From bac0f31a6b57cf42598abcf590d4f2ef1e751483 Mon Sep 17 00:00:00 2001
From: "watcha.h@almacom.co.th" <watcha.h@almacom.co.th>
Date: Thu, 15 Jan 2015 12:15:46 +0700
Subject: [PATCH] improve

---
 .../actions/clinic_hd_case_distcont.xml       |  2 +-
 netforce_clinic/actions/clinic_patient.xml    |  1 -
 .../layouts/clinic_dialyzer_form.xml          |  7 +++++-
 .../layouts/clinic_hd_case_dist_form.xml      |  2 +-
 .../layouts/clinic_patient_form.xml           | 10 ++++++--
 .../layouts/clinic_patient_list.xml           |  2 +-
 netforce_clinic/models/__init__.py            |  3 ++-
 netforce_clinic/models/hd_case.py             |  4 ++--
 netforce_clinic/models/hd_case_line.py        |  2 +-
 ...iscont.py => hd_case_popup_discontinue.py} |  6 ++---
 netforce_clinic/models/hd_case_popup_dlz.py   | 23 +++++++++++++++++++
 netforce_clinic/models/patient.py             |  1 +
 netforce_clinic/todo.txt                      | 10 ++++++++
 13 files changed, 59 insertions(+), 14 deletions(-)
 rename netforce_clinic/models/{hd_case_discont.py => hd_case_popup_discontinue.py} (95%)
 create mode 100644 netforce_clinic/models/hd_case_popup_dlz.py

diff --git a/netforce_clinic/actions/clinic_hd_case_distcont.xml b/netforce_clinic/actions/clinic_hd_case_distcont.xml
index bbdf364..eaec28d 100644
--- a/netforce_clinic/actions/clinic_hd_case_distcont.xml
+++ b/netforce_clinic/actions/clinic_hd_case_distcont.xml
@@ -1,6 +1,6 @@
 <action>
     <field name="string">Reason</field>
     <field name="view_cls">form_popup</field>
-    <field name="model">clinic.hd.case.discont</field>
+    <field name="model">clinic.hd.case.popup.discontinue</field>
     <field name="target">_popup</field>
 </action>
diff --git a/netforce_clinic/actions/clinic_patient.xml b/netforce_clinic/actions/clinic_patient.xml
index 6a59376..d29a5b1 100644
--- a/netforce_clinic/actions/clinic_patient.xml
+++ b/netforce_clinic/actions/clinic_patient.xml
@@ -2,7 +2,6 @@
     <field name="string">Patients</field>
     <field name="view_cls">multi_view</field>
     <field name="model">clinic.patient</field>
-    <!--<field name="tabs">[["All",[]],["Archived",[["active","=","False"]]],["Social Security",[["type","=","sc"]]],["UC",[["type","=","uc"]]],["Others",[["type","=","others"]]]]</field>-->
     <field name="tabs">[["All",[]],["Archived",[["active","=","False"]]]]</field>
     <field name="menu">clinic_menu</field>
     <field name="limit">25</field>
diff --git a/netforce_clinic/layouts/clinic_dialyzer_form.xml b/netforce_clinic/layouts/clinic_dialyzer_form.xml
index b679813..a22a796 100644
--- a/netforce_clinic/layouts/clinic_dialyzer_form.xml
+++ b/netforce_clinic/layouts/clinic_dialyzer_form.xml
@@ -16,11 +16,16 @@
     <group span="6" columns="1">
         <field name="product_id"/>
         <field name="dialyzer_type"/>
-        <field name="use_time" readonly="1"/>
+        <field name="use_time"/>
         <field name="max_use_time"/>
         <field name="description"/>
         <field name="company_id" invisible="1"/>
     </group>
+    <group span="6" columns="1">
+    </group>
+    <group span="6" columns="1">
+        <separator string="Note: Use time will count automatic after finish HD Case."/>
+    </group>
     <foot>
         <button string="Confirm" type="success" states="new" method="confirm"/>
         <button string="Drop" type="danger" icon="remove" states="active" method="drop"/>
diff --git a/netforce_clinic/layouts/clinic_hd_case_dist_form.xml b/netforce_clinic/layouts/clinic_hd_case_dist_form.xml
index 0a85415..302fcf9 100644
--- a/netforce_clinic/layouts/clinic_hd_case_dist_form.xml
+++ b/netforce_clinic/layouts/clinic_hd_case_dist_form.xml
@@ -1,4 +1,4 @@
-<form model="clinic.hd.case.discont">
+<form model="clinic.hd.case.popup.discontinue">
     <field name="hd_case_id" invisible="1"/>
     <field name="note" nolabel="1" width="450" height="200"/>
     <separator string="Good issue: remove line below if no need to create."/>
diff --git a/netforce_clinic/layouts/clinic_patient_form.xml b/netforce_clinic/layouts/clinic_patient_form.xml
index 55a2c07..468427c 100644
--- a/netforce_clinic/layouts/clinic_patient_form.xml
+++ b/netforce_clinic/layouts/clinic_patient_form.xml
@@ -11,7 +11,6 @@
     <field name="trt_no"/>
     <field name="type_id"/>
     <field name="name"/>
-    <!--<field name="hn"/>-->
     <field name="reg_date"/>
     <field name="partner_id"/>
     <field name="categ_id"/>
@@ -44,6 +43,14 @@
                 <field name="company_id" invisible="1"/>
             </group>
         </tab>
+        <tab string="Cycles">
+            <group span="8" columns="1">
+                <field name="cycles"/>
+            </group>
+            <group span="4" columns="1">
+                <field name="cycle_id"/>
+            </group>
+        </tab>
         <tab string="Health Information">
             <field name="smoke"/>
             <field name="withdrawal"/>
@@ -98,7 +105,6 @@
         </tab>
         <tab string="Other">
             <group form_layout="stacked">
-                <field name="cycle_id" span="2"/>
                 <field name="hn_no" span="2"/>
             </group>
         </tab>
diff --git a/netforce_clinic/layouts/clinic_patient_list.xml b/netforce_clinic/layouts/clinic_patient_list.xml
index 1b93e97..61bd72e 100644
--- a/netforce_clinic/layouts/clinic_patient_list.xml
+++ b/netforce_clinic/layouts/clinic_patient_list.xml
@@ -8,8 +8,8 @@
     <field name="name"/>
     <field name="branch_id"/>
     <field name="department_id"/>
-    <!--<field name="categ_id"/>-->
     <field name="doctor_id"/>
     <field name="type_id"/>
+    <field name="cycles"/>
     <field name="image" preview='1'/>
 </list>
diff --git a/netforce_clinic/models/__init__.py b/netforce_clinic/models/__init__.py
index 421f67b..389f9e3 100644
--- a/netforce_clinic/models/__init__.py
+++ b/netforce_clinic/models/__init__.py
@@ -25,7 +25,8 @@ from . import hd_case
 from . import hd_case_line
 from . import hd_case_expense
 from . import hd_case_staff
-from . import hd_case_discont
+from . import hd_case_popup_discontinue
+from . import hd_case_popup_dlz
 from . import hd_case_payment
 from . import hd_case_dialyzer
 from . import dialyzer
diff --git a/netforce_clinic/models/hd_case.py b/netforce_clinic/models/hd_case.py
index a639ec5..2b9d1e3 100644
--- a/netforce_clinic/models/hd_case.py
+++ b/netforce_clinic/models/hd_case.py
@@ -716,9 +716,9 @@ class HDCase(Model):
         hct=data["hct"]
         msg=""
         # XXX do not hard code
-        if(hct<36):
+        if(hct<=36):
             msg="สามารถเบิกค่ายาสูงสุดไม่เกิน 1,125บาท ต่อ สัปดาห์"
-        elif(hct>=36 and hct<=39):
+        elif(hct>36 and hct<=39):
             msg="สามารถเบิกค่ายาสูงสุดไม่เกิน 750บาท ต่อ สัปดาห์"
         elif(hct> 39):
             msg="ไม่สามารถเบิกค่ายาฉีดได้ทุกตัว"
diff --git a/netforce_clinic/models/hd_case_line.py b/netforce_clinic/models/hd_case_line.py
index ba891f9..df9d168 100644
--- a/netforce_clinic/models/hd_case_line.py
+++ b/netforce_clinic/models/hd_case_line.py
@@ -4,7 +4,7 @@ class Hdcaseline(Model):
     _name="clinic.hd.case.line"
     _fields={
         "hd_case_id": fields.Many2One("clinic.hd.case","HD Case",required=True,on_delete="cascade"),
-        "hd_case_dis_id": fields.Many2One("clinic.hd.case.discont","HD Case",on_delete="cascade"),
+        "hd_case_dis_id": fields.Many2One("clinic.hd.case.popup.discontinue","HD Case",on_delete="cascade"),
         "product_id": fields.Many2One("product","Product",search=True),
         "description": fields.Char("Description",search=True),
         "qty":fields.Integer("QTY"),
diff --git a/netforce_clinic/models/hd_case_discont.py b/netforce_clinic/models/hd_case_popup_discontinue.py
similarity index 95%
rename from netforce_clinic/models/hd_case_discont.py
rename to netforce_clinic/models/hd_case_popup_discontinue.py
index 81535f0..e0e6a10 100644
--- a/netforce_clinic/models/hd_case_discont.py
+++ b/netforce_clinic/models/hd_case_popup_discontinue.py
@@ -1,7 +1,7 @@
 from netforce.model import Model, fields, get_model
 
-class HDCaseDiscont(Model):
-    _name="clinic.hd.case.discont"
+class HDCasePopupDiscontinue(Model):
+    _name="clinic.hd.case.popup.discontinue"
     _transient=True
 
     _fields={
@@ -72,5 +72,5 @@ class HDCaseDiscont(Model):
             'flash': '%s has been cancelled'%hd_case.number,
         }
 
-HDCaseDiscont.register()
+HDCasePopupDiscontinue.register()
 
diff --git a/netforce_clinic/models/hd_case_popup_dlz.py b/netforce_clinic/models/hd_case_popup_dlz.py
new file mode 100644
index 0000000..e6158d0
--- /dev/null
+++ b/netforce_clinic/models/hd_case_popup_dlz.py
@@ -0,0 +1,23 @@
+from netforce.model import Model, fields, get_model
+
+class HDCasePopupDlz(Model):
+    _name="clinic.hd.case.popup.dlz"
+    _transient=True
+
+    _fields={
+        "hd_case_id": fields.Many2One("clinic.hd.case","HdCase",required=True,on_delete="cascade"),
+        "note": fields.Text("Description"),
+    }
+    
+    def _get_hd_case_id(self,context={}):
+        hd_case_id=context.get("refer_id")
+        print("hd case deault")
+        if not hd_case_id:
+            return None
+        return int(hd_case_id)
+
+    _defaults={
+        'hd_case_id': _get_hd_case_id,
+    }
+
+HDCasePopupDlz.register()
diff --git a/netforce_clinic/models/patient.py b/netforce_clinic/models/patient.py
index 87b126f..36b2fcf 100644
--- a/netforce_clinic/models/patient.py
+++ b/netforce_clinic/models/patient.py
@@ -100,6 +100,7 @@ class Patient(Model):
         'department_id': fields.Many2One("clinic.department","Department"),
         'cycle_id': fields.Many2One("clinic.cycle","Last Cycle",function="_get_last_cycle"),
         'branch_id': fields.Many2One("clinic.branch","Branch",search=True),
+        'cycles': fields.Many2Many("clinic.cycle","Cycles"),
     }
 
     def _get_number(self,context={}):
diff --git a/netforce_clinic/todo.txt b/netforce_clinic/todo.txt
index a0cd426..1e667e3 100644
--- a/netforce_clinic/todo.txt
+++ b/netforce_clinic/todo.txt
@@ -1,3 +1,13 @@
+=======
+    generate visit ใหม่
+    popup select dyalyzer
+        - visit
+            - confirm: if pt has dialyzer -> auto select else empty (need to select on hd case)
+            
+    - click pay -> cash -> not update use time (dlz)
+    - reset use time -> how ?
+
+=======
 report:
     - doctor detail (for accounting)
     - patient visit