From 985923006ddad2c5d18a182ce299548b30096599 Mon Sep 17 00:00:00 2001 From: Reena Aheer Date: Mon, 3 Apr 2023 13:37:01 +0200 Subject: [PATCH 1/2] imporve atm attributes --- apimanager/atms/templates/atms/update.html | 2 +- apimanager/atms/views.py | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/apimanager/atms/templates/atms/update.html b/apimanager/atms/templates/atms/update.html index fcb9968..6a6ed5d 100644 --- a/apimanager/atms/templates/atms/update.html +++ b/apimanager/atms/templates/atms/update.html @@ -252,7 +252,7 @@ - {% for attribute in bank_attributes_list %} + {% for attribute in atm_attributes_list %} {% url 'my-atm-attribute-detail' attribute.atm_attribute_id as url_atm_attribute_detail %}
diff --git a/apimanager/atms/views.py b/apimanager/atms/views.py index b1cfbcb..0afdc06 100644 --- a/apimanager/atms/views.py +++ b/apimanager/atms/views.py @@ -265,6 +265,7 @@ class UpdateAtmsView(LoginRequiredMixin, FormView): my_accessibility_features = result['accessibility_features'] my_accessibility_features_initial = ','.join(my_accessibility_features) fields['accessibility_features'].initial = my_accessibility_features_initial + self._paylod_choices(result, fields) except Exception as err: messages.error(self.request, "Unknown Error {}".format(err)) return form @@ -370,10 +371,10 @@ class UpdateAtmsView(LoginRequiredMixin, FormView): "balance_inquiry_fee": data["balance_inquiry_fee"] if data["balance_inquiry_fee"]!="" else "false" } - def bank_attributes(self, **kwargs): + def atm_attributes(self, **kwargs): atm_attributes_url_path = "/banks/{}/atms/{}/attributes".format(self.kwargs['bank_id'], self.kwargs['atm_id']) try: - atm_attributes_result = self.api.get(atm_attributes_url_path)["bank_attributes"] + atm_attributes_result = self.api.get(atm_attributes_url_path)["atm_attributes"] return atm_attributes_result except Exception as err: messages.error(self.request, "Unknown Error {}".format(err)) @@ -387,7 +388,7 @@ class UpdateAtmsView(LoginRequiredMixin, FormView): context.update({ 'atm_id': self.atm_id, 'bank_id': self.bank_id, - "bank_attributes_list": self.bank_attributes(**kwargs) + "atm_attributes_list": self.atm_attributes(**kwargs) }) return context From ccc89596cb519c726b27a54a3c749f1142c67796 Mon Sep 17 00:00:00 2001 From: Reena Aheer Date: Mon, 3 Apr 2023 16:44:17 +0200 Subject: [PATCH 2/2] improve spelling mistake in ATM attribute --- apimanager/atms/views.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apimanager/atms/views.py b/apimanager/atms/views.py index 0afdc06..277adde 100644 --- a/apimanager/atms/views.py +++ b/apimanager/atms/views.py @@ -265,12 +265,12 @@ class UpdateAtmsView(LoginRequiredMixin, FormView): my_accessibility_features = result['accessibility_features'] my_accessibility_features_initial = ','.join(my_accessibility_features) fields['accessibility_features'].initial = my_accessibility_features_initial - self._paylod_choices(result, fields) + self._payload_choices(result, fields) except Exception as err: messages.error(self.request, "Unknown Error {}".format(err)) return form - def _paylod_choices(self, result, fields): + def _payload_choices(self, result, fields): if result['is_accessible'].lower()=='true': fields['is_accessible'].choices = [(True, True), (False, False)] else: