Refactor code to conform with style guide

eHealthAfrica · Mar 15, 2017 · 7895b24 · 7895b24
1 parent ad1d00e
commit 7895b24
Show file tree

Hide file tree

Showing 15 changed files with 124 additions and 101 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,7 @@
 ---
 language: node_js
 node_js:
-- '4'
+  - "4"
 
 branches:
   only:
@@ -21,8 +21,8 @@ before_install:
   - phantomjs --version
 
 install:
-- npm install
-- bower install
+  - npm install
+  - bower install
 
 script:
   - travis_retry npm test
diff --git a/app/mixins/patient-submodule.js b/app/mixins/patient-submodule.js
@@ -184,10 +184,10 @@ export default Ember.Mixin.create(PatientVisits, {
   }.property('model.patient.id', 'newVisitAdded'),
 
   patientProcedures: Ember.computed('patientVisits.[]', function() {
-    let patient = this.get('model.patient');
+    let patient = get(this, 'model.patient');
     return DS.PromiseArray.create({
-      promise: this.get('patientVisits').then((patientVisits) => {
-        return patient.get('operationReports').then((operationReports) => {
+      promise: get(this, 'patientVisits').then((patientVisits) => {
+        return get(patient, 'operationReports').then((operationReports) => {
           return this._getPatientProcedures(operationReports, patientVisits);
         });
       })

diff --git a/app/mixins/patient-visits.js b/app/mixins/patient-visits.js
@@ -23,9 +23,9 @@ export default Ember.Mixin.create(PouchDbMixin, {
   },
 
   getPatientFutureAppointment(visit, outPatient) {
-    let patientId = visit.get('patient.id');
-    let visitDate = visit.get('startDate');
-    let maxValue = this.get('maxValue');
+    let patientId = get(visit, 'patient.id');
+    let visitDate = get(visit, 'startDate');
+    let maxValue = get(this, 'maxValue');
     let promise = this.store.query('appointment', {
       options: {
         startkey: [patientId, null, null, 'appointment_'],
@@ -34,18 +34,16 @@ export default Ember.Mixin.create(PouchDbMixin, {
       mapReduce: 'appointments_by_patient'
     }).then(function(result) {
       let futureAppointments = result.filter(function(data) {
-        let startDate = data.get('startDate');
+        let startDate = get(data, 'startDate');
         return startDate && moment(startDate).isAfter(moment(visitDate), 'day');
       }).sortBy('startDate');
       if (!futureAppointments.length) {
-        return '';
+        return null;
       }
       if (!outPatient) {
-        let [appointment] = futureAppointments;
-        return appointment;
+        return futureAppointments;
       } else {
-        let res = futureAppointments.slice(0, 3);
-        return res;
+        return futureAppointments.slice(0, 3);
       }
 
     });
@@ -56,7 +54,7 @@ export default Ember.Mixin.create(PouchDbMixin, {
     let returnList = [];
     if (!Ember.isEmpty(visits)) {
       visits.forEach(function(visit) {
-        visit.get(name).then(function(items) {
+        get(visit, name).then(function(items) {
           returnList.addObjects(items);
         });
       });

diff --git a/app/models/report.js b/app/models/report.js
@@ -6,7 +6,6 @@ export default AbstractModel.extend({
   reportDate: DS.attr('date'),
   customForms: DS.attr('custom-forms'),
   reportType: DS.attr('string'),
-  nextAppointment: DS.attr('date'),
   surgeon: DS.attr('string'),
 
   // Associations

diff --git a/app/procedures/edit/route.js b/app/procedures/edit/route.js
@@ -1,10 +1,10 @@
 import AbstractEditRoute from 'hospitalrun/routes/abstract-edit-route';
-import AddToPatient from 'hospitalrun/mixins/add-to-patient-route';
+import AddToPatientRoute from 'hospitalrun/mixins/add-to-patient-route';
 import ChargeRoute from 'hospitalrun/mixins/charge-route';
 import Ember from 'ember';
 import { translationMacro as t } from 'ember-i18n';
 
-export default AbstractEditRoute.extend(AddToPatient, ChargeRoute, {
+export default AbstractEditRoute.extend(AddToPatientRoute, ChargeRoute, {
   editTitle: t('procedures.titles.edit'),
   modelName: 'procedure',
   newTitle: t('procedures.titles.new'),

diff --git a/app/reports/edit/controller.js b/app/reports/edit/controller.js
@@ -4,6 +4,11 @@ import PatientSubmodule from 'hospitalrun/mixins/patient-submodule';
 import PatientDiagnosis from 'hospitalrun/mixins/patient-diagnosis';
 import PouchDbMixin from 'hospitalrun/mixins/pouchdb';
 
+const {
+  get,
+  set
+} = Ember;
+
 export default AbstractEditController.extend(PatientSubmodule, PatientDiagnosis, PouchDbMixin, {
   lookupListsToUpdate: [{
     name: 'physicianList',
@@ -26,7 +31,7 @@ export default AbstractEditController.extend(PatientSubmodule, PatientDiagnosis,
   diagnosisList: Ember.computed.alias('visitsController.diagnosisList'),
 
   additionalButtons: Ember.computed('model.{isNew}', function() {
-    let isNew = this.get('model.isNew');
+    let isNew = get(this, 'model.isNew');
     if (!isNew) {
       return [{
         class: 'btn btn-primary on-white',
@@ -40,23 +45,26 @@ export default AbstractEditController.extend(PatientSubmodule, PatientDiagnosis,
   updateCapability: 'add_report',
 
   beforeUpdate() {
-    return new Ember.RSVP.Promise(function(resolve) {
-      if (this.get('model.isNew')) {
-        if (this.get('model.visit.outPatient')) {
-          this.get('model').set('reportType', 'OPD Report');
+    return new Ember.RSVP.Promise((resolve) => {
+      let model = get(this, 'model');
+      if (get(model, 'isNew')) {
+        if (get(this, 'model.visit.outPatient')) {
+          set(model, 'reportType', 'OPD Report');
         } else {
-          this.get('model').set('reportType', 'Discharge Report');
+          set(model, 'reportType', 'Discharge Report');
         }
       }
       resolve();
-    }.bind(this));
+    });
   },
 
   afterUpdate() {
-    let alertTitle = this.get('i18n').t('reports.titles.saved');
-    let alertMessage = this.get('i18n').t('reports.messages.saved');
+    let alertTitle = get(this, 'i18n').t('reports.titles.saved');
+    let alertMessage = get(this, 'i18n').t('reports.messages.saved');
     this.saveVisitIfNeeded(alertTitle, alertMessage);
-    let editTitle = this.get('model.visit.outPatient') ? this.get('i18n').t('reports.opd.titles.edit') : this.get('i18n').t('reports.discharge.titles.edit');
+    let opdTitle = get(this, 'i18n').t('reports.opd.titles.edit');
+    let dischargeTitle = get(this, 'i18n').t('reports.discharge.titles.edit');
+    let editTitle = get(this, 'model.visit.outPatient') ? opdTitle : dischargeTitle;
     let sectionDetails = {};
     sectionDetails.currentScreenTitle = editTitle;
     this.send('setSectionHeader', sectionDetails);

diff --git a/app/reports/edit/route.js b/app/reports/edit/route.js
@@ -4,6 +4,11 @@ import Ember from 'ember';
 import { translationMacro as t } from 'ember-i18n';
 import PatientVisits from 'hospitalrun/mixins/patient-visits';
 
+const {
+  get,
+  set
+} = Ember;
+
 export default AbstractEditRoute.extend(AddToPatientRoute, PatientVisits, {
   modelName: 'report',
   customForms: Ember.inject.service(),
@@ -13,51 +18,51 @@ export default AbstractEditRoute.extend(AddToPatientRoute, PatientVisits, {
       reportDate: new Date(),
       customForms: Ember.Object.create()
     };
-    let customForms = this.get('customForms');
+    let customForms = get(this, 'customForms');
     return customForms.setDefaultCustomForms(['opdReport', 'dischargeReport'], newReportData);
   },
 
   getScreenTitle(model) {
-    let state = model.get('isNew') ? 'new' : 'edit';
-    let type = model.get('visit.outPatient') ? 'opd' : 'discharge';
+    let state = get(model, 'isNew') ? 'new' : 'edit';
+    let type = get(model, 'visit.outPatient') ? 'opd' : 'discharge';
     return t(`reports.${type}.titles.${state}`);
   },
 
   getDiagnosisContainer(visit) {
-    if (visit.get('outPatient')) {
+    if (get(visit, 'outPatient')) {
       return visit;
     }
     return null;
   },
 
   getCurrentOperativePlan(patient) {
-    let operativePlans = patient.get('operativePlans');
+    let operativePlans = get(patient, 'operativePlans');
     return operativePlans.findBy('isPlanned', true);
   },
 
   afterModel(model) {
-    if (!model.get('isNew')) {
-      let patient = model.get('visit.patient');
-      model.set('patient', patient);
+    if (!get(model, 'isNew')) {
+      let patient = get(model, 'visit.patient');
+      set(model, 'patient', patient);
     }
-    if (!model.get('visit')) {
+    if (!get(model, 'visit')) {
       return this.transitionTo('patients');
     }
   },
 
   setupController(controller, model) {
     this._super(controller, model);
-    let visit = model.get('visit');
-    let patient = model.get('patient');
-    let isOutPatient = visit.get('outPatient');
-    controller.set('visit', visit);
-    controller.set('isOutPatient', isOutPatient);
-    controller.set('diagnosisContainer', this.getDiagnosisContainer(visit));
-    controller.set('currentOperativePlan', this.getCurrentOperativePlan(patient));
+    let visit = get(model, 'visit');
+    let patient = get(model, 'patient');
+    let isOutPatient = get(visit, 'outPatient');
+    set(controller, 'visit', visit);
+    set(controller, 'isOutPatient', isOutPatient);
+    set(controller, 'diagnosisContainer', this.getDiagnosisContainer(visit));
+    set(controller, 'currentOperativePlan', this.getCurrentOperativePlan(patient));
     if (isOutPatient) {
-      controller.set('nextAppointments', this.getPatientFutureAppointment(model.get('visit'), true));
+      set(controller, 'nextAppointments', this.getPatientFutureAppointment(visit, true));
     } else {
-      controller.set('nextAppointment', this.getPatientFutureAppointment(model.get('visit')));
+      set(controller, 'nextAppointment', this.getPatientFutureAppointment(visit));
     }
   }
 });
diff --git a/app/reports/edit/template.hbs b/app/reports/edit/template.hbs
@@ -165,16 +165,18 @@
         {{/if}}
 
         {{#if visit.patientNotes}}
-          <label class="ps-info-label">{{t 'reports.form.notes.title' }}</label>
-          <ul>
-            {{#each visit.patientNotes as |note|}}
-              <li>
-                <b>{{t 'reports.form.notes.date' }}:</b> {{date-format note.date}}<br>
-                <b>{{t 'reports.form.notes.author' }}:</b> {{note.authoredBy}}<br>
-                <b>{{note.noteType}}: {{note.content}}</b>
-              </li>
-            {{/each}}
-          </ul>
+          <div class="ps-info-group test-notes">
+            <label class="ps-info-label test-notes-label">{{t 'reports.form.notes.title' }}</label>
+            <ul>
+              {{#each visit.patientNotes as |note|}}
+                <li class="test-notes-data">
+                  <b>{{t 'reports.form.notes.date' }}:</b> {{date-format note.date}}<br>
+                  <b>{{t 'reports.form.notes.author' }}:</b> {{note.authoredBy}}<br>
+                  <b>{{note.noteType}}: {{note.content}}</b>
+                </li>
+              {{/each}}
+            </ul>
+          </div>
         {{/if}}
 
         {{#if nextAppointment}}

diff --git a/app/services/database.js b/app/services/database.js
@@ -6,6 +6,7 @@ import UnauthorizedError from 'hospitalrun/utils/unauthorized-error';
 import enviroment from './../config/environment';
 
 const {
+  get,
   isEmpty
 } = Ember;
 
@@ -23,13 +24,13 @@ export default Ember.Service.extend({
         this.set('setMainDB', true);
       })
       .then(() => {
-        this.createSampleDocs([enviroment.hospitalInfoDoc]);
+        this.createOptionHeader([enviroment.hospitalInfoDoc]);
       });
   },
 
-  createSampleDocs(docs) {
+  createOptionHeader(docs) {
     return new Ember.RSVP.Promise((resolve, reject) => {
-      let mainDB = this.get('mainDB');
+      let mainDB = get(this, 'mainDB');
       let ids = docs.map((doc) => {
         return doc._id;
       });

diff --git a/app/users/edit/controller.js b/app/users/edit/controller.js
@@ -3,6 +3,10 @@ import Ember from 'ember';
 import UserRoles from 'hospitalrun/mixins/user-roles';
 import uuid from 'npm:uuid';
 
+const {
+  get
+} = Ember;
+
 export default AbstractEditController.extend(UserRoles, {
   usersController: Ember.inject.controller('users/index'),
   updateCapability: 'add_user',
@@ -39,8 +43,8 @@ export default AbstractEditController.extend(UserRoles, {
         updateModel.set('userPrefix', prefix);
       }
       updateModel.save().then(() => {
-        this.displayAlert(this.get('i18n').t('messages.userSaved'), this.get('i18n').t('messages.userHasBeenSaved'));
-        let editTitle = this.get('i18n').t('labels.editUser');
+        this.displayAlert(get(this, 'i18n').t('messages.userSaved'), get(this, 'i18n').t('messages.userHasBeenSaved'));
+        let editTitle = get(this, 'i18n').t('labels.editUser');
         let sectionDetails = {};
         sectionDetails.currentScreenTitle = editTitle;
         this.send('setSectionHeader', sectionDetails);

diff --git a/app/visits/edit/controller.js b/app/visits/edit/controller.js
@@ -36,7 +36,9 @@ export default AbstractEditController.extend(AddNewPatient, ChargeActions, Diagn
       return [buttonProps];
     }
   }),
+
   noReport: false,
+
   canAddAppointment: computed('model.isNew', function() {
     return (!this.get('model.isNew') && this.currentUserCan('add_appointment'));
   }),
@@ -65,9 +67,9 @@ export default AbstractEditController.extend(AddNewPatient, ChargeActions, Diagn
     return this.currentUserCan('add_vitals');
   }.property(),
 
-  canAddReport: function() {
+  canAddReport: computed('hasReport', function() {
     return this.currentUserCan('add_report') && !this.get('hasReport');
-  }.property('hasReport'),
+  }),
 
   canDeleteImaging: function() {
     return this.currentUserCan('delete_imaging');
@@ -406,7 +408,7 @@ export default AbstractEditController.extend(AddNewPatient, ChargeActions, Diagn
     },
 
     editReport(report) {
-      report.set('returnToVisit', this.get('model.id'));
+      set(report, 'returnToVisit', get(this, 'model.id'));
       this.transitionToRoute('reports.edit', report);
     },
 

diff --git a/app/visits/edit/route.js b/app/visits/edit/route.js
@@ -6,6 +6,12 @@ import PatientListRoute from 'hospitalrun/mixins/patient-list-route';
 import PatientVisit from 'hospitalrun/mixins/patient-visits';
 import DS from 'ember-data';
 
+const {
+  get,
+  set,
+  isEmpty
+} = Ember;
+
 export default AbstractEditRoute.extend(ChargeRoute, PatientListRoute, PatientVisit, {
   customForms: Ember.inject.service(),
   editTitle: t('visits.titles.editVisit'),
@@ -14,11 +20,11 @@ export default AbstractEditRoute.extend(ChargeRoute, PatientListRoute, PatientVi
   pricingCategory: 'Ward',
 
   model(params) {
-    let idParam = this.get('idParam');
-    if (!Ember.isEmpty(idParam) && params[idParam] === 'checkin') {
+    let idParam = get(this, 'idParam');
+    if (!isEmpty(idParam) && params[idParam] === 'checkin') {
       return this.getNewData().then((newData) => {
         newData.checkIn = true;
-        let newVisit = this.get('store').createRecord('visit', newData);
+        let newVisit = get(this, 'store').createRecord('visit', newData);
         return newVisit;
       });
     } else {
@@ -47,14 +53,14 @@ export default AbstractEditRoute.extend(ChargeRoute, PatientListRoute, PatientVi
   setupController(controller, model) {
     let promise = this.store.query('report', {
       options: {
-        key: model.get('id')
+        key: get(model, 'id')
       },
       mapReduce: 'report_by_visit'
     }).then((reports) => {
-      controller.set('noReport', Ember.isEmpty(reports));
-      return Ember.isEmpty(reports) ? '' : reports.get('firstObject');
+      set(controller, 'noReport', isEmpty(reports));
+      return isEmpty(reports) ? '' : get(reports, 'firstObject');
     });
-    controller.set('report', DS.PromiseObject.create({ promise }));
+    set(controller, 'report', DS.PromiseObject.create({ promise }));
     this._super(controller, model);
   },