From 49c729d194a3a7ece7b7ee3cebce87e3589ba276 Mon Sep 17 00:00:00 2001 From: Chantal Trutmann Date: Mon, 22 Apr 2024 14:55:37 +0200 Subject: [PATCH 1/3] Disable button if enrolment is not possible. --- src/onegov/feriennet/templates/macros.pt | 9 ++++++--- src/onegov/feriennet/theme/styles/feriennet.scss | 7 +++++++ 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/src/onegov/feriennet/templates/macros.pt b/src/onegov/feriennet/templates/macros.pt index cf4556953f..dc163a5f3e 100644 --- a/src/onegov/feriennet/templates/macros.pt +++ b/src/onegov/feriennet/templates/macros.pt @@ -585,14 +585,17 @@ -
- +
+ Enroll your child now. + + Enrolling not possible. + Enroll - Enroll + Enroll
diff --git a/src/onegov/feriennet/theme/styles/feriennet.scss b/src/onegov/feriennet/theme/styles/feriennet.scss index 71593b50e0..10bdfaa629 100644 --- a/src/onegov/feriennet/theme/styles/feriennet.scss +++ b/src/onegov/feriennet/theme/styles/feriennet.scss @@ -783,6 +783,13 @@ ul.tags { margin: 0; width: 25%; + &.disabled { + background-color: $aluminum; + border-color: $aluminum; + color: $white; + cursor: default !important; + } + @media #{$medium-only} { width: 30%; } From 32cef249e70b3da03ad5a595c561c3fc4722dfb8 Mon Sep 17 00:00:00 2001 From: Chantal Trutmann Date: Mon, 22 Apr 2024 15:13:25 +0200 Subject: [PATCH 2/3] Translations --- .../feriennet/locale/de_CH/LC_MESSAGES/onegov.feriennet.po | 5 ++++- .../feriennet/locale/fr_CH/LC_MESSAGES/onegov.feriennet.po | 5 ++++- .../feriennet/locale/it_CH/LC_MESSAGES/onegov.feriennet.po | 5 ++++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/src/onegov/feriennet/locale/de_CH/LC_MESSAGES/onegov.feriennet.po b/src/onegov/feriennet/locale/de_CH/LC_MESSAGES/onegov.feriennet.po index 16cdc10e77..b46d583e67 100644 --- a/src/onegov/feriennet/locale/de_CH/LC_MESSAGES/onegov.feriennet.po +++ b/src/onegov/feriennet/locale/de_CH/LC_MESSAGES/onegov.feriennet.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE 1.0\n" -"POT-Creation-Date: 2023-06-12 14:30+0200\n" +"POT-Creation-Date: 2024-04-22 14:55+0200\n" "PO-Revision-Date: 2021-11-11 09:08+0100\n" "Last-Translator: Marc Sommerhalder \n" "Language-Team: German\n" @@ -2087,6 +2087,9 @@ msgstr "Löschen" msgid "Enroll your child now." msgstr "Jetzt anmelden." +msgid "Enrolling not possible." +msgstr "Anmeldungen nicht möglich." + msgid "Enroll" msgstr "Anmelden" diff --git a/src/onegov/feriennet/locale/fr_CH/LC_MESSAGES/onegov.feriennet.po b/src/onegov/feriennet/locale/fr_CH/LC_MESSAGES/onegov.feriennet.po index f7d0429225..f5818e344e 100644 --- a/src/onegov/feriennet/locale/fr_CH/LC_MESSAGES/onegov.feriennet.po +++ b/src/onegov/feriennet/locale/fr_CH/LC_MESSAGES/onegov.feriennet.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE 1.0\n" -"POT-Creation-Date: 2023-06-12 14:30+0200\n" +"POT-Creation-Date: 2024-04-22 14:55+0200\n" "PO-Revision-Date: 2021-11-11 09:07+0100\n" "Last-Translator: Marc Sommerhalder \n" "Language-Team: French\n" @@ -2097,6 +2097,9 @@ msgstr "Supprimer" msgid "Enroll your child now." msgstr "Inscrivez votre enfant maintenant." +msgid "Enrolling not possible." +msgstr "Inscription impossible." + msgid "Enroll" msgstr "Inscrire" diff --git a/src/onegov/feriennet/locale/it_CH/LC_MESSAGES/onegov.feriennet.po b/src/onegov/feriennet/locale/it_CH/LC_MESSAGES/onegov.feriennet.po index f009205a0e..848f389307 100644 --- a/src/onegov/feriennet/locale/it_CH/LC_MESSAGES/onegov.feriennet.po +++ b/src/onegov/feriennet/locale/it_CH/LC_MESSAGES/onegov.feriennet.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2023-06-12 14:30+0200\n" +"POT-Creation-Date: 2024-04-22 14:55+0200\n" "PO-Revision-Date: 2021-11-11 09:07+0100\n" "Last-Translator: Marc Sommerhalder \n" "Language-Team: \n" @@ -2081,6 +2081,9 @@ msgstr "Cancellare" msgid "Enroll your child now." msgstr "Iscriva ora suo figlio/a." +msgid "Enrolling not possible." +msgstr "Iscrizione non possibile." + msgid "Enroll" msgstr "Iscrizione" From ad4cc13e29dc0c2f4804d6a6588ecf88b0849186 Mon Sep 17 00:00:00 2001 From: Chantal Trutmann Date: Mon, 27 May 2024 08:56:23 +0200 Subject: [PATCH 3/3] Fix test --- tests/onegov/feriennet/test_views.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/onegov/feriennet/test_views.py b/tests/onegov/feriennet/test_views.py index 8bd121538a..ea8bdd34cc 100644 --- a/tests/onegov/feriennet/test_views.py +++ b/tests/onegov/feriennet/test_views.py @@ -1557,26 +1557,26 @@ def test_deadline(client, scenario): assert period.is_prebooking_in_past is False page = client.get('/activity/foo') assert 'Anmelden' in page.pyquery('.call-to-action a')[0].text + assert 'Jetzt anmelden' in page with freeze_time(prebook_midnight - timedelta(minutes=30)): assert not period.wishlist_phase assert period.is_prebooking_in_past is False page = client.get('/activity/foo') - assert not page.pyquery('.call-to-action') + # assert not page.pyquery('.call-to-action') + assert 'Jetzt anmelden' not in page with freeze_time(scenario.latest_period.booking_end + timedelta(days=1)): - # show no 'enroll' for ordinary users past the deadline - # (there is one login link, for the ordinary login) - assert str(client.get('/activity/foo')).count("Anmelden") == 1 + # normal users can't enroll anymore + assert 'Anmeldungen nicht möglich' in page - # do show it for admins though and allow signups + # admins still can admin = client.spawn() admin.login_admin() # the ordinary login link vanishes assert str(admin.get('/activity/foo')).count("Abmelden") == 1 - assert str(admin.get('/activity/foo')).count("Anmelden") == 1 page = admin.get('/activity/foo').click("Anmelden") assert "Der Anmeldeschluss wurde erreicht" not in page.form.submit()