diff --git a/apimanager/entitlementrequests/static/entitlementrequests/css/entitlementrequests.css b/apimanager/entitlementrequests/static/entitlementrequests/css/entitlementrequests.css index b994c07..5b9ec42 100644 --- a/apimanager/entitlementrequests/static/entitlementrequests/css/entitlementrequests.css +++ b/apimanager/entitlementrequests/static/entitlementrequests/css/entitlementrequests.css @@ -1,20 +1,7 @@ -.entitlementrequests #entitlementrequests-list { +.table-responsive { margin-top: 20px; } -#entitlementrequests .btn-group-vertical.filter-enabled, -#entitlementrequests .btn-group-vertical.filter-apptype { - margin-top: 10px; -} - -#entitlementrequests-detail div { - margin: 5px 0; -} - #entitlementrequests .filter a { font-size: 12px; } - -#entitlementrequests .actions .btn { - margin-bottom: 2px; -} diff --git a/apimanager/entitlementrequests/templates/entitlementrequests/includes/filter_time.html b/apimanager/entitlementrequests/templates/entitlementrequests/includes/filter_time.html new file mode 100644 index 0000000..3ffddb2 --- /dev/null +++ b/apimanager/entitlementrequests/templates/entitlementrequests/includes/filter_time.html @@ -0,0 +1,6 @@ +Last Hour +Last Day +Last Week +Last Month +Last Year +All diff --git a/apimanager/entitlementrequests/templates/entitlementrequests/index.html b/apimanager/entitlementrequests/templates/entitlementrequests/index.html index 46d6524..88c5674 100644 --- a/apimanager/entitlementrequests/templates/entitlementrequests/index.html +++ b/apimanager/entitlementrequests/templates/entitlementrequests/index.html @@ -7,13 +7,28 @@
| Entitlement Request ID | Role Name | User ID | Bank ID | +Created | @@ -23,6 +38,7 @@{{ entitlementrequest.role_name }} | {{ entitlementrequest.user_id }} | {{ entitlementrequest.bank_id }} | +{{ entitlementrequest.created|naturaltime }} | {% endfor %} diff --git a/apimanager/entitlementrequests/views.py b/apimanager/entitlementrequests/views.py index eefe161..f257110 100644 --- a/apimanager/entitlementrequests/views.py +++ b/apimanager/entitlementrequests/views.py @@ -7,12 +7,23 @@ from django.contrib import messages from django.contrib.auth.mixins import LoginRequiredMixin from django.views.generic import TemplateView, RedirectView from obp.api import API, APIError +from base.filters import BaseFilter, FilterTime +from datetime import datetime +from django.conf import settings + class IndexView(LoginRequiredMixin, TemplateView): """Index view for entitlement requests""" template_name = "entitlementrequests/index.html" + def scrub(self, entitlement_requests): + """Scrubs data in the given consumers to adher to certain formats""" + for entitlement_request in entitlement_requests: + entitlement_request['created'] = datetime.strptime( + entitlement_request['created'], settings.API_DATETIMEFORMAT) + return entitlement_requests + def get_context_data(self, **kwargs): context = super(IndexView, self).get_context_data(**kwargs) entitlement_requests = [] @@ -20,11 +31,14 @@ class IndexView(LoginRequiredMixin, TemplateView): try: urlpath = '/entitlement-requests' entitlement_requests = api.get(urlpath) + entitlement_requests = entitlement_requests['entitlement_requests'] + entitlement_requests = FilterTime(context, self.request.GET, 'created') \ + .apply(entitlement_requests) + entitlement_requests = self.scrub(entitlement_requests) except APIError as err: messages.error(self.request, err) - sorted_entitlement_requests = entitlement_requests['entitlement_requests'] context.update({ - 'entitlementrequests': sorted_entitlement_requests, + 'entitlementrequests': entitlement_requests, }) return context
|---|