Merge pull request #2249 from gtech-mulearn/dev

dev server
gtech-mulearn · Oct 13, 2024 · a2a1726 · a2a1726
2 parents d339c55 + 4ddeb22
commit a2a1726
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 80 deletions.
diff --git a/alter-scripts/alter-1.55.py b/alter-scripts/alter-1.55.py
diff --git a/api/dashboard/ig/dash_ig_serializer.py b/api/dashboard/ig/dash_ig_serializer.py
@@ -9,7 +9,7 @@ class InterestGroupSerializer(serializers.ModelSerializer):
     updated_by = serializers.CharField(source='updated_by.full_name')
     created_by = serializers.CharField(source='created_by.full_name')
     members = serializers.SerializerMethodField()
-    category = serializers.ChoiceField(choices=["maker", "software", "creative", "management", "others"])
+    category = serializers.ChoiceField(choices=["hardware", "coder", "creative", "manager", "others"])
     class Meta:
         model = InterestGroup
         fields = [

diff --git a/api/dashboard/user/dash_user_serializer.py b/api/dashboard/user/dash_user_serializer.py
@@ -387,7 +387,7 @@ class UserOrgLinkSerializer(serializers.ModelSerializer):
     department = serializers.PrimaryKeyRelatedField(
         queryset=Department.objects.all(), required=False
     )
-    graduation_year = serializers.CharField(required=False)
+    graduation_year = serializers.CharField(required=False,allow_null=True)
     organization = serializers.PrimaryKeyRelatedField(
         queryset=Organization.objects.all(), many=False, required=True
     )

diff --git a/api/register/serializers.py b/api/register/serializers.py
@@ -451,7 +451,7 @@ def update(self, instance, validated_data):
 
     def validate_choosen_interests(self, interests):
         if not all(
-            interest in ("maker", "software", "creative", "management", "others")
+            interest in ("hardware", "coder", "creative", "manager", "others")
             for interest in interests
         ):
             raise serializers.ValidationError("Invalid interests selected.")
@@ -465,6 +465,7 @@ def validate_choosen_endgoals(self, end_goals):
                 "higher_education",
                 "gig_work",
                 "entrepreneurship",
+                "r&d",
                 "others",
             )
             for goal in end_goals