inherit top list

netforce_clinic/layouts/clinic_dialyzer_form.xml

@@ -7,6 +7,7 @@
     </head>
     <group span="6" columns="1">
         <field name="number"/>
+        <field name="ref"/>
         <field name="patient_id"/>
         <field name="date"/>
         <field name="member_type"/>

netforce_clinic/layouts/clinic_menu_inherit.xml

@@ -1,15 +1,21 @@
 <inherit inherit="account_menu">
     <item string="Settings" position="before">
         <item string="Ratchawat">
-            <header string="IMPORT PAYMENT"/>
+        <header string="IMPORT PAYMENT"/>
-                <!--<item string="Medical Government" action="import_clinic_mg"/>-->
+        <item string="Social Security" action="import_clinic_sc"/>
-            <item string="Social Security" action="import_clinic_sc"/>
+        <item string="UC" action="import_clinic_uc"/>
-            <item string="UC" action="import_clinic_uc"/>
+        <divider/>
-            <divider/>
+        <header string="IMPORT HISTORY"/>
-            <header string="IMPORT DATA"/>
+        <item string="Social Security" action="clinic_data_sc"/>
-                <!--<item string="Medical Government" action="clinic_import_payment"/>-->
+        <item string="UC" action="clinic_data_uc"/>
-            <item string="Social Security" action="clinic_data_sc"/>
+
-            <item string="UC" action="clinic_data_uc"/>
+        <!--<header string="IMPORT PAYMENT"/>-->
+        <!--<item string="Social Security" action="import_clinic_sc"/>-->
+        <!--<item string="UC" action="import_clinic_uc"/>-->
+        <!--<divider/>-->
+        <!--<header string="IMPORT DATA"/>-->
+        <!--<item string="Social Security" action="clinic_data_sc"/>-->
+        <!--<item string="UC" action="clinic_data_uc"/>-->
         </item>
     </item>
 </inherit>

netforce_clinic/layouts/clinic_staff_list.xml

@@ -1,4 +1,12 @@
 <list model="clinic.staff">
+    <top replace="1">
+    <button string="New Staff" icon="plus-sign" dropdown="1">
+        <item string="Staff" action="clinic_staff" action_options="mode=form&amp;context.type=staff"/>
+        <item string="Doctor" action="clinic_staff" action_options="mode=form&amp;context.type=doctor"/>
+        <item string="Nurse" action="clinic_staff" action_options="mode=form&amp;context.type=nurse"/>
+    </button>
+    <button string="Import" action="import_data" action_options="&amp;import_model=clinic.staff&amp;next=clinic_staff" icon="download"/>
+    </top>
     <field name="number"/>
     <field name="name"/>
     <field name="department_id"/>

netforce_clinic/layouts/import_clinic_sc.xml

@@ -1,19 +1,10 @@
-<form title="Import Social Security">
+<form title="Social Security">
     <group span="6" columns="1">
         <field name="file"/>
-        <field name="hcode"/>
     </group>
     <group span="6" columns="1">
-        <separator string="Result"/>
-        <template>
-            <a href="ui#name=clinic_data_sc" target="_blank"><span class="glyphicon glyphicon-arrow-right"></span> Review Data</a>
-        </template>
-        <field name="result" nolabel="1" height="240" width="540"/>
     </group>
     <foot replace="1">
-        <button string="Import Data" method="import_sc" type="primary" icon="arrow-right"/>
+        <button string="Import" method="import_uc" type="primary" icon="arrow-right"/>
-            <!--<button string="Match Invoice" method="match_invoice_sc" icon="retweet" type="default"/>-->
-        <button string="Approve" method="approve_sc" icon="ok" type="success"/>
-        <button string="Clear" method="clear_sc" type="danger" icon="remove"/>
     </foot>
 </form>

netforce_clinic/layouts/import_clinic_uc.xml

@@ -1,10 +1,10 @@
-<form title="Import UC">
+<form title="UC">
     <group span="6" columns="1">
         <field name="file"/>
     </group>
     <group span="6" columns="1">
     </group>
     <foot replace="1">
-        <button string="Import Data" method="import_uc" type="primary" icon="arrow-right"/>
+        <button string="Import" method="import_uc" type="primary" icon="arrow-right"/>
     </foot>
 </form>

netforce_clinic/layouts/old/import_clinic_sc.xml

@@ -0,0 +1,19 @@
+<form title="Import Social Security">
+    <group span="6" columns="1">
+        <field name="file"/>
+        <field name="hcode"/>
+    </group>
+    <group span="6" columns="1">
+        <separator string="Result"/>
+        <template>
+            <a href="ui#name=clinic_data_sc" target="_blank"><span class="glyphicon glyphicon-arrow-right"></span> Review Data</a>
+        </template>
+        <field name="result" nolabel="1" height="240" width="540"/>
+    </group>
+    <foot replace="1">
+        <button string="Import Data" method="import_sc" type="primary" icon="arrow-right"/>
+            <!--<button string="Match Invoice" method="match_invoice_sc" icon="retweet" type="default"/>-->
+        <button string="Approve" method="approve_sc" icon="ok" type="success"/>
+        <button string="Clear" method="clear_sc" type="danger" icon="remove"/>
+    </foot>
+</form>

netforce_clinic/layouts/old/import_clinic_uc.xml

@@ -0,0 +1,10 @@
+<form title="Import UC">
+    <group span="6" columns="1">
+        <field name="file"/>
+    </group>
+    <group span="6" columns="1">
+    </group>
+    <foot replace="1">
+        <button string="Import Data" method="import_uc" type="primary" icon="arrow-right"/>
+    </foot>
+</form>

netforce_clinic/models/dialyzer.py

@@ -12,6 +12,7 @@ class Dialyzer(Model):
     
     _fields={
         "number": fields.Char("Number",required=True,search=True),
+        'ref': fields.Char("Ref."),
         "description": fields.Text("Description",search=True),
         "date": fields.Date("Create Date",search=True),
         "use_time": fields.Integer("Use Time"),

netforce_clinic/models/staff.py

@@ -121,7 +121,8 @@ class Staff(Model):
     _defaults={
         'active': True,
         "state": "temporary",
-        'type': 'staff',
+        #'type': 'staff',
+        "type": lambda self,ctx: ctx.get("type") or "staff",
         "date": lambda *a: time.strftime("%Y-%m-%d"),
         "number": _get_number,
         "company_id": lambda *a: get_active_company(),

netforce_clinic/todo.txt

@@ -1,3 +1,7 @@
+=====
+    import payment from government
+
+======
 bug:
     มีปัญหาการสร้าง address ของ contact จากผู้ป่วยโดยอัตโนมัติ เพราะมันไม่ได้ถูกเก็บไว้ที่ form
 =====