From d7e1ee21b8a6b01beefcc740b364a9713d5273c3 Mon Sep 17 00:00:00 2001
From: "watcha.h" <watcha.h@almacom.co.th>
Date: Thu, 7 Jan 2016 10:18:28 +0700
Subject: [PATCH 1/3] sort report cycle item

---
 .../layouts/clinic_report_cycle_item.xml      |  1 +
 netforce_clinic/models/report_cycle_item.py   | 28 +++++++++++++++++--
 2 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/netforce_clinic/layouts/clinic_report_cycle_item.xml b/netforce_clinic/layouts/clinic_report_cycle_item.xml
index 0a46419..3826c2a 100644
--- a/netforce_clinic/layouts/clinic_report_cycle_item.xml
+++ b/netforce_clinic/layouts/clinic_report_cycle_item.xml
@@ -6,6 +6,7 @@
     <field name="ptype_id" span="2"/>
     <field name="branch_id" onchange="onchange_type" span="2"/>
     <field name="department_id" domain='[["branch_id","=",branch_id]]' span="2"/>
+    <field name="sort_by" span="2"/>
     <group span="6" columns="1">
         <template>
             <div>
diff --git a/netforce_clinic/models/report_cycle_item.py b/netforce_clinic/models/report_cycle_item.py
index 3e030d1..7582e62 100644
--- a/netforce_clinic/models/report_cycle_item.py
+++ b/netforce_clinic/models/report_cycle_item.py
@@ -19,6 +19,7 @@ class ReportCycleItem(Model):
         "ptype_id": fields.Many2One("clinic.patient.type","Patient Type"),
         'branch_id': fields.Many2One("clinic.branch","Branch"),
         'department_id': fields.Many2One("clinic.department","Department"),
+        'sort_by': fields.Selection([['hdcase_number','HDCase Number'],['pname','Pateint Name'],['mdc_name','EPO']],'Sort By'),
     }
 
     def default_get(self,field_names=None,context={},**kw):
@@ -51,6 +52,7 @@ class ReportCycleItem(Model):
             'branch_id': branch_id,
             'department_id': department_id,
             'ptype_id': ptype_id,
+            'sort_by': 'mdc_name',
         }
         print('report.cycle.item.defautls', res)
         return res
@@ -67,6 +69,7 @@ class ReportCycleItem(Model):
         print('date_from ', date_from)
         month=date_from.split("-")[1]
         cycle_id=None
+        sort_by='mdc_name'
         if ids:
             obj=self.browse(ids)[0]
             month=obj.date_from.split("-")[1]
@@ -76,6 +79,7 @@ class ReportCycleItem(Model):
             department_id=obj.department_id.id
             cycle_id=obj.cycle_id.id
             ptype_id=obj.ptype_id.id
+            sort_by=obj.sort_by or 'mdc_name'
         # new patient of this month
         dom=[]
         dom.append(['date','>=',date_from])
@@ -170,7 +174,7 @@ class ReportCycleItem(Model):
                    'mdc': hdcase.mdc,
                    'hdcase_number': reformat_number(hdcase.number),
                    'hdcase_id': hdcase.id,
-                   'mdc_name': hdcase.mdc_name or hdcase.epo,
+                   'mdc_name': hdcase.mdc_name or hdcase.epo or '',
                    'iron_name': hdcase.iron_name or '',
                    'fee': abs(hdcase.fee),
                    'dlz_name': hdcase.dlz_name,
@@ -199,6 +203,7 @@ class ReportCycleItem(Model):
             branch=get_model("clinic.branch").browse(branch_id)
             company_name+=" ("+branch.name+")"
         nlines=[]
+        clines=[]
         index=0
         old=[]
         total_fee=0
@@ -260,11 +265,30 @@ class ReportCycleItem(Model):
                             'nfirst_name': cres[i]['first_name'],
                             'ctid': cres[i]['cycle_item_id'],
                         })
-            nlines.append(line)
+            #nlines.append(line)
+            clines.append(line)
             # if nurse more that cres, should show name of nurses
             nlines+=more_lines
             if no==count:
                 epo_items=[{'name': k, 'qty': v} for k,v in epos.items() if k ]
+                #sort item
+                clines=sorted(clines,key=lambda cl: cl[sort_by])
+                no=1
+                index=len(nlines)
+                date_txt=''
+                cseq_txt=''
+                for cline in clines:
+                    if cline.get('cseq_txt'):
+                        date_txt=cline.get('date_txt')
+                        cseq_txt=cline.get('cseq_txt')
+                        cline['date_txt']=''
+                        cline['cseq_txt']=''
+                    cline['no']=no
+                    nlines.append(cline)
+                    no+=1
+                nlines[index]['date_txt']=date_txt
+                nlines[index]['cseq_txt']=cseq_txt
+                clines=[]
                 nlines.append({
                     'sub': 'show',
                     'is_sub': True,

From eb21830246a4e91ad79545dd3b17e3ac2b964a4e Mon Sep 17 00:00:00 2001
From: "watcha.h" <watcha.h@almacom.co.th>
Date: Thu, 7 Jan 2016 21:20:57 +0700
Subject: [PATCH 2/3] name of nurse not order

---
 netforce_clinic/models/report_cycle_item.py | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/netforce_clinic/models/report_cycle_item.py b/netforce_clinic/models/report_cycle_item.py
index 7582e62..aab3cba 100644
--- a/netforce_clinic/models/report_cycle_item.py
+++ b/netforce_clinic/models/report_cycle_item.py
@@ -19,7 +19,7 @@ class ReportCycleItem(Model):
         "ptype_id": fields.Many2One("clinic.patient.type","Patient Type"),
         'branch_id': fields.Many2One("clinic.branch","Branch"),
         'department_id': fields.Many2One("clinic.department","Department"),
-        'sort_by': fields.Selection([['hdcase_number','HDCase Number'],['pname','Pateint Name'],['mdc_name','EPO']],'Sort By'),
+        'sort_by': fields.Selection([['hdcase_number','HDCase Number'],['pname','Patient Name'],['mdc_name','EPO']],'Sort By'),
     }
 
     def default_get(self,field_names=None,context={},**kw):
@@ -277,7 +277,17 @@ class ReportCycleItem(Model):
                 index=len(nlines)
                 date_txt=''
                 cseq_txt=''
+                nurse_items=[]
                 for cline in clines:
+                    if cline.get('nfirst_name'):
+                        nurse_items.append({
+                            'nurse': cline.get('nurse'),
+                            'nfirst_name': cline.get('nfirst_name'),
+                            'ctid': cline.get('ctid'),
+                        })
+                        cline['nurse']=''
+                        cline['nfirst_name']=''
+                        cline['ctid']=''
                     if cline.get('cseq_txt'):
                         date_txt=cline.get('date_txt')
                         cseq_txt=cline.get('cseq_txt')
@@ -288,6 +298,13 @@ class ReportCycleItem(Model):
                     no+=1
                 nlines[index]['date_txt']=date_txt
                 nlines[index]['cseq_txt']=cseq_txt
+                for nurse_item in sorted(nurse_items,key=lambda nitem: nitem['nfirst_name']):
+                    nlines[index].update({
+                        'nurse': nurse_item['nurse'],
+                        'nfirst_name': nurse_item['nfirst_name'],
+                        'ctid': nurse_item['ctid'],
+                    })
+                    index+=1
                 clines=[]
                 nlines.append({
                     'sub': 'show',

From 160aefa860a88aa5237b81116c60196df9aabdfa Mon Sep 17 00:00:00 2001
From: "watcha.h" <watcha.h@almacom.co.th>
Date: Fri, 8 Jan 2016 08:18:00 +0700
Subject: [PATCH 3/3] no sort nurse

---
 netforce_clinic/models/report_cycle_item.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/netforce_clinic/models/report_cycle_item.py b/netforce_clinic/models/report_cycle_item.py
index aab3cba..ce6517f 100644
--- a/netforce_clinic/models/report_cycle_item.py
+++ b/netforce_clinic/models/report_cycle_item.py
@@ -298,7 +298,7 @@ class ReportCycleItem(Model):
                     no+=1
                 nlines[index]['date_txt']=date_txt
                 nlines[index]['cseq_txt']=cseq_txt
-                for nurse_item in sorted(nurse_items,key=lambda nitem: nitem['nfirst_name']):
+                for nurse_item in nurse_items:
                     nlines[index].update({
                         'nurse': nurse_item['nurse'],
                         'nfirst_name': nurse_item['nfirst_name'],