gunsmith-common 2.3.24 → 2.3.25
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/shared/services/finish-date-helper.service.mjs +4 -4
- package/fesm2015/gunsmith-common.mjs +3 -3
- package/fesm2015/gunsmith-common.mjs.map +1 -1
- package/fesm2020/gunsmith-common.mjs +3 -3
- package/fesm2020/gunsmith-common.mjs.map +1 -1
- package/gunsmith-common-2.3.25.tgz +0 -0
- package/package.json +1 -1
- package/shared/services/finish-date-helper.service.d.ts +1 -1
- package/gunsmith-common-2.3.24.tgz +0 -0
|
@@ -45,7 +45,7 @@ export class FinishDateHelperService {
|
|
|
45
45
|
}
|
|
46
46
|
return this.adjustHoliday(finishDate.toJSDate());
|
|
47
47
|
}
|
|
48
|
-
calculate(receivedDate, workOrderType) {
|
|
48
|
+
calculate(receivedDate, workOrderType, hasRefinish) {
|
|
49
49
|
if (!receivedDate) {
|
|
50
50
|
return EMPTY;
|
|
51
51
|
}
|
|
@@ -56,10 +56,10 @@ export class FinishDateHelperService {
|
|
|
56
56
|
]).pipe(switchMap(([configs, holidays]) => {
|
|
57
57
|
this.configs = configs;
|
|
58
58
|
this.holidays = holidays;
|
|
59
|
-
return of(this.calculateFinishDate(receivedDate, workOrderType));
|
|
59
|
+
return of(this.calculateFinishDate(receivedDate, workOrderType, hasRefinish));
|
|
60
60
|
}));
|
|
61
61
|
}
|
|
62
|
-
return of(this.calculateFinishDate(receivedDate, workOrderType));
|
|
62
|
+
return of(this.calculateFinishDate(receivedDate, workOrderType, hasRefinish));
|
|
63
63
|
}
|
|
64
64
|
}
|
|
65
65
|
FinishDateHelperService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.3.11", ngImport: i0, type: FinishDateHelperService, deps: [{ token: i1.ConfigurationService }, { token: i2.WorkHolidayService }], target: i0.ɵɵFactoryTarget.Injectable });
|
|
@@ -70,4 +70,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.11", ngImpo
|
|
|
70
70
|
providedIn: "root",
|
|
71
71
|
}]
|
|
72
72
|
}], ctorParameters: function () { return [{ type: i1.ConfigurationService }, { type: i2.WorkHolidayService }]; } });
|
|
73
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
73
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmluaXNoLWRhdGUtaGVscGVyLnNlcnZpY2UuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi9wcm9qZWN0cy9ndW5zbWl0aC1jb21tb24vc3JjL3NoYXJlZC9zZXJ2aWNlcy9maW5pc2gtZGF0ZS1oZWxwZXIuc2VydmljZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sZUFBZSxDQUFDO0FBQzNDLE9BQU8sRUFBRSxvQkFBb0IsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBQy9ELE9BQU8sRUFBRSxrQkFBa0IsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBQzVELE9BQU8sRUFBRSxLQUFLLEVBQUUsUUFBUSxFQUE2QixFQUFFLEVBQUUsU0FBUyxFQUFFLE1BQU0sTUFBTSxDQUFDO0FBQ2pGLE9BQU8sRUFBOEIsYUFBYSxFQUFFLE1BQU0sVUFBVSxDQUFDO0FBQ3JFLE9BQU8sRUFBRSxRQUFRLEVBQUUsTUFBTSxPQUFPLENBQUM7Ozs7QUFLakMsTUFBTSxPQUFPLHVCQUF1QjtJQUdsQyxZQUNVLGFBQW1DLEVBQ25DLGNBQWtDO1FBRGxDLGtCQUFhLEdBQWIsYUFBYSxDQUFzQjtRQUNuQyxtQkFBYyxHQUFkLGNBQWMsQ0FBb0I7UUFIcEMsYUFBUSxHQUFrQixFQUFFLENBQUM7SUFJbEMsQ0FBQztJQUVJLGFBQWEsQ0FBQyxVQUFnQjtRQUNwQyxPQUNFLElBQUksQ0FBQyxRQUFRO2FBQ1YsR0FBRyxDQUFDLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxJQUFJLElBQUksQ0FBQyxDQUFDLENBQUMsT0FBTyxDQUFDLENBQUM7YUFDL0IsU0FBUyxDQUFDLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFDLEtBQUssVUFBVSxDQUFDLEtBQUssQ0FBQyxDQUFDLEVBQzVDO1lBQ0EsR0FBRztnQkFDRCxVQUFVLEdBQUcsUUFBUSxDQUFDLFVBQVUsQ0FBQyxVQUFVLENBQUM7cUJBQ3pD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b3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBJbmplY3RhYmxlIH0gZnJvbSAnQGFuZ3VsYXIvY29yZSc7XG5pbXBvcnQgeyBDb25maWd1cmF0aW9uU2VydmljZSB9IGZyb20gJy4vY29uZmlndXJhdGlvbi5zZXJ2aWNlJztcbmltcG9ydCB7IFdvcmtIb2xpZGF5U2VydmljZSB9IGZyb20gJy4vd29yay1ob2xpZGF5LnNlcnZpY2UnO1xuaW1wb3J0IHsgRU1QVFksIGZvcmtKb2luLCBsYXN0VmFsdWVGcm9tLCBPYnNlcnZhYmxlLCBvZiwgc3dpdGNoTWFwIH0gZnJvbSAncnhqcyc7XG5pbXBvcnQgeyBDb25maWd1cmF0aW9uLCBXb3JrSG9saWRheSwgV29ya09yZGVyVHlwZSB9IGZyb20gJy4uL3R5cGVzJztcbmltcG9ydCB7IERhdGVUaW1lIH0gZnJvbSBcImx1eG9uXCI7XG5cbkBJbmplY3RhYmxlKHtcbiAgcHJvdmlkZWRJbjogXCJyb290XCIsXG59KVxuZXhwb3J0IGNsYXNzIEZpbmlzaERhdGVIZWxwZXJTZXJ2aWNlIHtcbiAgcHJpdmF0ZSBjb25maWdzOiBDb25maWd1cmF0aW9uO1xuICBwcml2YXRlIGhvbGlkYXlzOiBXb3JrSG9saWRheVtdID0gW107XG4gIGNvbnN0cnVjdG9yKFxuICAgIHByaXZhdGUgY29uZmlnU2VydmljZTogQ29uZmlndXJhdGlvblNlcnZpY2UsXG4gICAgcHJpdmF0ZSBob2xpZGF5U2VydmljZTogV29ya0hvbGlkYXlTZXJ2aWNlXG4gICkge31cblxuICBwcml2YXRlIGFkanVzdEhvbGlkYXkoZmluaXNoRGF0ZTogRGF0ZSkge1xuICAgIHdoaWxlIChcbiAgICAgIHRoaXMuaG9saWRheXNcbiAgICAgICAgLm1hcCgoaCkgPT4gbmV3IERhdGUoaC5ob2xpZGF5KSlcbiAgICAgICAgLmZpbmRJbmRleCgoaCkgPT4gaCA9PT0gZmluaXNoRGF0ZSkgIT09IC0xXG4gICAgKSB7XG4gICAgICBkbyB7XG4gICAgICAgIGZpbmlzaERhdGUgPSBEYXRlVGltZS5mcm9tSlNEYXRlKGZpbmlzaERhdGUpXG4gICAgICAgICAgLnBsdXMoeyBkYXlzOiAxIH0pXG4gICAgICAgICAgLnRvSlNEYXRlKCk7XG4gICAgICB9IHdoaWxlIChmaW5pc2hEYXRlLmdldERheSgpID09PSAwIHx8IGZpbmlzaERhdGUuZ2V0RGF5KCkgPT09IDYpO1xuICAgIH1cbiAgICByZXR1cm4gZmluaXNoRGF0ZTtcbiAgfVxuXG4gIHByaXZhdGUgY2FsY3VsYXRlRmluaXNoRGF0ZShcbiAgICByZWNlaXZlZERhdGU6IERhdGUsXG4gICAgd29ya09yZGVyVHlwZTogV29ya09yZGVyVHlwZSxcbiAgICBoYXNSZWZpbmlzaDogYm9vbGVhbiA9IGZhbHNlXG4gICk6IERhdGUge1xuICAgIGxldCBmaW5pc2hEYXRlID0gRGF0ZVRpbWUuZnJvbUpTRGF0ZShyZWNlaXZlZERhdGUpLnN0YXJ0T2YoXCJkYXlcIik7XG4gICAgaWYgKHdvcmtPcmRlclR5cGUgPT09IFdvcmtPcmRlclR5cGUuV2FycmFudHkpIHtcbiAgICAgIGZpbmlzaERhdGUgPSBmaW5pc2hEYXRlLnBsdXMoeyB3ZWVrczogdGhpcy5jb25maWdzLndhcnJhbnR5V2Vla3MgfSk7XG4gICAgfSBlbHNlIGlmICh3b3JrT3JkZXJUeXBlID09PSBXb3JrT3JkZXJUeXBlLkV4cGVkaXRlZCkge1xuICAgICAgZmluaXNoRGF0ZSA9IGZpbmlzaERhdGUucGx1cyh7IHdlZWtzOiB0aGlzLmNvbmZpZ3MuZXhwZWRpdGVkV2Vla3MgfSk7XG4gICAgfSBlbHNlIGlmICh3b3JrT3JkZXJUeXBlID09PSBXb3JrT3JkZXJUeXBlLk5ld0luQm94KSB7XG4gICAgICBmaW5pc2hEYXRlID0gaGFzUmVmaW5pc2hcbiAgICAgICAgPyBmaW5pc2hEYXRlLnBsdXMoeyB3ZWVrczogdGhpcy5jb25maWdzLnJlZmluaXNoV2Vla3MgfSlcbiAgICAgICAgOiBmaW5pc2hEYXRlLnBsdXMoeyB3ZWVrczogdGhpcy5jb25maWdzLm5ld0luQm94V2Vla3MgfSk7XG4gICAgfSBlbHNlIHtcbiAgICAgIGZpbmlzaERhdGUgPSBoYXNSZWZpbmlzaFxuICAgICAgICA/IGZpbmlzaERhdGUucGx1cyh7IHdlZWtzOiB0aGlzLmNvbmZpZ3MucmVmaW5pc2hXZWVrcyB9KVxuICAgICAgICA6IGZpbmlzaERhdGUucGx1cyh7IHdlZWtzOiB0aGlzLmNvbmZpZ3Muc3RhbmRhcmRXZWVrcyB9KTtcbiAgICB9XG5cbiAgICByZXR1cm4gdGhpcy5hZGp1c3RIb2xpZGF5KGZpbmlzaERhdGUudG9KU0RhdGUoKSk7XG4gIH1cblxuICBjYWxjdWxhdGUocmVjZWl2ZWREYXRlOiBEYXRlLCB3b3JrT3JkZXJUeXBlOiBXb3JrT3JkZXJUeXBlLCBoYXNSZWZpbmlzaDogYm9vbGVhbik6IE9ic2VydmFibGU8RGF0ZT4ge1xuICAgIGlmICghcmVjZWl2ZWREYXRlKSB7XG4gICAgICByZXR1cm4gRU1QVFk7XG4gICAgfVxuXG4gICAgaWYgKCF0aGlzLmNvbmZpZ3MpIHtcbiAgICAgIHJldHVybiBmb3JrSm9pbihbXG4gICAgICAgIHRoaXMuY29uZmlnU2VydmljZS5yZWFkQ29uZmlncygpLFxuICAgICAgICB0aGlzLmhvbGlkYXlTZXJ2aWNlLnJlYWRIb2xpZGF5cygpLFxuICAgICAgXSkucGlwZShcbiAgICAgICAgc3dpdGNoTWFwKChbY29uZmlncywgaG9saWRheXNdKSA9PiB7XG4gICAgICAgICAgdGhpcy5jb25maWdzID0gY29uZmlncztcbiAgICAgICAgICB0aGlzLmhvbGlkYXlzID0gaG9saWRheXM7XG4gICAgICAgICAgcmV0dXJuIG9mKHRoaXMuY2FsY3VsYXRlRmluaXNoRGF0ZShyZWNlaXZlZERhdGUsIHdvcmtPcmRlclR5cGUsIGhhc1JlZmluaXNoKSk7XG4gICAgICAgIH0pXG4gICAgICApO1xuICAgIH1cbiAgICByZXR1cm4gb2YodGhpcy5jYWxjdWxhdGVGaW5pc2hEYXRlKHJlY2VpdmVkRGF0ZSwgd29ya09yZGVyVHlwZSwgaGFzUmVmaW5pc2gpKTtcbiAgfVxufVxuIl19
|
|
@@ -2057,7 +2057,7 @@ class FinishDateHelperService {
|
|
|
2057
2057
|
}
|
|
2058
2058
|
return this.adjustHoliday(finishDate.toJSDate());
|
|
2059
2059
|
}
|
|
2060
|
-
calculate(receivedDate, workOrderType) {
|
|
2060
|
+
calculate(receivedDate, workOrderType, hasRefinish) {
|
|
2061
2061
|
if (!receivedDate) {
|
|
2062
2062
|
return EMPTY;
|
|
2063
2063
|
}
|
|
@@ -2068,10 +2068,10 @@ class FinishDateHelperService {
|
|
|
2068
2068
|
]).pipe(switchMap$1(([configs, holidays]) => {
|
|
2069
2069
|
this.configs = configs;
|
|
2070
2070
|
this.holidays = holidays;
|
|
2071
|
-
return of(this.calculateFinishDate(receivedDate, workOrderType));
|
|
2071
|
+
return of(this.calculateFinishDate(receivedDate, workOrderType, hasRefinish));
|
|
2072
2072
|
}));
|
|
2073
2073
|
}
|
|
2074
|
-
return of(this.calculateFinishDate(receivedDate, workOrderType));
|
|
2074
|
+
return of(this.calculateFinishDate(receivedDate, workOrderType, hasRefinish));
|
|
2075
2075
|
}
|
|
2076
2076
|
}
|
|
2077
2077
|
FinishDateHelperService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.3.11", ngImport: i0, type: FinishDateHelperService, deps: [{ token: ConfigurationService }, { token: WorkHolidayService }], target: i0.ɵɵFactoryTarget.Injectable });
|