Import mission profiles and better format text fields

This commit is contained in:
2025-11-18 23:24:38 +01:00
parent 79d7333ca0
commit 9cae53a942
6 changed files with 83 additions and 7 deletions

View File

@@ -1,6 +1,8 @@
import nested_admin
from django import forms
from django.db import models
from django.forms import TextInput, Textarea
from django.http import HttpRequest
from durationwidget.widgets import TimeDurationWidget
@@ -27,6 +29,10 @@ class HourBuildingLegInline(nested_admin.NestedTabularInline):
extra = 0
fk_name = 'hb'
max_num = 5
formfield_overrides = {
models.CharField: {'widget': TextInput(attrs={'size':'20'})},
models.TextField: {'widget': Textarea(attrs={'rows':4, 'cols':35})},
}
# If user is a student deny edit permission for week past the current one
def has_change_permission(self, request: HttpRequest, obj: HourBuilding | None = None):
@@ -46,6 +52,11 @@ class HourBuildingInLine(nested_admin.NestedTabularInline):
fk_name = 'weekpref'
verbose_name_plural = "Hour Building"
max_num = 7
formfield_overrides = {
models.CharField: {'widget': TextInput(attrs={'size':'20'})},
models.TextField: {'widget': Textarea(attrs={'rows':4, 'cols':35})},
}
# 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):

View File

@@ -1,5 +1,39 @@
from django.contrib import admin
from django.utils.safestring import SafeText
class MissionProfileAdmin(admin.ModelAdmin):
list_display = ("mtype", "mnum",)
from typing import Any
from import_export import fields
from import_export.admin import ImportMixin
from import_export.resources import ModelResource
from ..models.missions import MissionProfile
from django_admin_action_forms import AdminActionFormsMixin
from datetime import timedelta
# Resource Class for Student data import
class MissionProfileResource(ModelResource):
mtype = fields.Field(attribute="mtype", column_name="mtype")
mnum = fields.Field(attribute="mnum", column_name="mnum")
duration = fields.Field(attribute="duration", column_name="duration")
# Cleanup fields before entering
def before_import_row(self, row: dict[str, str | Any], **kwargs) -> None:
row["mtype"] = SafeText(row["mtype"].upper().strip())
row["mnum"] = SafeText(row["mnum"].upper().strip())
h, m, _ = row["duration"].split(":")
row["duration"] = timedelta(hours=float(h), minutes=float(m))
return super().before_import_row(row, **kwargs)
class Meta:
model = MissionProfile
skip_unchanged = True
report_skipped = True
fields = ("mtype", "mnum", "duration")
import_id_fields = ("mtype", "mnum")
class MissionProfileAdmin(ImportMixin, AdminActionFormsMixin, admin.ModelAdmin):
list_display = ("mtype", "mnum", "notes")
list_filter = ("mtype",)

View File

@@ -18,10 +18,10 @@ from ..custom.colortag import course_color
# Resource Class for Student data import
class StudentResource(ModelResource):
surname = fields.Field(attribute="surname", column_name="surname", widget=CharWidget())
name = fields.Field(attribute="name", column_name="name", widget=CharWidget())
email = fields.Field(attribute="email", column_name="email", widget=CharWidget())
phone = fields.Field(attribute="phone", column_name="phone", widget=CharWidget())
surname = fields.Field(attribute="surname", column_name="surname")
name = fields.Field(attribute="name", column_name="name")
email = fields.Field(attribute="email", column_name="email")
phone = fields.Field(attribute="phone", column_name="phone")
# Cleanup fields before entering
def before_import_row(self, row: dict[str, str], **kwargs) -> None:
@@ -42,7 +42,7 @@ class StudentResource(ModelResource):
class ChangeCourseForm(AdminActionForm):
course = forms.ModelChoiceField(queryset=Course.objects.all())
class StudentAdmin(ImportMixin, AdminActionFormsMixin, admin.ModelAdmin):
class StudentAdmin(ImportMixin, AdminActionFormsMixin, admin.ModelAdmin):
list_display = ("surname", "name", "course", "course_color", "email", "phone", "password", "active")
list_filter = ("course", "active")
actions = ("change_course", "disable_students")

View File

@@ -1,5 +1,7 @@
import nested_admin
from django import forms
from django.db import models
from django.forms import TextInput, Textarea
from django.http import HttpRequest
from ..models.missions import Training
@@ -18,6 +20,11 @@ class TrainingInLIne(nested_admin.NestedTabularInline):
verbose_name_plural = "Training Missions"
max_num = 7
formfield_overrides = {
models.CharField: {'widget': TextInput(attrs={'size':'20'})},
models.TextField: {'widget': Textarea(attrs={'rows':4, 'cols':35})},
}
# 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):
if hasattr(request.user, 'student') and obj: