Remove null parameter and refactor code

* CharField will store an empty string if no choice is selected
IMGIITRoorkee · Jun 24, 2020 · 2f126b4 · 2f126b4
1 parent f9683c4
commit 2f126b4
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 17 deletions.
diff --git a/constants/collaboration_types.py b/constants/collaboration_types.py
@@ -1,4 +1,4 @@
-#Collaboration Types
+# Collaboration types
 UNDERGRADUATE = 'ug'
 POSTGRADUATE = 'pg'
 DOCTORATE = 'phd'

diff --git a/constants/phd_types.py b/constants/phd_types.py
@@ -0,0 +1,7 @@
+# PhD Types
+FULLTIME = 'f'
+PARTTIME = 'p'
+PHD_TYPES = (
+    (FULLTIME, 'Fulltime'),
+    (PARTTIME, 'Parttime'),
+)
diff --git a/constants/semesters.py b/constants/semesters.py
@@ -1,4 +1,4 @@
-# Semesters Types
+# Semester types
 SPRING = 's'
 AUTUMN = 'a'
 SEMESTER_TYPES = (

diff --git a/constants/supervision.py b/constants/supervision.py
@@ -5,11 +5,3 @@
     (PROJECT, 'Project'),
     (DOCTORATE, 'Doctorate'),
 )
-
-# PhD Types
-FULLTIME = 'f'
-PARTTIME = 'p'
-PHD_TYPES = (
-    (FULLTIME, 'Fulltime'),
-    (PARTTIME, 'Parttime'),
-)
diff --git a/migrations/0012_auto_20200624_1437.py → migrations/0012_auto_20200625_0253.py b/migrations/0012_auto_20200624_1437.py → migrations/0012_auto_20200625_0253.py
@@ -1,4 +1,4 @@
-# Generated by Django 2.2.6 on 2020-06-24 09:07
+# Generated by Django 3.0.3 on 2020-06-24 21:23
 
 from django.db import migrations, models
 
@@ -13,12 +13,12 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='collaboration',
             name='level',
-            field=models.CharField(choices=[('ug', 'Undergraduate'), ('pg', 'Postgraduate'), ('phd', 'PhD'), ('rp', 'Research Project'), ('oth', 'Other')], default='oth', max_length=3),
+            field=models.CharField(blank=True, choices=[('ug', 'Undergraduate'), ('pg', 'Postgraduate'), ('phd', 'PhD'), ('rp', 'Research Project'), ('oth', 'Other')], max_length=3),
         ),
         migrations.AddField(
             model_name='supervision',
             name='phd_type',
-            field=models.CharField(blank=True, choices=[('f', 'Fulltime'), ('p', 'Parttime')], max_length=1, null=True),
+            field=models.CharField(blank=True, choices=[('f', 'Fulltime'), ('p', 'Parttime')], max_length=1),
         ),
         migrations.AddField(
             model_name='teachingengagement',

diff --git a/models/engagements/collaboration.py b/models/engagements/collaboration.py
@@ -18,7 +18,7 @@ class AbstractCollaboration(OrganisationMixin, BaseModel):
     level = models.CharField(
         max_length=3,
         choices=COLLABORATION_TYPES,
-        default=OTHER,
+        blank=True,
     )
 
     class Meta:

diff --git a/models/engagements/supervision.py b/models/engagements/supervision.py
@@ -1,10 +1,12 @@
 import swapper
 from django.db import models
 
-from faculty_biodata.constants.supervision import SUPERVISION_CATEGORIES, PHD_TYPES
-from faculty_biodata.models.abstract_classes.base_model import BaseModel
 from formula_one.mixins.period_mixin import BlurryPeriodMixin
 
+from faculty_biodata.models.abstract_classes.base_model import BaseModel
+from faculty_biodata.constants.supervision import SUPERVISION_CATEGORIES
+from faculty_biodata.constants.phd_types import PHD_TYPES
+
 
 class AbstractSupervision(BlurryPeriodMixin, BaseModel):
     """
@@ -25,7 +27,6 @@ class AbstractSupervision(BlurryPeriodMixin, BaseModel):
         max_length=1,
         choices=PHD_TYPES,
         blank=True,
-        null=True,
     )
 
     name_of_other_supervisors = models.TextField(