diff --git a/FusionIIIT/applications/programme_curriculum/models.py b/FusionIIIT/applications/programme_curriculum/models.py index 233fa0405..5b6507f0f 100644 --- a/FusionIIIT/applications/programme_curriculum/models.py +++ b/FusionIIIT/applications/programme_curriculum/models.py @@ -119,12 +119,12 @@ class Curriculum(models.Model): ''' programme = models.ForeignKey(Programme, on_delete=models.CASCADE, null=False) name = models.CharField(max_length=100, null=False, blank=False) - # version = models.FloatField(default=1.0, null=False) # version = models.PositiveIntegerField(default=1, null=False) version = models.DecimalField( max_digits=2, decimal_places=1, + default=1.0, validators=[MinValueValidator(1.0), DecimalValidator(max_digits=2, decimal_places=1)]) working_curriculum = models.BooleanField(default=True, null=False) @@ -219,10 +219,12 @@ class Course(models.Model): code = models.CharField(max_length=10, null=False, blank=False) name = models.CharField(max_length=100, null=False, blank=False) version = models.DecimalField( + max_digits=5, decimal_places=1, default=1.0, validators=[MinValueValidator(1.0), DecimalValidator(max_digits=5, decimal_places=1)]) + credit = models.PositiveIntegerField(default=0, null=False, blank=False) lecture_hours = PositiveIntegerField(null=True, ) tutorial_hours = PositiveIntegerField(null=True) @@ -249,7 +251,6 @@ class Meta: def __str__(self): - return str(self.code + " - " +self.name+"- v"+str(self.version)) @@ -337,8 +338,6 @@ class Meta: unique_together = ('course_id', 'instructor_id', 'batch_id') - - def __self__(self): return '{} - {}'.format(self.course_id, self.instructor_id) @@ -479,3 +478,4 @@ def __str__(self): # def courseslots(self): # return CourseSlot.objects.filter(courses=self.id) + diff --git a/FusionIIIT/templates/dashboard/modules.html b/FusionIIIT/templates/dashboard/modules.html index 81cb4c8a7..908dc536e 100644 --- a/FusionIIIT/templates/dashboard/modules.html +++ b/FusionIIIT/templates/dashboard/modules.html @@ -36,9 +36,7 @@ {% endif %} - - {% if request.user.extrainfo.user_type != "staff" or "acadadmin" == global_var or "corelabcaretaker" == global_var %} - + {% if request.user.extrainfo.user_type != "staff" or "acadadmin" == global_var or "corelabcaretaker" == global_var %}