From 65c1a36df530a1cfa0c66f08468f6cb642db2643 Mon Sep 17 00:00:00 2001
From: "watcha.h" <watcha.h@almacom.co.th>
Date: Tue, 25 Nov 2014 08:41:49 +0700
Subject: [PATCH] refactor

---
 netforce_clinic/layouts/clinic_hd_case_form.xml  |  4 ++--
 netforce_clinic/layouts/clinic_schedule_form.xml |  4 ++--
 netforce_clinic/layouts/clinic_visit_form.xml    |  6 +++---
 netforce_clinic/models/hd_case.py                |  2 +-
 netforce_clinic/models/hd_case_dialy.py          |  6 ++++--
 netforce_clinic/models/report_hd_case_summary.py |  1 +
 netforce_clinic/models/report_medical_summary.py |  1 +
 netforce_clinic/models/schedule.py               | 14 +++++++++++++-
 netforce_clinic/models/setting_level.py          |  2 +-
 netforce_clinic/models/visit.py                  |  4 ++--
 netforce_clinic/templates/hd_case_dialy.hbs      |  2 +-
 netforce_clinic/todo.txt                         |  4 ++++
 12 files changed, 35 insertions(+), 15 deletions(-)
diff --git a/netforce_clinic/layouts/clinic_hd_case_form.xml b/netforce_clinic/layouts/clinic_hd_case_form.xml
index dd05b15..cbd19f6 100644
--- a/netforce_clinic/layouts/clinic_hd_case_form.xml
+++ b/netforce_clinic/layouts/clinic_hd_case_form.xml
@@ -3,7 +3,7 @@
         <field name="state"/>
         <button string="Options" dropdown="1">
             <item string="New Dialyzer" method="new_dialyzer" states="draft"/>
-            <item string="To Draft" method="to_draft" states="in_progress"/>
+            <item string="To Draft" method="to_draft" states="in_progress,completed"/>
         </button>
     </head>
     <group span="6" columns="1">
@@ -109,8 +109,8 @@
         <button string="Start" type="success" icon="arrow-right" method="do_treatment" states="draft"/>
         <button string="Done" type="success" icon="ok" method="done" states="in_progress"/>
         <button string="Discontinue" type="danger" icon="remove" action="clinic_hd_case_distcont" states="in_progress"/>
-        <button string="Undo" type="default" icon="repeat" method="undo" states="completed"/>
         <button string="Pay" type="success" icon="ok" action="clinic_payment" states="waiting_payment" />
+        <!--<button string="Undo" type="default" icon="repeat" method="undo" states="completed"/>-->
    </foot>
     <related>
         <field name="invoices" click_action="view_invoice">
diff --git a/netforce_clinic/layouts/clinic_schedule_form.xml b/netforce_clinic/layouts/clinic_schedule_form.xml
index 4ab583c..5f1af9b 100644
--- a/netforce_clinic/layouts/clinic_schedule_form.xml
+++ b/netforce_clinic/layouts/clinic_schedule_form.xml
@@ -4,8 +4,8 @@
         <button string="Options" dropdown="1">
             <item string="Copy" method="copy"/>
             <item string="Copy By Duration" action="clinic_schedule_copy"/>
-            <item string="Load Nurse To Schedule" action="clinic_load_nurses"/>
-            <item string="Load Nurses To Cycle Item" method="copy2cycle_item"/>
+            <item string="Copy Nurses To Schedule" action="clinic_load_nurses"/>
+            <item string="Copy Nurses To Cycle Item" method="copy2cycle_item"/>
             <item string="Clear Nurses" method="clear" states="draft"/>
         </button>
     </head>
diff --git a/netforce_clinic/layouts/clinic_visit_form.xml b/netforce_clinic/layouts/clinic_visit_form.xml
index f667683..2f5eb79 100644
--- a/netforce_clinic/layouts/clinic_visit_form.xml
+++ b/netforce_clinic/layouts/clinic_visit_form.xml
@@ -1,10 +1,11 @@
-<form model="clinic.visit" attrs='{"readonly":[["state","in",["confirmed"]]]}' show_company="1">
+<form model="clinic.visit" attrs='{"readonly":[["state","in",["confirmed","cancelled"]]]}' show_company="1">
     <head>
         <field name="state"/>
-        <button string="Gen No." icon="check" type="primary" method="gen_no"/>
+        <button string="Gen No." icon="check" type="primary" method="gen_no" states="draft"/>
         <button string="Print" icon="print" action="report_visit_form"/>
         <button string="Options" dropdown="1">
             <item string="Copy" method="copy"/>
+            <item string="To Draft" method="to_draft" states="confirmed,cancelled" />
         </button>
     </head>
     <tabs>
@@ -32,7 +33,6 @@
     <foot>
         <button string="Confirm" type="success" method="confirm" states="draft" />
         <button string="Discard" type="danger" method="cancel" states="draft" />
-        <button string="To Draft" type="default" icon="repeat" method="to_draft" states="confirmed,cancelled" />
    </foot>
     <related>
         <field name="hd_cases" readonly="1"/>
diff --git a/netforce_clinic/models/hd_case.py b/netforce_clinic/models/hd_case.py
index 9c2d4d6..b317a90 100644
--- a/netforce_clinic/models/hd_case.py
+++ b/netforce_clinic/models/hd_case.py
@@ -436,7 +436,7 @@ class HDCase(Model):
     def do_treatment(self,ids,context={}):
         obj=self.browse(ids)[0]
         if not obj.dialyzers:
-            raise Exception("Can not do treatment without dialyzer!")
+            raise Exception("Please input dialyzer!")
         obj.write({"state":"in_progress"})
 
     def discontinue(self,ids,context={}):
diff --git a/netforce_clinic/models/hd_case_dialy.py b/netforce_clinic/models/hd_case_dialy.py
index 1df7d0f..f0de7f2 100644
--- a/netforce_clinic/models/hd_case_dialy.py
+++ b/netforce_clinic/models/hd_case_dialy.py
@@ -45,9 +45,11 @@ class HDCaseDialy(Model):
                 dlz=line.dialyzer_id
                 dlz_id=dlz.id
                 dlz_number=dlz.number
+            cycle=obj.cycle_id
             line={
-                'cycle_name': obj.cycle_id.name,
-                'cycle_sequence': obj.cycle_id.sequence,
+                'cycle_name': cycle.name,
+                'cycle_sequence': cycle.sequence,
+                'cycle_color': cycle.color or "",
                 'hd_case_number': obj.number,
                 'patient_name': obj.patient_id.name,
                 'patient_type': patient_type,
diff --git a/netforce_clinic/models/report_hd_case_summary.py b/netforce_clinic/models/report_hd_case_summary.py
index 1b8e3ae..c221d90 100644
--- a/netforce_clinic/models/report_hd_case_summary.py
+++ b/netforce_clinic/models/report_hd_case_summary.py
@@ -202,6 +202,7 @@ class ReportHDCaseSummary(Model):
             }
         medicals=get_model("clinic.report.medical.summary").get_report_data(ids=[],context=context)['lines']
 
+        year=year+543
         data={
             'date': date,
             'month': month_str,
diff --git a/netforce_clinic/models/report_medical_summary.py b/netforce_clinic/models/report_medical_summary.py
index 063b9f7..6d59eb1 100644
--- a/netforce_clinic/models/report_medical_summary.py
+++ b/netforce_clinic/models/report_medical_summary.py
@@ -104,6 +104,7 @@ class ReportMedicalSummary(Model):
             'nhso': utils.PATIENT_TYPE['nhso'],
             'personal': utils.PATIENT_TYPE['personal'],
             }
+        year=int(year)+543
         data={
             'company_name': company.name or "",
             'parent_company_name': company.parent_id.name or "",
diff --git a/netforce_clinic/models/schedule.py b/netforce_clinic/models/schedule.py
index 6478de1..4cf3940 100644
--- a/netforce_clinic/models/schedule.py
+++ b/netforce_clinic/models/schedule.py
@@ -120,6 +120,17 @@ class Schedule(Model):
                     'cycle_item_id': item_id,
                 })
                 cycles.update({cycle.name})
+            else:
+                item_id=get_model("clinic.cycle.item").create({
+                    'cycle_id': cycle.id,
+                    'date': date,
+                })
+                items[item_id]=[]
+                items[item_id].append(('create',{
+                    'nurse_id': nurse.id,
+                    'level_id': nurse.level_id.id,
+                }))
+                cycles.update({cycle.name})
 
         for item_id, nurses in items.items():
             item=get_model("clinic.cycle.item").browse(item_id)
@@ -129,7 +140,8 @@ class Schedule(Model):
                 'nurses': nurses,
             })
 
-        msg='Load nurses to cycle item %s successfully'%(','.join(list(cycles)))
+        cycles=list(reversed(list(cycles)))
+        msg='Copy nurses to cycle item %s successfully'%(','.join(cycles))
         # TODO create cycle item automatically
         if not items:
             msg='No cycle item to copy'
diff --git a/netforce_clinic/models/setting_level.py b/netforce_clinic/models/setting_level.py
index e817c60..a2c69da 100644
--- a/netforce_clinic/models/setting_level.py
+++ b/netforce_clinic/models/setting_level.py
@@ -16,7 +16,7 @@ class SettingLevel(Model):
         'var_a': fields.Char("Ax"),
         "op": fields.Selection([["+","+"],["-","-"],["*","*"],["/","/"]],"Operation"),
         'var_b': fields.Char("B"),
-        'formular': fields.Text("Formular",function="_get_formular"),
+        'formular': fields.Text("Formular (Ax op B)",function="_get_formular"),
     }
 
 SettingLevel.register()
diff --git a/netforce_clinic/models/visit.py b/netforce_clinic/models/visit.py
index 11aec03..8db9a95 100644
--- a/netforce_clinic/models/visit.py
+++ b/netforce_clinic/models/visit.py
@@ -347,7 +347,7 @@ class Visit(Model):
     
     def gen_no(self,ids,context={}):
         obj=self.browse(ids)[0]
-        if obj.number != '/':
+        if obj.number != '/' or obj.state!='draft':
             return
         number=self._get_number(context)
         obj.write({
@@ -359,7 +359,7 @@ class Visit(Model):
                 'mode': 'form',
                 'active_id': obj.id,
             },
-            'flash': 'Gen No OK',
+            'flash': 'Generate number succesfully',
         }
     
     def create(self, vals,**kw):
diff --git a/netforce_clinic/templates/hd_case_dialy.hbs b/netforce_clinic/templates/hd_case_dialy.hbs
index 9550cb6..02b263c 100644
--- a/netforce_clinic/templates/hd_case_dialy.hbs
+++ b/netforce_clinic/templates/hd_case_dialy.hbs
@@ -33,7 +33,7 @@
                 <td>{{currency fee_amount}}</td>
                 <td>-</td>
                 <td><a href="/ui#name=clinic_hd_case&active_id={{hd_case_id}}&mode=form">{{hd_case_number}}</a></td>
-                <td><a href="/ui#name=clinic_hd_dialyzer&active_id={{dlz_id}}&mode=form">{{dlz_number}}</a></td>
+                <td><a href="/ui#name=clinic_dialyzer&active_id={{dlz_id}}&mode=form">{{dlz_number}}</a></td>
                 <td>-</td>
                 <td>-</td>
                 <td>{{note}}</td>
diff --git a/netforce_clinic/todo.txt b/netforce_clinic/todo.txt
index 96933f2..d939a19 100644
--- a/netforce_clinic/todo.txt
+++ b/netforce_clinic/todo.txt
@@ -1,4 +1,8 @@
 =======
+    - design
+        - auto complete hd after time out
+        - create payment for each type of patient
+            - invoice
     - define rule to get
         - fee product
         - invoice
