From 0f7f671341e6be5e05914cbf9245be238e1cf809 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20Fra=C3=9F?= Date: Tue, 30 Apr 2024 08:46:19 +0200 Subject: [PATCH] [mod] forms --- source/logic/backend.ts | 5 +- source/pages/create/logic.ts | 10 ++-- source/pages/register/logic.ts | 2 +- source/pages/view/logic.ts | 92 ++++++++++++++++++---------------- 4 files changed, 58 insertions(+), 51 deletions(-) diff --git a/source/logic/backend.ts b/source/logic/backend.ts index 1c76b31..e2fea5e 100644 --- a/source/logic/backend.ts +++ b/source/logic/backend.ts @@ -251,6 +251,9 @@ namespace _espe.backend email_redirect_to_private_address : boolean; email_allow_sending : boolean; password_set : boolean; + email_address_veiled : string; + email_address_nominal : string; + name_login : string; } > { @@ -287,7 +290,7 @@ namespace _espe.backend /** */ - export async function member_get2( + export async function member_info( id : int, key : string ) : Promise< diff --git a/source/pages/create/logic.ts b/source/pages/create/logic.ts index 18e3e39..5d65009 100644 --- a/source/pages/create/logic.ts +++ b/source/pages/create/logic.ts @@ -25,16 +25,16 @@ lib_plankton.zoo_page.register( }), new lib_plankton.zoo_input.class_input_group( [ - { - "name": "membership_number", - "input": new lib_plankton.zoo_input.class_input_text(), - "label": "Mitgliedsnummer", - }, { "name": "name_real_value", "input": new lib_plankton.zoo_input.class_input_text(), "label": "Echter Name", }, + { + "name": "membership_number", + "input": new lib_plankton.zoo_input.class_input_text(), + "label": "Mitgliedsnummer", + }, { "name": "email_address_private", "input": new lib_plankton.zoo_input.class_input_text(), diff --git a/source/pages/register/logic.ts b/source/pages/register/logic.ts index 75a204d..1ba0fe2 100644 --- a/source/pages/register/logic.ts +++ b/source/pages/register/logic.ts @@ -22,7 +22,7 @@ lib_plankton.zoo_page.register( name_login : string; email_address_veiled : string; email_address_nominal : string; - } = await _espe.backend.member_get2(id, verification); + } = await _espe.backend.member_info(id, verification); target_element.appendChild(template_request("register")); diff --git a/source/pages/view/logic.ts b/source/pages/view/logic.ts index d815ad8..def5e53 100644 --- a/source/pages/view/logic.ts +++ b/source/pages/view/logic.ts @@ -8,25 +8,29 @@ lib_plankton.zoo_page.register( membership_number : string; name_real_value : string; name_real_index : int; - email_address_private : (null | string); registered : boolean; enabled : boolean; - email_use_veiled_address : boolean; - email_use_nominal_address : boolean; + email_address_private : (null | string); + email_address_veiled : (null | string); + email_address_nominal : (null | string); email_redirect_to_private_address : boolean; email_allow_sending : boolean; + name_login : string; + password_set : boolean; }, { membership_number : string; name_real_value : string; name_real_index : int; - email_address_private : (null | string); registered : boolean; enabled : boolean; - email_use_veiled_address : boolean; - email_use_nominal_address : boolean; + email_address_private : (null | string); + email_address_veiled : (null | string); + email_address_nominal : (null | string); email_redirect_to_private_address : boolean; email_allow_sending : boolean; + name_login : string; + password_set : boolean; } >( value => value, @@ -48,11 +52,6 @@ lib_plankton.zoo_page.register( "input": new lib_plankton.zoo_input.class_input_number({"read_only": true}), "label": "Namens-Index", }, - { - "name": "email_address_private", - "input": new lib_plankton.zoo_input.class_input_text(), - "label": "Private E-Mail-Adresse", - }, { "name": "registered", "input": new lib_plankton.zoo_input.class_input_checkbox({"read_only": true}), @@ -64,14 +63,19 @@ lib_plankton.zoo_page.register( "label": "für Netz-Dienste freigeschalten", }, { - "name": "email_use_veiled_address", - "input": new lib_plankton.zoo_input.class_input_checkbox({"read_only": true}), - "label": "Pseudonymisierte E-Mail-Adresse verwenden", + "name": "email_address_private", + "input": new lib_plankton.zoo_input.class_input_text(), + "label": "Private E-Mail-Adresse", }, { - "name": "email_use_nominal_address", - "input": new lib_plankton.zoo_input.class_input_checkbox({"read_only": true}), - "label": "Namentliche E-Mail-Adresse verwenden", + "name": "email_address_veiled", + "input": new lib_plankton.zoo_input.class_input_text({"read_only": true}), + "label": "Pseudonymisierte E-Mail-Adresse", + }, + { + "name": "email_address_nominal", + "input": new lib_plankton.zoo_input.class_input_text({"read_only": true}), + "label": "Namentliche E-Mail-Adresse", }, { "name": "email_redirect_to_private_address", @@ -83,25 +87,16 @@ lib_plankton.zoo_page.register( "input": new lib_plankton.zoo_input.class_input_checkbox(), "label": "Versenden von E-Mails erlaubt", }, - /* - { - "name": "name_display", - "input": new lib_plankton.zoo_input.class_input_text({"read_only": true}), - "label": "Anzeigename", - }, - */ - /* { "name": "name_login", - "input": new lib_plankton.zoo_input.class_input_text( - { - "pattern": "^[0-9a-zA-Z_]+$", - "read_only": true, - } - ), + "input": new lib_plankton.zoo_input.class_input_text({"read_only": true}), "label": "Anmeldename", }, - */ + { + "name": "password_set", + "input": new lib_plankton.zoo_input.class_input_checkbox({"read_only": true}), + "label": "Passwort gesetzt", + }, ] ), [ @@ -158,23 +153,32 @@ lib_plankton.zoo_page.register( [ form.setup(dom_fragment.querySelector(".view-form") as HTMLElement), _espe.backend.member_get(id), - // _espe.backend.member_info(id), ] ) .then( - ([_, member_object]) => { + ([_, member_data]) => { form.input_write( { - "membership_number": member_object.membership_number, - "name_real_value": member_object.name_real_value, - "name_real_index": member_object.name_real_index, - "email_address_private": member_object.email_address_private, - "registered": member_object.registered, - "enabled": member_object.enabled, - "email_use_veiled_address": member_object.email_use_veiled_address, - "email_use_nominal_address": member_object.email_use_nominal_address, - "email_redirect_to_private_address": member_object.email_redirect_to_private_address, - "email_allow_sending": member_object.email_allow_sending, + "membership_number": member_data.membership_number, + "name_real_value": member_data.name_real_value, + "name_real_index": member_data.name_real_index, + "registered": member_data.registered, + "enabled": member_data.enabled, + "email_address_private": member_data.email_address_private, + "email_address_veiled": ( + member_data.email_use_veiled_address + ? member_data.email_address_veiled + : "(nicht verwendet)" + ), + "email_address_nominal": ( + member_data.email_use_nominal_address + ? member_data.email_address_nominal + : "(nicht verwendet)" + ), + "email_redirect_to_private_address": member_data.email_redirect_to_private_address, + "email_allow_sending": member_data.email_allow_sending, + "name_login": member_data.name_login, + "password_set": member_data.password_set, } ); }