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 @@ - - Report New Patient - report - clinic.report.new.patient - report_new_patient - report_new_patient - clinic_menu - 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 @@ + + Report Recent Patient + report + clinic.report.recent.patient + report_recent_patient + report_recent_patient + clinic_menu + 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 @@ - + 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 @@ -
+ 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 @@
- + รายชื่อผู้ป่วยรับใหม่
@@ -65,8 +65,8 @@ หมายเหตุ - {{#if new_patients}} - {{#each new_patients}} + {{#if recent_patients}} + {{#each recent_patients}} {{no}} {{reg_date}} 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