Fixed dropdown values on appointment search

app/appointments/search/route.js

@@ -1,6 +1,7 @@
 import AppointmentIndexRoute from 'hospitalrun/appointments/index/route';
+import DateFormat from 'hospitalrun/mixins/date-format';
 import Ember from 'ember';
-export default AppointmentIndexRoute.extend({
+export default AppointmentIndexRoute.extend(DateFormat, {
   editReturn: 'appointments.search',
   filterParams: ['appointmentType', 'provider', 'status'],
   modelName: 'appointment',
@@ -31,5 +32,24 @@ export default AppointmentIndexRoute.extend({
       options: searchOptions,
       mapReduce: 'appointments_by_date'
     };
+  },
+
+  model: function(params) {
+    return this._super(params).then(function(model) {
+      model.setProperties({
+        selectedAppointmentType: params.appointmentType,
+        selectedProvider: params.provider,
+        selectedStatus: params.status
+      });
+      var startDate = params.startDate;
+      startDate = new Date();
+      if (!Ember.isEmpty(params.startDate)) {
+        startDate.setTime(params.startDate);
+      }
+      model.set('selectedStartingDate', startDate);
+      model.set('display_selectedStartingDate', this._dateFormat(startDate));
+      return model;
+    }.bind(this));
   }
+
 });

app/mixins/appointment-statuses.js

@@ -5,5 +5,9 @@ export default Ember.Mixin.create({
     'Scheduled',
     'Canceled'
   ],
-  appointmentStatuses: Ember.computed.map('appointmentStatusList', SelectValues.selectValuesMap)
+  appointmentStatuses: Ember.computed.map('appointmentStatusList', SelectValues.selectValuesMap),
+
+  appointmentStatusesWithEmpty: function() {
+    return SelectValues.selectValues(this.get('appointmentStatusList'), true);
+  }.property()
 });

app/mixins/visit-types.js

@@ -10,7 +10,7 @@ export default Ember.Mixin.create({
     'Pharmacy'
   ],
 
-  visitTypes: function() {
+  _getVisitTypes: function(includeEmpty) {
     var defaultVisitTypes = this.get('defaultVisitTypes'),
       visitTypesList = this.get('visitTypesList'),
       visitList;
@@ -19,7 +19,15 @@ export default Ember.Mixin.create({
     } else {
       visitList = visitTypesList.get('value');
     }
-    visitList = SelectValues.selectValues(visitList);
+    visitList = SelectValues.selectValues(visitList, includeEmpty);
     return visitList;
+  },
+
+  visitTypes: function() {
+    return this._getVisitTypes();
+  }.property('visitTypesList', 'defaultVisitTypes'),
+
+  visitTypesWithEmpty: function() {
+    return this._getVisitTypes(true);
   }.property('visitTypesList', 'defaultVisitTypes')
 });

app/utils/select-values.js

@@ -18,13 +18,23 @@ export default {
     });
   },
 
-  // Map an array of strings to objects with id and value set to the string values
-  // so that the array can be used for em-select
   selectValuesMap: selectValuesMap,
 
-  selectValues: function(array) {
+  /** Map an array of strings to objects with id and value set to the string values
+   * so that the array can be used for em-select
+   * @param {Array} array to map.
+   * @param {boolean} includeEmpty if there should be an empty item added to the select list
+   */
+  selectValues: function(array, includeEmpty) {
     if (Ember.isArray(array)) {
-      return array.map(selectValuesMap);
+      var arrayToMap = new Array(array);
+      if (includeEmpty) {
+        arrayToMap = [''];
+        arrayToMap.addObjects(array);
+      } else {
+        arrayToMap = array;
+      }
+      return arrayToMap.map(selectValuesMap);
     }
   }
 };