scheduler-models 1.3.12 → 1.3.13
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/package.json
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { ILeave, Leave } from "../../employees";
|
|
1
2
|
export declare enum HolidayType {
|
|
2
3
|
holiday = "H",
|
|
3
4
|
floating = "F"
|
|
@@ -7,12 +8,14 @@ export interface IHoliday {
|
|
|
7
8
|
name: string;
|
|
8
9
|
sort: number;
|
|
9
10
|
actualdates?: Date[];
|
|
11
|
+
leaves?: ILeave[];
|
|
10
12
|
}
|
|
11
13
|
export declare class Holiday implements IHoliday {
|
|
12
14
|
id: HolidayType;
|
|
13
15
|
name: string;
|
|
14
16
|
sort: number;
|
|
15
17
|
actualdates: Date[];
|
|
18
|
+
leaves?: Leave[];
|
|
16
19
|
constructor(hol?: IHoliday);
|
|
17
20
|
toString(): string;
|
|
18
21
|
compareTo(other?: Holiday): 1 | -1;
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.Holiday = exports.HolidayType = void 0;
|
|
4
|
+
const employees_1 = require("../../employees");
|
|
4
5
|
var HolidayType;
|
|
5
6
|
(function (HolidayType) {
|
|
6
7
|
HolidayType["holiday"] = "H";
|
|
@@ -11,6 +12,7 @@ class Holiday {
|
|
|
11
12
|
name;
|
|
12
13
|
sort;
|
|
13
14
|
actualdates;
|
|
15
|
+
leaves;
|
|
14
16
|
constructor(hol) {
|
|
15
17
|
this.id = (hol) ? hol.id : HolidayType.holiday;
|
|
16
18
|
this.name = (hol) ? hol.name : '';
|
|
@@ -22,6 +24,15 @@ class Holiday {
|
|
|
22
24
|
});
|
|
23
25
|
this.actualdates.sort((a, b) => (a.getTime() < b.getTime()) ? -1 : 1);
|
|
24
26
|
}
|
|
27
|
+
if (hol && hol.leaves) {
|
|
28
|
+
this.leaves = [];
|
|
29
|
+
hol.leaves.forEach(lv => {
|
|
30
|
+
if (this.leaves) {
|
|
31
|
+
this.leaves.push(new employees_1.Leave(lv));
|
|
32
|
+
}
|
|
33
|
+
});
|
|
34
|
+
this.leaves.sort((a, b) => a.compareTo(b));
|
|
35
|
+
}
|
|
25
36
|
}
|
|
26
37
|
toString() {
|
|
27
38
|
return `${this.id}${this.sort}`.toUpperCase();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"holiday.js","sourceRoot":"","sources":["../../../../src/scheduler/teams/company/holiday.ts"],"names":[],"mappings":";;;AAAA,IAAY,WAGX;AAHD,WAAY,WAAW;IACrB,4BAAa,CAAA;IACb,6BAAc,CAAA;AAChB,CAAC,EAHW,WAAW,2BAAX,WAAW,QAGtB;
|
|
1
|
+
{"version":3,"file":"holiday.js","sourceRoot":"","sources":["../../../../src/scheduler/teams/company/holiday.ts"],"names":[],"mappings":"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"}
|