Compare commits

..

No commits in common. 'f27a4039c1586a4e40c3baaa87d39b30df1a6c0e' and '519c8b6a967bba3229462c11617d896497a2889f' have entirely different histories.

@ -1406,6 +1406,7 @@ class MemberTrainingAdminForm(forms.ModelForm):
class MemberTrainingAdmin(CommonAdminMixin, nested_admin.NestedModelAdmin):
form = MemberTrainingAdminForm
list_display = ['title', 'member', 'date', 'category', 'get_activities', 'participated', 'passed', 'certificate']
search_fields = ['title']

@ -24,19 +24,4 @@ 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'),
),
]

@ -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', verbose_name=_('Member'))
member = models.ForeignKey(Member, on_delete=models.CASCADE, related_name='traininigs')
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'), null=True)
passed = models.BooleanField(verbose_name=_('Passed'), null=True)
participated = models.BooleanField(verbose_name=_('Participated'))
passed = models.BooleanField(verbose_name=_('Passed'))
certificate = RestrictedFileField(verbose_name=_('certificate of attendance'),
upload_to='training_forms',
blank=True,

Loading…
Cancel
Save