@annalib/anna-core 5.2.3 → 5.2.5

package/fesm2020/annalib-anna-core.mjs

@@ -1688,7 +1688,7 @@ class AnnaSortComponent {
             {
                 sortType: 'DEFAULT',
                 isOptionActive: false,
-                text: 'DEFAULT',
+                text: 'Default',
             },
         ];
     }
@@ -2690,30 +2690,55 @@ class AnnaNonEditableGenericTableComponent {
         }
     }
     incrementMinute(arr) {
-        arr[1] = parseInt(arr[1]) + 15;
-        if (parseInt(arr[1]) == 60) {
-            arr[1] = "00";
+        // increment to nearest proper interval(15,30,45)
+        let min = parseInt(arr[1]);
+        if (min == 0 && min <= 14) {
+            arr[1] = "15";
         }
-        else if (parseInt(arr[1]) == 0) {
-            arr[1] = "00";
+        else if (min >= 15 && min <= 29) {
+            arr[1] = "30";
+        }
+        else if (min >= 30 && min <= 44) {
+            arr[1] = "45";
         }
-        else if (parseInt(arr[1]) > 60) {
-            let res = parseInt(arr[1]) - 60;
-            arr[1] = res < 10 ? `0${res}` : res.toString();
+        else if (min >= 45) {
+            arr[1] = "00";
         }
+        // arr[1] = parseInt(arr[1]) + 15;
+        // if (parseInt(arr[1]) == 60) {
+        //     arr[1] = "00";
+        // } else if (parseInt(arr[1]) == 0) {
+        //     arr[1] = "00";
+        // }
+        // else if(parseInt(arr[1]) > 60){
+        //     let res = parseInt(arr[1]) - 60;
+        //     arr[1] = res < 10 ? `0${res}` : res.toString();    
+        // }
     }
     decrementMinute(arr) {
-        arr[1] = parseInt(arr[1]) - 15;
-        if (parseInt(arr[1]) < 0) {
-            let res = 60 + parseInt(arr[1]);
-            arr[1] = res;
-        }
-        else if (parseInt(arr[1]) == 0) {
+        let min = parseInt(arr[1]);
+        if (min == 0 && min <= 15) {
             arr[1] = "00";
         }
-        else if (arr[1] < 10) {
-            arr[1] = `0${arr[1]}`;
+        else if (min >= 16 && min <= 30) {
+            arr[1] = "15";
+        }
+        else if (min >= 31 && min <= 45) {
+            arr[1] = "30";
+        }
+        else if (min > 45) {
+            arr[1] = "45";
         }
+        // arr[1] = parseInt(arr[1]) - 15;
+        // if (parseInt(arr[1]) < 0) {
+        //     let res = 60 + parseInt(arr[1]);
+        //     arr[1] = res;
+        // } else if (parseInt(arr[1]) == 0) {
+        //     arr[1] = "00";
+        // }
+        // else if(arr[1] < 10){
+        //     arr[1]= `0${arr[1]}`;
+        // }
     }
     changeStartTimeHour(increment) {
         if (increment) {
@@ -2771,7 +2796,7 @@ class AnnaNonEditableGenericTableComponent {
             let fromTime24HrFormatArr = this.annaDateTimeFormatService.convertTotwentyFourHrsFormat(this.selectedFromTime[0] + ":" + this.selectedFromTime[1] + " " + this.selectedFromTime[2], true);
             let fromTime24HrFormat = fromTime24HrFormatArr[0] + ":" + fromTime24HrFormatArr[1] + ":00";
             let toTime24HrFormatArr = this.annaDateTimeFormatService.convertTotwentyFourHrsFormat(this.selectedToTime[0] + ":" + this.selectedToTime[1] + " " + this.selectedToTime[2], true);
-            let toTime24HrFormat = toTime24HrFormatArr[0] + ":" + toTime24HrFormatArr[1] + ":00";
+            let toTime24HrFormat = toTime24HrFormatArr[0] + ":" + toTime24HrFormatArr[1] + ":59";
             currentSelectedTimeFilter = { fromTime: fromTime24HrFormat, toTime: toTime24HrFormat, includeMulti: this.multiTimeCheckboxChecked,
                 includeZero: this.zeroTimeCheckboxChecked, includeTimeRange: this.enterTimeCheckboxChecked };
             let isFiltered = this.annaFilterService.reOrderAppliedFiltersState(this.clonedTableData, currentSelectedTimeFilter);
@@ -3062,7 +3087,8 @@ class AnnaNonEditableGenericTableComponent {
             includeTimeRange: false
         };
         if (this.gtGeneralConfig.component === "SPOTDETAILS" ||
-            this.gtGeneralConfig.component === "EXCLUDEINVENTORYPOPUP") {
+            this.gtGeneralConfig.component === "EXCLUDEINVENTORYPOPUP" ||
+            this.gtGeneralConfig.component === "ACTIVITYLOG") {
             let includeMulti = this.clonedTableData.findIndex((obj) => obj[key] == "<multi>") !=
                 -1;
             let includeZero = this.clonedTableData.findIndex((obj) => obj[key] == "0") != -1;