First step at allergy work

app/components/medication-allergy.js

@@ -0,0 +1,85 @@
+import Ember from 'ember';
+import { translationMacro as t } from 'ember-i18n';
+
+export default Ember.Component.extend({
+  store: Ember.inject.service(),
+  i18n: Ember.inject.service(),
+  patient: null,
+  displayModal: false,
+  currentAllergy: false,
+  buttonConfirmText: t('buttons.add'),
+  additionalButtons: Ember.computed('currentAllergy', function() {
+    let currentAllergy = this.get('currentAllergy');
+    let btn = this.get('i18n').t('buttons.delete');
+    if (currentAllergy) {
+      return [{
+        class: 'btn btn-default warning',
+        buttonAction: 'deleteAllergy',
+        buttonIcon: 'octicon octicon-x',
+        buttonText: btn
+      }];
+    }
+  }),
+
+  modalTitle: Ember.computed('currentAllergy', function() {
+    let currentAllergy = this.get('currentAllergy');
+    let i18n = this.get('i18n');
+    if (currentAllergy) {
+      return i18n.t('allergies.editAllergy', { allergy: currentAllergy.get('name') });
+    } else {
+      return i18n.t('allergies.newAllergy');
+    }
+  }),
+
+  closeAllergyModal() {
+    this.set('currentAllergy', false);
+    this.set('displayModal', false);
+  },
+
+  actions: {
+
+    cancel() {
+      this.closeAllergyModal();
+    },
+
+    closeModal() {
+      this.closeAllergyModal();
+    },
+
+    editAllergy(allergy) {
+      this.set('currentAllergy', allergy);
+      this.set('displayModal', true);
+    },
+
+    createNewAllergy() {
+      this.set('displayModal', true);
+    },
+
+    updateAllergy() {
+      let model = this.get('patient');
+      let allergyModel = this.get('currentAllergy');
+      if (!allergyModel) {
+        allergyModel = this.get('store').createRecord('allergy', {
+          name: this.get('name')
+        });
+        allergyModel.save().then(() => {
+          model.get('allergies').pushObject(allergyModel);
+          model.save().then(() => {
+            this.set('name', '');
+            this.closeAllergyModal();
+          });
+        });
+      } else {
+        allergyModel.save().then(() => {
+          this.closeAllergyModal();
+        });
+      }
+    },
+    deleteAllergy() {
+      let allergy = this.get('currentAllergy');
+      allergy.destroyRecord().then(() => {
+        this.closeAllergyModal();
+      });
+    }
+  }
+});

app/components/patient-summary.js

@@ -9,35 +9,39 @@ export default Ember.Component.extend(PatientDiagnosis, {
   showPatientAction: 'showPatient',
   visits: null,
 
-  havePrimaryDiagnoses: function() {
+  havePrimaryDiagnoses: Ember.computed('primaryDiagnosis.length', function() {
     let primaryDiagnosesLength = this.get('primaryDiagnoses.length');
     return (primaryDiagnosesLength > 0);
-  }.property('primaryDiagnoses.length'),
+  }),
 
-  haveProcedures: function() {
+  haveProcedures: Ember.computed('patientProcedures.length', function() {
     let proceduresLength = this.get('patientProcedures.length');
     return (proceduresLength > 0);
-  }.property('patientProcedures.length'),
+  }),
 
-  haveSecondaryDiagnoses: function() {
+  haveSecondaryDiagnoses: Ember.computed('secondaryDiagnoses.length', function() {
     let secondaryDiagnosesLength = this.get('secondaryDiagnoses.length');
     return (secondaryDiagnosesLength > 0);
-  }.property('secondaryDiagnoses.length'),
+  }),
 
-  primaryDiagnoses: function() {
+  primaryDiagnoses: Ember.computed('visits.[]', function() {
     let visits = this.get('visits');
     return this.getPrimaryDiagnoses(visits);
-  }.property('visits.[]'),
+  }),
 
-  secondaryDiagnoses: function() {
+  secondaryDiagnoses: Ember.computed('visits.[]', function() {
     let visits = this.get('visits');
     return this.getSecondaryDiagnoses(visits);
-  }.property('visits.[]'),
+  }),
 
-  shouldLinkToPatient: function() {
+  shouldLinkToPatient: Ember.computed('disablePatientLink', function() {
     let disablePatientLink = this.get('disablePatientLink');
     return !disablePatientLink;
-  }.property('disablePatientLink'),
+  }),
+
+  hasAllergies: Ember.computed('patient.allergies.[]', function() {
+    return Ember.computed.notEmpty('patient.allergies');
+  }),
 
   actions: {
     linkToPatient() {

app/locales/en/translations.js

@@ -410,7 +410,10 @@ export default {
     addVisit: 'Add Visit',
     search: 'Search',
     edit: 'Edit',
-    addLineItem: 'Add Line Item'
+    addLineItem: 'Add Line Item',
+    addNewAllergy: 'Add New Allergy',
+    showFewer: 'Show Fewer',
+    showAll: 'Show All'
   },
   login: {
     messages: {
@@ -1007,5 +1010,12 @@ export default {
     priceList: {
       charges: '{{pricingType}} charges'
     }
+  },
+  allergies: {
+    addAllergy: 'Add Allergy',
+    allergyName: 'Name',
+    editAllergy: 'Edit {{allergy}}',
+    newAllergy: 'Add New Allergy',
+    patientAllergy: 'Patient Allergies'
   }
 };

app/medication/edit/controller.js

@@ -10,7 +10,6 @@ import UserSession from 'hospitalrun/mixins/user-session';
 export default AbstractEditController.extend(InventorySelection, FulfillRequest, InventoryLocations, PatientId, PatientSubmodule, UserSession, {
   medicationController: Ember.inject.controller('medication'),
   newPatientId: null,
-
   expenseAccountList: Ember.computed.alias('medicationController.expenseAccountList'),
 
   canFulfill: function() {

app/medication/edit/template.hbs

@@ -21,6 +21,13 @@
         </div>
       {{/if}}
     </div>
+    {{#if model.patient.allergies}}
+        <div class="row">
+          <div class="col-xs-12">
+            {{medication-allergy patient=model.patient}}
+          </div>
+        </div>
+    {{/if}}
     {{#if isFulfilledOrRequested}}
       <div class="form-group">
         <label class="control-label">{{t 'labels.medication'}}</label>

app/mixins/medication-details.js

@@ -76,5 +76,6 @@ export default Ember.Mixin.create({
   },
 
   medicationTitle: DS.attr('string'),
-  priceOfMedication: DS.attr('number')
+  priceOfMedication: DS.attr('number'),
+  rxNormIdentifier: DS.attr('string')
 });

app/models/allergy.js

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

app/templates/components/medication-allergy.hbs

@@ -0,0 +1,39 @@
+<label class="ps-info-label wide">{{t 'allergies.patientAllergy'}}</label>
+
+<a class="clickable" {{action "createNewAllergy"}}><span class="octicon octicon-plus"></span>  {{t 'buttons.addNewAllergy'}}</a>
+
+<div class="ps-info-data-block">
+  <ul class="list-inline allergy-list">
+        {{#each patient.allergies as |allergy index|}}
+        <li>
+          <button class="btn-link allergy-button" {{action "editAllergy" allergy}}>{{allergy.name}}</button>
+        </li>
+    {{/each}}
+  </ul>
+</div>
+
+
+
+{{#if displayModal}}
+  {{#modal-dialog
+    title=modalTitle
+    updateButtonText=buttonConfirmText
+    hideCancelButton=true
+    updateButtonAction='updateAllergy'
+    additionalButtons=additionalButtons
+  }}
+
+    <div class="row">
+      <div class="col-xs-12 form-group">
+        <label>{{t "allergies.allergyName"}}</label>
+        {{#if currentAllergy}}
+          {{input class="form-control" value=currentAllergy.name}}
+        {{else}}
+          {{input class="form-control" value=name}}
+        {{/if}}
+      </div>
+
+    </div>
+
+  {{/modal-dialog}}
+{{/if}}

app/templates/components/patient-summary.hbs

@@ -20,7 +20,6 @@
     <span class="ps-info-data">{{patient.age}} (<strong>{{date-format patient.dateOfBirth}}</strong>)</span>
   </div>
 
-
   {{#if havePrimaryDiagnoses}}
     <div class="ps-info-group long-form">
       <label class="ps-info-label wide">{{t 'patients.labels.primaryDiagnosis'}}</label>
@@ -59,4 +58,11 @@
     </div>
   {{/if}}
 
+  {{#if hasAllergies}}
+    <div class="ps-info-group long-form">
+      {{medication-allergy patient=patient}}
+    </div>
+  {{/if}}
+
+
 </div>

app/visits/edit/template.hbs

@@ -90,12 +90,14 @@
                 {{/each}}
               </table>
             {{/if}}
+            {{medication-allergy patient=model.patient showOperations=true}}
             {{em-text label="Patient History" property="history" rows=3 }}
             {{em-text label="History since last seen" property="historySince" rows=3 }}
           {{/em-form}}
         </div>
       </div>
     </div>
+
     {{#unless model.isNew}}
       <div class="panel">
         <div class="panel-heading">

tests/integration/components/medication-allergy-test.js

@@ -0,0 +1,27 @@
+import { moduleForComponent, test } from 'ember-qunit';
+import hbs from 'htmlbars-inline-precompile';
+import Ember from 'ember';
+
+const Patient = Ember.Object.extend({ allergies: [] });
+let patient = Patient.create();
+const Allergy = Ember.Object.extend();
+let allergy = Allergy.create({ name: 'test allergy' });
+
+moduleForComponent('medication-allergy', 'Integration | Component | medication allergy', {
+  integration: true,
+  beforeEach() {
+    this.inject.service('i18n');
+  }
+});
+
+test('allergy component renders with appropriate data', function(assert) {
+  patient.get('allergies').pushObject(allergy);
+  // Set any properties with this.set('myProperty', 'value');
+  // Handle any actions with this.on('myAction', function(val) { ... });
+  this.set('patient', patient);
+  this.render(hbs`{{medication-allergy patient=patient}}`);
+  let allergyName = allergy.get('name');
+  let allergies = patient.get('allergies');
+  assert.equal(this.$('.allergy-list li').length, allergies.length, 'renders allergy list with correct list of elements');
+  assert.equal(this.$('.allergy-list li').first().text().trim(), allergyName, 'renders allergy names on buttons');
+});