Merge pull request #638 from sebastianrakel/fix-issue-625

Add from/till filter for reports

Author: gdubicki

puppetboard/app.py

@@ -11,11 +11,13 @@
 )
 
 import logging
+import json
 
 from pypuppetdb.QueryBuilder import (ExtractOperator, AndOperator,
                                      EqualsOperator, FunctionOperator,
                                      NullOperator, OrOperator,
-                                     LessEqualOperator, RegexOperator)
+                                     LessEqualOperator, RegexOperator,
+                                     GreaterEqualOperator)
 
 from puppetboard.forms import ENABLED_QUERY_ENDPOINTS, QueryForm
 from puppetboard.utils import (get_or_abort, yield_or_stop,
@@ -457,6 +459,7 @@ def reports_ajax(env, node_name):
     order_dir = request.args.get('order[0][dir]', 'desc')
     order_args = '[{"field": "%s", "order": "%s"}]' % (order_filter, order_dir)
     status_args = request.args.get('columns[1][search][value]', '').split('|')
+    date_args = request.args.get('columns[0][search][value]', '')
     max_col = len(REPORTS_COLUMNS)
     for i in range(len(REPORTS_COLUMNS)):
         if request.args.get("columns[%s][data]" % i, None):
@@ -480,6 +483,20 @@ def reports_ajax(env, node_name):
             "configuration_version", r"%s" % search_arg))
         reports_query.add(search_query)
 
+    if date_args:
+        dates = json.loads(date_args)
+
+        if len(dates) > 0:
+            date_query = AndOperator()
+
+            if 'min' in dates:
+                date_query.add(GreaterEqualOperator('end_time', dates['min']))
+
+            if 'max' in dates:
+                date_query.add(LessEqualOperator('end_time', dates['max']))
+
+            reports_query.add(date_query)
+
     status_query = OrOperator()
     for status_arg in status_args:
         if status_arg in ['failed', 'changed', 'unchanged']:

puppetboard/templates/reports.html

@@ -2,6 +2,17 @@
 {% import '_macros.html' as macros %}
 {% block content %}
 <div class="ui wide grid">
+  <div class="wide row">
+      <div class="three wide column">
+        <div class="ui">End Time (between)</div>
+      </div>
+      <div class="three wide column">
+        <label for="min"></label><input type="date" id="min" name="min">
+      </div>
+      <div class="three wide column">
+        <label for="max"></label><input type="date" id="max" name="max">
+      </div>
+  </div>
   <div class="wide row">
     <div class="three wide column">
       <div class="ui">Status</div>
@@ -34,6 +45,22 @@
   "deferLoading": true,
 {% endmacro %}
   {{ macros.datatable_init(table_html_id="reports_table", ajax_url=url_for('reports_ajax', env=current_env, node_name=node_name), default_length=config.NORMAL_TABLE_COUNT, length_selector=config.TABLE_COUNT_SELECTOR, extra_options=extra_options) }}
+  function date_filter_change(){
+    var minDate = $('#min').prop('value');
+    var maxDate = $('#max').prop('value');
+
+    var data = {};
+
+    if(minDate != '') {
+        data['min'] = minDate;
+    }
+
+    if(maxDate != '') {
+        data['max'] = maxDate;
+    }
+
+    table.column(0).search(JSON.stringify(data)).draw();
+  }
 
   // Event listener for status filters
   function status_filter_change(){
@@ -52,7 +79,9 @@
     }
     table.column(1).search(sum).draw();
   }
-  $('#failed, #changed, #unchanged, #noop').change(status_filter_change);
+    $('#failed, #changed, #unchanged, #noop').change(status_filter_change);
+    $('#min, #max').change(date_filter_change);
   // Call at init - fix page reload behavior
   status_filter_change();
+  date_filter_change();
 {% endblock onload_script %}