Check for date validity in preview (linkedin#196)

* prevent invalid date selection * added on eventalways
FlexShopper · Aug 6, 2018 · 53a72b0 · 53a72b0
1 parent fe57a49
commit 53a72b0
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/src/oncall/ui/static/js/incalendar.js b/src/oncall/ui/static/js/incalendar.js
@@ -46,6 +46,9 @@
           onEventGet: function (data, $calendar) {
             // callback for when fetch events ajax call is completed. list of events from server is passed in as arg
           },
+          onEventAlways: function(){
+            // callback for when fetch events ajax call is completed run regardless of success or failure
+          },
           onAddEvents: function (events) {
             // callback for when events are added to calendar
           },
@@ -678,6 +681,7 @@
         self.options.onEventGet(data, self.$calendar);
       }).always(function(){
         self.$el.removeClass('loading-events');
+        self.options.onEventAlways();
       });
     },
     addCalendarEvents: function (eventsArray) {

diff --git a/src/oncall/ui/static/js/oncall.js b/src/oncall/ui/static/js/oncall.js
@@ -2237,6 +2237,8 @@ var oncall = {
 
           if ( isNaN(Date.parse(date)) ) {
             oncall.alerts.createAlert('Invalid date.', 'danger', $modal.find('.modal-body'));
+          } else if (date <= new Date()) {
+            oncall.alerts.createAlert('Invalid date. Can only preview events in the future.', 'danger', $modal.find('.modal-body'));
           } else {
             self.populatePreview(date.valueOf(), $(this), $modal);
           }
@@ -2290,6 +2292,8 @@ var oncall = {
           readOnly: true,
           onEventGet: function(events, $cal){
             $cal.find('[data-schedule-id="' + scheduleId + '"]').attr('data-highlighted', true);
+          },
+          onEventAlways: function(){
             $cta.removeClass('loading disabled').prop('disabled', false);
           }
         });