From f63090ae621a314db0c4a58cee6e3980fca10ff2 Mon Sep 17 00:00:00 2001
From: "watcha.h" <watcha.h@almacom.co.th>
Date: Thu, 19 Mar 2015 07:56:47 +0700
Subject: [PATCH] report claim / no claim

---
 .../clinic_report_account_hd_case_summary.xml |   2 +-
 netforce_clinic/models/matching_hdcase.py     |   1 +
 .../models/report_account_hd_case_summary.py  |   8 ++++++++
 .../report_account_hd_case_summary.xlsx       | Bin 4965 -> 5743 bytes
 .../report_account_hd_case_summary.hbs        |  12 ++++++++----
 netforce_clinic/todo.txt                      |   3 +++
 6 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/netforce_clinic/layouts/clinic_report_account_hd_case_summary.xml b/netforce_clinic/layouts/clinic_report_account_hd_case_summary.xml
index b81e50e..aa048fd 100644
--- a/netforce_clinic/layouts/clinic_report_account_hd_case_summary.xml
+++ b/netforce_clinic/layouts/clinic_report_account_hd_case_summary.xml
@@ -1,6 +1,6 @@
 <form model="clinic.report.account.hd.case.summary">
     <field name="date" span="2" mode="month" onchange="onchange_date"/>
-    <field name="date_from" span="2"/>
+    <field name="date_from" onchange="onchange_datefrom" span="2"/>
     <field name="date_to" span="2"/>
     <field name="branch_id" onchange="onchange_branch" span="3"/>
     <field name="department_id" domain='[["branch_id","=",branch_id]]' span="3"/>
diff --git a/netforce_clinic/models/matching_hdcase.py b/netforce_clinic/models/matching_hdcase.py
index 94770e8..f36c847 100644
--- a/netforce_clinic/models/matching_hdcase.py
+++ b/netforce_clinic/models/matching_hdcase.py
@@ -113,6 +113,7 @@ class MatchingHDCase(Model):
                     name=name.upper()
                     products[name]=prod['id']
                 dom=[]
+                dom.append(['patient_id.walkin',"=","no"]) #XXX
                 dom.append(['date',">=",date_from])
                 dom.append(['date',"<=",date_to])
                 dom.append(['state','!=','cancelled'])
diff --git a/netforce_clinic/models/report_account_hd_case_summary.py b/netforce_clinic/models/report_account_hd_case_summary.py
index c613528..53fec3a 100644
--- a/netforce_clinic/models/report_account_hd_case_summary.py
+++ b/netforce_clinic/models/report_account_hd_case_summary.py
@@ -71,6 +71,7 @@ class ReportAccountHDCaseSummary(Model):
         dom=[
             ['date','>=', date_from],
             ['date','<=', date_to],
+            ['patient_id.walkin','=','no'],
         ]
         if ptype_id:
             dom.append(['patient_type_id','=',ptype_id])
@@ -217,6 +218,8 @@ class ReportAccountHDCaseSummary(Model):
             'total_qty': total_qty,
             'types': types,
             'reimbursable': reimbursable,
+            'is_reim': reimbursable=='yes' and True or False,
+            'ptype_id': ptype_id,
         }
         if not reimbursable:
             data['title']=''
@@ -240,5 +243,10 @@ class ReportAccountHDCaseSummary(Model):
         data=context['data']
         data['department_id']=None
         return data
+    
+    def onchange_datefrom(self,context={}):
+        data=context['data']
+        data['date_to']=data['date_from']
+        return data
 
 ReportAccountHDCaseSummary.register()
diff --git a/netforce_clinic/reports/report_account_hd_case_summary.xlsx b/netforce_clinic/reports/report_account_hd_case_summary.xlsx
index 4080997bd9b109de2f5ac5615faceb5865dfc131..11e745e405c8793df93fe1ff3cd7c1eb93a01a76 100644
GIT binary patch
delta 3353
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
E07g9{A^-pY

delta 2558
zcmZ8j2{hDe8=pvH8%>NQvW;wsm~4|J+sHN{qZHEEvW=Z<{|h5(vdy(?NTM0hHHu1-
zhNM9ZxoVVsiIFvA`1+*poUePIbKdj3=RLpYJ<oa0@A;kI;_)d3h@Ca(ei(?Gn;Y~r
zKC})ZvX65&*DLH3-MbKtIFx~QC)XgRHY|SRA#|;`3N7eMr#diE)0*>%nmjq-T<hk}
zf1=C;9doF~+gq;ZN*f;C>7lk89be5krN7~l!|2?mZD`g-Vk}<Q<8K{#*WlAICQEPN
zW7BC<CmfhLH#}u6qs&Fug>u)gPuZ>-h-M-xF&9Buop?!=+|sAD!$6y+JYx*mU8Xn=
zm**{VpMUFOCs<U>Xlp0wggCrHG@0oNola`Kn}(a^8i6TyV|d^`Ca~Uo4f?(2lH$XG
zc;PxT`{lyxMtbn{ir##pYID_`b>P-}&KA7Urv<f{z=+jQDMW#BwL6cvDl05}{Selm
zjj);A*UZ{((AFOV#y5howyzt68ELTeE%aZ(_a^w9(~~~tU15q%KQGUw%sle!+Q`qs
zW<#T)1An;H5#DYEN<LS{aMZD@!n=vdB)u2cpBi3!W!DwhQHohoD0{O-QV756Gn5il
z%Twc%GpmX72Y)}#vZ*Ew4U)WMM@D#SN7d>rj%CDfJwO7$z?b<p?38{O>2r_;#|`*H
z<_qmB9riUl!qMaS?7vuCXvk?*{cH4$!8Y?qMLTqXP_sfczs#o~#~O2-s#f@h4hG`q
zm@rR~Kbn7uaICrjFN-7EbpA2Qbs?{?8e@A(&vssr5`_i#=q_!4fn~<&OXRCec4UX(
z3E-^kMH}GRP?c=vvB^FtB2?kFZLs*t6BDVHQ&(F|*1=hIiv!|!LDRYr<ozr~(-KZ_
zi_0xvyuRc(3u)Xtr*R4reO~rmYF2i#xUxPFDUMi~<63}xxhAQ<+8Z#=)xXSr+sSkw
zAn(qnq%%EF9L&Puk<G5Xy$P)zS5tRFOm{Ho;AUXEx0j?L*fiCN?aARQe-o;<nQ$cu
zEh}t$qC2eG(3?J_NRi$b!AeW}3i^gsUS26^Dc36!6Dik^U(@ltS3DEJOln&52x?rL
z{(6>}a(eXJNR}yWa_JCqSnj%bsCOF**l&1bx$d<4S|m?K(f%JB<PLAYVISv4XV=$3
zRW|{^Y13`za^E(MTDv8u5Of9ztyrk2!Yy%xf?I)BHC^AQ&4Um6&2N$IY4i6r;#IX$
zGsgi1ZU40Hm^SYqOaABuGV9y@JNYH_s<7fsz_fPtjZu8)EUxph^T9DgWSm*gf__X`
zD<Xm@F>|$jH1;L6LBNmstZIULv&Gvj7-%I$S6Wax^ej<|9!qUEa9fgrzVOpRbzbTr
z?$3`rpG9-FAfj+Wg!JVBLxG}$EV9;xGNzqv0Lz&V8uFJbj)~(B$abDj36OeMzvSNq
z!})Ve`?NbOWZcsZDa=?d>09Z7aD9n-m&QYW#Mh+8&{7@IAgI*(UutYQ|1i}RXjcn8
zkcq<0%IxpYW=KxEC>a+prUR^lQaZs$JlCQ9tOJ<$l1SkVR$<-=ElHY_MND)T`2lQg
zcrM8y#J<S?Lp8>f+w&Oyx#r46*_&`BY$bnWn48cG9$IEoWVhOkKEJhGbKDum_Rib5
z7WVnzZ~wV=4|D17(apsuD{AQ?YF4DANlC9;H>G<j?rVd(c-_%egjvmXuY?itAzuHl
zk*g`*t8Rr;Zg$pS?kC!ZElc-<Kpzf)K>v_7;ySlHfXg=aqp3qt8wPm0zi$nTSZOp+
zxhFyLuHbf38;3PjYr<WQA88T$w4?%o9~`*c1FZgts|a8g7sV%@SqSKn*5SE&h3|r2
zZ0C12_Q%rO!#UJ@l-u}{gNbn}iwHA!{QPlL|H-Sj-{Zhdr)6JX>WW4URG3_`zh?g=
z1Ttg+^z=xeLe@mD-2ywha~V~N*jlc@35+~C|Kl!;R6E^%CA}jx2=$CYnZoq+ou%eK
z6ue~ryfGS;LDQusvmM{4ss@#HlUMJb)vEY`<xWV=pN4)l78bsHXP*mgUdz<S*NNEv
zXG4s6=^d|C1S@ifun06IsBW+m3PD=6nuk-Bas~TqzEjeEsI=_+IV>xb@dVF45J-~a
zU&E?L^D%zuKOCY0m@tmw6iwboc5C`lDB8IS=-A-aL`M%frmraw|4;*p$W>rS<yq=u
z1vW^rPo&e)!7qA{F_l&)m8YY^Cq2wiM?Dl6$OI=f!&3JO$RUlfbG=A4^6QzgDx>0@
zem3D;a-#7pvWKAjB8rrOC=!Z4%6Dwk67G1Gf0#1Rj|a++4h|~Md>-1kdiiX@ORUWK
z?{FP)RH!`v8z0%p?T4QHbuF$VE+eknFW(rjrIM!tlA6_*{F2lyDu$M9>Npc`O~MR>
z3_C<`914stCn!NyRKh*8Qzi-d0%FcaErYf@$I|Z3$+MoZe-yK&K17B4-#z~*zvbBw
zLcNEHAk+bzugYXz+sTUrC(nJO9xr>uQAF><MCv_oK)vmY`WSLw4Z2}Z5i5Giv=A`S
zkR!uVfZP+kvpi!(<05fN;!6CwXnv?lp7*++Cw9bDTrSK>Q%d`hN1!Owu)Ji1*|}L5
z@cA>C5s_qJzqFE6kC_}8ca)Nhx%fTEnD6`b?iwH`)x1*N0o-&ylJ|<w0$ayAxF(;O
zEO?-TClf&)QW5*eTZysb!X*}@srZhPPqw%9pHnOFt@oP!IBaQJ!mXY(0-?dJ$5xX2
zZo=CIyTqj}9Qt_A9KI=QMDOrgGn+u4iJqVQWb=O7nLOt%Jx$Rb&V697bFslax!_V)
z6cng`mk4n`ppjf)+$A&Zwqt)b<DgadY}tT~fK~Tq)<B7t`}42spK#N9?9GXd#$|Tr
z0vyl_k5tJV?3C>qnKX)6=*qt!+8E~P&u2iBgc;O|>DUZB=(D0BXBgO;Be5jXgan(M
z6l4-@pxGha@6xHS2%-CYv_8p9KCrU_pc^sumnoeBl-zR|GcS5LgC0(m?$4|3zufSp
zBcKt3>OH60cQGPu7zPW}E+xOx`AO~A5X{h%U0Tlz{+rq+(EoWH=R+5MnVrXiA-~A3
z4AcJUeu(Zcl)!E_|G$_JAH#HIem?!aGBD8ZAqFNwgyDOj$1K;Lg5AC9+HK(A?--B=
zH_=vDau4)-hme1Oba{ycVTrv?D8dpPDiC6au+(0Siu52|V)x_i-LorjzlE6qkxN8+
g542oXnXIu3xUegOLcc*kAksminTY%W=w9i60hwx-E&u=k

diff --git a/netforce_clinic/templates/report_account_hd_case_summary.hbs b/netforce_clinic/templates/report_account_hd_case_summary.hbs
index f3f8b21..872faa2 100644
--- a/netforce_clinic/templates/report_account_hd_case_summary.hbs
+++ b/netforce_clinic/templates/report_account_hd_case_summary.hbs
@@ -17,10 +17,14 @@
             {{else}}
                 <th colspan="14" style="text-align:center">
             {{/ifeq}}
-                {{#each types}}
-                    <span class="label label-{{color}}">{{name}}: {{qty}}</span>
-                {{/each}}
-                <span class="label label-default">Total: {{total_qty}}</span>
+                {{#if ptype_id}}
+                    <span class="label label-default">Total: {{total_qty}}</span>
+                {{else}}
+                    {{#each types}}
+                        <span class="label label-{{color}}">{{name}}: {{qty}}</span>
+                    {{/each}}
+                        <span class="label label-default">Total: {{total_qty}}</span>
+                {{/if}}
             </th>
         </tr>
         <tr>
diff --git a/netforce_clinic/todo.txt b/netforce_clinic/todo.txt
index 7a920c0..159be6f 100644
--- a/netforce_clinic/todo.txt
+++ b/netforce_clinic/todo.txt
@@ -1,3 +1,6 @@
+=====
+- if department of staff or  patient not related to department profile of user , it will show error's permission denied.
+=====
 - report
     - walkin
 - receipt **