From e5be77bb4d2bb11bdc140ce6e1888d8d741e2b83 Mon Sep 17 00:00:00 2001 From: "chayut.s" Date: Tue, 21 Oct 2014 18:22:48 +0700 Subject: [PATCH] translate Topic in Report Summary --- .../layouts/clinic_translate_form.xml | 4 +- .../layouts/clinic_translate_list.xml | 4 +- netforce_clinic/models/__init__.py | 2 +- netforce_clinic/models/report_hd_detail.py | 8 +++ netforce_clinic/models/report_hd_madical.py | 7 ++- netforce_clinic/models/report_hd_summary.py | 52 +++++++++++------- netforce_clinic/models/translate.py | 6 +- .../reports/report_hd_madical.xlsx | Bin 6302 -> 7156 bytes .../templates/report_hd_detail.hbs | 2 +- .../templates/report_hd_madical.hbs | 2 +- .../templates/report_hd_summary.hbs | 2 +- 11 files changed, 58 insertions(+), 31 deletions(-) diff --git a/netforce_clinic/layouts/clinic_translate_form.xml b/netforce_clinic/layouts/clinic_translate_form.xml index 27c8779..1a87471 100644 --- a/netforce_clinic/layouts/clinic_translate_form.xml +++ b/netforce_clinic/layouts/clinic_translate_form.xml @@ -1,4 +1,4 @@
- - + + diff --git a/netforce_clinic/layouts/clinic_translate_list.xml b/netforce_clinic/layouts/clinic_translate_list.xml index 38a44f2..44ae2b1 100644 --- a/netforce_clinic/layouts/clinic_translate_list.xml +++ b/netforce_clinic/layouts/clinic_translate_list.xml @@ -1,4 +1,4 @@ - - + + diff --git a/netforce_clinic/models/__init__.py b/netforce_clinic/models/__init__.py index 05178af..bd10678 100644 --- a/netforce_clinic/models/__init__.py +++ b/netforce_clinic/models/__init__.py @@ -34,4 +34,4 @@ from . import report_hd_summary from . import report_hd_madical from . import payment from . import input_data -#from . import translate +from . import translate diff --git a/netforce_clinic/models/report_hd_detail.py b/netforce_clinic/models/report_hd_detail.py index 7d9c63c..d218e18 100644 --- a/netforce_clinic/models/report_hd_detail.py +++ b/netforce_clinic/models/report_hd_detail.py @@ -1,6 +1,7 @@ import time from netforce.model import Model, fields, get_model +#from netforce.access import get_active_company class ReportHDDetail(Model): _name="clinic.report.hd.detail" @@ -25,10 +26,16 @@ class ReportHDDetail(Model): def get_report_data(self,ids,context={}): + + # company_id=get_active_company + # comp=get_model("company").browse(company_id) # context=> dict # inside context => keys => defaults => type => dict # dict => key: value => '', 1, [], {} # context['default'] => defaults(dict) => key => inside key => value => '2014-10-22' + for item in get_model("company").search_browse([]): + company_name=item.name + date_from=time.strftime("%Y-%m-%d") date_to=time.strftime("%Y-%m-%d") # print('date_from ',date_from) @@ -149,6 +156,7 @@ class ReportHDDetail(Model): 'same_date': date_from==date_to, 'date_from': date_from, 'date_to': date_to, + 'company_name': company_name, } return data diff --git a/netforce_clinic/models/report_hd_madical.py b/netforce_clinic/models/report_hd_madical.py index b316a13..c2de473 100644 --- a/netforce_clinic/models/report_hd_madical.py +++ b/netforce_clinic/models/report_hd_madical.py @@ -2,7 +2,7 @@ import time from datetime import datetime from calendar import monthrange -from netforce.model import Model,fields +from netforce.model import Model,fields,get_model class ReportHDMadical(Model): _name="clinic.report.hd.madical" @@ -18,6 +18,10 @@ class ReportHDMadical(Model): } def get_report_data(self,ids,context={}): + + for item in get_model("company").search_browse([]): + company_name=item.name + date=datetime.now().strftime("%Y-%m-%d") #datemonth=datetime.now().strftime("%m") if ids: @@ -147,6 +151,7 @@ class ReportHDMadical(Model): 'month': month_str, 'year': year, 'lines': lines, + 'company_name': company_name, } return data diff --git a/netforce_clinic/models/report_hd_summary.py b/netforce_clinic/models/report_hd_summary.py index ca0412e..3cbfdb5 100644 --- a/netforce_clinic/models/report_hd_summary.py +++ b/netforce_clinic/models/report_hd_summary.py @@ -3,6 +3,7 @@ import time from datetime import datetime from calendar import monthrange from netforce.model import Model, fields, get_model +#from netforce.access import get_active_company class ReportHDSummary(Model): _name="clinic.report.hd.summary" @@ -14,10 +15,16 @@ class ReportHDSummary(Model): } _defaults={ - 'date': lambda *a: time.strftime("%Y-%m-%d"), + 'date': lambda *a: time.strftime("%Y-%m-%d"), } def get_report_data(self,ids,context={}): + # company_id=get_active_company + # company_name=get_model("company").search("name") + # company_name=get_model("company").search_browse() + for item in get_model("company").search_browse([]): + company_name=item.name + date=datetime.now().strftime("%Y-%m-%d") dom=[] if ids: @@ -40,8 +47,7 @@ class ReportHDSummary(Model): previous_month = 12 #tip previous_month=str(month-1 == 0 and 12 or month) previous_month_str=datetime.strptime('%s'%previous_month,'%m').strftime("%B") - - + time_start='2014-%s-01'%(month) # 2014-10-20 time_stop='2014-%s-%s'%(month,total_day) @@ -51,11 +57,12 @@ class ReportHDSummary(Model): patients=get_model("clinic.patient").search_browse(['type','=','All']) new_patients=len(patients) + patients_mg=get_model("clinic.patient").search_browse(['type','=','mg']) patients_sc=get_model("clinic.patient").search_browse(['type','=','sc']) patients_nhso=get_model("clinic.patient").search_browse(['type','=','nhso']) patients_pn=get_model("clinic.patient").search_browse(['type','=','personal']) - + dom=[] dom.append(['state','=','completed']) dom.append(['time_start','>=',time_start]) @@ -66,84 +73,91 @@ class ReportHDSummary(Model): time_start_pre='2014-%s-01'%(previous_month) # 2014-10-20 time_stop_pre='2014-%s-%s'%(previous_month,prev_total_day) - dom=[] + dom=[] dom.append(['state','=','completed']) dom.append(['time_start','>=',time_start_pre]) dom.append(['time_stop','<=',time_stop_pre]) prev_total_case=len(get_model("clinic.hd.case").search(dom)) - - lines=[ - { - 'topic': 'The number of times the Hemodialysis', + items={ + 'topic1': { 'month': month_str, 'amount': cur_total_case, 'date_from': time_start, 'date_to': time_stop, }, + 'topic2': { - 'topic':'The number of cases brought', 'month': previous_month_str, 'amount': prev_total_case, 'date_from': time_start_pre, 'date_to': time_stop_pre, }, + 'topic3': { - 'topic':'Number of new patients', 'month': month_str, 'amount': new_patients, 'date_from': time_start, 'date_to': time_stop, }, + 'topic4': { - 'topic':'Number of patients discharged', 'month': month_str, 'amount': 'N/A', 'date_from': time_start, 'date_to': time_stop, }, + 'topic5': { - 'topic':'The number of cases brought', 'month': next_month_str, 'amount': 'N/A', 'date_from': time_start, 'date_to': time_stop, }, + 'topic6': { - 'topic':'Number of patients withdrawn Social Security', 'month': '', 'amount': len(patients_sc), 'date_from': "", 'date_to': "", }, + 'topic7': { - 'topic':'Number of patients withdrawn Medical Government', 'month':'', 'amount': len(patients_mg), 'date_from': "", 'date_to': "", }, + 'topic8': { - 'topic':'Number of patients withdrawn NHSO(30B)', 'month':'', 'amount': len(patients_nhso), 'date_from': "", 'date_to': "", }, + 'topic9': { - 'topic':'Many patients pay themselves', 'month': '', 'amount': len(patients_pn), 'date_from': "", 'date_to': "", }, - ] + } + + lines=[] + for item in get_model("clinic.translate").search_browse([]): + topic=item.org + line=items.get(topic,{}) + line['topic']=item.tr + lines.append(line) data={ 'month': month_str, 'year': year, 'lines': lines, + 'company_name': company_name, } - #print("data", data) + print("data", data) return data + ReportHDSummary.register() diff --git a/netforce_clinic/models/translate.py b/netforce_clinic/models/translate.py index 9ad41b1..716185c 100644 --- a/netforce_clinic/models/translate.py +++ b/netforce_clinic/models/translate.py @@ -3,10 +3,10 @@ from netforce.model import Model, fields class Translate(Model): _name="clinic.translate" _string="Translate" - + _field_name="org" _fields={ - "original_string": fields.Char("original_string","Original String",required=True,search=True), - "translate": fields.Char("translate","Translate"), + "org": fields.Char("Original String",required=True,search=True), + "tr": fields.Char("Translate"), } diff --git a/netforce_clinic/reports/report_hd_madical.xlsx b/netforce_clinic/reports/report_hd_madical.xlsx index a802b45a05e7229ef0b89fc6b4b654c2a6e2fba1..65c30fd0c562c10b8976a3c068892cca2ee73bb1 100644 GIT binary patch delta 4455 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

Detail of the Hemodialysis

-

Clinic [Ratchawat]

+

[{{company_name}}]

{{#if same_date}} As at {{fmt_date date_from}} diff --git a/netforce_clinic/templates/report_hd_madical.hbs b/netforce_clinic/templates/report_hd_madical.hbs index dabd546..43c24b7 100644 --- a/netforce_clinic/templates/report_hd_madical.hbs +++ b/netforce_clinic/templates/report_hd_madical.hbs @@ -3,7 +3,7 @@ Summary of the Madical

- [Ratchawat : Saamsan4]
+ [{{company_name}}]
As at {{month}} {{year}}

diff --git a/netforce_clinic/templates/report_hd_summary.hbs b/netforce_clinic/templates/report_hd_summary.hbs index 665c8b1..af2deb1 100644 --- a/netforce_clinic/templates/report_hd_summary.hbs +++ b/netforce_clinic/templates/report_hd_summary.hbs @@ -3,7 +3,7 @@ Summary of the Hemodialysis

- [Ratchawat : Saamsan4]
+ [{{company_name}}]
As at {{month}} {{year}}