@annalib/anna-core 1.0.0 → 1.2.1

package/fesm2020/annalib-anna-core-src-lib-anna-core-shared-lib.mjs

@@ -502,9 +502,152 @@ var AllSelectedStatus;
     AllSelectedStatus[AllSelectedStatus["fewSelected"] = 2] = "fewSelected";
 })(AllSelectedStatus || (AllSelectedStatus = {}));
 
+// Angular import statements
+// Third party import statements
+// User defined import statements
+class AnnaSortService {
+    constructor(annaDateTimeFormatService) {
+        this.annaDateTimeFormatService = annaDateTimeFormatService;
+        this.updateSortTypeSubject = new Subject();
+        this.dateSet = new Set([
+            'endDate',
+            'startDate',
+            'end_date',
+            'start_date',
+            'flightStartDate',
+            'flightEndDate',
+        ]);
+        console.log('AnnaTableColumnSortService sevice created.');
+    }
+    sortDataForComponentOtherThanLurAndCsrPage(isAsc, data, key) {
+        let param1;
+        let param2;
+        if (this.dateSet.has(key)) {
+            data.sort((a, b) => {
+                return this.annaDateTimeFormatService.compareDate(a[key], b[key], isAsc);
+            });
+        }
+        else if (key === 'AirDateAndTime') {
+            data.sort((a, b) => {
+                let first, second;
+                if (a[key] == '-') {
+                    return 1;
+                }
+                if (b[key] == '-') {
+                    return -1;
+                }
+                else {
+                    first =
+                        this.annaDateTimeFormatService.formatDateAndHHMMATimeToStandardFormat(a[key]);
+                    second =
+                        this.annaDateTimeFormatService.formatDateAndHHMMATimeToStandardFormat(b[key]);
+                    let compareDate = this.annaDateTimeFormatService.compareDate(first, second, isAsc);
+                    return compareDate;
+                }
+            });
+        }
+        else if (key == 'startEndTime' || key == 'TimeBand') {
+            data.sort((a, b) => {
+                if (isAsc) {
+                    param1 = a[key][1];
+                    param2 = b[key][1];
+                }
+                else {
+                    param1 = a[key][2];
+                    param2 = b[key][2];
+                }
+                let val = isAsc
+                    ? this.annaDateTimeFormatService.sortByTimeAscending(param1, param2)
+                    : this.annaDateTimeFormatService.sortByTimeDescending(param1, param2);
+                return val;
+            });
+        }
+        else {
+            data.sort((a, b) => {
+                param1 = a[key];
+                param2 = b[key];
+                if (param1 !== param2) {
+                    return this.annaDateTimeFormatService.compare(param1, param2, isAsc);
+                }
+                return 0;
+            });
+        }
+        return data;
+    }
+    sortEnterEditLurAndCsrPage(isAsc, data, key) {
+        let param1;
+        let param2;
+        if (key.includes('_')) {
+            let keys = key.split('_');
+            let weekNumber = keys[0];
+            let sortKey = keys[1];
+            if (keys.length > 2) {
+                sortKey =
+                    keys[2] == true
+                        ? 'BookedAurIncludingNoChargeSpots'
+                        : 'BookedAurExcludingNoChargeSpots';
+            }
+            data.sort((a, b) => {
+                let aInventoryCodeWeekWiseKey = Object.keys(a.WeekWiseInventoryCodeData).filter((key) => key.split('_')[1] == weekNumber);
+                let bInventoryCodeWeekWiseKey = Object.keys(b.WeekWiseInventoryCodeData).filter((key) => key.split('_')[1] == weekNumber);
+                param1 = null;
+                param2 = null;
+                if (aInventoryCodeWeekWiseKey.length > 0) {
+                    param1 =
+                        a.WeekWiseInventoryCodeData[aInventoryCodeWeekWiseKey[0]][sortKey][1];
+                }
+                if (bInventoryCodeWeekWiseKey.length > 0) {
+                    param2 =
+                        b.WeekWiseInventoryCodeData[bInventoryCodeWeekWiseKey[0]][sortKey][1];
+                }
+                if (param1 !== param2) {
+                    return this.annaDateTimeFormatService.compare(param1, param2, isAsc);
+                }
+                return 0;
+            });
+        }
+        else if (key == 'TimeBand') {
+            data.sort((a, b) => {
+                if (isAsc) {
+                    param1 = a[key][1];
+                    param2 = b[key][1];
+                }
+                else {
+                    param1 = a[key][2];
+                    param2 = b[key][2];
+                }
+                let val = isAsc
+                    ? this.annaDateTimeFormatService.sortByTimeAscending(param1, param2)
+                    : this.annaDateTimeFormatService.sortByTimeDescending(param1, param2);
+                return val;
+            });
+        }
+        else {
+            data.sort((a, b) => {
+                param1 = a[key];
+                param2 = b[key];
+                if (param1 !== param2) {
+                    return this.annaDateTimeFormatService.compare(param1, param2, isAsc);
+                }
+                return 0;
+            });
+        }
+        return data;
+    }
+}
+AnnaSortService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.2.7", ngImport: i0, type: AnnaSortService, deps: [{ token: AnnaDateTimeFormatService }], target: i0.ɵɵFactoryTarget.Injectable });
+AnnaSortService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.2.7", ngImport: i0, type: AnnaSortService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.2.7", ngImport: i0, type: AnnaSortService, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root',
+                }]
+        }], ctorParameters: function () { return [{ type: AnnaDateTimeFormatService }]; } });
+
 class AnnaFilterService {
-    constructor(dateTimeFormatService) {
+    constructor(dateTimeFormatService, annaSortService) {
         this.dateTimeFormatService = dateTimeFormatService;
+        this.annaSortService = annaSortService;
         this.tooltipMap = new Map();
         this.tooltipSelectedMap = new Map();
         this.appliedFiltersArray = [];
@@ -591,10 +734,15 @@ class AnnaFilterService {
         return ((sortMap.size > 0 && sortMap.get(header[0]) != "DEFAULT") || (sortMap.size > 0 && sortMap.get(header[1]) != "DEFAULT") || set.has(header[0]) || set.has(header[1]));
     }
     clearColumnFilter() {
-        this.tooltipSelectedMap.delete(this.selectedRadio);
-        let appliedFilterSet = new Set(this.appliedFiltersArray);
-        appliedFilterSet.delete(this.selectedRadio);
-        this.appliedFiltersArray = [...appliedFilterSet];
+        if (this.tooltipSelectedMap.has(this.selectedRadio)) {
+            this.tooltipSelectedMap.delete(this.selectedRadio);
+            let appliedFilterSet = new Set(this.appliedFiltersArray);
+            appliedFilterSet.delete(this.selectedRadio);
+            this.appliedFiltersArray = [...appliedFilterSet];
+        }
+        if (this.annaSortService.columnSortState.has(this.selectedRadio)) {
+            this.annaSortService.columnSortState.set(this.selectedRadio, "DEFAULT");
+        }
     }
     populateSliderTooltip(completeData, filteredData) {
         let minValue;
@@ -1072,155 +1220,14 @@ class AnnaFilterService {
     }
 }
 AnnaFilterService.bufferSize = 20;
-AnnaFilterService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.2.7", ngImport: i0, type: AnnaFilterService, deps: [{ token: AnnaDateTimeFormatService }], target: i0.ɵɵFactoryTarget.Injectable });
+AnnaFilterService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.2.7", ngImport: i0, type: AnnaFilterService, deps: [{ token: AnnaDateTimeFormatService }, { token: AnnaSortService }], target: i0.ɵɵFactoryTarget.Injectable });
 AnnaFilterService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.2.7", ngImport: i0, type: AnnaFilterService, providedIn: 'root' });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.2.7", ngImport: i0, type: AnnaFilterService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
                 }]
-        }], ctorParameters: function () { return [{ type: AnnaDateTimeFormatService }]; } });
-
-// Angular import statements
-// Third party import statements
-// User defined import statements
-class AnnaSortService {
-    constructor(annaDateTimeFormatService) {
-        this.annaDateTimeFormatService = annaDateTimeFormatService;
-        this.dateSet = new Set([
-            'endDate',
-            'startDate',
-            'end_date',
-            'start_date',
-            'flightStartDate',
-            'flightEndDate',
-        ]);
-        console.log('AnnaTableColumnSortService sevice created.');
-    }
-    sortDataForComponentOtherThanLurAndCsrPage(isAsc, data, key) {
-        let param1;
-        let param2;
-        if (this.dateSet.has(key)) {
-            data.sort((a, b) => {
-                return this.annaDateTimeFormatService.compareDate(a[key], b[key], isAsc);
-            });
-        }
-        else if (key === 'AirDateAndTime') {
-            data.sort((a, b) => {
-                let first, second;
-                if (a[key] == '-') {
-                    return 1;
-                }
-                if (b[key] == '-') {
-                    return -1;
-                }
-                else {
-                    first =
-                        this.annaDateTimeFormatService.formatDateAndHHMMATimeToStandardFormat(a[key]);
-                    second =
-                        this.annaDateTimeFormatService.formatDateAndHHMMATimeToStandardFormat(b[key]);
-                    let compareDate = this.annaDateTimeFormatService.compareDate(first, second, isAsc);
-                    return compareDate;
-                }
-            });
-        }
-        else if (key == 'startEndTime' || key == 'TimeBand') {
-            data.sort((a, b) => {
-                if (isAsc) {
-                    param1 = a[key][1];
-                    param2 = b[key][1];
-                }
-                else {
-                    param1 = a[key][2];
-                    param2 = b[key][2];
-                }
-                let val = isAsc
-                    ? this.annaDateTimeFormatService.sortByTimeAscending(param1, param2)
-                    : this.annaDateTimeFormatService.sortByTimeDescending(param1, param2);
-                return val;
-            });
-        }
-        else {
-            data.sort((a, b) => {
-                param1 = a[key];
-                param2 = b[key];
-                if (param1 !== param2) {
-                    return this.annaDateTimeFormatService.compare(param1, param2, isAsc);
-                }
-                return 0;
-            });
-        }
-        return data;
-    }
-    sortEnterEditLurAndCsrPage(isAsc, data, key) {
-        let param1;
-        let param2;
-        if (key.includes('_')) {
-            let keys = key.split('_');
-            let weekNumber = keys[0];
-            let sortKey = keys[1];
-            if (keys.length > 2) {
-                sortKey =
-                    keys[2] == true
-                        ? 'BookedAurIncludingNoChargeSpots'
-                        : 'BookedAurExcludingNoChargeSpots';
-            }
-            data.sort((a, b) => {
-                let aInventoryCodeWeekWiseKey = Object.keys(a.WeekWiseInventoryCodeData).filter((key) => key.split('_')[1] == weekNumber);
-                let bInventoryCodeWeekWiseKey = Object.keys(b.WeekWiseInventoryCodeData).filter((key) => key.split('_')[1] == weekNumber);
-                param1 = null;
-                param2 = null;
-                if (aInventoryCodeWeekWiseKey.length > 0) {
-                    param1 =
-                        a.WeekWiseInventoryCodeData[aInventoryCodeWeekWiseKey[0]][sortKey][1];
-                }
-                if (bInventoryCodeWeekWiseKey.length > 0) {
-                    param2 =
-                        b.WeekWiseInventoryCodeData[bInventoryCodeWeekWiseKey[0]][sortKey][1];
-                }
-                if (param1 !== param2) {
-                    return this.annaDateTimeFormatService.compare(param1, param2, isAsc);
-                }
-                return 0;
-            });
-        }
-        else if (key == 'TimeBand') {
-            data.sort((a, b) => {
-                if (isAsc) {
-                    param1 = a[key][1];
-                    param2 = b[key][1];
-                }
-                else {
-                    param1 = a[key][2];
-                    param2 = b[key][2];
-                }
-                let val = isAsc
-                    ? this.annaDateTimeFormatService.sortByTimeAscending(param1, param2)
-                    : this.annaDateTimeFormatService.sortByTimeDescending(param1, param2);
-                return val;
-            });
-        }
-        else {
-            data.sort((a, b) => {
-                param1 = a[key];
-                param2 = b[key];
-                if (param1 !== param2) {
-                    return this.annaDateTimeFormatService.compare(param1, param2, isAsc);
-                }
-                return 0;
-            });
-        }
-        return data;
-    }
-}
-AnnaSortService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.2.7", ngImport: i0, type: AnnaSortService, deps: [{ token: AnnaDateTimeFormatService }], target: i0.ɵɵFactoryTarget.Injectable });
-AnnaSortService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.2.7", ngImport: i0, type: AnnaSortService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.2.7", ngImport: i0, type: AnnaSortService, decorators: [{
-            type: Injectable,
-            args: [{
-                    providedIn: 'root',
-                }]
-        }], ctorParameters: function () { return [{ type: AnnaDateTimeFormatService }]; } });
+        }], ctorParameters: function () { return [{ type: AnnaDateTimeFormatService }, { type: AnnaSortService }]; } });
 
 // Angular import statements
 class AnnaGenericTableService {