Modified patient model, using ember style guides

app/models/allergy.js

@@ -2,8 +2,10 @@ import AbstractModel from 'hospitalrun/models/abstract';
 import DS from 'ember-data';
 
 export default AbstractModel.extend({
-  patient: DS.belongsTo('patient'),
+  // Attributes
   name: DS.attr('string'),
   icd9CMCode: DS.attr('string'),
-  icd10Code: DS.attr('string')
+  icd10Code: DS.attr('string'),
+  // Associations
+  patient: DS.belongsTo('patient')
 });

app/models/diagnosis.js

@@ -2,6 +2,7 @@ import AbstractModel from 'hospitalrun/models/abstract';
 import DS from 'ember-data';
 
 export default AbstractModel.extend({
+  // Attributes
   active: DS.attr('boolean', { defaultValue: true }),
   date: DS.attr('date'),
   diagnosis: DS.attr('string'),

app/models/patient-note.js

@@ -1,30 +1,36 @@
 import AbstractModel from 'hospitalrun/models/abstract';
 import Ember from 'ember';
 import DS from 'ember-data';
+
+const { computed } = Ember;
+
 export default AbstractModel.extend({
-  authoredBy: function() {
+  // Attributes
+  /*
+   * if the note was written by one person but dictated or
+   * given on behalf of another, otherwise, this and createdBy are the same.
+   */
+  attribution: DS.attr('string'),
+
+  content: DS.attr('string'),
+  createdBy: DS.attr('string'),
+  date: DS.attr('date'),
+  /* custom list of noteTypes of mixins/patient-note-types */
+  noteType: DS.attr(),
+  /* who is this note about? */
+  patient: DS.belongsTo('patient', { async: false }),
+  /* if this note is related to a visit, make sure it's noted. */
+  visit: DS.belongsTo('visit', { async: false }),
+
+  authoredBy: computed('attribution', 'createdBy', function() {
     if (!Ember.isEmpty(this.get('attribution'))) {
       let i18n = this.get('i18n');
       return `${this.get('createdBy')} ${i18n.t('patients.notes.onBehalfOfCopy')} ${this.get('attribution')}`;
     } else {
       return this.get('createdBy');
     }
-  }.property('attribution', 'createdBy'),
-  // if the note was written by one person but dictated / given on behalf of another, otherwise, this and createdBy are the same
-  attribution: DS.attr('string'),
-  content: DS.attr('string'),
-  createdBy: DS.attr('string'),
-  date: DS.attr('date'),
-  // custom list of noteTypes of mixins/patient-note-types
-  noteType: DS.attr(),
-  // who is this note about?
-  patient: DS.belongsTo('patient', {
-    async: false
-  }),
-  // if this note is related to a visit, make sure it's noted.
-  visit: DS.belongsTo('visit', {
-    async: false
   }),
+
   validations: {
     patient: {
       presence: true

app/models/patient.js

@@ -5,27 +5,22 @@ import Ember from 'ember';
 import DS from 'ember-data';
 import PatientName from 'hospitalrun/mixins/patient-name';
 
-const { computed } = Ember;
+const { computed, get } = Ember;
 
 export default AbstractModel.extend(DOBDays, PatientName, {
+  // Attributes
   admitted: DS.attr('boolean', { defaultValue: false }),
   additionalContacts: DS.attr(),
   address: DS.attr('string'),
   address2: DS.attr('string'),
   address3: DS.attr('string'),
   address4: DS.attr('string'),
-  allergies: DS.hasMany('allergy', {
-    async: true
-  }),
   bloodType: DS.attr('string'),
   clinic: DS.attr('string'),
   country: DS.attr('string'),
   checkedIn: DS.attr('boolean', { defaultValue: false }),
   customForms: DS.attr('custom-forms'),
   dateOfBirth: DS.attr('date'),
-  diagnoses: DS.hasMany('diagnosis', {
-    async: false
-  }),
   economicClassification: DS.attr('string'),
   email: DS.attr('string'),
   expenses: DS.attr(),
@@ -47,14 +42,8 @@ export default AbstractModel.extend(DOBDays, PatientName, {
   middleName: DS.attr('string'),
   notes: DS.attr('string'),
   otherIncome: DS.attr('string'),
-  payments: DS.hasMany('payment', {
-    async: true
-  }),
   patientType: DS.attr('string'),
   parent: DS.attr('string'),
-  paymentProfile: DS.belongsTo('price-profile', {
-    async: false
-  }),
   phone: DS.attr('string'),
   placeOfBirth: DS.attr('string'),
   referredDate: DS.attr('date'),
@@ -63,13 +52,18 @@ export default AbstractModel.extend(DOBDays, PatientName, {
   socialActionTaken: DS.attr('string'),
   socialRecommendation: DS.attr('string'),
   status: DS.attr('string'),
+  // Associations
+  allergies: DS.hasMany('allergy', { async: true }),
+  diagnoses: DS.hasMany('diagnosis', { async: false }),
+  payments: DS.hasMany('payment', { async: true }),
+  paymentProfile: DS.belongsTo('price-profile', { async: false }),
 
-  age: function() {
-    let dob = this.get('dateOfBirth');
+  age: computed('dateOfBirth', function() {
+    let dob = get(this, 'dateOfBirth');
     return this.convertDOBToText(dob);
-  }.property('dateOfBirth'),
+  }),
 
-  displayAddress: function() {
+  displayAddress: computed('address', 'address2', 'address3', 'address4', function() {
     let addressFields = this.getProperties('address', 'address2', 'address3', 'address4');
     let displayAddress = '';
     for (let prop in addressFields) {
@@ -81,20 +75,20 @@ export default AbstractModel.extend(DOBDays, PatientName, {
       }
     }
     return displayAddress;
-  }.property('address', 'address2', 'address3', 'address4'),
+  }),
 
-  displayName: function() {
+  displayName: computed('firstName', 'lastName', 'middleName', function() {
     return this.getPatientDisplayName(this);
-  }.property('firstName', 'lastName', 'middleName'),
+  }),
 
-  displayPatientId: function() {
+  displayPatientId: computed('id', 'externalPatientId', 'friendlyId', function() {
     return this.getPatientDisplayId(this);
-  }.property('id', 'externalPatientId', 'friendlyId'),
+  }),
 
-  shortAge: function() {
-    let dob = this.get('dateOfBirth');
+  shortAge: computed('dateOfBirth', function() {
+    let dob = get(this, 'dateOfBirth');
     return this.convertDOBToText(dob, true);
-  }.property('dateOfBirth'),
+  }),
 
   shortDisplayName: computed('firstName', 'lastName', function() {
     return this.getPatientDisplayName(this, true);
@@ -118,5 +112,4 @@ export default AbstractModel.extend(DOBDays, PatientName, {
       presence: true
     }
   }
-
 });