diff --git a/cntmanage/flightslot/admins/student_adm.py b/cntmanage/flightslot/admins/student_adm.py index b1e328a..c4e942e 100644 --- a/cntmanage/flightslot/admins/student_adm.py +++ b/cntmanage/flightslot/admins/student_adm.py @@ -59,7 +59,7 @@ class ChangeCourseForm(AdminActionForm): class StudentAdmin(ImportMixin, AdminActionFormsMixin, admin.ModelAdmin): list_display = ("surname", "name", "course", "course_color", "email", "phone", "username", "password", "active",) list_filter = ("course", "active",) - search_fields= ("surname", "name", "phone", "email",) + search_fields = ("surname", "name", "phone", "email",) actions = ("change_course", "disable_students",) resource_classes = [StudentResource] confirm_form_class = StudentCustomConfirmImportForm diff --git a/cntmanage/flightslot/admins/weekpref_adm.py b/cntmanage/flightslot/admins/weekpref_adm.py index dd4fd06..47763d6 100644 --- a/cntmanage/flightslot/admins/weekpref_adm.py +++ b/cntmanage/flightslot/admins/weekpref_adm.py @@ -21,7 +21,8 @@ from datetime import date class WeekPreferenceAdmin(nested_admin.NestedPolymorphicModelAdmin): inlines = (TrainingInLIne, HourBuildingInLine, ) list_display = ("week", "student__surname","student__name", "student__course", "course_color", "student_brief_mix",) - list_filter = ("week", "student__course", "student",) + list_filter = ("week", "student__course",) + search_fields = ("student__surname","student__name",) actions = ("export",) @admin.action(description="Export Selected Preferences") diff --git a/cntmanage/flightslot/migrations/0021_alter_hourbuildinglegstop_refuel.py b/cntmanage/flightslot/migrations/0021_alter_hourbuildinglegstop_refuel.py new file mode 100644 index 0000000..701bee7 --- /dev/null +++ b/cntmanage/flightslot/migrations/0021_alter_hourbuildinglegstop_refuel.py @@ -0,0 +1,18 @@ +# Generated by Django 5.2.8 on 2025-11-27 10:56 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('flightslot', '0020_alter_hourbuildinglegbase_options_and_more'), + ] + + operations = [ + migrations.AlterField( + model_name='hourbuildinglegstop', + name='refuel', + field=models.BooleanField(default=False, verbose_name='Stop for Refuelling'), + ), + ] diff --git a/cntmanage/flightslot/models/hourbuildings.py b/cntmanage/flightslot/models/hourbuildings.py index 3de50e6..c92af17 100644 --- a/cntmanage/flightslot/models/hourbuildings.py +++ b/cntmanage/flightslot/models/hourbuildings.py @@ -124,8 +124,10 @@ class HourBuildingLegFlight(HourBuildingLegBase): class HourBuildingLegStop(HourBuildingLegBase): - refuel = models.BooleanField( - default=False + refuel = models.BooleanField ( + null=False, + default=False, + verbose_name="Stop for Refuelling" ) # Change displayed name in the inline form