From 563ef053e7e3e93f9381519545e9b1fdacc32643 Mon Sep 17 00:00:00 2001
From: "watcha.h" <watcha.h@almacom.co.th>
Date: Tue, 25 Nov 2014 22:22:50 +0700
Subject: [PATCH] xxxx

---
 .../{clinic_staff_move.xml => clinic_staff_rotate.xml}    | 4 ++--
 netforce_clinic/layouts/clinic_menu.xml                   | 6 +++---
 ...c_staff_move_form.xml => clinic_staff_rotate_form.xml} | 2 +-
 ...c_staff_move_list.xml => clinic_staff_rotate_list.xml} | 2 +-
 netforce_clinic/models/__init__.py                        | 2 +-
 netforce_clinic/models/staff_categ.py                     | 1 +
 .../models/{staff_move.py => staff_rotation.py}           | 8 ++++----
 7 files changed, 13 insertions(+), 12 deletions(-)
 rename netforce_clinic/actions/{clinic_staff_move.xml => clinic_staff_rotate.xml} (51%)
 rename netforce_clinic/layouts/{clinic_staff_move_form.xml => clinic_staff_rotate_form.xml} (88%)
 rename netforce_clinic/layouts/{clinic_staff_move_list.xml => clinic_staff_rotate_list.xml} (88%)
 rename netforce_clinic/models/{staff_move.py => staff_rotation.py} (87%)

diff --git a/netforce_clinic/actions/clinic_staff_move.xml b/netforce_clinic/actions/clinic_staff_rotate.xml
similarity index 51%
rename from netforce_clinic/actions/clinic_staff_move.xml
rename to netforce_clinic/actions/clinic_staff_rotate.xml
index 3658897..d48f8e5 100644
--- a/netforce_clinic/actions/clinic_staff_move.xml
+++ b/netforce_clinic/actions/clinic_staff_rotate.xml
@@ -1,6 +1,6 @@
 <action>
-    <field name="string">Staff Moves</field>
+    <field name="string">Staff Rotation</field>
     <field name="view_cls">multi_view</field>
-    <field name="model">clinic.staff.move</field>
+    <field name="model">clinic.staff.rotation</field>
     <field name="menu">clinic_menu</field>
 </action>
diff --git a/netforce_clinic/layouts/clinic_menu.xml b/netforce_clinic/layouts/clinic_menu.xml
index 8ffae5a..4efebbf 100644
--- a/netforce_clinic/layouts/clinic_menu.xml
+++ b/netforce_clinic/layouts/clinic_menu.xml
@@ -5,12 +5,12 @@
         <item string="Doctors" action="clinic_staff" action_options="tab_no=2"/>
         <item string="Nurses" action="clinic_staff" action_options="tab_no=3"/>
         <divider/>
-        <header string="MOVEMENT"/>
-        <item string="Staff Movement" action="clinic_staff_move"/>
+        <header string="ROTATION"/>
+        <item string="Staff Rotation" action="clinic_staff_rotate"/>
         <divider/>
         <header string="SETTINGS"/>
-        <item string="Categories" action="clinic_staff_categ"/>
         <item string="Levels" action="clinic_staff_level"/>
+        <item string="Categories" action="clinic_staff_categ"/>
     </item>
     <item string="Patients">
         <item string="New Patient" action="clinic_patient" action_options="mode=form"/>
diff --git a/netforce_clinic/layouts/clinic_staff_move_form.xml b/netforce_clinic/layouts/clinic_staff_rotate_form.xml
similarity index 88%
rename from netforce_clinic/layouts/clinic_staff_move_form.xml
rename to netforce_clinic/layouts/clinic_staff_rotate_form.xml
index c7779aa..2eb2061 100644
--- a/netforce_clinic/layouts/clinic_staff_move_form.xml
+++ b/netforce_clinic/layouts/clinic_staff_rotate_form.xml
@@ -1,4 +1,4 @@
-<form model="clinic.staff.move">
+<form model="clinic.staff.rotation">
     <field name="staff_id"/>
     <field name="level_id"/>
     <field name="from_company_id"/>
diff --git a/netforce_clinic/layouts/clinic_staff_move_list.xml b/netforce_clinic/layouts/clinic_staff_rotate_list.xml
similarity index 88%
rename from netforce_clinic/layouts/clinic_staff_move_list.xml
rename to netforce_clinic/layouts/clinic_staff_rotate_list.xml
index 5a4cf42..358172b 100644
--- a/netforce_clinic/layouts/clinic_staff_move_list.xml
+++ b/netforce_clinic/layouts/clinic_staff_rotate_list.xml
@@ -1,4 +1,4 @@
-<list model="clinic.staff.move">
+<list model="clinic.staff.rotation">
     <field name="staff_id"/>
     <field name="level_id"/>
     <field name="from_company_id"/>
diff --git a/netforce_clinic/models/__init__.py b/netforce_clinic/models/__init__.py
index 09f082c..af4f59a 100644
--- a/netforce_clinic/models/__init__.py
+++ b/netforce_clinic/models/__init__.py
@@ -44,7 +44,7 @@ from . import account_invoice
 from . import staff
 from . import staff_categ
 from . import staff_level
-from . import staff_move
+from . import staff_rotation
 from . import staff_cycle
 from . import schedule
 from . import schedule_line
diff --git a/netforce_clinic/models/staff_categ.py b/netforce_clinic/models/staff_categ.py
index 826a1d6..827e3b6 100644
--- a/netforce_clinic/models/staff_categ.py
+++ b/netforce_clinic/models/staff_categ.py
@@ -14,6 +14,7 @@ class StaffCategory(Model):
 
     _defaults={
         "company_id": lambda *a: get_active_company(),
+        'type': 'nurse',
     }
 
 StaffCategory.register()
diff --git a/netforce_clinic/models/staff_move.py b/netforce_clinic/models/staff_rotation.py
similarity index 87%
rename from netforce_clinic/models/staff_move.py
rename to netforce_clinic/models/staff_rotation.py
index 8d12ce9..07b2b6b 100644
--- a/netforce_clinic/models/staff_move.py
+++ b/netforce_clinic/models/staff_rotation.py
@@ -1,9 +1,9 @@
 from netforce.model import Model, fields
 from netforce.access import get_active_company
 
-class StaffMove(Model):
-    _name="clinic.staff.move"
-    _string="Staff Move"
+class StaffRotation(Model):
+    _name="clinic.staff.rotation"
+    _string="Staff Rotation"
 
     _fields={
         "staff_id": fields.Many2One("clinic.staff","Staff", search=True),
@@ -21,4 +21,4 @@ class StaffMove(Model):
         "company_id": lambda *a: get_active_company(),
     }
 
-StaffMove.register()
+StaffRotation.register()