Fix/add allergy bug

app/components/medication-allergy.js

@@ -13,6 +13,7 @@ export default Ember.Component.extend({
   patient: null,
   displayModal: false,
   currentAllergy: false,
+  parentProps: null,
 
   buttonConfirmText: computed('currentAllergy', function() {
     let i18n = this.get('i18n');
@@ -55,9 +56,17 @@ export default Ember.Component.extend({
     }
   }),
 
+  setStayOnPage(val) {
+    let props = this.get('parentProps');
+    if (props) {
+      props.stayOnPage = val;
+    }
+  },
+
   closeAllergyModal() {
     this.set('currentAllergy', false);
     this.set('displayModal', false);
+    this.setStayOnPage(false);
   },
 
   actions: {
@@ -73,10 +82,12 @@ export default Ember.Component.extend({
     editAllergy(allergy) {
       this.set('currentAllergy', allergy);
       this.set('displayModal', true);
+      this.setStayOnPage(true);
     },
 
     createNewAllergy() {
       this.set('displayModal', true);
+      this.setStayOnPage(true);
     },
 
     updateAllergy() {

app/components/patient-summary.js

@@ -23,6 +23,7 @@ export default Ember.Component.extend(UserSession, {
   hideInActiveDiagnoses: true,
   patient: null,
   patientProcedures: null,
+  props: {},
   showAddDiagnosisAction: 'showAddDiagnosis',
   showPatientAction: 'showPatient',
 
@@ -76,7 +77,8 @@ export default Ember.Component.extend(UserSession, {
 
     linkToPatient() {
       let shouldLink = this.get('shouldLinkToPatient');
-      if (shouldLink) {
+      let stayOnPage = this.get('props.stayOnPage');
+      if (shouldLink && !stayOnPage) {
         let patient = this.get('patient');
         let returnTo = this.get('returnTo');
         let returnToContext = this.get('returnToContext');

app/templates/components/medication-allergy.hbs

@@ -29,9 +29,9 @@
       <div class="col-xs-12 form-group">
         <label>{{t "allergies.labels.allergyName"}}</label>
         {{#if currentAllergy}}
-          {{input class="form-control" value=currentAllergy.name}}
+          {{input class="form-control allergy-text" value=currentAllergy.name}}
         {{else}}
-          {{input class="form-control" value=name}}
+          {{input class="form-control allergy-text" value=name}}
         {{/if}}
       </div>
     </div>

app/templates/components/patient-summary.hbs

@@ -43,7 +43,7 @@
     </div>
   {{/if}}
 
-  {{medication-allergy patient=patient canAddAllergy=canAddAllergy}}
+  {{medication-allergy patient=patient canAddAllergy=canAddAllergy parentProps=props}}
 
   {{#if canAddOperativePlan}}
     <div class="ps-info-group long-form">

tests/acceptance/visit-test.js

@@ -91,6 +91,17 @@ test('Edit visit', function(assert) {
     });
     andThen(function() {
       assert.equal(find('a.primary-diagnosis:contains(Broken Arm)').length, 1, 'New primary diagnosis appears');
+      click('a:contains(Add Allergy)');
+      waitToAppear('.modal-dialog');
+    });
+    andThen(function() {
+      assert.equal(find('.modal-title').text(), 'Add Allergy', 'Add Allergy dialog displays');
+      fillIn('input.allergy-text', 'Quinine');
+      click('.modal-footer button:contains(Add)');
+      waitToAppear('a.primary-diagnosis');
+    });
+    andThen(function() {
+      assert.equal(find('a.allergy-button:contains(Quinine)').length, 1, 'New allergy appears');
       click('button:contains(New Medication)');
     });
     andThen(function() {