From 9276d1aa6cadfae2914cf7a50fd1c50a04e22d53 Mon Sep 17 00:00:00 2001
From: "watcha.h@almacom.co.th" <watcha.h@almacom.co.th>
Date: Sun, 21 Jun 2015 23:05:47 +0700
Subject: [PATCH] report overtime

---
 .../layouts/clinic_compute_labor_cost.xml     |  11 +++---
 netforce_clinic/models/compute_labor_cost.py  |  33 +++++++++++++++---
 .../models/report_labor_cost_overtime.py      |   6 ++++
 .../reports/report_labor_cost_overtime.xlsx   | Bin 7270 -> 7812 bytes
 .../templates/report_labor_cost_overtime.hbs  |  13 +++----
 5 files changed, 45 insertions(+), 18 deletions(-)

diff --git a/netforce_clinic/layouts/clinic_compute_labor_cost.xml b/netforce_clinic/layouts/clinic_compute_labor_cost.xml
index b8b5173..ea2d654 100644
--- a/netforce_clinic/layouts/clinic_compute_labor_cost.xml
+++ b/netforce_clinic/layouts/clinic_compute_labor_cost.xml
@@ -1,9 +1,10 @@
 <form model="clinic.compute.labor.cost" title="Compute Labor Cost">
-    <field name="date" span="2" mode="month" onchange="onchange_date"/>
-    <field name="date_from" 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"/>
+<!--<field name="date" span="2" mode="month" onchange="onchange_date"/>-->
+    <field name="period_id" domain='[["state","=","open"]]' onchange="onchange_period" span="4"/>
+    <field name="date_from" span="4"/>
+    <field name="date_to" span="4"/>
+    <field name="branch_id" onchange='onchange_branch' span="4"/>
+    <field name="department_id" domain='[["branch_id","=",branch_id]]' span="4"/>
     <foot replace="1">
         <button string="Compute" method="compute" icon="repeat" type="default"/>
     </foot>
diff --git a/netforce_clinic/models/compute_labor_cost.py b/netforce_clinic/models/compute_labor_cost.py
index 75cf803..3896c2a 100644
--- a/netforce_clinic/models/compute_labor_cost.py
+++ b/netforce_clinic/models/compute_labor_cost.py
@@ -9,6 +9,7 @@ class ComputeLaborCost(Model):
     _transient=True
     
     _fields={
+        "period_id": fields.Many2One("clinic.period.line","Period"),
         "date": fields.Date("Month"),
         "date_from": fields.Date("From", required=True),
         "date_to": fields.Date("To", required=True),
@@ -25,11 +26,25 @@ class ComputeLaborCost(Model):
         weekday, total_day=monthrange(int(year), int(month))
         return "%s-%s-%s"%(year,month,total_day)
 
-    _defaults={
-        'date': lambda *a: time.strftime("%Y-%m-%d"),
-        'date_from': _get_date_from,
-        'date_to': _get_date_to,
-    }
+    def default_get(self,field_names=None,context={},**kw):
+        defaults=context.get("defaults",{})
+        date_from=defaults.get("date_from", self._get_date_from())
+        date_to=defaults.get("date_to", self._get_date_to())
+        yearnow=date_from.split("-")[0]
+        for period in get_model('clinic.period').search_browse([['name','=',yearnow]]):
+            for line in period.lines:
+                if line.state=='open':
+                    period_id=line.id
+                    date_from=line.date_start
+                    date_to=line.date_stop
+                    break
+        res={
+            'period_id': period_id,
+            'date': time.strftime("%Y-%m-%d"),
+            'date_from': date_from,
+            'date_to': date_to,
+        }
+        return res
     
     def compute(self,ids,context={}):
         obj=self.browse(ids)[0]
@@ -70,4 +85,12 @@ class ComputeLaborCost(Model):
         data['department_id']=None
         return data
 
+    def onchange_period(self,context={}):   
+        data=context['data']
+        period_id=data['period_id']
+        period=get_model('clinic.period.line').browse(period_id)
+        data['date_from']=period.date_start
+        data['date_to']=period.date_stop
+        return data
+
 ComputeLaborCost.register()
diff --git a/netforce_clinic/models/report_labor_cost_overtime.py b/netforce_clinic/models/report_labor_cost_overtime.py
index add003c..3537dab 100644
--- a/netforce_clinic/models/report_labor_cost_overtime.py
+++ b/netforce_clinic/models/report_labor_cost_overtime.py
@@ -104,6 +104,12 @@ class ReportLaborCostOverTime(Model):
             dom=dom.replace("False","false")
             dom=dom.replace("True","true")
             return dom.replace("'","\"")
+        def int2ths(r):
+            if type(r)==type(''):
+                return r
+            if not r:
+                return ""
+            return "{0:,.2f}".format(r) 
         lines=[]
         snames=sorted(staffs.keys()) #sort by staff name
         no=1
diff --git a/netforce_clinic/reports/report_labor_cost_overtime.xlsx b/netforce_clinic/reports/report_labor_cost_overtime.xlsx
index 7b7211ea5f8bcbb0ccc98daea03833eaff29dc62..6ccedebb991d0687aaf8005076b20ceeb26f8859 100644
GIT binary patch
literal 7812
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

literal 7270
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

diff --git a/netforce_clinic/templates/report_labor_cost_overtime.hbs b/netforce_clinic/templates/report_labor_cost_overtime.hbs
index 638ee1f..4aa894b 100644
--- a/netforce_clinic/templates/report_labor_cost_overtime.hbs
+++ b/netforce_clinic/templates/report_labor_cost_overtime.hbs
@@ -29,14 +29,11 @@
                     <td style="text-align:right;">
                         <a href="#name=clinic_report_labor_cost_summary&defaults.date_from={{../date_from}}&defaults.date_to={{../date_to}}&defaults.staff_type={{staff_type}}&defaults.staff_id={{staff_id}}">{{currency amount zero=""}}</a>
                     </td>
-                    <td style="text-align:right;">{{max_cycle}}</td>
+                    <td style="text-align:right;">{{currency max_cycle zero=""}}</td>
                     <td style="text-align:right;">
                         {{view "link" string=cycle_qty action="clinic_labor_cost_item" action_options=action_options}}
                     </td>
-                    <!--
-                    <td style="text-align:right;">{{cycle_qty}}</th>
-                    -->
-                    <td style="text-align:right;">{{ot_qty}}</th>
+                    <td style="text-align:right;">{{currency ot_qty zero=""}}</th>
                     <td style="text-align:right;">{{currency ot_per_cycle zero=""}}</th>
                     <td style="text-align:right;color:orange">{{currency ot_amount zero=""}}</th>
                     <td style="text-align:right;color:blue">{{currency staff_wage zero=""}}</th>
@@ -51,9 +48,9 @@
         <th></th>
         <th>รวม</th>
         <th style="text-align:right">{{currency total_amount zero=""}}</th>
-        <th style="text-align:right">{{total_max_cycle}}</th>
-        <th style="text-align:right">{{total_cycle_qty}}</th>
-        <th style="text-align:right">{{total_ot_qty}}</th>
+        <th style="text-align:right">{{currency total_max_cycle zero=""}}</th>
+        <th style="text-align:right">{{currency total_cycle_qty zero=""}}</th>
+        <th style="text-align:right">{{currency total_ot_qty zero=""}}</th>
         <th style="text-align:right">{{currency total_ot_per_cycle zero=""}}</th>
         <th style="text-align:right">{{currency total_ot_amount zero=""}}</th>
         <th style="text-align:right">{{currency total_wage zero=""}}</th>