From 168badd98f95089661af34d831d354e16a294c6f Mon Sep 17 00:00:00 2001
From: "watcha.h@almacom.co.th" <watcha.h@almacom.co.th>
Date: Wed, 6 May 2015 18:25:15 +0700
Subject: [PATCH] improve

---
 netforce_clinic/models/report_cycle_item.py   |   2 +
 .../models/report_medical_summary.py          |   3 +
 .../reports/report_cycle_item.xlsx            | Bin 5576 -> 5504 bytes
 .../templates/report_cycle_item.hbs           |  67 ++++--------------
 netforce_clinic/templates/report_visit.hbs    |   2 +-
 5 files changed, 18 insertions(+), 56 deletions(-)

diff --git a/netforce_clinic/models/report_cycle_item.py b/netforce_clinic/models/report_cycle_item.py
index cba6277..c35e296 100644
--- a/netforce_clinic/models/report_cycle_item.py
+++ b/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,
diff --git a/netforce_clinic/models/report_medical_summary.py b/netforce_clinic/models/report_medical_summary.py
index 4ee091e..ba3c65d 100644
--- a/netforce_clinic/models/report_medical_summary.py
+++ b/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 "",
diff --git a/netforce_clinic/reports/report_cycle_item.xlsx b/netforce_clinic/reports/report_cycle_item.xlsx
index 4cf0f5001b6936c9447229a903fa3644081a1dde..742a7e14b81bf8b4600ce6346db17d7ef5556b6b 100644
GIT binary patch
delta 2299
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
ZA|IYJr=LUc2m`x{?(#^}%X6Qm{0kJGDn$SQ

delta 2327
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
BQa=Cy

diff --git a/netforce_clinic/templates/report_cycle_item.hbs b/netforce_clinic/templates/report_cycle_item.hbs
index f0b4310..eaf1dc4 100644
--- a/netforce_clinic/templates/report_cycle_item.hbs
+++ b/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>
--->
diff --git a/netforce_clinic/templates/report_visit.hbs b/netforce_clinic/templates/report_visit.hbs
index e70c58e..83d20a2 100644
--- a/netforce_clinic/templates/report_visit.hbs
+++ b/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>