@annalib/anna-core 0.0.2 → 1.0.0

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

@@ -474,7 +474,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.2.7", ngImpor
                 }]
         }], ctorParameters: function () { return []; } });
 
-class tooltipModel {
+class TooltipModel {
     constructor(obj) {
         this.data = obj;
         this.isSelected = false;
@@ -488,9 +488,11 @@ class tooltipModelForColumnLevelFiltering {
     }
 }
 class radioButtonModel {
-    constructor(key, value) {
+    constructor(key, value, sort, filter) {
         this.key = key;
         this.label = value;
+        this.isSortRequired = sort;
+        this.isFilterRequired = filter;
     }
 }
 var AllSelectedStatus;
@@ -506,6 +508,7 @@ class AnnaFilterService {
         this.tooltipMap = new Map();
         this.tooltipSelectedMap = new Map();
         this.appliedFiltersArray = [];
+        this.sliderCurrencySet = new Set(["booked", "cpp", "cpm", "rcvPreempt", "osPreempt", "postedAdu", "scheduledAdu", "audienceDeficit", "Rate"]);
         this.percentTranslateFunction = (data) => {
             const val = data.toFixed(1) + "%";
             return val;
@@ -560,9 +563,9 @@ class AnnaFilterService {
             "bookedSpots",
             "userChanges"
         ];
-        const calendarArr = ["period", "AirDate", "flightStartDate", "flightEndDate", "date"];
+        const calendarArr = ["period", "AirDate", "flightStartDate", "flightEndDate", "date", "startDate", "endDate"];
         const timeArr = ["StartTimeForFilter", "EndTimeForFilter",
-            "start_time_for_filter", "end_time_for_filter", "startEndTimeMulti"];
+            "start_time_for_filter", "end_time_for_filter", "startEndTimeMulti", "startEndTime"];
         this.sliderSet = new Set(sliderArr);
         this.calendarSet = new Set(calendarArr);
         this.timeSet = new Set(timeArr);
@@ -580,19 +583,15 @@ class AnnaFilterService {
         let maxDate = moment.max(DateArr);
         return [minDate, maxDate];
     }
-    isTooltipActive(header) {
+    isTooltipActive(header, sortMap) {
         let set = new Set(this.appliedFiltersArray);
-        return (set.has(header[0])) || (set.has(header[1]));
+        if (header.length == 1) {
+            return ((sortMap.size > 0 && sortMap.get(header[0]) != "DEFAULT") || set.has(header[0]));
+        }
+        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);
-        if (this.tooltipMap.has(this.selectedRadio)) {
-            this.tooltipMap.delete(this.selectedRadio);
-        }
-        if (this.selectedRadio === "postedAdu") {
-            this.subRadioButton = "required";
-            this.tooltipSelectedMap.delete("isAudRequired");
-        }
         let appliedFilterSet = new Set(this.appliedFiltersArray);
         appliedFilterSet.delete(this.selectedRadio);
         this.appliedFiltersArray = [...appliedFilterSet];
@@ -636,7 +635,9 @@ class AnnaFilterService {
     setOptionValues(minValue, maxValue) {
         return {
             floor: minValue,
-            ceil: maxValue
+            ceil: maxValue,
+            disabled: true,
+            translate: this.normalTranslateFunction
         };
     }
     populateTooltip(selectedColumnName, completeData, filteredData) {
@@ -668,7 +669,7 @@ class AnnaFilterService {
         else {
             //get the unique values from the column and save it in the map
             this.selectedRadio = value[0];
-            const data = sortBy(originalData.map((u) => u[this.selectedRadio])).filter(n => n !== null); //sorting the data in alphabetical order
+            const data = sortBy(originalData.map((u) => u[this.selectedRadio])).filter((n) => n !== null); //sorting the data in alphabetical order
             const dataSet = new Set(data); //created a set from the data
             const toolTipdata = [...dataSet].map((x) => new tooltipModelForColumnLevelFiltering(x));
             this.tooltipMap.set(value[0], toolTipdata); //setting the key value pair in the tooltipMap
@@ -850,40 +851,25 @@ class AnnaFilterService {
         this.appliedFiltersArray = [...set];
     }
     filterData(originalData, keyToSkip) {
-        let filteredData = originalData;
+        let filteredData = [...originalData];
         this.tooltipSelectedMap.forEach((value, key) => {
             if (key != keyToSkip) {
                 if (this.sliderSet.has(key)) {
                     filteredData = filteredData.filter((obj) => obj[key] >= value.min && obj[key] <= value.max);
                 }
-                else if (key === "startDate" || key === "endDate") {
-                    filteredData = filteredData.filter((obj) => this.returnOrdersInTheRange(obj, value, key));
+                else if (key === "startDate" || key === "endDate" || key === "AirDate" || key === "flightStartDate" || key === "flightEndDate" || key == "date") {
+                    filteredData = filteredData.filter((obj) => this.isObjectInTheRange(obj, value, key));
                 }
-                else if (key === "period" || key === "AirDate" || key === "flightStartDate" || key === "flightEndDate" || key == "date") {
+                else if (key === "period") {
                     filteredData = filteredData.filter((obj) => this.getDataInTheDateRange(obj, value, key));
                 }
                 else if (key === "StartTimeForFilter" || key === "EndTimeForFilter"
                     || key === "start_time_for_filter" || key === "end_time_for_filter") {
                     filteredData = filteredData.filter((obj) => this.returnDataForFromAndToTimeRange(obj, value, key));
                 }
-                else if (key === "startEndTimeMulti") {
+                else if (key === "startEndTimeMulti" || key == "startEndTime" || key === "TimeBand") {
                     filteredData = filteredData.filter((obj) => this.returnDataForStartAndEndTimeRange(obj, value, key));
                 }
-                else if (key === "startEndTime" || key === "TimeBand") {
-                    let filteredMulti = [];
-                    let filteredZero = [];
-                    let filteredTimeRange = [];
-                    if (this.includeTimeRange) {
-                        filteredTimeRange = filteredData.filter((obj) => this.returnDataForTimeRange(obj, value));
-                    }
-                    if (this.includeMultiTime) {
-                        filteredMulti = filteredData.filter((obj) => obj[key][0] == "<multi>");
-                    }
-                    if (this.includeZeroTime) {
-                        filteredZero = filteredData.filter((obj) => obj[key][0] == "0");
-                    }
-                    filteredData = [...filteredMulti, ...filteredZero, ...filteredTimeRange];
-                }
                 else if (value.length > 0) {
                     filteredData = filteredData.filter((u) => value.includes(u[key]));
                 }
@@ -920,28 +906,35 @@ class AnnaFilterService {
         if (["", "-", null].includes(objTime)) {
             return false;
         }
-        if (this.includeMultiTime && obj[key] == "<multi>") {
+        if (selectedData.includeMulti && obj[key] == "<multi>") {
             return true;
         }
-        if (!this.includeMultiTime && obj[key] == "<multi>") {
+        if (!selectedData.includeMulti && obj[key] == "<multi>") {
             return false;
         }
-        if (this.includeZeroTime && obj[key] == "0") {
+        if (selectedData.includeZero && obj[key] == "0") {
             return true;
         }
-        if (!this.includeZeroTime && obj[key] == "0") {
+        if (!selectedData.includeZero && obj[key] == "0") {
             return false;
         }
-        if (!this.includeTimeRange) {
+        if (!selectedData.includeTimeRange) {
             return false;
         }
-        objTime = this.dateTimeFormatService.formatToTwelveHrs(objTime, true);
-        objTime = this.dateTimeFormatService.convertTotwentyFourHrsFormat(objTime[0] + ":" + objTime[1] + " " + objTime[2], true);
-        objTime = objTime[0] + ":" + objTime[1] + ":00";
-        objTime = moment(objTime, format);
-        let isObjTimeSameAsSelectedFromTime = objTime.isSame(selectedFromTime);
-        let isObjTimeSameAsSelectedToTime = objTime.isSame(selectedToTime);
-        let isObjTimeBetweenSelectedFromTimeAndToTime = objTime.isBetween(selectedFromTime, selectedToTime);
+        // objTime = this.dateTimeFormatService.formatToTwelveHrs(objTime, true);
+        // objTime = this.dateTimeFormatService.convertTotwentyFourHrsFormat(
+        //   objTime[0] + ":" + objTime[1] + " " + objTime[2],
+        //   true
+        // );
+        // objTime = objTime[0] + ":" + objTime[1] + ":00";
+        // objTime = moment(objTime, format);
+        let momentTime = moment(objTime, format);
+        console.log(momentTime);
+        console.log(selectedFromTime);
+        console.log(selectedToTime);
+        let isObjTimeSameAsSelectedFromTime = momentTime.isSame(selectedFromTime);
+        let isObjTimeSameAsSelectedToTime = momentTime.isSame(selectedToTime);
+        let isObjTimeBetweenSelectedFromTimeAndToTime = momentTime.isBetween(selectedFromTime, selectedToTime);
         return (isObjTimeSameAsSelectedFromTime ||
             isObjTimeSameAsSelectedToTime ||
             isObjTimeBetweenSelectedFromTimeAndToTime);
@@ -950,20 +943,19 @@ class AnnaFilterService {
         let format = "HH:mm:ss";
         let selectedFromTime = moment(selectedData.fromTime, format);
         let selectedToTime = moment(selectedData.toTime, format);
-        let objTime = obj[key];
-        if (this.includeMultiTime && obj[key][0] == "<multi>") {
+        if (selectedData.includeMulti && obj[key][0] == "<multi>") {
             return true;
         }
-        if (!this.includeMultiTime && obj[key][0] == "<multi>") {
+        if (!selectedData.includeMulti && obj[key][0] == "<multi>") {
             return false;
         }
-        if (this.includeZeroTime && obj[key][0] == "0") {
+        if (selectedData.includeZero && obj[key][0] == "0") {
             return true;
         }
-        if (!this.includeZeroTime && obj[key][0] == "0") {
+        if (!selectedData.includeZero && obj[key][0] == "0") {
             return false;
         }
-        if (!this.includeTimeRange) {
+        if (!selectedData.includeTimeRange) {
             return false;
         }
         let startTime = moment(obj[key][1], format);
@@ -981,10 +973,13 @@ class AnnaFilterService {
         let parsingFormat;
         if (key === "period") {
             parsingFormat = "YYYY-MM-DD";
-            let startDateIsBetweenSelDate = moment(obj.startDate, parsingFormat).isBetween(value.minSelectedDate, value.maxSelectedDate);
-            let endDateIsBetweenSelDate = moment(obj.endDate, parsingFormat).isBetween(value.minSelectedDate, value.maxSelectedDate);
-            let startDateIsSameAsSelStartDate = moment(obj.startDate, parsingFormat).isSame(value.minSelectedDate);
-            let endDateIsSameAsSelEndDate = moment(obj.endDate, parsingFormat).isSame(value.maxSelectedDate);
+            let momentStartDate = moment(obj.startDate);
+            let momentEndDate = moment(obj.endDate);
+            let startDateIsBetweenSelDate = momentStartDate.isBetween(value.fromDate, value.toDate);
+            let endDateIsBetweenSelDate = momentEndDate.isBetween(value.fromDate, value.toDate);
+            console.log(moment(obj.startDate, parsingFormat));
+            let startDateIsSameAsSelStartDate = value.fromDate.isSame(momentStartDate);
+            let endDateIsSameAsSelEndDate = value.toDate.isSame(momentEndDate);
             return ((startDateIsBetweenSelDate || startDateIsSameAsSelStartDate) &&
                 (endDateIsBetweenSelDate || endDateIsSameAsSelEndDate));
         }
@@ -995,8 +990,6 @@ class AnnaFilterService {
             let dateIsSameAsSelEndDate = moment(obj[key], parsingFormat).isSame(value.maxSelectedDate);
             return dateIsBetweenSelDate || dateIsSameAsSelStartDate || dateIsSameAsSelEndDate;
         }
-        else {
-        }
     }
     initializeTimeFilterData(clonedData, key = "startEndTime") {
         let startTimeArr = map(clonedData, "startTime");
@@ -1013,8 +1006,69 @@ class AnnaFilterService {
         };
         this.initialValueMap.set(key, initialStartEndTime);
     }
-    returnColumnFilterStatus(data, headername) {
-        return uniq(data.map((u) => u[headername])).length > 1 ? false : true;
+    returnColumnFilterStatus(data, headerName) {
+        if (headerName == "startEndTime") {
+            let time = data.map(u => u[headerName][0]);
+            let uniqTime = uniq(time);
+            return uniqTime.length == 0;
+        }
+        return uniq(data.map((u) => u[headerName])).length > 1 ? false : true;
+    }
+    getFilterOptionsData(data, clonedData) {
+        let appliedFilterSet = new Set(this.appliedFiltersArray);
+        console.log("appliedFilterSet");
+        console.log(appliedFilterSet);
+        if (appliedFilterSet.has(this.selectedRadio)) {
+            return this.filterData(clonedData, this.selectedRadio);
+        }
+        else {
+            return data;
+        }
+    }
+    reOrderAppliedFiltersState(clonedData, value) {
+        let isFiltered = true;
+        isFiltered = this.checkIfFilterIsApplied(clonedData, value);
+        this.removeOrChangeLatestFilterIndex(isFiltered);
+        return isFiltered;
+    }
+    checkIfFilterIsApplied(clonedData, value) {
+        let initialValueOfColumn = sortBy(clonedData.map(item => item[this.selectedRadio]));
+        let currentValueOfColumn = sortBy(this.applyFilter(clonedData, value).map(item => item[this.selectedRadio]));
+        return !isEqual(initialValueOfColumn, currentValueOfColumn);
+    }
+    applyFilter(data, value) {
+        let filteredData = data;
+        let key = this.selectedRadio;
+        if (this.sliderSet.has(key)) {
+            filteredData = filteredData.filter((obj) => obj[key] >= value.min && obj[key] <= value.max);
+        }
+        else if (key === "startDate" || key === "endDate" || key === "AirDate" || key === "flightStartDate" || key === "flightEndDate" || key == "date") {
+            filteredData = filteredData.filter((obj) => this.isObjectInTheRange(obj, value, key));
+        }
+        else if (key === "period") {
+            filteredData = filteredData.filter((obj) => this.getDataInTheDateRange(obj, value, key));
+        }
+        else if (key === "StartTimeForFilter" || key === "EndTimeForFilter"
+            || key === "start_time_for_filter" || key === "end_time_for_filter") {
+            filteredData = filteredData.filter((obj) => this.returnDataForFromAndToTimeRange(obj, value, key));
+        }
+        else if (key === "startEndTimeMulti" || key == "startEndTime" || key === "TimeBand") {
+            filteredData = filteredData.filter((obj) => this.returnDataForStartAndEndTimeRange(obj, value, key));
+        }
+        else if (value.length > 0) {
+            filteredData = filteredData.filter((u) => value.includes(u[key]));
+        }
+        return filteredData;
+    }
+    isObjectInTheRange(obj, value, key) {
+        let objVal = obj[key];
+        let momentDate = moment(objVal);
+        console.log(objVal);
+        console.log(value.fromDate);
+        let isDateSameAsStartOfTheRange = value.fromDate.isSame(objVal);
+        let isDateSameAsEndOfTheRange = value.toDate.isSame(objVal);
+        let isDateBetweenTheStartAndEndOfRange = momentDate.isBetween(value.fromDate, value.toDate);
+        return isDateSameAsStartOfTheRange || isDateSameAsEndOfTheRange || isDateBetweenTheStartAndEndOfRange;
     }
 }
 AnnaFilterService.bufferSize = 20;
@@ -1027,95 +1081,58 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.2.7", ngImpor
                 }]
         }], ctorParameters: function () { return [{ type: AnnaDateTimeFormatService }]; } });
 
-class Constants {
-}
-Constants.SUCCESS_STRING = "success";
-Constants.BACKEND_SERVER_URL = "/server/public/index.php/api";
-Constants.ERROR_MSG = "Error occurred please try again.";
-Constants.NO_DATA_MSG = "No Data to display";
-Constants.SERVER_ERROR = "Server error. Please try Again";
-Constants.USER_ORIGIN = "ANNA";
-Constants.ACTIVE_USER_STATUS = "active";
-Constants.DELETED_USER_STATUS = "deleted";
-Constants.INACTIVE_USER_STATUS = "inactive";
-Constants.OGAdminRole = "OG-admin";
-Constants.dollars = "$";
-class ErrorCodes {
-}
-ErrorCodes.BAD_REQUEST = 400;
-ErrorCodes.SERVER_ERROR = 500;
-ErrorCodes.SUCCESS_CODE = 200;
-ErrorCodes.SUCCESS_CODE_GET = 200;
-ErrorCodes.SUCCESS_CODE_POST = 201;
-ErrorCodes.SUCCESS_CODE_PATCH = 204;
-ErrorCodes.NO_CONTENT = 204;
-ErrorCodes.under_review = 409;
-var Days;
-(function (Days) {
-    Days[Days["M"] = 1] = "M";
-    Days[Days["Tu"] = 2] = "Tu";
-    Days[Days["We"] = 3] = "We";
-    Days[Days["Th"] = 4] = "Th";
-    Days[Days["F"] = 5] = "F";
-    Days[Days["Sa"] = 6] = "Sa";
-    Days[Days["Su"] = 7] = "Su";
-})(Days || (Days = {}));
-
 // Angular import statements
+// Third party import statements
+// User defined import statements
 class AnnaSortService {
     constructor(annaDateTimeFormatService) {
         this.annaDateTimeFormatService = annaDateTimeFormatService;
-        this.sortByAsc = new Map();
-        this.sortByDesc = new Map();
-        this.dateSet = new Set(["endDate", "startDate", "end_date", "start_date", "flightStartDate", "flightEndDate"]);
-        console.log("AnnaTableColumnSortService sevice created.");
-    }
-    checkIfSortingIsApplied(sortMap, setValueTo) {
-        let obj = { key: "", setValueTo: null };
-        for (let [key, value] of sortMap.entries()) {
-            if (value) {
-                obj = { key, setValueTo };
-                break;
-            }
-        }
-        return obj;
+        this.dateSet = new Set([
+            'endDate',
+            'startDate',
+            'end_date',
+            'start_date',
+            'flightStartDate',
+            'flightEndDate',
+        ]);
+        console.log('AnnaTableColumnSortService sevice created.');
     }
-    sort(isAsc, data, sortBy) {
-        const dataToExclude = [];
-        const dataToInclude = [];
+    sortDataForComponentOtherThanLurAndCsrPage(isAsc, data, key) {
         let param1;
         let param2;
-        if (this.dateSet.has(sortBy)) {
+        if (this.dateSet.has(key)) {
             data.sort((a, b) => {
-                return this.annaDateTimeFormatService.compareDate(a[sortBy], b[sortBy], isAsc);
+                return this.annaDateTimeFormatService.compareDate(a[key], b[key], isAsc);
             });
         }
-        else if (sortBy === "AirDateAndTime") {
+        else if (key === 'AirDateAndTime') {
             data.sort((a, b) => {
                 let first, second;
-                if (a[sortBy] == "-") {
+                if (a[key] == '-') {
                     return 1;
                 }
-                if (b[sortBy] == "-") {
+                if (b[key] == '-') {
                     return -1;
                 }
                 else {
-                    first = this.annaDateTimeFormatService.formatDateAndHHMMATimeToStandardFormat(a[sortBy]);
-                    second = this.annaDateTimeFormatService.formatDateAndHHMMATimeToStandardFormat(b[sortBy]);
+                    first =
+                        this.annaDateTimeFormatService.formatDateAndHHMMATimeToStandardFormat(a[key]);
+                    second =
+                        this.annaDateTimeFormatService.formatDateAndHHMMATimeToStandardFormat(b[key]);
                     let compareDate = this.annaDateTimeFormatService.compareDate(first, second, isAsc);
                     return compareDate;
                 }
             });
         }
-        else if (sortBy === "startEndTime" || sortBy === "TimeBand") {
+        else if (key == 'startEndTime' || key == 'TimeBand') {
             data.sort((a, b) => {
                 if (isAsc) {
-                    param1 = a[sortBy][1];
-                    param2 = b[sortBy][1];
+                    param1 = a[key][1];
+                    param2 = b[key][1];
                 }
                 else {
-                    param1 = a[sortBy][2];
-                    param2 = b[sortBy][2];
+                    param1 = a[key][2];
+                    param2 = b[key][2];
                 }
                 let val = isAsc
                     ? this.annaDateTimeFormatService.sortByTimeAscending(param1, param2)
@@ -1123,119 +1140,85 @@ class AnnaSortService {
                 return val;
             });
         }
-        else if (sortBy === "days") {
-            data.sort((a, b) => {
-                param1 = a[sortBy].includes("-") ? Days[a[sortBy].split("-")[0]] : Days[a[sortBy]];
-                param2 = b[sortBy].includes("-") ? Days[b[sortBy].split("-")[0]] : Days[b[sortBy]];
-                return this.annaDateTimeFormatService.compare(param1, param2, isAsc);
-            });
-        }
-        //sort by string or number
         else {
-            data.forEach((a) => {
-                // if(a['sort'] == undefined) //
-                //for component other than enter/edit lur page
-                if (!("sort" in a)) {
-                    dataToInclude.push(a);
-                }
-                //for enter/edit lur page
-                else {
-                    dataToExclude.push(a);
+            data.sort((a, b) => {
+                param1 = a[key];
+                param2 = b[key];
+                if (param1 !== param2) {
+                    return this.annaDateTimeFormatService.compare(param1, param2, isAsc);
                 }
+                return 0;
             });
-            data = [];
-            data = dataToInclude;
+        }
+        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) => {
-                param1 = a[sortBy];
-                param2 = b[sortBy];
-                if (Array.isArray(a[sortBy])) {
-                    param1 = a[sortBy][0] === "-" ? 0 : a[sortBy][0];
-                    if (a[sortBy][0].includes(Constants.dollars)) {
-                        param1 = +a[sortBy][0].split(Constants.dollars)[1];
-                    }
+                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 (Array.isArray(b[sortBy])) {
-                    param2 = b[sortBy][0] == "-" ? 0 : b[sortBy][0];
-                    if (b[sortBy][0].includes(Constants.dollars)) {
-                        param2 = +b[sortBy][0].split(Constants.dollars)[1];
-                    }
+                if (bInventoryCodeWeekWiseKey.length > 0) {
+                    param2 =
+                        b.WeekWiseInventoryCodeData[bInventoryCodeWeekWiseKey[0]][sortKey][1];
                 }
                 if (param1 !== param2) {
                     return this.annaDateTimeFormatService.compare(param1, param2, isAsc);
                 }
-                // CHANGES@ANNALIB changed it to from false to 0
                 return 0;
             });
-            if (dataToExclude.length > 0) {
-                if (sortBy.includes("_")) {
-                    let keys = sortBy.split("_");
-                    let weekNumber = keys[0];
-                    let sortKey = keys[1];
-                    if (keys.length > 2) {
-                        sortKey = keys[2] == true ? "BookedAurIncludingNoChargeSpots" : "BookedAurExcludingNoChargeSpots";
-                    }
-                    dataToExclude.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 {
-                    dataToExclude.sort((a, b) => {
-                        param1 = a[sortBy];
-                        param2 = b[sortBy];
-                        if (param1 !== param2) {
-                            return this.annaDateTimeFormatService.compare(param1, param2, isAsc);
-                        }
-                        return 0;
-                    });
-                }
-            }
-        }
-        return { data: [...data, ...dataToExclude], type: isAsc };
-    }
-    callSort(data) {
-        let sortBy = null;
-        let isAsc;
-        this.sortByAsc.forEach((value, key) => {
-            if (value === true) {
-                sortBy = key;
-                isAsc = true;
-            }
-        });
-        if (sortBy == null) {
-            this.sortByDesc.forEach((value, key) => {
-                if (value === true) {
-                    sortBy = key;
-                    isAsc = false;
+                    param1 = a[key][2];
+                    param2 = b[key][2];
                 }
+                let val = isAsc
+                    ? this.annaDateTimeFormatService.sortByTimeAscending(param1, param2)
+                    : this.annaDateTimeFormatService.sortByTimeDescending(param1, param2);
+                return val;
             });
         }
-        if (sortBy != null) {
-            return this.sort(isAsc, data, sortBy).data;
-        }
         else {
-            return data;
+            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" });
+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",
+                    providedIn: 'root',
                 }]
         }], ctorParameters: function () { return [{ type: AnnaDateTimeFormatService }]; } });
 
@@ -1261,16 +1244,12 @@ class AnnaGenericTableService {
         return numberOfSkeletonColumns;
     }
     initColumnFilterAndSorting() {
-        this.annaFilterService.tooltipMap = new Map();
         this.annaFilterService.tooltipSelectedMap = new Map();
         this.annaFilterService.selectedRadio = null;
         this.annaFilterService.appliedFiltersArray = [];
         this.annaFilterService.initialValueMap = new Map();
-        this.annaSortService.tooltip = null;
-        this.annaSortService.sortByAsc = new Map();
-        this.annaSortService.sortByDesc = new Map();
-        this.annaSortService.keySorted = null;
-        this.annaSortService.isAsc = false;
+        this.annaSortService.columnSortState = new Map();
+        this.annaSortService.noSortingAppliedData = [];
     }
 }
 AnnaGenericTableService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.2.7", ngImport: i0, type: AnnaGenericTableService, deps: [{ token: AnnaFilterService }, { token: AnnaSortService }], target: i0.ɵɵFactoryTarget.Injectable });
@@ -1284,11 +1263,45 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.2.7", ngImpor
 
 ;
 
+class Constants {
+}
+Constants.SUCCESS_STRING = "success";
+Constants.BACKEND_SERVER_URL = "/server/public/index.php/api";
+Constants.ERROR_MSG = "Error occurred please try again.";
+Constants.NO_DATA_MSG = "No Data to display";
+Constants.SERVER_ERROR = "Server error. Please try Again";
+Constants.USER_ORIGIN = "ANNA";
+Constants.ACTIVE_USER_STATUS = "active";
+Constants.DELETED_USER_STATUS = "deleted";
+Constants.INACTIVE_USER_STATUS = "inactive";
+Constants.OGAdminRole = "OG-admin";
+Constants.dollars = "$";
+class ErrorCodes {
+}
+ErrorCodes.BAD_REQUEST = 400;
+ErrorCodes.SERVER_ERROR = 500;
+ErrorCodes.SUCCESS_CODE = 200;
+ErrorCodes.SUCCESS_CODE_GET = 200;
+ErrorCodes.SUCCESS_CODE_POST = 201;
+ErrorCodes.SUCCESS_CODE_PATCH = 204;
+ErrorCodes.NO_CONTENT = 204;
+ErrorCodes.under_review = 409;
+var Days;
+(function (Days) {
+    Days[Days["M"] = 1] = "M";
+    Days[Days["Tu"] = 2] = "Tu";
+    Days[Days["We"] = 3] = "We";
+    Days[Days["Th"] = 4] = "Th";
+    Days[Days["F"] = 5] = "F";
+    Days[Days["Sa"] = 6] = "Sa";
+    Days[Days["Su"] = 7] = "Su";
+})(Days || (Days = {}));
+
 //Modules
 
 /**
  * Generated bundle index. Do not edit.
  */
 
-export { AllSelectedStatus, AnnaBuyerApprovalIconTemplateComponent, AnnaCoreSharedLibModule, AnnaDateTimeFormatService, AnnaFilterSearchedTextPipe, AnnaFilterService, AnnaGenericTableService, AnnaGlobalConfigService, AnnaLiveIconTemplateComponent, AnnaNoDataComponent, AnnaNotifyIconTemplateComponent, AnnaPayForPerformanceIconTemplateComponent, AnnaRejectedIconTemplateComponent, AnnaSortService, Constants, Days, ErrorCodes, radioButtonModel, tooltipModel, tooltipModelForColumnLevelFiltering };
+export { AllSelectedStatus, AnnaBuyerApprovalIconTemplateComponent, AnnaCoreSharedLibModule, AnnaDateTimeFormatService, AnnaFilterSearchedTextPipe, AnnaFilterService, AnnaGenericTableService, AnnaGlobalConfigService, AnnaLiveIconTemplateComponent, AnnaNoDataComponent, AnnaNotifyIconTemplateComponent, AnnaPayForPerformanceIconTemplateComponent, AnnaRejectedIconTemplateComponent, AnnaSortService, Constants, Days, ErrorCodes, TooltipModel, radioButtonModel, tooltipModelForColumnLevelFiltering };
 //# sourceMappingURL=annalib-anna-core-src-lib-anna-core-shared-lib.mjs.map