From 039c884bf67f80f41ea73d77a1c4eb8402e4407c Mon Sep 17 00:00:00 2001
From: "watcha.h@almacom.co.th" <watcha.h@almacom.co.th>
Date: Fri, 9 Jan 2015 17:39:33 +0700
Subject: [PATCH] refactor

---
 .../actions/clinic_account_setting.xml        |  9 ++++
 netforce_clinic/actions/clinic_setting.xml    |  5 +-
 .../layouts/clinic_account_setting.xml        | 30 ++++++++++++
 .../layouts/clinic_menu_inherit.xml           |  4 +-
 netforce_clinic/layouts/clinic_setting.xml    | 47 ++-----------------
 .../layouts/clinic_sickbed_form.xml           |  1 +
 netforce_clinic/layouts/clinic_staff_list.xml |  2 +-
 netforce_clinic/models/sickbed.py             |  1 +
 netforce_clinic/todo.txt                      | 13 ++---
 9 files changed, 54 insertions(+), 58 deletions(-)
 create mode 100644 netforce_clinic/actions/clinic_account_setting.xml
 create mode 100644 netforce_clinic/layouts/clinic_account_setting.xml

diff --git a/netforce_clinic/actions/clinic_account_setting.xml b/netforce_clinic/actions/clinic_account_setting.xml
new file mode 100644
index 0000000..b643066
--- /dev/null
+++ b/netforce_clinic/actions/clinic_account_setting.xml
@@ -0,0 +1,9 @@
+<record model="action">
+    <field name="name">clinic_account_setting</field>
+    <field name="view">form_view</field>
+    <field name="model">clinic.setting</field>
+    <field name="active_id">1</field>
+    <field name="view_xml">clinic_account_setting</field>
+    <field name="menu">account_menu</field>
+</record>
+
diff --git a/netforce_clinic/actions/clinic_setting.xml b/netforce_clinic/actions/clinic_setting.xml
index 7dac94f..7e6d456 100644
--- a/netforce_clinic/actions/clinic_setting.xml
+++ b/netforce_clinic/actions/clinic_setting.xml
@@ -1,10 +1,9 @@
 <record model="action">
     <field name="name">clinic_setting</field>
-    <field name="string">Settings</field>
-    <field name="view_cls">form_view</field>
+    <field name="view">form_view</field>
     <field name="model">clinic.setting</field>
-    <field name="modes">form</field>
     <field name="active_id">1</field>
+    <field name="view_xml">clinic_setting</field>
     <field name="menu">clinic_menu</field>
 </record>
 
diff --git a/netforce_clinic/layouts/clinic_account_setting.xml b/netforce_clinic/layouts/clinic_account_setting.xml
new file mode 100644
index 0000000..02b4b80
--- /dev/null
+++ b/netforce_clinic/layouts/clinic_account_setting.xml
@@ -0,0 +1,30 @@
+<form model="clinic.setting" title="Clinic Settings">
+    <tabs>
+        <tab string="Labor Cost">
+            <separator string="Nurse"/>
+            <field name="var_k"/>
+            <field name="levels" nolabel="1">
+                <list>
+                    <field name="level_id"/>
+                    <field name="var_a" onchange="onchange_line"/>
+                    <field name="op" onchange="onchange_line"/>
+                    <field name="var_b" onchange="onchange_line"/>
+                    <field name="formular"/>
+                </list>
+                <form>
+                    <field name="level_id"/>
+                    <field name="var_a"/>
+                    <field name="op"/>
+                    <field name="var_b"/>
+                    <field name="formular"/>
+                </form>
+            </field>
+            <separator string="Doctor"/>
+            <field name="cost_per_case"/>
+        </tab>
+        <tab string="Importing">
+            <field name="patient_type_id"/>
+            <field name="imp_patient_type_id"/>
+        </tab>
+    </tabs>
+</form>
diff --git a/netforce_clinic/layouts/clinic_menu_inherit.xml b/netforce_clinic/layouts/clinic_menu_inherit.xml
index 601e83c..7029e07 100644
--- a/netforce_clinic/layouts/clinic_menu_inherit.xml
+++ b/netforce_clinic/layouts/clinic_menu_inherit.xml
@@ -11,8 +11,8 @@
             <item string="Staff Fee Summary" action="clinic_report_staff_fee_sum"/>
             <item string="Staff Fee Detail" action="clinic_report_staff_fee_detail"/>
             <divider/>
-            <header string="SETTINGS"/>
-            <item string="Labor Cost Setting" action="clinic_report_staff_fee_sum"/>
+            <header string="OTHERS"/>
+            <item string="Clinic Settings" action="clinic_account_setting"/>
         </item>
     </item>
     <item string="Conversion Balances" position="after">
diff --git a/netforce_clinic/layouts/clinic_setting.xml b/netforce_clinic/layouts/clinic_setting.xml
index 8127c2a..2bdff22 100644
--- a/netforce_clinic/layouts/clinic_setting.xml
+++ b/netforce_clinic/layouts/clinic_setting.xml
@@ -23,48 +23,7 @@
                         <field name="amount"/>
                     </list>
                 </field>
-                <!--
-                <separator string="Invoice Policy"/>
-                <field name="invoice_policies" nolabel="1">
-                    <list>
-                        <field name="patient_type_id"/>
-                        <field name="invoice_policy"/>
-                        <field name="invoice_option"/>
-                    </list>
-                    <form>
-                        <field name="patient_type_id"/>
-                        <field name="invoice_policy"/>
-                        <field name="invoice_option"/>
-                    </form>
-                </field>
-                -->
-            </group>
-        </tab>
-        <tab string="Labor Cost">
-            <separator string="Nurse"/>
-            <field name="var_k"/>
-            <field name="levels" nolabel="1">
-                <list>
-                    <field name="level_id"/>
-                    <field name="var_a" onchange="onchange_line"/>
-                    <field name="op" onchange="onchange_line"/>
-                    <field name="var_b" onchange="onchange_line"/>
-                    <field name="formular"/>
-                </list>
-                <form>
-                    <field name="level_id"/>
-                    <field name="var_a"/>
-                    <field name="op"/>
-                    <field name="var_b"/>
-                    <field name="formular"/>
-                </form>
-            </field>
-            <separator string="Doctor"/>
-            <field name="cost_per_case"/>
-        </tab>
-        <tab string="Importing">
-            <field name="patient_type_id"/>
-            <field name="imp_patient_type_id"/>
+           </group>
         </tab>
         <tab string="Dialyzer">
             <field name="stock_journal_id"/>
@@ -73,12 +32,14 @@
             <separator string='Transfer nurses to cycle item'/>
             <field name="schd_from"/>
             <field name="schd_to"/>
-            <button string="Confirm" type="success" method="schd_confirm"/>
+            <button string="Transfer" type="primary" icon="arrow-right" method="schd_confirm"/>
         </tab>
+        <!--
         <tab string="Testing">
             <button string="Dummy" type="default" method="run_script"/>
             <button string="Reset Import" icon="repeat" type="default" method="reset_last_import"/>
         </tab>
+        -->
     </tabs>
     <foot>
     </foot>
diff --git a/netforce_clinic/layouts/clinic_sickbed_form.xml b/netforce_clinic/layouts/clinic_sickbed_form.xml
index 6966220..6dc3aae 100644
--- a/netforce_clinic/layouts/clinic_sickbed_form.xml
+++ b/netforce_clinic/layouts/clinic_sickbed_form.xml
@@ -7,6 +7,7 @@
     <field name="name"/>
     <field name="available" readonly="1"/>
     <field name="sequence"/>
+    <field name="note"/>
     <field name="company_id" invisible="1"/>
     <related>
         <field name="hd_cases"/>
diff --git a/netforce_clinic/layouts/clinic_staff_list.xml b/netforce_clinic/layouts/clinic_staff_list.xml
index dcd96ee..97b669a 100644
--- a/netforce_clinic/layouts/clinic_staff_list.xml
+++ b/netforce_clinic/layouts/clinic_staff_list.xml
@@ -14,6 +14,6 @@
     <field name="level_id"/>
     <field name="categ_id"/>
     <field name="type"/>
-    <field name="image"/>
+    <field name="image" preview="1"/>
     <field name="state"/>
 </list>
diff --git a/netforce_clinic/models/sickbed.py b/netforce_clinic/models/sickbed.py
index 70b771c..154573f 100644
--- a/netforce_clinic/models/sickbed.py
+++ b/netforce_clinic/models/sickbed.py
@@ -34,6 +34,7 @@ class SickBed(Model):
         'date': fields.Date("Date",function="_get_all",function_multi=True),
         "state": fields.Selection([("available","Available"),("not_available","Not Available")],"Status"),
         'sequence': fields.Integer("Sequence"),
+        'note': fields.Text("Note"),
     }
 
     _defaults={
diff --git a/netforce_clinic/todo.txt b/netforce_clinic/todo.txt
index d5ab5ac..7326a79 100644
--- a/netforce_clinic/todo.txt
+++ b/netforce_clinic/todo.txt
@@ -1,13 +1,8 @@
 =====
-    -bug
-        - generate schedule
-            - copy nurse
-            - create duplicate
-        - import
-            - check name
-    - get account id by product -> ok
-    - access right control
-        
+    - access right
+    - fix bug
+        - schedule
+        - import 
 =====
 create button reset at setting
     - backup master data