From 46dabd80455a4c26164791c1fbd0ba451430feeb Mon Sep 17 00:00:00 2001 From: "watcha.h" Date: Fri, 17 Oct 2014 15:48:32 +0700 Subject: [PATCH 1/4] xxxx --- netforce_clinic/reports/hd_report_monthly.xlsx | Bin 15867 -> 0 bytes netforce_clinic/reports/report_hd_dialy.xlsx | Bin 0 -> 5994 bytes ...report_dialy.xlsx => report_hd_monthly.xlsx} | Bin 3 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 netforce_clinic/reports/hd_report_monthly.xlsx create mode 100644 netforce_clinic/reports/report_hd_dialy.xlsx rename netforce_clinic/reports/{hd_report_dialy.xlsx => report_hd_monthly.xlsx} (100%) diff --git a/netforce_clinic/reports/hd_report_monthly.xlsx b/netforce_clinic/reports/hd_report_monthly.xlsx deleted file mode 100644 index 117d38d9d208aacd4d4aa7b5b3d039b0c789ad32..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15867 zcmeI3c|26@|Nq--S}14i$=!@bLs?FX3Tc@c(M0xS3&%EOE!$Yy8EdB$r$j}=5bl&M z%T$z6p)w_eLPU*y2{Zht?mM)6`u_WS+?U6LDisfy&0eUN7PhOpe3!VO>eBWHeBw&=_2wYNw2X#&zd4hg(e57heKGO6*Zj6K zB40Z**%J?Y8=E5@@?X9vPB!P^8)J_*wwLJd`i2D;OY}bvTTd~{;zTSQ<&%0fui}8= zW7{aH6phE79Ttrmx&mt&v`eB=sgJh*U81yFs@tq=J>WIg?K0le$vN4`Cme0p))naI z-CLg!#Lw3ixINH+a4cFtG(0sd}tIyGqv4QrwzM&vV$uXYmaCc+Ch=m$AAfPAb zi3NX9>cUcq0w%ZTU51g7|x-g3s?qpYRI@ zRaGmEf2gnPl2r5U=Z<y=abiR`p9%pT@Xe`(|I=uYKIJc+%9q%PaOODS)J0l_} zaQI_Q(32oFo~s9c{lk+=b}kuw!UMw}n=P4J{i!}%8V29>M;E*1UfTZVO~9r&uhRQ% zmzm@3L0xLR=J)__f6s!Tj|M)jZr&cI2s5^zpy6%n;P9vJ(f3Ayf!%$>b$y}Sfk^&% zHUH0V2i}#pm*yC?KdkxK?K{?7oEjP#6vQuA5imU99r^NI`O7w{pX>0);jXeC?)D

TQ#@e1Kh?DIyt+l;n>U|6jrIG!Ppx9c2NoDV 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 Nm&9#;NJ;Nj{{tnjJAwcJ literal 0 HcmV?d00001 diff --git a/netforce_clinic/reports/hd_report_dialy.xlsx b/netforce_clinic/reports/report_hd_monthly.xlsx similarity index 100% rename from netforce_clinic/reports/hd_report_dialy.xlsx rename to netforce_clinic/reports/report_hd_monthly.xlsx From 28431a348bcbd90ef87149f42e9879ede5613ca7 Mon Sep 17 00:00:00 2001 From: "watcha.h" Date: Mon, 20 Oct 2014 10:02:57 +0700 Subject: [PATCH 2/4] xxxxx --- .../layouts/clinic_hd_case_form.xml | 1 + .../layouts/clinic_hd_case_list.xml | 9 +++ netforce_clinic/models/__init__.py | 1 - netforce_clinic/models/hd_case.py | 6 +- .../models/report_dialyzer_drop.py | 37 ------------ netforce_clinic/models/report_hd_dialy.py | 8 ++- .../templates/report_dialyzer_drop.hbs | 58 ------------------- .../templates/report_hd_monthly.hbs | 2 +- netforce_clinic/templates/round.hbs | 1 - netforce_clinic/todo.txt | 10 ++-- 10 files changed, 28 insertions(+), 105 deletions(-) delete mode 100644 netforce_clinic/models/report_dialyzer_drop.py delete mode 100644 netforce_clinic/templates/report_dialyzer_drop.hbs delete mode 100644 netforce_clinic/templates/round.hbs diff --git a/netforce_clinic/layouts/clinic_hd_case_form.xml b/netforce_clinic/layouts/clinic_hd_case_form.xml index d03cdb9..0bc1f6f 100644 --- a/netforce_clinic/layouts/clinic_hd_case_form.xml +++ b/netforce_clinic/layouts/clinic_hd_case_form.xml @@ -28,6 +28,7 @@ + diff --git a/netforce_clinic/layouts/clinic_hd_case_list.xml b/netforce_clinic/layouts/clinic_hd_case_list.xml index 89ca460..fd09d59 100644 --- a/netforce_clinic/layouts/clinic_hd_case_list.xml +++ b/netforce_clinic/layouts/clinic_hd_case_list.xml @@ -1,4 +1,13 @@ + + + + + + + + + diff --git a/netforce_clinic/models/__init__.py b/netforce_clinic/models/__init__.py index a58cdde..565a8f0 100644 --- a/netforce_clinic/models/__init__.py +++ b/netforce_clinic/models/__init__.py @@ -13,7 +13,6 @@ from . import patient_cause_line from . import patient_comorbidity_line from . import patient_morbidity_line from . import race -from . import report_dialyzer_drop from . import schedule from . import setting from . import visit diff --git a/netforce_clinic/models/hd_case.py b/netforce_clinic/models/hd_case.py index 95df288..7c0ee1b 100644 --- a/netforce_clinic/models/hd_case.py +++ b/netforce_clinic/models/hd_case.py @@ -64,6 +64,7 @@ class HDcase(Model): "fee_total": fields.Float("Total",function="get_gmtotal",readonly=True,function_multi=True), 'note': fields.Text("Note"), "cycle_id": fields.Many2One("clinic.cycle","Cycle"), + 'pop_txt': fields.Char("POP TEXT", readonly=True), } def _get_number(self,context={}): @@ -97,6 +98,7 @@ class HDcase(Model): "number": _get_number, "company_id": lambda *a: get_active_company(), "fee": 1500, + 'show_pop': False, } _order="date desc,number desc" @@ -175,7 +177,9 @@ class HDcase(Model): data=context['data'] hct=data['hct'] if(hct<=39): - data['hct']=0 + data['pop_txt']='xxxxxxxxxxxxxxxxx' + else: + data['pop_txt']='' return data def cancelled(self,ids,context={}): diff --git a/netforce_clinic/models/report_dialyzer_drop.py b/netforce_clinic/models/report_dialyzer_drop.py deleted file mode 100644 index 0e229e4..0000000 --- a/netforce_clinic/models/report_dialyzer_drop.py +++ /dev/null @@ -1,37 +0,0 @@ -import time - -from netforce.model import Model, fields, get_model - -class DialyzerDrop(Model): - _name="report.dialyzer.drop" - _string="Dialyzer [Drop]" - _transient=True - - _fields={ - "date": fields.Date("Date"), - } - - _defaults={ - 'date': lambda *a: time.strftime("%Y-%m-%d"), - } - - def get_report_data(self,ids,context={}): - lines=[] - - hd_cases=get_model("clinic.dialyzer").search_browse(['state','=','drop']) - for dialyzer_ids in hd_cases: - lines.append({ - 'number' : dialyzer_ids.number, - 'usetime': dialyzer_ids.use_time, - 'maxuse' : dialyzer_ids.max_use_time, - 'createdate' : dialyzer_ids.date, - 'expdate' : dialyzer_ids.exp_date, - 'patient' : dialyzer_ids.patient_id.name, - }) - - data={ - 'lines': lines or "Dialyzer Drop [Empty]", - } - return data - -DialyzerDrop.register() diff --git a/netforce_clinic/models/report_hd_dialy.py b/netforce_clinic/models/report_hd_dialy.py index 423b6ba..f84792c 100644 --- a/netforce_clinic/models/report_hd_dialy.py +++ b/netforce_clinic/models/report_hd_dialy.py @@ -36,6 +36,12 @@ class ReportHDDialy(Model): date_from=time.strftime("%Y-%m-%d") date_to=time.strftime("%Y-%m-%d") + defaults=context.get("defaults") + if defaults.get("date_from"): + date_from=defaults.get("date_from") + if defaults.get("date_to"): + date_to=defaults.get("date_to") + dom=[] dom.append(['state','=','completed']) if ids: @@ -66,8 +72,6 @@ class ReportHDDialy(Model): for hd_case in get_model("clinic.hd.case").search_browse(dom,order="cycle_id.sequence"): patient_type=hd_case.patient_id.type patient_type=PATIENT_TYPE.get(patient_type) - #dialyzer_name=hd_case.dialyzers.id - #dialyzer_name=DIALYZER_NAME.get(dialyzer_name) cycle_name=hd_case.cycle_id.name or "" show_cycle=False if not cycle_name in cycles: diff --git a/netforce_clinic/templates/report_dialyzer_drop.hbs b/netforce_clinic/templates/report_dialyzer_drop.hbs deleted file mode 100644 index a990eac..0000000 --- a/netforce_clinic/templates/report_dialyzer_drop.hbs +++ /dev/null @@ -1,58 +0,0 @@ -

-

- Dialyzers [Drop] -

-
- - - - - - - - - - - - - {{#each lines context=context}} - - - - - - - - - {{/each}} - - - - - - -
- Number - - Use (Time) - - Max Use (Time) - - Create Date - - Expire Date - - Patient -
- {{number}} - - {{usetime}} - - {{maxuse}} - - {{createdate}} - - {{expdate}} - - {{patient}} -
diff --git a/netforce_clinic/templates/report_hd_monthly.hbs b/netforce_clinic/templates/report_hd_monthly.hbs index 078950f..4862c78 100644 --- a/netforce_clinic/templates/report_hd_monthly.hbs +++ b/netforce_clinic/templates/report_hd_monthly.hbs @@ -18,7 +18,7 @@ {{topic}} {{month}} - {{amount}} + {{amount}} {{/each}} diff --git a/netforce_clinic/templates/round.hbs b/netforce_clinic/templates/round.hbs deleted file mode 100644 index 8813e52..0000000 --- a/netforce_clinic/templates/round.hbs +++ /dev/null @@ -1 +0,0 @@ -

Hello HBS

diff --git a/netforce_clinic/todo.txt b/netforce_clinic/todo.txt index 33d8862..5e28c66 100644 --- a/netforce_clinic/todo.txt +++ b/netforce_clinic/todo.txt @@ -1,7 +1,10 @@ +==== + - import data + - payment + - NHSO + - SSO ===== - select diaylizer at treatment page - - + select diaylizer at treatment page -> ok ===== step: nurse @@ -19,7 +22,6 @@ 3. go to hd case - select dialyzer - if not we can no do treament - ===== todo ###### - import payment From 219fb0961207d63659185c04bfab1d84f8ae46f9 Mon Sep 17 00:00:00 2001 From: "watcha.h" Date: Mon, 20 Oct 2014 12:17:21 +0700 Subject: [PATCH 3/4] get visit --- .../layouts/clinic_gen_visit_form.xml | 1 + .../layouts/clinic_visit_calendar.xml | 3 +- netforce_clinic/models/gen_visit.py | 124 ++++++++++++++---- netforce_clinic/models/patient.py | 4 - netforce_clinic/todo.txt | 2 + 5 files changed, 106 insertions(+), 28 deletions(-) diff --git a/netforce_clinic/layouts/clinic_gen_visit_form.xml b/netforce_clinic/layouts/clinic_gen_visit_form.xml index 797a0a8..37cf326 100644 --- a/netforce_clinic/layouts/clinic_gen_visit_form.xml +++ b/netforce_clinic/layouts/clinic_gen_visit_form.xml @@ -18,5 +18,6 @@