Merge branch 'develop'

Added max/min interval information to tabulated data summary.

dataview/templates/dataview/data_summary.html

@@ -58,6 +58,12 @@ <h2>{{ sub_name }}</h2>
  <td>Lowest Dosage:</td>
  <td>{{ usage_low }}</td>
  </tr>
+ <tr>
+ <td>Longest Span Between Intervals:</td>
+ <td>{{ longest_span }}</td>
+ <td>Shortest Span Between Intervals:</td>
+ <td>{{ shortest_span }}</td>
+ </tr>
  </table>
 
  <h3>Applicable Administrations Listing</h3>
@@ -74,7 +80,7 @@ <h4>Administration Time and Dosage</h4>
  <div class="dose_chart"></div>
  <script src="//d3js.org/d3.v3.min.js"></script>
  <script>
- let json_src = '{% url 'dataview:dump_graph_data' sub_id %}';
+ let json_src = '{% url 'dataview:dump_dose_graph_data' sub_id %}';
 
  fetch(json_src)
  .then(res => res.json())
@@ -114,6 +120,7 @@ <h4>Time Between Subsequent Administrations</h4>
  span #2 is between administration #2 & #3, etc ad infinitum.
 
  {% if timespans %}
+
  <ol>
  {% for span in timespans %}
  <li>{{ span }}</li>

dataview/urls.py

@@ -6,5 +6,5 @@
 urlpatterns = [
  path('', views.IndexView.as_view(), name='index'),
  path('<int:pk>/', views.SubAdminDataView.as_view(), name='data_summary'),
- path('dump_graph_data/<int:sub_id>/', views.dump_graph_data, name='dump_graph_data'),
+ path('dump_dose_graph_data/<int:sub_id>/', views.dump_dose_graph_data, name='dump_dose_graph_data'),
 ]

dataview/views.py

@@ -87,7 +87,16 @@ def get_context_data(self, **kwargs):
  prev_time = use.timestamp
 
  total_span = datetime.timedelta(0)
+ longest_span = datetime.timedelta(0)
+ shortest_span = datetime.timedelta.max
+
  for span in timespans:
+ if longest_span < span:
+ longest_span = span
+
+ if shortest_span > span:
+ shortest_span = span
+
  total_span += span
 
  average_span = round_timedelta_to_15min_floor(total_span / (usage_count - 1))
@@ -96,11 +105,12 @@ def get_context_data(self, **kwargs):
  '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'],
- 'timespans': timespans, 'average_span': average_span})
+ 'sub_id': self.kwargs['pk'], 'longest_span': longest_span,
+ 'shortest_span': shortest_span, 'timespans': timespans,
+ 'average_span': average_span})
 
 
-def dump_graph_data(request, sub_id):
+def dump_dose_graph_data(request, sub_id):
  """
  This view is a little more interesting than the different flavors of the
  same that we've been working with so far. This one is going to take our