xxxxxx

netforce_clinic/layouts/clinic_patient_form.xml

@@ -58,7 +58,7 @@
             <field name="reason_of_chronic_renal_failure"/>
         </tab>
         <tab string="Cause Of Chronic Renal Failure">
-            <field name="cause_lines" nolabel="1">
+            <field name="causes" nolabel="1">
                 <list>
                     <field name="cause_id"/>
                     <field name="date_cause"/>
@@ -67,7 +67,7 @@
         </tab>
         <tab string="Co-marbid">  
             <separator string="Co-morbidity, before RRT"/>
-            <field name="comorbility_lines" nolabel="1">
+            <field name="comorbilities" nolabel="1">
                 <list>
                     <field name="comorbility_id"/>
                     <field name="ans"/>
@@ -77,7 +77,7 @@
         </tab>
         <tab string="Morbidity">
             <separator string="Morbidity, After RRT"/>
-            <field name="morbility_lines" nolabel="1">
+            <field name="morbilities" nolabel="1">
                 <list>
                     <field name="morbility_id"/>
                     <field name="ans"/>

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

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"),

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()

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()

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()