scheduler-node-models 1.0.71 → 1.0.73
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
@@ -351,8 +351,8 @@ class Employee {
|
|
351
351
|
if (wk.useWork(date) && wk.modtime) {
|
352
352
|
work += wk.hours;
|
353
353
|
}
|
354
|
-
if (wk.
|
355
|
-
lastWorked = new Date(wk.
|
354
|
+
if (wk.dateworked.getTime() > lastWorked.getTime()) {
|
355
|
+
lastWorked = new Date(wk.dateworked);
|
356
356
|
}
|
357
357
|
});
|
358
358
|
}
|
@@ -481,8 +481,8 @@ class Employee {
|
|
481
481
|
if (wk.useWork(date) && wk.modtime) {
|
482
482
|
work += wk.hours;
|
483
483
|
}
|
484
|
-
if (wk.
|
485
|
-
lastWorked = new Date(wk.
|
484
|
+
if (wk.dateworked.getTime() > lastWorked.getTime()) {
|
485
|
+
lastWorked = new Date(wk.dateworked);
|
486
486
|
}
|
487
487
|
});
|
488
488
|
}
|
@@ -748,7 +748,7 @@ class Employee {
|
|
748
748
|
let lastWorked = new Date(0);
|
749
749
|
if (this.work && this.work.length > 0) {
|
750
750
|
this.work.sort((a, b) => a.compareTo(b));
|
751
|
-
lastWorked = new Date(this.work[this.work.length - 1].
|
751
|
+
lastWorked = new Date(this.work[this.work.length - 1].dateworked);
|
752
752
|
}
|
753
753
|
// check leaves for a date greater than lastworked
|
754
754
|
this.leaves.sort((a, b) => a.compareTo(b));
|
@@ -807,14 +807,14 @@ class Employee {
|
|
807
807
|
let answer = 0.0;
|
808
808
|
if (this.work) {
|
809
809
|
this.work.forEach(wk => {
|
810
|
-
if (wk.
|
811
|
-
&& wk.
|
810
|
+
if (wk.dateworked.getTime() >= start.getTime()
|
811
|
+
&& wk.dateworked.getTime() <= end.getTime()
|
812
812
|
&& !wk.modtime) {
|
813
813
|
if (!chgno) {
|
814
814
|
answer += wk.hours;
|
815
815
|
}
|
816
816
|
else if (chgno && ext) {
|
817
|
-
if (chgno.toLowerCase() === wk.
|
817
|
+
if (chgno.toLowerCase() === wk.chargenumber.toLowerCase()
|
818
818
|
&& ext.toLowerCase() === wk.extension.toLowerCase()) {
|
819
819
|
answer += wk.hours;
|
820
820
|
}
|
@@ -833,7 +833,7 @@ class Employee {
|
|
833
833
|
if (this.work && this.work.length > 0) {
|
834
834
|
this.work.sort((a, b) => a.compareTo(b));
|
835
835
|
const last = this.work[this.work.length - 1];
|
836
|
-
answer = new Date(last.
|
836
|
+
answer = new Date(last.dateworked);
|
837
837
|
}
|
838
838
|
return answer;
|
839
839
|
}
|
@@ -846,8 +846,8 @@ class Employee {
|
|
846
846
|
getModTime(start, end) {
|
847
847
|
let answer = 0.0;
|
848
848
|
this.work?.forEach(wk => {
|
849
|
-
if (wk.
|
850
|
-
&& wk.
|
849
|
+
if (wk.dateworked.getTime() >= start.getTime()
|
850
|
+
&& wk.dateworked.getTime() <= end.getTime()
|
851
851
|
&& wk.modtime) {
|
852
852
|
answer += wk.hours;
|
853
853
|
}
|
@@ -857,8 +857,8 @@ class Employee {
|
|
857
857
|
hasModTime(start, end) {
|
858
858
|
let answer = false;
|
859
859
|
this.work?.forEach(wk => {
|
860
|
-
if (wk.
|
861
|
-
&& wk.
|
860
|
+
if (wk.dateworked.getTime() >= start.getTime()
|
861
|
+
&& wk.dateworked.getTime() <= end.getTime()
|
862
862
|
&& wk.modtime) {
|
863
863
|
answer = true;
|
864
864
|
}
|
@@ -6,10 +6,10 @@ import { ObjectId } from "mongodb";
|
|
6
6
|
* The work interface describing the data members required.
|
7
7
|
*/
|
8
8
|
export interface IWork {
|
9
|
-
|
10
|
-
|
9
|
+
dateworked: Date;
|
10
|
+
chargenumber: string;
|
11
11
|
extension: string;
|
12
|
-
|
12
|
+
paycode: number;
|
13
13
|
modtime?: boolean;
|
14
14
|
hours: number;
|
15
15
|
}
|
@@ -23,10 +23,10 @@ export interface IWork {
|
|
23
23
|
* hours (numeric value for the number of hours worked for the labor code)
|
24
24
|
*/
|
25
25
|
export declare class Work implements IWork {
|
26
|
-
|
27
|
-
|
26
|
+
dateworked: Date;
|
27
|
+
chargenumber: string;
|
28
28
|
extension: string;
|
29
|
-
|
29
|
+
paycode: number;
|
30
30
|
modtime: boolean;
|
31
31
|
hours: number;
|
32
32
|
constructor(wk?: IWork);
|
@@ -11,17 +11,17 @@ exports.WorkRecord = exports.Work = void 0;
|
|
11
11
|
* hours (numeric value for the number of hours worked for the labor code)
|
12
12
|
*/
|
13
13
|
class Work {
|
14
|
-
|
15
|
-
|
14
|
+
dateworked;
|
15
|
+
chargenumber;
|
16
16
|
extension;
|
17
|
-
|
17
|
+
paycode;
|
18
18
|
modtime;
|
19
19
|
hours;
|
20
20
|
constructor(wk) {
|
21
|
-
this.
|
22
|
-
this.
|
21
|
+
this.dateworked = (wk) ? new Date(wk.dateworked) : new Date(0);
|
22
|
+
this.chargenumber = (wk) ? wk.chargenumber : '';
|
23
23
|
this.extension = (wk) ? wk.extension : '';
|
24
|
-
this.
|
24
|
+
this.paycode = (wk) ? wk.paycode : 1;
|
25
25
|
this.modtime = (wk && wk.modtime) ? wk.modtime : false;
|
26
26
|
this.hours = (wk) ? wk.hours : 0.0;
|
27
27
|
}
|
@@ -34,13 +34,13 @@ class Work {
|
|
34
34
|
*/
|
35
35
|
compareTo(other) {
|
36
36
|
if (other) {
|
37
|
-
if (this.
|
38
|
-
if (this.
|
37
|
+
if (this.dateworked.getTime() === other.dateworked.getTime()) {
|
38
|
+
if (this.chargenumber === other.chargenumber) {
|
39
39
|
return this.extension < other.extension ? -1 : 1;
|
40
40
|
}
|
41
|
-
return this.
|
41
|
+
return this.chargenumber < other.chargenumber ? -1 : 1;
|
42
42
|
}
|
43
|
-
return this.
|
43
|
+
return this.dateworked.getTime() < other.dateworked.getTime() ? -1 : 1;
|
44
44
|
}
|
45
45
|
return -1;
|
46
46
|
}
|
@@ -50,9 +50,9 @@ class Work {
|
|
50
50
|
* @returns A boolean value to indicate whether the work object is on the date provided.
|
51
51
|
*/
|
52
52
|
useWork(date) {
|
53
|
-
return this.
|
54
|
-
&& this.
|
55
|
-
&& this.
|
53
|
+
return this.dateworked.getUTCFullYear() === date.getUTCFullYear()
|
54
|
+
&& this.dateworked.getUTCMonth() === date.getUTCMonth()
|
55
|
+
&& this.dateworked.getUTCDate() === date.getUTCDate();
|
56
56
|
}
|
57
57
|
}
|
58
58
|
exports.Work = Work;
|
@@ -110,8 +110,8 @@ class WorkRecord {
|
|
110
110
|
*/
|
111
111
|
removeWork(start, end) {
|
112
112
|
for (let w = this.work.length - 1; w >= 0; w--) {
|
113
|
-
if (this.work[w].
|
114
|
-
&& this.work[w].
|
113
|
+
if (this.work[w].dateworked.getTime() >= start.getTime()
|
114
|
+
&& this.work[w].dateworked.getTime() <= end.getTime()) {
|
115
115
|
this.work.splice(w, 1);
|
116
116
|
}
|
117
117
|
}
|
@@ -123,7 +123,7 @@ class WorkRecord {
|
|
123
123
|
*/
|
124
124
|
purge(purgeDate) {
|
125
125
|
for (let w = this.work.length - 1; w >= 0; w--) {
|
126
|
-
if (this.work[w].
|
126
|
+
if (this.work[w].dateworked.getTime() < purgeDate.getTime()) {
|
127
127
|
this.work.splice(w, 1);
|
128
128
|
}
|
129
129
|
}
|