From 58ec5de4594490ec87672f3832738d344afdf641 Mon Sep 17 00:00:00 2001 From: "watcha.h" Date: Tue, 10 Feb 2015 11:29:27 +0700 Subject: [PATCH] improve menu --- netforce_clinic/actions/clinic_board.xml | 8 +- netforce_clinic/layouts/clinic_menu.xml | 1 - .../layouts/clinic_patient_form.xml | 2 +- .../layouts/clinic_patient_list.xml | 4 +- netforce_clinic/layouts/clinic_staff_list.xml | 3 +- netforce_clinic/models/patient.py | 8 +- netforce_clinic/templates/clinic_page.hbs | 104 ++++++++++++++++++ netforce_clinic/todo.txt | 12 +- 8 files changed, 121 insertions(+), 21 deletions(-) create mode 100644 netforce_clinic/templates/clinic_page.hbs diff --git a/netforce_clinic/actions/clinic_board.xml b/netforce_clinic/actions/clinic_board.xml index cecee1f..4c53edb 100644 --- a/netforce_clinic/actions/clinic_board.xml +++ b/netforce_clinic/actions/clinic_board.xml @@ -1,7 +1,5 @@ - clinic_board - Clinic Board - board - clinic_board - clinic_menu + template_view + clinic_page + clinic_menu diff --git a/netforce_clinic/layouts/clinic_menu.xml b/netforce_clinic/layouts/clinic_menu.xml index 2e61255..74acb7e 100644 --- a/netforce_clinic/layouts/clinic_menu.xml +++ b/netforce_clinic/layouts/clinic_menu.xml @@ -50,7 +50,6 @@ - diff --git a/netforce_clinic/layouts/clinic_patient_form.xml b/netforce_clinic/layouts/clinic_patient_form.xml index 4e80d8e..f68c076 100644 --- a/netforce_clinic/layouts/clinic_patient_form.xml +++ b/netforce_clinic/layouts/clinic_patient_form.xml @@ -3,7 +3,7 @@ diff --git a/netforce_clinic/layouts/clinic_patient_list.xml b/netforce_clinic/layouts/clinic_patient_list.xml index 35a33cb..7c5730a 100644 --- a/netforce_clinic/layouts/clinic_patient_list.xml +++ b/netforce_clinic/layouts/clinic_patient_list.xml @@ -1,7 +1,9 @@ + @@ -11,5 +13,5 @@ - + diff --git a/netforce_clinic/layouts/clinic_staff_list.xml b/netforce_clinic/layouts/clinic_staff_list.xml index e8db363..a3f85d5 100644 --- a/netforce_clinic/layouts/clinic_staff_list.xml +++ b/netforce_clinic/layouts/clinic_staff_list.xml @@ -14,6 +14,5 @@ - - + diff --git a/netforce_clinic/models/patient.py b/netforce_clinic/models/patient.py index 146d26a..407fba4 100644 --- a/netforce_clinic/models/patient.py +++ b/netforce_clinic/models/patient.py @@ -47,7 +47,7 @@ class Patient(Model): "hn_no": fields.Char("HN",function="_get_hn_no",store=True), "hn": fields.Char("REF/HN",search=False), "name": fields.Char("Name",required=True,search=True), - "reg_date": fields.Date("Register Date",required=False,search=True), + "reg_date": fields.Date("Reg. Date",required=False,search=True), "birthday": fields.Date("Birthday",required=False,search=True), "phone": fields.Char("Phone",required=False,search=True), "mobile": fields.Char("Mobile",required=False,search=True), @@ -57,9 +57,9 @@ class Patient(Model): 'email': fields.Char("Email"), "weight": fields.Float("Weight (kg.)"), "height": fields.Float("Height (cm.)"), - "card_type": fields.Selection([("identification","Identification"),("passport","Passport")],"ID Type"), - 'card_no' : fields.Char("ID"), - 'card_exp' : fields.Date("ID Exp."), + "card_type": fields.Selection([("identification","Identification"),("passport","Passport")],"Card Type"), + 'card_no' : fields.Char("ID Card"), + 'card_exp' : fields.Date("Card Exp."), "app_no": fields.Char("Application No."), "salary": fields.Selection([["20000","5,001-20,000"],["50000","20,001-50,000"],["100000","50,001-100,000"],["100001","100,000+"]], "Salary"), "addresses": fields.One2Many("address","patient_id","Addresses"), diff --git a/netforce_clinic/templates/clinic_page.hbs b/netforce_clinic/templates/clinic_page.hbs new file mode 100644 index 0000000..e94704a --- /dev/null +++ b/netforce_clinic/templates/clinic_page.hbs @@ -0,0 +1,104 @@ +{{#view "page" title="Clinic Board"}} +
+
+
+

{{t "Staffs"}}

+
+ +
+

{{t "Patients"}}

+
+ +
+

{{t "Reports"}}

+
+ +
+
+
+

{{t "Cycles"}}

+
+ +
+

{{t "Visits"}}

+
+ +
+

{{t "HD Cases"}}

+
+ +
+
+{{/view}} diff --git a/netforce_clinic/todo.txt b/netforce_clinic/todo.txt index c7ab114..c849921 100644 --- a/netforce_clinic/todo.txt +++ b/netforce_clinic/todo.txt @@ -1,14 +1,12 @@ todo: - - urgent: - - set nurse's profile -> many2many - - change department on user profile - - - change profile - - Because of one user can access more than branch - report doctor & nurse *** - - - matching payment *** - script generate hd case + + + - urgent -> done: + - change department on user profile -> ok + - Because of one user can access more than branch - move between branch -> next phase - patient - sale medicine -> ok