Report formatting updated

diff --git a/librevax.py b/librevax.py
index 91fd26682ddcae182e327b185339fe908bba213b..fb0f0f99743400152f8c3c1f94872a716a5e3a99 100644 (file)
--- a/librevax.py
+++ b/librevax.py
@@ -820,7 +820,6 @@ def report(mid):
         raise(e)
         return render_template("error.html", data=e)
 
-
 def get_db():
     db=getattr(g, "_database", None)
     if db is None:

diff --git a/static/style.css b/static/style.css
index d95c46d711a949c2d2223287e94d250857ad3d1b..262b3edb5f799b527713205103e2595ec2c50c5d 100644 (file)
--- a/static/style.css
+++ b/static/style.css
@@ -15,8 +15,16 @@ a {
        padding: 20px;
 }
 
-@media print{
+@media print {
        form, .navbar, .btn {
                display: none;
        }
+       .report {
+               font-size:8px;
+               line-height:1;
+       }
+       a {
+               color: inherit;
+               text-decoration: none;
+       }
 }

diff --git a/templates/report.html b/templates/report.html
index 4c0ca4de7259d4a478dc826a0b39d2d4dff4e516..df345b523976388420c0c9bc2057f03f7f6a60c0 100644 (file)
--- a/templates/report.html
+++ b/templates/report.html
@@ -11,7 +11,7 @@ You should have received a copy of the GNU General Public License along with Lib
 {% extends "base.html" %}
 
 {% block content %}
-<div class="content" style="font-size:8px; line-height:1">
+<div class="content report">
   <form>
     <div class="mb-2 row">
       <div class="col-sm-9">
@@ -28,18 +28,27 @@ You should have received a copy of the GNU General Public License along with Lib
   <table class="table table-bordered">
     {% for i in data %}
     <tr>
-      <td>{{loop.index}}</td>
       <td>
+        <a href="/vaccination/view/{{i["vid"]}}">
+        {{loop.index}}<br>
+        {%if not i["given"]%}<span class="text-danger">[PENDING]</span>{%endif%}
+        </a>
+      </td>
+      <td>
+        <a href="/patient/view/{{i["pid"]}}">
         {{i["name"]}}({{i["cid"]}})<br>
         {{i["sex"]}}/{{i["dob"]}}
+        </a>
       </td>
       <td>
         {{i["contact"]}}<br>
         {{i["address"]}}
       </td>
       <td>
+        <a href="/inventory/view/{{i["iid"]}}">
         {{i["vaccine"]}}{% if i["dosage"]>0 %}&times;{{i["dosage"]}}{% endif %}<br>
         {{i["batch"]}} {{i["doe"]}}
+        </a>
       </td>
     </tr>
     {% endfor %}