improve

netforce_clinic/models/report_cycle_item.py

@@ -242,11 +242,13 @@ class ReportCycleItem(Model):
                 'v%s_1'%index: vscl_line['qty'],
             })
             index+=1
+        vscl_txt=' '.join(['%s = %s'%(x['description'],x['qty']) for x in vscl_lines])
         data={
             'company_name': company_name or "",
             'lines': nlines,
             'vscl_lines': vscl_lines,
             'vscl_lines2': vscl_lines2,
+            'vscl_txt': vscl_txt,
             'ptype_lines': ptype_lines,
             'ptype_txt': ptype_txt,
             'month': month_str,

netforce_clinic/models/report_medical_summary.py

@@ -202,6 +202,9 @@ class ReportMedicalSummary(Model):
         elif branch_id:
             branch=get_model("clinic.branch").browse(branch_id)
             sub_name="(%s)" % branch.name or ""
+        from pprint import pprint
+        for line in lines:
+            pprint(line)
         data={
             'company_name': '%s %s' % (company.name or "", sub_name),
             'parent_company_name': company.parent_id.name or "",

netforce_clinic/templates/report_cycle_item.hbs

@@ -5,7 +5,7 @@
     </h4>
 </center>
 <table class="table table-condensed table-striped" style="margin-bottom:0px;">
-    <thead>
+    <thead class="scroll-header">
         <th>วันที่</th>
         <th>รอบ</th>
         <th>No</th>
@@ -68,63 +68,20 @@
         {{/each}}
     </tbody>
     <tfoot>
-        <th class="active">รวมผู้ป่วยทั้งหมด</th>
-        <th class="active"></th>
+        <th rowspan="2" class="active">รวมผู้ป่วยทั้งหมด</th>
+        <th rowspan="2" class="active"></th>
         <th class="active">{{total_pt}}</th>
         <th colspan="7" class="active">
-            {{#each ptype_lines}}
-                {{name}} : {{qty}} &nbsp;&nbsp;&nbsp;
+            <p>
+                {{#each ptype_lines}}
+                    {{name}} : {{qty}} &nbsp;&nbsp;&nbsp;
+                {{/each}}
+            </p>
+            <p>
+            {{#each vscl_lines}}
+                {{description}} = {{qty}} &nbsp;&nbsp;&nbsp;
             {{/each}}
+            </p>
         </th>
     </tfoot>
 </table>
-<table class="table table-condensed table-striped" style="margin-bottom:0px;">
-    <tbody>
-        <tr>
-            {{#each vscl_lines}}
-                <th style="text-align:right;">{{description}} = </th>
-                <th style="text-align:left">{{qty}}</th>
-            {{/each}}
-        </tr>
-    </tbody>
-</table>
-<!--
-<table class="table table-condensed table-striped">
-        <tr>
-            <td colspan="5" style="width:50%">
-                <table class="table ">
-                    <thead>
-                        <th>Vascular Access</th>
-                        <th>Qty</th>
-                    </thead>
-                    <tbody>
-                        {{#each vscl_lines}}
-                            <tr>
-                                <td>{{description}}</td><td>{{qty}}</td>
-                            </tr>
-                        {{/each}}
-                    </tbody>
-                </table>
-            </td>
-            <td colspan="6" style="width:50%">
-                <table class="table ">
-                    <thead>
-                        <th>Patient Type</th>
-                        <th>Qty</th>
-                    </thead>
-                    <tbody>
-                        {{#each ptype_lines}}
-                            <tr>
-                                <td>{{name}}</td><td>{{qty}}</td>
-                            </tr>
-                        {{/each}}
-                    </tbody>
-                    <tfoot>
-                        <th>รวมผู้ป่วยทั้งหมด</th>
-                        <th>{{total_pt}}</th>
-                    </tfoot>
-                </table>
-            </td>
-        </tr>
-</table>
--->

netforce_clinic/templates/report_visit.hbs

@@ -14,7 +14,7 @@
     -->
 </center>
 <table class="table table-condensed table-striped">
-    <thead>
+    <thead class="scroll-header">
         <th>#</th>
         <th>วันที่</th>
         <th>รอบ</th>