From 616e17244746075be35031900c2f3977df3b8694 Mon Sep 17 00:00:00 2001 From: "watcha.h" Date: Fri, 24 Oct 2014 15:08:56 +0700 Subject: [PATCH] import --- netforce_clinic/actions/clinic_data_nhso.xml | 7 ++ netforce_clinic/actions/clinic_data_sc.xml | 7 ++ .../layouts/clinic_data_nhso_form.xml | 18 +++++ .../layouts/clinic_data_nhso_list.xml | 19 +++++ .../layouts/clinic_data_sc_form.xml | 12 +++ .../layouts/clinic_data_sc_list.xml | 12 +++ .../layouts/clinic_gen_visit_form.xml | 15 ++-- .../layouts/clinic_menu_inherit.xml | 8 +- netforce_clinic/layouts/import_clinic_mg.xml | 10 ++- .../layouts/import_clinic_nhso.xml | 13 ++-- netforce_clinic/layouts/import_clinic_sc.xml | 8 +- netforce_clinic/models/gen_visit.py | 2 + netforce_clinic/models/import_data_nhso.py | 3 +- netforce_clinic/models/import_data_sc.py | 12 ++- netforce_clinic/models/import_payment.py | 75 +++++++++++++++++-- netforce_clinic/models/patient.py | 22 ++++++ 16 files changed, 215 insertions(+), 28 deletions(-) create mode 100644 netforce_clinic/actions/clinic_data_nhso.xml create mode 100644 netforce_clinic/actions/clinic_data_sc.xml create mode 100644 netforce_clinic/layouts/clinic_data_nhso_form.xml create mode 100644 netforce_clinic/layouts/clinic_data_nhso_list.xml create mode 100644 netforce_clinic/layouts/clinic_data_sc_form.xml create mode 100644 netforce_clinic/layouts/clinic_data_sc_list.xml diff --git a/netforce_clinic/actions/clinic_data_nhso.xml b/netforce_clinic/actions/clinic_data_nhso.xml new file mode 100644 index 0000000..67e8bb2 --- /dev/null +++ b/netforce_clinic/actions/clinic_data_nhso.xml @@ -0,0 +1,7 @@ + + NHSO + multi_view + [["All",[]],["Success",[["type","=","success"]]],["Fail",[["type","=","fail"]]]] + clinic.data.nhso + account_menu + diff --git a/netforce_clinic/actions/clinic_data_sc.xml b/netforce_clinic/actions/clinic_data_sc.xml new file mode 100644 index 0000000..498dcb8 --- /dev/null +++ b/netforce_clinic/actions/clinic_data_sc.xml @@ -0,0 +1,7 @@ + + NHSO + multi_view + [["All",[]],["Success",[["type","=","success"]]],["Fail",[["type","=","fail"]]]] + clinic.data.sc + account_menu + diff --git a/netforce_clinic/layouts/clinic_data_nhso_form.xml b/netforce_clinic/layouts/clinic_data_nhso_form.xml new file mode 100644 index 0000000..974e91d --- /dev/null +++ b/netforce_clinic/layouts/clinic_data_nhso_form.xml @@ -0,0 +1,18 @@ +
+ + + + + + + + + + + + + + + + + diff --git a/netforce_clinic/layouts/clinic_data_nhso_list.xml b/netforce_clinic/layouts/clinic_data_nhso_list.xml new file mode 100644 index 0000000..4e88632 --- /dev/null +++ b/netforce_clinic/layouts/clinic_data_nhso_list.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + diff --git a/netforce_clinic/layouts/clinic_data_sc_form.xml b/netforce_clinic/layouts/clinic_data_sc_form.xml new file mode 100644 index 0000000..7ec0a89 --- /dev/null +++ b/netforce_clinic/layouts/clinic_data_sc_form.xml @@ -0,0 +1,12 @@ +
+ + + + + + + + + + + diff --git a/netforce_clinic/layouts/clinic_data_sc_list.xml b/netforce_clinic/layouts/clinic_data_sc_list.xml new file mode 100644 index 0000000..897a221 --- /dev/null +++ b/netforce_clinic/layouts/clinic_data_sc_list.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/netforce_clinic/layouts/clinic_gen_visit_form.xml b/netforce_clinic/layouts/clinic_gen_visit_form.xml index 37cf326..65e80f5 100644 --- a/netforce_clinic/layouts/clinic_gen_visit_form.xml +++ b/netforce_clinic/layouts/clinic_gen_visit_form.xml @@ -1,10 +1,13 @@
- - - - - - + + + + + + + + + diff --git a/netforce_clinic/layouts/clinic_menu_inherit.xml b/netforce_clinic/layouts/clinic_menu_inherit.xml index 1fbee64..5a7e502 100644 --- a/netforce_clinic/layouts/clinic_menu_inherit.xml +++ b/netforce_clinic/layouts/clinic_menu_inherit.xml @@ -2,14 +2,14 @@
- +
- - - + + + diff --git a/netforce_clinic/layouts/import_clinic_mg.xml b/netforce_clinic/layouts/import_clinic_mg.xml index 33fd255..b8b8982 100644 --- a/netforce_clinic/layouts/import_clinic_mg.xml +++ b/netforce_clinic/layouts/import_clinic_mg.xml @@ -1,6 +1,12 @@ - + + + + + + + -