From 8d9a6a44f3be468f2472e68df8d33b849a0922ae Mon Sep 17 00:00:00 2001
From: "watcha.h" <watcha.h@almacom.co.th>
Date: Thu, 13 Nov 2014 11:16:25 +0700
Subject: [PATCH] refactor

---
 .../actions/clinic_report_new_patient.xml           |   8 --------
 .../actions/clinic_report_recent_patient.xml        |   8 ++++++++
 netforce_clinic/layouts/clinic_menu.xml             |   2 +-
 ...patient.xml => clinic_report_recent_patient.xml} |   2 +-
 netforce_clinic/models/__init__.py                  |   2 +-
 netforce_clinic/models/report_hd_case_summary.py    |   2 +-
 ...port_new_patient.py => report_recent_patient.py} |   8 ++++----
 ..._new_patient.xlsx => report_recent_patient.xlsx} | Bin
 .../templates/report_hd_case_summary.hbs            |   6 +++---
 ...rt_new_patient.hbs => report_recent_patient.hbs} |   0
 10 files changed, 19 insertions(+), 19 deletions(-)
 delete mode 100644 netforce_clinic/actions/clinic_report_new_patient.xml
 create mode 100644 netforce_clinic/actions/clinic_report_recent_patient.xml
 rename netforce_clinic/layouts/{clinic_report_new_patient.xml => clinic_report_recent_patient.xml} (78%)
 rename netforce_clinic/models/{report_new_patient.py => report_recent_patient.py} (95%)
 rename netforce_clinic/reports/{report_new_patient.xlsx => report_recent_patient.xlsx} (100%)
 rename netforce_clinic/templates/{report_new_patient.hbs => report_recent_patient.hbs} (100%)

diff --git a/netforce_clinic/actions/clinic_report_new_patient.xml b/netforce_clinic/actions/clinic_report_new_patient.xml
deleted file mode 100644
index 325413a..0000000
--- a/netforce_clinic/actions/clinic_report_new_patient.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<action>                                                                                                         
-    <field name="string">Report New Patient</field>
-    <field name="view_cls">report</field>                                                                        
-    <field name="model">clinic.report.new.patient</field>
-    <field name="report_template">report_new_patient</field>                                                      
-    <field name="report_template_xls">report_new_patient</field>                                                         
-    <field name="menu">clinic_menu</field>                                                                  
-</action>  
diff --git a/netforce_clinic/actions/clinic_report_recent_patient.xml b/netforce_clinic/actions/clinic_report_recent_patient.xml
new file mode 100644
index 0000000..19786fb
--- /dev/null
+++ b/netforce_clinic/actions/clinic_report_recent_patient.xml
@@ -0,0 +1,8 @@
+<action>                                                                                                         
+    <field name="string">Report Recent Patient</field>
+    <field name="view_cls">report</field>                                                                        
+    <field name="model">clinic.report.recent.patient</field>
+    <field name="report_template">report_recent_patient</field>                                                      
+    <field name="report_template_xls">report_recent_patient</field>                                                         
+    <field name="menu">clinic_menu</field>                                                                  
+</action>  
diff --git a/netforce_clinic/layouts/clinic_menu.xml b/netforce_clinic/layouts/clinic_menu.xml
index dac844e..face1da 100644
--- a/netforce_clinic/layouts/clinic_menu.xml
+++ b/netforce_clinic/layouts/clinic_menu.xml
@@ -39,7 +39,7 @@
     <item string="Reports">
         <item string="HD Case Summary" action="clinic_report_hd_case_summary"/>
         <item string="Medical Summary" action="clinic_report_medical_summary"/>
-        <item string="New Patient" action="clinic_report_new_patient"/>
+        <item string="Recent Patient" action="clinic_report_recent_patient"/>
         <item string="Discontinue Patient" action="clinic_report_discontinue_patient"/>
     </item>
     <item string="Settings">
diff --git a/netforce_clinic/layouts/clinic_report_new_patient.xml b/netforce_clinic/layouts/clinic_report_recent_patient.xml
similarity index 78%
rename from netforce_clinic/layouts/clinic_report_new_patient.xml
rename to netforce_clinic/layouts/clinic_report_recent_patient.xml
index ba06bb1..253fadc 100644
--- a/netforce_clinic/layouts/clinic_report_new_patient.xml
+++ b/netforce_clinic/layouts/clinic_report_recent_patient.xml
@@ -1,4 +1,4 @@
-<form model="clinic.report.new.patient">
+<form model="clinic.report.recent.patient">
     <field name="date" span="3" mode="month" onchange="onchange_date"/>
     <field name="date_from" span="3"/>
     <field name="date_to" span="3"/>
diff --git a/netforce_clinic/models/__init__.py b/netforce_clinic/models/__init__.py
index 2e2f2c5..5a69f70 100644
--- a/netforce_clinic/models/__init__.py
+++ b/netforce_clinic/models/__init__.py
@@ -34,7 +34,7 @@ from . import gen_visit_line
 from . import report_clinic
 from . import report_hd_case_summary
 from . import report_medical_summary
-from . import report_new_patient
+from . import report_recent_patient
 from . import report_discontinue_patient
 from . import fin_setting
 from . import import_data_mg
diff --git a/netforce_clinic/models/report_hd_case_summary.py b/netforce_clinic/models/report_hd_case_summary.py
index 21012ad..1b8e3ae 100644
--- a/netforce_clinic/models/report_hd_case_summary.py
+++ b/netforce_clinic/models/report_hd_case_summary.py
@@ -207,7 +207,7 @@ class ReportHDCaseSummary(Model):
             'month': month_str,
             'year': year,
             'lines': lines,
-            'new_patients': get_model("clinic.report.new.patient").get_report_data(ids=[],context=context)['lines'],
+            'recent_patients': get_model("clinic.report.recent.patient").get_report_data(ids=[],context=context)['lines'],
             'resign_patients': get_model("clinic.report.discontinue.patient").get_report_data(ids=[],context=context)['lines'],
             'medicals': medicals,
             'company_name': company.name or "",
diff --git a/netforce_clinic/models/report_new_patient.py b/netforce_clinic/models/report_recent_patient.py
similarity index 95%
rename from netforce_clinic/models/report_new_patient.py
rename to netforce_clinic/models/report_recent_patient.py
index d7f140b..271c6f5 100644
--- a/netforce_clinic/models/report_new_patient.py
+++ b/netforce_clinic/models/report_recent_patient.py
@@ -6,9 +6,9 @@ from netforce.access import get_active_company
 
 from . import utils
 
-class ReportNewPatient(Model):
-    _name="clinic.report.new.patient"
-    _string="Report New Patient"
+class ReportRecentPatient(Model):
+    _name="clinic.report.recent.patient"
+    _string="Report Recent Patient"
     _transient=True
     
     _fields={
@@ -92,4 +92,4 @@ class ReportNewPatient(Model):
         data['date_to']="%s-%s-%s"%(year,month,total_day)
         return data
 
-ReportNewPatient.register()
+ReportRecentPatient.register()
diff --git a/netforce_clinic/reports/report_new_patient.xlsx b/netforce_clinic/reports/report_recent_patient.xlsx
similarity index 100%
rename from netforce_clinic/reports/report_new_patient.xlsx
rename to netforce_clinic/reports/report_recent_patient.xlsx
diff --git a/netforce_clinic/templates/report_hd_case_summary.hbs b/netforce_clinic/templates/report_hd_case_summary.hbs
index b8f5519..a4e5a89 100644
--- a/netforce_clinic/templates/report_hd_case_summary.hbs
+++ b/netforce_clinic/templates/report_hd_case_summary.hbs
@@ -42,7 +42,7 @@
     <thead>
         <th>
             <center>
-                <a href="/ui#name=clinic_report_new_patient&defaults.date={{date}}">
+                <a href="/ui#name=clinic_report_recent_patient&defaults.date={{date}}">
                     รายชื่อผู้ป่วยรับใหม่
                 </a>
             </center>
@@ -65,8 +65,8 @@
                     <th>หมายเหตุ</th>
                 </thead>
                 <tbody>
-                    {{#if new_patients}}
-                        {{#each new_patients}}
+                    {{#if recent_patients}}
+                        {{#each recent_patients}}
                             <tr>
                                 <td>{{no}}</td>
                                 <td>{{reg_date}}</td>
diff --git a/netforce_clinic/templates/report_new_patient.hbs b/netforce_clinic/templates/report_recent_patient.hbs
similarity index 100%
rename from netforce_clinic/templates/report_new_patient.hbs
rename to netforce_clinic/templates/report_recent_patient.hbs