[PS-1] Merging to latest_staging

FusionIIIT/applications/academic_procedures/migrations/0001_initial.py

@@ -402,4 +402,4 @@ class Migration(migrations.Migration):
                 'unique_together': {('curr_id', 'student_id')},
             },
         ),
-    ]
+    ]

FusionIIIT/applications/department/models.py

@@ -4,7 +4,7 @@
 
 # Create your models here.
 from applications.globals.models import ExtraInfo
-  
+
 class SpecialRequest(models.Model):
     request_maker = models.ForeignKey(ExtraInfo, on_delete=models.CASCADE)
     request_date = models.DateTimeField(default=date.today)

FusionIIIT/applications/filetracking/models.py

@@ -24,8 +24,8 @@ class File(models.Model):
     class Meta:
         db_table = 'File'
 
-    #def __str__(self):
-        #return str(self.ref_id)
+    # def __str__(self):
+    #     return str(self.ref_id)
 
 
 class Tracking(models.Model):
@@ -48,4 +48,4 @@ class Tracking(models.Model):
     tracking_extra_JSON = models.JSONField(null=True) 
 
     class Meta:
-        db_table = 'Tracking'
+        db_table = 'Tracking'

FusionIIIT/applications/globals/models.py

@@ -64,8 +64,6 @@ class Constants:
     DESIGNATIONS = (
         ('academic', 'Academic Designation'),
         ('administrative', 'Administrative Designation'),
-
-
     )
     USER_STATUS = {
         ("NEW", "NEW"),

FusionIIIT/applications/health_center/api/serializers.py

@@ -54,6 +54,7 @@ class Meta:
 
 
 
+
 class AnnouncementSerializer(serializers.ModelSerializer):
 
     class Meta:

FusionIIIT/applications/health_center/models.py

@@ -112,8 +112,6 @@ class Pathologist_Schedule(models.Model):
     room = models.IntegerField()
     date = models.DateField(auto_now=True)
 
-
-
 
 class Counter(models.Model):
     count=models.IntegerField(default=0)