Merge pull request #31 from TRISHANT131104/main

change in models

.gitignore

@@ -1,6 +1,6 @@
 .env
 .vscode
-
+venv
 __pycache__
 db.sqlite3
 migrations

home/admin.py

@@ -167,7 +167,7 @@ class about_Admin(admin.ModelAdmin):
 class about_Admin(admin.ModelAdmin):
     model = Caterer
     search_fields = ("name",)
-    list_filter = ("name",)
+    list_filter = ("id","name",)
     fieldsets = (
         (
             None,

home/models/Semesters/autumn22.py

@@ -133,7 +133,7 @@ class CatererBillsAutumn22(models.Model):
     period6_bills = models.IntegerField(_("Period 6 Bill"),default=0, null=True)
 
     def __str__(self):
-        return str(self.caterer.name)
+        return str(self.caterer.pk)
 
     class Meta:
         verbose_name = "Caterer Bill Autumn 2022"

home/models/Semesters/spring23.py

@@ -133,7 +133,7 @@ class CatererBillsSpring23(models.Model):
     period6_bills = models.IntegerField(_("Period 6 Bill"),default=0, null=True)
 
     def __str__(self):
-        return str(self.caterer.name)
+        return str(self.caterer.pk)
 
     class Meta:
         verbose_name = "Caterer Bill Spring 2023"

home/models/students.py

@@ -10,7 +10,7 @@ class Student(models.Model):
 
     name = models.CharField(
         _("Name of Student"),
-        max_length=30,
+        max_length=50,
         help_text="This contains the name of the Student",
     )
     email = models.CharField(max_length=30, default="")
@@ -21,7 +21,7 @@ class Student(models.Model):
     )
     department = models.CharField(
         _("Department of Student"),
-        max_length=30,
+        max_length=50,
         help_text="This contains the department of the Student",
         null=True,
     )

templates/allocationForm.html

@@ -102,7 +102,7 @@ <h4 class="px-5 mx-5">
       if(second_pref[i].checked){
         cat_list[i]++;
       }
-      if(third_pref.length==first_pref.length && [i].checked){
+      if(third_pref.length==first_pref.length && third_pref[i].checked){
         cat_list[i]++;
       }
     }