@annalib/anna-core 5.2.3 → 5.2.5
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 +45 -19
- package/esm2020/lib/anna-generic-table-lib/components/anna-sort/anna-sort.component.mjs +2 -2
- package/fesm2015/annalib-anna-core.mjs +45 -19
- package/fesm2015/annalib-anna-core.mjs.map +1 -1
- package/fesm2020/annalib-anna-core.mjs +45 -19
- package/fesm2020/annalib-anna-core.mjs.map +1 -1
- package/package.json +1 -1
|
@@ -23,7 +23,7 @@ export class AnnaSortComponent {
|
|
|
23
23
|
{
|
|
24
24
|
sortType: 'DEFAULT',
|
|
25
25
|
isOptionActive: false,
|
|
26
|
-
text: '
|
|
26
|
+
text: 'Default',
|
|
27
27
|
},
|
|
28
28
|
];
|
|
29
29
|
}
|
|
@@ -64,4 +64,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.2.7", ngImpor
|
|
|
64
64
|
}], sortOptionClicked: [{
|
|
65
65
|
type: Output
|
|
66
66
|
}] } });
|
|
67
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
67
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYW5uYS1zb3J0LmNvbXBvbmVudC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uLy4uL3Byb2plY3RzL2FubmEtY29yZS9zcmMvbGliL2FubmEtZ2VuZXJpYy10YWJsZS1saWIvY29tcG9uZW50cy9hbm5hLXNvcnQvYW5uYS1zb3J0LmNvbXBvbmVudC50cyIsIi4uLy4uLy4uLy4uLy4uLy4uLy4uL3Byb2plY3RzL2FubmEtY29yZS9zcmMvbGliL2FubmEtZ2VuZXJpYy10YWJsZS1saWIvY29tcG9uZW50cy9hbm5hLXNvcnQvYW5uYS1zb3J0LmNvbXBvbmVudC5odG1sIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLDRCQUE0QjtBQUM1QixPQUFPLEVBQUUsdUJBQXVCLEVBQUUsU0FBUyxFQUFFLFlBQVksRUFBRSxLQUFLLEVBQWEsTUFBTSxFQUFpQixNQUFNLGVBQWUsQ0FBQztBQUUxSCxPQUFPLEVBQUUsZUFBZSxFQUFFLE1BQU0sMERBQTBELENBQUM7Ozs7QUFFM0Ysb0NBQW9DO0FBT3BDLE1BQU0sT0FBTyxpQkFBaUI7SUF1QjVCLFlBQW9CLGVBQWdDO1FBQWhDLG9CQUFlLEdBQWYsZUFBZSxDQUFpQjtRQXBCMUMsc0JBQWlCLEdBQUcsSUFBSSxZQUFZLEVBQVksQ0FBQztRQUUzRCxnQkFBVyxHQUFpQjtZQUMxQjtnQkFDRSxRQUFRLEVBQUUsS0FBSztnQkFDZixjQUFjLEVBQUUsS0FBSztnQkFDckIsSUFBSSxFQUFFLFFBQVE7YUFDZjtZQUNEO2dCQUNFLFFBQVEsRUFBRSxNQUFNO2dCQUNoQixjQUFjLEVBQUUsS0FBSztnQkFDckIsSUFBSSxFQUFFLFFBQVE7YUFDZjtZQUNEO2dCQUNFLFFBQVEsRUFBRSxTQUFTO2dCQUNuQixjQUFjLEVBQUUsS0FBSztnQkFDckIsSUFBSSxFQUFFLFNBQVM7YUFDaEI7U0FDRixDQUFDO0lBRXFELENBQUM7SUFFeEQsV0FBVyxDQUFDLE9BQXNCO1FBQ2hDLE9BQU8sQ0FBQyxHQUFHLENBQUMsNEJBQTRCLENBQUMsQ0FBQztRQUMxQyxPQUFPLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQyxhQUFhLENBQUMsQ0FBQztRQUNoQyxJQUFHLE9BQU8sQ0FBQyxlQUFlLENBQUMsSUFBSSxPQUFPLENBQUMsZUFBZSxDQUFDLENBQUMsWUFBWSxFQUFDO1lBQ25FLE9BQU8sQ0FBQyxHQUFHLENBQUMseUJBQXlCLENBQUMsQ0FBQztZQUN2QyxJQUFJLFFBQVEsR0FBRyxJQUFJLENBQUMsZUFBZSxDQUFDLGVBQWUsQ0FBQyxHQUFHLENBQ3JELElBQUksQ0FBQyxhQUFhLENBQ25CLENBQUM7WUFDRixJQUFJLENBQUMsV0FBVyxDQUFDLFFBQVEsQ0FBQyxDQUFDO1NBQzVCO0lBRUgsQ0FBQztJQUVELGlCQUFpQixDQUFDLEtBQWEsRUFBRSxRQUFrQjtRQUNqRCxJQUFJLENBQUMsV0FBVyxDQUFDLE9BQU8sQ0FBQyxDQUFDLElBQUksRUFBRSxFQUFFLENBQUMsQ0FBQyxJQUFJLENBQUMsY0FBYyxHQUFHLEtBQUssQ0FBQyxDQUFDLENBQUM7UUFDbEUsSUFBSSxDQUFDLFdBQVcsQ0FBQyxLQUFLLENBQUMsQ0FBQyxjQUFjLEdBQUcsSUFBSSxDQUFDO1FBQzlDLElBQUksQ0FBQyxpQkFBaUIsQ0FBQyxJQUFJLENBQUMsUUFBUSxDQUFDLENBQUM7SUFDeEMsQ0FBQztJQUVELFFBQVE7UUFDTixPQUFPLENBQUMsR0FBRyxDQUFDLHlCQUF5QixDQUFDLENBQUM7UUFDdkMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsZUFBZSxDQUFDLGVBQWUsQ0FBQyxDQUFDO1FBQ2xELElBQUksQ0FBQyxlQUFlLENBQUMscUJBQXFCLENBQUMsU0FBUyxDQUFDLENBQUMsSUFBWSxFQUFFLEVBQUU7WUFDcEUsSUFBSSxDQUFDLFdBQVcsQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUN6QixDQUFDLENBQUMsQ0FBQztJQUNMLENBQUM7SUFFRCxXQUFXLENBQUMsTUFBYztRQUN4QixJQUFJLENBQUMsV0FBVyxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsRUFBRSxDQUFDLElBQUksQ0FBQyxjQUFjLEdBQUcsS0FBSyxDQUFDLENBQUM7UUFDOUQsSUFBSSxLQUFLLEdBQUcsSUFBSSxDQUFDLFdBQVcsQ0FBQyxTQUFTLENBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQyxJQUFJLENBQUMsUUFBUSxJQUFJLE1BQU0sQ0FBQyxDQUFDO1FBQ3hFLElBQUksQ0FBQyxXQUFXLENBQUMsS0FBSyxDQUFDLENBQUMsY0FBYyxHQUFHLElBQUksQ0FBQztJQUNoRCxDQUFDOzs4R0F4RFUsaUJBQWlCO2tHQUFqQixpQkFBaUIsZ0xDWjlCLCtUQVNJOzJGREdTLGlCQUFpQjtrQkFON0IsU0FBUzsrQkFDRSxvQkFBb0IsbUJBR2IsdUJBQXVCLENBQUMsTUFBTTtzR0FJdEMsYUFBYTtzQkFBckIsS0FBSztnQkFDSSxpQkFBaUI7c0JBQTFCLE1BQU0iLCJzb3VyY2VzQ29udGVudCI6WyIvLyBBbmd1bGFyIGltcG9ydCBzdGF0ZW1lbnRzXHJcbmltcG9ydCB7IENoYW5nZURldGVjdGlvblN0cmF0ZWd5LCBDb21wb25lbnQsIEV2ZW50RW1pdHRlciwgSW5wdXQsIE9uQ2hhbmdlcywgT3V0cHV0LCBTaW1wbGVDaGFuZ2VzIH0gZnJvbSAnQGFuZ3VsYXIvY29yZSc7XHJcbmltcG9ydCB7IFNvcnRPcHRpb24sIFNvcnRUeXBlIH0gZnJvbSAnLi4vLi4vLi4vYW5uYS1jb3JlLXNoYXJlZC1saWIvbW9kZWxzL2FubmEtc29ydC5tb2RlbCc7XHJcbmltcG9ydCB7IEFubmFTb3J0U2VydmljZSB9IGZyb20gJy4uLy4uLy4uL2FubmEtY29yZS1zaGFyZWQtbGliL3NlcnZpY2VzL2FubmEtc29ydC5zZXJ2aWNlJztcclxuXHJcbi8vQWRkIG9uQ2hhbmdlIHB1c2ggY2hhbmdlIGRldGVjdGlvblxyXG5AQ29tcG9uZW50KHtcclxuICBzZWxlY3RvcjogJ2FubmEtY29yZS1zb3J0LWxpYicsXHJcbiAgdGVtcGxhdGVVcmw6ICcuL2FubmEtc29ydC5jb21wb25lbnQuaHRtbCcsXHJcbiAgc3R5bGVVcmxzOiBbJy4vYW5uYS1zb3J0LmNvbXBvbmVudC5zY3NzJ10sXHJcbiAgY2hhbmdlRGV0ZWN0aW9uOiBDaGFuZ2VEZXRlY3Rpb25TdHJhdGVneS5PblB1c2hcclxufSlcclxuZXhwb3J0IGNsYXNzIEFubmFTb3J0Q29tcG9uZW50IGltcGxlbWVudHMgT25DaGFuZ2Vze1xyXG4gIFxyXG4gIEBJbnB1dCgpIHNvcnRPYmplY3RLZXk6IHN0cmluZztcclxuICBAT3V0cHV0KCkgc29ydE9wdGlvbkNsaWNrZWQgPSBuZXcgRXZlbnRFbWl0dGVyPFNvcnRUeXBlPigpO1xyXG5cclxuICBzb3J0T3B0aW9uczogU29ydE9wdGlvbltdID0gW1xyXG4gICAge1xyXG4gICAgICBzb3J0VHlwZTogJ0FTQycsXHJcbiAgICAgIGlzT3B0aW9uQWN0aXZlOiBmYWxzZSxcclxuICAgICAgdGV4dDogJ0EgdG8gWicsXHJcbiAgICB9LFxyXG4gICAge1xyXG4gICAgICBzb3J0VHlwZTogJ0RFU0MnLFxyXG4gICAgICBpc09wdGlvbkFjdGl2ZTogZmFsc2UsXHJcbiAgICAgIHRleHQ6ICdaIHRvIEEnLFxyXG4gICAgfSxcclxuICAgIHtcclxuICAgICAgc29ydFR5cGU6ICdERUZBVUxUJyxcclxuICAgICAgaXNPcHRpb25BY3RpdmU6IGZhbHNlLFxyXG4gICAgICB0ZXh0OiAnRGVmYXVsdCcsXHJcbiAgICB9LFxyXG4gIF07XHJcblxyXG4gIGNvbnN0cnVjdG9yKHByaXZhdGUgYW5uYVNvcnRTZXJ2aWNlOiBBbm5hU29ydFNlcnZpY2UpIHt9XHJcbiAgXHJcbiAgbmdPbkNoYW5nZXMoY2hhbmdlczogU2ltcGxlQ2hhbmdlcyk6IHZvaWQge1xyXG4gICAgY29uc29sZS5sb2coXCJzb3J0IGNvbXBvbmVudCBuZ09uQ2hhbmdlc1wiKTtcclxuICAgIGNvbnNvbGUubG9nKHRoaXMuc29ydE9iamVjdEtleSk7XHJcbiAgICBpZihjaGFuZ2VzW1wic29ydE9iamVjdEtleVwiXSAmJiBjaGFuZ2VzW1wic29ydE9iamVjdEtleVwiXS5jdXJyZW50VmFsdWUpe1xyXG4gICAgICBjb25zb2xlLmxvZyhcImluc2lkZSBzb3J0IGFjdGl2ZSBmdW5jXCIpO1xyXG4gICAgICBsZXQgc29ydFR5cGUgPSB0aGlzLmFubmFTb3J0U2VydmljZS5jb2x1bW5Tb3J0U3RhdGUuZ2V0KFxyXG4gICAgICAgIHRoaXMuc29ydE9iamVjdEtleVxyXG4gICAgICApO1xyXG4gICAgICB0aGlzLnNldFNvcnRUeXBlKHNvcnRUeXBlKTtcclxuICAgIH1cclxuXHJcbiAgfVxyXG5cclxuICBzb3J0T3B0aW9uQ2hhbmdlZChpbmRleDogbnVtYmVyLCBzb3J0VHlwZTogU29ydFR5cGUpIHtcclxuICAgIHRoaXMuc29ydE9wdGlvbnMuZm9yRWFjaCgoaXRlbSkgPT4gKGl0ZW0uaXNPcHRpb25BY3RpdmUgPSBmYWxzZSkpO1xyXG4gICAgdGhpcy5zb3J0T3B0aW9uc1tpbmRleF0uaXNPcHRpb25BY3RpdmUgPSB0cnVlO1xyXG4gICAgdGhpcy5zb3J0T3B0aW9uQ2xpY2tlZC5lbWl0KHNvcnRUeXBlKTtcclxuICB9XHJcblxyXG4gIG5nT25Jbml0KCk6IHZvaWQge1xyXG4gICAgY29uc29sZS5sb2coXCJzb3J0IGNvbXBvbmVudCBuZ09uSW5pdFwiKTtcclxuICAgIGNvbnNvbGUubG9nKHRoaXMuYW5uYVNvcnRTZXJ2aWNlLmNvbHVtblNvcnRTdGF0ZSk7XHJcbiAgICB0aGlzLmFubmFTb3J0U2VydmljZS51cGRhdGVTb3J0VHlwZVN1YmplY3Quc3Vic2NyaWJlKChpdGVtOiBzdHJpbmcpID0+IHtcclxuICAgICAgdGhpcy5zZXRTb3J0VHlwZShpdGVtKTtcclxuICAgIH0pO1xyXG4gIH1cclxuXHJcbiAgc2V0U29ydFR5cGUob3B0aW9uOiBzdHJpbmcpe1xyXG4gICAgdGhpcy5zb3J0T3B0aW9ucy5mb3JFYWNoKGl0ZW0gPT4gaXRlbS5pc09wdGlvbkFjdGl2ZSA9IGZhbHNlKTtcclxuICAgIGxldCBpbmRleCA9IHRoaXMuc29ydE9wdGlvbnMuZmluZEluZGV4KGl0ZW0gPT4gaXRlbS5zb3J0VHlwZSA9PSBvcHRpb24pO1xyXG4gICAgdGhpcy5zb3J0T3B0aW9uc1tpbmRleF0uaXNPcHRpb25BY3RpdmUgPSB0cnVlO1xyXG4gIH1cclxufVxyXG4iLCI8cCBjbGFzcz1cInNvcnQtY29udGFpbmVyXCI+XHJcbiAgICA8YnV0dG9uXHJcbiAgICAgICAgY2xhc3M9XCJzb3J0LWJ0blwiXHJcbiAgICAgICAgKm5nRm9yPVwibGV0IG9wdGlvbiBvZiBzb3J0T3B0aW9uczsgbGV0IGkgPSBpbmRleFwiXHJcbiAgICAgICAgKGNsaWNrKT1cInNvcnRPcHRpb25DaGFuZ2VkKGksIG9wdGlvbi5zb3J0VHlwZSlcIlxyXG4gICAgICAgIFtuZ0NsYXNzXT1cInsgYWN0aXZlOiBvcHRpb24uaXNPcHRpb25BY3RpdmUgfVwiXHJcbiAgICA+XHJcbiAgICAgICAge3tvcHRpb24udGV4dH19XHJcbiAgICA8L2J1dHRvbj5cclxuPC9wPiJdfQ==
|
|
@@ -1690,7 +1690,7 @@ class AnnaSortComponent {
|
|
|
1690
1690
|
{
|
|
1691
1691
|
sortType: 'DEFAULT',
|
|
1692
1692
|
isOptionActive: false,
|
|
1693
|
-
text: '
|
|
1693
|
+
text: 'Default',
|
|
1694
1694
|
},
|
|
1695
1695
|
];
|
|
1696
1696
|
}
|
|
@@ -2692,30 +2692,55 @@ class AnnaNonEditableGenericTableComponent {
|
|
|
2692
2692
|
}
|
|
2693
2693
|
}
|
|
2694
2694
|
incrementMinute(arr) {
|
|
2695
|
-
|
|
2696
|
-
|
|
2697
|
-
|
|
2695
|
+
// increment to nearest proper interval(15,30,45)
|
|
2696
|
+
let min = parseInt(arr[1]);
|
|
2697
|
+
if (min == 0 && min <= 14) {
|
|
2698
|
+
arr[1] = "15";
|
|
2698
2699
|
}
|
|
2699
|
-
else if (
|
|
2700
|
-
arr[1] = "
|
|
2700
|
+
else if (min >= 15 && min <= 29) {
|
|
2701
|
+
arr[1] = "30";
|
|
2702
|
+
}
|
|
2703
|
+
else if (min >= 30 && min <= 44) {
|
|
2704
|
+
arr[1] = "45";
|
|
2701
2705
|
}
|
|
2702
|
-
else if (
|
|
2703
|
-
|
|
2704
|
-
arr[1] = res < 10 ? `0${res}` : res.toString();
|
|
2706
|
+
else if (min >= 45) {
|
|
2707
|
+
arr[1] = "00";
|
|
2705
2708
|
}
|
|
2709
|
+
// arr[1] = parseInt(arr[1]) + 15;
|
|
2710
|
+
// if (parseInt(arr[1]) == 60) {
|
|
2711
|
+
// arr[1] = "00";
|
|
2712
|
+
// } else if (parseInt(arr[1]) == 0) {
|
|
2713
|
+
// arr[1] = "00";
|
|
2714
|
+
// }
|
|
2715
|
+
// else if(parseInt(arr[1]) > 60){
|
|
2716
|
+
// let res = parseInt(arr[1]) - 60;
|
|
2717
|
+
// arr[1] = res < 10 ? `0${res}` : res.toString();
|
|
2718
|
+
// }
|
|
2706
2719
|
}
|
|
2707
2720
|
decrementMinute(arr) {
|
|
2708
|
-
|
|
2709
|
-
if (
|
|
2710
|
-
let res = 60 + parseInt(arr[1]);
|
|
2711
|
-
arr[1] = res;
|
|
2712
|
-
}
|
|
2713
|
-
else if (parseInt(arr[1]) == 0) {
|
|
2721
|
+
let min = parseInt(arr[1]);
|
|
2722
|
+
if (min == 0 && min <= 15) {
|
|
2714
2723
|
arr[1] = "00";
|
|
2715
2724
|
}
|
|
2716
|
-
else if (
|
|
2717
|
-
arr[1] =
|
|
2725
|
+
else if (min >= 16 && min <= 30) {
|
|
2726
|
+
arr[1] = "15";
|
|
2727
|
+
}
|
|
2728
|
+
else if (min >= 31 && min <= 45) {
|
|
2729
|
+
arr[1] = "30";
|
|
2730
|
+
}
|
|
2731
|
+
else if (min > 45) {
|
|
2732
|
+
arr[1] = "45";
|
|
2718
2733
|
}
|
|
2734
|
+
// arr[1] = parseInt(arr[1]) - 15;
|
|
2735
|
+
// if (parseInt(arr[1]) < 0) {
|
|
2736
|
+
// let res = 60 + parseInt(arr[1]);
|
|
2737
|
+
// arr[1] = res;
|
|
2738
|
+
// } else if (parseInt(arr[1]) == 0) {
|
|
2739
|
+
// arr[1] = "00";
|
|
2740
|
+
// }
|
|
2741
|
+
// else if(arr[1] < 10){
|
|
2742
|
+
// arr[1]= `0${arr[1]}`;
|
|
2743
|
+
// }
|
|
2719
2744
|
}
|
|
2720
2745
|
changeStartTimeHour(increment) {
|
|
2721
2746
|
if (increment) {
|
|
@@ -2773,7 +2798,7 @@ class AnnaNonEditableGenericTableComponent {
|
|
|
2773
2798
|
let fromTime24HrFormatArr = this.annaDateTimeFormatService.convertTotwentyFourHrsFormat(this.selectedFromTime[0] + ":" + this.selectedFromTime[1] + " " + this.selectedFromTime[2], true);
|
|
2774
2799
|
let fromTime24HrFormat = fromTime24HrFormatArr[0] + ":" + fromTime24HrFormatArr[1] + ":00";
|
|
2775
2800
|
let toTime24HrFormatArr = this.annaDateTimeFormatService.convertTotwentyFourHrsFormat(this.selectedToTime[0] + ":" + this.selectedToTime[1] + " " + this.selectedToTime[2], true);
|
|
2776
|
-
let toTime24HrFormat = toTime24HrFormatArr[0] + ":" + toTime24HrFormatArr[1] + ":
|
|
2801
|
+
let toTime24HrFormat = toTime24HrFormatArr[0] + ":" + toTime24HrFormatArr[1] + ":59";
|
|
2777
2802
|
currentSelectedTimeFilter = { fromTime: fromTime24HrFormat, toTime: toTime24HrFormat, includeMulti: this.multiTimeCheckboxChecked,
|
|
2778
2803
|
includeZero: this.zeroTimeCheckboxChecked, includeTimeRange: this.enterTimeCheckboxChecked };
|
|
2779
2804
|
let isFiltered = this.annaFilterService.reOrderAppliedFiltersState(this.clonedTableData, currentSelectedTimeFilter);
|
|
@@ -3064,7 +3089,8 @@ class AnnaNonEditableGenericTableComponent {
|
|
|
3064
3089
|
includeTimeRange: false
|
|
3065
3090
|
};
|
|
3066
3091
|
if (this.gtGeneralConfig.component === "SPOTDETAILS" ||
|
|
3067
|
-
this.gtGeneralConfig.component === "EXCLUDEINVENTORYPOPUP"
|
|
3092
|
+
this.gtGeneralConfig.component === "EXCLUDEINVENTORYPOPUP" ||
|
|
3093
|
+
this.gtGeneralConfig.component === "ACTIVITYLOG") {
|
|
3068
3094
|
let includeMulti = this.clonedTableData.findIndex((obj) => obj[key] == "<multi>") !=
|
|
3069
3095
|
-1;
|
|
3070
3096
|
let includeZero = this.clonedTableData.findIndex((obj) => obj[key] == "0") != -1;
|