Merge pull request #52 from dgets/develop

dgets · web-flow · commit c44781aacfb1 · 2019-01-08T15:02:39.000-06:00
Develop; interval graphing now working (not polished).
diff --git a/dataview/static/dataview/graphing_internals.js b/dataview/static/dataview/graphing_internals.js
@@ -16,4 +16,15 @@ getJSON = function(url, callback) {
     };
 
     xhr.send();
-};
+};
+
+function secondsToHms(d) {
+    d = Number(d);
+
+    var h = Math.floor(d / 3600);
+    var m = Math.floor(d % 3600 / 60);
+    var s = Math.floor(d % 3600 % 60);
+
+    return ('0' + h).slice(-2) + ":" + ('0' + m).slice(-2) + ":" + ('0' + s).slice(-2);
+}
+
diff --git a/dataview/templates/dataview/data_summary.html b/dataview/templates/dataview/data_summary.html
@@ -7,12 +7,10 @@
      <link rel="stylesheet" type="text/css"
         href="{% static 'recadm/lasttime.css' %}">
 
-     <!-- unnecessary in this version
      <script>
          var getJSON;
      </script>
      <script src="{% static 'dataview/graphing_internals.js' %}"></script>
-     -->
 
  </head>
  <body>
@@ -127,6 +125,37 @@ <h4>Time Between Subsequent Administrations</h4>
        {% endfor %}
    </ol>
 
+   <div class="interval_chart"></div>
+   <script src="//d3js.org/d3.v3.min.js"></script>
+   <script>
+    let json_src2 = '{% url 'dataview:dump_interval_graph_data' sub_id %}';
+
+    fetch(json_src2)
+      .then(res => res.json())
+      .then((out) => {
+        //debugging schitt
+        //out = [ 7, 15, 2, 12, 13 ];
+        console.log(out);
+
+        //var data = [];
+        //for (var ouah in out) {
+        //  data.push(out[ouah]);
+        //}
+
+        var x = d3.scale.linear()
+            .domain([0, d3.max(out.timespans)])
+            .range([0, d3.max(out.timespans)]);
+
+        d3.select(".interval_chart")
+          .selectAll("div")
+            .data(out.timespans)
+          .enter().append("div")
+            .style("width", function(d) { return x(d) + "px"; })
+            .text(function(d) { return (secondsToHms(d / out.scale_factor)); });
+      })
+      .catch(err => { throw err });
+     </script>
+
   {% else %}
 
    <p>No timespans have been recorded.</p>
diff --git a/dataview/urls.py b/dataview/urls.py
@@ -7,4 +7,5 @@
     path('', views.IndexView.as_view(), name='index'),
     path('<int:pk>/', views.SubAdminDataView.as_view(), name='data_summary'),
     path('dump_dose_graph_data/<int:sub_id>/', views.dump_dose_graph_data, name='dump_dose_graph_data'),
+    path('dump_interval_graph_data/<int:sub_id>/', views.dump_interval_graph_data, name='dump_interval_graph_data'),
 ]
diff --git a/dataview/views.py b/dataview/views.py
@@ -99,14 +99,16 @@ def get_context_data(self, **kwargs):
 
             total_span += span
 
+        # errors here if there are 0 or 1 usages, obviously
         average_span = round_timedelta_to_15min_floor(total_span / (usage_count - 1))
+        scale_factor = get_graph_normalization_divisor(longest_span.total_seconds(), 600)
 
         return add_header_info({'usages': usages, 'usage_count': usage_count, 'usage_average': usage_average,
                                 'usage_high': highest_administered, 'usage_low': lowest_administered,
                                 'usage_total': total_administered,
                                 'sub_name': Substance.objects.filter(pk=self.kwargs['pk'])[0].common_name,
                                 'sub_id': self.kwargs['pk'], 'longest_span': longest_span,
-                                'shortest_span': shortest_span, 'timespans': timespans,
+                                'shortest_span': shortest_span, 'timespans': timespans, 'scale_factor': scale_factor,
                                 'average_span': average_span})
 
 
@@ -126,22 +128,49 @@ def dump_dose_graph_data(request, sub_id):
     :return:
     """
 
-    usage_graph_data = {}
-    # usage_sub_id = request.POST['sub']
-    usages = Usage.objects.filter(sub=sub_id)[:20]   # pk or usage_sub_id?
+    dosage_graph_data = []
+    # dosage_sub_id = request.POST['sub']
+    usages = Usage.objects.filter(sub=sub_id)[:20]
 
-    cntr = 0
+    # cntr = 0
     for use in usages:
-        # usage_graph_data[str(use.timestamp)] = float(use.dosage)
+        # dosage_graph_data[str(use.timestamp)] = float(use.dosage)
         # NOTE: switching to a standard array for now for simplicity in the
         # template's javascript; we can add more gravy later
 
         # later on we can look at using use.notes as hover-over text for each
         # graph bar, or something of the like
-        usage_graph_data[cntr] = float(use.dosage)
-        cntr += 1
+        dosage_graph_data.append(float(use.dosage))
+        # cntr += 1
 
-    return HttpResponse(json.dumps(usage_graph_data), content_type='application/json')
+    return HttpResponse(json.dumps(dosage_graph_data), content_type='application/json')
+
+
+def dump_interval_graph_data(request, sub_id):
+    # interval_graph_data = {}
+    usages = Usage.objects.filter(sub=sub_id)[:20]
+
+    timespans = []
+    prev_time = None  # would we (perhaps optionally) want timezone.now()?
+    max_span = datetime.timedelta(0)
+    for use in usages:
+        if prev_time is not None:
+            current_delta = datetime.timedelta
+            current_delta = use.timestamp - prev_time
+            current_delta = round_timedelta_to_15min_floor(current_delta)
+            timespans.append(current_delta.total_seconds())
+
+            if current_delta > max_span:
+                max_span = current_delta
+
+        prev_time = use.timestamp
+
+    scale_factor = get_graph_normalization_divisor(max_span.total_seconds(), 300)
+    for cntr in range(0, len(timespans)):
+        timespans[cntr] = timespans[cntr] * scale_factor
+
+    return HttpResponse(json.dumps({ 'scale_factor': scale_factor, 'timespans': timespans }),
+                        content_type='application/json')
 
 
 def add_header_info(page_data):
@@ -173,3 +202,21 @@ def round_timedelta_to_15min_floor(span):
     dingleberry = span.total_seconds() % fifteen_min.seconds
 
     return span - datetime.timedelta(seconds=dingleberry)
+
+
+def get_graph_normalization_divisor(max_qty, graph_max_boundary):
+    """
+    Method takes the maximum quantity (dimensionless), along with the maximum
+    dimension on the quantity axis, and returns the scale to divide by in
+    order to make things fit properly in the graph.
+
+    :param max_qty:
+    :param graph_max_boundary:
+    :return:
+    """
+
+    scale_factor = 1
+    if max_qty <= (graph_max_boundary / 2) or max_qty > graph_max_boundary:
+        scale_factor = graph_max_boundary / max_qty
+
+    return scale_factor
diff --git a/recadm/static/recadm/lasttime.css b/recadm/static/recadm/lasttime.css
@@ -115,6 +115,15 @@ p {
   color: white;
 }
 
+.interval_chart div {
+  font: 10px sans-serif;
+  background-color: steelblue;
+  text-align: right;
+  padding: 3px;
+  margin: 1px;
+  color: white;
+}
+
 .axis {
   font: 10px sans-serif;
 }

Original file line number	Diff line number	Diff line change
`@@ -7,4 +7,5 @@`
`7`	`7`	`path('', views.IndexView.as_view(), name='index'),`
`8`	`8`	`path('<int:pk>/', views.SubAdminDataView.as_view(), name='data_summary'),`
`9`	`9`	`path('dump_dose_graph_data/<int:sub_id>/', views.dump_dose_graph_data, name='dump_dose_graph_data'),`
	`10`	`+ path('dump_interval_graph_data/<int:sub_id>/', views.dump_interval_graph_data, name='dump_interval_graph_data'),`
`10`	`11`	`]`