@datarailsshared/datarailsshared 1.4.135 → 1.4.136
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/bundles/datarailsshared-datarailsshared.umd.js +2 -3
- package/bundles/datarailsshared-datarailsshared.umd.js.map +1 -1
- package/datarailsshared-datarailsshared-1.4.136.tgz +0 -0
- package/esm2015/lib/utils/dr-shared-utils.js +3 -4
- package/fesm2015/datarailsshared-datarailsshared.js +2 -3
- package/fesm2015/datarailsshared-datarailsshared.js.map +1 -1
- package/package.json +1 -1
- package/datarailsshared-datarailsshared-1.4.135.tgz +0 -0
|
Binary file
|
|
@@ -28,7 +28,7 @@ export class DrSharedUtils {
|
|
|
28
28
|
}
|
|
29
29
|
}
|
|
30
30
|
static getDateByTag(tag) {
|
|
31
|
-
const todayDate = moment().utc();
|
|
31
|
+
const todayDate = moment().utc().endOf('day');
|
|
32
32
|
switch (tag) {
|
|
33
33
|
case DateTags.TODAY:
|
|
34
34
|
return todayDate;
|
|
@@ -39,10 +39,9 @@ export class DrSharedUtils {
|
|
|
39
39
|
todayDate.endOf('month');
|
|
40
40
|
return todayDate;
|
|
41
41
|
case DateTags.PREV_MONTH:
|
|
42
|
-
todayDate.endOf('month');
|
|
43
|
-
todayDate.subtract(1, 'months');
|
|
42
|
+
todayDate.subtract(1, 'months').endOf('month');
|
|
44
43
|
return todayDate;
|
|
45
44
|
}
|
|
46
45
|
}
|
|
47
46
|
}
|
|
48
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
47
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZHItc2hhcmVkLXV0aWxzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vcHJvamVjdHMvZGF0YXJhaWxzc2hhcmVkL3NyYy9saWIvdXRpbHMvZHItc2hhcmVkLXV0aWxzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxNQUFNLE1BQU0sUUFBUSxDQUFDO0FBQ2pDLE9BQU8sRUFBRSxRQUFRLEVBQUUsZUFBZSxFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFFakUsTUFBTSxPQUFPLGFBQWE7SUFDdEI7Ozs7T0FJRztJQUNJLE1BQU0sQ0FBQyx3QkFBd0IsQ0FBQyxNQUFjO1FBQ2pELE1BQU0sWUFBWSxHQUFHLGVBQWUsQ0FBQyxHQUFHLENBQUM7UUFFekMsSUFBSSxDQUFDLE1BQU0sRUFBRTtZQUNULE9BQU8sWUFBWSxDQUFDO1NBQ3ZCO1FBRUQsTUFBTSxlQUFlLEdBQUcsTUFBTSxDQUFDLFdBQVcsRUFBRSxDQUFDO1FBQzdDLFFBQVEsSUFBSSxFQUFFO1lBQ1YsS0FBSyxlQUFlLENBQUMsUUFBUSxDQUFDLEdBQUcsQ0FBQztnQkFDOUIsT0FBTyxlQUFlLENBQUMsT0FBTyxDQUFDO1lBQ25DLEtBQUssZUFBZSxDQUFDLFFBQVEsQ0FBQyxHQUFHLENBQUM7Z0JBQzlCLE9BQU8sZUFBZSxDQUFDLEdBQUcsQ0FBQztZQUMvQixLQUFLLGVBQWUsQ0FBQyxRQUFRLENBQUMsR0FBRyxDQUFDO2dCQUM5QixPQUFPLGVBQWUsQ0FBQyxJQUFJLENBQUM7WUFDaEMsS0FBSyxlQUFlLENBQUMsUUFBUSxDQUFDLEdBQUcsQ0FBQztnQkFDOUIsT0FBTyxlQUFlLENBQUMsS0FBSyxDQUFDO1lBQ2pDLEtBQUssZUFBZSxDQUFDLFFBQVEsQ0FBQyxHQUFHLENBQUM7Z0JBQzlCLE9BQU8sZUFBZSxDQUFDLElBQUksQ0FBQztZQUNoQztnQkFDSSxPQUFPLFlBQVksQ0FBQztTQUMzQjtJQUNMLENBQUM7SUFFTSxNQUFNLENBQUMsWUFBWSxDQUFDLEdBQVc7UUFDbEMsTUFBTSxTQUFTLEdBQUcsTUFBTSxFQUFFLENBQUMsR0FBRyxFQUFFLENBQUMsS0FBSyxDQUFDLEtBQUssQ0FBQyxDQUFDO1FBQzlDLFFBQVEsR0FBRyxFQUFFO1lBQ1QsS0FBSyxRQUFRLENBQUMsS0FBSztnQkFDZixPQUFPLFNBQVMsQ0FBQztZQUNyQixLQUFLLFFBQVEsQ0FBQyxTQUFTO2dCQUNuQixTQUFTLENBQUMsUUFBUSxDQUFDLENBQUMsRUFBRSxNQUFNLENBQUMsQ0FBQztnQkFDOUIsT0FBTyxTQUFTLENBQUM7WUFDckIsS0FBSyxRQUFRLENBQUMsVUFBVTtnQkFDcEIsU0FBUyxDQUFDLEtBQUssQ0FBQyxPQUFPLENBQUMsQ0FBQztnQkFDekIsT0FBTyxTQUFTLENBQUM7WUFDckIsS0FBSyxRQUFRLENBQUMsVUFBVTtnQkFDcEIsU0FBUyxDQUFDLFFBQVEsQ0FBQyxDQUFDLEVBQUUsUUFBUSxDQUFDLENBQUMsS0FBSyxDQUFDLE9BQU8sQ0FBQyxDQUFDO2dCQUMvQyxPQUFPLFNBQVMsQ0FBQztTQUN4QjtJQUNMLENBQUM7Q0FDSiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCAqIGFzIG1vbWVudCBmcm9tICdtb21lbnQnO1xuaW1wb3J0IHsgRGF0ZVRhZ3MsIFRpbWVmcmFtZU9wdGlvbiB9IGZyb20gJy4uL21vZGVscy9kYXRlUGlja2VyJztcblxuZXhwb3J0IGNsYXNzIERyU2hhcmVkVXRpbHMge1xuICAgIC8qKlxuICAgICAqIEdldCB0aW1lZnJhbWUgKGRheSwgeWVhciwgbW9udGgsIHF1YXJ0ZXIpIGJhc2VkIG9uIHBhc3NlZCBmb3JtYXRcbiAgICAgKlxuICAgICAqIEBwYXJhbSBmb3JtYXQgLSBkYXRlIGZvcm1hdCBzdHJpbmcuIEV4YW1wbGVzOiBNTS9ERC9ZWVlZLCBRL1lZWVlcbiAgICAgKi9cbiAgICBwdWJsaWMgc3RhdGljIGdldFRpbWVmcmFtZUJ5RGF0ZUZvcm1hdChmb3JtYXQ6IHN0cmluZyk6IFRpbWVmcmFtZU9wdGlvbiB7XG4gICAgICAgIGNvbnN0IGRlZmF1bHRGcmFtZSA9IFRpbWVmcmFtZU9wdGlvbi5EQVk7XG5cbiAgICAgICAgaWYgKCFmb3JtYXQpIHtcbiAgICAgICAgICAgIHJldHVybiBkZWZhdWx0RnJhbWU7XG4gICAgICAgIH1cblxuICAgICAgICBjb25zdCBsb3dlckNhc2VGb3JtYXQgPSBmb3JtYXQudG9Mb3dlckNhc2UoKTtcbiAgICAgICAgc3dpdGNoICh0cnVlKSB7XG4gICAgICAgICAgICBjYXNlIGxvd2VyQ2FzZUZvcm1hdC5pbmNsdWRlcygncScpOlxuICAgICAgICAgICAgICAgIHJldHVybiBUaW1lZnJhbWVPcHRpb24uUVVBUlRFUjtcbiAgICAgICAgICAgIGNhc2UgbG93ZXJDYXNlRm9ybWF0LmluY2x1ZGVzKCdkJyk6XG4gICAgICAgICAgICAgICAgcmV0dXJuIFRpbWVmcmFtZU9wdGlvbi5EQVk7XG4gICAgICAgICAgICBjYXNlIGxvd2VyQ2FzZUZvcm1hdC5pbmNsdWRlcygndycpOlxuICAgICAgICAgICAgICAgIHJldHVybiBUaW1lZnJhbWVPcHRpb24uV0VFSztcbiAgICAgICAgICAgIGNhc2UgbG93ZXJDYXNlRm9ybWF0LmluY2x1ZGVzKCdtJyk6XG4gICAgICAgICAgICAgICAgcmV0dXJuIFRpbWVmcmFtZU9wdGlvbi5NT05USDtcbiAgICAgICAgICAgIGNhc2UgbG93ZXJDYXNlRm9ybWF0LmluY2x1ZGVzKCd5Jyk6XG4gICAgICAgICAgICAgICAgcmV0dXJuIFRpbWVmcmFtZU9wdGlvbi5ZRUFSO1xuICAgICAgICAgICAgZGVmYXVsdDpcbiAgICAgICAgICAgICAgICByZXR1cm4gZGVmYXVsdEZyYW1lO1xuICAgICAgICB9XG4gICAgfVxuXG4gICAgcHVibGljIHN0YXRpYyBnZXREYXRlQnlUYWcodGFnOiBzdHJpbmcpIDphbnkge1xuICAgICAgICBjb25zdCB0b2RheURhdGUgPSBtb21lbnQoKS51dGMoKS5lbmRPZignZGF5Jyk7XG4gICAgICAgIHN3aXRjaCAodGFnKSB7XG4gICAgICAgICAgICBjYXNlIERhdGVUYWdzLlRPREFZOlxuICAgICAgICAgICAgICAgIHJldHVybiB0b2RheURhdGU7XG4gICAgICAgICAgICBjYXNlIERhdGVUYWdzLllFU1RFUkRBWTpcbiAgICAgICAgICAgICAgICB0b2RheURhdGUuc3VidHJhY3QoMSwgJ2RheXMnKTtcbiAgICAgICAgICAgICAgICByZXR1cm4gdG9kYXlEYXRlO1xuICAgICAgICAgICAgY2FzZSBEYXRlVGFncy5USElTX01PTlRIOlxuICAgICAgICAgICAgICAgIHRvZGF5RGF0ZS5lbmRPZignbW9udGgnKTtcbiAgICAgICAgICAgICAgICByZXR1cm4gdG9kYXlEYXRlO1xuICAgICAgICAgICAgY2FzZSBEYXRlVGFncy5QUkVWX01PTlRIOlxuICAgICAgICAgICAgICAgIHRvZGF5RGF0ZS5zdWJ0cmFjdCgxLCAnbW9udGhzJykuZW5kT2YoJ21vbnRoJyk7XG4gICAgICAgICAgICAgICAgcmV0dXJuIHRvZGF5RGF0ZTtcbiAgICAgICAgfVxuICAgIH1cbn1cbiJdfQ==
|
|
@@ -3605,7 +3605,7 @@ class DrSharedUtils {
|
|
|
3605
3605
|
}
|
|
3606
3606
|
}
|
|
3607
3607
|
static getDateByTag(tag) {
|
|
3608
|
-
const todayDate = moment$9().utc();
|
|
3608
|
+
const todayDate = moment$9().utc().endOf('day');
|
|
3609
3609
|
switch (tag) {
|
|
3610
3610
|
case DateTags.TODAY:
|
|
3611
3611
|
return todayDate;
|
|
@@ -3616,8 +3616,7 @@ class DrSharedUtils {
|
|
|
3616
3616
|
todayDate.endOf('month');
|
|
3617
3617
|
return todayDate;
|
|
3618
3618
|
case DateTags.PREV_MONTH:
|
|
3619
|
-
todayDate.endOf('month');
|
|
3620
|
-
todayDate.subtract(1, 'months');
|
|
3619
|
+
todayDate.subtract(1, 'months').endOf('month');
|
|
3621
3620
|
return todayDate;
|
|
3622
3621
|
}
|
|
3623
3622
|
}
|