Changes in deepl file name

apimanager/apimanager/settings.py

@@ -55,7 +55,7 @@ INSTALLED_APPS = [
     'users',
     'branches',
     'atms',
-    'atmdetail',
+    'atmlist',
     'entitlementrequests',
     'customers',
     'metrics',

apimanager/apimanager/urls.py

@@ -38,8 +38,8 @@ urlpatterns += i18n_patterns(
     url(r'^entitlementrequests/', include('entitlementrequests.urls')),
     url(r'^users/', include('users.urls')),
     url(r'^branches/', include('branches.urls')),
-    url(r'^atms/create', include('atms.urls')),
-    url(r'^atms/list', include('atmdetail.urls')),
+    url(r'^atms/', include('atms.urls')),
+    url(r'^atms/list', include('atmlist.urls')),
     url(r'^customers/', include('customers.urls')),
     url(r'^metrics/', include('metrics.urls')),
     url(r'^config/', include('config.urls')),

apimanager/atmlist/apps.py

@@ -2,4 +2,4 @@ from django.apps import AppConfig
 
 
 class AtmsConfig(AppConfig):
-    name = 'atms_views'
+    name = 'atms_list'

apimanager/atmlist/templates/atmlist/atmlist.html

@@ -1,5 +1,5 @@
 {% extends 'base.html' %} {% load static %} {% load i18n %}
-{% block page_title %} {{ block.super }} / {% trans "ATMs Detail" %}{% endblock page_title %} {% block content %}
+{% block page_title %} {{ block.super }} / {% trans "ATM List" %}{% endblock page_title %} {% block content %}
 <div id="atms">
     <h1>{% trans "ATM List" %}</h1>
     <form class="form-inline" method="get">

apimanager/atmlist/views.py

@@ -19,8 +19,8 @@ import csv
 
 
 class AtmListView(IndexAtmsView, LoginRequiredMixin, FormView ):
-    template_name = "atmsView/atmlist.html"
-    success_url = '/atmsView/'
+    template_name = "atmlist/atmlist.html"
+    success_url = '/atms/list'
     def get_banks(self):
                 api = API(self.request.session.get('obp'))
                 try:

apimanager/atms/templates/atms/create.html

@@ -1,72 +0,0 @@
-{% extends 'base.html' %} {% load static %} {% load i18n %}
-{% block page_title %} /atms_views{% endblock page_title %} {% block content %}
-<div id="atms">
-    <h1>{% trans "ATM Detail" %}</h1>
-<div class="table-responsive">
-    <table class="table table-hover tablesorter" id="atms-list" aria-describedby="atms list">
-        <thead>
-        <th scope="col">{% trans "ATM Id" %}</th>
-        <th scope="col">{% trans "Bank Id" %}</th>
-        <th scope="col">{% trans "ATM Name" %}</th>
-        <th scope="col">{% trans "More info" %}</th>
-        <!--<th scope="col">{% trans "Update Button" %}</th>-->
-        </thead>
-        <tbody>
-        {% for atm in atms_list %}
-
-        {% url 'atms_update' atm.id atm.bank_id as url_atm_update %}
-        <tr data-atm-id="{{ atm.id }}">
-            <td>{{ atm.id }}</td>
-            <td>{{ atm.bank_id }}</td>
-            <td>{{ atm.name }}</td>
-            <td>
-                <div class="popuptext">
-                    <ul>
-                        <li>{% trans "Address" %}:
-                            <ul>
-                                <li>line1: {{atm.address.line_1}}</li>
-                            </ul>
-                        </li>
-                        <!-- <li>line2: {{atm.address.line_2}}</li>
-                                <li>line3: {{atm.address.line_3}}</li>
-                                <li>city: {{atm.address.city}}</li>
-                                <li>county: {{atm.address.county}}</li>
-                                <li>state: {{atm.address.state}}</li>
-                                <li>postcode: {{atm.address.postcode}}</li>
-                                <li>country_code: {{atm.address.country_code}}</li>
-                            </ul>
-                        </li>
-                        <li>Location:
-                            <ul>
-                                <li>latitude: {{atm.location.latitude}}</li>
-                                <li>longitude: {{atm.location.longitude}}</li>
-                            </ul>
-                        </li>
-                        <li>Meta License:
-                            <ul>
-                                <li>id: {{atm.meta.license.id}}</li>
-                                <li>name: {{atm.meta.license.name}}</li>
-                            </ul>
-                        </li>
-                        <li>ATM Routing
-                            <ul>
-                                <li>Scheme: {{atm.atm_routing.scheme}}</li>
-                                <li>Address: {{atm.atm_routing.address}}</li>
-                            </ul>
-                        </li>
-                        <li>ATM Type: {{atm.branch_type}}</li>
-                        <li>More Info: {{atm.more_info}}</li>
-                        <li>Accessible Features: {{atm.accessibleFeatures}}</li>-->
-                    </ul>
-                </div>
-            </td>
-            <td><a href="{{ url_atm_update }}" class="btn btn-primary">{% trans "View" %}</a></td>
-        </tr>
-        {% endfor %}
-
-        </tbody>
-    </table>
-</div>
-</div>
-{% endblock %} {% block extrajs %} {% endblock extrajs %} {% block extracss %}
-<link href="{% static 'atms/css/atms.css' %}" rel="stylesheet"> {% endblock extracss %}

apimanager/atms/urls.py

@@ -7,7 +7,7 @@ from django.conf.urls import url
 from .views import IndexAtmsView, UpdateAtmsView
 
 urlpatterns = [
-    url(r'^$',
+    url(r'^create',
         IndexAtmsView.as_view(),
         name='atms_create'),
     url(r'^update/(?P<atm_id>[ 0-9\w|\W\@\.\+-]+)/bank/(?P<bank_id>[0-9\w\@\.\+-]+)/$',