Incident reporting

app/admin/custom-forms/edit/controller.js

@@ -75,6 +75,7 @@ export default AbstractEditController.extend({
   }),
 
   formTypeValues: [
+    'incident',
     'operativePlan',
     'patient',
     'socialwork',

app/admin/lookup/controller.js

@@ -8,12 +8,13 @@ import VisitTypes from 'hospitalrun/mixins/visit-types';
 import { EKMixin, keyDown } from 'ember-keyboard';
 
 const {
-  computed, get
+  computed, get, inject
 } = Ember;
 
 export default Ember.Controller.extend(BillingCategories, EKMixin,
   InventoryTypeList, ModalHelper, UnitTypes, VisitTypes, {
-    fileSystem: Ember.inject.service('filesystem'),
+    fileSystem: inject.service('filesystem'),
+    lookupLists: inject.service(),
 
     canEditValues: computed('model.lookupType', function() {
       let lookupType = this.get('model.lookupType');
@@ -95,6 +96,12 @@ export default Ember.Controller.extend(BillingCategories, EKMixin,
             'locationsAffected' // Special use case that we need to handle
           ]
         }
+      }, {
+        name: this.get('i18n').t('admin.lookup.incidentDepartments'),
+        value: 'incident_departments',
+        models: {
+          incident: 'department'
+        }
       }, {
         defaultValues: 'defaultInventoryTypes',
         name: this.get('i18n').t('admin.lookup.inventoryTypes'),
@@ -309,6 +316,8 @@ export default Ember.Controller.extend(BillingCategories, EKMixin,
           let message = i18n.t('admin.lookup.alertImportListSaveMessage');
           let title = i18n.t('admin.lookup.alertImportListSaveTitle');
           lookupTypeList.save().then(() => {
+            let lookupLists = get(this, 'lookupLists');
+            lookupLists.resetLookupList(get(lookupTypeList, 'id'));
             this.displayAlert(title, message);
             this.set('importFile');
             this.set('model.importFileName');
@@ -373,12 +382,14 @@ export default Ember.Controller.extend(BillingCategories, EKMixin,
       },
       updateList() {
         let lookupTypeList = this.get('lookupTypeList');
-        lookupTypeList.save().then(function() {
+        lookupTypeList.save().then(() => {
+          let lookupLists = get(this, 'lookupLists');
+          lookupLists.resetLookupList(get(lookupTypeList, 'id'));
           this.displayAlert(
             this.get('i18n').t('admin.lookup.alertImportListUpdateTitle'),
             this.get('i18n').t('admin.lookup.alertImportListUpdateMessage')
           );
-        }.bind(this));
+        });
       },
       updateValue(valueObject) {
         let updateList = false;
@@ -399,7 +410,7 @@ export default Ember.Controller.extend(BillingCategories, EKMixin,
           values.addObject(value);
           values = values.sort(this._sortValues);
           lookupTypeList.set('value', values);
-          lookupTypeList.save();
+          this.send('updateList');
         }
       }
     }

app/admin/roles/controller.js

@@ -97,6 +97,17 @@ export default AbstractEditController.extend(UserRoles, UserSession, {
       'completeImaging',
       'deleteImaging'
     ]
+  }, {
+    name: 'incident',
+    capabilities: [
+      'incident',
+      'addIncident',
+      'addIncidentCategory',
+      'deleteIncident',
+      'deleteIncidentCategory',
+      'manageIncidents',
+      'generateIncidentReport'
+    ]
   }, {
     name: 'inventory',
     capabilities: [

app/components/custom-form-manager.js

@@ -2,77 +2,37 @@ import Ember from 'ember';
 import SelectValues from 'hospitalrun/utils/select-values';
 
 const {
-  computed,
-  isEmpty
+  Component,
+  computed: {
+    alias
+  },
+  get,
+  inject
 } = Ember;
 
-export default Ember.Component.extend(SelectValues, {
-  customForms: Ember.inject.service(),
+export default Component.extend(SelectValues, {
+  customForms: inject.service(),
   formType: null,
   formsForType: null,
   model: null,
   openModalAction: 'openModal',
 
+  formsForSelect: alias('customForms.formsForSelect'),
+  formsToDisplay: alias('customForms.formsToDisplay'),
+  showAddButton: alias('customForms.showAddButton'),
+
   didReceiveAttrs(/* attrs */) {
     this._super(...arguments);
-    let customForms = this.get('customForms');
-    let formType = this.get('formType');
-    customForms.getCustomForms([formType]).then((forms) => {
-      let isDestroyed = this.get('isDestroyed');
-      if (!isDestroyed) {
-        this.set('formsForType', forms);
-      }
-    });
+    let customForms = get(this, 'customForms');
+    let formType = get(this, 'formType');
+    let model = get(this, 'model');
+    customForms.setupForms(formType, model);
   },
 
-  formsForSelect: computed('formsForType', 'usedForms', function() {
-    let formsForType = this.get('formsForType');
-    let usedForms = this.get('usedForms');
-    if (!isEmpty(formsForType)) {
-      let formsForSelect = formsForType.filter((customForm) => {
-        return (!usedForms.includes(customForm.get('id')));
-      });
-      formsForSelect = formsForSelect.map((customForm) => {
-        return {
-          id: customForm.get('id'),
-          value: customForm.get('name')
-        };
-      });
-      return formsForSelect;
-    }
-  }),
-
-  formsToDisplay: computed('formsForType', 'model.customForms', function() {
-    let formsForType = this.get('formsForType');
-    let modelForms = this.get('model.customForms');
-    if (!isEmpty(modelForms) && !isEmpty(formsForType)) {
-      return Object.keys(modelForms).map((formId) => {
-        return {
-          form: formsForType.findBy('id', formId),
-          propertyPrefix: `customForms.${formId}.`
-        };
-      });
-    }
-  }),
-
-  usedForms: computed('model.customForms', function() {
-    let modelForms = this.get('model.customForms');
-    if (isEmpty(modelForms)) {
-      return [];
-    } else {
-      return Object.keys(modelForms);
-    }
-  }),
-
-  showAddButton: computed('formsForSelect', function() {
-    let formsForSelect = this.get('formsForSelect');
-    return !isEmpty(formsForSelect);
-  }),
-
   actions: {
     addForm() {
-      let model = this.get('model');
-      let formsForSelect = this.get('formsForSelect');
+      let model = get(this, 'model');
+      let formsForSelect = get(this, 'formsForSelect');
       this.sendAction('openModalAction', 'custom-form-add', Ember.Object.create({
         modelToAddTo: model,
         customForms: formsForSelect

app/components/date-filter.js

@@ -0,0 +1,19 @@
+import Ember from 'ember';
+import PikadayComponent from 'hospitalrun/mixins/pikaday-component';
+
+const {
+  Component
+} = Ember;
+
+export default Component.extend(PikadayComponent, {
+  classNames: ['input-group'],
+  dateSetAction: 'filter',
+
+  actions: {
+    clearFilter() {
+      let $input = this.$('input');
+      $input.val('');
+      this.sendAction('dateSetAction');
+    }
+  }
+});

app/components/date-input.js

@@ -1,8 +1,7 @@
 import Ember from 'ember';
 import HtmlInput from 'ember-rapid-forms/components/html-input';
-export default HtmlInput.extend({
-  _picker: null,
-
+import PikadayComponent from 'hospitalrun/mixins/pikaday-component';
+export default HtmlInput.extend(PikadayComponent, {
   _shouldSetDate(currentDate, picker) {
     return (picker && (Ember.isEmpty(currentDate)
       || Ember.isEmpty(picker.getDate())
@@ -48,34 +47,6 @@ export default HtmlInput.extend({
     }
   },
 
-  didInsertElement() {
-    let currentDate = this.get('currentDate');
-    let $input = this.$('input');
-    let picker = null;
-    let props = this.getProperties('format', 'yearRange', 'showTime');
-
-    props.onSelect = this.dateSet.bind(this);
-
-    if (!Ember.isEmpty(this.get('minDate'))) {
-      props.minDate = this.get('minDate');
-      if (props.minDate === 'now') {
-        props.minDate = new Date();
-      }
-    }
-    if (!Ember.isEmpty(this.get('maxDate'))) {
-      props.maxDate = this.get('maxDate');
-      if (props.maxDate === 'now') {
-        props.maxDate = new Date();
-      }
-    }
-    props.field = $input[0];
-    picker = new Pikaday(props);
-    Ember.run.next(this, function() {
-      picker.setDate(currentDate);
-    });
-    this.set('_picker', picker);
-  },
-
   didReceiveAttrs(/* attrs */) {
     this._super(...arguments);
     let dateProperty = this.get('mainComponent.originalPropery');
@@ -87,14 +58,6 @@ export default HtmlInput.extend({
     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);
-  },
-
-  willDestroyElement() {
-    let picker = this.get('_picker');
-    if (picker) {
-      picker.destroy();
-    }
-    this.set('_picker', null);
   }
 
 });

app/components/image-upload.js

@@ -1,6 +1,11 @@
+import Ember from 'ember';
 import InputComponent from 'ember-rapid-forms/components/em-input';
+
+const { isEmpty } = Ember;
+
 export default InputComponent.extend({
   fileInputEl: null,
+  isImage: true,
   resizeFile: true,
   selectedFile: null,
   type: 'file',
@@ -9,20 +14,26 @@ export default InputComponent.extend({
     let inputEl = this.get('fileInputEl');
     let resize = this.get('resizeFile');
 
-    if (resize) {
+    if (!isEmpty(inputEl.files[0]) && resize) {
       // Derived from https://github.com/josefrichter/resize/blob/master/public/preprocess.js
-      window.URL = window.URL || window.webkitURL;
       let blobURL = window.URL.createObjectURL(inputEl.files[0]); // and get it's URL
       // helper Image object
       let image = new Image();
       image.src = blobURL;
-      image.onload = function() {
+      image.addEventListener('load', function() {
         window.URL.revokeObjectURL(blobURL);
         // have to wait till it's loaded
         this.set('selectedFile', this._resizeImage(image)); // send it to canvas
-
-      }.bind(this);
+        this.set('isImage', true);
+      }.bind(this));
+      image.addEventListener('error', function() {
+        // if image load fails, file probably isn't an image, so don't resize
+        window.URL.revokeObjectURL(blobURL);
+        this.set('selectedFile', inputEl.files[0]);
+        this.set('isImage', false);
+      }.bind(this));
     } else {
+      this.set('isImage', false);
       this.set('selectedFile', inputEl.files[0]);
     }
   },

app/components/select-or-typeahead.js

@@ -32,7 +32,7 @@ export default Ember.Component.extend({
         return contentList;
       }
     }
-  }.property('list'),
+  }.property('list.value.[]'),
 
   usePricingTypeAhead: function() {
     return (this.get('typeAheadType') === 'pricing');
@@ -45,5 +45,5 @@ export default Ember.Component.extend({
     } else {
       return true;
     }
-  }.property('list')
+  }.property('list.userCanAdd')
 });