Generalized aircraft assign function

Reviewed-on: #2

cntmanage/flightslot/actions/assign_aircraft.py

@@ -0,0 +1,22 @@
+from django.db.models.query import QuerySet, Q
+
+from ..models.students import Student
+from ..models.missions import MissionProfile
+from ..models.aircrafts import Aircraft, AircraftTypes
+
+from typing import List, Dict, Tuple
+
+def assign_aircraft(queryset: QuerySet[Student] | QuerySet[MissionProfile], data: Dict[str, List[AircraftTypes]]) -> Tuple[int, List[str]]:
+    i: int = 0
+    ac_types: List[AircraftTypes] = data["aircrafts"]
+    ac_query: Q = Q() # Build an or query to select all aircrafts of the specified types
+    for a in ac_types:
+        ac_query |= Q(type=a)
+    aircrafts: QuerySet[Aircraft] = Aircraft.objects.filter(ac_query).all() # Execute query
+    for obj in queryset:
+        obj.aircrafts.clear()
+        for ac in aircrafts:
+            obj.aircrafts.add(ac)
+        obj.save()
+        i += 1
+    return i, [a for a in ac_types]

cntmanage/flightslot/admins/course_adm.py

@@ -1,12 +1,24 @@
 from django.contrib import admin
+from django.db.models.query import QuerySet
+from django.http import HttpRequest
 from django.utils.safestring import SafeText
 
+from ..models.students import Student
 from ..models.courses import Course
 from ..custom.colortag import course_color
      
 class CourseAdmin(admin.ModelAdmin):
-    list_display = ("ctype", "cnumber","color_display", "year")
+    list_display = ("ctype", "cnumber","color_display", "course_students", "year")
     list_filter = ("ctype", "year")
+
+    def get_queryset(self, request: HttpRequest) -> QuerySet:
+        return super().get_queryset(request).order_by("ctype", "cnumber")
+    
+    @admin.display(description="Student Number")
+    def course_students(self, obj: Course) -> SafeText:
+        if not obj.pk:
+            return SafeText("")
+        return SafeText(f"{Student.objects.filter(course = obj.id).count()}")
     
     # Dinamically add color_display property to show a colored dot
     @admin.display(description="Color")

cntmanage/flightslot/admins/hourbuilding_adm.py

@@ -10,7 +10,7 @@ from durationwidget.widgets import TimeDurationWidget
 from ..models.hourbuildings import HourBuilding, HourBuildingLegBase, HourBuildingLegFlight, HourBuildingLegStop
 from ..models.weekpref import WeekPreference
 
-from datetime import date
+from ..custom.student_permissions import has_edit_permission
 
 class HourBuildingLegFlightForm(forms.ModelForm):
     class Meta:
@@ -74,11 +74,7 @@ class HourBuildingInLine(nested_admin.NestedTabularInline):
 
     # If user is a student deny edit permission for week past the current one
     def has_change_permission(self, request: HttpRequest, obj: WeekPreference | None = None) -> bool:
-        if hasattr(request.user, 'student') and obj:
+        return has_edit_permission(request=request, obj=obj)
-            current_week: int = date.today().isocalendar().week
-            if current_week > obj.week:
-                return False
-        return True
     
     def has_delete_permission(self, request: HttpRequest, obj: WeekPreference | None = None) -> bool:
         return self.has_change_permission(request=request, obj=obj)

cntmanage/flightslot/admins/mission_adm.py

@@ -1,7 +1,7 @@
-from django.forms import ModelMultipleChoiceField
+from django.forms import TypedMultipleChoiceField
 from django.contrib import admin, messages
 from django.http import HttpRequest
-from django.db.models.query import QuerySet, Q
+from django.db.models.query import QuerySet
 from django.utils.safestring import SafeText
 
 from django_admin_action_forms import AdminActionFormsMixin, AdminActionForm, action_with_form
@@ -11,11 +11,13 @@ from import_export.admin import ImportMixin
 from import_export.tmp_storages import CacheStorage
 from import_export.resources import ModelResource
 
-from ..models.aircrafts import Aircraft
+from ..models.aircrafts import AircraftTypes
 from ..models.missions import MissionProfile
 
+from ..actions.assign_aircraft import assign_aircraft
+
 from datetime import timedelta
-from typing import Any, Dict
+from typing import Any, Dict, List
 
 # Resource Class for Student data import
 class MissionProfileResource(ModelResource):
@@ -40,30 +42,25 @@ class MissionProfileResource(ModelResource):
 
 # Form class to assing aircrafts to students
 class ChangeAircraftForm(AdminActionForm):
-    aircrafts = ModelMultipleChoiceField(queryset=Aircraft.objects.distinct('type').all())
+    aircrafts = TypedMultipleChoiceField(choices=AircraftTypes)
 
 class MissionProfileAdmin(ImportMixin, AdminActionFormsMixin, admin.ModelAdmin):
     list_display = ("mtype", "mnum", "assigned_aircrafts", "duration", "notes", )
     list_filter = ("mtype", )
     actions = ("assign_aircraft", )
+    resource_classes = [MissionProfileResource]
     tmp_storage_class = CacheStorage
     skip_admin_log = True
 
-    @action_with_form(ChangeAircraftForm, description="Assign Aircraft")
+    def get_queryset(self, request: HttpRequest) -> QuerySet[MissionProfile]:
-    def assign_aircraft(self, request: HttpRequest, queryset: QuerySet[MissionProfile], data: Dict[str, QuerySet[Aircraft]]):
+        return super().get_queryset(request).order_by("mtype", "mnum")
-        ac_types = [t.type for t in data["aircrafts"]]
+
-        ac_query: Q = Q() # Build an or query to select all aircrafts of the specified types
+    @action_with_form(ChangeAircraftForm, description="Assign Aircraft Type")
-        for a in ac_types:
+    def assign_aircraft(self, request: HttpRequest, queryset: QuerySet[MissionProfile], data: Dict[str, List[AircraftTypes]]):
-            ac_query |= Q(type=a)
+        i: int
-        aircrafts: QuerySet[Aircraft] = Aircraft.objects.filter(ac_query).all() # Execute query
+        ac_types: List[str]
-        i: int = 0
+        i, ac_types = assign_aircraft(queryset=queryset, data=data)
-        for mix in queryset:
+        messages.success(request, f"{i} Missions updated to {ac_types}")
-            mix.aircrafts.clear()
-            for ac in aircrafts:
-                mix.aircrafts.add(ac)
-            mix.save()
-            i += 1
-        messages.success(request, f"{i} Students updated to {ac_types}")
 
     @admin.display(description="Assigned Aircrafts")
     def assigned_aircrafts(self, obj: MissionProfile) -> SafeText:

cntmanage/flightslot/admins/student_adm.py

@@ -1,5 +1,5 @@
-from django.forms import ModelChoiceField, TypedMultipleChoiceField, ModelMultipleChoiceField
+from django.forms import ModelChoiceField, TypedMultipleChoiceField
-from django.db.models.query import QuerySet, Q
+from django.db.models.query import QuerySet
 from django.http import HttpRequest
 from django.contrib import admin, messages
 from django.utils.safestring import SafeText
@@ -12,13 +12,15 @@ from import_export.forms import ConfirmImportForm, ImportForm
 
 from django_admin_action_forms import AdminActionFormsMixin, AdminActionForm, action_with_form
 
-from ..models.aircrafts import Aircraft, AircraftTypes
+from ..models.aircrafts import AircraftTypes
 from ..models.courses import Course
 from ..models.students import Student
 
+from ..actions.assign_aircraft import assign_aircraft
+
 from ..custom.colortag import course_color
 
-from typing import Any, Dict
+from typing import Any, Dict, List
 
 # Custom import form to select a course for student input
 class StudentCustomConfirmImportForm(ConfirmImportForm):
@@ -56,18 +58,18 @@ class StudentResource(ModelResource):
 
 # Form Class for Student course change
 class ChangeCourseForm(AdminActionForm):
-    course = TypedMultipleChoiceField(choices=AircraftTypes)
+    course = ModelChoiceField(queryset=Course.objects.all().order_by("ctype", "-cnumber"))
 
 # Form class to assing aircrafts to students
 class ChangeAircraftForm(AdminActionForm):
-    aircrafts = ModelMultipleChoiceField(queryset=Aircraft.objects.distinct('type').all())
+    aircrafts = TypedMultipleChoiceField(choices=AircraftTypes)
 
 class StudentAdmin(ImportMixin, AdminActionFormsMixin, admin.ModelAdmin):
     model = Student
     list_display = ("surname", "name", "course", "course_color", "email", "phone", "username", "password", "active", )
     list_filter = ("course", "active", )
     search_fields = ("surname", "name", "phone", "email", )
-    actions = ("change_course", "disable_students", "change_aircraft", )
+    actions = ("change_course", "deactivate_students", "change_aircraft", )
     resource_classes = [StudentResource]
     confirm_form_class = StudentCustomConfirmImportForm
     tmp_storage_class = CacheStorage
@@ -88,7 +90,7 @@ class StudentAdmin(ImportMixin, AdminActionFormsMixin, admin.ModelAdmin):
         return SafeText(obj.default_username())
     
     @admin.action(description="Deactivate Students")
-    def disable_students(self, request: HttpRequest, queryset: QuerySet[Student]):
+    def deactivate_students(self, request: HttpRequest, queryset: QuerySet[Student]):
         for q in queryset.all():
             if q.user:
                 q.user.is_staff = False
@@ -102,20 +104,11 @@ class StudentAdmin(ImportMixin, AdminActionFormsMixin, admin.ModelAdmin):
         count: int = queryset.update(course=course)
         messages.success(request, f"{count} students updated to {course}")
 
-    @action_with_form(ChangeAircraftForm, description="Assign Aircraft")
+    @action_with_form(ChangeAircraftForm, description="Assign Aircraft Type")
-    def change_aircraft(self, request: HttpRequest, queryset: QuerySet[Student], data: Dict[str, QuerySet[Aircraft]]):
+    def change_aircraft(self, request: HttpRequest, queryset: QuerySet[Student], data: Dict[str, List[AircraftTypes]]):
-        ac_types = [t.type for t in data["aircrafts"]]
+        i: int
-        ac_query: Q = Q() # Build an or query to select all aircrafts of the specified types
+        ac_types: List[str]
-        for a in ac_types:
+        i, ac_types = assign_aircraft(queryset=queryset, data=data)
-            ac_query |= Q(type=a)
-        aircrafts: QuerySet[Aircraft] = Aircraft.objects.filter(ac_query).all() # Execute query
-        i: int = 0
-        for student in queryset:
-            student.aircrafts.clear()
-            for ac in aircrafts:
-                student.aircrafts.add(ac)
-            student.save()
-            i += 1
         messages.success(request, f"{i} Students updated to {ac_types}")
 
     # Return the initial form for import confirmations, request course to user

cntmanage/flightslot/admins/training_adm.py

@@ -7,6 +7,8 @@ from django.http import HttpRequest
 from ..models.missions import Training
 from ..models.weekpref import WeekPreference
 
+from ..custom.student_permissions import has_edit_permission
+
 from datetime import date
 
 class TrainingForm(forms.ModelForm):
@@ -27,11 +29,7 @@ class TrainingInLIne(nested_admin.NestedTabularInline):
 
     # If user is a student deny edit permission for week past the current one
     def has_change_permission(self, request: HttpRequest, obj: WeekPreference | None = None) -> bool:
-        if hasattr(request.user, 'student') and obj:
+        return has_edit_permission(request=request, obj=obj)
-            current_week: int = date.today().isocalendar().week
-            if current_week > obj.week:
-                return False
-        return True
     
     def has_delete_permission(self, request: HttpRequest, obj: WeekPreference | None = None) -> bool:
         return self.has_change_permission(request=request, obj=obj)

cntmanage/flightslot/admins/weekpref_adm.py

@@ -2,12 +2,12 @@ import nested_admin
 
 from django.forms import Form
 from django.db.models.query import QuerySet
-from django.contrib.auth.models import User
 from django.http import HttpRequest, HttpResponse
 from django.contrib import admin, messages
 from django.utils.translation import ngettext
 from django.utils.safestring import SafeText
 
+from ..models.students import Student
 from ..models.missions import Training
 from ..models.weekpref import WeekPreference
 
@@ -15,6 +15,7 @@ from .training_adm import TrainingInLIne
 from .hourbuilding_adm import HourBuildingInLine
 
 from ..custom.colortag import course_color
+from ..custom.student_permissions import has_edit_permission
 from ..actions.exportweek import export_selected
 
 from datetime import date
@@ -62,7 +63,7 @@ class WeekPreferenceAdmin(nested_admin.NestedPolymorphicModelAdmin):
 
     # If a user is registered as student show only their preferences
     def get_queryset(self, request: HttpRequest) -> QuerySet[WeekPreference]:
-        qs = super().get_queryset(request)
+        qs = super().get_queryset(request).order_by("-week", "-student__course", "student__surname", "student__name")
         if hasattr(request.user, "student"):
             return qs.filter(student=request.user.student)
         # If admin show everything
@@ -79,7 +80,7 @@ class WeekPreferenceAdmin(nested_admin.NestedPolymorphicModelAdmin):
 
         # If student is current user making request
         if hasattr(request.user, "student"):
-            student = request.user.student
+            student: Student = request.user.student
             if "student" in form.base_fields:
                 form.base_fields["student"].initial = student
                 form.base_fields["student"].disabled = True
@@ -88,11 +89,7 @@ class WeekPreferenceAdmin(nested_admin.NestedPolymorphicModelAdmin):
     
     # If user is a student deny edit permission for week past the current one
     def has_change_permission(self, request: HttpRequest, obj: WeekPreference | None = None) -> bool:
-        if hasattr(request.user, "student") and obj:
+        return has_edit_permission(request=request, obj=obj)
-            current_week = date.today().isocalendar().week
-            if current_week > obj.week:
-                return False
-        return True
     
     # If user is a student deny edit permission for week past the current one
     def has_add_permission(self, request: HttpRequest, obj: WeekPreference | None = None) -> bool:
@@ -105,9 +102,8 @@ class WeekPreferenceAdmin(nested_admin.NestedPolymorphicModelAdmin):
     def changeform_view(self, request: HttpRequest, object_id: int | None = None, form_url: str = "", extra_context=None):
         extra_context = extra_context or {}
         if hasattr(request.user, "student") and object_id:
-            current_week = date.today().isocalendar().week
             weekpref = WeekPreference.objects.get(id=object_id)
-            if current_week > weekpref.week:
+            if not has_edit_permission(request=request, obj=weekpref):
                 extra_context["show_save"] = False
                 extra_context["show_save_and_continue"] = False
                 extra_context["show_save_and_add_another"] = False

cntmanage/flightslot/custom/student_permissions.py

@@ -0,0 +1,17 @@
+
+from django.http import HttpRequest
+from ..models.students import Student
+from ..models.weekpref import WeekPreference
+
+from datetime import date
+
+# allow add, modify, delete depending on a set of requirements
+def has_edit_permission(request: HttpRequest, obj: WeekPreference | None = None) -> bool:
+    if hasattr(request.user, 'student'):
+        student: Student = request.user.student
+        if not student.active:
+            return False
+        current_week: int = date.today().isocalendar().week
+        if obj and current_week > obj.week or not student.active:
+            return False
+    return True

cntmanage/flightslot/migrations/0025_alter_aircraft_type_alter_hourbuilding_aircraft_and_more.py

@@ -0,0 +1,28 @@
+# Generated by Django 5.2.8 on 2025-12-01 12:37
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('flightslot', '0024_alter_missionprofile_mtype'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='aircraft',
+            name='type',
+            field=models.CharField(choices=[('C152', 'Cessna 152'), ('P208', 'Tecnam P2008'), ('PA28', 'Piper PA28R'), ('PA34', 'Piper PA34'), ('C182', 'Cessna 182Q'), ('TWEN', 'Tecnam P2010'), ('CP10', 'Cap 10'), ('FSTD', 'Alsim ALX40')], max_length=4),
+        ),
+        migrations.AlterField(
+            model_name='hourbuilding',
+            name='aircraft',
+            field=models.CharField(choices=[('C152', 'Cessna 152'), ('P208', 'Tecnam P2008'), ('PA28', 'Piper PA28R'), ('PA34', 'Piper PA34'), ('C182', 'Cessna 182Q'), ('TWEN', 'Tecnam P2010'), ('CP10', 'Cap 10'), ('FSTD', 'Alsim ALX40')]),
+        ),
+        migrations.AlterField(
+            model_name='weekpreference',
+            name='week',
+            field=models.PositiveSmallIntegerField(auto_created=True, db_default=49, db_index=True, verbose_name='Week Number'),
+        ),
+    ]

cntmanage/flightslot/models/aircrafts.py

@@ -8,6 +8,7 @@ class AircraftTypes(models.TextChoices):
     PA34 = "PA34", _("Piper PA34")
     C182 = "C182", _("Cessna 182Q")
     P210 = "TWEN", _("Tecnam P2010")
+    CP10 = "CP10", _("Cap 10")
     ALX40 = "FSTD", _("Alsim ALX40")
 
 class Aircraft(models.Model):