From 43494a02f1d72e126917a20df973633af4469400 Mon Sep 17 00:00:00 2001 From: "watcha.h" Date: Tue, 2 Dec 2014 14:08:20 +0700 Subject: [PATCH] rm PATIENT_TYPE --- netforce_clinic/actions/clinic_patient.xml | 3 +- .../actions/clinic_patient_type.xml | 6 + .../actions/clinic_vascular_access.xml | 6 + .../actions/import_clinic_hd_case.xml | 6 + netforce_clinic/actions/import_clinic_mg.xml | 6 - .../actions/import_clinic_patient.xml | 6 + .../actions/import_clinic_visit.xml | 6 + .../layouts/clinic_gen_visit_form.xml | 4 +- .../layouts/clinic_hd_case_form.xml | 2 +- .../layouts/clinic_hd_case_list.xml | 2 +- netforce_clinic/layouts/clinic_menu.xml | 9 +- .../layouts/clinic_patient_form.xml | 3 +- .../layouts/clinic_patient_list.xml | 6 +- .../layouts/clinic_patient_type_form.xml | 5 + .../layouts/clinic_patient_type_list.xml | 5 + netforce_clinic/layouts/clinic_setting.xml | 16 - .../layouts/clinic_vascular_access_form.xml | 4 + .../layouts/clinic_vascular_access_list.xml | 4 + .../layouts/import_clinic_hd_case.xml | 9 + .../layouts/import_clinic_patient.xml | 9 + .../layouts/import_clinic_visit.xml | 9 + .../layouts/old/import_clinic_sc.xml | 19 -- .../layouts/old/import_clinic_uc.xml | 10 - netforce_clinic/models/__init__.py | 13 +- netforce_clinic/models/hd_case.py | 50 +-- .../{hd_case_dialy.py => hd_case_daily.py} | 9 +- netforce_clinic/models/import_hd_case.py | 143 +++++++++ netforce_clinic/models/import_patient.py | 54 ++++ netforce_clinic/models/import_visit.py | 82 +++++ netforce_clinic/models/patient.py | 16 +- netforce_clinic/models/patient_type.py | 14 + .../models/report_hd_case_summary.py | 13 +- .../models/report_medical_summary.py | 60 ++-- netforce_clinic/models/setting.py | 286 +----------------- netforce_clinic/models/staff.py | 2 +- netforce_clinic/models/utils.py | 61 +++- netforce_clinic/models/vascular_access.py | 12 + netforce_clinic/models/visit_board.py | 9 +- .../templates/report_hd_case_summary.hbs | 15 +- .../templates/report_medical_summary.hbs | 15 +- netforce_clinic/todo.txt | 12 +- 41 files changed, 564 insertions(+), 457 deletions(-) create mode 100644 netforce_clinic/actions/clinic_patient_type.xml create mode 100644 netforce_clinic/actions/clinic_vascular_access.xml create mode 100644 netforce_clinic/actions/import_clinic_hd_case.xml delete mode 100644 netforce_clinic/actions/import_clinic_mg.xml create mode 100644 netforce_clinic/actions/import_clinic_patient.xml create mode 100644 netforce_clinic/actions/import_clinic_visit.xml create mode 100644 netforce_clinic/layouts/clinic_patient_type_form.xml create mode 100644 netforce_clinic/layouts/clinic_patient_type_list.xml create mode 100644 netforce_clinic/layouts/clinic_vascular_access_form.xml create mode 100644 netforce_clinic/layouts/clinic_vascular_access_list.xml create mode 100644 netforce_clinic/layouts/import_clinic_hd_case.xml create mode 100644 netforce_clinic/layouts/import_clinic_patient.xml create mode 100644 netforce_clinic/layouts/import_clinic_visit.xml delete mode 100644 netforce_clinic/layouts/old/import_clinic_sc.xml delete mode 100644 netforce_clinic/layouts/old/import_clinic_uc.xml rename netforce_clinic/models/{hd_case_dialy.py => hd_case_daily.py} (92%) create mode 100644 netforce_clinic/models/import_hd_case.py create mode 100644 netforce_clinic/models/import_patient.py create mode 100644 netforce_clinic/models/import_visit.py create mode 100644 netforce_clinic/models/patient_type.py create mode 100644 netforce_clinic/models/vascular_access.py diff --git a/netforce_clinic/actions/clinic_patient.xml b/netforce_clinic/actions/clinic_patient.xml index 2738622..fea87f2 100644 --- a/netforce_clinic/actions/clinic_patient.xml +++ b/netforce_clinic/actions/clinic_patient.xml @@ -2,6 +2,7 @@ Patients multi_view clinic.patient - [["All",[]],["Archived",[["active","=","False"]]],["Social Security",[["type","=","sc"]]],["UC",[["type","=","uc"]]],["Others",[["type","=","others"]]]] + + [["All",[]],["Archived",[["active","=","False"]]]] clinic_menu diff --git a/netforce_clinic/actions/clinic_patient_type.xml b/netforce_clinic/actions/clinic_patient_type.xml new file mode 100644 index 0000000..bd99fc0 --- /dev/null +++ b/netforce_clinic/actions/clinic_patient_type.xml @@ -0,0 +1,6 @@ + + Patient Type + multi_view + clinic.patient.type + clinic_menu + diff --git a/netforce_clinic/actions/clinic_vascular_access.xml b/netforce_clinic/actions/clinic_vascular_access.xml new file mode 100644 index 0000000..2d5a425 --- /dev/null +++ b/netforce_clinic/actions/clinic_vascular_access.xml @@ -0,0 +1,6 @@ + + Vascular Access + multi_view + clinic.vascular.access + clinic_menu + diff --git a/netforce_clinic/actions/import_clinic_hd_case.xml b/netforce_clinic/actions/import_clinic_hd_case.xml new file mode 100644 index 0000000..8e49633 --- /dev/null +++ b/netforce_clinic/actions/import_clinic_hd_case.xml @@ -0,0 +1,6 @@ + + form_view + clinic.import.hd.case + import_clinic_hd_case + clinic_menu + diff --git a/netforce_clinic/actions/import_clinic_mg.xml b/netforce_clinic/actions/import_clinic_mg.xml deleted file mode 100644 index 7d4b641..0000000 --- a/netforce_clinic/actions/import_clinic_mg.xml +++ /dev/null @@ -1,6 +0,0 @@ - - form_view - clinic.import.payment - import_clinic_mg - account_menu - diff --git a/netforce_clinic/actions/import_clinic_patient.xml b/netforce_clinic/actions/import_clinic_patient.xml new file mode 100644 index 0000000..e9254e2 --- /dev/null +++ b/netforce_clinic/actions/import_clinic_patient.xml @@ -0,0 +1,6 @@ + + form_view + clinic.import.patient + import_clinic_patient + clinic_menu + diff --git a/netforce_clinic/actions/import_clinic_visit.xml b/netforce_clinic/actions/import_clinic_visit.xml new file mode 100644 index 0000000..4e2ffd2 --- /dev/null +++ b/netforce_clinic/actions/import_clinic_visit.xml @@ -0,0 +1,6 @@ + + form_view + clinic.import.visit + import_clinic_visit + clinic_menu + diff --git a/netforce_clinic/layouts/clinic_gen_visit_form.xml b/netforce_clinic/layouts/clinic_gen_visit_form.xml index 7a65597..5913436 100644 --- a/netforce_clinic/layouts/clinic_gen_visit_form.xml +++ b/netforce_clinic/layouts/clinic_gen_visit_form.xml @@ -1,9 +1,9 @@
- + - + diff --git a/netforce_clinic/layouts/clinic_hd_case_form.xml b/netforce_clinic/layouts/clinic_hd_case_form.xml index c5b51b8..884fb3d 100644 --- a/netforce_clinic/layouts/clinic_hd_case_form.xml +++ b/netforce_clinic/layouts/clinic_hd_case_form.xml @@ -3,7 +3,7 @@ diff --git a/netforce_clinic/layouts/clinic_hd_case_list.xml b/netforce_clinic/layouts/clinic_hd_case_list.xml index d32c0bb..59b7875 100644 --- a/netforce_clinic/layouts/clinic_hd_case_list.xml +++ b/netforce_clinic/layouts/clinic_hd_case_list.xml @@ -1,6 +1,6 @@ - + diff --git a/netforce_clinic/layouts/clinic_menu.xml b/netforce_clinic/layouts/clinic_menu.xml index 049b162..1918df1 100644 --- a/netforce_clinic/layouts/clinic_menu.xml +++ b/netforce_clinic/layouts/clinic_menu.xml @@ -17,6 +17,7 @@
+ @@ -55,7 +56,13 @@ - + + + +
+ + + diff --git a/netforce_clinic/layouts/clinic_patient_form.xml b/netforce_clinic/layouts/clinic_patient_form.xml index a7631be..1f31fc5 100644 --- a/netforce_clinic/layouts/clinic_patient_form.xml +++ b/netforce_clinic/layouts/clinic_patient_form.xml @@ -8,7 +8,7 @@ - + @@ -96,7 +96,6 @@ - diff --git a/netforce_clinic/layouts/clinic_patient_list.xml b/netforce_clinic/layouts/clinic_patient_list.xml index 7668966..a12e069 100644 --- a/netforce_clinic/layouts/clinic_patient_list.xml +++ b/netforce_clinic/layouts/clinic_patient_list.xml @@ -2,13 +2,13 @@