scheduler-node-models 1.0.7 → 1.0.9

package/general/report.js

@@ -6,7 +6,7 @@ class Report {
         if (typeof col === 'string') {
             return `${col}${row}`;
         }
-        const letters = 'ABCDEFGHIJKLMNOPQRSTUVWXVZ';
+        const letters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ';
         if (col < letters.length) {
             return `${letters.substring(col, col + 1)}${row}`;
         }

package/package.json

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

package/scheduler/reports/scheduleReport.js

@@ -51,7 +51,7 @@ class ScheduleReport extends general_1.Report {
                 this.styles.set(wc.id, style);
             }
         });
-        this.styles.set('evenday', {
+        let style = {
             fill: { type: 'pattern', pattern: 'solid', fgColor: { argb: `ffc0c0c0` } },
             font: { bold: true, size: 11, color: { argb: `ff000000` } },
             alignment: { horizontal: 'center', vertical: 'middle', wrapText: true },
@@ -61,7 +61,8 @@ class ScheduleReport extends general_1.Report {
                 bottom: { style: 'thin', color: { argb: 'ff000000' } },
                 right: { style: 'thin', color: { argb: 'ff000000' } }
             }
-        });
+        };
+        this.styles.set('evenday', style);
         this.styles.set('oddday', {
             fill: { type: 'pattern', pattern: 'solid', fgColor: { argb: `ffffffff` } },
             font: { bold: true, size: 11, color: { argb: `ff000000` } },
@@ -201,7 +202,7 @@ class ScheduleReport extends general_1.Report {
         let style = this.styles.get('month');
         sheet.getRow(1).height = 20;
         sheet.getRow(2).height = 20;
-        this.setCell(sheet, this.getCellID(1, 1), this.getCellID(1, 1), style, months[startDate.getMonth()]);
+        this.setCell(sheet, this.getCellID(0, 1), this.getCellID(0, 1), style, months[startDate.getMonth()]);
         const formatter = new Intl.DateTimeFormat('en-US', {
             month: '2-digit',
             day: '2-digit',
@@ -215,11 +216,12 @@ class ScheduleReport extends general_1.Report {
                 styleID = 'evenend';
             }
             style = this.styles.get(styleID);
-            let cellID = this.getCellID(current.getDate() + 1, 1);
+            let cellID = this.getCellID(current.getDate(), 1);
             this.setCell(sheet, cellID, cellID, style, weekdays[current.getDay()]);
-            cellID = this.getCellID(current.getDate() + 1, 2);
+            cellID = this.getCellID(current.getDate(), 2);
             this.setCell(sheet, cellID, cellID, style, current.getDate());
             current = new Date(current.getTime() + (24 * 3600000));
+            console.log(current);
         }
         // now add row for workcenter header, then the employees under that workcenter
         let row = 2;
@@ -227,7 +229,7 @@ class ScheduleReport extends general_1.Report {
             row++;
             style = this.styles.get('wkctr');
             sheet.getRow(row).height = 20.0;
-            this.setCell(sheet, this.getCellID(0, row), this.getCellID(endofMonth + 2, row), style, wkctr.name);
+            this.setCell(sheet, this.getCellID(0, row), this.getCellID(endofMonth, row), style, wkctr.name);
             // sort positions, then add a row for each employee for the positions.
             if (wkctr.positions && wkctr.positions.length > 0) {
                 wkctr.positions.sort((a, b) => a.compareTo(b));
@@ -263,7 +265,7 @@ class ScheduleReport extends general_1.Report {
         let style = this.styles.get(styleID);
         sheet.getRow(row).height = 20;
         const name = `${emp.name.lastname}, ${emp.name.firstname.substring(0, 1)}`;
-        this.setCell(sheet, this.getCellID(1, row), this.getCellID(1, row), style, name);
+        this.setCell(sheet, this.getCellID(0, row), this.getCellID(0, row), style, name);
         let current = new Date(start);
         while (current.getTime() < end.getTime()) {
             let stID = styleID;
@@ -281,7 +283,7 @@ class ScheduleReport extends general_1.Report {
                 }
             }
             style = this.styles.get(stID);
-            const cellID = this.getCellID(current.getDate() + 1, row);
+            const cellID = this.getCellID(current.getDate(), row);
             this.setCell(sheet, cellID, cellID, style, code);
             current = new Date(current.getTime() + (24 * 3600000));
         }