@annalib/anna-core 8.0.17 → 8.0.18

package/fesm2020/annalib-anna-core.mjs

@@ -1104,7 +1104,9 @@ class AnnaSortService {
             });
         }
         else {
-            data.sort((a, b) => {
+            let dataWithoutEmptyOrHyphenValues = data.filter(n => n[key] != "-");
+            let rowsWithHyphenOrZeroValues = data.filter(n => n[key] == "-");
+            dataWithoutEmptyOrHyphenValues.sort((a, b) => {
                 param1 = a[key];
                 param2 = b[key];
                 if (param1 !== param2) {
@@ -1112,7 +1114,10 @@ class AnnaSortService {
                 }
                 return 0;
             });
+            data = isAsc ? [...rowsWithHyphenOrZeroValues, ...dataWithoutEmptyOrHyphenValues] :
+                [...dataWithoutEmptyOrHyphenValues, ...rowsWithHyphenOrZeroValues];
         }
+        console.log(data.map(n => n[key]));
         return data;
     }
     sortEnterEditLurAndCsrPage(isAsc, data, key) {
@@ -1289,9 +1294,16 @@ class AnnaFilterService {
             "userChanges",
             "userMG",
             "WeeklyAUR",
-            "WeeklyAURatingOrImpressions"
+            "WeeklyAURatingOrImpressions",
+            "BookedRate",
+            "BookedRTG",
+            "BookedIMPS",
+            "AURTG",
+            "AURTG",
+            "PostedRating",
+            "PostedImpressions",
         ];
-        const calendarArr = ["period", "AirDate", "flightStartDate", "flightEndDate", "date", "startDate", "endDate", "revisionStartDate"];
+        const calendarArr = ["period", "AirDate", "flightStartDate", "flightEndDate", "date", "startDate", "endDate", "revisionStartDate", "Week"];
         const timeArr = ["StartTimeForFilter", "EndTimeForFilter", "time",
             "start_time_for_filter", "end_time_for_filter", "startEndTimeMulti", "startEndTime"];
         this.sliderSet = new Set(sliderArr);
@@ -1379,6 +1391,7 @@ class AnnaFilterService {
             this.selectedRadio === "flightStartDate" ||
             this.selectedRadio === "flightEndDate" ||
             this.selectedRadio == "date" ||
+            this.selectedRadio == "Week" ||
             this.selectedRadio == "revisionStartDate") {
             isFiltered =
                 !isEqual(this.initialValueMap.get(this.selectedRadio), this.tooltipSelectedMap.get(this.selectedRadio)) &&
@@ -1415,7 +1428,8 @@ class AnnaFilterService {
                 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" || key == "revisionStartDate") {
+                else if (key === "startDate" || key === "endDate" || key === "AirDate" || key === "flightStartDate" || key === "flightEndDate" || key == "date" || key == "revisionStartDate"
+                    || key == "Week") {
                     filteredData = filteredData.filter((obj) => this.isObjectInTheRange(obj, value, key));
                 }
                 else if (key === "period") {
@@ -1530,7 +1544,7 @@ class AnnaFilterService {
             return ((startDateIsBetweenSelDate || startDateIsSameAsSelStartDate) &&
                 (endDateIsBetweenSelDate || endDateIsSameAsSelEndDate));
         }
-        else if (key === "AirDate" || key === "flightStartDate" || key === "flightEndDate") {
+        else if (key === "AirDate" || key === "flightStartDate" || key === "flightEndDate" || key === "Week") {
             parsingFormat = "MM/DD/YYYY";
             let dateIsBetweenSelDate = dayjs(obj[key], parsingFormat).isBetween(value.minSelectedDate, value.maxSelectedDate);
             let dateIsSameAsSelStartDate = dayjs(obj[key], parsingFormat).isSame(value.minSelectedDate);
@@ -1588,7 +1602,7 @@ class AnnaFilterService {
         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" || key == "revisionStartDate") {
+        else if (key === "startDate" || key === "endDate" || key === "AirDate" || key === "flightStartDate" || key === "flightEndDate" || key == "date" || key == "revisionStartDate" || key === "Week") {
             filteredData = filteredData.filter((obj) => this.isObjectInTheRange(obj, value, key));
         }
         else if (key === "period") {
@@ -1932,6 +1946,24 @@ class AnnaNonEditableGenericTableComponent {
         this.tooltipRadioTextMap.set("udGrpPercent", "UD GRP %");
         this.tooltipRadioTextMap.set("odImpsPercent", "OD IMPS %");
         this.tooltipRadioTextMap.set("odGrpPercent", "OD GRP %");
+        this.tooltipRadioTextMap.set("SellerLine", "Seller Line #");
+        this.tooltipRadioTextMap.set("BuyerLine", "Buy Line #");
+        this.tooltipRadioTextMap.set("SpotStatus", "Spot Status");
+        this.tooltipRadioTextMap.set("InventoryCode", "Inventory Code");
+        this.tooltipRadioTextMap.set("BuyerProgramName", "Buyer Program Name");
+        this.tooltipRadioTextMap.set("RevenueClass", "Revenue Class");
+        this.tooltipRadioTextMap.set("WeeklyAUR", "AUR");
+        this.tooltipRadioTextMap.set("BookedRate", "Booked Rate");
+        this.tooltipRadioTextMap.set("BookedRTG", "Booked RTG");
+        this.tooltipRadioTextMap.set("BookedIMPS", "Booked IMPS('000)");
+        this.tooltipRadioTextMap.set("AURTG", "AU RTG");
+        this.tooltipRadioTextMap.set("AUIMPS", "AU IMPS('000)");
+        this.tooltipRadioTextMap.set("PostedRatingsOrImpressions", "Posted RTG");
+        this.tooltipRadioTextMap.set("ScheduleFlightWeek", "Schedule Week");
+        this.tooltipRadioTextMap.set("ScheduledDay", "Scheduled Day");
+        this.tooltipRadioTextMap.set("AirStatus", "Aired Status");
+        this.tooltipRadioTextMap.set("AirDateAndTime", "Aired Date & Time");
+        this.tooltipRadioTextMap.set("AdId", "Ad-Id");
     }
     generateTableDataWrapper() {
         this.showSkeletonLoading = true;