gunsmith-common 2.3.23 → 2.3.24
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 +8 -4
- package/fesm2015/gunsmith-common.mjs +7 -3
- package/fesm2015/gunsmith-common.mjs.map +1 -1
- package/fesm2020/gunsmith-common.mjs +7 -3
- package/fesm2020/gunsmith-common.mjs.map +1 -1
- package/gunsmith-common-2.3.24.tgz +0 -0
- package/package.json +1 -1
- package/gunsmith-common-2.3.23.tgz +0 -0
|
@@ -25,7 +25,7 @@ export class FinishDateHelperService {
|
|
|
25
25
|
}
|
|
26
26
|
return finishDate;
|
|
27
27
|
}
|
|
28
|
-
calculateFinishDate(receivedDate, workOrderType) {
|
|
28
|
+
calculateFinishDate(receivedDate, workOrderType, hasRefinish = false) {
|
|
29
29
|
let finishDate = DateTime.fromJSDate(receivedDate).startOf("day");
|
|
30
30
|
if (workOrderType === WorkOrderType.Warranty) {
|
|
31
31
|
finishDate = finishDate.plus({ weeks: this.configs.warrantyWeeks });
|
|
@@ -34,10 +34,14 @@ export class FinishDateHelperService {
|
|
|
34
34
|
finishDate = finishDate.plus({ weeks: this.configs.expeditedWeeks });
|
|
35
35
|
}
|
|
36
36
|
else if (workOrderType === WorkOrderType.NewInBox) {
|
|
37
|
-
finishDate =
|
|
37
|
+
finishDate = hasRefinish
|
|
38
|
+
? finishDate.plus({ weeks: this.configs.refinishWeeks })
|
|
39
|
+
: finishDate.plus({ weeks: this.configs.newInBoxWeeks });
|
|
38
40
|
}
|
|
39
41
|
else {
|
|
40
|
-
finishDate =
|
|
42
|
+
finishDate = hasRefinish
|
|
43
|
+
? finishDate.plus({ weeks: this.configs.refinishWeeks })
|
|
44
|
+
: finishDate.plus({ weeks: this.configs.standardWeeks });
|
|
41
45
|
}
|
|
42
46
|
return this.adjustHoliday(finishDate.toJSDate());
|
|
43
47
|
}
|
|
@@ -66,4 +70,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.11", ngImpo
|
|
|
66
70
|
providedIn: "root",
|
|
67
71
|
}]
|
|
68
72
|
}], ctorParameters: function () { return [{ type: i1.ConfigurationService }, { type: i2.WorkHolidayService }]; } });
|
|
69
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
73
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmluaXNoLWRhdGUtaGVscGVyLnNlcnZpY2UuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi9wcm9qZWN0cy9ndW5zbWl0aC1jb21tb24vc3JjL3NoYXJlZC9zZXJ2aWNlcy9maW5pc2gtZGF0ZS1oZWxwZXIuc2VydmljZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sZUFBZSxDQUFDO0FBQzNDLE9BQU8sRUFBRSxvQkFBb0IsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBQy9ELE9BQU8sRUFBRSxrQkFBa0IsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBQzVELE9BQU8sRUFBRSxLQUFLLEVBQUUsUUFBUSxFQUE2QixFQUFFLEVBQUUsU0FBUyxFQUFFLE1BQU0sTUFBTSxDQUFDO0FBQ2pGLE9BQU8sRUFBOEIsYUFBYSxFQUFFLE1BQU0sVUFBVSxDQUFDO0FBQ3JFLE9BQU8sRUFBRSxRQUFRLEVBQUUsTUFBTSxPQUFPLENBQUM7Ozs7QUFLakMsTUFBTSxPQUFPLHVCQUF1QjtJQUdsQyxZQUNVLGFBQW1DLEVBQ25DLGNBQWtDO1FBRGxDLGtCQUFhLEdBQWIsYUFBYSxDQUFzQjtRQUNuQyxtQkFBYyxHQUFkLGNBQWMsQ0FBb0I7UUFIcEMsYUFBUSxHQUFrQixFQUFFLENBQUM7SUFJbEMsQ0FBQztJQUVJLGFBQWEsQ0FBQyxVQUFnQjtRQUNwQyxPQUNFLElBQUksQ0FBQyxRQUFRO2FBQ1YsR0FBRyxDQUFDLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxJQUFJLElBQUksQ0FBQyxDQUFDLENBQUMsT0FBTyxDQUFDLENBQUM7YUFDL0IsU0FBUyxDQUFDLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFDLEtBQUssVUFBVSxDQUFDLEtBQUssQ0FBQyxDQUFDLEVBQzVDO1lBQ0EsR0FBRztnQkFDRCxVQUFVLEdBQUcsUUFBUSxDQUFDLFVBQVUsQ0FBQyxVQUFVLENBQUM7cUJBQ3pD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dGFibGUgfSBmcm9tICdAYW5ndWxhci9jb3JlJztcbmltcG9ydCB7IENvbmZpZ3VyYXRpb25TZXJ2aWNlIH0gZnJvbSAnLi9jb25maWd1cmF0aW9uLnNlcnZpY2UnO1xuaW1wb3J0IHsgV29ya0hvbGlkYXlTZXJ2aWNlIH0gZnJvbSAnLi93b3JrLWhvbGlkYXkuc2VydmljZSc7XG5pbXBvcnQgeyBFTVBUWSwgZm9ya0pvaW4sIGxhc3RWYWx1ZUZyb20sIE9ic2VydmFibGUsIG9mLCBzd2l0Y2hNYXAgfSBmcm9tICdyeGpzJztcbmltcG9ydCB7IENvbmZpZ3VyYXRpb24sIFdvcmtIb2xpZGF5LCBXb3JrT3JkZXJUeXBlIH0gZnJvbSAnLi4vdHlwZXMnO1xuaW1wb3J0IHsgRGF0ZVRpbWUgfSBmcm9tIFwibHV4b25cIjtcblxuQEluamVjdGFibGUoe1xuICBwcm92aWRlZEluOiBcInJvb3RcIixcbn0pXG5leHBvcnQgY2xhc3MgRmluaXNoRGF0ZUhlbHBlclNlcnZpY2Uge1xuICBwcml2YXRlIGNvbmZpZ3M6IENvbmZpZ3VyYXRpb247XG4gIHByaXZhdGUgaG9saWRheXM6IFdvcmtIb2xpZGF5W10gPSBbXTtcbiAgY29uc3RydWN0b3IoXG4gICAgcHJpdmF0ZSBjb25maWdTZXJ2aWNlOiBDb25maWd1cmF0aW9uU2VydmljZSxcbiAgICBwcml2YXRlIGhvbGlkYXlTZXJ2aWNlOiBXb3JrSG9saWRheVNlcnZpY2VcbiAgKSB7fVxuXG4gIHByaXZhdGUgYWRqdXN0SG9saWRheShmaW5pc2hEYXRlOiBEYXRlKSB7XG4gICAgd2hpbGUgKFxuICAgICAgdGhpcy5ob2xpZGF5c1xuICAgICAgICAubWFwKChoKSA9PiBuZXcgRGF0ZShoLmhvbGlkYXkpKVxuICAgICAgICAuZmluZEluZGV4KChoKSA9PiBoID09PSBmaW5pc2hEYXRlKSAhPT0gLTFcbiAgICApIHtcbiAgICAgIGRvIHtcbiAgICAgICAgZmluaXNoRGF0ZSA9IERhdGVUaW1lLmZyb21KU0RhdGUoZmluaXNoRGF0ZSlcbiAgICAgICAgICAucGx1cyh7IGRheXM6IDEgfSlcbiAgICAgICAgICAudG9KU0RhdGUoKTtcbiAgICAgIH0gd2hpbGUgKGZpbmlzaERhdGUuZ2V0RGF5KCkgPT09IDAgfHwgZmluaXNoRGF0ZS5nZXREYXkoKSA9PT0gNik7XG4gICAgfVxuICAgIHJldHVybiBmaW5pc2hEYXRlO1xuICB9XG5cbiAgcHJpdmF0ZSBjYWxjdWxhdGVGaW5pc2hEYXRlKFxuICAgIHJlY2VpdmVkRGF0ZTogRGF0ZSxcbiAgICB3b3JrT3JkZXJUeXBlOiBXb3JrT3JkZXJUeXBlLFxuICAgIGhhc1JlZmluaXNoOiBib29sZWFuID0gZmFsc2VcbiAgKTogRGF0ZSB7XG4gICAgbGV0IGZpbmlzaERhdGUgPSBEYXRlVGltZS5mcm9tSlNEYXRlKHJlY2VpdmVkRGF0ZSkuc3RhcnRPZihcImRheVwiKTtcbiAgICBpZiAod29ya09yZGVyVHlwZSA9PT0gV29ya09yZGVyVHlwZS5XYXJyYW50eSkge1xuICAgICAgZmluaXNoRGF0ZSA9IGZpbmlzaERhdGUucGx1cyh7IHdlZWtzOiB0aGlzLmNvbmZpZ3Mud2FycmFudHlXZWVrcyB9KTtcbiAgICB9IGVsc2UgaWYgKHdvcmtPcmRlclR5cGUgPT09IFdvcmtPcmRlclR5cGUuRXhwZWRpdGVkKSB7XG4gICAgICBmaW5pc2hEYXRlID0gZmluaXNoRGF0ZS5wbHVzKHsgd2Vla3M6IHRoaXMuY29uZmlncy5leHBlZGl0ZWRXZWVrcyB9KTtcbiAgICB9IGVsc2UgaWYgKHdvcmtPcmRlclR5cGUgPT09IFdvcmtPcmRlclR5cGUuTmV3SW5Cb3gpIHtcbiAgICAgIGZpbmlzaERhdGUgPSBoYXNSZWZpbmlzaFxuICAgICAgICA/IGZpbmlzaERhdGUucGx1cyh7IHdlZWtzOiB0aGlzLmNvbmZpZ3MucmVmaW5pc2hXZWVrcyB9KVxuICAgICAgICA6IGZpbmlzaERhdGUucGx1cyh7IHdlZWtzOiB0aGlzLmNvbmZpZ3MubmV3SW5Cb3hXZWVrcyB9KTtcbiAgICB9IGVsc2Uge1xuICAgICAgZmluaXNoRGF0ZSA9IGhhc1JlZmluaXNoXG4gICAgICAgID8gZmluaXNoRGF0ZS5wbHVzKHsgd2Vla3M6IHRoaXMuY29uZmlncy5yZWZpbmlzaFdlZWtzIH0pXG4gICAgICAgIDogZmluaXNoRGF0ZS5wbHVzKHsgd2Vla3M6IHRoaXMuY29uZmlncy5zdGFuZGFyZFdlZWtzIH0pO1xuICAgIH1cblxuICAgIHJldHVybiB0aGlzLmFkanVzdEhvbGlkYXkoZmluaXNoRGF0ZS50b0pTRGF0ZSgpKTtcbiAgfVxuXG4gIGNhbGN1bGF0ZShyZWNlaXZlZERhdGU6IERhdGUsIHdvcmtPcmRlclR5cGU6IFdvcmtPcmRlclR5cGUpOiBPYnNlcnZhYmxlPERhdGU+IHtcbiAgICBpZiAoIXJlY2VpdmVkRGF0ZSkge1xuICAgICAgcmV0dXJuIEVNUFRZO1xuICAgIH1cblxuICAgIGlmICghdGhpcy5jb25maWdzKSB7XG4gICAgICByZXR1cm4gZm9ya0pvaW4oW1xuICAgICAgICB0aGlzLmNvbmZpZ1NlcnZpY2UucmVhZENvbmZpZ3MoKSxcbiAgICAgICAgdGhpcy5ob2xpZGF5U2VydmljZS5yZWFkSG9saWRheXMoKSxcbiAgICAgIF0pLnBpcGUoXG4gICAgICAgIHN3aXRjaE1hcCgoW2NvbmZpZ3MsIGhvbGlkYXlzXSkgPT4ge1xuICAgICAgICAgIHRoaXMuY29uZmlncyA9IGNvbmZpZ3M7XG4gICAgICAgICAgdGhpcy5ob2xpZGF5cyA9IGhvbGlkYXlzO1xuICAgICAgICAgIHJldHVybiBvZih0aGlzLmNhbGN1bGF0ZUZpbmlzaERhdGUocmVjZWl2ZWREYXRlLCB3b3JrT3JkZXJUeXBlKSk7XG4gICAgICAgIH0pXG4gICAgICApO1xuICAgIH1cbiAgICByZXR1cm4gb2YodGhpcy5jYWxjdWxhdGVGaW5pc2hEYXRlKHJlY2VpdmVkRGF0ZSwgd29ya09yZGVyVHlwZSkpO1xuICB9XG59XG4iXX0=
|
|
@@ -2037,7 +2037,7 @@ class FinishDateHelperService {
|
|
|
2037
2037
|
}
|
|
2038
2038
|
return finishDate;
|
|
2039
2039
|
}
|
|
2040
|
-
calculateFinishDate(receivedDate, workOrderType) {
|
|
2040
|
+
calculateFinishDate(receivedDate, workOrderType, hasRefinish = false) {
|
|
2041
2041
|
let finishDate = DateTime.fromJSDate(receivedDate).startOf("day");
|
|
2042
2042
|
if (workOrderType === WorkOrderType.Warranty) {
|
|
2043
2043
|
finishDate = finishDate.plus({ weeks: this.configs.warrantyWeeks });
|
|
@@ -2046,10 +2046,14 @@ class FinishDateHelperService {
|
|
|
2046
2046
|
finishDate = finishDate.plus({ weeks: this.configs.expeditedWeeks });
|
|
2047
2047
|
}
|
|
2048
2048
|
else if (workOrderType === WorkOrderType.NewInBox) {
|
|
2049
|
-
finishDate =
|
|
2049
|
+
finishDate = hasRefinish
|
|
2050
|
+
? finishDate.plus({ weeks: this.configs.refinishWeeks })
|
|
2051
|
+
: finishDate.plus({ weeks: this.configs.newInBoxWeeks });
|
|
2050
2052
|
}
|
|
2051
2053
|
else {
|
|
2052
|
-
finishDate =
|
|
2054
|
+
finishDate = hasRefinish
|
|
2055
|
+
? finishDate.plus({ weeks: this.configs.refinishWeeks })
|
|
2056
|
+
: finishDate.plus({ weeks: this.configs.standardWeeks });
|
|
2053
2057
|
}
|
|
2054
2058
|
return this.adjustHoliday(finishDate.toJSDate());
|
|
2055
2059
|
}
|