]> Softwares of Agnibho - medscript.git/commitdiff
Bugfix: template
authorAgnibho Mondal <mondal@agnibho.com>
Fri, 15 Sep 2023 20:12:59 +0000 (01:42 +0530)
committerAgnibho Mondal <mondal@agnibho.com>
Fri, 15 Sep 2023 20:12:59 +0000 (01:42 +0530)
data/template/cert/index.html [deleted file]
data/template/cert/style.css [deleted file]
data/template/medcert/index.html [new file with mode: 0644]
data/template/medcert/style.css [new file with mode: 0644]
renderer.py

diff --git a/data/template/cert/index.html b/data/template/cert/index.html
deleted file mode 100644 (file)
index 347055b..0000000
+++ /dev/null
@@ -1,66 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <title>Prescription</title>
-    <link rel="stylesheet" href="style.css">
-  </head>
-  <body>
-    <div class="container">
-      <div class="header" style="position:fixed;top:0">
-        <table class="w100">
-          <tr>
-            <td class="w60">
-              <h1>{{prescriber.name}}</h1>
-              <h2>{{prescriber.qualification}}</h2>
-              <h3>{{prescriber.registration}}</h3>
-            </td>
-            <td class="w40">
-              <p class="formatted">{{prescriber.address}}</p>
-              <p>{% if prescriber.contact %}Contact: {{prescriber.contact}}{% endif %}</p>
-              <p class="formatted">{{prescriber.extra}}</p>
-            </td>
-          </tr>
-        </table>
-      </div>
-      <div class="content">
-        <table>
-          <thead><tr><td><div class="header-space"></div></td></tr></thead>
-          <tbody>
-            <tr>
-              <td>
-                <table class="patient">
-                  <tr>
-                    <td class="rtxt" colspan="3"><small>{% if id %}ID: {{id}}{% endif %}</small></td>
-                  </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>
-                  </tr>
-                  <tr>
-                    <td colspan="3"><small>{% if address %}Address: {{address}}{% endif %} {% if contact %}Contact: {{contact}}{% endif %}</small></td>
-                  </tr>
-                </table>
-                <table>
-                  <tr>
-                    <td>{% if diagnosis %}<strong>Provisional Diagnosis: {{diagnosis}}</strong>{% endif %}</td>
-                  </tr>
-                  <tr>
-                    <td><p class="formatted jtxt">{{extra}}</p></td>
-                  </tr>
-                </table>
-              </td>
-            </tr>
-          </tbody>
-          <tfoot><tr><td><div class="footer-space"></div></td></tr></tfoot>
-        </table>
-      </div>
-      <div class="footer">
-        <table class="w100">
-          <tr><td class="w75">{% if mode %}Consultation: {{mode}}{% endif %}<br>{% if daw %}Dispense as written{% endif %}</td><td class="w25"><br><br></td></tr>
-          <tr><td><p>{{date.strftime("%B %d, %Y %I:%M %p")}}</p></td><td class="sign"><p>Signature</p></td></tr>
-        </table>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/data/template/cert/style.css b/data/template/cert/style.css
deleted file mode 100644 (file)
index 03581b1..0000000
+++ /dev/null
@@ -1,140 +0,0 @@
-table {
-       width: 100%;
-       border-collapse: collapse;
-}
-
-td {
-       vertical-align: top;
-}
-
-.container {
-       width: 95%;
-       margin-left: auto;
-       margin-right: auto;
-}
-
-.header, .footer {
-       width: 95%;
-       position: fixed;
-       left: 50%;
-       transform: translateX(-50%);
-       background: white;
-}
-.header {
-       top: 0;
-       border-bottom: 2px solid black;
-}
-
-.footer {
-       bottom: 0;
-       border-top: 2px solid black;
-}
-
-.header, .header-space {
-       height: 200px;
-}
-
-.footer, .footer-space {
-       height: 100px;
-}
-
-.patient {
-       border-bottom: 2px solid black;
-}
-
-.sign {
-       border-top: 2px solid black;
-}
-
-.formatted {
-       white-space: pre-wrap;
-       padding: 2px;
-}
-
-.ltxt {
-       text-align: left;
-}
-
-.rtxt {
-       text-align: right;
-}
-
-.ctxt {
-       text-align: center;
-}
-
-.jtxt {
-       text-align: justify;
-}
-
-.bordered {
-       border: 2px solid black;
-}
-
-.lbordered {
-       border-left: 2px dotted black;
-}
-
-.rbordered {
-       border-right: 2px dotted black;
-}
-
-.tbordered {
-       border-top: 2px solid black;
-}
-
-.bbordered {
-       border-bottom: 2px solid black;
-}
-
-.w0 {
-       width: 0%;
-}
-
-.w10 {
-       width: 10%;
-}
-
-.w20 {
-       width: 20%;
-}
-
-.w25 {
-       width: 25%;
-}
-
-.w30 {
-       width: 30%;
-}
-
-.w40 {
-       width: 40%;
-}
-
-.w50 {
-       width: 50%;
-}
-
-.w60 {
-       width: 60%;
-}
-
-.w70 {
-       width: 70%;
-}
-
-.w75 {
-       width: 75%;
-}
-
-.w80 {
-       width: 80%;
-}
-
-.w90 {
-       width: 90%;
-}
-
-.w100 {
-       width: 100%;
-}
diff --git a/data/template/medcert/index.html b/data/template/medcert/index.html
new file mode 100644 (file)
index 0000000..347055b
--- /dev/null
@@ -0,0 +1,66 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>Prescription</title>
+    <link rel="stylesheet" href="style.css">
+  </head>
+  <body>
+    <div class="container">
+      <div class="header" style="position:fixed;top:0">
+        <table class="w100">
+          <tr>
+            <td class="w60">
+              <h1>{{prescriber.name}}</h1>
+              <h2>{{prescriber.qualification}}</h2>
+              <h3>{{prescriber.registration}}</h3>
+            </td>
+            <td class="w40">
+              <p class="formatted">{{prescriber.address}}</p>
+              <p>{% if prescriber.contact %}Contact: {{prescriber.contact}}{% endif %}</p>
+              <p class="formatted">{{prescriber.extra}}</p>
+            </td>
+          </tr>
+        </table>
+      </div>
+      <div class="content">
+        <table>
+          <thead><tr><td><div class="header-space"></div></td></tr></thead>
+          <tbody>
+            <tr>
+              <td>
+                <table class="patient">
+                  <tr>
+                    <td class="rtxt" colspan="3"><small>{% if id %}ID: {{id}}{% endif %}</small></td>
+                  </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>
+                  </tr>
+                  <tr>
+                    <td colspan="3"><small>{% if address %}Address: {{address}}{% endif %} {% if contact %}Contact: {{contact}}{% endif %}</small></td>
+                  </tr>
+                </table>
+                <table>
+                  <tr>
+                    <td>{% if diagnosis %}<strong>Provisional Diagnosis: {{diagnosis}}</strong>{% endif %}</td>
+                  </tr>
+                  <tr>
+                    <td><p class="formatted jtxt">{{extra}}</p></td>
+                  </tr>
+                </table>
+              </td>
+            </tr>
+          </tbody>
+          <tfoot><tr><td><div class="footer-space"></div></td></tr></tfoot>
+        </table>
+      </div>
+      <div class="footer">
+        <table class="w100">
+          <tr><td class="w75">{% if mode %}Consultation: {{mode}}{% endif %}<br>{% if daw %}Dispense as written{% endif %}</td><td class="w25"><br><br></td></tr>
+          <tr><td><p>{{date.strftime("%B %d, %Y %I:%M %p")}}</p></td><td class="sign"><p>Signature</p></td></tr>
+        </table>
+      </div>
+    </div>
+  </body>
+</html>
diff --git a/data/template/medcert/style.css b/data/template/medcert/style.css
new file mode 100644 (file)
index 0000000..03581b1
--- /dev/null
@@ -0,0 +1,140 @@
+table {
+       width: 100%;
+       border-collapse: collapse;
+}
+
+td {
+       vertical-align: top;
+}
+
+.container {
+       width: 95%;
+       margin-left: auto;
+       margin-right: auto;
+}
+
+.header, .footer {
+       width: 95%;
+       position: fixed;
+       left: 50%;
+       transform: translateX(-50%);
+       background: white;
+}
+.header {
+       top: 0;
+       border-bottom: 2px solid black;
+}
+
+.footer {
+       bottom: 0;
+       border-top: 2px solid black;
+}
+
+.header, .header-space {
+       height: 200px;
+}
+
+.footer, .footer-space {
+       height: 100px;
+}
+
+.patient {
+       border-bottom: 2px solid black;
+}
+
+.sign {
+       border-top: 2px solid black;
+}
+
+.formatted {
+       white-space: pre-wrap;
+       padding: 2px;
+}
+
+.ltxt {
+       text-align: left;
+}
+
+.rtxt {
+       text-align: right;
+}
+
+.ctxt {
+       text-align: center;
+}
+
+.jtxt {
+       text-align: justify;
+}
+
+.bordered {
+       border: 2px solid black;
+}
+
+.lbordered {
+       border-left: 2px dotted black;
+}
+
+.rbordered {
+       border-right: 2px dotted black;
+}
+
+.tbordered {
+       border-top: 2px solid black;
+}
+
+.bbordered {
+       border-bottom: 2px solid black;
+}
+
+.w0 {
+       width: 0%;
+}
+
+.w10 {
+       width: 10%;
+}
+
+.w20 {
+       width: 20%;
+}
+
+.w25 {
+       width: 25%;
+}
+
+.w30 {
+       width: 30%;
+}
+
+.w40 {
+       width: 40%;
+}
+
+.w50 {
+       width: 50%;
+}
+
+.w60 {
+       width: 60%;
+}
+
+.w70 {
+       width: 70%;
+}
+
+.w75 {
+       width: 75%;
+}
+
+.w80 {
+       width: 80%;
+}
+
+.w90 {
+       width: 90%;
+}
+
+.w100 {
+       width: 100%;
+}
index d046aaa81eb0970e39c473baef5db3e3ef6990b9..e9ca921f2e43f4e5efcce90917c2476bf5656c4f 100644 (file)
@@ -56,6 +56,7 @@ class Renderer:
         return data
 
     def render_markdown(self, data):
+        data["extra"]=markdown(data["extra"])
         data["note"]=markdown(data["note"])
         data["report"]=markdown(data["report"])
         data["advice"]=markdown(data["advice"])