feat: spruce up list

Author: dodumosu

locations/templates/locations/center_edit.html

@@ -13,11 +13,11 @@
                 {{ form.id }}
                 <div class="form-group">
                     <label for="{{ form.name.name }}">{{ form.name.label }}</label>
-                    <input type="text" class="form-control" id="{{ form.name.auto_id }}" name="{{ form.name.name }}" value="{{ form.name.value }}">
+                    {% render_field form.name class='form-control' %}
                 </div>
                 <div class="form-group">
                     <label for="{{ form.code.name }}">{{ form.code.label }}</label>
-                    <input type="text" class="form-control" id="{{ form.code.auto_id }}" name="{{ form.code.name }}" value="{{ form.code.value }}">
+                    {% render_field form.code class='form-control' %}
                 </div>
                 <div class="form-group">
                     <label for="{{ form.state.name }}">{{ form.state.label }}</label>
@@ -46,7 +46,7 @@
 </div>
 {% endblock %}
 {% block scripts %}
-<script src="{% static 'base/vendor/jquery/dist/jquery.min.js' %}"></script>
+{{ block.super }}
 {% javascript 'centers' %}
 <script type="text/javascript">
 $(document).ready(function() {

locations/templates/locations/non_reporting_centre_list.html

@@ -31,11 +31,14 @@ <h1 class="page-title">{{ page_title }}</h1>
                 <fieldset>
                     <div class="form-group row">
                         <div class="col-md-12">
+                            <select name="{{ filter_form.location.name }}" id="{{ filter_form.location.id_for_label }}" data-placeholder="Location">
+                                {% if filter_form.cleaned_data.location %}<option value="{{ filter_form.cleaned_data.location.pk }}">{{ filter_form.cleaned_data.location.name }}</option>{% endif %}
+                            </select>
                             {% render_field filter_form.year class="form-control" %}
                             {% render_field filter_form.month class="form-control" %}
                             <button type="submit" class="btn btn-primary" id="filter_button">Filter</button>
                             <a class="btn btn-inverse" href="{% url 'locations:non_reporting_center_list' %}">Clear</a>
-                            <a class="btn btn-primary-outline" href="{% url 'locations:non_reporting_center_list' %}?export=1&year={{ year }}&month={{ month }}">Export</a>
+                            <a class="btn btn-primary-outline" href="{% url 'locations:non_reporting_center_list' %}?export=1&year={{ year }}&month={{ month }}&location={{ location }}">Export</a>
                         </div>
                     </div>
                 </fieldset>
@@ -48,6 +51,7 @@ <h1 class="page-title">{{ page_title }}</h1>
         <section class="widget">
             <div class="widget-table">
                 <table class="table table-striped table-bordered table-hover">
+                    <caption>{{ caption }}</caption>
                     <thead>
                         <tr>
                             <th>State</th>
@@ -100,8 +104,8 @@ <h1 class="page-title">{{ page_title }}</h1>
 <script src="{% static "js/select2/select2.min.js" %}"></script>
 <script>
 document.addEventListener('DOMContentLoaded', function () {
-    var endpoint = '{% url "api:location_list_typed" %}?type=lga';
-    $('#{{ filter_form.lga.id_for_label }}').select2({
+    var endpoint = '{% url "api:location_list_typed" %}?type=state,lga';
+    $('#{{ filter_form.location.id_for_label }}').select2({
         ajax: {
             url: endpoint,
             data: function(params) {

locations/views.py

@@ -1,4 +1,5 @@
 # vim: ai ts=4 sts=4 et sw=4
+import calendar
 import csv
 import json
 
@@ -206,7 +207,6 @@ def facilities(request):
     return response
 
 
-
 class CSVBuffer(object):
     def write(self, value):
         return value
@@ -258,10 +258,34 @@ def get_context_data(self, **kwargs):
 
         context['page_title'] = self.page_title
         context['filter_form'] = self.filter_form
-        context['year'] = self.request.GET.get('year') or now().year
-        context['month'] = self.request.GET.get('month') or ''
+        context['year'] = self.selected_year
+        context['month'] = self.selected_month or ''
+        context['location'] = self.filter_location.pk if self.filter_location else ''
+        context['caption'] = self.get_header_title()
 
         return context
+    
+    def get_header_title(self):
+        if self.selected_month and self.filter_location:
+            return 'Non-reporting centres for {}, {} {}'.format(
+                self.filter_location.name,
+                calendar.month_name[int(self.selected_month)],
+                self.selected_year
+            )
+        elif self.selected_month:
+            return 'Non-reporting centres for {} {}'.format(
+                calendar.month_name[int(self.selected_month)],
+                self.selected_year
+            )
+        elif self.filter_location:
+            return 'Non-reporting centres for {}, {}'.format(
+                self.filter_location.name,
+                self.selected_year
+            )
+        else:
+            return 'Non-reporting centres for {}'.format(
+                self.selected_year
+            )
 
     def get_queryset(self):
         self.filter_form = NonReportingCentresFilterForm(self.request.GET)
@@ -271,17 +295,23 @@ def get_queryset(self):
             filter_data = {}
 
         filter_kwargs = {}
-        year = filter_data.get('year') or now().year
-        filter_kwargs['birthregistration_records__time__year'] = int(year)
-        month = filter_data.get('month')
-        if month:
-            filter_kwargs['birthregistration_records__time__month'] = int(month)
+        alt_filter_kwargs = {'type__name': 'RC'}
+        self.selected_year = filter_data.get('year') or now().year
+        filter_kwargs['birthregistration_records__time__year'] = int(self.selected_year)
+        self.selected_month = filter_data.get('month')
+        if self.selected_month:
+            filter_kwargs['birthregistration_records__time__month'] = int(self.selected_month)
+        
+        self.filter_location = filter_data.get('location')
+        if self.filter_location:
+            alt_filter_kwargs['lft__gt'] = self.filter_location.lft
+            alt_filter_kwargs['rgt__lt'] = self.filter_location.rgt
 
         if len(filter_kwargs) == 0:
             centres = Location.objects.none()
         else:
             centres = Location.objects.filter(
-                type__name='RC'
+                **alt_filter_kwargs
             ).annotate(
                 cnt=Count(Case(When(then=1, **filter_kwargs)))
             ).filter(cnt=0)