Merged in [16852] from sasha@dashcare.nl:

    Fix ietf-tools#2331 - Show stacked bar graph for in time and late reviews.
On the stats page, a single stacked bar graph is now shown which
combines in time and late reviews, replacing the separate graphs for
these statistics.
Tests for the charts are also expanded to validate the actual
graph content for both stacked and non-stacked charts.
 - Legacy-Id: 16898
Note: SVN reference [16852] has been migrated to Git commit f651320

Author: levkowetz

ietf/externals/static/flot/jquery.flot.stack.min.js

@@ -4,7 +4,9 @@
 
 from __future__ import absolute_import, print_function, unicode_literals
 
+import calendar
 import datetime
+import json
 
 from mock import patch
 from pyquery import PyQuery
@@ -197,11 +199,27 @@ def test_review_stats(self):
             if stats_type != "results":
                 self.assertTrue(q('.review-stats td:contains("1")'))
 
-        # check chart
+        # check stacked chart
+        expected_date = datetime.date.today().replace(day=1)
+        expected_js_timestamp = calendar.timegm(expected_date.timetuple()) * 1000
         url = urlreverse(ietf.stats.views.review_stats, kwargs={ "stats_type": "time" })
         url += "?team={}".format(review_req.team.acronym)
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
+        self.assertEqual(json.loads(r.context['data']), [
+            {"label": "in time", "color": "#3d22b3", "data": [[expected_js_timestamp, 0]]},
+            {"label": "late", "color": "#b42222", "data": [[expected_js_timestamp, 0]]}
+        ])
+        q = PyQuery(r.content)
+        self.assertTrue(q('.stats-time-graph'))
+
+        # check non-stacked chart
+        url = urlreverse(ietf.stats.views.review_stats, kwargs={ "stats_type": "time" })
+        url += "?team={}".format(review_req.team.acronym)
+        url += "&completion=not_completed"
+        r = self.client.get(url)
+        self.assertEqual(r.status_code, 200)
+        self.assertEqual(json.loads(r.context['data']), [{"color": "#3d22b3", "data": [[expected_js_timestamp, 0]]}])
         q = PyQuery(r.content)
         self.assertTrue(q('.stats-time-graph'))
 

ietf/stats/tests.py

@@ -1175,8 +1175,7 @@ def time_key_fn(t):
         # choice
 
         possible_completion_types = add_url_to_choices([
-            ("completed_in_time", "Completed in time"),
-            ("completed_late", "Completed late"),
+            ("completed_in_time_or_late", "Completed (in time or late)"),
             ("not_completed", "Not completed"),
             ("average_assignment_to_closure_days", "Avg. compl. days"),
         ], lambda slug: build_review_stats_url(get_overrides={ "completion": slug, "result": None, "state": None }))
@@ -1198,25 +1197,37 @@ def time_key_fn(t):
         selected_state = get_choice(request, "state", possible_states)
 
         if not selected_completion_type and not selected_result and not selected_state:
-            selected_completion_type = "completed_in_time"
-
-        series_data = []
+            selected_completion_type = "completed_in_time_or_late"
+
+        standard_color = '#3d22b3'
+        if selected_completion_type == 'completed_in_time_or_late':
+            graph_data = [
+                {'label': 'in time', 'color': standard_color, 'data': []},
+                {'label': 'late', 'color': '#b42222', 'data': []}
+            ]
+        else:
+            graph_data = [{'color': standard_color, 'data': []}]
         if selected_completion_type == "completed_combined":
                 pass
         else:
             for d, aggr in aggrs:
-                v = 0
-                if selected_completion_type is not None:
-                    v = aggr[selected_completion_type]
+                v1 = 0
+                v2 = None
+                js_timestamp = calendar.timegm(d.timetuple()) * 1000
+                if selected_completion_type == 'completed_in_time_or_late':
+                    v1 = aggr['completed_in_time']
+                    v2 = aggr['completed_late']
+                elif selected_completion_type is not None:
+                    v1 = aggr[selected_completion_type]
                 elif selected_result is not None:
-                    v = aggr["result"][selected_result]
+                    v1 = aggr["result"][selected_result]
                 elif selected_state is not None:
-                    v = aggr["state"][selected_state]
+                    v1 = aggr["state"][selected_state]
 
-                series_data.append((calendar.timegm(d.timetuple()) * 1000, v))
-            data = json.dumps([{
-                "data": series_data
-            }])
+                graph_data[0]['data'].append((js_timestamp, v1))
+                if v2 is not None:
+                    graph_data[1]['data'].append((js_timestamp, v2))
+            data = json.dumps(graph_data)
 
     else: # tabular data
         extracted_data = extract_review_assignment_data(query_teams, query_reviewers, from_time, to_time, ordering=[level])

ietf/stats/views.py

@@ -220,7 +220,7 @@ <h3>Counts per month</h3>
              tickDecimals: {% if selected_completion_type == "average_assignment_to_closure_days" %}null{% else %}0{% endif %}
          },
          series: {
-             color: "#3d22b3",
+             stack: true,
              bars: {
                  show: true,
                  barWidth: 20 * 24 * 60 * 60 * 1000,
@@ -257,6 +257,7 @@ <h3>Counts per month</h3>
   {% if stats_type == "time" %}
     <script src="{% static 'flot/jquery.flot.min.js' %}"></script>
     <script src="{% static 'flot/jquery.flot.time.min.js' %}"></script>
+    <script src="{% static 'flot/jquery.flot.stack.min.js' %}"></script>
     <script src="{% static 'ietf/js/review-stats.js' %}"></script>
   {% endif %}
 {% endblock %}