[Cleanup] eslint prefer-template (#745)

HospitalRun · Oct 17, 2016 · d50c5da · d50c5da
1 parent a9554d8
commit d50c5da
Show file tree

Hide file tree

Showing 43 changed files with 157 additions and 159 deletions.
diff --git a/app/adapters/user.js b/app/adapters/user.js
@@ -152,7 +152,7 @@ export default DS.RESTAdapter.extend(UserSession, {
         startkey: '"org.couchdb.user"'
       }
     };
-    let allURL = this.endpoint + '_all_docs';
+    let allURL = `${this.endpoint}_all_docs`;
     return this.ajax(allURL, 'GET', ajaxData);
   },
 

diff --git a/app/admin/roles/controller.js b/app/admin/roles/controller.js
@@ -108,11 +108,11 @@ export default AbstractEditController.extend(UserRoles, UserSession, {
     section.capabilities.forEach((key) => {
       mappedCapabilities.push({
         key: key,
-        name: this.get('i18n').t('admin.roles.capability.' + key)
+        name: this.get('i18n').t(`admin.roles.capability.${key}`)
       });
     });
     return {
-      name: this.get('i18n').t('admin.roles.capability.' + section.name),
+      name: this.get('i18n').t(`admin.roles.capability.${section.name}`),
       capabilities: mappedCapabilities
     };
   }),

diff --git a/app/appointments/edit/controller.js b/app/appointments/edit/controller.js
@@ -46,7 +46,7 @@ export default AbstractEditController.extend(AppointmentStatuses, PatientSubmodu
     let minute;
     let minuteList = [];
     for (minute = 0; minute < 60; minute++) {
-      minuteList.push(String('00' + minute).slice(-2));
+      minuteList.push(String(`00${minute}`).slice(-2));
     }
     return minuteList;
   }.property(),

diff --git a/app/appointments/search/route.js b/app/appointments/search/route.js
@@ -28,7 +28,7 @@ export default AppointmentIndexRoute.extend(DateFormat, {
     let startOfDay = startDate.startOf('day').toDate().getTime();
     let searchOptions = {
       startkey: [startOfDay, null, 'appointment_'],
-      endkey: [maxValue, maxValue, 'appointment_' + maxValue]
+      endkey: [maxValue, maxValue, `appointment_${maxValue}`]
     };
     return {
       options: searchOptions,

diff --git a/app/appointments/today/route.js b/app/appointments/today/route.js
@@ -12,7 +12,7 @@ export default AppointmentIndexRoute.extend({
     return {
       options: {
         startkey: [startOfDay, null, 'appointment_'],
-        endkey: [endOfDay, endOfDay, 'appointment_' + maxValue]
+        endkey: [endOfDay, endOfDay, `appointment_${maxValue}`]
       },
       mapReduce: 'appointments_by_date'
     };

diff --git a/app/components/charge-quantity.js b/app/components/charge-quantity.js
@@ -8,7 +8,7 @@ export default Ember.Component.extend({
 
   didReceiveAttrs(/* attrs */) {
     this._super(...arguments);
-    this.quantitySelected = Ember.computed.alias('model.' + this.get('pricingItem.id'));
+    this.quantitySelected = Ember.computed.alias(`model.${this.get('pricingItem.id')}`);
   },
 
   hasError: function() {

diff --git a/app/components/charges-by-type-tab.js b/app/components/charges-by-type-tab.js
@@ -18,6 +18,6 @@ export default Ember.Component.extend({
 
   tabHref: function() {
     let tabId = this.get('tabId');
-    return '#' + tabId;
+    return `#${tabId}`;
   }.property('tabId')
 });
diff --git a/app/components/checkbox-or-typeahead.js b/app/components/checkbox-or-typeahead.js
@@ -23,9 +23,9 @@ export default SelectOrTypeahead.extend({
 
   _setup: function() {
     let property = this.get('property');
-    Ember.defineProperty(this, 'errors', Ember.computed('model.errors.' + property, function() {
+    Ember.defineProperty(this, 'errors', Ember.computed(`model.errors.${property}`, function() {
       let property = this.get('property');
-      let errors = this.get('model.errors.' + property);
+      let errors = this.get(`model.errors.${property}`);
       if (!Ember.isEmpty(errors)) {
         return errors[0];
       }
@@ -47,7 +47,7 @@ export default SelectOrTypeahead.extend({
   actions: {
     checkboxChanged: function(value, checked) {
       let property = this.get('property');
-      let propertyName = 'model.' + property;
+      let propertyName = `model.${property}`;
       let selectedValues = this.get(propertyName);
       if (!Ember.isArray(selectedValues)) {
         selectedValues = [];

diff --git a/app/components/custom-form.js b/app/components/custom-form.js
@@ -22,7 +22,7 @@ export default Ember.Component.extend(SelectValues, {
           currentRow = [];
           colCount = 0;
         }
-        field.classNames += ' col-sm-' + (colWidth * colSpan);
+        field.classNames += ` col-sm-${colWidth * colSpan}`;
         if (field.type === 'select') {
           field.mappedValues = field.values.map(this.selectValuesMap);
         }

diff --git a/app/components/date-input.js b/app/components/date-input.js
@@ -73,16 +73,16 @@ export default HtmlInput.extend({
   didReceiveAttrs(/* attrs */) {
     this._super(...arguments);
     let dateProperty = this.get('mainComponent.property');
-    let displayPropertyName = 'display_' + dateProperty;
+    let displayPropertyName = `display_${dateProperty}`;
     this.set('mainComponent.property', displayPropertyName);
-    this.currentDate = Ember.computed.alias('mainComponent.model.' + dateProperty);
-    this.selectedValue = Ember.computed.alias('mainComponent.model.' + displayPropertyName);
+    this.currentDate = Ember.computed.alias(`mainComponent.model.${dateProperty}`);
+    this.selectedValue = Ember.computed.alias(`mainComponent.model.${displayPropertyName}`);
     this.minDate = Ember.computed.alias('mainComponent.minDate');
     this.maxDate = Ember.computed.alias('mainComponent.maxDate');
     this.showTime = Ember.computed.alias('mainComponent.showTime');
     this.yearRange = Ember.computed.alias('mainComponent.yearRange');
-    this.addObserver('mainComponent.model.' + dateProperty, this, this.currentDateChangedValue);
-    Ember.Binding.from('mainComponent.model.errors.' + dateProperty).to('mainComponent.model.errors.' + displayPropertyName).connect(this);
+    this.addObserver(`mainComponent.model.${dateProperty}`, this, this.currentDateChangedValue);
+    Ember.Binding.from(`mainComponent.model.errors.${dateProperty}`).to(`mainComponent.model.errors.${displayPropertyName}`).connect(this);
   },
 
   willDestroyElement: function() {

diff --git a/app/components/icd10-typeahead.js b/app/components/icd10-typeahead.js
@@ -14,7 +14,7 @@ export default TypeAhead.extend({
       cb(suggestions);
       // Set the headers content.
       let $header = this.$('.query-results');
-      $header.html('<strong><em>' + query + '</em></strong> returned <strong>' + suggestions.length + '</strong> results');
+      $header.html(`<strong><em>${query}</em></strong> returned <strong>${suggestions.length}</strong> results`);
     }.bind(this));
   },
 

diff --git a/app/components/take-photo.js b/app/components/take-photo.js
@@ -57,9 +57,9 @@ export default Ember.Component.extend({
     for (let i = 0; i !== sourceInfos.length; ++i) {
       let sourceInfo = sourceInfos[i];
       if (sourceInfo.kind === 'video') {
-        cameraLabel = 'Camera ' + (++cameraCount);
+        cameraLabel = `Camera '${++cameraCount}`;
         if (sourceInfo.label) {
-          cameraLabel += ' (' + sourceInfo.label + ')';
+          cameraLabel += ` (${sourceInfo.label})`;
         }
         videoSources.addObject({
           id: sourceInfo.id,

diff --git a/app/controllers/abstract-edit-controller.js b/app/controllers/abstract-edit-controller.js
@@ -113,11 +113,11 @@ export default Ember.Controller.extend(EditPanelProps, IsUpdateDisabled, ModalHe
           this.saveModel(skipAfterUpdate);
         }).catch((err) => {
           if (!err.ignore) {
-            this.displayAlert('Error!!!!', 'An error occurred while attempting to save: ' + JSON.stringify(err));
+            this.displayAlert('Error!!!!', `An error occurred while attempting to save: ${JSON.stringify(err)}`);
           }
         });
       } catch (ex) {
-        this.displayAlert('Error!!!!', 'An error occurred while attempting to save: ' + ex);
+        this.displayAlert('Error!!!!', `An error occurred while attempting to save: ${ex}`);
       }
     }
   },

diff --git a/app/controllers/abstract-report-controller.js b/app/controllers/abstract-report-controller.js
@@ -104,10 +104,10 @@ export default Ember.Controller.extend(DateFormat, ModalHelper, NumberFormat, Pa
         }
 
       });
-      csvRows.push('"' + rowToAdd.join('","') + '"');
+      csvRows.push(`"${rowToAdd.join('","')}"`);
     });
     let csvString = csvRows.join('\r\n');
-    let uriContent = 'data:application/csv;charset=utf-8,' + encodeURIComponent(csvString);
+    let uriContent = `data:application/csv;charset=utf-8,${encodeURIComponent(csvString)}`;
     this.set('csvExport', uriContent);
   },
 

diff --git a/app/controllers/index.js b/app/controllers/index.js
@@ -15,7 +15,7 @@ export default Ember.Controller.extend(UserSession, {
     let permissions = this.get('defaultCapabilities');
     for (let capability in permissions) {
       if (this.currentUserCan(capability)) {
-        this.set('userCan_' + capability, true);
+        this.set(`userCan_${capability}`, true);
       }
     }
   }.on('init'),

diff --git a/app/controllers/navigation.js b/app/controllers/navigation.js
@@ -43,9 +43,9 @@ export default Ember.Controller.extend(HospitalRunVersion, ModalHelper, Progress
         let textToFind = this.get('searchText');
         if (currentSearchText !== textToFind || currentRouteName.indexOf('.search') === -1) {
           this.set('searchText', '');
-          this.set('progressMessage', 'Searching for ' + textToFind + '.  Please wait...');
+          this.set('progressMessage', `Searching for ${textToFind}. Please wait...`);
           this.showProgressModal();
-          this.transitionToRoute(this.searchRoute + '/' + textToFind);
+          this.transitionToRoute(`${this.searchRoute}/${textToFind}`);
         }
       }
     },

diff --git a/app/inventory/edit/controller.js b/app/inventory/edit/controller.js
@@ -202,7 +202,7 @@ export default AbstractEditController.extend(InventoryLocations, InventoryTypeLi
     sequence.incrementProperty('value', 1);
     sequenceValue = sequence.get('value');
     if (sequenceValue < 100000) {
-      friendlyId += String('00000' + sequenceValue).slice(-5);
+      friendlyId += String(`00000${sequenceValue}`).slice(-5);
     } else {
       friendlyId += sequenceValue;
     }
@@ -222,7 +222,7 @@ export default AbstractEditController.extend(InventoryLocations, InventoryTypeLi
     sequenceFinder.then(function(prefixChars) {
       let store = this.get('store');
       let newSequence = store.push(store.normalize('sequence', {
-        id: 'inventory_' + inventoryType,
+        id: `inventory_${inventoryType}`,
         prefix: inventoryType.toLowerCase().substr(0, prefixChars),
         value: 0
       }));
@@ -287,7 +287,7 @@ export default AbstractEditController.extend(InventoryLocations, InventoryTypeLi
         model.validate().then(function() {
           if (model.get('isValid')) {
             this.set('savingNewItem', true);
-            this.store.find('sequence', 'inventory_' + inventoryType).then(function(sequence) {
+            this.store.find('sequence', `inventory_${inventoryType}`).then(function(sequence) {
               this._completeBeforeUpdate(sequence, resolve, reject);
             }.bind(this), function() {
               this._findSequence(inventoryType, resolve, reject);

diff --git a/app/inventory/reports/controller.js b/app/inventory/reports/controller.js
@@ -612,7 +612,7 @@ export default AbstractReportController.extend(LocationName, ModalHelper, Number
         let i = this._numberFormat(beginningBalance + inventoryAdjustment);
         let i18n = this.get('i18n');
         if ((beginningBalance + inventoryAdjustment) < 0) {
-          this.get('reportRows').addObject([i18n.t('inventory.reports.rows.balanceEnd'), '', '(' + i + ')']);
+          this.get('reportRows').addObject([i18n.t('inventory.reports.rows.balanceEnd'), '', `(${i})`]);
         } else {
           this.get('reportRows').addObject([i18n.t('inventory.reports.rows.balanceEnd'), '', i]);
         }
@@ -695,23 +695,23 @@ export default AbstractReportController.extend(LocationName, ModalHelper, Number
               Object.keys(consumed).forEach(function(key) {
                 let i = this._getValidNumber(consumed[key]);
                 consumedTotal += i;
-                this.get('reportRows').addObject(['', key, '(' + this._numberFormat(i) + ')']);
+                this.get('reportRows').addObject(['', key, `(${this._numberFormat(i)})`]);
               }.bind(this));
               overallValue += consumedTotal;
-              this.get('reportRows').addObject([i18n.t('inventory.reports.rows.consumedPurchasesTotal'), '', '(' + this._numberFormat(consumedTotal) + ')']);
+              this.get('reportRows').addObject([i18n.t('inventory.reports.rows.consumedPurchasesTotal'), '', `(${this._numberFormat(consumedTotal)})`]);
             }
             if (Object.keys(gikConsumed).length > 0) {
               this.get('reportRows').addObject([i18n.t('inventory.reports.rows.consumedGik'), '', '']);
               let gikTotal = 0;
               Object.keys(gikConsumed).forEach(function(key) {
                 let i = this._getValidNumber(gikConsumed[key]);
                 gikTotal += i;
-                this.get('reportRows').addObject(['', key, '(' + this._numberFormat(i) + ')']);
+                this.get('reportRows').addObject(['', key, `(${this._numberFormat(i)})`]);
               }.bind(this));
               overallValue += gikTotal;
-              this.get('reportRows').addObject([i18n.t('inventory.reports.rows.consumedGikTotal'), '', '(' + this._numberFormat(gikTotal) + ')']);
+              this.get('reportRows').addObject([i18n.t('inventory.reports.rows.consumedGikTotal'), '', `(${this._numberFormat(gikTotal)})`]);
             }
-            this.get('reportRows').addObject([i18n.t('inventory.reports.rows.consumedTotal'), '', '(' + this._numberFormat(overallValue) + ')']);
+            this.get('reportRows').addObject([i18n.t('inventory.reports.rows.consumedTotal'), '', `(${this._numberFormat(overallValue)})`]);
             adjustedValue -= overallValue;
           }
           // write the adjustment rows
@@ -727,13 +727,13 @@ export default AbstractReportController.extend(LocationName, ModalHelper, Number
                   this.get('reportRows').addObject(['', key, this._numberFormat(i)]);
                 } else {
                   adjustmentTotal -= i;
-                  this.get('reportRows').addObject(['', key, '(' + this._numberFormat(i) + ')']);
+                  this.get('reportRows').addObject(['', key, `(${this._numberFormat(i)})`]);
                 }
               }.bind(this));
             }
           }.bind(this));
           if (adjustmentTotal < 0) {
-            this.get('reportRows').addObject([i18n.t('inventory.reports.rows.adjustmentsTotal'), '', '(' + this._numberFormat(adjustmentTotal) + ')']);
+            this.get('reportRows').addObject([i18n.t('inventory.reports.rows.adjustmentsTotal'), '', `(${this._numberFormat(adjustmentTotal)})`]);
           } else {
             this.get('reportRows').addObject([i18n.t('inventory.reports.rows.adjustmentsTotal'), '', this._numberFormat(adjustmentTotal)]);
           }
@@ -803,7 +803,7 @@ export default AbstractReportController.extend(LocationName, ModalHelper, Number
             }
           }.bind(this));
           if (beginningBalance < 0) {
-            this.get('reportRows').addObject([i18n.t('inventory.reports.rows.balanceBegin'), '', '(' + this._numberFormat(beginningBalance) + ')']);
+            this.get('reportRows').addObject([i18n.t('inventory.reports.rows.balanceBegin'), '', `(${this._numberFormat(beginningBalance)})`]);
           } else {
             this.get('reportRows').addObject([i18n.t('inventory.reports.rows.balanceBegin'), '', this._numberFormat(beginningBalance)]);
           }
@@ -944,7 +944,7 @@ export default AbstractReportController.extend(LocationName, ModalHelper, Number
                   if (consumedQuantity === 0) {
                     row.consumedPerDay = '0';
                   } else {
-                    row.consumedPerDay = '?' + consumedQuantity;
+                    row.consumedPerDay = `?${consumedQuantity}`;
                   }
                   row.daysLeft = '?';
                 }

diff --git a/app/invoices/edit/controller.js b/app/invoices/edit/controller.js
@@ -292,7 +292,7 @@ export default AbstractEditController.extend(NumberFormat, PatientSubmodule, Pub
     sequence.incrementProperty('value', 1);
     sequenceValue = sequence.get('value');
     if (sequenceValue < 100000) {
-      invoiceId += String('00000' + sequenceValue).slice(-5);
+      invoiceId += String(`00000${sequenceValue}`).slice(-5);
     } else {
       invoiceId += sequenceValue;
     }

diff --git a/app/mixins/charge-actions.js b/app/mixins/charge-actions.js
@@ -18,7 +18,7 @@ export default Ember.Mixin.create({
           resolve();
         }.bind(this), reject);
       }.bind(this), reject);
-    }.bind(this), '_createNewChargeRecord with pricingId:' + pricingId);
+    }.bind(this), `_createNewChargeRecord with pricingId:${pricingId}`);
   },
 
   actions: {
@@ -207,7 +207,7 @@ export default Ember.Mixin.create({
         this.set(priceObjectToSet, newPricing);
         resolve();
       }.bind(this), reject);
-    }.bind(this), 'saveNewPricing for: ' + pricingName);
+    }.bind(this), `saveNewPricing for: ${pricingName}`);
   },
 
   getSelectedPricing: function(selectedField) {
@@ -293,7 +293,7 @@ export default Ember.Mixin.create({
           }
         }
       }.bind(this));
-      Ember.RSVP.all(chargePromises, 'Charges updated for current record:' + this.get('model.id')).then(resolve, reject);
-    }.bind(this), 'updateCharges for current record:' + this.get('model.id'));
+      Ember.RSVP.all(chargePromises, `Charges updated for current record: ${this.get('model.id')}`).then(resolve, reject);
+    }.bind(this), `updateCharges for current record: ${this.get('model.id')}`);
   }
 });
diff --git a/app/mixins/fulfill-request.js b/app/mixins/fulfill-request.js
@@ -96,7 +96,7 @@ export default Ember.Mixin.create({
         }
       });
       if (!foundQuantity) {
-        return 'Could not find any purchases that had the required quantity:' + quantityRequested;
+        return `Could not find any purchases that had the required quantity: ${quantityRequested}`;
       }
     }
     request.set('costPerUnit', (totalCost / quantityRequested).toFixed(2));

diff --git a/app/mixins/inventory-id.js b/app/mixins/inventory-id.js
@@ -9,6 +9,6 @@ export default Ember.Mixin.create({
     let max = 999;
     let part1 = new Date().getTime();
     let part2 = Math.floor(Math.random() * (max - min + 1)) + min;
-    return Ember.RSVP.resolve(part1.toString(36) + '_' + part2.toString(36));
+    return Ember.RSVP.resolve(`${part1.toString(36)}_${part2.toString(36)}`);
   }
 });
diff --git a/app/mixins/navigation.js b/app/mixins/navigation.js
@@ -307,7 +307,7 @@ export default Ember.Mixin.create({
       nav.localizedTitle = translationOrOriginal(navTranslated, nav.title);
       // Map all of the sub navs, too
       nav.subnav = nav.subnav.map((sub) => {
-        let subItemKey = localizationPrefix + 'subnav.' + camelize(sub.title);
+        let subItemKey = `${localizationPrefix}subnav.${camelize(sub.title)}`;
         let subTranslated = this.get('i18n').t(subItemKey);
 
         sub.localizedTitle = translationOrOriginal(subTranslated, sub.title);

diff --git a/app/mixins/patient-submodule.js b/app/mixins/patient-submodule.js
@@ -166,7 +166,7 @@ export default Ember.Mixin.create(PatientVisits, {
       let childPromises = [];
       let visit = this.get('model.visit');
       childPromises.addObjects(this.resolveVisitChildren());
-      Ember.RSVP.all(childPromises, 'Resolved visit children before removing ' + childName).then(function() {
+      Ember.RSVP.all(childPromises, `Resolved visit children before removing ${childName}`).then(function() {
         visit.get(childName).then(function(visitChildren) {
           visitChildren.removeObject(objectToRemove);
           visit.save().then(resolve, reject);

diff --git a/app/mixins/pouch-adapter-utils.js b/app/mixins/pouch-adapter-utils.js
@@ -11,7 +11,7 @@ export default Ember.Mixin.create({
         }
       }
       let errmsg = [err.status,
-        (err.name || err.error) + ':',
+        `${(err.name || err.error)}:`,
         (err.message || err.reason)
       ].join(' ');
       Ember.run(null, reject, errmsg);

diff --git a/app/mixins/progress-dialog.js b/app/mixins/progress-dialog.js
@@ -28,7 +28,7 @@ export default Ember.Mixin.create({
       progressBarValue = 0;
     }
     progressDialog.set('progressBarValue', progressBarValue);
-    let progressBarStyle = Ember.String.htmlSafe('width: ' + progressBarValue + '%');
+    let progressBarStyle = Ember.String.htmlSafe(`width: ${progressBarValue}%`);
     progressDialog.set('progressBarStyle', progressBarStyle);
   },
 

diff --git a/app/models/patient-note.js b/app/models/patient-note.js
@@ -5,7 +5,7 @@ export default AbstractModel.extend({
   authoredBy: function() {
     if (!Ember.isEmpty(this.get('attribution'))) {
       let i18n = this.get('i18n');
-      return this.get('createdBy') + ' ' + i18n.t('patients.notes.onBehalfOfCopy') + ' ' + this.get('attribution');
+      return `${this.get('createdBy')} ${i18n.t('patients.notes.onBehalfOfCopy')} ${this.get('attribution')}`;
     } else {
       return this.get('createdBy');
     }

diff --git a/app/models/visit.js b/app/models/visit.js
@@ -80,7 +80,7 @@ export default AbstractModel.extend({
     let startDate = moment(this.get('startDate'));
     let visitDate = startDate.format('l');
     if (!Ember.isEmpty(endDate) && !startDate.isSame(endDate, 'day')) {
-      visitDate += ' - ' + moment(endDate).format('l');
+      visitDate += ` - ${moment(endDate).format('l')}`;
     }
     return visitDate;
   }.property('startDate', 'endDate'),