Netz39_Vorstand/stammdaten-formular
3
0
Fork 0
Code Issues 2 Pull requests Releases Wiki Activity

Merge pull request 'revert key-options to avoid inconsistent data in entites repo' (#32) from revert-key-options into master

Browse source 
Reviewed-on: https://gitea.n39.eu/Netz39_Vorstand/stammdaten-formular/pulls/32
This commit is contained in:
MG-95 2022-10-24 21:59:14 +00:00
commit e78b31e1a8
2 changed files with 4 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
example.json
View file

@ -29,10 +29,7 @@
"bis": "", "bis": "",
"mitgliedsbeitrag": "", "mitgliedsbeitrag": "",
"spendenbeitrag": "", "spendenbeitrag": "",
"schliessberechtigung": [ "schliessberechtigung": "",
"BLE",
"SSH"
],
"scan-antrag": "" "scan-antrag": ""
} }
} }

25
membership_data_model.py
View file

@ -6,12 +6,6 @@ class membership_data_model():
'E': 'Ermäßigt', 'E': 'Ermäßigt',
'F': 'Fördermitglied' 'F': 'Fördermitglied'
} }
schliessberechtigung_values = [
'SSH',
'BLE',
'Telefon',
'Metallschluessel'
]
def __init__(self, membership_data_dict): def __init__(self, membership_data_dict):
self.membership_data_dict = membership_data_dict self.membership_data_dict = membership_data_dict
@ -19,12 +13,6 @@ class membership_data_model():
def add_edit_fields(self, parent_form): def add_edit_fields(self, parent_form):
mem = self.membership_data_dict mem = self.membership_data_dict
schliessberechtigung_value = []
if 'schliessberechtigung' in mem.keys() and set(mem['schliessberechtigung']).issubset(set(self.schliessberechtigung_values)):
for entry in mem['schliessberechtigung']:
schliessberechtigung_value.append(self.schliessberechtigung_values.index(entry))
status_value = 0 status_value = 0
if 'status' in mem.keys() and mem['status'] in self.status_values.keys(): if 'status' in mem.keys() and mem['status'] in self.status_values.keys():
status_value = list(self.status_values.keys()).index(mem['status']) status_value = list(self.status_values.keys()).index(mem['status'])
@ -39,23 +27,14 @@ class membership_data_model():
value=mem['mitgliedsbeitrag']) value=mem['mitgliedsbeitrag'])
self.forms['spendenbeitrag'] = parent_form.add(npyscreen.TitleText, begin_entry_at=20, use_two_lines=False, name="Spendenbeitrag: ", self.forms['spendenbeitrag'] = parent_form.add(npyscreen.TitleText, begin_entry_at=20, use_two_lines=False, name="Spendenbeitrag: ",
value=mem['spendenbeitrag']) value=mem['spendenbeitrag'])
self.forms['schliessberechtigung'] = parent_form.add(npyscreen.TitleMultiSelect, name="Schliessberechtigung: ", self.forms['schliessberechtigung'] = parent_form.add(npyscreen.TitleText, begin_entry_at=24, use_two_lines=False, name="Schliessberechtigung: ",
values = self.schliessberechtigung_values, value=mem['schliessberechtigung'])
value = schliessberechtigung_value,
max_height = len(self.schliessberechtigung_values) + 1,
scroll_exit = True)
self.forms['scan-antrag'] = parent_form.add(npyscreen.TitleText, begin_entry_at=18, use_two_lines=False, name="URI Scan Antrag: ", self.forms['scan-antrag'] = parent_form.add(npyscreen.TitleText, begin_entry_at=18, use_two_lines=False, name="URI Scan Antrag: ",
value=mem['scan-antrag']) value=mem['scan-antrag'])
def get_form_values_dict(self): def get_form_values_dict(self):
membership_data_model = dict(zip(self.forms.keys(), map(lambda f: f.value, self.forms.values()))) membership_data_model = dict(zip(self.forms.keys(), map(lambda f: f.value, self.forms.values())))
membership_data_model['status'] = list(self.status_values.keys())[self.forms['status'].value[0]] membership_data_model['status'] = list(self.status_values.keys())[self.forms['status'].value[0]]
if self.forms['schliessberechtigung'].get_selected_objects() is not None:
membership_data_model['schliessberechtigung'] = list(self.forms['schliessberechtigung'].get_selected_objects())
else:
membership_data_model['schliessberechtigung'] = []
return membership_data_model return membership_data_model
def has_changed(self): def has_changed(self):