From 93cba3e688369b6c235ac4f024674e97c7bc130d Mon Sep 17 00:00:00 2001
From: "watcha.h" <watcha.h@almacom.co.th>
Date: Thu, 19 Mar 2015 13:43:25 +0700
Subject: [PATCH] pending cycle item

---
 netforce_clinic/actions/clinic_cycle_item.xml      |  2 +-
 netforce_clinic/layouts/clinic_cycle_item_form.xml | 13 ++++++++-----
 netforce_clinic/layouts/clinic_cycle_item_list.xml |  1 +
 netforce_clinic/models/cycle_item.py               |  9 ++++++++-
 4 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/netforce_clinic/actions/clinic_cycle_item.xml b/netforce_clinic/actions/clinic_cycle_item.xml
index 405d100..d066491 100644
--- a/netforce_clinic/actions/clinic_cycle_item.xml
+++ b/netforce_clinic/actions/clinic_cycle_item.xml
@@ -3,7 +3,7 @@
     <field name="view_cls">multi_view</field>
     <field name="model">clinic.cycle.item</field>
     <field name="modes">list,form</field>
-    <field name="tabs">[["All",[]],["Draft",[["state","=","draft"]]],["Validated",[["state","=","validated"]]]]</field>
+    <field name="tabs">[["All",[]],["Draft",[["state","=","draft"]]],["Pending",[["state","=","pending"]]],["Validated",[["state","=","validated"]]]]</field>
     <field name="menu">clinic_menu</field>
     <field name="limit">25</field>
 </action>
diff --git a/netforce_clinic/layouts/clinic_cycle_item_form.xml b/netforce_clinic/layouts/clinic_cycle_item_form.xml
index 2ce57dd..7b44aae 100644
--- a/netforce_clinic/layouts/clinic_cycle_item_form.xml
+++ b/netforce_clinic/layouts/clinic_cycle_item_form.xml
@@ -5,7 +5,7 @@
             <item string="Copy Nurses" method="cycle_item_copy" states='draft'/>
             <!--<item string="Recheck HD Case" method="update_hdcase" states="draft"  confirm="Are you sure?"/>-->
             <item string="View Schedule" method="view_schedule"/>
-            <item string="To Draft" method="to_draft" states="validated" />
+            <item string="To Draft" method="to_draft" states="pending,validated" />
         </button>
     </head>
     <group from_layout="stacked">
@@ -26,17 +26,20 @@
             </field>
         </tab>
         <tab string="Validation">
-            <field name="user_id" span="4"/>
-            <button string="Validate" perm="clinic_cycle_item_validate" type="success" method="validate" icon="ok" size="small" states="draft" />
-            <group span="6" columns="1">
-            </group>
             <group span="6" columns="1">
+                <field name="user_id" span="6"/>
+                <button string="Validate" perm="clinic_cycle_item_validate" type="success" method="validate" icon="ok" size="small" states="draft,pending" />
                 <template>
                     <div>
                         <p></p>
                         <b>Note: </b>State Accept: <b style="color:green">'Finish Treatment', 'Waiting Payment', 'Paid'.</b></div>
                 </template>
             </group>
+            <group span="6" columns="1">
+                <button string="Pending" perm="clinic_cycle_item_validate" type="default" method="pending" icon="pause" size="small" states="draft" />
+                <newline/>
+                <field name="note"/>
+            </group>
         </tab>
     </tabs>
     <related>
diff --git a/netforce_clinic/layouts/clinic_cycle_item_list.xml b/netforce_clinic/layouts/clinic_cycle_item_list.xml
index 5f8ec6d..a48de9f 100644
--- a/netforce_clinic/layouts/clinic_cycle_item_list.xml
+++ b/netforce_clinic/layouts/clinic_cycle_item_list.xml
@@ -9,5 +9,6 @@
     <field name="nurse_total"/>
     <field name="user_id"/>
     <field name="date_validate"/>
+    <field name="note"/>
     <field name="state"/>
 </list>
diff --git a/netforce_clinic/models/cycle_item.py b/netforce_clinic/models/cycle_item.py
index 7a1fe87..4feeebf 100644
--- a/netforce_clinic/models/cycle_item.py
+++ b/netforce_clinic/models/cycle_item.py
@@ -46,8 +46,9 @@ class CycleItem(Model):
         'branch_id': fields.Many2One("clinic.branch", "Branch",search=True),
         'department_id': fields.Many2One("clinic.department", "Department",search=True),
         "comments": fields.One2Many("message","related_id","Comments"), "company_id": fields.Many2One("company","Company"),
-        "state": fields.Selection([("draft","Draft"),("validated","Validated")],"Status",required=True),
+        "state": fields.Selection([("draft","Draft"),('pending','Pending'),("validated","Validated")],"Status",required=True),
         'nurse_total': fields.Integer("Nurses",function="_get_all",function_multi=True),
+        'note': fields.Text("Note"),
     }
 
     def _get_branch(self,context={}):
@@ -278,4 +279,10 @@ class CycleItem(Model):
             },
         }
 
+    def pending(self,ids,context={}):
+        for obj in self.browse(ids):
+            obj.write({
+                'state': 'pending',
+            })
+
 CycleItem.register()