From 36b772a5dd25f3fb500127fae81e5d337b327a88 Mon Sep 17 00:00:00 2001 From: "watcha.h" Date: Wed, 5 Nov 2014 14:22:23 +0700 Subject: [PATCH] xxxxxx --- netforce_clinic/layouts/clinic_patient_form.xml | 6 +++--- netforce_clinic/models/__init__.py | 6 +++--- netforce_clinic/models/patient.py | 6 +++--- .../models/{patient_cause_line.py => patient_cause.py} | 8 ++++---- ...ient_comorbidity_line.py => patient_comorbidity.py} | 8 ++++---- ...{patient_morbidity_line.py => patient_morbidity.py} | 10 +++++----- 6 files changed, 22 insertions(+), 22 deletions(-) rename netforce_clinic/models/{patient_cause_line.py => patient_cause.py} (74%) rename netforce_clinic/models/{patient_comorbidity_line.py => patient_comorbidity.py} (72%) rename netforce_clinic/models/{patient_morbidity_line.py => patient_morbidity.py} (59%) diff --git a/netforce_clinic/layouts/clinic_patient_form.xml b/netforce_clinic/layouts/clinic_patient_form.xml index c4e1572..79e3378 100644 --- a/netforce_clinic/layouts/clinic_patient_form.xml +++ b/netforce_clinic/layouts/clinic_patient_form.xml @@ -58,7 +58,7 @@ - + @@ -67,7 +67,7 @@ - + @@ -77,7 +77,7 @@ - + diff --git a/netforce_clinic/models/__init__.py b/netforce_clinic/models/__init__.py index 28260d1..2e2f2c5 100644 --- a/netforce_clinic/models/__init__.py +++ b/netforce_clinic/models/__init__.py @@ -10,9 +10,9 @@ from . import nation from . import address from . import patient from . import patient_categ -from . import patient_cause_line -from . import patient_comorbidity_line -from . import patient_morbidity_line +from . import patient_cause +from . import patient_comorbidity +from . import patient_morbidity from . import race from . import visit from . import hd_case diff --git a/netforce_clinic/models/patient.py b/netforce_clinic/models/patient.py index 2663865..9dc156e 100644 --- a/netforce_clinic/models/patient.py +++ b/netforce_clinic/models/patient.py @@ -67,9 +67,9 @@ class Patient(Model): "waiting_transplantation": fields.Selection([("yes","Yes"),("no","No")],"Kidney Transplantation Waiting ?"), "who_transplantation": fields.Char("Who is Transplantation?"), "reason_of_chronic_renal_failure": fields.Char("Reason chronic renal failure ?"), - 'cause_lines': fields.One2Many("clinic.patient.cause.line","patient_id","Cause Line"), - 'comorbility_lines': fields.One2Many("clinic.patient.comorbidity.line","patient_id","Comorbility"), - 'morbility_lines': fields.One2Many("clinic.patient.morbidity.line","patient_id","Morbility"), + 'causes': fields.One2Many("clinic.patient.cause","patient_id","Cause Line"), + 'comorbilities': fields.One2Many("clinic.patient.comorbidity","patient_id","Comorbility"), + 'morbilities': fields.One2Many("clinic.patient.morbidity","patient_id","Morbility"), "comments": fields.One2Many("message","related_id","Comments"), "company_id": fields.Many2One("company","Company"), "visits": fields.One2Many("clinic.visit","patient_id","Visits"), diff --git a/netforce_clinic/models/patient_cause_line.py b/netforce_clinic/models/patient_cause.py similarity index 74% rename from netforce_clinic/models/patient_cause_line.py rename to netforce_clinic/models/patient_cause.py index aafe330..76bd481 100644 --- a/netforce_clinic/models/patient_cause_line.py +++ b/netforce_clinic/models/patient_cause.py @@ -2,9 +2,9 @@ import time from netforce.model import Model, fields -class PatientCauseLine(Model): - _name="clinic.patient.cause.line" - _string="Patient Cause Line" +class PatientCause(Model): + _name="clinic.patient.cause" + _string="Patient Cause" _fields={ "patient_id": fields.Many2One("clinic.patient","Patient",required=True,on_delete="cascade"), "cause_id": fields.Many2One("clinic.cause.chronic","Cause"), @@ -15,4 +15,4 @@ class PatientCauseLine(Model): 'date_cause': lambda *a: time.strftime("%Y-%m-%d"), } -PatientCauseLine.register() +PatientCause.register() diff --git a/netforce_clinic/models/patient_comorbidity_line.py b/netforce_clinic/models/patient_comorbidity.py similarity index 72% rename from netforce_clinic/models/patient_comorbidity_line.py rename to netforce_clinic/models/patient_comorbidity.py index 90c7529..b77486e 100644 --- a/netforce_clinic/models/patient_comorbidity_line.py +++ b/netforce_clinic/models/patient_comorbidity.py @@ -2,9 +2,9 @@ import time from netforce.model import Model, fields -class PatientComorbidityLine(Model): - _name="clinic.patient.comorbidity.line" - _string="Patient Patient Comorbidity Line" +class PatientComorbidity(Model): + _name="clinic.patient.comorbidity" + _string="Patient Patient Comorbidity" _fields={ "patient_id": fields.Many2One("clinic.patient","Patient",required=True,on_delete="cascade"), "comorbility_id": fields.Many2One("clinic.comorbidity","Comorbidity"), @@ -16,4 +16,4 @@ class PatientComorbidityLine(Model): 'ans': "no", } -PatientComorbidityLine.register() +PatientComorbidity.register() diff --git a/netforce_clinic/models/patient_morbidity_line.py b/netforce_clinic/models/patient_morbidity.py similarity index 59% rename from netforce_clinic/models/patient_morbidity_line.py rename to netforce_clinic/models/patient_morbidity.py index f9fc7cc..9417574 100644 --- a/netforce_clinic/models/patient_morbidity_line.py +++ b/netforce_clinic/models/patient_morbidity.py @@ -1,11 +1,11 @@ from netforce.model import Model, fields -class PatientMorbidityLine(Model): - _name="clinic.patient.morbidity.line" - _string="Patient Patient Morbidity Line" +class PatientMorbidity(Model): + _name="clinic.patient.morbidity" + _string="Patient Patient Morbidity" _fields={ "patient_id": fields.Many2One("clinic.patient","Patient",required=True,on_delete="cascade"), - "morbility_id": fields.Many2One("clinic.comorbidity","Morbidity"), + "morbility_id": fields.Many2One("clinic.morbidity","Morbidity"), "ans": fields.Selection([['yes','Yes'],['no','No']], "Answer"), "analysis_date": fields.Date("Analysis Date"), } @@ -14,4 +14,4 @@ class PatientMorbidityLine(Model): 'ans': "no", } -PatientMorbidityLine.register() +PatientMorbidity.register()