swaped order of employer status

Author: Shaughn

main.js

@@ -10,7 +10,6 @@ const dateOnlyString = isoWithoutMsOrZ.replace(/T.*/, '');
 const { Worker } = require('worker_threads');
 
 
-
 let xmlBase = {
 
   Header: {
@@ -58,9 +57,7 @@ function createWindow() {
     win.webContents.toggleDevTools();
   });
 }
-process.on('unhandledRejection', (reason, promise) => {
-  console.error('Unhandled Rejection at:', promise, 'reason:', reason);
-});
+
 ipcMain.on('log-message', (event, message) => {
   console.log('Renderer:', message); // Log to terminal
 });
@@ -132,6 +129,33 @@ for (let i = 1; i < dataArray.length; i++) {
     },
  ]: undefined),
     LearnerEmploymentStatus: [
+      ...(dataArray[i][27] ? [{
+        EmpStat: dataArray[i][27],
+        DateEmpStatApp: dataArray[i][26],
+        EmpId: dataArray[i][28]|| undefined,
+        EmploymentStatusMonitoring: [
+          ...(dataArray[i][29] ? [{
+            ESMType: "EII",
+            ESMCode: dataArray[i][29]
+          }] : []),
+          ...(dataArray[i][33] ? [{
+            ESMType: "LOE",
+            ESMCode: dataArray[i][33]
+          }] : []),
+          ...(dataArray[i][31] ? [{
+            ESMType: "SEI",
+            ESMCode: "1"
+          }] : []),
+          ...(dataArray[i][32] ? [{
+            ESMType: "SEM",
+            ESMCode: "1"
+          }] : []),
+          ...(dataArray[i][30] ? [{
+            ESMType: "OET",
+            ESMCode: "1"
+          }] : [])
+        ]
+      }] : []),
       ...(dataArray[i][18] ? [{
         EmpStat: dataArray[i][18],
         DateEmpStatApp: dataArray[i][17],
@@ -150,7 +174,6 @@ for (let i = 1; i < dataArray.length; i++) {
             ESMCode: dataArray[i][25]
           }] : []),
           ...(dataArray[i][21] ? [{
-            //showing up as 0 of 1 marked
             ESMType: "SEI",
             ESMCode: "1"
           }] : []),
@@ -163,34 +186,8 @@ for (let i = 1; i < dataArray.length; i++) {
             ESMCode: "1"
           }] : [])
         ]
-      }] : []),
-      ...(dataArray[i][27] ? [{
-        EmpStat: dataArray[i][27],
-        DateEmpStatApp: dataArray[i][26],
-        EmpId: dataArray[i][28]|| undefined,
-        EmploymentStatusMonitoring: [
-          ...(dataArray[i][29] ? [{
-            ESMType: "EII",
-            ESMCode: dataArray[i][29]
-          }] : []),
-          ...(dataArray[i][33] ? [{
-            ESMType: "LOE",
-            ESMCode: dataArray[i][33]
-          }] : []),
-          ...(dataArray[i][31] ? [{
-            ESMType: "SEI",
-            ESMCode: "1"
-          }] : []),
-          ...(dataArray[i][32] ? [{
-            ESMType: "SEM",
-            ESMCode: "1"
-          }] : []),
-          ...(dataArray[i][30] ? [{
-            ESMType: "OET",
-            ESMCode: "1"
-          }] : [])
-        ]
       }] : [])
+      
     ],
     LearningDelivery: [
       // First aim - only include if required fields are present
@@ -254,11 +251,11 @@ for (let i = 1; i < dataArray.length; i++) {
         AimSeqNumber: '2',
         LearnStartDate: dataArray[i][68], // Start date (aim 2)
         LearnPlanEndDate: dataArray[i][69], // Planned end date (aim 2)
-        FundModel: dataArray[i][70], // Funding module (aim 2)
+        FundModel: dataArray[i][70], // Funding module (aim 2) 
+        PHours: dataArray[i][74] || undefined, // Planned hours (aim 2)
         ProgType: dataArray[i][71], // Programme type (aim 2)
         StdCode: dataArray[i][72] || undefined, // Apprentice standard (aim 2)
         DelLocPostCode: dataArray[i][73], // Delivery postcode (aim 2)
-        PHours: dataArray[i][74] || undefined, // Planned hours (aim 2)
         OTJActHours: dataArray[i][75] || undefined, // Actual hours (aim 2)
         EPAOrgID: dataArray[i][77] || undefined, // EPAO ID (aim 2)
         ConRefNumber: dataArray[i][76] || undefined, // Contract Ref (aim 2)
@@ -363,10 +360,10 @@ for (let i = 1; i < dataArray.length; i++) {
         LearnStartDate: dataArray[i][132], // Start date (aim 4)
         LearnPlanEndDate: dataArray[i][133], // Planned end date (aim 4)
         FundModel: dataArray[i][134], // Funding module (aim 4)
+        PHours: dataArray[i][138] || undefined, // Planned hours (aim 4)
         ProgType: dataArray[i][135], // Programme type (aim 4)
         StdCode: dataArray[i][136] || undefined, // Apprentice standard (aim 4)
         DelLocPostCode: dataArray[i][137], // Delivery postcode (aim 4)
-        PHours: dataArray[i][138] || undefined, // Planned hours (aim 4)
         OTJActHours: dataArray[i][139] || undefined, // Actual hours (aim 4)
         EPAOrgID: dataArray[i][141] || undefined, // EPAO ID (aim 4)
         ConRefNumber: dataArray[i][140] || undefined, // Contract Ref (aim 4)
@@ -384,7 +381,7 @@ for (let i = 1; i < dataArray.length; i++) {
           }] : []),
           ...(dataArray[i][147] ? [{ // Source of funding (aim 4)
             LearnDelFAMType: 'SOF',
-            LearnDelFAMCode: dataArray[i][163]
+            LearnDelFAMCode: dataArray[i][147]
           }] : []),
           ...(dataArray[i][142] ? [{ // Contract type (aim 4)
             LearnDelFAMType: dataArray[i][142],