diff --git a/apimanager/apimanager/settings.py b/apimanager/apimanager/settings.py index 42ceada..f0df7a4 100644 --- a/apimanager/apimanager/settings.py +++ b/apimanager/apimanager/settings.py @@ -57,8 +57,9 @@ INSTALLED_APPS = [ 'users', 'branches', 'atms', - 'banks', 'atmlist', + 'banks', + 'banklist', 'products', 'productlist', 'entitlementrequests', diff --git a/apimanager/apimanager/urls.py b/apimanager/apimanager/urls.py index fe20059..4dfef6c 100644 --- a/apimanager/apimanager/urls.py +++ b/apimanager/apimanager/urls.py @@ -32,8 +32,7 @@ urlpatterns += i18n_patterns( url(r'^$', HomeView.as_view(), name="home"), url(r'^single-sign-on', OAuthInitiateView.as_view(), name='single-sign-on'), - url(r'^logout$', - LogoutView.as_view(), name='oauth-logout'), + url(r'^logout$', LogoutView.as_view(), name='oauth-logout'), url(r'^systemviews/', include('systemviews.urls')), url(r'^accounts/', include('accounts.urls')), url(r'^account/list', include('accountlist.urls')), @@ -42,8 +41,9 @@ urlpatterns += i18n_patterns( url(r'^users/', include('users.urls')), url(r'^branches/', include('branches.urls')), url(r'^atms/', include('atms.urls')), - url(r'^banks/', include('banks.urls')), url(r'^atms/list', include('atmlist.urls')), + url(r'^banks/', include('banks.urls')), + url(r'^banks/list', include('banklist.urls')), url(r'^products/', include('products.urls')), url(r'^products/list', include('productlist.urls')), url(r'^customers/', include('customers.urls')), diff --git a/apimanager/banklist/__init__.py b/apimanager/banklist/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/apimanager/banklist/admin.py b/apimanager/banklist/admin.py new file mode 100644 index 0000000..8c38f3f --- /dev/null +++ b/apimanager/banklist/admin.py @@ -0,0 +1,3 @@ +from django.contrib import admin + +# Register your models here. diff --git a/apimanager/banklist/apps.py b/apimanager/banklist/apps.py new file mode 100644 index 0000000..26b574f --- /dev/null +++ b/apimanager/banklist/apps.py @@ -0,0 +1,5 @@ +from django.apps import AppConfig + + +class BanksConfig(AppConfig): + name = 'banks_list' diff --git a/apimanager/banklist/models.py b/apimanager/banklist/models.py new file mode 100644 index 0000000..3b5ea8d --- /dev/null +++ b/apimanager/banklist/models.py @@ -0,0 +1,4 @@ +from django.db import models + +# Create your models here. +# -*- coding: utf-8 -*- diff --git a/apimanager/banklist/static/banklist/css/banklist.css b/apimanager/banklist/static/banklist/css/banklist.css new file mode 100644 index 0000000..a2e16e3 --- /dev/null +++ b/apimanager/banklist/static/banklist/css/banklist.css @@ -0,0 +1,18 @@ +#atms_list div { + margin: 5px 0; +} + +/* The actual popup (appears on top) */ +.popuptext { + width: 250px; + background-color: #555; + color: #fff; + text-align: left; + border-radius: 6px; + padding: 8px 0; + z-index: 1; + /*bottom: 125%;*/ + top:100% + left: 50%; + margin-left: -80px; +} diff --git a/apimanager/banklist/static/banklist/js/banklist.js b/apimanager/banklist/static/banklist/js/banklist.js new file mode 100644 index 0000000..338fe9e --- /dev/null +++ b/apimanager/banklist/static/banklist/js/banklist.js @@ -0,0 +1,5 @@ +$(document).ready(function($) { + $('#info').click(function() { + alert("Hello World") + }); +}); diff --git a/apimanager/banklist/templates/banklist/banklist.html b/apimanager/banklist/templates/banklist/banklist.html new file mode 100644 index 0000000..68dbacb --- /dev/null +++ b/apimanager/banklist/templates/banklist/banklist.html @@ -0,0 +1,32 @@ +{% extends 'base.html' %} {% load static %} {% load i18n %} +{% block page_title %} {{ block.super }} / {% trans "Bank List" %}{% endblock page_title %} {% block content %} +
+

{% trans "Bank List" %}

+
+ + + + + + + + + {% for bank in banks_list %} + + {% url 'banks_update' bank.id as url_bank_update %} + + + + + + + + + {% endfor %} + + +
{% trans "Bank Id" %}{% trans "Short Name" %}{% trans "Full Name" %}{% trans "Logo" %}
{{ bank.id }}{{ bank.short_name }}{{ bank.full_name }}{{ bank.logo }}{% trans "Detail" %}
+
+
+{% endblock %} {% block extrajs %} {% endblock extrajs %} {% block extracss %} + {% endblock extracss %} \ No newline at end of file diff --git a/apimanager/banklist/tests.py b/apimanager/banklist/tests.py new file mode 100644 index 0000000..7ce503c --- /dev/null +++ b/apimanager/banklist/tests.py @@ -0,0 +1,3 @@ +from django.test import TestCase + +# Create your tests here. diff --git a/apimanager/banklist/urls.py b/apimanager/banklist/urls.py new file mode 100644 index 0000000..2bafd12 --- /dev/null +++ b/apimanager/banklist/urls.py @@ -0,0 +1,18 @@ +# -*- coding: utf-8 -*- +""" +URLs for Bank list app +""" + +from django.conf.urls import url +from .views import BankListView #, ExportCsvView + +urlpatterns = [ + url(r'^$', + BankListView.as_view(), + name='bank-list'), + +] +""" +url(r'^export_csv$', + ExportCsvView.as_view(), + name='export-bank-csv') """ diff --git a/apimanager/banklist/views.py b/apimanager/banklist/views.py new file mode 100644 index 0000000..1e5bbb1 --- /dev/null +++ b/apimanager/banklist/views.py @@ -0,0 +1,45 @@ +from django.shortcuts import render + +# Create your views here. +# -*- coding: utf-8 -*- +""" +Views of Bank List app +""" +import datetime +from django.contrib import messages +from django.contrib.auth.mixins import LoginRequiredMixin +import json +from django.urls import reverse_lazy +from django.http import HttpResponse +from django.views.generic import FormView,TemplateView, View +from banks.views import IndexBanksView +from obp.api import API, APIError + + +class BankListView(IndexBanksView, LoginRequiredMixin, FormView ): + template_name = "banklist/banklist.html" + success_url = '/banks/list' + + def get_banks(self,context): + api = API(self.request.session.get('obp')) + try: + urlpath = '/banks' + result = api.get(urlpath) + banks_list = [] + if 'banks' in result: + banks_list.extend(result["banks"]) + except APIError as err: + messages.error(self.request, err) + return [] + except Exception as inst: + messages.error(self.request, "Unknown Error {}".format(type(inst).__name__)) + return [] + + return banks_list + def get_context_data(self, **kwargs): + context = super(BankListView, self).get_context_data(**kwargs) + banks_list = self.get_banks(context) + context.update({ + 'banks_list': banks_list + }) + return context diff --git a/apimanager/base/templates/base.html b/apimanager/base/templates/base.html index e9ee40a..1926850 100644 --- a/apimanager/base/templates/base.html +++ b/apimanager/base/templates/base.html @@ -58,13 +58,14 @@
  • {% trans "KPI Dashboard" %}
    • - {% url "system_view" as system_view_url %} {% url "banks_create" as banks_create_url %} {% url "accounts-create" as accounts_create_url %} {% url "account-list" as accounts_list_url %} {% url "branches_list" as branches_list_url %} {% url "customers-create" as customers_create_url %} {% url "customer-list" as customer_list_url %} {% url "atms_create" as atms_create_url %} {% url "atm-list" as atm_list_url %} {% url "product-list" as product_list_url %} {% url "products-create" as product_create_url %} + {% url "system_view" as system_view_url %} {% url "banks_create" as banks_create_url %} {% url "bank-list" as bank_list_url %} {% url "accounts-create" as accounts_create_url %} {% url "account-list" as accounts_list_url %} {% url "branches_list" as branches_list_url %} {% url "customers-create" as customers_create_url %} {% url "customer-list" as customer_list_url %} {% url "atms_create" as atms_create_url %} {% url "atm-list" as atm_list_url %} {% url "product-list" as product_list_url %} {% url "products-create" as product_create_url %}
  • {% trans "Resources" %}