scheduler-node-models 1.2.37 → 1.2.39

package/package.json

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

package/scheduler/ingest/excelRow.js

@@ -44,7 +44,7 @@ class ExcelRow {
         return -1;
     }
     toString() {
-        let result = `${this.date.toDateString()} - `;
+        let result = `${this.date.toDateString()} - ${this.employee} - `;
         if (this.code !== '') {
             result += `${this.code} `;
             if (this.code.toLowerCase() === 'h') {
@@ -54,7 +54,7 @@ class ExcelRow {
         else {
             result += `${this.chargeNumber}/${this.extension}`;
         }
-        result += `- ${this.hours.toFixed(2)}`;
+        result += ` - ${this.hours.toFixed(2)}`;
         return result;
     }
 }

package/scheduler/ingest/sapIngest.d.ts

@@ -1,9 +1,9 @@
-import { Team } from "../teams";
+import { ITeam, Team } from "../teams";
 import { ExcelRow } from "./excelRow";
 export declare class SAPIngest {
     files: File[];
-    teamid: string;
     team: Team;
-    constructor(files?: File[], team?: string);
+    constructor(files?: File[], team?: ITeam);
+    Process(): Promise<ExcelRow[]>;
     processFile(file: File): Promise<ExcelRow[]>;
 }

package/scheduler/ingest/sapIngest.js

@@ -6,12 +6,22 @@ const excelRow_1 = require("./excelRow");
 const exceljs_1 = require("exceljs");
 class SAPIngest {
     files;
-    teamid;
     team;
     constructor(files, team) {
         this.files = (files) ? files : [];
-        this.teamid = (team) ? team : '';
-        this.team = new teams_1.Team();
+        this.team = (team) ? new teams_1.Team(team) : new teams_1.Team();
+    }
+    async Process() {
+        const result = [];
+        if (this.files.length > 0) {
+            const allfiles = this.files.map(async (file, f) => {
+                const results = await this.processFile(file);
+                result.push(...results);
+            });
+            await Promise.allSettled(allfiles);
+        }
+        result.sort((a, b) => a.compareTo(b));
+        return result;
     }
     async processFile(file) {
         const result = [];
@@ -54,7 +64,7 @@ class SAPIngest {
                         dataCols.forEach(sCol => {
                             const col = columns.get(sCol);
                             if (col) {
-                                const sValue = row.getCell(col).toString();
+                                const sValue = row.getCell(col).toString().trim();
                                 switch (sCol) {
                                     case 'date':
                                         eRow.date = new Date(Date.parse(sValue));