Completed all additions of units to relevant areas sans the 'record a…

…dministration' form (see #72) while en route to #71.
dgets · Jan 15, 2019 · 3b20d9d · 3b20d9d
1 parent c7a90ad
commit 3b20d9d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/recadm/templates/recadm/details.html b/recadm/templates/recadm/details.html
@@ -53,7 +53,7 @@ <h3>Administration Details</h3>
               Dosage:
           </td>
           <td>
-              {{ dosage }}
+              {{ dosage }}{{ units }}
           </td>
       </tr>
       <tr>

diff --git a/recadm/templates/recadm/index.html b/recadm/templates/recadm/index.html
@@ -33,7 +33,7 @@ <h3 class="mission">{{ header_info.mission }}</h3>
   <ul>
     {% for admin_details in mydata %}
       <li><a href="{% url 'recadm:detail' admin_details.id %}">
-        {{ admin_details.ts }}: {{ admin_details.dosage }}mg
+        {{ admin_details.ts }}: {{ admin_details.dosage }}{{ admin_details.units }}
         {{ admin_details.substance_name }}
       </a></li>
     {% endfor %}

diff --git a/recadm/views.py b/recadm/views.py
@@ -22,12 +22,14 @@ def index(request):
     """
 
     recent_administrations = Usage.objects.filter(user=request.user)
+
     mydata = []  # this can no doubt be handled better via the db
 
     for administration in recent_administrations:
         mydata.append({'ts': administration.timestamp,
             'id': administration.id,
             'dosage': administration.dosage,
+            'units': administration.sub.units,
             'substance_name': administration.sub,})
 
     context = {'mydata': mydata, 'user': request.user,}
@@ -133,6 +135,7 @@ def detail(request, topic_id):
     context = {
         'sub': admin_details.sub,
         'dosage': admin_details.dosage,
+        'units': admin_details.sub.units,
         'timestamp': admin_details.timestamp,
         'notes': admin_details.notes,
     }