@annalib/anna-core 6.0.4 → 6.0.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-core-shared-lib/services/anna-date-time-format.service.mjs +5 -5
- package/esm2020/lib/anna-generic-table-lib/components/anna-non-editable-generic-table/anna-non-editable-generic-table.component.mjs +4 -3
- package/fesm2015/annalib-anna-core.mjs +7 -6
- package/fesm2015/annalib-anna-core.mjs.map +1 -1
- package/fesm2020/annalib-anna-core.mjs +7 -6
- package/fesm2020/annalib-anna-core.mjs.map +1 -1
- package/package.json +1 -1
|
@@ -378,16 +378,16 @@ class AnnaDateTimeFormatService {
|
|
|
378
378
|
return isAsc ? dayjs(a).diff(b) : dayjs(b).diff(a);
|
|
379
379
|
}
|
|
380
380
|
static formatTwentyFourHourTimeToHHMMAFormat(value, date) {
|
|
381
|
-
value = dayjs(date ? date : '01/01/2000 ' + value).format("
|
|
381
|
+
value = dayjs(date ? date : '01/01/2000 ' + value).format("HH:mm:ss");
|
|
382
382
|
return value[3] == "0" && value[4] == "0"
|
|
383
383
|
? dayjs(value, ["HH:mm:ss"]).format("hA").slice(0, -1)
|
|
384
384
|
: dayjs(value, ["HH:mm:ss"]).format("h:mmA").slice(0, -1);
|
|
385
385
|
}
|
|
386
386
|
static formatTwelveHourTimeToHHMMAFormat(timeValue, date) {
|
|
387
|
-
timeValue = dayjs(date ? date : '01/01/2000 ' + timeValue).format("
|
|
387
|
+
timeValue = dayjs(date ? date : '01/01/2000 ' + timeValue).format("HH:mm:ss");
|
|
388
388
|
return timeValue[3] == "0" && timeValue[4] == "0"
|
|
389
|
-
? dayjs(timeValue).format("hA").slice(0, -1)
|
|
390
|
-
: dayjs(timeValue).format("h:mmA").slice(0, -1);
|
|
389
|
+
? dayjs(timeValue, ["HH:mm:ss"]).format("hA").slice(0, -1)
|
|
390
|
+
: dayjs(timeValue, ["HH:mm:ss"]).format("h:mmA").slice(0, -1);
|
|
391
391
|
}
|
|
392
392
|
formatDateAndHHMMATimeToStandardFormat(dateAndTime) {
|
|
393
393
|
let standardFormat, date, time;
|
|
@@ -1911,7 +1911,7 @@ class AnnaNonEditableGenericTableComponent {
|
|
|
1911
1911
|
this.tooltipRadioTextMap.set("bookedEffectiveCppValue", "Effective CPP");
|
|
1912
1912
|
this.tooltipRadioTextMap.set("bookedCpmValue", "Booked CPM");
|
|
1913
1913
|
this.tooltipRadioTextMap.set("bookedEffectiveCpmValue", "Effective CPM");
|
|
1914
|
-
this.tooltipRadioTextMap.set("orderSource", "Order
|
|
1914
|
+
this.tooltipRadioTextMap.set("orderSource", "Order Source");
|
|
1915
1915
|
this.tooltipRadioTextMap.set("orderCategory", "Rev Category");
|
|
1916
1916
|
this.tooltipRadioTextMap.set("cashOrTrade", "C/T");
|
|
1917
1917
|
this.tooltipRadioTextMap.set("revisionStartDate", "Revision Start Date");
|
|
@@ -2128,7 +2128,8 @@ class AnnaNonEditableGenericTableComponent {
|
|
|
2128
2128
|
}
|
|
2129
2129
|
disableActiveFilterClearButton() {
|
|
2130
2130
|
let selectedFilterSet = new Set(this.annaFilterService.appliedFiltersArray);
|
|
2131
|
-
let isSortPresent = (this.annaSortService.columnSortState.size > 0 && this.annaSortService.columnSortState.
|
|
2131
|
+
let isSortPresent = (this.annaSortService.columnSortState.size > 0 && this.annaSortService.columnSortState.has(this.annaFilterService.selectedRadio)
|
|
2132
|
+
&& this.annaSortService.columnSortState.get(this.annaFilterService.selectedRadio) != "DEFAULT");
|
|
2132
2133
|
this.disableColumnClearAllBtn = selectedFilterSet.has(this.annaFilterService.selectedRadio) || isSortPresent ? false : true;
|
|
2133
2134
|
}
|
|
2134
2135
|
getSliderData(header) {
|