From 29bf7b49171efbd4bb53ffcc092171ec987cf4b8 Mon Sep 17 00:00:00 2001 From: mariusrklein <47218379+mariusrklein@users.noreply.github.com> Date: Fri, 10 Oct 2025 18:44:03 +0200 Subject: [PATCH] changes to membertraining fields --- .../0044_membertraining_activity_and_more.py | 15 +++++++++++++++ jdav_web/members/models.py | 6 +++--- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/jdav_web/members/migrations/0044_membertraining_activity_and_more.py b/jdav_web/members/migrations/0044_membertraining_activity_and_more.py index bb9c32c..0c82f57 100644 --- a/jdav_web/members/migrations/0044_membertraining_activity_and_more.py +++ b/jdav_web/members/migrations/0044_membertraining_activity_and_more.py @@ -24,4 +24,19 @@ class Migration(migrations.Migration): name='title', field=models.CharField(max_length=150, verbose_name='Title'), ), + migrations.AlterField( + model_name='membertraining', + name='member', + field=models.ForeignKey(on_delete=models.deletion.CASCADE, related_name='traininigs', to='members.member', verbose_name='Member'), + ), + migrations.AlterField( + model_name='membertraining', + name='participated', + field=models.BooleanField(null=True, verbose_name='Participated'), + ), + migrations.AlterField( + model_name='membertraining', + name='passed', + field=models.BooleanField(null=True, verbose_name='Passed'), + ), ] diff --git a/jdav_web/members/models.py b/jdav_web/members/models.py index 3e624b9..a03ad10 100644 --- a/jdav_web/members/models.py +++ b/jdav_web/members/models.py @@ -2093,14 +2093,14 @@ class TrainingCategory(models.Model): class MemberTraining(CommonModel): """Represents a training planned or attended by a member.""" - member = models.ForeignKey(Member, on_delete=models.CASCADE, related_name='traininigs') + member = models.ForeignKey(Member, on_delete=models.CASCADE, related_name='traininigs', verbose_name=_('Member')) title = models.CharField(verbose_name=_('Title'), max_length=150) date = models.DateField(verbose_name=_('Date'), null=True, blank=True) category = models.ForeignKey(TrainingCategory, on_delete=models.PROTECT, verbose_name=_('Category')) activity = models.ManyToManyField(ActivityCategory, verbose_name=_('Activity')) comments = models.TextField(verbose_name=_('Comments'), blank=True) - participated = models.BooleanField(verbose_name=_('Participated')) - passed = models.BooleanField(verbose_name=_('Passed')) + participated = models.BooleanField(verbose_name=_('Participated'), null=True) + passed = models.BooleanField(verbose_name=_('Passed'), null=True) certificate = RestrictedFileField(verbose_name=_('certificate of attendance'), upload_to='training_forms', blank=True,