Compare commits

..

2 Commits

1 changed files with 9 additions and 10 deletions

View File

@ -81,16 +81,15 @@ class EvaFormView(CookieWizardView):
# This implementation works only for unique keys over all of these dicts from model.py
#
def beautify_data(self, data):
# for k, v in data.items():
# # print(f"v: {v}")
# if isinstance(v,collections.Hashable):
# if v in TRANSPONDER_CHOICES.keys():
# print(f"found {v} in TRANSPONDER_CHOICES")
# data.update({k : TRANSPONDER_CHOICES[v]})
# update data with keys from *_CHOICES if present there
data.update({k:TRANSPONDER_CHOICES[v] for k,v in data.items() \
# update values in data dictionary with keys from *_CHOICES if present there
choices = {**DEPARTMENT_CHOICES, **LAPTOP_CHOICES, **TRANSPONDER_CHOICES,
**OS_CHOICES, **MOBILE_CHOICES, **LANG_CHOICES,}
data.update({k:choices[v] for k,v in data.items() \
if isinstance(v,collections.abc.Hashable) \
and v in TRANSPONDER_CHOICES})
and v in choices})
return data
# replace keys in data dictionary with verbose_name
newdata = {self.instance._meta.get_field(k).verbose_name.title() : v for k,v in data.items()}
return newdata