From e7acbce08ca4906862fbc52f8a9c9ddf145f5c81 Mon Sep 17 00:00:00 2001 From: Alexander Malzkuhn Date: Sat, 31 May 2025 16:42:21 +0200 Subject: [PATCH] =?UTF-8?q?Ausblenden=20des=20R=C3=BCckg=C3=A4ngig=20Knopf?= =?UTF-8?q?es=20f=C3=BCr=20Adminbereich=20Feiertage=20auch=20bei=20Speiche?= =?UTF-8?q?rn?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/admin.py | 55 +++++++++++++++++++++++++++------------------------- 1 file changed, 29 insertions(+), 26 deletions(-) diff --git a/lib/admin.py b/lib/admin.py index 3396e10..9963585 100644 --- a/lib/admin.py +++ b/lib/admin.py @@ -739,30 +739,6 @@ Dies kann nicht rückgängig gemacht werden!''') with ui.card(): ui.markdown("**Administrationsbenutzer:**") with ui.grid(columns=2): - def save_admin_settings(): - write_adminsetting("admin_user", admin_user.value) - if admin_password.value != "": - write_adminsetting("admin_password", hash_password(admin_password.value)) - else: - write_adminsetting("admin_password", data["admin_password"]) - write_adminsetting("port", port.value) - write_adminsetting("secret", secret) - write_adminsetting("touchscreen", touchscreen_switch.value) - write_adminsetting("times_on_touchscreen", timestamp_switch.value) - write_adminsetting("photos_on_touchscreen", photo_switch.value) - write_adminsetting("picture_height", picture_height_input.value) - write_adminsetting("button_height", button_height_input.value) - write_adminsetting("user_notes", notes_switch.value) - write_adminsetting("holidays", data["holidays"]) - write_adminsetting("vacation_application", va_switch.value) - - if int(old_port) != int(port.value): - with ui.dialog() as dialog, ui.card(): - ui.markdown("Damit die Porteinstellungen wirksam werden, muss der Server neu gestartet werden.") - ui.button("OK", on_click=lambda: dialog.close()) - dialog.open() - ui.notify("Einstellungen gespeichert") - timetable.refresh() ui.markdown("Benutzername des Adminstrators") admin_user = ui.input().tooltip("Geben Sie hier den Benutzernamen für den Adminstationsnutzer ein") @@ -826,12 +802,12 @@ Dies kann nicht rückgängig gemacht werden!''') ui.markdown("**Einstellungen für Benutzerfrontend**") notes_switch = ui.switch("Notizfunktion aktiviert", value=data["user_notes"]) va_switch = ui.switch("Urlaubsanträge", value=data["vacation_application"]) - + reset_visibility = ValueBinder() def holiday_section(): with ui.card(): ui.markdown('**Feiertage:**') - reset_visibility = ValueBinder() + reset_visibility.value = False def new_holiday_entry(): @@ -1031,6 +1007,33 @@ Dies kann nicht rückgängig gemacht werden!''') holiday_section() + def save_admin_settings(): + write_adminsetting("admin_user", admin_user.value) + if admin_password.value != "": + write_adminsetting("admin_password", hash_password(admin_password.value)) + else: + write_adminsetting("admin_password", data["admin_password"]) + write_adminsetting("port", port.value) + write_adminsetting("secret", secret) + write_adminsetting("touchscreen", touchscreen_switch.value) + write_adminsetting("times_on_touchscreen", timestamp_switch.value) + write_adminsetting("photos_on_touchscreen", photo_switch.value) + write_adminsetting("picture_height", picture_height_input.value) + write_adminsetting("button_height", button_height_input.value) + write_adminsetting("user_notes", notes_switch.value) + write_adminsetting("holidays", data["holidays"]) + write_adminsetting("vacation_application", va_switch.value) + + if int(old_port) != int(port.value): + with ui.dialog() as dialog, ui.card(): + ui.markdown( + "Damit die Porteinstellungen wirksam werden, muss der Server neu gestartet werden.") + ui.button("OK", on_click=lambda: dialog.close()) + dialog.open() + ui.notify("Einstellungen gespeichert") + reset_visibility.value = False + timetable.refresh() + ui.button("Speichern", on_click=save_admin_settings).tooltip("Hiermit werden sämtliche oben gemachten Einstellungen gespeichert.") with ui.tab_panel(users):