From ee958ab0421de66cfbba4830771225f549a6a40a Mon Sep 17 00:00:00 2001 From: Reena_Aheer Date: Thu, 14 Apr 2022 12:52:26 +0200 Subject: [PATCH] feature add ATM page --- apimanager/apimanager/settings.py | 1 + apimanager/atms/forms.py | 22 ++++++++++++++++++++++ apimanager/atms/templates/atms/index.html | 14 ++++++++++++-- apimanager/atms/templates/atms/update.html | 10 ++++++++++ apimanager/atms/views.py | 6 +++++- 5 files changed, 50 insertions(+), 3 deletions(-) diff --git a/apimanager/apimanager/settings.py b/apimanager/apimanager/settings.py index abdcb1e..f582b1f 100644 --- a/apimanager/apimanager/settings.py +++ b/apimanager/apimanager/settings.py @@ -52,6 +52,7 @@ INSTALLED_APPS = [ 'consumers', 'users', 'branches', + 'atms', 'entitlementrequests', 'customers', 'metrics', diff --git a/apimanager/atms/forms.py b/apimanager/atms/forms.py index 0305889..f59de43 100644 --- a/apimanager/atms/forms.py +++ b/apimanager/atms/forms.py @@ -184,6 +184,28 @@ class CreateAtmForm(forms.Form): required=False, ) + located_at = forms.CharField( + label='More information', + widget=forms.TextInput( + attrs={ + 'placeholder': 'short walk to the lake from here', + 'class': 'form-control', + } + ), + required=False, + ) + + services = forms.CharField( + label='Services', + widget=forms.TextInput( + attrs={ + 'placeholder': 'Services Are', + 'class': 'form-control', + } + ), + required=False, + ) + def __init__(self, *args, **kwargs): kwargs.setdefault('label_suffix', '') super(CreateAtmForm, self).__init__(*args, **kwargs) diff --git a/apimanager/atms/templates/atms/index.html b/apimanager/atms/templates/atms/index.html index a5b89c8..80f9db7 100644 --- a/apimanager/atms/templates/atms/index.html +++ b/apimanager/atms/templates/atms/index.html @@ -121,6 +121,16 @@ +
+
+ {% if form.services.errors %}
{{ form.services.errors }}
{% endif %} +
+ {{ form.services.label_tag }} + {{ form.services }} +
+
+
+
{% if form.address.errors %}
{{ form.address.errors }}
{% endif %} @@ -157,7 +167,7 @@
- + @@ -197,7 +207,7 @@
  • name: {{atm.meta.license.name}}
  • -
  • Branch Routing +
  • ATM Routing
    • Scheme: {{atm.atm_routing.scheme}}
    • Address: {{atm.atm_routing.address}}
    • diff --git a/apimanager/atms/templates/atms/update.html b/apimanager/atms/templates/atms/update.html index f303acc..fd20dbb 100644 --- a/apimanager/atms/templates/atms/update.html +++ b/apimanager/atms/templates/atms/update.html @@ -132,6 +132,16 @@ +
      +
      + {% if form.services.errors %}
      {{ form.services.errors }}
      {% endif %} +
      + {{ form.services.label_tag }} + {{ form.services }} +
      +
      +
      +
      diff --git a/apimanager/atms/views.py b/apimanager/atms/views.py index dd7bb36..b946fbd 100644 --- a/apimanager/atms/views.py +++ b/apimanager/atms/views.py @@ -157,7 +157,8 @@ class IndexAtmView(LoginRequiredMixin, FormView): "accessibleFeatures": data["accessibleFeatures"] if data["accessibleFeatures"]!="" else "accessible features name", "branch_type": data["branch_type"] if data["branch_type"]!="" else "branch type", "more_info": data["more_info"] if data["more_info"]!="" else "more info", - "phone_number": data["phone_number"] if data["phone_number"]!="" else "phone number" + "phone_number": data["phone_number"] if data["phone_number"]!="" else "phone number", + "services": data["services"] if data["services"]!="" else "services" } result = self.api.post(urlpath, payload=payload) except APIError as err: @@ -251,15 +252,18 @@ class UpdateAtmView(LoginRequiredMixin, FormView): fields['meta_license_name'].initial = result['meta']['license']['name'] fields['atm_routing_scheme'].initial = result['atm_routing']['scheme'] fields['atm_routing_address'].initial = result['atm_routing']['address'] + print("This is result", result) if result['is_accessible'].lower()=='true': fields['is_accessible'].choices = [(True, True), (False, False)] else: fields['is_accessible'].choices = [(False, False), (True, True)] fields['accessibleFeatures'].initial = result['accessibleFeatures'] fields['atm_type'].initial = result['atm_type'] + fields['located_at'].initial = result['located_at'] fields['more_info'].initial = result['more_info'] fields['phone_number'].initial = result['phone_number'] fields['lobby'].initial = json.dumps(result['lobby'], indent=4) + print(result, "Hello World") fields['drive_up'].initial = json.dumps(result['drive_up'], indent=4) except APIError as err: messages.error(self.request, err)
  • Atm IdATM Id Bank Id ATM Name More_info