members/group: add weekly time
gitea/kompass/pipeline/head There was a failure building this commit Details

individual-sender-address
Christian Merten 1 year ago
parent 3a862469ee
commit 7d9a1bf9a6
Signed by: christian.merten
GPG Key ID: D953D69721B948B3

@ -535,7 +535,8 @@ class GroupAdminForm(forms.ModelForm):
class GroupAdmin(CommonAdminMixin, admin.ModelAdmin):
fields = ['name', 'description', 'year_from', 'year_to', 'leiters', 'show_website']
fields = ['name', 'description', 'year_from', 'year_to', 'leiters', 'show_website',
'weekday', ('start_time', 'end_time')]
form = GroupAdminForm
list_display = ('name', 'year_from', 'year_to')
inlines = [RegistrationPasswordInline, PermissionOnGroupInline]

@ -0,0 +1,28 @@
# Generated by Django 4.0.1 on 2024-10-20 23:23
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('members', '0017_alter_member_alternative_email'),
]
operations = [
migrations.AddField(
model_name='group',
name='end_time',
field=models.TimeField(blank=True, null=True, verbose_name='Ending time'),
),
migrations.AddField(
model_name='group',
name='start_time',
field=models.TimeField(blank=True, null=True, verbose_name='Starting time'),
),
migrations.AddField(
model_name='group',
name='weekday',
field=models.IntegerField(blank=True, choices=[(0, 'Monday'), (1, 'Tuesday'), (2, 'Wednesday'), (3, 'Thursday'), (4, 'Friday'), (5, 'Saturday'), (6, 'Sunday')], null=True),
),
]

@ -34,6 +34,16 @@ GEMEINSCHAFTS_TOUR = MUSKELKRAFT_ANREISE = MALE = 0
FUEHRUNGS_TOUR = OEFFENTLICHE_ANREISE = FEMALE = 1
AUSBILDUNGS_TOUR = FAHRGEMEINSCHAFT_ANREISE = DIVERSE = 2
WEEKDAYS = (
(0, _('Monday')),
(1, _('Tuesday')),
(2, _('Wednesday')),
(3, _('Thursday')),
(4, _('Friday')),
(5, _('Saturday')),
(6, _('Sunday')),
)
class ActivityCategory(models.Model):
"""
@ -62,6 +72,9 @@ class Group(models.Model):
year_to = models.IntegerField(verbose_name=_('highest year'), default=2011)
leiters = models.ManyToManyField('members.Member', verbose_name=_('youth leaders'),
related_name='leited_groups', blank=True)
weekday = models.IntegerField(choices=WEEKDAYS, null=True, blank=True)
start_time = models.TimeField(verbose_name=_('Starting time'), null=True, blank=True)
end_time = models.TimeField(verbose_name=_('Ending time'), null=True, blank=True)
def __str__(self):
"""String representation"""

Loading…
Cancel
Save