From 63c101ed7b2c8d97d3731102e464ee1bc1965fb9 Mon Sep 17 00:00:00 2001 From: Reena Aheer Date: Thu, 30 Mar 2023 12:22:04 +0200 Subject: [PATCH 1/5] Change notes to a text field in ATM List --- apimanager/atms/forms.py | 4 ++-- apimanager/atms/views.py | 9 +++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/apimanager/atms/forms.py b/apimanager/atms/forms.py index 9992e45..fcc6ea9 100644 --- a/apimanager/atms/forms.py +++ b/apimanager/atms/forms.py @@ -252,9 +252,9 @@ class CreateAtmForm(forms.Form): ), required=False, ) - notes = forms.ChoiceField( + notes = forms.CharField( label=_('Notes'), - widget=forms.Select( + widget=forms.TextInput( attrs={ 'class': 'form-control', } diff --git a/apimanager/atms/views.py b/apimanager/atms/views.py index 6d4e8e6..af8415b 100644 --- a/apimanager/atms/views.py +++ b/apimanager/atms/views.py @@ -38,7 +38,7 @@ class IndexAtmsView(LoginRequiredMixin, FormView): fields['is_accessible'].choices = [('',_(CHOOSE)),(True, True), (False, False)] fields['has_deposit_capability'].choices = [('',_(CHOOSE)),(True, True), (False, False)] fields['supported_languages'].choices = [('',_(CHOOSE)),("en", "en"), ("fr", "fr"), ("de", "de"), ("es", "es")] - fields['notes'].choices = [('',_(CHOOSE)),("String1", "String1"), ("String2", "String2")] + #fields['notes'].choices = [('',_(CHOOSE)),("String1", "String1"), ("String2", "String2")] fields['supported_currencies'].choices = [('',_(CHOOSE)),("EUR", "EUR"), ("MXN", "MXN"), ("USD", "USD")] # TODO: get from API fields['location_categories'].choices = [('',_(CHOOSE)),("ATBI", "ATBI"), ("ATBE", "ATBE")] fields['lobby'].initial = json.dumps({ @@ -243,9 +243,10 @@ class UpdateAtmsView(LoginRequiredMixin, FormView): fields['located_at'].initial = result['located_at'] fields['more_info'].initial = result['more_info'] fields['located_at'].initial = result['located_at'] + fields['notes'].initial = result['notes'] self._paylod_choices(result, fields) self._paylod_languages_and_currencies(result, fields) - self._paylod_notes_and_categories(result, fields) + #self._paylod_notes_and_categories(result, fields) except APIError as err: messages.error(self.request, err) except Exception as err: @@ -281,11 +282,11 @@ class UpdateAtmsView(LoginRequiredMixin, FormView): fields['supported_currencies'].initial = result['supported_currencies'] def _paylod_notes_and_categories(self, result, fields): - if result['notes'][0].lower()=='string1': + """ if result['notes'][0].lower()=='string1': fields['notes'].choices = [("String1", "String1"),("String2", "String2")] else: fields['notes'].choices = [("String2", "String2"),("String1", "String1")] - fields['notes'].initial = result['notes'] + fields['notes'].initial = result['notes'] """ if result['location_categories'][0].lower()=='atbi': fields['location_categories'].choices = [("ATBI", "ATBI"),("ATBE", "ATBE")] else: From 8aedbf4fd045bce2ece6601034eb7f26a4de5614 Mon Sep 17 00:00:00 2001 From: Reena Aheer Date: Thu, 30 Mar 2023 12:29:19 +0200 Subject: [PATCH 2/5] Change notes to a text field in ATM List --- apimanager/atms/views.py | 7 ------- 1 file changed, 7 deletions(-) diff --git a/apimanager/atms/views.py b/apimanager/atms/views.py index af8415b..d0e51c3 100644 --- a/apimanager/atms/views.py +++ b/apimanager/atms/views.py @@ -38,7 +38,6 @@ class IndexAtmsView(LoginRequiredMixin, FormView): fields['is_accessible'].choices = [('',_(CHOOSE)),(True, True), (False, False)] fields['has_deposit_capability'].choices = [('',_(CHOOSE)),(True, True), (False, False)] fields['supported_languages'].choices = [('',_(CHOOSE)),("en", "en"), ("fr", "fr"), ("de", "de"), ("es", "es")] - #fields['notes'].choices = [('',_(CHOOSE)),("String1", "String1"), ("String2", "String2")] fields['supported_currencies'].choices = [('',_(CHOOSE)),("EUR", "EUR"), ("MXN", "MXN"), ("USD", "USD")] # TODO: get from API fields['location_categories'].choices = [('',_(CHOOSE)),("ATBI", "ATBI"), ("ATBE", "ATBE")] fields['lobby'].initial = json.dumps({ @@ -246,7 +245,6 @@ class UpdateAtmsView(LoginRequiredMixin, FormView): fields['notes'].initial = result['notes'] self._paylod_choices(result, fields) self._paylod_languages_and_currencies(result, fields) - #self._paylod_notes_and_categories(result, fields) except APIError as err: messages.error(self.request, err) except Exception as err: @@ -282,11 +280,6 @@ class UpdateAtmsView(LoginRequiredMixin, FormView): fields['supported_currencies'].initial = result['supported_currencies'] def _paylod_notes_and_categories(self, result, fields): - """ if result['notes'][0].lower()=='string1': - fields['notes'].choices = [("String1", "String1"),("String2", "String2")] - else: - fields['notes'].choices = [("String2", "String2"),("String1", "String1")] - fields['notes'].initial = result['notes'] """ if result['location_categories'][0].lower()=='atbi': fields['location_categories'].choices = [("ATBI", "ATBI"),("ATBE", "ATBE")] else: From 65993f17d4c6d619c6bb6720fcb0d6e5d4a37c56 Mon Sep 17 00:00:00 2001 From: Reena Aheer Date: Thu, 30 Mar 2023 12:48:47 +0200 Subject: [PATCH 3/5] Change location_categories to a text field in ATM List --- apimanager/atms/forms.py | 4 ++-- apimanager/atms/views.py | 9 +-------- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/apimanager/atms/forms.py b/apimanager/atms/forms.py index fcc6ea9..676f91b 100644 --- a/apimanager/atms/forms.py +++ b/apimanager/atms/forms.py @@ -261,9 +261,9 @@ class CreateAtmForm(forms.Form): ), required=False, ) - location_categories = forms.ChoiceField( + location_categories = forms.CharField( label=_('Location Category'), - widget=forms.Select( + widget=forms.TextInput( attrs={ 'class': 'form-control', } diff --git a/apimanager/atms/views.py b/apimanager/atms/views.py index d0e51c3..d6c4bcd 100644 --- a/apimanager/atms/views.py +++ b/apimanager/atms/views.py @@ -39,7 +39,6 @@ class IndexAtmsView(LoginRequiredMixin, FormView): fields['has_deposit_capability'].choices = [('',_(CHOOSE)),(True, True), (False, False)] fields['supported_languages'].choices = [('',_(CHOOSE)),("en", "en"), ("fr", "fr"), ("de", "de"), ("es", "es")] fields['supported_currencies'].choices = [('',_(CHOOSE)),("EUR", "EUR"), ("MXN", "MXN"), ("USD", "USD")] # TODO: get from API - fields['location_categories'].choices = [('',_(CHOOSE)),("ATBI", "ATBI"), ("ATBE", "ATBE")] fields['lobby'].initial = json.dumps({ "monday": [ { @@ -243,6 +242,7 @@ class UpdateAtmsView(LoginRequiredMixin, FormView): fields['more_info'].initial = result['more_info'] fields['located_at'].initial = result['located_at'] fields['notes'].initial = result['notes'] + fields['location_categories'].initial = result['location_categories'] self._paylod_choices(result, fields) self._paylod_languages_and_currencies(result, fields) except APIError as err: @@ -279,13 +279,6 @@ class UpdateAtmsView(LoginRequiredMixin, FormView): fields['supported_currencies'].choices = [("USD", "USD"),("MXN", "MXN"), ("EUR", "EUR")] fields['supported_currencies'].initial = result['supported_currencies'] - def _paylod_notes_and_categories(self, result, fields): - if result['location_categories'][0].lower()=='atbi': - fields['location_categories'].choices = [("ATBI", "ATBI"),("ATBE", "ATBE")] - else: - fields['location_categories'].choices = [("ATBE", "ATBE"),("ATBI", "ATBI")] - fields['location_categories'].initial = result['location_categories'] - def form_valid(self, form): data = form.cleaned_data urlpath = '/banks/{}/atms/{}'.format(data["bank_id"],data["atm_id"]) From 3d841ed2c30c1c5b24837ec118fcb649e496f3cd Mon Sep 17 00:00:00 2001 From: Reena Aheer Date: Thu, 30 Mar 2023 15:32:33 +0200 Subject: [PATCH 4/5] Change Supported Currencies to a text field in ATM List --- apimanager/atms/forms.py | 13 ++++++++----- apimanager/atms/views.py | 30 ++++++------------------------ 2 files changed, 14 insertions(+), 29 deletions(-) diff --git a/apimanager/atms/forms.py b/apimanager/atms/forms.py index 676f91b..d04407b 100644 --- a/apimanager/atms/forms.py +++ b/apimanager/atms/forms.py @@ -214,9 +214,9 @@ class CreateAtmForm(forms.Form): ), required=False, ) - supported_languages = forms.ChoiceField( + supported_languages = forms.CharField( label=_('Supported Languages'), - widget=forms.Select( + widget=forms.TextInput( attrs={ 'class': 'form-control', } @@ -227,7 +227,7 @@ class CreateAtmForm(forms.Form): label=_('Services'), widget=forms.TextInput( attrs={ - 'placeholder': _('Service store'), + 'placeholder': _('Services'), 'class': 'form-control', } ), @@ -243,10 +243,11 @@ class CreateAtmForm(forms.Form): ), required=False, ) - supported_currencies = forms.ChoiceField( # not be a dropdown + supported_currencies = forms.CharField( # not be a dropdown label=_('Supported Currencies'), - widget=forms.Select( + widget=forms.TextInput( attrs={ + 'placeholder': _('Currency'), 'class': 'form-control', } ), @@ -256,6 +257,7 @@ class CreateAtmForm(forms.Form): label=_('Notes'), widget=forms.TextInput( attrs={ + 'placeholder': _('Notes'), 'class': 'form-control', } ), @@ -265,6 +267,7 @@ class CreateAtmForm(forms.Form): label=_('Location Category'), widget=forms.TextInput( attrs={ + 'placeholder': _('Location Category'), 'class': 'form-control', } ), diff --git a/apimanager/atms/views.py b/apimanager/atms/views.py index d6c4bcd..f247f08 100644 --- a/apimanager/atms/views.py +++ b/apimanager/atms/views.py @@ -37,8 +37,6 @@ class IndexAtmsView(LoginRequiredMixin, FormView): fields['bank_id'].choices = self.api.get_bank_id_choices() fields['is_accessible'].choices = [('',_(CHOOSE)),(True, True), (False, False)] fields['has_deposit_capability'].choices = [('',_(CHOOSE)),(True, True), (False, False)] - fields['supported_languages'].choices = [('',_(CHOOSE)),("en", "en"), ("fr", "fr"), ("de", "de"), ("es", "es")] - fields['supported_currencies'].choices = [('',_(CHOOSE)),("EUR", "EUR"), ("MXN", "MXN"), ("USD", "USD")] # TODO: get from API fields['lobby'].initial = json.dumps({ "monday": [ { @@ -101,6 +99,7 @@ class IndexAtmsView(LoginRequiredMixin, FormView): return form + # Form Valid, when create a new ATM def form_valid(self, form): try: data = form.cleaned_data @@ -237,14 +236,14 @@ class UpdateAtmsView(LoginRequiredMixin, FormView): fields['cash_withdrawal_national_fee'].initial = result['cash_withdrawal_national_fee'] fields['cash_withdrawal_international_fee'].initial = result['cash_withdrawal_international_fee'] fields['balance_inquiry_fee'].initial = result['balance_inquiry_fee'] - fields['services'].initial = result['services'] + fields['services'].placeholder = result['services'] fields['located_at'].initial = result['located_at'] fields['more_info'].initial = result['more_info'] fields['located_at'].initial = result['located_at'] - fields['notes'].initial = result['notes'] - fields['location_categories'].initial = result['location_categories'] + fields['notes'].placeholder = result['notes'] + fields['location_categories'].placeholder = result['location_categories'] + fields['supported_currencies'].placeholder = result['supported_currencies'] self._paylod_choices(result, fields) - self._paylod_languages_and_currencies(result, fields) except APIError as err: messages.error(self.request, err) except Exception as err: @@ -261,24 +260,7 @@ class UpdateAtmsView(LoginRequiredMixin, FormView): else: fields['has_deposit_capability'].choices = [(False, False), (True, True)] - def _paylod_languages_and_currencies(self, result, fields): - if result['supported_languages'][0].lower()=='en': - fields['supported_languages'].choices = [("en", "en"), ("fr", "fr"), ("de", "de"), ("es", "es")] - elif result['supported_languages'][0].lower()=='fr': - fields['supported_languages'].choices = [("fr", "fr"), ("en", "en"), ("de", "de"), ("es", "es")] - elif result['supported_languages'][0].lower()=='es': - fields['supported_languages'].choices = [("es", "es"), ("en", "en"), ("de", "de"), ("fr", "fr")] - else: - fields['supported_languages'].choices = [("de", "de"),("fr", "fr"), ("en", "en"), ("es", "es")] - fields['supported_languages'].initial = result['supported_languages'] - if result['supported_currencies'][0].lower()=='EUR': - fields['supported_currencies'].choices = [("EUR", "EUR"), ("MXN", "MXN"), ("USD", "USD")] - elif result['supported_currencies'][0].lower()=='MXN': - fields['supported_currencies'].choices = [("MXN", "MXN"), ("EUR", "EUR"), ("USD", "USD")] - else: - fields['supported_currencies'].choices = [("USD", "USD"),("MXN", "MXN"), ("EUR", "EUR")] - fields['supported_currencies'].initial = result['supported_currencies'] - + #Check form validation, when update previous ATM def form_valid(self, form): data = form.cleaned_data urlpath = '/banks/{}/atms/{}'.format(data["bank_id"],data["atm_id"]) From 79e568eb6f6e8af4b058cb776a440fd40b2b94b5 Mon Sep 17 00:00:00 2001 From: Reena Aheer Date: Thu, 30 Mar 2023 17:24:05 +0200 Subject: [PATCH 5/5] Changes in ATM update --- apimanager/atms/views.py | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/apimanager/atms/views.py b/apimanager/atms/views.py index f247f08..e85683d 100644 --- a/apimanager/atms/views.py +++ b/apimanager/atms/views.py @@ -236,13 +236,28 @@ class UpdateAtmsView(LoginRequiredMixin, FormView): fields['cash_withdrawal_national_fee'].initial = result['cash_withdrawal_national_fee'] fields['cash_withdrawal_international_fee'].initial = result['cash_withdrawal_international_fee'] fields['balance_inquiry_fee'].initial = result['balance_inquiry_fee'] - fields['services'].placeholder = result['services'] - fields['located_at'].initial = result['located_at'] + my_services = result["services"] + services_initial = ','.join(my_services) + fields['services'].initial = services_initial + fields['more_info'].initial = result['more_info'] fields['located_at'].initial = result['located_at'] - fields['notes'].placeholder = result['notes'] - fields['location_categories'].placeholder = result['location_categories'] - fields['supported_currencies'].placeholder = result['supported_currencies'] + + my_notes = result["notes"] + note_initial = ','.join(my_notes) + fields['notes'].initial = note_initial + + my_location_categories = result['location_categories'] + location_categories_initial = ','.join(my_location_categories) + fields['location_categories'].initial = location_categories_initial + + my_supported_currencies = result['supported_currencies'] + supported_currencies_initial = ','.join(my_supported_currencies) + fields['supported_currencies'].initial = supported_currencies_initial + + my_supported_languages = result['supported_languages'] + supported_languages_initial = ','.join(my_supported_languages) + fields['supported_languages'].initial = supported_languages_initial self._paylod_choices(result, fields) except APIError as err: messages.error(self.request, err)