@annalib/anna-core 11.2.7 → 11.2.8
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 +7 -7
- package/esm2020/lib/anna-core-shared-lib/services/anna-filter.service.mjs +10 -10
- package/fesm2015/annalib-anna-core.mjs +15 -15
- package/fesm2015/annalib-anna-core.mjs.map +1 -1
- package/fesm2020/annalib-anna-core.mjs +15 -15
- package/fesm2020/annalib-anna-core.mjs.map +1 -1
- package/package.json +1 -1
|
@@ -343,9 +343,9 @@ class AnnaDateTimeFormatService {
|
|
|
343
343
|
return formattedTime;
|
|
344
344
|
}
|
|
345
345
|
sortByTimeAscending(a, b) {
|
|
346
|
-
let format = "HH:mm:ss";
|
|
347
|
-
a = dayjs(a, format);
|
|
348
|
-
b = dayjs(b, format);
|
|
346
|
+
let format = "MM/DD/YYYY HH:mm:ss";
|
|
347
|
+
a = dayjs('01/01/2001 ' + a, format);
|
|
348
|
+
b = dayjs('01/01/2001 ' + b, format);
|
|
349
349
|
let results;
|
|
350
350
|
results = a.get('hour') > b.get('hour') ? 1 : a.get('hour') < b.get('hour') ? -1 : 0;
|
|
351
351
|
if (results === 0)
|
|
@@ -355,9 +355,9 @@ class AnnaDateTimeFormatService {
|
|
|
355
355
|
return results;
|
|
356
356
|
}
|
|
357
357
|
sortByTimeDescending(a, b) {
|
|
358
|
-
let format = "HH:mm:ss";
|
|
359
|
-
a = dayjs(a, format);
|
|
360
|
-
b = dayjs(b, format);
|
|
358
|
+
let format = "MM/DD/YYYY HH:mm:ss";
|
|
359
|
+
a = dayjs('01/01/2001 ' + a, format);
|
|
360
|
+
b = dayjs('01/01/2001 ' + b, format);
|
|
361
361
|
let results;
|
|
362
362
|
results = a.get('hour') < b.get('hour') ? 1 : a.get('hour') > b.get('hour') ? -1 : 0;
|
|
363
363
|
if (results === 0)
|
|
@@ -1484,9 +1484,9 @@ class AnnaFilterService {
|
|
|
1484
1484
|
(isStartTimeBetweenSelectedStartAndEndTime && isEndTimeSameAsSelectedEndTime));
|
|
1485
1485
|
}
|
|
1486
1486
|
returnDataForFromAndToTimeRange(obj, selectedData, key) {
|
|
1487
|
-
let format = "HH:mm:ss";
|
|
1488
|
-
let selectedFromTime = dayjs(selectedData.fromTime, format);
|
|
1489
|
-
let selectedToTime = dayjs(selectedData.toTime, format);
|
|
1487
|
+
let format = "MM/DD/YYYY HH:mm:ss";
|
|
1488
|
+
let selectedFromTime = dayjs('01/01/2001 ' + selectedData.fromTime, format);
|
|
1489
|
+
let selectedToTime = dayjs('01/01/2001 ' + selectedData.toTime, format);
|
|
1490
1490
|
let objTime = obj[key];
|
|
1491
1491
|
if (["", "-", null].includes(objTime)) {
|
|
1492
1492
|
return false;
|
|
@@ -1506,7 +1506,7 @@ class AnnaFilterService {
|
|
|
1506
1506
|
if (!selectedData.includeTimeRange) {
|
|
1507
1507
|
return false;
|
|
1508
1508
|
}
|
|
1509
|
-
let dayjsTime = dayjs(objTime, format);
|
|
1509
|
+
let dayjsTime = dayjs('01/01/2001 ' + objTime, format);
|
|
1510
1510
|
let isObjTimeSameAsSelectedFromTime = dayjsTime.isSame(selectedFromTime);
|
|
1511
1511
|
let isObjTimeSameAsSelectedToTime = dayjsTime.isSame(selectedToTime);
|
|
1512
1512
|
let isObjTimeBetweenSelectedFromTimeAndToTime = dayjsTime.isBetween(selectedFromTime, selectedToTime);
|
|
@@ -1515,9 +1515,9 @@ class AnnaFilterService {
|
|
|
1515
1515
|
isObjTimeBetweenSelectedFromTimeAndToTime);
|
|
1516
1516
|
}
|
|
1517
1517
|
returnDataForStartAndEndTimeRange(obj, selectedData, key) {
|
|
1518
|
-
let format = "HH:mm:ss";
|
|
1519
|
-
let selectedFromTime = dayjs(selectedData.fromTime, format);
|
|
1520
|
-
let selectedToTime = dayjs(selectedData.toTime, format);
|
|
1518
|
+
let format = "MM/DD/YYYY HH:mm:ss";
|
|
1519
|
+
let selectedFromTime = dayjs('01/01/2001 ' + selectedData.fromTime, format);
|
|
1520
|
+
let selectedToTime = dayjs('01/01/2001 ' + selectedData.toTime, format);
|
|
1521
1521
|
if (selectedData.includeMulti && obj[key][0] == "<multi>") {
|
|
1522
1522
|
return true;
|
|
1523
1523
|
}
|
|
@@ -1533,8 +1533,8 @@ class AnnaFilterService {
|
|
|
1533
1533
|
if (!selectedData.includeTimeRange) {
|
|
1534
1534
|
return false;
|
|
1535
1535
|
}
|
|
1536
|
-
let startTime = dayjs(obj[key][1], format);
|
|
1537
|
-
let endTime = dayjs(obj[key][2], format);
|
|
1536
|
+
let startTime = dayjs('01/01/2001 ' + obj[key][1], format);
|
|
1537
|
+
let endTime = dayjs('01/01/2001 ' + obj[key][2], format);
|
|
1538
1538
|
let isStartTimeSameAsSelectedStartTime = startTime.isSame(selectedFromTime);
|
|
1539
1539
|
let isStartTimeBetweenSelectedStartAndEndTime = startTime.isBetween(selectedFromTime, selectedToTime);
|
|
1540
1540
|
let isEndTimeSameAsSelectedEndTime = endTime.isSame(selectedToTime);
|