From 69818aa35326280a903e191a5ed8c6a221a8bbaf Mon Sep 17 00:00:00 2001 From: Reena Aheer Date: Mon, 3 Apr 2023 11:22:08 +0200 Subject: [PATCH] feature/ add ATM Attribute in update ATM --- apimanager/atms/forms.py | 16 +++---- apimanager/atms/static/atms/js/atms.js | 51 ++-------------------- apimanager/atms/templates/atms/update.html | 2 + apimanager/atms/views.py | 6 +-- 4 files changed, 16 insertions(+), 59 deletions(-) diff --git a/apimanager/atms/forms.py b/apimanager/atms/forms.py index ab3572a..545ab9a 100644 --- a/apimanager/atms/forms.py +++ b/apimanager/atms/forms.py @@ -206,14 +206,14 @@ class CreateAtmForm(forms.Form): required=False, ) has_deposit_capability = forms.ChoiceField( - label=_('Deposit Capabilities'), - widget=forms.Select( - attrs={ - 'class': 'form-control', - } - ), - required=False, - ) + label=_('Deposit Capabilities'), + widget=forms.Select( + attrs={ + 'class': 'form-control', + } + ), + required=False, + ) supported_languages = forms.CharField( label=_('Supported Languages'), widget=forms.TextInput( diff --git a/apimanager/atms/static/atms/js/atms.js b/apimanager/atms/static/atms/js/atms.js index 9a0570e..338fe9e 100644 --- a/apimanager/atms/static/atms/js/atms.js +++ b/apimanager/atms/static/atms/js/atms.js @@ -1,50 +1,5 @@ $(document).ready(function($) { - $('.runner button.forSave').click(function(e) { - e.preventDefault(); - let runner = $(this).parent().parent().parent(); - let name = $(runner).find('.atm_attribute_name').val(); - let type = $(runner).find('.atm_attribute_type').val(); - let value = $(runner).find('.atm_attribute_value').val(); - $('.runner button.forUpdate').attr("disabled","disabled"); - $('.runner button.forSave').attr("disabled","disabled"); - $('.runner button.forDelete').attr("disabled","disabled"); - $.post('save/attribute', { - 'name': name, - 'type': type, - 'value': value, - }, function (response) { - location.reload(); - }); - }); - $('.runner button.forUpdate').click(function(e) { - e.preventDefault(); - let runner = $(this).parent().parent().parent(); - let name = $(runner).find('.atm_attribute_name').val(); - let type = $(runner).find('.atm_attribute_type').val(); - let value = $(runner).find('.atm_attribute_value').val(); - $('.runner button.forUpdate').attr("disabled","disabled"); - $('.runner button.forSave').attr("disabled","disabled"); - $('.runner button.forDelete').attr("disabled","disabled"); - $.post('updateattribute/attribute', { - 'name': name, - 'type': type, - 'value': value, - }, function (response) { - location.reload(); - }); - }); - - $('.runner button.forDelete').click(function(e) { - e.preventDefault(); - let runner = $(this).parent().parent().parent(); - let atm_attribute_id = $(runner).find('.atm_attribute_id').attr("value"); - $('.runner button.forUpdate').attr("disabled","disabled"); - $('.runner button.forSave').attr("disabled","disabled"); - $('.runner button.forDelete').attr("disabled","disabled"); - $.post('delete/attribute', { - 'atm_attribute_id': atm_attribute_id - }, function (response) { - location.reload(); - }); - }); + $('#info').click(function() { + alert("Hello World") + }); }); diff --git a/apimanager/atms/templates/atms/update.html b/apimanager/atms/templates/atms/update.html index fcb9968..ce26622 100644 --- a/apimanager/atms/templates/atms/update.html +++ b/apimanager/atms/templates/atms/update.html @@ -203,6 +203,7 @@
{{ form.address.label_tag }} {{ form.address }}
+
{% if form.lobby.errors %} @@ -211,6 +212,7 @@ {{ form.lobby.label_tag }} {{ form.lobby }}
+ diff --git a/apimanager/atms/views.py b/apimanager/atms/views.py index e2af48b..76e54dd 100644 --- a/apimanager/atms/views.py +++ b/apimanager/atms/views.py @@ -261,13 +261,12 @@ class UpdateAtmsView(LoginRequiredMixin, FormView): my_supported_languages = result['supported_languages'] supported_languages_initial = ','.join(my_supported_languages) fields['supported_languages'].initial = supported_languages_initial - 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 APIError as err: - messages.error(self.request, err) + except Exception as err: + messages.error(self.request, "Unknown Error {}".format(err)) return form def _paylod_choices(self, result, fields): @@ -352,6 +351,7 @@ class UpdateAtmsView(LoginRequiredMixin, FormView): messages.success(self.request, msg) return super(UpdateAtmsView, self).form_valid(form) def _update_boolean_payload1(self, data): + return { "is_accessible": data["is_accessible"] if data["is_accessible"]!="" else "false", "located_at": data["located_at"] if data["located_at"]!="no-example-provided" else " ",