artin/API-Manager
1
0
Fork 0
mirror of https://github.com/OpenBankProject/API-Manager.git synced 2026-02-06 17:26:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #313 from Reena-cell/develop

Browse Source 
imporve atm attributes
This commit is contained in:
Simon Redfern 2023-04-03 16:46:22 +02:00 committed by GitHub
commit 3c1979c3d1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apimanager/atms/templates/atms/update.html
View File

@ -252,7 +252,7 @@
</div>
</div>
</div>
{% 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 %}
<div class="runner">

9
apimanager/atms/views.py
View File

@ -265,11 +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._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:
@ -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