From d0395e9fcf94051de7f9b0dce2732f4032ce2c67 Mon Sep 17 00:00:00 2001
From: "watcha.h" <watcha.h@almacom.co.th>
Date: Mon, 17 Nov 2014 07:59:19 +0700
Subject: [PATCH] demo

---
 .../actions/clinic_cycle_dialy.xml            |  10 +-
 .../actions/clinic_cycle_dialy.xml.old        |  11 ++
 .../actions/clinic_schedule_copy.xml          |   6 +
 .../actions/clinic_visit_dialy.xml            |  16 +-
 .../actions/clinic_visit_widget.xml           |   1 +
 .../layouts/clinic_cycle_dialy_form.xml       |  16 ++
 .../layouts/clinic_cycle_dialy_list.xml       |   3 +
 .../layouts/clinic_cycle_item_form.xml        |   3 +
 netforce_clinic/layouts/clinic_menu.xml       |   2 +-
 .../layouts/clinic_schedule_copy_form.xml     |  17 ++
 .../layouts/clinic_schedule_form.xml          |   4 +-
 .../layouts/clinic_schedule_list.xml          |   1 +
 .../layouts/clinic_visit_calendar.xml         |   3 +-
 .../layouts/clinic_visit_dialy.xml            |   3 +
 netforce_clinic/layouts/clinic_visit_form.xml |   3 +
 .../layouts/clinic_visit_widget.xml           |   2 +
 netforce_clinic/models/__init__.py            |   2 +
 netforce_clinic/models/cycle_dialy.py         |  27 ++++
 netforce_clinic/models/cycle_item.py          |  35 +++-
 netforce_clinic/models/gen_visit.py           |   1 -
 netforce_clinic/models/load_nurse.py          |   7 +-
 netforce_clinic/models/schedule.py            |  17 +-
 netforce_clinic/models/schedule_copy.py       | 153 ++++++++++++++++++
 netforce_clinic/models/visit.py               |  12 +-
 netforce_clinic/models/visit_dialy.py         |  68 +++++++-
 netforce_clinic/reports/visit_dialy.xlsx      | Bin 0 -> 5043 bytes
 netforce_clinic/templates/visit_dialy.hbs     |  33 ++++
 netforce_clinic/todo.txt                      |   6 +-
 28 files changed, 417 insertions(+), 45 deletions(-)
 create mode 100644 netforce_clinic/actions/clinic_cycle_dialy.xml.old
 create mode 100644 netforce_clinic/actions/clinic_schedule_copy.xml
 create mode 100644 netforce_clinic/layouts/clinic_cycle_dialy_form.xml
 create mode 100644 netforce_clinic/layouts/clinic_cycle_dialy_list.xml
 create mode 100644 netforce_clinic/layouts/clinic_schedule_copy_form.xml
 create mode 100644 netforce_clinic/layouts/clinic_visit_dialy.xml
 create mode 100644 netforce_clinic/models/cycle_dialy.py
 create mode 100644 netforce_clinic/models/schedule_copy.py
 create mode 100644 netforce_clinic/reports/visit_dialy.xlsx
 create mode 100644 netforce_clinic/templates/visit_dialy.hbs

diff --git a/netforce_clinic/actions/clinic_cycle_dialy.xml b/netforce_clinic/actions/clinic_cycle_dialy.xml
index 5df7a10..2271659 100644
--- a/netforce_clinic/actions/clinic_cycle_dialy.xml
+++ b/netforce_clinic/actions/clinic_cycle_dialy.xml
@@ -1,11 +1,7 @@
 <action>
     <field name="string">Cycle Dialy</field>
-    <field name="view_cls">report_view</field>
-    <field name="model">clinic.cycle.item</field>
-    <!--<field name="domain">[["order_id.state","in",["confirmed","done"]]]</field>-->
-    <field name="group_fields">date</field>
-    <field name="group_select">cycle_id</field>
-    <!--<field name="group_select">partner_id,product_id,user_id,order_id</field>-->
-    <!--<field name="sum_fields">amount</field>-->
+    <field name="view_cls">multi_view</field>
+    <field name="model">clinic.cycle.dialy</field>
+    <field name="modes">list,form</field>
     <field name="menu">clinic_menu</field>
 </action>
diff --git a/netforce_clinic/actions/clinic_cycle_dialy.xml.old b/netforce_clinic/actions/clinic_cycle_dialy.xml.old
new file mode 100644
index 0000000..5df7a10
--- /dev/null
+++ b/netforce_clinic/actions/clinic_cycle_dialy.xml.old
@@ -0,0 +1,11 @@
+<action>
+    <field name="string">Cycle Dialy</field>
+    <field name="view_cls">report_view</field>
+    <field name="model">clinic.cycle.item</field>
+    <!--<field name="domain">[["order_id.state","in",["confirmed","done"]]]</field>-->
+    <field name="group_fields">date</field>
+    <field name="group_select">cycle_id</field>
+    <!--<field name="group_select">partner_id,product_id,user_id,order_id</field>-->
+    <!--<field name="sum_fields">amount</field>-->
+    <field name="menu">clinic_menu</field>
+</action>
diff --git a/netforce_clinic/actions/clinic_schedule_copy.xml b/netforce_clinic/actions/clinic_schedule_copy.xml
new file mode 100644
index 0000000..db43ab9
--- /dev/null
+++ b/netforce_clinic/actions/clinic_schedule_copy.xml
@@ -0,0 +1,6 @@
+<action>
+    <field name="string">Copy Schedule</field>
+    <field name="view_cls">form_popup</field>
+    <field name="model">clinic.schedule.copy</field>
+    <field name="target">_popup</field>
+</action>
diff --git a/netforce_clinic/actions/clinic_visit_dialy.xml b/netforce_clinic/actions/clinic_visit_dialy.xml
index b49b346..dfbc3c2 100644
--- a/netforce_clinic/actions/clinic_visit_dialy.xml
+++ b/netforce_clinic/actions/clinic_visit_dialy.xml
@@ -1,10 +1,8 @@
-<action>
+<action>                                                                                                         
     <field name="string">Visit Dialy</field>
-    <field name="view_cls">report_view</field>
-    <field name="model">clinic.visit</field>
-    <!--<field name="domain">[["order_id.state","in",["confirmed","done"]]]</field>-->
-    <field name="group_fields">visit_date</field>
-    <field name="group_select">visit_date,cycle_id</field>
-    <!--<field name="view_xml">clinic_visit_dialy</field>-->
-    <field name="menu">clinic_menu</field>
-</action>
+    <field name="view_cls">report</field>                                                                        
+    <field name="model">clinic.visit.dialy</field>
+    <field name="report_template">visit_dialy</field>                                                      
+    <field name="report_template_xls">visit_dialy</field>                                                         
+    <field name="menu">clinic_menu</field>                                                                  
+</action>  
diff --git a/netforce_clinic/actions/clinic_visit_widget.xml b/netforce_clinic/actions/clinic_visit_widget.xml
index 9b8637a..0b9159d 100644
--- a/netforce_clinic/actions/clinic_visit_widget.xml
+++ b/netforce_clinic/actions/clinic_visit_widget.xml
@@ -2,6 +2,7 @@
     <field name="view_cls">list_view</field>
     <field name="model">clinic.visit</field>
     <field name="domain">[["state","not in",["confirmed"]]]</field>
+    <!-- need to filter by datenow-->
     <field name="view_xml">clinic_visit_widget</field>
     <field name="limit">10</field>
 </action>
diff --git a/netforce_clinic/layouts/clinic_cycle_dialy_form.xml b/netforce_clinic/layouts/clinic_cycle_dialy_form.xml
new file mode 100644
index 0000000..5215aee
--- /dev/null
+++ b/netforce_clinic/layouts/clinic_cycle_dialy_form.xml
@@ -0,0 +1,16 @@
+<form model="clinic.cycle.dialy">
+    <head>
+        <button string="Options" dropdown="1">
+        </button>
+    </head>
+    <field name="date"/>
+    <related>
+        <field name="cycle_items">
+            <list colors='{"#cfc":[["state","=","done"]]}'>
+                <field name="cycle_id"/>
+                <field name="date"/>
+                <field name="state"/>
+            </list>
+        </field>
+    </related>
+</form>
diff --git a/netforce_clinic/layouts/clinic_cycle_dialy_list.xml b/netforce_clinic/layouts/clinic_cycle_dialy_list.xml
new file mode 100644
index 0000000..6792cf3
--- /dev/null
+++ b/netforce_clinic/layouts/clinic_cycle_dialy_list.xml
@@ -0,0 +1,3 @@
+<list model="clinic.cycle.dialy">
+    <field name="name"/>
+</list>
diff --git a/netforce_clinic/layouts/clinic_cycle_item_form.xml b/netforce_clinic/layouts/clinic_cycle_item_form.xml
index d8aa5d3..431cd7b 100644
--- a/netforce_clinic/layouts/clinic_cycle_item_form.xml
+++ b/netforce_clinic/layouts/clinic_cycle_item_form.xml
@@ -16,6 +16,9 @@
                 </list>
             </field>
         </tab>
+        <tab string="Other Info">
+            <field name="cycle_dialy_id" domain="[['date','=',date]]"/>
+        </tab>
     </tabs>
     <foot>
         <button string="Validate" type="success" method="validate" icon="ok" states="draft" />
diff --git a/netforce_clinic/layouts/clinic_menu.xml b/netforce_clinic/layouts/clinic_menu.xml
index 17be872..face1da 100644
--- a/netforce_clinic/layouts/clinic_menu.xml
+++ b/netforce_clinic/layouts/clinic_menu.xml
@@ -32,7 +32,7 @@
         <item string="Schedules" action="clinic_schedule"/>
     <item string="Visits">
         <item string="Visits" action="clinic_visit"/>
-        <!--<item string="Visit Dialy" action="clinic_visit_dialy"/>-->
+        <item string="Visit Dialy" action="clinic_visit_dialy"/>
         <item string="Generate Visit" action="clinic_gen_visit_form"/>
     </item>
     <item string="HD Cases" action="clinic_hd_case"/>
diff --git a/netforce_clinic/layouts/clinic_schedule_copy_form.xml b/netforce_clinic/layouts/clinic_schedule_copy_form.xml
new file mode 100644
index 0000000..0152c54
--- /dev/null
+++ b/netforce_clinic/layouts/clinic_schedule_copy_form.xml
@@ -0,0 +1,17 @@
+<form model="clinic.schedule.copy">
+    <group form_layout="stacked">
+        <field name="date_from"/>
+        <field name="date_to"/>
+        <field name="mon"/>
+        <field name="tue"/>
+        <field name="wed"/>
+        <field name="thu"/>
+        <field name="fri"/>
+        <field name="sat"/>
+        <field name="sun"/>
+        <field name="schedule_id" invisible="2"/> <!-- need to push -->
+    </group>
+    <foot>
+        <button string="Copy" type="success" method="copy2schedule"/>
+    </foot>
+</form>
diff --git a/netforce_clinic/layouts/clinic_schedule_form.xml b/netforce_clinic/layouts/clinic_schedule_form.xml
index 2a78182..64f3950 100644
--- a/netforce_clinic/layouts/clinic_schedule_form.xml
+++ b/netforce_clinic/layouts/clinic_schedule_form.xml
@@ -3,7 +3,7 @@
         <field name="state"/>
         <button string="Options" dropdown="1">
             <item string="Copy" method="copy"/>
-            <item string="Copy To Cycle Item" method="copy2cycle_item"/>
+            <item string="Copy From" action="clinic_schedule_copy"/>
             <item string="Copy Nurses To Schedule" action="clinic_load_nurses"/>
         </button>
     </head>
@@ -19,7 +19,7 @@
                 </field>
             </group>
         </tab>
-        <tab string="Planing">
+        <tab string="Planning">
             <group form_layout="stacked">
                 <field name="time_start" span="3"/>
                 <field name="time_stop" span="3"/>
diff --git a/netforce_clinic/layouts/clinic_schedule_list.xml b/netforce_clinic/layouts/clinic_schedule_list.xml
index 565d306..34cb5de 100644
--- a/netforce_clinic/layouts/clinic_schedule_list.xml
+++ b/netforce_clinic/layouts/clinic_schedule_list.xml
@@ -1,4 +1,5 @@
 <list model="clinic.schedule">
     <field name="date"/>
+    <field name="user_id"/>
     <field name="state"/>
 </list>
diff --git a/netforce_clinic/layouts/clinic_visit_calendar.xml b/netforce_clinic/layouts/clinic_visit_calendar.xml
index f5515a7..11d8e9f 100644
--- a/netforce_clinic/layouts/clinic_visit_calendar.xml
+++ b/netforce_clinic/layouts/clinic_visit_calendar.xml
@@ -4,5 +4,6 @@
     <field name="number"/>
     <field name="doctor_id"/>
     <field name="nurse_id"/>
-    <field name="state"/>
+    <field name="cycle_color"/>
+    <!--<field name="state"/>-->
 </calendar>
diff --git a/netforce_clinic/layouts/clinic_visit_dialy.xml b/netforce_clinic/layouts/clinic_visit_dialy.xml
new file mode 100644
index 0000000..3a275c4
--- /dev/null
+++ b/netforce_clinic/layouts/clinic_visit_dialy.xml
@@ -0,0 +1,3 @@
+<form model="clinic.visit.dialy">
+    <field name="date" span="2"/>
+</form>
diff --git a/netforce_clinic/layouts/clinic_visit_form.xml b/netforce_clinic/layouts/clinic_visit_form.xml
index 44c2815..f667683 100644
--- a/netforce_clinic/layouts/clinic_visit_form.xml
+++ b/netforce_clinic/layouts/clinic_visit_form.xml
@@ -25,6 +25,9 @@
         <tab string="Validation">
             <field name="nurse_id"/>
         </tab>
+        <tab string="Note">
+            <field name="note" nolabel="1"/>
+        </tab>
     </tabs>
     <foot>
         <button string="Confirm" type="success" method="confirm" states="draft" />
diff --git a/netforce_clinic/layouts/clinic_visit_widget.xml b/netforce_clinic/layouts/clinic_visit_widget.xml
index 93ccb50..5c83e75 100644
--- a/netforce_clinic/layouts/clinic_visit_widget.xml
+++ b/netforce_clinic/layouts/clinic_visit_widget.xml
@@ -1,7 +1,9 @@
+<!--<list model="clinic.visit" colors='{"#cfc":[["cycle_color","=","red"]]}'>-->
 <list model="clinic.visit" colors='{"#cfc":[["state","=","confirmed"]]}'>
     <field name="cycle_id"/>
     <field name="visit_date"/>
     <field name="patient_id"/>
     <field name="doctor_id"/>
     <field name="state"/>
+    <!--<field name="cycle_color" invisible="1"/>-->
 </list>
diff --git a/netforce_clinic/models/__init__.py b/netforce_clinic/models/__init__.py
index 89d6e5a..d1e9d79 100644
--- a/netforce_clinic/models/__init__.py
+++ b/netforce_clinic/models/__init__.py
@@ -30,6 +30,7 @@ from . import cycle_item
 from . import cycle_item_nurse
 from . import cycle_item_doctor
 from . import cycle_item_line
+from . import cycle_dialy
 from . import gen_visit
 from . import gen_visit_line
 from . import report_clinic
@@ -51,5 +52,6 @@ from . import personal_move
 from . import personal_cycle
 from . import schedule
 from . import schedule_line
+from . import schedule_copy
 from . import load_nurse
 from . import load_nurse_line
diff --git a/netforce_clinic/models/cycle_dialy.py b/netforce_clinic/models/cycle_dialy.py
new file mode 100644
index 0000000..a402bbf
--- /dev/null
+++ b/netforce_clinic/models/cycle_dialy.py
@@ -0,0 +1,27 @@
+import time
+
+from netforce.model import Model, fields
+from netforce.access import get_active_company
+
+class CycleDialy(Model):
+    _name="clinic.cycle.dialy"
+    _string="Cycle Diay"
+    
+    _fields={
+        "name": fields.Char("Name"),
+        'date': fields.Date("Date", required=True, search=True),
+        'cycle_items': fields.One2Many("clinic.cycle.item","cycle_dialy_id", "Cycle Items"),
+        'company_id': fields.Many2One("company","Company"),
+    }
+
+    _defaults={
+        'company_id': lambda *a: get_active_company(),
+        'date': lambda *a: time.strftime("%Y-%m-%d"),
+        'name': lambda *a: time.strftime("%Y-%m-%d"),
+    }
+    
+    def write(self,ids,vals,**kw):
+        vals['name']=vals['date']
+        super().write(ids,vals,**kw)
+
+CycleDialy.register()
diff --git a/netforce_clinic/models/cycle_item.py b/netforce_clinic/models/cycle_item.py
index 976d762..7cea13b 100644
--- a/netforce_clinic/models/cycle_item.py
+++ b/netforce_clinic/models/cycle_item.py
@@ -18,16 +18,16 @@ class CycleItem(Model):
         return res
 
     _fields={
-        'name': fields.Char("Name", function="_get_all",function_multi=True), # need to field related in journal
-        'company_id': fields.Many2One("company", "Company"),
-        'cycle_id': fields.Many2One("clinic.cycle", "Cycle",search=True),
+        'name': fields.Char("Name", function="_get_all",function_multi=True),
         'date': fields.Date("Date",search=True),
-        "state": fields.Selection([("draft","Draft"),("done","Done")],"Status",required=True),
-        'hd_cases': fields.One2Many("clinic.hd.case","cycle_item_id", "HD Cases"),
+        'cycle_id': fields.Many2One("clinic.cycle", "Cycle",search=True),
+        'cycle_dialy_id': fields.Many2One("clinic.cycle.dialy", "Cycle Dialy",search=True),
         'visits': fields.One2Many("clinic.visit","cycle_item_id", "Visits"),
+        'hd_cases': fields.One2Many("clinic.hd.case","cycle_item_id", "HD Cases"),
         'nurses': fields.One2Many("clinic.cycle.item.nurse",'cycle_item_id','Nurses'),
-        'doctors': fields.One2Many("clinic.cycle.item.doctor",'cycle_item_id','Doctors'),
-        'sequence': fields.Char("Sequence"),
+        'sequence': fields.Char("Sequence"), # for sort item
+        'company_id': fields.Many2One("company", "Company"),
+        "state": fields.Selection([("draft","Draft"),("done","Done")],"Status",required=True),
     }
 
     _defaults={
@@ -40,10 +40,27 @@ class CycleItem(Model):
     _sql_constraints=[
         ("cycle_item_uniq","unique (cycle_id,date,company_id)","Cycle item should be unique"),
     ]
-
+    
+    def get_cycle_diary(self,date):
+        dom=[]
+        print("get ", date)
+        dom.append(['date','=',date])
+        cd_ids=get_model('clinic.cycle.dialy').search(dom)
+        cd_id=None
+        if cd_ids:
+            cd_id=cd_ids[0]
+        else:
+            cd_id=get_model('clinic.cycle.dialy').create({
+                'date':date,
+                'name':date,
+                })
+        return cd_id
+        
     def create(self, vals,**kw):
         date=vals['date']
         cycle_id=vals['cycle_id']
+        vals['cycle_dialy_id']=self.get_cycle_diary(date)
+
         cycle=get_model("clinic.cycle").browse(cycle_id)
         vals['sequence']='%s-%s'%(date,cycle.sequence) #date-sequence
         obj_id=super().create(vals,**kw)
@@ -52,6 +69,8 @@ class CycleItem(Model):
     def write(self,ids,vals,**kw):
         obj=self.browse(ids)[0]
         cycle=obj.cycle_id
+        date=vals.get('date') and vals.get('date') or obj.date
+        vals['cycle_dialy_id']=self.get_cycle_diary(date)
         vals['sequence']='%s-%s'%(obj.date,cycle.sequence) #date-sequence
         super().write(ids,vals,**kw)
     
diff --git a/netforce_clinic/models/gen_visit.py b/netforce_clinic/models/gen_visit.py
index d0597ae..72c8d90 100644
--- a/netforce_clinic/models/gen_visit.py
+++ b/netforce_clinic/models/gen_visit.py
@@ -17,7 +17,6 @@ class GenVisit(Model):
             duration=datetime.strptime(obj.date_to,FMT_DATETIME)-datetime.strptime(obj.date_from,FMT_DATETIME)
             res[obj.id]=duration.days
         return res
-    
 
     _fields={
         'date_from': fields.DateTime("From", required=True),
diff --git a/netforce_clinic/models/load_nurse.py b/netforce_clinic/models/load_nurse.py
index 99062c9..44f825d 100644
--- a/netforce_clinic/models/load_nurse.py
+++ b/netforce_clinic/models/load_nurse.py
@@ -5,7 +5,7 @@ class LoadNurse(Model):
     _transient=True
 
     _fields={
-        "schedule_id": fields.Many2One("clinic.schedule","Schedule",required=True,on_delete="cascade"),
+        "schedule_id": fields.Many2One("clinic.schedule","Schedule",on_delete="cascade"),
         'categ_id': fields.Many2One("clinic.personal.categ","Category", domain=[['type','=','nurse']]),
         "lines": fields.One2Many("clinic.schedule.load.nurse.line",'load_id', 'Lines'),
     }
@@ -41,11 +41,13 @@ class LoadNurse(Model):
 
     def copy2schedule(self,ids,context):
         obj=self.browse(ids)[0]
+        if not obj.schedule_id:
+            raise Exception("Please save schedule before copy")
+
         schedule=get_model("clinic.schedule").browse(obj.schedule_id.id)
         vals={
             'lines': [],
         }
-
         cycles=set()
         for line in obj.lines:
             nurse=line.nurse_id
@@ -75,6 +77,5 @@ class LoadNurse(Model):
         return data
     
 
-
 LoadNurse.register()
 
diff --git a/netforce_clinic/models/schedule.py b/netforce_clinic/models/schedule.py
index 21f9c43..fd7212f 100644
--- a/netforce_clinic/models/schedule.py
+++ b/netforce_clinic/models/schedule.py
@@ -11,7 +11,7 @@ class Schedule(Model):
     def _get_name(self,ids,context={}):
         res={}
         for obj in self.browse(ids):
-            res[obj.id]='Schedule - %s'%(obj.date)
+            res[obj.id]='%s'%(obj.date)
         return res
 
     def _get_item(self,ids,context={}):
@@ -29,11 +29,11 @@ class Schedule(Model):
         'cycle_item_id': fields.Many2One("clinic.cycle.item","Cycle Item", function="_get_item"),
         "time_start": fields.DateTime("Time Start",required=True),
         "time_stop": fields.DateTime("Time Stop",required=True),
-        'date': fields.Date("Date",required=True),
+        'date': fields.Date("Date",required=True,search=True),
         'lines': fields.One2Many("clinic.schedule.line","schedule_id","Lines"),
         'company_id': fields.Many2One("company","Company"),
-        'state': fields.Selection([['draft','Draft'],['confirmed', 'Confirmed']],'State'),
-        'user_id': fields.Many2One("base.user","User"),
+        'state': fields.Selection([['draft','Draft'],['confirmed', 'Confirmed']],'State',search=True),
+        'user_id': fields.Many2One("base.user","Confirm By"),
     }
 
     _defaults={
@@ -45,6 +45,8 @@ class Schedule(Model):
         'state': 'draft',
     }
 
+    _order="date desc"
+
     _sql_constraints=[
         ('schedule_uniq','unique (date,company_id)','Date should be unique'),
     ]
@@ -64,6 +66,10 @@ class Schedule(Model):
     
     def copy(self,ids,context={}):
         obj=self.browse(ids)[0]
+        datenow=datetime.now().strftime("%Y-%m-%d")
+        old_ids=get_model('clinic.schedule').search([['date','=',datenow]])
+        if old_ids:
+            raise Exception("This schedule is already create!")
         vals={
             'lines': [],
         }
@@ -73,7 +79,6 @@ class Schedule(Model):
                     'cycle_id': line.cycle_id.id
                     }
             ))
-
         new_id=get_model("clinic.schedule").create(vals)
         new_obj=get_model("clinic.schedule").browse(new_id)
         return {
@@ -94,7 +99,7 @@ class Schedule(Model):
                 'nurse_id': nurse.id,
                 'level_id': nurse.level_id.id,
             }))
-
+        print('xx')
         for nurse in obj.cycle_item_id.nurses:
             nurse.delete()
 
diff --git a/netforce_clinic/models/schedule_copy.py b/netforce_clinic/models/schedule_copy.py
new file mode 100644
index 0000000..c527a6b
--- /dev/null
+++ b/netforce_clinic/models/schedule_copy.py
@@ -0,0 +1,153 @@
+from datetime import datetime, timedelta
+from netforce.model import Model, fields, get_model
+
+FMT_DATE="%Y-%m-%d"
+FMT_DATETIME="%Y-%m-%d %H:%M:%S"
+
+class ScheduleCopy(Model):
+    _name="clinic.schedule.copy"
+    _transient=True
+
+    _fields={
+        "schedule_id": fields.Many2One("clinic.schedule","Schedule",on_delete="cascade"),
+        'date_from': fields.Date("From", required=True),
+        'date_to': fields.Date("To", required=True),
+        'mon': fields.Boolean("Monday"),
+        'tue': fields.Boolean("Tuesdays"),
+        'wed': fields.Boolean("Wednesdays"),
+        'thu': fields.Boolean("Thursdays"),
+        'fri': fields.Boolean("Fridays"),
+        'sat': fields.Boolean("Saturday"),
+        'sun': fields.Boolean("Sunday"),
+    }
+
+    def _get_schedule_id(self,context={}):
+        schedule_id=context.get("refer_id")
+        if not schedule_id:
+            return None
+        return int(schedule_id)
+    
+    def _get_date_from(self,context={}):
+        date_from=datetime.now().strftime("%Y-%m-%d")
+        schedule_id=context.get("refer_id")
+        if schedule_id:
+            schedule=get_model("clinic.schedule").browse(int(schedule_id))
+            date_from=datetime.strptime(schedule.date,FMT_DATE)
+            date_from=(date_from+timedelta(days=1)).strftime("%Y-%m-%d")
+        return date_from
+
+    def _get_date_to(self,context={}):
+        date_to=(datetime.now()+timedelta(days=8)).strftime("%Y-%m-%d")
+        schedule_id=context.get("refer_id")
+        if schedule_id:
+            schedule=get_model("clinic.schedule").browse(int(schedule_id))
+            date_to=datetime.strptime(schedule.date,FMT_DATE)
+            date_to=(date_to+timedelta(days=8)).strftime("%Y-%m-%d")
+        return  date_to
+
+    _defaults={
+        'schedule_id': _get_schedule_id,
+        'date_from': _get_date_from,
+        'date_to': _get_date_to,
+        'mon': True,
+        'tue': True,
+        'wed': True,
+        'thu': True,
+        'fri': True,
+        'sat': True,
+        'sun': True,
+    }
+
+    def copy2schedule(self,ids,context={}):
+        obj=self.browse(ids)[0]
+        if not obj.schedule_id:
+            raise Exception("Please save schedule before copy")
+
+        schedule=get_model("clinic.schedule").browse(obj.schedule_id.id)
+        lines=[]
+        for line in schedule.lines:
+            lines.append(('create',{
+                'nurse_id': line.nurse_id.id,
+                'cycle_id': line.cycle_id.id,
+            }))
+        days=[
+            obj.mon and 1 or 0,
+            obj.tue and 2 or 0,
+            obj.wed and 3 or 0,
+            obj.thu and 4 or 0,
+            obj.fri and 5 or 0,
+            obj.sat and 6 or 0,
+            obj.sun and 7 or 0,
+            ]
+        days=[day for day in days if day]
+        ntoday=1
+        date_from=datetime.strptime(obj.date_from,FMT_DATE)
+        date_to=datetime.strptime(obj.date_to,FMT_DATE)
+        day_total=(date_to-date_from).days+ntoday
+        schedules=[]
+        schedule_date=obj.schedule_id.date
+        time_start=obj.schedule_id.time_start[11:]
+        time_stop=obj.schedule_id.time_stop[11:]
+        exist_date={}
+        for r in get_model("clinic.schedule").search_read([['date','>=',obj.date_from],['date','<=',(date_to+timedelta(days=8)).strftime(FMT_DATE)]],['date','state']):
+            exist_date.update({
+                r['date']:{
+                    'id': r['id'],
+                    'date': r['date'],
+                    'state': r['state']
+                }})
+        print('exist date')
+        print("="*50)
+        for k,v in exist_date.items():
+            print(k)
+        print("="*50)
+        for weekday in days:
+            wd=date_from.weekday() 
+            start_date=date_from
+            while wd != weekday-1:
+                start_date+=timedelta(days=1)
+                wd=start_date.weekday()
+            #XXX should gen only in scope
+            if start_date.strftime(FMT_DATE) > date_to.strftime(FMT_DATE):
+                continue
+            count=0
+            tmp=start_date
+            while count < day_total:
+                tmp=start_date+timedelta(days=count)
+                date=tmp.strftime(FMT_DATE)
+                exist_vals=exist_date.get(date,{})
+                if exist_vals:
+                    eid=exist_vals['id']
+                    edate=exist_vals['date']
+                    estate=exist_vals['state']
+                    if edate==date and estate=='draft':
+                        get_model("clinic.schedule").delete([eid])
+                        print("delete ", exist_date)
+                count+=7 # looking for next week if dow is not exist
+                if date not in [v['date'] for k,v in exist_date.items()]+[schedule_date]:
+                    schedules.append({
+                        'date': date,
+                        'lines': lines,
+                    })
+                    
+            start_date=tmp
+
+
+        for sc in schedules:
+            date=sc['date']
+            sc['time_start']='%s %s'%(date,time_start)
+            sc['time_stop']='%s %s'%(date,time_stop)
+            sc_id=get_model("clinic.schedule").create(sc)
+            print('create', sc['date'])
+
+        return {
+            'next': {
+                'name': 'clinic_schedule',
+                'mode': 'form',
+                'active_id': obj.schedule_id.id,
+            },
+            'flash': 'Copy successully',
+        }
+
+ScheduleCopy.register()
+
diff --git a/netforce_clinic/models/visit.py b/netforce_clinic/models/visit.py
index e6f4684..a7fb332 100644
--- a/netforce_clinic/models/visit.py
+++ b/netforce_clinic/models/visit.py
@@ -18,6 +18,13 @@ class Visit(Model):
         for obj in self.browse(ids):
             res[obj.id]=datetime.now().strftime("%Y-%m-%d %H:%M:%S")
         return res
+    
+    def _get_color(self,ids,context={}):
+        res={}
+        for obj in self.browse(ids):
+            color=get_model("clinic.cycle").browse(obj.cycle_id.id).color
+            res[obj.id]=color
+        return res
 
     _fields={
         "number": fields.Char("Number",required=True,search=True),
@@ -31,12 +38,14 @@ class Visit(Model):
         "company_id": fields.Many2One("company","Company"),
         'hd_cases': fields.One2Many('clinic.hd.case','visit_id',"HD Cases",readonly=True),
         "cycle_id": fields.Many2One("clinic.cycle","Cycle"),
+        'cycle_color': fields.Char('Color',function="_get_color"),
         "state": fields.Selection([["draft","Draft"],["confirmed","Confirmed"],["cancelled","Cancelled"]],"Status",required=True),
         "comments": fields.One2Many("message","related_id","Comments"),
         'visit_date': fields.Date('Visit Date'),
         'print_date': fields.Date('Print Date',function="_get_print_date"),
         'cycle_item_id': fields.Many2One("clinic.cycle.item","Cycle Item"), #XXX on_delete="cascade" -> rm visit from cycle item
         'sequence': fields.Char("Sequence"),
+        'note': fields.Text('Note'),
     }
 
     def _get_number(self,context={}):
@@ -296,7 +305,7 @@ class Visit(Model):
         item_obj=get_model('clinic.cycle.item')
         item_ids=item_obj.search(dom)
         item_id=None
-        # XXX
+
         nurse_vals=[]
         if 'nurse_vals' in vals.keys():
             nurse_vals=vals['nurse_vals']
@@ -326,6 +335,7 @@ class Visit(Model):
                 })
 
         vals['cycle_item_id']=item_id
+
         vals['sequence']='%s-%s'%(vals['time_start'][0:10],cycle.sequence) #date-sequence
         vals['visit_date']=vals['time_start'][0:10]
         obj_id=super().create(vals,**kw)
diff --git a/netforce_clinic/models/visit_dialy.py b/netforce_clinic/models/visit_dialy.py
index abb3276..1007607 100644
--- a/netforce_clinic/models/visit_dialy.py
+++ b/netforce_clinic/models/visit_dialy.py
@@ -1,12 +1,74 @@
-from netforce.model import Model, fields
+import time
+import urllib.parse as urllib
+
+from datetime import datetime
+from calendar import monthrange
+from netforce.model import Model, fields, get_model
+from netforce.access import get_active_company
+
+from . import utils
 
 class VisitDialy(Model):
     _name="clinic.visit.dialy"
     _string="Visit Dialy"
     _transient=True
-
+    
     _fields={
-        'date': fields.Date('Date'),
+        "date": fields.Date("Month", required=True),
     }
 
+    _defaults={
+        'date': lambda *a: time.strftime("%Y-%m-%d"),        
+    }
+    
+    def get_report_data(self,ids,context={}):
+        company_id=get_active_company()
+        company=get_model("company").browse(company_id)
+
+        date=datetime.now().strftime("%Y-%m-%d")
+        if ids:
+            obj=self.browse(ids)[0]
+            date=obj.date 
+        month=int(date[5:7])
+        day=date[8:10]
+        year=date[0:4]
+        month_str=utils.MONTHS['th_TH'][month]  
+        dom=[]
+        dom.append(['time_start','>=','%s 00:00:00'%date])
+        dom.append(['time_stop','<=','%s 23:59:59'%date])
+        lines=[]
+        for obj in get_model("clinic.visit").search_browse(dom):
+            hd_case_id=None
+            hd_case_number=''
+            if obj.hd_cases:
+                hd_case=obj.hd_cases[0]
+                hd_case_id=hd_case.id,
+                hd_case_number=hd_case.number,
+            number=obj.number
+            if number=='/':
+                number='รอการรรักษา'
+            line={
+                'number': number,
+                'visit_id': obj.id,
+                'cycle_name': obj.cycle_id.name,
+                'cycle_color': obj.cycle_id.color,
+                'patient_name': obj.patient_id.name,
+                'doctor_name': obj.doctor_id.name,
+                'hd_case_number': hd_case_number,
+                'hd_case_id': hd_case_id,
+                'success_color':  obj.state=='confirmed' and '#99ff99' or ''
+            }
+            lines.append(line)
+        # XXX
+        year=int(year)+543
+        date_str='%s %s %s'%(day,month_str,year)
+        data={
+            'lines': lines,
+            #'date': date,
+            'date': date_str,
+            'company_name': company.name,
+            'company_parent_name': company.parent_id.name,
+        }
+        return data
+
 VisitDialy.register()
diff --git a/netforce_clinic/reports/visit_dialy.xlsx b/netforce_clinic/reports/visit_dialy.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..47b0b02c1a7a456edbcc9c91fe2d02d8a457f06e
GIT binary patch
literal 5043
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

literal 0
HcmV?d00001

diff --git a/netforce_clinic/templates/visit_dialy.hbs b/netforce_clinic/templates/visit_dialy.hbs
new file mode 100644
index 0000000..c7230b3
--- /dev/null
+++ b/netforce_clinic/templates/visit_dialy.hbs
@@ -0,0 +1,33 @@
+<center>
+    <h2>ตารางการรักษาผู้ป่วย</h2>
+    <h3>
+        {{parent_company_name}}&nbsp;{{company_name}}<br/>
+    </h3>
+    <h4>
+        ประจำวันที่  {{date}}
+    </h4>
+</center>
+<table class="table table-hover">
+    <thead>
+        <th>รอบ</th>
+        <th>Ref.</th>
+        <th>ผู้ป่วย</th>
+        <th>นพ.</th>
+        <th>HD Case</th>
+        <th>หมายเหตุ</th>
+    </thead>
+    <tbody>
+        {{#each lines }}
+            <tr style="background-color: {{success_color}}">
+                <td style="background-color: {{cycle_color}}">{{cycle_name}}</td>
+                <td><a href="/ui#name=clinic_visit&active_id={{visit_id}}&mode=form">{{number}}</a></td>
+                <td>{{patient_name}}</td>
+                <td>{{doctor_name}}</td>
+                <td><a href="/ui#name=clinic_hd_case&active_id={{hd_case_id}}&mode=form">{{hd_case_number}}</a></td>
+                <td>{{note}}</td>
+            </tr>
+        {{/each}}
+    </tbody>
+    <tfoot>
+    </tfoot>
+</table>
diff --git a/netforce_clinic/todo.txt b/netforce_clinic/todo.txt
index 7c08c6d..8648700 100644
--- a/netforce_clinic/todo.txt
+++ b/netforce_clinic/todo.txt
@@ -1,7 +1,7 @@
 cycle dialy
-    cycle_id, date,
-        -list of cycle items
-        -list 
+    -list of cycle items
+    - report all compute all cost
+
 visit dialy
     list of visits
 schedule planing for nurses / personal