Added Admission visit type

Admission type allows entry on admission and discharge dates and times. Resolves #38
HospitalRun · May 6, 2015 · 4716eee · 4716eee
1 parent 7fdc9d3
commit 4716eee
Show file tree

Hide file tree

Showing 3 changed files with 54 additions and 2 deletions.
diff --git a/app/models/visit.js b/app/models/visit.js
@@ -59,6 +59,29 @@ export default AbstractModel.extend({
     }.property('visitDate', 'visitType'),
 
     validations: {
+        endDate: {
+            acceptance: {
+                accept: true,
+                    if: function(object) {
+                        if (!object.get('isDirty')) {
+                            return false;
+                        }
+                        var startDate = object.get('startDate'),
+                            endDate = object.get('endDate');
+                        if (Ember.isEmpty(endDate) || Ember.isEmpty(startDate)) {
+                            //Can't validate if empty
+                            return false;
+                        } else {
+                            if (endDate.getTime() <=  startDate.getTime()) {
+                                return true;
+                            }
+                        }
+                        return false;
+                    }, 
+                message: 'Please select an end date later than the start date'
+            }
+        },
+
         startDate: {
             presence: true
         },

diff --git a/app/visits/edit/controller.js b/app/visits/edit/controller.js
@@ -57,6 +57,34 @@ export default AbstractEditController.extend(ChargeActions, PatientSubmodule, Us
         return this.currentUserCan('delete_vitals');
     }.property(),
 
+    dateFormat: function() {
+        if (this.get('isAdmissionVisit')) {
+            return 'l h:mm A';
+        } else {
+            return 'l';
+        }
+    }.property('isAdmissionVisit'),
+
+    endDateLabel: function() {
+        if (this.get('isAdmissionVisit')) {
+            return 'Discharge Date';
+        } else {
+            return 'End Date';
+        }
+    }.property('isAdmissionVisit'),
+
+    isAdmissionVisit: function() {
+        var visitType = this.get('visitType');
+        return (visitType === 'Admission');
+    }.property('visitType'),
+
+    startDateLabel: function() {
+        if (this.get('isAdmissionVisit')) {
+            return 'Admission Date';
+        } else {
+            return 'Start Date';
+        }
+    }.property('isAdmissionVisit'),
 
     cancelAction: 'returnToPatient',
     chargePricingCategory: 'Ward',
@@ -68,6 +96,7 @@ export default AbstractEditController.extend(ChargeActions, PatientSubmodule, Us
     pricingTypes: Ember.computed.alias('controllers.visits.wardPricingTypes'),
     physicianList: Ember.computed.alias('controllers.visits.physicianList'),
     locationList: Ember.computed.alias('controllers.visits.locationList'),
+    visitTypesList: Ember.computed.alias('controllers.visits.visitTypeList'),
     lookupListsToUpdate: [{
         name: 'clinicList',
         property: 'clinic',

diff --git a/app/visits/edit/template.hbs b/app/visits/edit/template.hbs
@@ -17,8 +17,8 @@
                             <label>Patient</label>
                             <p class="form-control-static">{{patient.displayName}}</p>
                         </div>       
-                        {{date-picker property="startDate" label="Start Date" class="col-sm-3 required"}}
-                        {{date-picker property="endDate" label="End Date" class="col-sm-3"}}
+                        {{date-picker property="startDate" label=startDateLabel format=dateFormat showTime=isAdmissionVisit class="col-sm-3 required"}}
+                        {{date-picker property="endDate" label=endDateLabel format=dateFormat showTime=isAdmissionVisit class="col-sm-3"}}
                     </div>
                     <div class="row">
                         {{em-select class="col-sm-3 required" label="Visit Type"