@annalib/anna-core 4.2.20 → 4.3.0

package/fesm2015/annalib-anna-core.mjs

@@ -21,8 +21,10 @@ import { NgxSkeletonLoaderModule } from 'ngx-skeleton-loader';
 import * as i16 from 'ng-circle-progress';
 import { NgCircleProgressModule } from 'ng-circle-progress';
 import { memoize, min, max, uniq, cloneDeep, isEqual, map, sortBy } from 'lodash-es';
-import moment from 'moment';
+import dayjs from 'dayjs';
 import { Subject, BehaviorSubject, animationFrameScheduler, asapScheduler, Observable, Subscription, isObservable, of } from 'rxjs';
+import minMax from 'dayjs/plugin/minMax';
+import isBetween from 'dayjs/plugin/isBetween';
 import { startWith, auditTime, takeUntil, distinctUntilChanged, pairwise, switchMap, shareReplay, map as map$1 } from 'rxjs/operators';
 import * as i1$1 from '@angular/cdk/bidi';
 import { coerceNumberProperty } from '@angular/cdk/coercion';
@@ -241,16 +243,16 @@ class AnnaDateTimeFormatService {
     }
     convertToNgbDateStandardFormat(date) {
         return {
-            year: parseInt(moment(date, "MM/DD/YYYY").format("YYYY")),
-            month: parseInt(moment(date, "MM/DD/YYYY").format("M")),
-            day: parseInt(moment(date, "MM/DD/YYYY").format("D")),
+            year: parseInt(dayjs(date, "MM/DD/YYYY").format("YYYY")),
+            month: parseInt(dayjs(date, "MM/DD/YYYY").format("M")),
+            day: parseInt(dayjs(date, "MM/DD/YYYY").format("D")),
         };
     }
     convertToNgbDate(date, parseFormat) {
         return {
-            year: parseInt(moment(date, parseFormat).format("YYYY")),
-            month: parseInt(moment(date, parseFormat).format("M")),
-            day: parseInt(moment(date, parseFormat).format("D")),
+            year: parseInt(dayjs(date, parseFormat).format("YYYY")),
+            month: parseInt(dayjs(date, parseFormat).format("M")),
+            day: parseInt(dayjs(date, parseFormat).format("D")),
         };
     }
     formatToTwelveHrs(time, callRemoveZero) {
@@ -341,8 +343,8 @@ class AnnaDateTimeFormatService {
     }
     sortByTimeAscending(a, b) {
         let format = "HH:mm:ss";
-        a = moment(a, format);
-        b = moment(b, format);
+        a = dayjs(a, format);
+        b = dayjs(b, format);
         let results;
         results = a.hours() > b.hours() ? 1 : a.hours() < b.hours() ? -1 : 0;
         if (results === 0)
@@ -353,8 +355,8 @@ class AnnaDateTimeFormatService {
     }
     sortByTimeDescending(a, b) {
         let format = "HH:mm:ss";
-        a = moment(a, format);
-        b = moment(b, format);
+        a = dayjs(a, format);
+        b = dayjs(b, format);
         let results;
         results = a.hours() < b.hours() ? 1 : a.hours() > b.hours() ? -1 : 0;
         if (results === 0)
@@ -363,27 +365,27 @@ class AnnaDateTimeFormatService {
             results = a.seconds() < b.seconds() ? 1 : a.seconds() > b.seconds() ? -1 : 0;
         return results;
     }
-    convertNgbDateToMoment(ngbDate) {
-        let converted = moment();
+    convertNgbDateToDayjs(ngbDate) {
+        let converted = dayjs();
         converted.month(ngbDate.month - 1);
         converted.date(ngbDate.day);
         converted.year(ngbDate.year);
         return converted.format("MM/DD/YYYY");
     }
     compareDate(a, b, isAsc) {
-        return isAsc ? moment(a).diff(b) : moment(b).diff(a);
+        return isAsc ? dayjs(a).diff(b) : dayjs(b).diff(a);
     }
     static formatTwentyFourHourTimeToHHMMAFormat(value) {
-        value = moment(value, ["HH:mm:ss"]).format("HH:mm:ss");
+        value = dayjs(value, ["HH:mm:ss"]).format("HH:mm:ss");
         return value[3] == "0" && value[4] == "0"
-            ? moment(value, ["HH:mm:ss"]).format("hA").slice(0, -1)
-            : moment(value, ["HH:mm:ss"]).format("h:mmA").slice(0, -1);
+            ? dayjs(value, ["HH:mm:ss"]).format("hA").slice(0, -1)
+            : dayjs(value, ["HH:mm:ss"]).format("h:mmA").slice(0, -1);
     }
     static formatTwelveHourTimeToHHMMAFormat(value) {
-        value = moment(value, ["HH:mm:A"]).format("HH:mm:ss");
+        value = dayjs(value, ["HH:mm:A"]).format("HH:mm:ss");
         return value[3] == "0" && value[4] == "0"
-            ? moment(value, ["HH:mm:ss"]).format("hA").slice(0, -1)
-            : moment(value, ["HH:mm:ss"]).format("h:mmA").slice(0, -1);
+            ? dayjs(value, ["HH:mm:ss"]).format("hA").slice(0, -1)
+            : dayjs(value, ["HH:mm:ss"]).format("h:mmA").slice(0, -1);
     }
     formatDateAndHHMMATimeToStandardFormat(dateAndTime) {
         let standardFormat, date, time;
@@ -397,7 +399,7 @@ class AnnaDateTimeFormatService {
         else {
             standardFormat = dateAndTime + " 00:00 AM";
         }
-        return moment(standardFormat).format("MM/DD/YYYY hh:mm A");
+        return dayjs(standardFormat).format("MM/DD/YYYY hh:mm A");
     }
     compare(a, b, isAsc) {
         if (typeof a == 'string' && typeof b == 'string') {
@@ -408,11 +410,11 @@ class AnnaDateTimeFormatService {
     }
     sortDataByBroadcastTimeAsc(firstParamTime, secondParamTime, broadcastTime) {
         let format = "HH:mm:ss";
-        let a = moment(firstParamTime, format);
-        let b = moment(secondParamTime, format);
-        let broadcastMomentDateTime = moment(broadcastTime, "HH:mm:ss");
-        a = a.isBefore(broadcastMomentDateTime) ? a.add(1, "d") : a;
-        b = b.isBefore(broadcastMomentDateTime) ? b.add(1, "d") : b;
+        let a = dayjs(firstParamTime, format);
+        let b = dayjs(secondParamTime, format);
+        let broadcastdayjsDateTime = dayjs(broadcastTime, "HH:mm:ss");
+        a = a.isBefore(broadcastdayjsDateTime) ? a.add(1, "d") : a;
+        b = b.isBefore(broadcastdayjsDateTime) ? b.add(1, "d") : b;
         let result = a.isBefore(b) ? -1 : a.isAfter(b) ? 1 : 0;
         return result;
     }
@@ -599,13 +601,13 @@ class AnnaWeekCalendarComponent {
         }
     }
     getWeekNumber(week, firstDayOfWeek) {
-        const weekStartDate = moment(convertNgbDateToMoment(week[0]), "MM/DD/YYYY");
+        const weekStartDate = dayjs(convertNgbDateTodayjs(week[0]), "MM/DD/YYYY");
         const weekYear = weekStartDate.year();
-        const yearStartDate = moment(`01/01/${weekYear}`, "MM/DD/YYYY");
+        const yearStartDate = dayjs(`01/01/${weekYear}`, "MM/DD/YYYY");
         const weekDay = yearStartDate.day();
         const noOfDays = weekStartDate.diff(yearStartDate, "d") + 1;
-        function convertNgbDateToMoment(ngbDate) {
-            let converted = moment();
+        function convertNgbDateTodayjs(ngbDate) {
+            let converted = dayjs();
             converted.month(ngbDate.month - 1);
             converted.date(ngbDate.day);
             converted.year(ngbDate.year);
@@ -684,15 +686,15 @@ class AnnaWeekCalendarComponent {
                 this.toDate = this.constructEndDate(dateObject)(constructDate);
             }
             if (this.disabledDates.length > 0) {
-                let momentStartDate = moment(this.annaDateTimeFormatService.convertNgbDateToMoment(this.fromDate), "MM/DD/YYYY");
-                let momentEndDate = moment(this.annaDateTimeFormatService.convertNgbDateToMoment(this.toDate), "MM/DD/YYYY");
+                let dayjsStartDate = dayjs(this.annaDateTimeFormatService.convertNgbDateToDayjs(this.fromDate), "MM/DD/YYYY");
+                let dayjsEndDate = dayjs(this.annaDateTimeFormatService.convertNgbDateToDayjs(this.toDate), "MM/DD/YYYY");
                 let ngbDate;
-                while (!momentStartDate.isSame(momentEndDate)) {
-                    ngbDate = this.annaDateTimeFormatService.convertToNgbDate(momentStartDate, "MM/DD/YYYY");
+                while (!dayjsStartDate.isSame(dayjsEndDate)) {
+                    ngbDate = this.annaDateTimeFormatService.convertToNgbDate(dayjsStartDate, "MM/DD/YYYY");
                     if (this.checkIfDateIsDisabled(ngbDate)) {
                         break;
                     }
-                    momentStartDate.add(1, "d");
+                    dayjsStartDate.add(1, "d");
                 }
                 let newDateObject = new Date(ngbDate.year, ngbDate.month - 1, ngbDate.day - 1);
                 let constructDate = this.buildDate(newDateObject);
@@ -970,10 +972,10 @@ class AnnaCalendarFilterComponent {
     }
     setInputText() {
         if (this.fromDate && this.toDate) {
-            this.dateToBeShownInInput = `${this.annaTimeService.convertNgbDateToMoment(this.fromDate)} - ${this.annaTimeService.convertNgbDateToMoment(this.toDate)}`;
+            this.dateToBeShownInInput = `${this.annaTimeService.convertNgbDateToDayjs(this.fromDate)} - ${this.annaTimeService.convertNgbDateToDayjs(this.toDate)}`;
         }
         else if (this.fromDate) {
-            this.dateToBeShownInInput = `${this.annaTimeService.convertNgbDateToMoment(this.fromDate)}`;
+            this.dateToBeShownInInput = `${this.annaTimeService.convertNgbDateToDayjs(this.fromDate)}`;
         }
     }
 }
@@ -1231,6 +1233,8 @@ class AnnaFilterService {
             }
             return data.toString();
         };
+        dayjs.extend(minMax);
+        dayjs.extend(isBetween);
         console.log("AnnaFilterService service created.");
         const sliderArr = [
             "rcvPreempt",
@@ -1279,9 +1283,9 @@ class AnnaFilterService {
     }
     returnMinAndMaxDate(data, key) {
         data = data.filter((obj) => !["", "-", null].includes(obj[key]));
-        let DateArr = data.map((obj) => moment(obj[key]));
-        let minDate = moment.min(DateArr);
-        let maxDate = moment.max(DateArr);
+        let DateArr = data.map((obj) => dayjs(obj[key]));
+        let minDate = dayjs.min(DateArr);
+        let maxDate = dayjs.max(DateArr);
         return [minDate, maxDate];
     }
     isTooltipActive(header, sortMap) {
@@ -1315,7 +1319,7 @@ class AnnaFilterService {
         let uniqueDates = uniq(data.map((u) => u["date"]));
         let uniqueDatesInNgbDateFormat = [];
         uniqueDates.forEach((date) => {
-            uniqueDatesInNgbDateFormat.push(this.dateTimeFormatService.convertToNgbDateStandardFormat(moment(date, "MM/DD/YY").format("MM/DD/YYYY")));
+            uniqueDatesInNgbDateFormat.push(this.dateTimeFormatService.convertToNgbDateStandardFormat(dayjs(date, "MM/DD/YY").format("MM/DD/YYYY")));
         });
         return uniqueDatesInNgbDateFormat;
     }
@@ -1408,17 +1412,17 @@ class AnnaFilterService {
         return filteredData;
     }
     returnOrdersInTheRange(order, range, key) {
-        let isDateBetweenTheSelectedRange = moment(order[key]).isBetween(range.minSelectedDate, range.maxSelectedDate);
-        let isDateSameAsTheMinSelectedDate = moment(order[key]).isSame(range.minSelectedDate);
-        let isDateSameAsTheMaxSelectedDate = moment(order[key]).isSame(range.maxSelectedDate);
+        let isDateBetweenTheSelectedRange = dayjs(order[key]).isBetween(range.minSelectedDate, range.maxSelectedDate);
+        let isDateSameAsTheMinSelectedDate = dayjs(order[key]).isSame(range.minSelectedDate);
+        let isDateSameAsTheMaxSelectedDate = dayjs(order[key]).isSame(range.maxSelectedDate);
         return isDateBetweenTheSelectedRange || isDateSameAsTheMinSelectedDate || isDateSameAsTheMaxSelectedDate;
     }
     returnDataForTimeRange(obj, selectedData) {
         let format = "HH:mm:ss";
-        let selectedStartDate = moment(selectedData.startTime, format);
-        let selectedEndDate = moment(selectedData.endTime, format);
-        let startTime = moment(obj.startTime, format);
-        let endTime = moment(obj.endTime, format);
+        let selectedStartDate = dayjs(selectedData.startTime, format);
+        let selectedEndDate = dayjs(selectedData.endTime, format);
+        let startTime = dayjs(obj.startTime, format);
+        let endTime = dayjs(obj.endTime, format);
         let isStartTimeSameAsSelectedStartTime = startTime.isSame(selectedStartDate);
         let isStartTimeBetweenSelectedStartAndEndTime = startTime.isBetween(selectedStartDate, selectedEndDate);
         let isEndTimeSameAsSelectedEndTime = endTime.isSame(selectedEndDate);
@@ -1430,8 +1434,8 @@ class AnnaFilterService {
     }
     returnDataForFromAndToTimeRange(obj, selectedData, key) {
         let format = "HH:mm:ss";
-        let selectedFromTime = moment(selectedData.fromTime, format);
-        let selectedToTime = moment(selectedData.toTime, format);
+        let selectedFromTime = dayjs(selectedData.fromTime, format);
+        let selectedToTime = dayjs(selectedData.toTime, format);
         let objTime = obj[key];
         if (["", "-", null].includes(objTime)) {
             return false;
@@ -1451,18 +1455,18 @@ class AnnaFilterService {
         if (!selectedData.includeTimeRange) {
             return false;
         }
-        let momentTime = moment(objTime, format);
-        let isObjTimeSameAsSelectedFromTime = momentTime.isSame(selectedFromTime);
-        let isObjTimeSameAsSelectedToTime = momentTime.isSame(selectedToTime);
-        let isObjTimeBetweenSelectedFromTimeAndToTime = momentTime.isBetween(selectedFromTime, selectedToTime);
+        let dayjsTime = dayjs(objTime, format);
+        let isObjTimeSameAsSelectedFromTime = dayjsTime.isSame(selectedFromTime);
+        let isObjTimeSameAsSelectedToTime = dayjsTime.isSame(selectedToTime);
+        let isObjTimeBetweenSelectedFromTimeAndToTime = dayjsTime.isBetween(selectedFromTime, selectedToTime);
         return (isObjTimeSameAsSelectedFromTime ||
             isObjTimeSameAsSelectedToTime ||
             isObjTimeBetweenSelectedFromTimeAndToTime);
     }
     returnDataForStartAndEndTimeRange(obj, selectedData, key) {
         let format = "HH:mm:ss";
-        let selectedFromTime = moment(selectedData.fromTime, format);
-        let selectedToTime = moment(selectedData.toTime, format);
+        let selectedFromTime = dayjs(selectedData.fromTime, format);
+        let selectedToTime = dayjs(selectedData.toTime, format);
         if (selectedData.includeMulti && obj[key][0] == "<multi>") {
             return true;
         }
@@ -1478,8 +1482,8 @@ class AnnaFilterService {
         if (!selectedData.includeTimeRange) {
             return false;
         }
-        let startTime = moment(obj[key][1], format);
-        let endTime = moment(obj[key][2], format);
+        let startTime = dayjs(obj[key][1], format);
+        let endTime = dayjs(obj[key][2], format);
         let isStartTimeSameAsSelectedStartTime = startTime.isSame(selectedFromTime);
         let isStartTimeBetweenSelectedStartAndEndTime = startTime.isBetween(selectedFromTime, selectedToTime);
         let isEndTimeSameAsSelectedEndTime = endTime.isSame(selectedToTime);
@@ -1493,20 +1497,20 @@ class AnnaFilterService {
         let parsingFormat;
         if (key === "period") {
             parsingFormat = "YYYY-MM-DD";
-            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);
-            let startDateIsSameAsSelStartDate = value.fromDate.isSame(momentStartDate);
-            let endDateIsSameAsSelEndDate = value.toDate.isSame(momentEndDate);
+            let dayjsStartDate = dayjs(obj.startDate);
+            let dayjsEndDate = dayjs(obj.endDate);
+            let startDateIsBetweenSelDate = dayjsStartDate.isBetween(value.fromDate, value.toDate);
+            let endDateIsBetweenSelDate = dayjsEndDate.isBetween(value.fromDate, value.toDate);
+            let startDateIsSameAsSelStartDate = value.fromDate.isSame(dayjsStartDate);
+            let endDateIsSameAsSelEndDate = value.toDate.isSame(dayjsEndDate);
             return ((startDateIsBetweenSelDate || startDateIsSameAsSelStartDate) &&
                 (endDateIsBetweenSelDate || endDateIsSameAsSelEndDate));
         }
         else if (key === "AirDate" || key === "flightStartDate" || key === "flightEndDate") {
             parsingFormat = "MM/DD/YYYY";
-            let dateIsBetweenSelDate = moment(obj[key], parsingFormat).isBetween(value.minSelectedDate, value.maxSelectedDate);
-            let dateIsSameAsSelStartDate = moment(obj[key], parsingFormat).isSame(value.minSelectedDate);
-            let dateIsSameAsSelEndDate = moment(obj[key], parsingFormat).isSame(value.maxSelectedDate);
+            let dateIsBetweenSelDate = dayjs(obj[key], parsingFormat).isBetween(value.minSelectedDate, value.maxSelectedDate);
+            let dateIsSameAsSelStartDate = dayjs(obj[key], parsingFormat).isSame(value.minSelectedDate);
+            let dateIsSameAsSelEndDate = dayjs(obj[key], parsingFormat).isSame(value.maxSelectedDate);
             return dateIsBetweenSelDate || dateIsSameAsSelStartDate || dateIsSameAsSelEndDate;
         }
     }
@@ -1579,10 +1583,10 @@ class AnnaFilterService {
     }
     isObjectInTheRange(obj, value, key) {
         let objVal = obj[key];
-        let momentDate = moment(objVal);
+        let dayjsDate = dayjs(objVal);
         let isDateSameAsStartOfTheRange = value.fromDate.isSame(objVal);
         let isDateSameAsEndOfTheRange = value.toDate.isSame(objVal);
-        let isDateBetweenTheStartAndEndOfRange = momentDate.isBetween(value.fromDate, value.toDate);
+        let isDateBetweenTheStartAndEndOfRange = dayjsDate.isBetween(value.fromDate, value.toDate);
         return isDateSameAsStartOfTheRange || isDateSameAsEndOfTheRange || isDateBetweenTheStartAndEndOfRange;
     }
     updateStateOfTheCurrentFilterTab(sortMap) {
@@ -1895,7 +1899,7 @@ class AnnaNonEditableGenericTableComponent {
         this.tooltipRadioTextMap.set("bookedCpmValue", "Booked CPM");
         this.tooltipRadioTextMap.set("bookedEffectiveCpmValue", "Effective CPM");
         this.tooltipRadioTextMap.set("orderSource", "Order Source");
-        this.tooltipRadioTextMap.set("orderCategory", "Rev Category");
+        this.tooltipRadioTextMap.set("orderCategory", "Category");
         this.tooltipRadioTextMap.set("cashOrTrade", "C/T");
         this.tooltipRadioTextMap.set("revisionStartDate", "Revision Start Date");
     }
@@ -2627,8 +2631,8 @@ class AnnaNonEditableGenericTableComponent {
                 currentSelectedDate = this.annaFilterService.initialValueMap.get(this.annaFilterService.selectedRadio);
             }
             else {
-                currentSelectedDate.fromDate = moment(this.annaDateTimeFormatService.convertNgbDateToMoment(currentSelectedDate.fromDate));
-                currentSelectedDate.toDate = moment(this.annaDateTimeFormatService.convertNgbDateToMoment(currentSelectedDate.toDate));
+                currentSelectedDate.fromDate = dayjs(this.annaDateTimeFormatService.convertNgbDateToDayjs(currentSelectedDate.fromDate));
+                currentSelectedDate.toDate = dayjs(this.annaDateTimeFormatService.convertNgbDateToDayjs(currentSelectedDate.toDate));
             }
             this.annaFilterService.reOrderAppliedFiltersState(this.clonedTableData, currentSelectedDate);
             this.annaFilterService.tooltipSelectedMap.set(this.annaFilterService.selectedRadio, currentSelectedDate);
@@ -2786,7 +2790,7 @@ class AnnaNonEditableGenericTableComponent {
         let startTime24HrFormat = startTime24HrFormatArr[0] + ":" + startTime24HrFormatArr[1] + ":00";
         let endTime24HrFormatArr = this.annaDateTimeFormatService.convertTotwentyFourHrsFormat(this.selectedToTime[0] + ":" + this.selectedToTime[1] + " " + this.selectedToTime[2], true);
         let endTime24HrFormat = endTime24HrFormatArr[0] + ":" + endTime24HrFormatArr[1] + ":00";
-        return !(moment(startTime24HrFormat, timeFormat).isAfter(moment(endTime24HrFormat, timeFormat)));
+        return !(dayjs(startTime24HrFormat, timeFormat).isAfter(dayjs(endTime24HrFormat, timeFormat)));
     }
     sortedData(event) {
         if (event.type == "none") {
@@ -3185,8 +3189,8 @@ class AnnaNonEditableGenericTableComponent {
                 currentSelectedDate = this.annaFilterService.initialValueMap.get(this.annaFilterService.selectedRadio);
             }
             else {
-                currentSelectedDate.fromDate = moment(this.annaDateTimeFormatService.convertNgbDateToMoment(currentSelectedDate.fromDate));
-                currentSelectedDate.toDate = moment(this.annaDateTimeFormatService.convertNgbDateToMoment(currentSelectedDate.toDate));
+                currentSelectedDate.fromDate = dayjs(this.annaDateTimeFormatService.convertNgbDateToDayjs(currentSelectedDate.fromDate));
+                currentSelectedDate.toDate = dayjs(this.annaDateTimeFormatService.convertNgbDateToDayjs(currentSelectedDate.toDate));
             }
             this.isFilterChanged = !isEqual(previousSelectedDate, currentSelectedDate);
         }