@annalib/anna-core 5.2.4 → 5.2.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/esm2020/lib/anna-generic-table-lib/components/anna-non-editable-generic-table/anna-non-editable-generic-table.component.mjs +43 -18
- package/fesm2015/annalib-anna-core.mjs +42 -17
- package/fesm2015/annalib-anna-core.mjs.map +1 -1
- package/fesm2020/annalib-anna-core.mjs +42 -17
- package/fesm2020/annalib-anna-core.mjs.map +1 -1
- package/package.json +1 -1
|
@@ -2690,30 +2690,55 @@ class AnnaNonEditableGenericTableComponent {
|
|
|
2690
2690
|
}
|
|
2691
2691
|
}
|
|
2692
2692
|
incrementMinute(arr) {
|
|
2693
|
-
|
|
2694
|
-
|
|
2695
|
-
|
|
2693
|
+
// increment to nearest proper interval(15,30,45)
|
|
2694
|
+
let min = parseInt(arr[1]);
|
|
2695
|
+
if (min <= 14) {
|
|
2696
|
+
arr[1] = "15";
|
|
2696
2697
|
}
|
|
2697
|
-
else if (
|
|
2698
|
-
arr[1] = "
|
|
2698
|
+
else if (min >= 15 && min <= 29) {
|
|
2699
|
+
arr[1] = "30";
|
|
2700
|
+
}
|
|
2701
|
+
else if (min >= 30 && min <= 44) {
|
|
2702
|
+
arr[1] = "45";
|
|
2699
2703
|
}
|
|
2700
|
-
else if (
|
|
2701
|
-
|
|
2702
|
-
arr[1] = res < 10 ? `0${res}` : res.toString();
|
|
2704
|
+
else if (min >= 45) {
|
|
2705
|
+
arr[1] = "00";
|
|
2703
2706
|
}
|
|
2707
|
+
// arr[1] = parseInt(arr[1]) + 15;
|
|
2708
|
+
// if (parseInt(arr[1]) == 60) {
|
|
2709
|
+
// arr[1] = "00";
|
|
2710
|
+
// } else if (parseInt(arr[1]) == 0) {
|
|
2711
|
+
// arr[1] = "00";
|
|
2712
|
+
// }
|
|
2713
|
+
// else if(parseInt(arr[1]) > 60){
|
|
2714
|
+
// let res = parseInt(arr[1]) - 60;
|
|
2715
|
+
// arr[1] = res < 10 ? `0${res}` : res.toString();
|
|
2716
|
+
// }
|
|
2704
2717
|
}
|
|
2705
2718
|
decrementMinute(arr) {
|
|
2706
|
-
|
|
2707
|
-
if (
|
|
2708
|
-
let res = 60 + parseInt(arr[1]);
|
|
2709
|
-
arr[1] = res;
|
|
2710
|
-
}
|
|
2711
|
-
else if (parseInt(arr[1]) == 0) {
|
|
2719
|
+
let min = parseInt(arr[1]);
|
|
2720
|
+
if (min > 0 && min <= 15) {
|
|
2712
2721
|
arr[1] = "00";
|
|
2713
2722
|
}
|
|
2714
|
-
else if (
|
|
2715
|
-
arr[1] =
|
|
2723
|
+
else if (min >= 16 && min <= 30) {
|
|
2724
|
+
arr[1] = "15";
|
|
2725
|
+
}
|
|
2726
|
+
else if (min >= 31 && min <= 45) {
|
|
2727
|
+
arr[1] = "30";
|
|
2728
|
+
}
|
|
2729
|
+
else if (min > 45 || min == 0) {
|
|
2730
|
+
arr[1] = "45";
|
|
2716
2731
|
}
|
|
2732
|
+
// arr[1] = parseInt(arr[1]) - 15;
|
|
2733
|
+
// if (parseInt(arr[1]) < 0) {
|
|
2734
|
+
// let res = 60 + parseInt(arr[1]);
|
|
2735
|
+
// arr[1] = res;
|
|
2736
|
+
// } else if (parseInt(arr[1]) == 0) {
|
|
2737
|
+
// arr[1] = "00";
|
|
2738
|
+
// }
|
|
2739
|
+
// else if(arr[1] < 10){
|
|
2740
|
+
// arr[1]= `0${arr[1]}`;
|
|
2741
|
+
// }
|
|
2717
2742
|
}
|
|
2718
2743
|
changeStartTimeHour(increment) {
|
|
2719
2744
|
if (increment) {
|
|
@@ -2771,7 +2796,7 @@ class AnnaNonEditableGenericTableComponent {
|
|
|
2771
2796
|
let fromTime24HrFormatArr = this.annaDateTimeFormatService.convertTotwentyFourHrsFormat(this.selectedFromTime[0] + ":" + this.selectedFromTime[1] + " " + this.selectedFromTime[2], true);
|
|
2772
2797
|
let fromTime24HrFormat = fromTime24HrFormatArr[0] + ":" + fromTime24HrFormatArr[1] + ":00";
|
|
2773
2798
|
let toTime24HrFormatArr = this.annaDateTimeFormatService.convertTotwentyFourHrsFormat(this.selectedToTime[0] + ":" + this.selectedToTime[1] + " " + this.selectedToTime[2], true);
|
|
2774
|
-
let toTime24HrFormat = toTime24HrFormatArr[0] + ":" + toTime24HrFormatArr[1] + ":
|
|
2799
|
+
let toTime24HrFormat = toTime24HrFormatArr[0] + ":" + toTime24HrFormatArr[1] + ":59";
|
|
2775
2800
|
currentSelectedTimeFilter = { fromTime: fromTime24HrFormat, toTime: toTime24HrFormat, includeMulti: this.multiTimeCheckboxChecked,
|
|
2776
2801
|
includeZero: this.zeroTimeCheckboxChecked, includeTimeRange: this.enterTimeCheckboxChecked };
|
|
2777
2802
|
let isFiltered = this.annaFilterService.reOrderAppliedFiltersState(this.clonedTableData, currentSelectedTimeFilter);
|