Added middle name and status to patient

For #42 and #40
HospitalRun · May 4, 2015 · c7dfbde · c7dfbde
1 parent 2aadbf4
commit c7dfbde
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/app/models/patient.js b/app/models/patient.js
@@ -32,6 +32,7 @@ export default AbstractModel.extend(DOBDays, PatientName, {
     insurance: DS.attr('string'),
     lastName:  DS.attr('string'),
     livingArrangement: DS.attr('string'),
+    middleName:  DS.attr('string'),
     notes: DS.attr('string'),  
     otherIncome: DS.attr('string'),
     payments: DS.hasMany('payment', { async: true }),
@@ -45,6 +46,7 @@ export default AbstractModel.extend(DOBDays, PatientName, {
     religion: DS.attr('string'),
     socialActionTaken: DS.attr('string'),
     socialRecommendation: DS.attr('string'),
+    status: DS.attr('string'),
 
     age: function() {
         var dob = this.get('dateOfBirth');
@@ -67,7 +69,7 @@ export default AbstractModel.extend(DOBDays, PatientName, {
 
     displayName: function() {
         return this.getPatientDisplayName(this);
-    }.property('firstName', 'lastName'),
+    }.property('firstName', 'lastName', 'middleName'),
 
     displayPatientId: function() {
         return this.getPatientDisplayId(this);

diff --git a/app/patients/edit/template.hbs b/app/patients/edit/template.hbs
@@ -75,6 +75,7 @@
                         <div class="col-xs-12 col-sm-6">
                             {{em-input property="friendlyId" label="Id" class="required"}}
                             {{em-input property="firstName" label="First Name" class="required"}}
+                            {{em-input property="middleName" label="First Name" }}
                             {{em-input property="lastName" label="Last Name" class="required"}}
                             <div class="form-group">
                                 <label>Gender</label>
@@ -93,9 +94,10 @@
                                 <div>
                                     {{ext-radio name=patientType content=patientTypes value=patientType showInline=true radioLabelPath="content" radioValuePath="content"}}
                                 </div>
-                            </div>                                                   
+                            </div>
                         </div>
                         <div class="col-xs-12 col-sm-6">
+                            {{select-or-typeahead property="status" label="Patient Status" list=statusList selection=status }}
                             {{em-input property="externalPatientId" label="External Patient Id"}}
                             {{em-select
                                 prompt=" "