Completed addition of dosage units to the applicable areas in the dat…

…aview app. This closes #71; note that #72 still needs to be fixed.
dgets · Jan 15, 2019 · 3041a86 · 3041a86
1 parent 3b20d9d
commit 3041a86
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/dataview/templates/dataview/data_summary.html b/dataview/templates/dataview/data_summary.html
@@ -7,9 +7,9 @@
      <link rel="stylesheet" type="text/css"
         href="{% static 'recadm/lasttime.css' %}">
 
-     <script>
+     <!-- <script>
          var getJSON;
-     </script>
+     </script> -->
      <script src="{% static 'dataview/graphing_internals.js' %}"></script>
 
  </head>
@@ -42,7 +42,7 @@ <h2>{{ sub_name }}</h2>
           <td>Total Administrations:</td>
           <td>{{ usage_count }}</td>
           <td>Total Administered:</td>
-          <td>{{ usage_total }}</td>
+          <td>{{ usage_total }}{{ sub_dosage_units }}</td>
       </tr>
       <tr>
           <td>Average Administered:</td>
@@ -52,9 +52,9 @@ <h2>{{ sub_name }}</h2>
       </tr>
       <tr>
           <td>Highest Dosage:</td>
-          <td>{{ usage_high }}</td>
+          <td>{{ usage_high }}{{ sub_dosage_units }}</td>
           <td>Lowest Dosage:</td>
-          <td>{{ usage_low }}</td>
+          <td>{{ usage_low }}{{ sub_dosage_units }}</td>
       </tr>
       <tr>
           <td>Longest Span Between Intervals:</td>
@@ -71,7 +71,7 @@ <h4>Administration Time and Dosage</h4>
   {% if usages %}
    <ol>
        {% for use in usages %}
-        <li>{{ use.timestamp }}: {{ use.dosage }}</li>
+        <li>{{ use.timestamp }}: {{ use.dosage }}{{ sub_dosage_units }}</li>
        {% endfor %}
    </ol>
 
@@ -144,7 +144,7 @@ <h4>Administration Time and Dosage</h4>
               .attr("y", 6)
               .attr("dy", ".71em")
               .style("text-anchor", "end")
-              .text("Dosage");
+              .text("Dosage in {{ sub_dosage_units }}");
 
           svg.selectAll("bar")
               .data(ouah)
@@ -245,7 +245,7 @@ <h4>Time Between Subsequent Administrations</h4>
       .attr("y2", 6)
       .attr("dy", ".71em")
       .style("text-anchor", "end")
-      .text("Timespan");
+      .text("Timespan in Hours");
 
   svg2.selectAll("bar")
       .data(ouah_interval)

diff --git a/dataview/views.py b/dataview/views.py
@@ -98,7 +98,7 @@ def get_context_data(self, **kwargs):
 
         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,
+                                'usage_total': total_administered, 'sub_dosage_units': usages[0].sub.units,
                                 '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, 'scale_factor': scale_factor,