digitales
/
kompass
4
1
Fork 1
Code Issues 45 Pull Requests 2 Packages Projects Releases Wiki Activity

members: provide contact info in waitinglist invitation

Browse Source
pull/73/head
Christian Merten 1 year ago
parent 5205caa6a6
commit 7ef55738a5
Signed by: christian.merten
GPG Key ID: D953D69721B948B3
7 changed files with 161 additions and 86 deletions
Show Stats Download Patch File Download Diff File

11
jdav_web/jdav_web/settings/components/texts.py
Unescape Escape View File

@ -22,12 +22,19 @@ der Registrierung kommst du hier:
Viele Grüße Viele Grüße
Dein KOMPASS""" Dein KOMPASS"""
GROUP_TIME_AVAILABLE_TEXT = """Die Gruppenstunde findet jeden {weekday} von {start_time} bis {end_time} Uhr statt."""
GROUP_TIME_UNAVAILABLE_TEXT = """Bitte erfrage die Gruppenzeiten bei der Gruppenleitung ({contact_email})."""
INVITE_TEXT = """Hallo {name}, INVITE_TEXT = """Hallo {name},
wir haben gute Neuigkeiten für dich. Es ist ein Platz in der Jugendgruppe {group_name} {group_link}freigeworden. wir haben gute Neuigkeiten für dich. Es ist ein Platz in der Jugendgruppe {group_name} {group_link}freigeworden.
Wir treffen uns jeden {weekday} von {start_time} bis {end_time} Uhr. {group_time}
Bitte kontaktiere die Gruppenleitung ({contact_email}) für alle weiteren Absprachen.
Wir brauchen jetzt noch ein paar Informationen von dir und deine Anmeldebestätigung. Die lädst du herunter Wenn du nach der Schnupperstunde beschließt der Gruppe beizutreten, benötigen wir noch ein paar
Informationen und deine Anmeldebestätigung von dir. Die lädst du herunter
(siehe %(REGISTRATION_FORM_DOWNLOAD_LINK)s), lässt sie von deinen Eltern ausfüllen, unterschreiben (siehe %(REGISTRATION_FORM_DOWNLOAD_LINK)s), lässt sie von deinen Eltern ausfüllen, unterschreiben
und lädst ein Foto davon in unserem Anmeldeformular hoch. Das kannst du alles über folgenden Link erledigen: und lädst ein Foto davon in unserem Anmeldeformular hoch. Das kannst du alles über folgenden Link erledigen:

8
jdav_web/mailer/mailutils.py
Unescape Escape View File

@ -7,10 +7,14 @@ import os
NOT_SENT, SENT, PARTLY_SENT = 0, 1, 2 NOT_SENT, SENT, PARTLY_SENT = 0, 1, 2
def send(subject, content, sender, recipients, message_id=None, reply_to=None, def send(subject, content, sender, recipients, message_id=None, reply_to=None,
attachments=None): attachments=None, cc=None):
failed, succeeded = False, False failed, succeeded = False, False
if type(recipients) != list: if type(recipients) != list:
recipients = [recipients] recipients = [recipients]
if not cc:
cc = []
elif type(cc) != list:
cc = [cc]
if reply_to is not None: if reply_to is not None:
kwargs = {"reply_to": reply_to} kwargs = {"reply_to": reply_to}
else: else:
@ -23,7 +27,7 @@ def send(subject, content, sender, recipients, message_id=None, reply_to=None,
# construct mails # construct mails
mails = [] mails = []
for recipient in set(recipients): for recipient in set(recipients):
email = EmailMessage(subject, content, sender, [recipient], email = EmailMessage(subject, content, sender, [recipient], cc=cc,
headers=headers, **kwargs) headers=headers, **kwargs)
if attachments is not None: if attachments is not None:
for attach in attachments: for attach in attachments:

13
jdav_web/members/admin.py
Unescape Escape View File

@ -170,6 +170,7 @@ class MemberAdmin(CommonAdminMixin, admin.ModelAdmin):
('email', 'alternative_email'), ('email', 'alternative_email'),
'phone_number', 'phone_number',
'birth_date', 'birth_date',
'gender',
'group', 'registration_form', 'image', 'group', 'registration_form', 'image',
('join_date', 'leave_date'), ('join_date', 'leave_date'),
'comments', 'comments',
@ -382,6 +383,7 @@ class MemberUnconfirmedAdmin(admin.ModelAdmin):
('email', 'alternative_email'), ('email', 'alternative_email'),
'phone_number', 'phone_number',
'birth_date', 'birth_date',
'gender',
'group', 'registration_form', 'image', 'group', 'registration_form', 'image',
('join_date', 'leave_date'), ('join_date', 'leave_date'),
'comments', 'comments',
@ -539,6 +541,10 @@ class MemberWaitingListAdmin(CommonAdminMixin, admin.ModelAdmin):
messages.error(request, messages.error(request,
_("An error occurred while trying to invite said members. Please try again.")) _("An error occurred while trying to invite said members. Please try again."))
return HttpResponseRedirect(request.get_full_path()) return HttpResponseRedirect(request.get_full_path())
if not group.contact_email:
messages.error(request,
_('The selected group does not have a contact email. Please first set a contact email and then try again.'))
return HttpResponseRedirect(request.get_full_path())
for waiter in queryset: for waiter in queryset:
waiter.invited_for_group = group waiter.invited_for_group = group
@ -596,6 +602,11 @@ class MemberWaitingListAdmin(CommonAdminMixin, admin.ModelAdmin):
_("An error occurred while trying to invite said members. Please try again.")) _("An error occurred while trying to invite said members. Please try again."))
return HttpResponseRedirect(request.get_full_path()) return HttpResponseRedirect(request.get_full_path())
if not group.contact_email:
messages.error(request,
_('The selected group does not have a contact email. Please first set a contact email and then try again.'))
return HttpResponseRedirect(request.get_full_path())
waiter.invited_for_group = group waiter.invited_for_group = group
waiter.save() waiter.save()
waiter.invite_to_group(group) waiter.invite_to_group(group)
@ -634,7 +645,7 @@ class GroupAdminForm(forms.ModelForm):
class GroupAdmin(CommonAdminMixin, admin.ModelAdmin): class GroupAdmin(CommonAdminMixin, admin.ModelAdmin):
fields = ['name', 'description', 'year_from', 'year_to', 'leiters', 'show_website', fields = ['name', 'description', 'year_from', 'year_to', 'leiters', 'contact_email', 'show_website',
'weekday', ('start_time', 'end_time')] 'weekday', ('start_time', 'end_time')]
form = GroupAdminForm form = GroupAdminForm
list_display = ('name', 'year_from', 'year_to') list_display = ('name', 'year_from', 'year_to')

138
jdav_web/members/locale/de/LC_MESSAGES/django.po
Unescape Escape View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-11-24 22:24+0100\n" "POT-Creation-Date: 2024-11-27 23:16+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -34,174 +34,174 @@ msgstr "Nein"
msgid "All" msgid "All"
msgstr "Alle" msgstr "Alle"
#: members/admin.py:183 members/admin.py:395 #: members/admin.py:184 members/admin.py:397
msgid "Contact information" msgid "Contact information"
msgstr "Kontaktinformationen" msgstr "Kontaktinformationen"
#: members/admin.py:188 members/admin.py:400 #: members/admin.py:189 members/admin.py:402
msgid "Skills" msgid "Skills"
msgstr "Fähigkeiten" msgstr "Fähigkeiten"
#: members/admin.py:193 members/admin.py:405 #: members/admin.py:194 members/admin.py:407
msgid "Others" msgid "Others"
msgstr "Sonstiges" msgstr "Sonstiges"
#: members/admin.py:199 members/admin.py:410 #: members/admin.py:200 members/admin.py:412
msgid "Organizational" msgid "Organizational"
msgstr "Organisatorisches" msgstr "Organisatorisches"
#: members/admin.py:280 #: members/admin.py:281
msgid "Compose new mail to selected members" msgid "Compose new mail to selected members"
msgstr "Neue Nachricht an ausgewählte Teilnehmer verfassen" msgstr "Neue Nachricht an ausgewählte Teilnehmer verfassen"
#: members/admin.py:286 #: members/admin.py:287
msgid "Echo required" msgid "Echo required"
msgstr "Rückmeldung erforderlich" msgstr "Rückmeldung erforderlich"
#: members/admin.py:288 #: members/admin.py:289
msgid "Successfully requested echo from selected members." msgid "Successfully requested echo from selected members."
msgstr "" msgstr ""
"Rückmeldungsaufforderung erfolgreich an ausgewählte Teilnehmer verschickt." "Rückmeldungsaufforderung erfolgreich an ausgewählte Teilnehmer verschickt."
#: members/admin.py:289 #: members/admin.py:290
msgid "Request echo from selected members" msgid "Request echo from selected members"
msgstr "Rückmeldungsaufforderung an ausgewählte Teilnehmer verschicken" msgstr "Rückmeldungsaufforderung an ausgewählte Teilnehmer verschicken"
#: members/admin.py:295 #: members/admin.py:296
#, python-format #, python-format
msgid "Successfully invited %(name)s as user." msgid "Successfully invited %(name)s as user."
msgstr "Erfolgreich %(name)s aufgefordert Zugangsdaten zu wählen." msgstr "Erfolgreich %(name)s aufgefordert Zugangsdaten zu wählen."
#: members/admin.py:297 #: members/admin.py:298
msgid "Successfully invited selected members to join as users." msgid "Successfully invited selected members to join as users."
msgstr "" msgstr ""
"Erfolgreich ausgewählte Teilnehmer:innen aufgefordert Zugangsdaten zu wählen." "Erfolgreich ausgewählte Teilnehmer:innen aufgefordert Zugangsdaten zu wählen."
#: members/admin.py:304 members/admin.py:321 #: members/admin.py:305 members/admin.py:322
msgid "Permission denied." msgid "Permission denied."
msgstr "Fehlende Berechtigungen." msgstr "Fehlende Berechtigungen."
#: members/admin.py:311 members/admin.py:340 #: members/admin.py:312 members/admin.py:341
#: members/templates/admin/invite_as_user.html:21 #: members/templates/admin/invite_as_user.html:21
msgid "Invite as user" msgid "Invite as user"
msgstr "Kompass Zugangsdaten wählen lassen" msgstr "Kompass Zugangsdaten wählen lassen"
#: members/admin.py:316 #: members/admin.py:317
msgid "Invite selected members to join Kompass as users." msgid "Invite selected members to join Kompass as users."
msgstr "Ausgewählte Teilnehmer:innen Kompass Zugangsdaten wählen lassen." msgstr "Ausgewählte Teilnehmer:innen Kompass Zugangsdaten wählen lassen."
#: members/admin.py:327 #: members/admin.py:328
msgid "Member not found." msgid "Member not found."
msgstr "Teilnehmer:in nicht gefunden." msgstr "Teilnehmer:in nicht gefunden."
#: members/admin.py:331 #: members/admin.py:332
#, python-format #, python-format
msgid "%(name)s already has login data." msgid "%(name)s already has login data."
msgstr "%(name)s hat schon Zugangsdaten." msgstr "%(name)s hat schon Zugangsdaten."
#: members/admin.py:345 #: members/admin.py:346
#, python-format #, python-format
msgid "%(name)s already has a pending invitation as user." msgid "%(name)s already has a pending invitation as user."
msgstr "" msgstr ""
"%(name)s hat bereits eine ausstehende Aufforderung Zugangsdaten zu wählen." "%(name)s hat bereits eine ausstehende Aufforderung Zugangsdaten zu wählen."
#: members/admin.py:363 #: members/admin.py:364
msgid "activity" msgid "activity"
msgstr "Aktivität" msgstr "Aktivität"
#: members/admin.py:373 members/models.py:53 members/models.py:1390 #: members/admin.py:374 members/models.py:53 members/models.py:1390
msgid "Name" msgid "Name"
msgstr "Name" msgstr "Name"
#: members/admin.py:444 #: members/admin.py:446
msgid "Successfully requested mail confirmation from selected registrations." msgid "Successfully requested mail confirmation from selected registrations."
msgstr "Aufforderung zur Bestätigung der Email Adresse versendet." msgstr "Aufforderung zur Bestätigung der Email Adresse versendet."
#: members/admin.py:445 #: members/admin.py:447
msgid "Request mail confirmation from selected registrations" msgid "Request mail confirmation from selected registrations"
msgstr "Aufforderung zur Bestätigung der Email Adresse versenden" msgstr "Aufforderung zur Bestätigung der Email Adresse versenden"
#: members/admin.py:452 members/admin.py:486 #: members/admin.py:454 members/admin.py:488
#, python-format #, python-format
msgid "Successfully confirmed %(name)s." msgid "Successfully confirmed %(name)s."
msgstr "Registrierung von %(name)s erfolgreich bestätigt." msgstr "Registrierung von %(name)s erfolgreich bestätigt."
#: members/admin.py:456 members/admin.py:489 #: members/admin.py:458 members/admin.py:491
#, python-format #, python-format
msgid "Can't confirm. %(name)s has unconfirmed email addresses." msgid "Can't confirm. %(name)s has unconfirmed email addresses."
msgstr "Bestätigung nicht möglich. %(name)s hat unbestätigte Emailadressen." msgstr "Bestätigung nicht möglich. %(name)s hat unbestätigte Emailadressen."
#: members/admin.py:461 #: members/admin.py:463
msgid "Successfully confirmed multiple registrations." msgid "Successfully confirmed multiple registrations."
msgstr "Erfolgreich mehrere Registrierungen bestätigt." msgstr "Erfolgreich mehrere Registrierungen bestätigt."
#: members/admin.py:463 #: members/admin.py:465
msgid "" msgid ""
"Failed to confirm some registrations because of unconfirmed email addresses." "Failed to confirm some registrations because of unconfirmed email addresses."
msgstr "" msgstr ""
"Einige Bestätigungen fehlgeschlagen, weil Emailadressen noch nicht bestätigt " "Einige Bestätigungen fehlgeschlagen, weil Emailadressen noch nicht bestätigt "
"sind." "sind."
#: members/admin.py:464 #: members/admin.py:466
msgid "Confirm selected registrations" msgid "Confirm selected registrations"
msgstr "Ausgewählte Registrierungen bestätigen" msgstr "Ausgewählte Registrierungen bestätigen"
#: members/admin.py:480 #: members/admin.py:482
#, python-format #, python-format
msgid "Successfully demoted %(name)s to waiter." msgid "Successfully demoted %(name)s to waiter."
msgstr "%(name)s zurück auf die Warteliste gesetzt." msgstr "%(name)s zurück auf die Warteliste gesetzt."
#: members/admin.py:481 #: members/admin.py:483
msgid "Demote selected registrations to waiters." msgid "Demote selected registrations to waiters."
msgstr "Ausgewählte Registrierungen zurück auf die Warteliste setzen." msgstr "Ausgewählte Registrierungen zurück auf die Warteliste setzen."
#: members/admin.py:496 members/models.py:380 members/models.py:729 #: members/admin.py:498 members/models.py:380 members/models.py:729
#: members/models.py:1135 #: members/models.py:1135
msgid "Group" msgid "Group"
msgstr "Gruppe" msgstr "Gruppe"
#: members/admin.py:530 #: members/admin.py:532
#, python-format #, python-format
msgid "Successfully asked %(name)s to confirm their waiting status." msgid "Successfully asked %(name)s to confirm their waiting status."
msgstr "Erfolgreich %(name)s aufgefordert den Wartelistenplatz zu bestätigen." msgstr "Erfolgreich %(name)s aufgefordert den Wartelistenplatz zu bestätigen."
#: members/admin.py:531 #: members/admin.py:533
msgid "Ask selected waiters to confirm their waiting status" msgid "Ask selected waiters to confirm their waiting status"
msgstr "Wartende auffordern den Wartelistenplatz zu bestätigen" msgstr "Wartende auffordern den Wartelistenplatz zu bestätigen"
#: members/admin.py:540 members/admin.py:596 #: members/admin.py:542 members/admin.py:598
msgid "" msgid ""
"An error occurred while trying to invite said members. Please try again." "An error occurred while trying to invite said members. Please try again."
msgstr "" msgstr ""
"Beim Einladen dieser Personen ist ein Fehler aufgetreten. Bitte versuche es " "Beim Einladen dieser Personen ist ein Fehler aufgetreten. Bitte versuche es "
"nochmal. " "nochmal. "
#: members/admin.py:548 members/admin.py:603 #: members/admin.py:550 members/admin.py:605
#, python-format #, python-format
msgid "Successfully invited %(name)s to %(group)s." msgid "Successfully invited %(name)s to %(group)s."
msgstr "Erfolgreich %(name)s zu Gruppe %(group)s eingeladen." msgstr "Erfolgreich %(name)s zu Gruppe %(group)s eingeladen."
#: members/admin.py:552 members/admin.py:609 #: members/admin.py:554 members/admin.py:611
msgid "Select group for invitation" msgid "Select group for invitation"
msgstr "Wähle Gruppe für Einladung aus" msgstr "Wähle Gruppe für Einladung aus"
#: members/admin.py:559 #: members/admin.py:561
msgid "Offer waiter a place in a group." msgid "Offer waiter a place in a group."
msgstr "Personen auf der Warteliste einen Gruppenplatz anbieten." msgstr "Personen auf der Warteliste einen Gruppenplatz anbieten."
#: members/admin.py:652 #: members/admin.py:654
msgid "Difficulty" msgid "Difficulty"
msgstr "Schwierigkeit" msgstr "Schwierigkeit"
#: members/admin.py:655 #: members/admin.py:657
msgid "Tour type" msgid "Tour type"
msgstr "Art der Tour" msgstr "Art der Tour"
#: members/admin.py:658 members/models.py:945 #: members/admin.py:660 members/models.py:945
msgid "Means of transportation" msgid "Means of transportation"
msgstr "Verkehrsmittel" msgstr "Verkehrsmittel"
#: members/admin.py:684 #: members/admin.py:686
msgid "" msgid ""
"Please list here all expenses in relation with this excursion and upload " "Please list here all expenses in relation with this excursion and upload "
"relevant bills. These have to be permanently stored for the application of " "relevant bills. These have to be permanently stored for the application of "
@ -214,7 +214,7 @@ msgstr ""
"einzelnen Posten wird dabei auf der LJP-Kostenübersicht angezeigt (sinnvoll " "einzelnen Posten wird dabei auf der LJP-Kostenübersicht angezeigt (sinnvoll "
"wären z.B. Anreise, Verpflegung, Material etc.)." "wären z.B. Anreise, Verpflegung, Material etc.)."
#: members/admin.py:702 #: members/admin.py:704
msgid "" msgid ""
"Here you can work on a seminar report for applying for financial " "Here you can work on a seminar report for applying for financial "
"contributions from Landesjugendplan (LJP). More information on creating a " "contributions from Landesjugendplan (LJP). More information on creating a "
@ -227,7 +227,7 @@ msgstr ""
"wahlweise nur TN-Liste und Kostenübersicht kannst du anschließend " "wahlweise nur TN-Liste und Kostenübersicht kannst du anschließend "
"herunterladen." "herunterladen."
#: members/admin.py:710 #: members/admin.py:712
msgid "" msgid ""
"Please list all participants (also youth leaders) of this excursion. Here " "Please list all participants (also youth leaders) of this excursion. Here "
"you can still make changes just before departure and hence generate the " "you can still make changes just before departure and hence generate the "
@ -238,30 +238,30 @@ msgstr ""
"jederzeit die aktuelle Teilnehmer:innenliste für die Krisenintervention " "jederzeit die aktuelle Teilnehmer:innenliste für die Krisenintervention "
"generieren." "generieren."
#: members/admin.py:756 #: members/admin.py:758
#, python-format #, python-format
msgid "You are not allowed to view all members on note list %(name)s." msgid "You are not allowed to view all members on note list %(name)s."
msgstr "" msgstr ""
"Du hast nicht die nötigen Rechte um alle Teilnehmer:innen der Notizliste " "Du hast nicht die nötigen Rechte um alle Teilnehmer:innen der Notizliste "
"%(name)s anzusehen." "%(name)s anzusehen."
#: members/admin.py:766 #: members/admin.py:768
msgid "Generate PDF summary" msgid "Generate PDF summary"
msgstr "Übersicht erstellen" msgstr "Übersicht erstellen"
#: members/admin.py:770 #: members/admin.py:772
msgid "Full report" msgid "Full report"
msgstr "Vollständiger Seminarbericht" msgstr "Vollständiger Seminarbericht"
#: members/admin.py:771 #: members/admin.py:773
msgid "Costs and participants only" msgid "Costs and participants only"
msgstr "Nur Kosten und Teilnehmende" msgstr "Nur Kosten und Teilnehmende"
#: members/admin.py:772 #: members/admin.py:774
msgid "Mode" msgid "Mode"
msgstr "Modus" msgstr "Modus"
#: members/admin.py:786 #: members/admin.py:788
msgid "" msgid ""
"General information on your excursion. These are partly relevant for the " "General information on your excursion. These are partly relevant for the "
"amount of financial compensation (means of transport, travel distance, etc.)." "amount of financial compensation (means of transport, travel distance, etc.)."
@ -270,38 +270,38 @@ msgstr ""
"teilweise relevant für die Zuschüsse aus dem Jugendetat (Verkehrsmittel, " "teilweise relevant für die Zuschüsse aus dem Jugendetat (Verkehrsmittel, "
"Fahrstrecke in km)." "Fahrstrecke in km)."
#: members/admin.py:816 #: members/admin.py:818
#, python-format #, python-format
msgid "You are not allowed to view all members on excursion %(name)s." msgid "You are not allowed to view all members on excursion %(name)s."
msgstr "" msgstr ""
"Du hast nicht die nötigen Rechte um alle Teilnehmer:innen der Ausfahrt " "Du hast nicht die nötigen Rechte um alle Teilnehmer:innen der Ausfahrt "
"%(name)s anzusehen." "%(name)s anzusehen."
#: members/admin.py:824 #: members/admin.py:826
msgid "Generate crisis intervention list" msgid "Generate crisis intervention list"
msgstr "Kriseninterventionsliste erstellen" msgstr "Kriseninterventionsliste erstellen"
#: members/admin.py:832 #: members/admin.py:834
msgid "Generate overview" msgid "Generate overview"
msgstr "Hinweise für Jugendleiter erstellen" msgstr "Hinweise für Jugendleiter erstellen"
#: members/admin.py:836 members/admin.py:859 #: members/admin.py:838 members/admin.py:861
#: members/templates/admin/generate_seminar_report.html:21 #: members/templates/admin/generate_seminar_report.html:21
msgid "Generate seminar report" msgid "Generate seminar report"
msgstr "Seminarbericht erstellen" msgstr "Seminarbericht erstellen"
#: members/admin.py:849 #: members/admin.py:851
msgid "Please select a mode." msgid "Please select a mode."
msgstr "Bitte wähle einen Modus aus." msgstr "Bitte wähle einen Modus aus."
#: members/admin.py:853 #: members/admin.py:855
msgid "" msgid ""
"Full mode is only available, if the seminar report section is filled out." "Full mode is only available, if the seminar report section is filled out."
msgstr "" msgstr ""
"Der vollständiger Modus ist nur verfügbar, wenn der Seminarbericht " "Der vollständiger Modus ist nur verfügbar, wenn der Seminarbericht "
"ausgefüllt ist. " "ausgefüllt ist. "
#: members/admin.py:871 #: members/admin.py:873
msgid "Generate SJR application" msgid "Generate SJR application"
msgstr "SJR Antrag erstellen" msgstr "SJR Antrag erstellen"
@ -374,6 +374,10 @@ msgstr "Bis Jahrgang"
msgid "youth leaders" msgid "youth leaders"
msgstr "Jugendleiter" msgstr "Jugendleiter"
#: members/models.py:76
msgid "week day"
msgstr "Wochentag"
#: members/models.py:77 members/models.py:1217 #: members/models.py:77 members/models.py:1217
msgid "Starting time" msgid "Starting time"
msgstr "Zeitpunkt" msgstr "Zeitpunkt"
@ -1022,7 +1026,7 @@ msgid "Save and confirm registration"
msgstr "Speichern und Registrierung bestätigen" msgstr "Speichern und Registrierung bestätigen"
#: members/templates/members/echo.html:6 members/templates/members/echo.html:13 #: members/templates/members/echo.html:6 members/templates/members/echo.html:13
#: members/templates/members/echo_failed.html:11 #: members/templates/members/echo_failed.html:10
#: members/templates/members/echo_password.html:6 #: members/templates/members/echo_password.html:6
#: members/templates/members/echo_password.html:11 #: members/templates/members/echo_password.html:11
#: members/templates/members/echo_success.html:10 #: members/templates/members/echo_success.html:10
@ -1037,23 +1041,23 @@ msgstr ""
"Vielen Dank, dass du dich rückmeldest. Hier siehst du deine aktuellen Daten. " "Vielen Dank, dass du dich rückmeldest. Hier siehst du deine aktuellen Daten. "
"Falls sich etwas geändert hat, trage das bitte hier ein." "Falls sich etwas geändert hat, trage das bitte hier ein."
#: members/templates/members/echo_failed.html:6 #: members/templates/members/echo_failed.html:5
msgid "Echo failed" msgid "Echo failed"
msgstr "Rückmeldung fehlgeschlagen" msgstr "Rückmeldung fehlgeschlagen"
#: members/templates/members/echo_failed.html:13 #: members/templates/members/echo_failed.html:12
#: members/templates/members/invited_registration_failed.html:13 #: members/templates/members/invited_registration_failed.html:12
msgid "Something went wrong. The key you supplied is" msgid "Something went wrong. The key you supplied is"
msgstr "Etwas ist schief gegangen. Der verwendete Code ist" msgstr "Etwas ist schief gegangen. Der verwendete Code ist"
#: members/templates/members/echo_failed.html:15 #: members/templates/members/echo_failed.html:14
#: members/templates/members/invited_registration_failed.html:15 #: members/templates/members/invited_registration_failed.html:14
#: members/templates/members/register_failed.html:15 #: members/templates/members/register_failed.html:14
msgid "If you think this is a mistake, please" msgid "If you think this is a mistake, please"
msgstr "Wenn du denkst, dass das ein Fehler ist, " msgstr "Wenn du denkst, dass das ein Fehler ist, "
#: members/templates/members/echo_failed.html:15 #: members/templates/members/echo_failed.html:15
#: members/templates/members/invited_registration_failed.html:15 #: members/templates/members/invited_registration_failed.html:14
#: members/templates/members/register_failed.html:15 #: members/templates/members/register_failed.html:15
msgid "contact us." msgid "contact us."
msgstr "kontaktiere uns." msgstr "kontaktiere uns."
@ -1091,14 +1095,14 @@ msgstr ""
"Du hast zu oft ein falsches Passwort eingegeben. Bitte frage deinen " "Du hast zu oft ein falsches Passwort eingegeben. Bitte frage deinen "
"Jugendleiter nach einem korrekten Passwort." "Jugendleiter nach einem korrekten Passwort."
#: members/templates/members/invited_registration_failed.html:6 #: members/templates/members/invited_registration_failed.html:5
#: members/templates/members/register_failed.html:6 #: members/templates/members/register_failed.html:5
msgid "Registration failed" msgid "Registration failed"
msgstr "Registrierung fehlgeschlagen" msgstr "Registrierung fehlgeschlagen"
#: members/templates/members/invited_registration_failed.html:11 #: members/templates/members/invited_registration_failed.html:10
#: members/templates/members/register.html:6 #: members/templates/members/register.html:6
#: members/templates/members/register_failed.html:11 #: members/templates/members/register_failed.html:10
#: members/templates/members/register_password.html:6 #: members/templates/members/register_password.html:6
#: members/templates/members/register_success.html:6 #: members/templates/members/register_success.html:6
#: members/templates/members/register_wrong_password.html:6 #: members/templates/members/register_wrong_password.html:6
@ -1183,7 +1187,7 @@ msgstr "Registrieren"
msgid "Here you can register for group" msgid "Here you can register for group"
msgstr "Hier kannst du dich registrieren für die Gruppe" msgstr "Hier kannst du dich registrieren für die Gruppe"
#: members/templates/members/register_failed.html:13 #: members/templates/members/register_failed.html:12
msgid "Something went wrong while processing your registration." msgid "Something went wrong while processing your registration."
msgstr "Etwas ist schief gelaufen, bei der Verarbeitung deiner Registrierung." msgstr "Etwas ist schief gelaufen, bei der Verarbeitung deiner Registrierung."

18
jdav_web/members/migrations/0027_alter_group_weekday.py
Unescape Escape View File

@ -0,0 +1,18 @@
# Generated by Django 4.0.1 on 2024-11-27 22:16
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('members', '0026_alter_emergencycontact_email'),
]
operations = [
migrations.AlterField(
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, verbose_name='week day'),
),
]

20
jdav_web/members/migrations/0028_group_contact_email.py
Unescape Escape View File

@ -0,0 +1,20 @@
# Generated by Django 4.0.1 on 2024-11-27 22:40
from django.db import migrations, models
import django.db.models.deletion
class Migration(migrations.Migration):
dependencies = [
('mailer', '0005_alter_emailaddress_name'),
('members', '0027_alter_group_weekday'),
]
operations = [
migrations.AddField(
model_name='group',
name='contact_email',
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='mailer.emailaddress', verbose_name='Contact email'),
),
]

39
jdav_web/members/models.py
Unescape Escape View File

@ -73,9 +73,14 @@ class Group(models.Model):
year_to = models.IntegerField(verbose_name=_('highest year'), default=2011) year_to = models.IntegerField(verbose_name=_('highest year'), default=2011)
leiters = models.ManyToManyField('members.Member', verbose_name=_('youth leaders'), leiters = models.ManyToManyField('members.Member', verbose_name=_('youth leaders'),
related_name='leited_groups', blank=True) related_name='leited_groups', blank=True)
weekday = models.IntegerField(choices=WEEKDAYS, null=True, blank=True) weekday = models.IntegerField(verbose_name=_('week day'), choices=WEEKDAYS, null=True, blank=True)
start_time = models.TimeField(verbose_name=_('Starting time'), 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) end_time = models.TimeField(verbose_name=_('Ending time'), null=True, blank=True)
contact_email = models.ForeignKey('mailer.EmailAddress',
verbose_name=_('Contact email'),
null=True,
blank=True,
on_delete=models.SET_NULL)
def __str__(self): def __str__(self):
"""String representation""" """String representation"""
@ -85,6 +90,10 @@ class Group(models.Model):
verbose_name = _('group') verbose_name = _('group')
verbose_name_plural = _('groups') verbose_name_plural = _('groups')
def has_time_info(self):
# return if the group has all relevant time slot information filled
return self.weekday and self.start_time and self.end_time
class MemberManager(models.Manager): class MemberManager(models.Manager):
def get_queryset(self): def get_queryset(self):
@ -154,9 +163,9 @@ class Contact(CommonModel):
return getattr(self, email_fd) return getattr(self, email_fd)
return None return None
def send_mail(self, subject, content): def send_mail(self, subject, content, cc=None):
send_mail(subject, content, settings.DEFAULT_SENDING_MAIL, send_mail(subject, content, settings.DEFAULT_SENDING_MAIL,
[getattr(self, email_fd) for email_fd, _, _ in self.email_fields]) [getattr(self, email_fd) for email_fd, _, _ in self.email_fields], cc=cc)
def confirm_mail_by_key(key): def confirm_mail_by_key(key):
@ -849,21 +858,23 @@ class MemberWaitingList(Person):
group_link = '({url}) '.format(url=prepend_base_url(reverse('startpage:gruppe_detail', args=[group.name]))) group_link = '({url}) '.format(url=prepend_base_url(reverse('startpage:gruppe_detail', args=[group.name])))
else: else:
group_link = '' group_link = ''
# TODO: inform the user that the group has no configured weekday, start_time or end_time if group.has_time_info():
weekday = WEEKDAYS[group.weekday][1] if group.weekday != None else WEEKDAYS[0][1] group_time = settings.GROUP_TIME_AVAILABLE_TEXT.format(weekday=WEEKDAYS[group.weekday][1],
start_time = group.start_time.strftime('%H:%M') if group.start_time != None else "14:00" start_time=group.start_time.strftime('%H:%M'),
end_time = group.end_time.strftime('%H:%M') if group.end_time != None else "16:00" end_time=group.end_time.strftime('%H:%M'))
else:
group_time = settings.GROUP_TIME_UNAVAILABLE_TEXT.format(contact_email=group.contact_email)
invitation = InvitationToGroup(group=group, waiter=self) invitation = InvitationToGroup(group=group, waiter=self)
invitation.save() invitation.save()
self.send_mail(_("Invitation to trial group meeting"), self.send_mail(_("Invitation to trial group meeting"),
settings.INVITE_TEXT.format(name=self.prename, settings.INVITE_TEXT.format(name=self.prename,
weekday=weekday, group_time=group_time,
start_time=start_time, group_name=group.name,
end_time=end_time, group_link=group_link,
group_name=group.name, contact_email=group.contact_email,
group_link=group_link, link=get_registration_link(invitation.key),
link=get_registration_link(invitation.key), invitation_reject_link=get_invitation_reject_link(invitation.key)),
invitation_reject_link=get_invitation_reject_link(invitation.key))) cc=group.contact_email.email)
def unregister(self): def unregister(self):
"""Delete the waiter and inform them about the deletion via email.""" """Delete the waiter and inform them about the deletion via email."""

Write Preview
Loading…
Cancel
Save