scheduler-node-models 1.0.139 → 1.0.141

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "scheduler-node-models",
-  "version": "1.0.139",
+  "version": "1.0.141",
   "main": "index.js",
   "types": "index.d.ts",
   "files": [

package/scheduler/reports/leaveReport.d.ts

@@ -20,10 +20,11 @@ export declare class LeaveReport extends Report {
      * @param user The user object for the employee who is creating the report
      * @param iEmps A list of employee objects to use in creating the report
      * @param site A string value for the site identifier for the report
+     * @param company A string value for the company identifier
      * @param reqDate A date object for the requested date
      * @returns The workbook object with the report data.
      */
-    create(user: User, iEmps: IEmployee[], site: string, reqDate: Date): Workbook;
+    create(user: User, iEmps: IEmployee[], site: string, company: string, reqDate: Date): Workbook;
     /**
      * This function will create the basic style information to be used within the sheet
      * cells, which consists for font styles, cell fill styles, borders, and alignments for

package/scheduler/reports/leaveReport.js

@@ -42,16 +42,17 @@ class LeaveReport extends general_1.Report {
      * @param user The user object for the employee who is creating the report
      * @param iEmps A list of employee objects to use in creating the report
      * @param site A string value for the site identifier for the report
+     * @param company A string value for the company identifier
      * @param reqDate A date object for the requested date
      * @returns The workbook object with the report data.
      */
-    create(user, iEmps, site, reqDate) {
-        console.log(iEmps.length);
+    create(user, iEmps, site, company, reqDate) {
         const start = new Date(Date.UTC(reqDate.getUTCFullYear(), 0, 1));
         const end = new Date(Date.UTC(reqDate.getUTCFullYear() + 1, 0, 1));
         iEmps.forEach(iemp => {
             const emp = new employees_1.Employee(iemp);
-            if (emp.atSite(site, start, end)) {
+            if (emp.atSite(site, start, end)
+                && emp.companyinfo.company.toLowerCase() === company.toLowerCase()) {
                 this.employees.push(emp);
             }
         });