Upated template to include dob,cert

diff --git a/data/template/default/index.html b/data/template/default/index.html
index 703a21220f645194af4de05107785df1e528a021..ce07fb5af01852ba50bf039d89ef41a5c9743200 100644 (file)
--- a/data/template/default/index.html
+++ b/data/template/default/index.html
@@ -34,8 +34,12 @@
                   </tr>
                   <tr>
                     <td><p><strong>Name:</strong> {{name}}</p></td>
-                    <td><p><strong>Age:</strong> {{age}}</p></td>
                     <td><p><strong>Sex:</strong> {{sex}}</p></td>
+                    {%if age %}
+                    <td><p><strong>Age:</strong> {{age}}</p></td>
+                    {%else%}
+                    <td><p><strong>Date of Birth:</strong> {{dob}}</p></td>
+                    {%endif%}
                   </tr>
                   <tr>
                     <td colspan="3"><small>{% if address %}Address: {{address}}{% endif %} {% if contact %}Contact: {{contact}}{% endif %}</small></td>

diff --git a/data/template/medcert/index.html b/data/template/medcert/index.html
index 347055bee84d81cf1fec98b65987bc8db166048b..951bb2ad76f4044f647d5501c3db2ccb92a75785 100644 (file)
--- a/data/template/medcert/index.html
+++ b/data/template/medcert/index.html
@@ -34,8 +34,12 @@
                   </tr>
                   <tr>
                     <td><p><strong>Name:</strong> {{name}}</p></td>
-                    <td><p><strong>Age:</strong> {{age}}</p></td>
                     <td><p><strong>Sex:</strong> {{sex}}</p></td>
+                    {% if age %}
+                    <td><p><strong>Age:</strong> {{age}}</p></td>
+                    {% else %}
+                    <td><p><strong>Date of Birth:</strong> {{dob}}</p></td>
+                    {% endif %}
                   </tr>
                   <tr>
                     <td colspan="3"><small>{% if address %}Address: {{address}}{% endif %} {% if contact %}Contact: {{contact}}{% endif %}</small></td>
@@ -46,7 +50,7 @@
                     <td>{% if diagnosis %}<strong>Provisional Diagnosis: {{diagnosis}}</strong>{% endif %}</td>
                   </tr>
                   <tr>
-                    <td><p class="formatted jtxt">{{extra}}</p></td>
+                    <td><p class="formatted jtxt">{{certificate}}</p></td>
                   </tr>
                 </table>
               </td>

diff --git a/window.py b/window.py
index c423ee7c03954ca66c6499a87921098372801e4c..ea0300cfd3685b4c4e0bc499be6cc484cb0959e1 100644 (file)
--- a/window.py
+++ b/window.py
@@ -388,6 +388,7 @@ class MainWindow(QMainWindow):
                 date=self.prescription.date,
                 id=self.prescription.id,
                 name=self.prescription.name,
+                dob=self.prescription.dob,
                 age=self.prescription.age,
                 sex=self.prescription.sex,
                 address=self.prescription.address,