[refs #90825] Add filter by state

insitu/templates/data/list.html

@@ -110,6 +110,15 @@ <h1 class="col-sm-12">
             </select>
           </div>
 
+          <div class="form-group">
+            <label for="state">State:</label>
+            <select id="state" class="form-control">
+              {% for state in states %}
+                <option value="{{ state.name }}">{{ state.title }}</option>
+              {% endfor %}
+            </select>
+          </div>
+
           <div class="form-group">
             <button type="button" class="btn btn-primary"
                     id="filter-btn">Filter
@@ -168,6 +177,7 @@ <h1 class="col-sm-12">
             d.data_format = $('#data_format').val();
             d.quality_control_procedure = $('#quality_control_procedure').val();
             d.dissemination = $('#dissemination').val();
+            d.state = $('#state').val();
           }
         }
       }).fnFilterOnReturn();
@@ -178,7 +188,7 @@ <h1 class="col-sm-12">
       });
 
       $('#reset-btn').on('click', function () {
-        $('#name,#update_frequency,#coverage,#timeliness,#policy,#data_type,#data_format,#quality_control_procedure,#dissemination').val('All');
+        $('#name,#update_frequency,#coverage,#timeliness,#policy,#data_type,#data_format,#quality_control_procedure,#dissemination,state').val('All');
         var table = $table.DataTable();
         table.ajax.reload();
         table.search('').draw();

insitu/templates/data_provider/list.html

@@ -59,6 +59,15 @@ <h1 class="col-sm-12">
             </select>
           </div>
 
+          <div class="form-group">
+            <label for="state">State:</label>
+            <select id="state" class="form-control">
+              {% for state in states %}
+                <option value="{{ state.name }}">{{ state.title }}</option>
+              {% endfor %}
+            </select>
+          </div>
+
           <div class="form-group">
             <button type="button" class="btn btn-primary btn-sm"
                     id="filter-btn">Filter
@@ -110,6 +119,7 @@ <h1 class="col-sm-12">
           "data": function (d) {
             d.is_network = $('#is_network').val();
             d.provider_type = $('#provider_type').val();
+            d.state = $('#state').val();
           }
         },
         "columnDefs": [
@@ -136,7 +146,7 @@ <h1 class="col-sm-12">
       });
 
       $('#reset-btn').on('click', function () {
-        $('#is_network, #provider_type').val('All');
+        $('#is_network, #provider_type,#state').val('All');
         var table = $table.DataTable();
         table.ajax.reload();
         table.search('').draw();

insitu/templates/requirement/list.html

@@ -65,6 +65,15 @@ <h1 class="col-sm-12">
             </select>
           </div>
 
+          <div class="form-group">
+            <label for="state">State:</label>
+            <select id="state" class="form-control">
+              {% for state in states %}
+                <option value="{{ state.name }}">{{ state.title }}</option>
+              {% endfor %}
+            </select>
+          </div>
+
           <div class="form-group">
             <button type="button" class="btn btn-primary btn-sm"
                     id="filter-btn">Filter
@@ -119,6 +128,7 @@ <h1 class="col-sm-12">
             d.dissemination = $('#dissemination').val();
             d.quality_control_procedure = $('#quality_control_procedure').val();
             d.group = $('#group').val();
+            d.state = $('#state').val()
           }
         },
         "columnDefs": [
@@ -149,7 +159,7 @@ <h1 class="col-sm-12">
       });
 
       $('#reset-btn').on('click', function () {
-        $('#dissemination,#quality_control_procedure,#group').val('All');
+        $('#dissemination,#quality_control_procedure,#group,#state').val('All');
         var table = $table.DataTable();
         table.ajax.reload();
         table.search('').draw();

insitu/views/data.py

@@ -34,6 +34,8 @@ def get_context_data(self):
             model_cls=pickmodels.QualityControlProcedure
         )
         disseminations = get_choices('name', model_cls=pickmodels.Dissemination)
+        states = [{'title': 'All', 'name': 'All'}] + [
+            state for state in models.ValidationWorkflow.states]
         context.update({
             'update_frequencies': update_frequencies,
             'coverages': coverages,
@@ -43,6 +45,7 @@ def get_context_data(self):
             'data_formats': data_formats,
             'quality_control_procedures': quality_control_procedures,
             'disseminations': disseminations,
+            'states': states,
         })
         return context
 
@@ -54,7 +57,7 @@ class DataListJson(ESDatatableView):
     order_columns = columns
     filters = ['update_frequency', 'coverage', 'timeliness', 'policy',
                'data_type', 'data_format', 'quality_control_procedure',
-               'dissemination']
+               'dissemination', 'state']
     document = documents.DataDoc
     permission_classes = (IsAuthenticated, )
 

insitu/views/data_provider.py

@@ -31,8 +31,11 @@ def get_context_data(self):
         context = super().get_context_data()
         provider_types = get_choices(
             'name', model_cls=pickmodels.ProviderType)
+        states = [{'title': 'All', 'name': 'All'}] + [
+            state for state in models.ValidationWorkflow.states]
         context.update({
             'provider_types': provider_types,
+            'states': states,
         })
         return context
 
@@ -41,7 +44,7 @@ class DataProviderListJson(ESDatatableView):
     columns = ['name', 'acronym', 'address', 'phone', 'email', 'contact_person',
                'provider_type', 'is_network', 'state']
     order_columns = columns
-    filters = ['is_network', 'provider_type']
+    filters = ['is_network', 'provider_type', 'state']
     document = documents.DataProviderDoc
     permission_classes = (IsAuthenticated,)
 

insitu/views/requirement.py

@@ -79,10 +79,13 @@ def get_context_data(self):
             'name', model_cls=pickmodels.QualityControlProcedure
         )
         groups = get_choices('name', model_cls=pickmodels.RequirementGroup)
+        states = [{'title': 'All', 'name': 'All'}] + [
+            state for state in models.ValidationWorkflow.states]
         context.update({
             'disseminations': disseminations,
             'quality_control_procedures': quality_control_procedures,
             'groups': groups,
+            'states': states,
         })
         return context
 
@@ -92,7 +95,7 @@ class RequirementListJson(ESDatatableView):
                'uncertainty', 'update_frequency', 'timeliness',
                'horizontal_resolution', 'vertical_resolution', 'state']
     order_columns = columns
-    filters = ['dissemination', 'quality_control_procedure', 'group']
+    filters = ['dissemination', 'quality_control_procedure', 'group', 'state']
     document = documents.RequirementDoc
     permission_classes = (IsAuthenticated, )
 

picklists/admin.py

@@ -8,6 +8,7 @@
 class CountryAdmin(admin.ModelAdmin):
     search_fields = ['code', 'name']
 
+
 class InspireThemeAdmin(admin.ModelAdmin):
     search_fields = ['name', 'annex']