Better inLine version with nested_admin

techdb/flightslot/admin.py

@@ -1,28 +1,37 @@
 from django.contrib import admin
-from nested_inline.admin import NestedTabularInline, NestedModelAdmin
+import nested_admin
 from .models import *
 
 # Register your models here.
-admin.site.register(Student, StudentAdmin)
-admin.site.register(MissionProfile)
-
-class HourBuildingLegInline(NestedTabularInline):
+class HourBuildingLegInline(nested_admin.NestedTabularInline):
     model = HourBuildingLeg
     extra = 1
     fk_name = 'hb'
 
-class HourBuildingInLine(NestedTabularInline):
+class HourBuildingInLine(nested_admin.NestedTabularInline):
     model = HourBuilding
     extra = 1
     inlines = [HourBuildingLegInline]
     fk_name = 'weekpref'
 
-class TrainingInLIne(NestedTabularInline):
+class TrainingInLIne(nested_admin.NestedTabularInline):
     model = Training
     extra = 0
     fk_name = 'weekpref'
 
-class WeekPreferenceAdmin(NestedModelAdmin):
+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_filter = ["course", "active"]
+
+class CourseAdmin(admin.ModelAdmin):
+    list_filter = ["ctype"]
+
+admin.site.register(Course, CourseAdmin)
+admin.site.register(MissionProfile)
+admin.site.register(Student, StudentAdmin)
 admin.site.register(WeekPreference, WeekPreferenceAdmin)

techdb/flightslot/migrations/0006_course_student_active_student_course.py

@@ -0,0 +1,33 @@
+# Generated by Django 5.1.2 on 2024-10-20 09:14
+
+import django.db.models.deletion
+import django.db.models.functions.datetime
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('flightslot', '0005_hourbuilding_notes_training_notes_and_more'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Course',
+            fields=[
+                ('id', models.AutoField(primary_key=True, serialize=False)),
+                ('ctype', models.CharField(choices=[('PPL', 'PPL'), ('ATPL', 'ATPL')])),
+                ('cnumber', models.PositiveSmallIntegerField(default=django.db.models.functions.datetime.ExtractYear(django.db.models.functions.datetime.Now()))),
+            ],
+        ),
+        migrations.AddField(
+            model_name='student',
+            name='active',
+            field=models.BooleanField(default=True),
+        ),
+        migrations.AddField(
+            model_name='student',
+            name='course',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.DO_NOTHING, to='flightslot.course'),
+        ),
+    ]

techdb/flightslot/models.py

@@ -1,13 +1,31 @@
 from django.db import models
 from django.contrib import admin
-from django.db.models.functions import Now, ExtractWeek
-from django.http import HttpRequest
+from django.db.models.functions import Now, ExtractWeek, ExtractYear
 from django.utils.translation import gettext_lazy as _
 
 # Create your models here.
-class StudentAdmin(admin.ModelAdmin):
-    list_display = ("name", "surname", "email")
-    list_filter = []
+
+class CourseTypes(models.TextChoices):
+    PPL = "PPL", _("PPL")
+    ATPL = "ATPL", _("ATPL")
+
+class Course(models.Model):
+    id = models.AutoField(
+        primary_key=True
+    )
+
+    ctype = models.CharField(
+        null=False,
+        choices=CourseTypes
+    )
+
+    cnumber = models.PositiveSmallIntegerField(
+        null=False,
+        default=ExtractYear(Now())
+    )
+
+    def __str__(self):
+        return f"{self.ctype}-{self.cnumber}"
 
 class Student(models.Model):
     id = models.AutoField(
@@ -29,6 +47,20 @@ class Student(models.Model):
         max_length=32
     )
 
+    course = models.ForeignKey(
+        Course,
+        on_delete=models.DO_NOTHING,
+        null=True
+    )
+
+    active = models.BooleanField(
+        null=False,
+        default=True
+    )
+
+    def __str__(self):
+        return f"{self.surname} {self.name[0]}. - {self.course}"
+
 class WeekPreference(models.Model):
     id = models.BigAutoField(
         primary_key=True
@@ -48,6 +80,9 @@ class WeekPreference(models.Model):
         on_delete=models.DO_NOTHING
     )
 
+    def __str__(self):
+        return f"{self.week} - {self.student.surname} {self.student.name[0]}."
+
 class MissionType(models.TextChoices):
     OTHER = "OTHER", _("OTHER")
     PPL = "PPL", _("PPL")
@@ -80,7 +115,8 @@ class MissionProfile(models.Model):
 
     notes = models.TextField(
         max_length=140,
-        null=True
+        null=True,
+        blank=True
     )
 
     def __str__(self):
@@ -144,7 +180,8 @@ class HourBuilding(models.Model):
 
     notes = models.TextField(
         max_length=140,
-        null=True
+        null=True,
+        blank=True
     )
 
 class HourBuildingLeg(models.Model):
@@ -180,6 +217,12 @@ class HourBuildingLeg(models.Model):
         default=False
     )
 
+    def __str__(self):
+        if self.stop:
+            return "Refuelling Stop"
+        else:
+            return f"Flight Leg: {self.departure} -> {self.destination}"
+
 class Training(models.Model):
     id = models.BigAutoField(
         primary_key=True
@@ -229,5 +272,9 @@ class Training(models.Model):
 
     notes = models.TextField(
         max_length=140,
-        null=True
+        null=True,
+        blank=True
     )
+
+    def __str__(self):
+        return f"{self.mission}"