From a732066d111906ec396e28c223b30c498258c896 Mon Sep 17 00:00:00 2001 From: "watcha.h" Date: Fri, 14 Nov 2014 08:58:12 +0700 Subject: [PATCH] shedule --- .../actions/clinic_load_nurses.xml | 6 + netforce_clinic/actions/clinic_schedule.xml | 2 +- .../layouts/clinic_hd_case_form.xml | 1 - .../layouts/clinic_load_nurse_form.xml | 15 ++ .../layouts/clinic_personal_form.xml | 40 ++++-- .../layouts/clinic_schedule_calendar.xml | 2 +- .../layouts/clinic_schedule_form.xml | 36 +++-- .../layouts/clinic_schedule_list.xml | 4 +- netforce_clinic/models/__init__.py | 4 + netforce_clinic/models/gen_visit.py | 22 +-- netforce_clinic/models/hd_case_discont.py | 1 + netforce_clinic/models/load_nurse.py | 80 +++++++++++ netforce_clinic/models/load_nurse_line.py | 15 ++ netforce_clinic/models/personal.py | 14 +- netforce_clinic/models/personal_cycle.py | 23 ++++ netforce_clinic/models/schedule.py | 95 ++++++++----- netforce_clinic/models/schedule.py.old | 130 ++++++++++++++++++ netforce_clinic/models/schedule_line.py | 13 ++ netforce_clinic/todo.txt | 2 + 19 files changed, 426 insertions(+), 79 deletions(-) create mode 100644 netforce_clinic/actions/clinic_load_nurses.xml create mode 100644 netforce_clinic/layouts/clinic_load_nurse_form.xml create mode 100644 netforce_clinic/models/load_nurse.py create mode 100644 netforce_clinic/models/load_nurse_line.py create mode 100644 netforce_clinic/models/personal_cycle.py create mode 100644 netforce_clinic/models/schedule.py.old create mode 100644 netforce_clinic/models/schedule_line.py diff --git a/netforce_clinic/actions/clinic_load_nurses.xml b/netforce_clinic/actions/clinic_load_nurses.xml new file mode 100644 index 0000000..355d974 --- /dev/null +++ b/netforce_clinic/actions/clinic_load_nurses.xml @@ -0,0 +1,6 @@ + + List Nurse + form_popup + clinic.schedule.load.nurse + _popup + diff --git a/netforce_clinic/actions/clinic_schedule.xml b/netforce_clinic/actions/clinic_schedule.xml index 2b0b1b1..896ef03 100644 --- a/netforce_clinic/actions/clinic_schedule.xml +++ b/netforce_clinic/actions/clinic_schedule.xml @@ -2,7 +2,7 @@ Schedules multi_view clinic.schedule - calendar,list,page,form + list,page,form,calendar [["All",[]],["Draft",[["state","=","draft"]]],["Confirmed",[["state","=","confirmed"]]]] clinic_menu diff --git a/netforce_clinic/layouts/clinic_hd_case_form.xml b/netforce_clinic/layouts/clinic_hd_case_form.xml index d852095..dd05b15 100644 --- a/netforce_clinic/layouts/clinic_hd_case_form.xml +++ b/netforce_clinic/layouts/clinic_hd_case_form.xml @@ -108,7 +108,6 @@ - - - - - - - + + + + + + + + + + + + + + + + + + + + + + -