scheduler-node-models 1.0.70 → 1.0.72

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.
Files changed (4) hide show
  1. package/package.json +1 -1
  2. package/scheduler/employees/employee.js +13 -16
  3. package/scheduler/employees/work.d.ts +6 -6
  4. package/scheduler/employees/work.js +16 -16
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "scheduler-node-models",
3
- "version": "1.0.70",
3
+ "version": "1.0.72",
4
4
  "main": "./index.js",
5
5
  "types": "./index.d.ts",
6
6
  "files": [
package/scheduler/employees/employee.js CHANGED
@@ -108,9 +108,6 @@ class Employee {
108
108
  if (emp && emp.work && emp.work.length > 0) {
109
109
  this.work = [];
110
110
  emp.work.forEach(w => {
111
- if (emp.name.lastname.toLowerCase() === 'erne') {
112
- console.log(JSON.stringify(w));
113
- }
114
111
  this.work.push(new work_1.Work(w));
115
112
  });
116
113
  this.work.sort((a, b) => a.compareTo(b));
@@ -354,8 +351,8 @@ class Employee {
354
351
  if (wk.useWork(date) && wk.modtime) {
355
352
  work += wk.hours;
356
353
  }
357
- if (wk.dateWorked.getTime() > lastWorked.getTime()) {
358
- lastWorked = new Date(wk.dateWorked);
354
+ if (wk.dateworked.getTime() > lastWorked.getTime()) {
355
+ lastWorked = new Date(wk.dateworked);
359
356
  }
360
357
  });
361
358
  }
@@ -484,8 +481,8 @@ class Employee {
484
481
  if (wk.useWork(date) && wk.modtime) {
485
482
  work += wk.hours;
486
483
  }
487
- if (wk.dateWorked.getTime() > lastWorked.getTime()) {
488
- lastWorked = new Date(wk.dateWorked);
484
+ if (wk.dateworked.getTime() > lastWorked.getTime()) {
485
+ lastWorked = new Date(wk.dateworked);
489
486
  }
490
487
  });
491
488
  }
@@ -751,7 +748,7 @@ class Employee {
751
748
  let lastWorked = new Date(0);
752
749
  if (this.work && this.work.length > 0) {
753
750
  this.work.sort((a, b) => a.compareTo(b));
754
- lastWorked = new Date(this.work[this.work.length - 1].dateWorked);
751
+ lastWorked = new Date(this.work[this.work.length - 1].dateworked);
755
752
  }
756
753
  // check leaves for a date greater than lastworked
757
754
  this.leaves.sort((a, b) => a.compareTo(b));
@@ -810,14 +807,14 @@ class Employee {
810
807
  let answer = 0.0;
811
808
  if (this.work) {
812
809
  this.work.forEach(wk => {
813
- if (wk.dateWorked.getTime() >= start.getTime()
814
- && wk.dateWorked.getTime() <= end.getTime()
810
+ if (wk.dateworked.getTime() >= start.getTime()
811
+ && wk.dateworked.getTime() <= end.getTime()
815
812
  && !wk.modtime) {
816
813
  if (!chgno) {
817
814
  answer += wk.hours;
818
815
  }
819
816
  else if (chgno && ext) {
820
- if (chgno.toLowerCase() === wk.chargeNumber.toLowerCase()
817
+ if (chgno.toLowerCase() === wk.chargenumber.toLowerCase()
821
818
  && ext.toLowerCase() === wk.extension.toLowerCase()) {
822
819
  answer += wk.hours;
823
820
  }
@@ -836,7 +833,7 @@ class Employee {
836
833
  if (this.work && this.work.length > 0) {
837
834
  this.work.sort((a, b) => a.compareTo(b));
838
835
  const last = this.work[this.work.length - 1];
839
- answer = new Date(last.dateWorked);
836
+ answer = new Date(last.dateworked);
840
837
  }
841
838
  return answer;
842
839
  }
@@ -849,8 +846,8 @@ class Employee {
849
846
  getModTime(start, end) {
850
847
  let answer = 0.0;
851
848
  this.work?.forEach(wk => {
852
- if (wk.dateWorked.getTime() >= start.getTime()
853
- && wk.dateWorked.getTime() <= end.getTime()
849
+ if (wk.dateworked.getTime() >= start.getTime()
850
+ && wk.dateworked.getTime() <= end.getTime()
854
851
  && wk.modtime) {
855
852
  answer += wk.hours;
856
853
  }
@@ -860,8 +857,8 @@ class Employee {
860
857
  hasModTime(start, end) {
861
858
  let answer = false;
862
859
  this.work?.forEach(wk => {
863
- if (wk.dateWorked.getTime() >= start.getTime()
864
- && wk.dateWorked.getTime() <= end.getTime()
860
+ if (wk.dateworked.getTime() >= start.getTime()
861
+ && wk.dateworked.getTime() <= end.getTime()
865
862
  && wk.modtime) {
866
863
  answer = true;
867
864
  }
package/scheduler/employees/work.d.ts CHANGED
@@ -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
- dateWorked: Date;
10
- chargeNumber: string;
9
+ dateworked: Date;
10
+ chargenumber: string;
11
11
  extension: string;
12
- payCode: number;
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
- dateWorked: Date;
27
- chargeNumber: string;
26
+ dateworked: Date;
27
+ chargenumber: string;
28
28
  extension: string;
29
- payCode: number;
29
+ paycode: number;
30
30
  modtime: boolean;
31
31
  hours: number;
32
32
  constructor(wk?: IWork);
package/scheduler/employees/work.js CHANGED
@@ -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
- dateWorked;
15
- chargeNumber;
14
+ dateworked;
15
+ chargenumber;
16
16
  extension;
17
- payCode;
17
+ paycode;
18
18
  modtime;
19
19
  hours;
20
20
  constructor(wk) {
21
- this.dateWorked = (wk) ? new Date(wk.dateWorked) : new Date(0);
22
- this.chargeNumber = (wk) ? wk.chargeNumber : '';
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.payCode = (wk) ? wk.payCode : 1;
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.dateWorked.getTime() === other.dateWorked.getTime()) {
38
- if (this.chargeNumber === other.chargeNumber) {
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.chargeNumber < other.chargeNumber ? -1 : 1;
41
+ return this.chargenumber < other.chargenumber ? -1 : 1;
42
42
  }
43
- return this.dateWorked.getTime() < other.dateWorked.getTime() ? -1 : 1;
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.dateWorked.getUTCFullYear() === date.getUTCFullYear()
54
- && this.dateWorked.getUTCMonth() === date.getUTCMonth()
55
- && this.dateWorked.getUTCDate() === date.getUTCDate();
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].dateWorked.getTime() >= start.getTime()
114
- && this.work[w].dateWorked.getTime() <= end.getTime()) {
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].dateWorked.getTime() < purgeDate.getTime()) {
126
+ if (this.work[w].dateworked.getTime() < purgeDate.getTime()) {
127
127
  this.work.splice(w, 1);
128
128
  }
129
129
  }