@websy/websy-designs 1.2.7 → 1.2.9

package/dist/websy-designs.debug.js

@@ -700,10 +700,10 @@ class WebsyDatePicker {
     if (this.selectedRange === 0) {
       return
     }
-    if (this.customRangeSelected === true) {   
-      console.log('if date selection', this.currentselection)
-      console.log('if month selection', this.currentselection.map(d => new Date(d)))   
+    if (this.customRangeSelected === true) {         
       let diff
+      let diffStart
+      let diffEnd
       if (this.options.mode === 'date') {
         diff = Math.floor((this.selectedRangeDates[this.selectedRangeDates.length - 1].getTime() - this.selectedRangeDates[0].getTime()) / this.oneDay)
         // if (this.selectedRangeDates[0].getMonth() !== this.selectedRangeDates[this.selectedRangeDates.length - 1].getMonth()) {
@@ -722,8 +722,16 @@ class WebsyDatePicker {
         console.log('year diff', yearDiff)
         console.log('diff', diff)
       }
-      else if (this.options.mode === 'hour') {
-        diff = this.selectedRangeDates[this.selectedRangeDates.length - 1] - this.selectedRangeDates[0]
+      else if (this.options.mode === 'hour') {        
+        this.options.hours.forEach(h => {
+          if (h.text === this.selectedRangeDates[0]) {
+            diffStart = h.num            
+          }
+          if (h.text === this.selectedRangeDates[this.selectedRangeDates.length - 1]) {
+            diffEnd = h.num            
+          }
+        })
+        diff = diffEnd - diffStart
       }  
       for (let i = 0; i < diff + 1; i++) {
         let d
@@ -746,9 +754,11 @@ class WebsyDatePicker {
           rangeEnd = this.selectedRangeDates[this.selectedRangeDates.length - 1].getTime()
         }
         else if (this.options.mode === 'hour') {
-          d = this.selectedRangeDates[0] + i
-          rangeStart = this.selectedRangeDates[0]
-          rangeEnd = this.selectedRangeDates[this.selectedRangeDates.length - 1]
+          d = this.options.hours[i]
+          rangeStart = diffStart
+          rangeEnd = diffEnd
+          // rangeStart = this.selectedRangeDates[0]
+          // rangeEnd = this.selectedRangeDates[this.selectedRangeDates.length - 1]
         }
         let dateEl 
         if (this.options.mode === 'date') {
@@ -757,10 +767,7 @@ class WebsyDatePicker {
         else if (this.options.mode === 'year') {
           dateEl = document.getElementById(`${this.elementId}_${d}_year`)
         }
-        else if (this.options.mode === 'monthyear') {
-          console.log('d', d)
-          console.log(this.selectedRangeDates)
-          console.log(rangeStart, rangeEnd)
+        else if (this.options.mode === 'monthyear') {          
           dateEl = document.getElementById(`${this.elementId}_${d}_monthyear`)
         }
         else if (this.options.mode === 'hour') {
@@ -881,12 +888,13 @@ class WebsyDatePicker {
         }
         if (this.monthYearMonths.indexOf(`${d.getMonth()}-${d.getFullYear()}`) === -1) {
           this.monthYearMonths.push(`${d.getMonth()}-${d.getFullYear()}`)
+          let firstOfMonth = new Date(new Date(d).setDate(1))
           this.monthYears[d.getFullYear()].push({
-            date: new Date(d.setDate(1)),
+            date: firstOfMonth,
             month: this.options.monthMap[d.getMonth()],
             monthNum: d.getMonth(),
             year: d.getFullYear(),
-            id: d.setDate(1)
+            id: firstOfMonth.getTime()
           })
         }
         if (disabled.indexOf(d.getTime()) === -1) {

package/dist/websy-designs.js

@@ -790,11 +790,9 @@ var WebsyDatePicker = /*#__PURE__*/function () {
       }
 
       if (this.customRangeSelected === true) {
-        console.log('if date selection', this.currentselection);
-        console.log('if month selection', this.currentselection.map(function (d) {
-          return new Date(d);
-        }));
         var diff;
+        var diffStart;
+        var diffEnd;
 
         if (this.options.mode === 'date') {
           diff = Math.floor((this.selectedRangeDates[this.selectedRangeDates.length - 1].getTime() - this.selectedRangeDates[0].getTime()) / this.oneDay); // if (this.selectedRangeDates[0].getMonth() !== this.selectedRangeDates[this.selectedRangeDates.length - 1].getMonth()) {
@@ -811,7 +809,16 @@ var WebsyDatePicker = /*#__PURE__*/function () {
           console.log('year diff', yearDiff);
           console.log('diff', diff);
         } else if (this.options.mode === 'hour') {
-          diff = this.selectedRangeDates[this.selectedRangeDates.length - 1] - this.selectedRangeDates[0];
+          this.options.hours.forEach(function (h) {
+            if (h.text === _this5.selectedRangeDates[0]) {
+              diffStart = h.num;
+            }
+
+            if (h.text === _this5.selectedRangeDates[_this5.selectedRangeDates.length - 1]) {
+              diffEnd = h.num;
+            }
+          });
+          diff = diffEnd - diffStart;
         }
 
         for (var _i = 0; _i < diff + 1; _i++) {
@@ -833,9 +840,10 @@ var WebsyDatePicker = /*#__PURE__*/function () {
             rangeStart = this.selectedRangeDates[0].getTime();
             rangeEnd = this.selectedRangeDates[this.selectedRangeDates.length - 1].getTime();
           } else if (this.options.mode === 'hour') {
-            d = this.selectedRangeDates[0] + _i;
-            rangeStart = this.selectedRangeDates[0];
-            rangeEnd = this.selectedRangeDates[this.selectedRangeDates.length - 1];
+            d = this.options.hours[_i];
+            rangeStart = diffStart;
+            rangeEnd = diffEnd; // rangeStart = this.selectedRangeDates[0]
+            // rangeEnd = this.selectedRangeDates[this.selectedRangeDates.length - 1]
           }
 
           var dateEl = void 0;
@@ -845,9 +853,6 @@ var WebsyDatePicker = /*#__PURE__*/function () {
           } else if (this.options.mode === 'year') {
             dateEl = document.getElementById("".concat(this.elementId, "_").concat(d, "_year"));
           } else if (this.options.mode === 'monthyear') {
-            console.log('d', d);
-            console.log(this.selectedRangeDates);
-            console.log(rangeStart, rangeEnd);
             dateEl = document.getElementById("".concat(this.elementId, "_").concat(d, "_monthyear"));
           } else if (this.options.mode === 'hour') {
             dateEl = document.getElementById("".concat(this.elementId, "_").concat(d, "_hour"));
@@ -988,12 +993,13 @@ var WebsyDatePicker = /*#__PURE__*/function () {
 
           if (this.monthYearMonths.indexOf("".concat(d.getMonth(), "-").concat(d.getFullYear())) === -1) {
             this.monthYearMonths.push("".concat(d.getMonth(), "-").concat(d.getFullYear()));
+            var firstOfMonth = new Date(new Date(d).setDate(1));
             this.monthYears[d.getFullYear()].push({
-              date: new Date(d.setDate(1)),
+              date: firstOfMonth,
               month: this.options.monthMap[d.getMonth()],
               monthNum: d.getMonth(),
               year: d.getFullYear(),
-              id: d.setDate(1)
+              id: firstOfMonth.getTime()
             });
           }