ngx-wapp-components 1.21.4 → 1.21.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/shared/pipes/w-date.pipe.mjs +11 -4
- package/fesm2015/ngx-wapp-components.mjs +10 -3
- package/fesm2015/ngx-wapp-components.mjs.map +1 -1
- package/fesm2020/ngx-wapp-components.mjs +10 -3
- package/fesm2020/ngx-wapp-components.mjs.map +1 -1
- package/lib/shared/pipes/w-date.pipe.d.ts +1 -1
- package/package.json +1 -1
|
@@ -28,8 +28,11 @@ export class WDatePipe {
|
|
|
28
28
|
break;
|
|
29
29
|
}
|
|
30
30
|
case WDatePipeFormatType.Business: {
|
|
31
|
-
wappDate =
|
|
32
|
-
this.getBusinessTime(wappDate);
|
|
31
|
+
wappDate = date;
|
|
32
|
+
wappDate = this.getBusinessTime(wappDate);
|
|
33
|
+
if (date instanceof Date) {
|
|
34
|
+
return wappDate;
|
|
35
|
+
}
|
|
33
36
|
wappDate = locale ?
|
|
34
37
|
new DatePipe(locale).transform(wappDate, 'short')?.replace(/,/g, "") :
|
|
35
38
|
new DatePipe(window.navigator.language.slice(0, 2)).transform(wappDate, 'short')?.replace(/,/g, "");
|
|
@@ -45,8 +48,12 @@ export class WDatePipe {
|
|
|
45
48
|
return wappDate;
|
|
46
49
|
}
|
|
47
50
|
getBusinessTime(date) {
|
|
51
|
+
if (typeof date == 'string') {
|
|
52
|
+
let d = new Date(date);
|
|
53
|
+
date = d;
|
|
54
|
+
}
|
|
48
55
|
let businessHourDifference = this.sessionStorageService.getBusinessData().diffHourFromUTC;
|
|
49
|
-
date.setHours(date.getHours() + businessHourDifference ? businessHourDifference : 0);
|
|
56
|
+
return new Date(date.setHours(date.getHours() + businessHourDifference ? businessHourDifference : 0));
|
|
50
57
|
}
|
|
51
58
|
}
|
|
52
59
|
WDatePipe.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.7", ngImport: i0, type: WDatePipe, deps: [{ token: i1.SessionStorageService }], target: i0.ɵɵFactoryTarget.Pipe });
|
|
@@ -57,4 +64,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.7", ngImpor
|
|
|
57
64
|
name: 'wappDate'
|
|
58
65
|
}]
|
|
59
66
|
}], ctorParameters: function () { return [{ type: i1.SessionStorageService }]; } });
|
|
60
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
67
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidy1kYXRlLnBpcGUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi9wcm9qZWN0cy93YXBwLWNvbXBvbmVudHMvc3JjL2xpYi9zaGFyZWQvcGlwZXMvdy1kYXRlLnBpcGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLElBQUksRUFBaUIsTUFBTSxlQUFlLENBQUM7QUFDcEQsT0FBTyxFQUFFLFFBQVEsRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBQzNDLE9BQU8sRUFBRSxtQkFBbUIsRUFBRSxNQUFNLHVCQUF1QixDQUFDOzs7QUFNNUQsTUFBTSxPQUFPLFNBQVM7SUFFbEIsWUFDWSxxQkFBNEM7UUFBNUMsMEJBQXFCLEdBQXJCLHFCQUFxQixDQUF1QjtJQUNuRCxDQUFDO0lBRU4sU0FBUyxDQUFDLElBQTRCLEVBQUUsTUFBaUMsRUFBRSxNQUFZO1FBQ25GLElBQUksUUFBYSxDQUFDO1FBRWxCLFFBQU8sTUFBTSxFQUFFO1lBQ1gsS0FBSyxtQkFBbUIsQ0FBQyxDQUFDLENBQUMsQ0FBQztnQkFDekIsUUFBUSxHQUFHLElBQUksUUFBUSxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQyxNQUFNLENBQUMsU0FBUyxDQUFDLFFBQVEsQ0FBQyxLQUFLLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDLENBQUMsU0FBUyxDQUFDLElBQUksRUFBRSxXQUFXLENBQUMsQ0FBQTtnQkFDN0csTUFBTTthQUNSO1lBQ0QsS0FBSyxtQkFBbUIsQ0FBQyxDQUFDLENBQUMsQ0FBQztnQkFDeEIsUUFBUSxHQUFHLElBQUksUUFBUSxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQyxNQUFNLENBQUMsU0FBUyxDQUFDLFFBQVEsQ0FBQyxLQUFLLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDLENBQUMsU0FBUyxDQUFDLElBQUksRUFBRSxVQUFV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LENBQUMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxJQUFJLENBQUMsUUFBUSxFQUFFLEdBQUcsc0JBQXNCLENBQUMsQ0FBQyxDQUFDLHNCQUFzQixDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFBO0lBQ3pHLENBQUM7O3NHQTFEUSxTQUFTO29HQUFULFNBQVM7MkZBQVQsU0FBUztrQkFIckIsSUFBSTttQkFBQztvQkFDRixJQUFJLEVBQUUsVUFBVTtpQkFDbkIiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBQaXBlLCBQaXBlVHJhbnNmb3JtIH0gZnJvbSAnQGFuZ3VsYXIvY29yZSc7XHJcbmltcG9ydCB7IERhdGVQaXBlIH0gZnJvbSAnQGFuZ3VsYXIvY29tbW9uJztcclxuaW1wb3J0IHsgV0RhdGVQaXBlRm9ybWF0VHlwZSB9IGZyb20gJy4uL21vZGVscy9lbnVtcy5tb2RlbCc7XHJcbmltcG9ydCB7IFNlc3Npb25TdG9yYWdlU2VydmljZSB9IGZyb20gJy4uL3NlcnZpY2VzL3Nlc3Npb24tc3RvcmFnZS5zZXJ2aWNlJztcclxuXHJcbkBQaXBlKHtcclxuICAgIG5hbWU6ICd3YXBwRGF0ZSdcclxufSlcclxuZXhwb3J0IGNsYXNzIFdEYXRlUGlwZSBpbXBsZW1lbnRzIFBpcGVUcmFuc2Zvcm0ge1xyXG5cclxuICAgIGNvbnN0cnVjdG9yKFxyXG4gICAgICAgIHByaXZhdGUgc2Vzc2lvblN0b3JhZ2VTZXJ2aWNlOiBTZXNzaW9uU3RvcmFnZVNlcnZpY2UsXHJcbiAgICAgICkge31cclxuICAgICAgXHJcbiAgICB0cmFuc2Zvcm0oZGF0ZTogRGF0ZSB8IG51bWJlciB8IHN0cmluZywgZm9ybWF0PzogV0RhdGVQaXBlRm9ybWF0VHlwZSB8IFwiXCIsIGxvY2FsZT86IGFueSkge1xyXG4gICAgICAgIGxldCB3YXBwRGF0ZTogYW55O1xyXG5cclxuICAgICAgICBzd2l0Y2goZm9ybWF0KSB7IFxyXG4gICAgICAgICAgICBjYXNlIFdEYXRlUGlwZUZvcm1hdFR5cGUuZDogeyBcclxuICAgICAgICAgICAgICAgd2FwcERhdGUgPSBuZXcgRGF0ZVBpcGUobG9jYWxlID8gbG9jYWxlIDogd2luZG93Lm5hdmlnYXRvci5sYW5ndWFnZS5zbGljZSgwLCAyKSkudHJhbnNmb3JtKGRhdGUsICdzaG9ydERhdGUnKVxyXG4gICAgICAgICAgICAgICBicmVhazsgXHJcbiAgICAgICAgICAgIH0gXHJcbiAgICAgICAgICAgIGNhc2UgV0RhdGVQaXBlRm9ybWF0VHlwZS5EOiB7IFxyXG4gICAgICAgICAgICAgICAgd2FwcERhdGUgPSBuZXcgRGF0ZVBpcGUobG9jYWxlID8gbG9jYWxlIDogd2luZG93Lm5hdmlnYXRvci5sYW5ndWFnZS5zbGljZSgwLCAyKSkudHJhbnNmb3JtKGRhdGUsICdmdWxsRGF0ZScpXHJcbiAgICAgICAgICAgICAgICBicmVhazsgXHJcbiAgICAgICAgICAgIH0gXHJcbiAgICAgICAgICAgIGNhc2UgV0RhdGVQaXBlRm9ybWF0VHlwZS5nOiB7IFxyXG4gICAgICAgICAgICAgICAgd2FwcERhdGUgPSBuZXcgRGF0ZVBpcGUobG9jYWxlID8gbG9jYWxlIDogd2luZG93Lm5hdmlnYXRvci5sYW5ndWFnZS5zbGljZSgwLCAyKSkudHJhbnNmb3JtKGRhdGUsICdzaG9ydCcpPy5yZXBsYWNlKC8sL2csIFwiXCIpXHJcbiAgICAgICAgICAgICAgICBicmVhazsgXHJcbiAgICAgICAgICAgIH0gXHJcbiAgICAgICAgICAgIGNhc2UgV0RhdGVQaXBlRm9ybWF0VHlwZS5HOiB7IFxyXG4gICAgICAgICAgICAgICAgd2FwcERhdGUgPSBuZXcgRGF0ZVBpcGUobG9jYWxlID8gbG9jYWxlIDogd2luZG93Lm5hdmlnYXRvci5sYW5ndWFnZS5zbGljZSgwLCAyKSkudHJhbnNmb3JtKGRhdGUsICdzaG9ydERhdGUnKSEgKyAnICdcclxuICAgICAgICAgICAgICAgICAgICAgICAgICsgbmV3IERhdGVQaXBlKGxvY2FsZSA/IGxvY2FsZSA6IHdpbmRvdy5uYXZpZ2F0b3IubGFuZ3VhZ2Uuc2xpY2UoMCwgMikpLnRyYW5zZm9ybShkYXRlLCAnbWVkaXVtVGltZScpXHJcbiAgICAgICAgICAgICAgICBicmVhazsgXHJcbiAgICAgICAgICAgIH1cclxuICAgICAgICAgICAgY2FzZSBXRGF0ZVBpcGVGb3JtYXRUeXBlLkJ1c2luZXNzOiB7IFxyXG4gICAgICAgICAgICAgICAgd2FwcERhdGUgPSBkYXRlO1xyXG4gICAgICAgICAgICAgICAgd2FwcERhdGUgPSB0aGlzLmdldEJ1c2luZXNzVGltZSh3YXBwRGF0ZSk7XHJcblxyXG4gICAgICAgICAgICAgICAgaWYoZGF0ZSBpbnN0YW5jZW9mIERhdGUpIHtcclxuICAgICAgICAgICAgICAgICAgICByZXR1cm4gd2FwcERhdGU7XHJcbiAgICAgICAgICAgICAgICB9XHJcblxyXG4gICAgICAgICAgICAgICAgd2FwcERhdGUgPSBsb2NhbGUgP1xyXG4gICAgICAgICAgICAgICAgICAgIG5ldyBEYXRlUGlwZShsb2NhbGUpLnRyYW5zZm9ybSh3YXBwRGF0ZSwgJ3Nob3J0Jyk/LnJlcGxhY2UoLywvZywgXCJcIikgOlxyXG4gICAgICAgICAgICAgICAgICAgIG5ldyBEYXRlUGlwZSh3aW5kb3cubmF2aWdhdG9yLmxhbmd1YWdlLnNsaWNlKDAsIDIpKS50cmFuc2Zvcm0od2FwcERhdGUsICdzaG9ydCcpPy5yZXBsYWNlKC8sL2csIFwiXCIpO1xyXG4gICAgICAgICAgICAgICAgYnJlYWs7IFxyXG4gICAgICAgICAgICB9XHJcblxyXG4gICAgICAgICAgICBkZWZhdWx0OiB7IFxyXG4gICAgICAgICAgICAgICAgd2FwcERhdGUgPSBsb2NhbGUgP1xyXG4gICAgICAgICAgICAgICAgICAgIG5ldyBEYXRlUGlwZShsb2NhbGUpLnRyYW5zZm9ybShkYXRlLCAnc2hvcnQnKT8ucmVwbGFjZSgvLC9nLCBcIlwiKSA6XHJcbiAgICAgICAgICAgICAgICAgICAgbmV3IERhdGVQaXBlKHdpbmRvdy5uYXZpZ2F0b3IubGFuZ3VhZ2Uuc2xpY2UoMCwgMikpLnRyYW5zZm9ybShkYXRlLCAnc2hvcnQnKT8ucmVwbGFjZSgvLC9nLCBcIlwiKTtcclxuICAgICAgICAgICAgICAgICAgICBicmVhazsgXHJcbiAgICAgICAgICAgIH0gXHJcbiAgICAgICAgIH0gXHJcbiAgICAgICAgIHJldHVybiB3YXBwRGF0ZTtcclxuICAgIH1cclxuXHJcbiAgICBnZXRCdXNpbmVzc1RpbWUoZGF0ZTogRGF0ZSB8IHN0cmluZykge1xyXG4gICAgICAgIGlmKHR5cGVvZiBkYXRlID09ICdzdHJpbmcnKSB7XHJcbiAgICAgICAgICAgIGxldCBkID0gbmV3IERhdGUoZGF0ZSk7XHJcbiAgICAgICAgICAgIGRhdGUgPSBkO1xyXG4gICAgICAgICAgfVxyXG4gICAgICAgIGxldCBidXNpbmVzc0hvdXJEaWZmZXJlbmNlOiBudW1iZXIgPSB0aGlzLnNlc3Npb25TdG9yYWdlU2VydmljZS5nZXRCdXNpbmVzc0RhdGEoKS5kaWZmSG91ckZyb21VVEM7XHJcbiAgICAgICAgcmV0dXJuIG5ldyBEYXRlKGRhdGUuc2V0SG91cnMoZGF0ZS5nZXRIb3VycygpICsgYnVzaW5lc3NIb3VyRGlmZmVyZW5jZSA/IGJ1c2luZXNzSG91ckRpZmZlcmVuY2UgOiAwKSlcclxuICAgIH1cclxuXHJcbn0iXX0=
|
|
@@ -1041,8 +1041,11 @@ class WDatePipe {
|
|
|
1041
1041
|
break;
|
|
1042
1042
|
}
|
|
1043
1043
|
case WDatePipeFormatType.Business: {
|
|
1044
|
-
wappDate =
|
|
1045
|
-
this.getBusinessTime(wappDate);
|
|
1044
|
+
wappDate = date;
|
|
1045
|
+
wappDate = this.getBusinessTime(wappDate);
|
|
1046
|
+
if (date instanceof Date) {
|
|
1047
|
+
return wappDate;
|
|
1048
|
+
}
|
|
1046
1049
|
wappDate = locale ?
|
|
1047
1050
|
(_b = new DatePipe(locale).transform(wappDate, 'short')) === null || _b === void 0 ? void 0 : _b.replace(/,/g, "") :
|
|
1048
1051
|
(_c = new DatePipe(window.navigator.language.slice(0, 2)).transform(wappDate, 'short')) === null || _c === void 0 ? void 0 : _c.replace(/,/g, "");
|
|
@@ -1058,8 +1061,12 @@ class WDatePipe {
|
|
|
1058
1061
|
return wappDate;
|
|
1059
1062
|
}
|
|
1060
1063
|
getBusinessTime(date) {
|
|
1064
|
+
if (typeof date == 'string') {
|
|
1065
|
+
let d = new Date(date);
|
|
1066
|
+
date = d;
|
|
1067
|
+
}
|
|
1061
1068
|
let businessHourDifference = this.sessionStorageService.getBusinessData().diffHourFromUTC;
|
|
1062
|
-
date.setHours(date.getHours() + businessHourDifference ? businessHourDifference : 0);
|
|
1069
|
+
return new Date(date.setHours(date.getHours() + businessHourDifference ? businessHourDifference : 0));
|
|
1063
1070
|
}
|
|
1064
1071
|
}
|
|
1065
1072
|
WDatePipe.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.7", ngImport: i0, type: WDatePipe, deps: [{ token: SessionStorageService }], target: i0.ɵɵFactoryTarget.Pipe });
|