Fixed Interface to add weekpreference

techdb/flightslot/admin.py

@@ -18,20 +18,20 @@ class TrainingInLIne(nested_admin.NestedTabularInline):
     model = Training
     extra = 0
     fk_name = 'weekpref'
-
+    
 class WeekPreferenceAdmin(nested_admin.NestedModelAdmin):
     list_display = ('week', 'student')
     list_filter = ['week', 'student']
     inlines = [TrainingInLIne, HourBuildingInLine]
 
 class StudentAdmin(admin.ModelAdmin):
-    list_display = ("name", "surname", "course", "active")
+    list_display = ("surname", "name", "course", "email","active")
     list_filter = ["course", "active"]
 
 class CourseAdmin(admin.ModelAdmin):
-    list_filter = ["ctype"]
+    list_filter = ["ctype", "year"]
 
 admin.site.register(Course, CourseAdmin)
 admin.site.register(MissionProfile)
 admin.site.register(Student, StudentAdmin)
-admin.site.register(WeekPreference, WeekPreferenceAdmin)
+admin.site.register(WeekPreference, WeekPreferenceAdmin)

techdb/flightslot/migrations/0007_course_year_alter_hourbuilding_notes_and_more.py

@@ -0,0 +1,34 @@
+# Generated by Django 5.1.2 on 2024-10-20 09:27
+
+import django.db.models.functions.datetime
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('flightslot', '0006_course_student_active_student_course'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='course',
+            name='year',
+            field=models.PositiveSmallIntegerField(db_default=django.db.models.functions.datetime.ExtractYear(django.db.models.functions.datetime.Now()), editable=False),
+        ),
+        migrations.AlterField(
+            model_name='hourbuilding',
+            name='notes',
+            field=models.TextField(blank=True, max_length=140, null=True),
+        ),
+        migrations.AlterField(
+            model_name='missionprofile',
+            name='notes',
+            field=models.TextField(blank=True, max_length=140, null=True),
+        ),
+        migrations.AlterField(
+            model_name='training',
+            name='notes',
+            field=models.TextField(blank=True, max_length=140, null=True),
+        ),
+    ]

techdb/flightslot/migrations/0008_hourbuilding_friday_training_friday.py

@@ -0,0 +1,23 @@
+# Generated by Django 5.1.2 on 2024-10-20 10:07
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('flightslot', '0007_course_year_alter_hourbuilding_notes_and_more'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='hourbuilding',
+            name='friday',
+            field=models.BooleanField(default=True),
+        ),
+        migrations.AddField(
+            model_name='training',
+            name='friday',
+            field=models.BooleanField(default=True),
+        ),
+    ]

techdb/flightslot/models.py

@@ -24,6 +24,11 @@ class Course(models.Model):
         default=ExtractYear(Now())
     )
 
+    year = models.PositiveSmallIntegerField(
+        editable=False,
+        db_default=ExtractYear(Now())
+    )
+
     def __str__(self):
         return f"{self.ctype}-{self.cnumber}"
 
@@ -59,7 +64,7 @@ class Student(models.Model):
     )
 
     def __str__(self):
-        return f"{self.surname} {self.name[0]}. - {self.course}"
+        return f"{self.surname} {self.name[0]}. => {self.course}"
 
 class WeekPreference(models.Model):
     id = models.BigAutoField(
@@ -81,7 +86,7 @@ class WeekPreference(models.Model):
     )
 
     def __str__(self):
-        return f"{self.week} - {self.student.surname} {self.student.name[0]}."
+        return f"Week {self.week} - {self.student.surname} {self.student.name[0]}."
 
 class MissionType(models.TextChoices):
     OTHER = "OTHER", _("OTHER")
@@ -168,6 +173,11 @@ class HourBuilding(models.Model):
         null=False
     )
 
+    friday = models.BooleanField(
+        default=True,
+        null=False
+    )
+
     saturday = models.BooleanField(
         default=True,
         null=False
@@ -260,6 +270,11 @@ class Training(models.Model):
         null=False
     )
 
+    friday = models.BooleanField(
+        default=True,
+        null=False
+    )
+
     saturday = models.BooleanField(
         default=True,
         null=False