Merge pull request #2 from tmoore42six/master

added css files

dist/css/bootstrap-datepicker.css

@@ -118,6 +118,10 @@
   color: #999999;
   cursor: default;
 }
+.datepicker table tr td.highlighted {
+  background: #d9edf7;
+  border-radius: 0;
+}
 .datepicker table tr td.today,
 .datepicker table tr td.today:hover,
 .datepicker table tr td.today.disabled,

dist/css/bootstrap-datepicker.standalone.css

@@ -118,6 +118,10 @@
   color: #999999;
   cursor: default;
 }
+.datepicker table tr td.highlighted {
+  background: #d9edf7;
+  border-radius: 0;
+}
 .datepicker table tr td.today,
 .datepicker table tr td.today:hover,
 .datepicker table tr td.today.disabled,

dist/css/bootstrap-datepicker3.css

@@ -21,6 +21,7 @@
 .datepicker-dropdown {
   top: 0;
   left: 0;
+  padding: 4px;
 }
 .datepicker-dropdown:before {
   content: '';
@@ -113,6 +114,10 @@
   color: #999999;
   cursor: default;
 }
+.datepicker table tr td.highlighted {
+  background: #d9edf7;
+  border-radius: 0;
+}
 .datepicker table tr td.today,
 .datepicker table tr td.today:hover,
 .datepicker table tr td.today.disabled,
@@ -749,3 +754,9 @@ fieldset[disabled] .datepicker table tr td span.active.disabled:hover.active {
   margin-left: -5px;
   margin-right: -5px;
 }
+.ptsEventsPicker {
+  overflow-y: scroll;
+  max-height: 300px;
+  margin-right: -9px;
+  padding-right: 9px;
+}

dist/css/bootstrap-datepicker3.standalone.css

@@ -21,6 +21,7 @@
 .datepicker-dropdown {
   top: 0;
   left: 0;
+  padding: 4px;
 }
 .datepicker-dropdown:before {
   content: '';
@@ -113,6 +114,10 @@
   color: #999999;
   cursor: default;
 }
+.datepicker table tr td.highlighted {
+  background: #d9edf7;
+  border-radius: 0;
+}
 .datepicker table tr td.today,
 .datepicker table tr td.today:hover,
 .datepicker table tr td.today.disabled,
@@ -749,6 +754,12 @@ fieldset[disabled] .datepicker table tr td span.active.disabled:hover.active {
   margin-left: -5px;
   margin-right: -5px;
 }
+.ptsEventsPicker {
+  overflow-y: scroll;
+  max-height: 300px;
+  margin-right: -9px;
+  padding-right: 9px;
+}
 .datepicker.dropdown-menu {
   position: absolute;
   top: 100%;

dist/js/bootstrap-datepicker.js

@@ -79,7 +79,9 @@
     this.viewDate = this.o.defaultViewDate;
     this.focusDate = null;
 
-    this.monthsWithEvents = [];
+    this.monthsWithEvents = [1,2,3,4,5,6,7,8,9,10,11,12];
+    this.selectedNonMonthlyEvents = {};
+    this.nonMonthlyEvents = [];
 
     this.element = $(element);
     this.isInline = false;
@@ -576,6 +578,44 @@
       return this;
     },
 
+    setSelectedEvents: function(){
+      var args = $.isArray(arguments[0]) ? arguments[0] : arguments;
+      this.selectedNonMonthlyEvents = {}
+
+      for (index in args) {
+        var event = args[index]
+        this.selectedNonMonthlyEvents[event.EventId] = event.EventName;
+      }
+
+      return this;
+    },
+
+    clearSelectedEvents: function() {
+      this.selectedNonMonthlyEvents = {};
+      this.picker.find('.ptsEvent').removeClass('active')
+      return this;
+    },
+
+    setNonMonthlyEvents: function() {
+      this.nonMonthlyEvents = arguments[0];
+    },
+
+    renderEvents: function() {
+      var specialEvents = arguments[0];
+      this.nonMonthlyEvents = specialEvents
+
+      var html = '<td colspan="7"><div class="ptsEventsPicker">';
+      for (var _i = 0; _i < specialEvents.length; _i++){
+        var tempEvent = specialEvents[_i];
+        var selectedClass = this.selectedNonMonthlyEvents.hasOwnProperty(tempEvent.EventId) ? "active" : ""
+        html += '<div class="ptsEvent ' + selectedClass + '" data-eventId="'+ tempEvent.EventId +'">'+ tempEvent.EventName +'</div>';
+      }
+      html += '</div></td>'
+      this.picker.find('.datepicker-months .ptsEvents').html(html);
+
+      return this;
+    },
+
     setUTCDates: function(){
       var args = $.isArray(arguments[0]) ? arguments[0] : arguments;
       this.update.apply(this, $.map(args, this._utc_to_local));
@@ -1100,17 +1140,22 @@
 
                     var elem = $(this.element).closest('[ng-controller]')
                     var controller = angular.element(elem).controller()
+
+                    if (controller === undefined) {
+                      elem = elem.context;
+
+                      while (elem.parentElement !== undefined && controller == undefined) {
+                        elem = elem.parentElement;
+                        controller = angular.element(elem).controller()
+                      }
+
+                    }
+
                     var specialEvents = _.filter(controller.events, function(event) {
-                      return event.EventDesc != "Monthly";
+                      return event.Monthly;
                     })
 
-                    var html = '<td colspan="7">';
-                    for (var _i = 0; _i < specialEvents.length; _i++){
-                      var tempEvent = specialEvents[_i];
-                      html += '<div class="ptsEvent" data-eventId="'+ tempEvent.EventId +'">'+ tempEvent.EventName +'</div>';
-                    }
-                    html += '</td>'
-                    this.picker.find('.datepicker-months .ptsEvents').html(html);
+                    this.renderEvents(specialEvents)
 
                     break;
                 }
@@ -1137,17 +1182,12 @@
 
                 var elem = $(this.element).closest('[ng-controller]')
                 var controller = angular.element(elem).controller()
+
                 var specialEvents = _.filter(controller.events, function(event) {
-                  return event.EventDesc != "Monthly";
+                  return !event.Monthly;
                 })
 
-                var html = '<td colspan="7">';
-                for (var _i = 0; _i < specialEvents.length; _i++){
-                  var tempEvent = specialEvents[_i];
-                  html += '<div class="ptsEvent" data-eventId="'+ tempEvent.EventId +'">'+ tempEvent.EventName +'</div>';
-                }
-                html += '</td>'
-                this.picker.find('.datepicker-months .ptsEvents').html(html);
+                this.renderEvents(specialEvents);
 
                 break;
               case 'switchMonths':
@@ -1165,8 +1205,38 @@
             if (target.hasClass('ptsEvent')) {
               var elem = $(this.element).closest('[ng-controller]')
               var controller = angular.element(elem).controller()
-              controller.setEventById($(target).data('eventid'))
-              this.hide()
+
+              if (controller === undefined) {
+                elem = elem.context;
+
+                while (elem.parentElement !== undefined && controller == undefined) {
+                  elem = elem.parentElement;
+                  controller = angular.element(elem).controller()
+                }
+
+              }
+
+              var eventId = $(target).data('eventid')
+              var eventName = $(target).html()
+
+              if (!this.o.multievent) {
+                controller.setEventById($(target).data('eventid'))
+                this.selectedNonMonthlyEvents = {}
+                this.selectedNonMonthlyEvents[eventId] = eventName
+                target.parent().find('.ptsEvent').removeClass('active')
+                target.addClass('active')
+                this.hide()
+              }
+              else if (!this.selectedNonMonthlyEvents.hasOwnProperty(eventId)) {
+                target.addClass('active')
+                controller.setEventById($(target).data('eventid'))
+                this.selectedNonMonthlyEvents[eventId] = eventName
+              }
+              else {
+                target.removeClass('active')
+                delete this.selectedNonMonthlyEvents[eventId]
+                controller.removeEventById(eventId)
+              }
             }
             break;
           case 'span':

js/bootstrap-datepicker.js

@@ -620,7 +620,7 @@
       var specialEvents = arguments[0];
       this.nonMonthlyEvents = specialEvents
 
-      var html = '<td colspan="7"><div class="eventsPicker">';
+      var html = '<td colspan="7"><div class="ptsEventsPicker">';
       for (var _i = 0; _i < specialEvents.length; _i++){
         var tempEvent = specialEvents[_i];
         var selectedClass = this.selectedNonMonthlyEvents.hasOwnProperty(tempEvent.EventId) ? "active" : ""

less/datepicker3.less

@@ -232,3 +232,10 @@
 		margin-right: -5px;
 	}
 }
+
+.ptsEventsPicker {
+  overflow-y: scroll;
+  max-height: 300px;
+  margin-right: -9px;
+  padding-right: 9px;
+}