Skip to content

Fix/employment status monitoring field #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 30, 2025
Merged

Fix/employment status monitoring field #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4890fe9
docs: add reference documentation for the missing xml field
JasonWarrenUK Sep 30, 2025
d07a3e2
fix: add the OET block to the small employer #1 index
JasonWarrenUK Sep 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,10 @@ ipcMain.on("upload-csv", (event, dataArray, version) => {
ESMType: "SEM",
ESMCode: "1",
},
{
ESMType: "OET",
ESMCode: "2",
},
]
: []),
...(dataArray[i][22]
Expand Down Expand Up @@ -250,6 +254,10 @@ ipcMain.on("upload-csv", (event, dataArray, version) => {
ESMType: "SEM",
ESMCode: "1",
},
{
ESMType: "OET",
ESMCode: "2",
},
]
: []),
...(dataArray[i][30]
Expand Down
106 changes: 106 additions & 0 deletions schemas/xml-bug/example-bad.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,106 @@
<Learner>
<LearnRefNumber>0193</LearnRefNumber>
<ULN>8938361038</ULN>
<FamilyName>Rignell</FamilyName>
<GivenNames>Milo</GivenNames>
<DateOfBirth>1996-10-21</DateOfBirth>
<Ethnicity>31</Ethnicity>
<Sex>M</Sex>
<LLDDHealthProb>9</LLDDHealthProb>
<NINumber>PX059549B</NINumber>
<PlanLearnHours>240</PlanLearnHours>
<PostcodePrior>W1G 8PD</PostcodePrior>
<Postcode>W1G 8PD</Postcode>
<AddLine1>19 Wimpole Mews</AddLine1>
<PriorAttain>
<PriorLevel>9</PriorLevel>
<DateLevelApp>2025-04-07</DateLevelApp>
</PriorAttain>
<LearnerEmploymentStatus>
<EmpStat>10</EmpStat>
<DateEmpStatApp>2025-03-31</DateEmpStatApp>
<EmploymentStatusMonitoring>
<ESMType>LOE</ESMType>
<ESMCode>4</ESMCode>
</EmploymentStatusMonitoring>
<EmploymentStatusMonitoring>
<ESMType>EII</ESMType>
<ESMCode>8</ESMCode>
</EmploymentStatusMonitoring>
<EmploymentStatusMonitoring>
<ESMType>SEM</ESMType>
<ESMCode>1</ESMCode>
</EmploymentStatusMonitoring>
<!-- WARNING: Lacks an additional <EmploymentStatusMonitoring> tag -->
</LearnerEmploymentStatus>
<LearningDelivery>
<LearnAimRef>ZPROG001</LearnAimRef>
<AimType>1</AimType>
<AimSeqNumber>1</AimSeqNumber>
<LearnStartDate>2025-04-14</LearnStartDate>
<LearnPlanEndDate>2025-05-23</LearnPlanEndDate>
<FundModel>37</FundModel>
<PHours>240</PHours>
<ProgType>32</ProgType>
<DelLocPostCode>EC1V 8BR</DelLocPostCode>
<ConRefNumber>SBD-1232-674</ConRefNumber>
<CompStatus>2</CompStatus>
<LearnActEndDate>2025-05-23</LearnActEndDate>
<Outcome>8</Outcome>
<SWSupAimId>44002ec6-e19c-4b8d-9e9e-9c818aaa0464</SWSupAimId>
<LearningDeliveryFAM>
<LearnDelFAMType>FFI</LearnDelFAMType>
<LearnDelFAMCode>2</LearnDelFAMCode>
</LearningDeliveryFAM>
<LearningDeliveryFAM>
<LearnDelFAMType>SOF</LearnDelFAMType>
<LearnDelFAMCode>105</LearnDelFAMCode>
</LearningDeliveryFAM>
</LearningDelivery>
<LearningDelivery>
<LearnAimRef>Z0060503</LearnAimRef>
<AimType>3</AimType>
<AimSeqNumber>2</AimSeqNumber>
<LearnStartDate>2025-04-14</LearnStartDate>
<LearnPlanEndDate>2025-05-23</LearnPlanEndDate>
<FundModel>37</FundModel>
<ProgType>32</ProgType>
<DelLocPostCode>EC1V 8BR</DelLocPostCode>
<ConRefNumber>SBD-1232-674</ConRefNumber>
<CompStatus>2</CompStatus>
<LearnActEndDate>2025-05-23</LearnActEndDate>
<Outcome>1</Outcome>
<SWSupAimId>05bc5cd6-8799-4203-ae8f-a4c3fa32180f</SWSupAimId>
<LearningDeliveryFAM>
<LearnDelFAMType>FFI</LearnDelFAMType>
<LearnDelFAMCode>2</LearnDelFAMCode>
</LearningDeliveryFAM>
<LearningDeliveryFAM>
<LearnDelFAMType>SOF</LearnDelFAMType>
<LearnDelFAMCode>105</LearnDelFAMCode>
</LearningDeliveryFAM>
</LearningDelivery>
<LearningDelivery>
<LearnAimRef>Z0059748</LearnAimRef>
<AimType>3</AimType>
<AimSeqNumber>3</AimSeqNumber>
<LearnStartDate>2025-04-15</LearnStartDate>
<LearnPlanEndDate>2025-04-15</LearnPlanEndDate>
<FundModel>37</FundModel>
<ProgType>32</ProgType>
<DelLocPostCode>EC1V 8BR</DelLocPostCode>
<ConRefNumber>SBD-1232-674</ConRefNumber>
<CompStatus>2</CompStatus>
<LearnActEndDate>2025-04-15</LearnActEndDate>
<Outcome>1</Outcome>
<SWSupAimId>d2ccba98-ec61-4998-a8d6-39aff4858fea</SWSupAimId>
<LearningDeliveryFAM>
<LearnDelFAMType>FFI</LearnDelFAMType>
<LearnDelFAMCode>2</LearnDelFAMCode>
</LearningDeliveryFAM>
<LearningDeliveryFAM>
<LearnDelFAMType>SOF</LearnDelFAMType>
<LearnDelFAMCode>105</LearnDelFAMCode>
</LearningDeliveryFAM>
</LearningDelivery>
</Learner>
110 changes: 110 additions & 0 deletions schemas/xml-bug/example-good.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,110 @@
<Learner>
<LearnRefNumber>0193</LearnRefNumber>
<ULN>8938361038</ULN>
<FamilyName>Rignell</FamilyName>
<GivenNames>Milo</GivenNames>
<DateOfBirth>1996-10-21</DateOfBirth>
<Ethnicity>31</Ethnicity>
<Sex>M</Sex>
<LLDDHealthProb>9</LLDDHealthProb>
<NINumber>PX059549B</NINumber>
<PlanLearnHours>240</PlanLearnHours>
<PostcodePrior>W1G 8PD</PostcodePrior>
<Postcode>W1G 8PD</Postcode>
<AddLine1>19 Wimpole Mews</AddLine1>
<PriorAttain>
<PriorLevel>9</PriorLevel>
<DateLevelApp>2025-04-07</DateLevelApp>
</PriorAttain>
<LearnerEmploymentStatus>
<EmpStat>10</EmpStat>
<DateEmpStatApp>2025-03-31</DateEmpStatApp>
<EmploymentStatusMonitoring>
<ESMType>LOE</ESMType>
<ESMCode>4</ESMCode>
</EmploymentStatusMonitoring>
<EmploymentStatusMonitoring>
<ESMType>EII</ESMType>
<ESMCode>8</ESMCode>
</EmploymentStatusMonitoring>
<EmploymentStatusMonitoring>
<ESMType>SEM</ESMType>
<ESMCode>1</ESMCode>
</EmploymentStatusMonitoring>
<!-- NOTE: Includes the additional <EmploymentStatusMonitoring> tag -->
<EmploymentStatusMonitoring>
<ESMType>OET</ESMType>
<ESMCode>2</ESMCode>
</EmploymentStatusMonitoring>
</LearnerEmploymentStatus>
<LearningDelivery>
<LearnAimRef>ZPROG001</LearnAimRef>
<AimType>1</AimType>
<AimSeqNumber>1</AimSeqNumber>
<LearnStartDate>2025-04-14</LearnStartDate>
<LearnPlanEndDate>2025-05-23</LearnPlanEndDate>
<FundModel>37</FundModel>
<PHours>240</PHours>
<ProgType>32</ProgType>
<DelLocPostCode>EC1V 8BR</DelLocPostCode>
<ConRefNumber>SBD-1232-674</ConRefNumber>
<CompStatus>2</CompStatus>
<LearnActEndDate>2025-05-23</LearnActEndDate>
<Outcome>8</Outcome>
<SWSupAimId>44002ec6-e19c-4b8d-9e9e-9c818aaa0464</SWSupAimId>
<LearningDeliveryFAM>
<LearnDelFAMType>FFI</LearnDelFAMType>
<LearnDelFAMCode>2</LearnDelFAMCode>
</LearningDeliveryFAM>
<LearningDeliveryFAM>
<LearnDelFAMType>SOF</LearnDelFAMType>
<LearnDelFAMCode>105</LearnDelFAMCode>
</LearningDeliveryFAM>
</LearningDelivery>
<LearningDelivery>
<LearnAimRef>Z0060503</LearnAimRef>
<AimType>3</AimType>
<AimSeqNumber>2</AimSeqNumber>
<LearnStartDate>2025-04-14</LearnStartDate>
<LearnPlanEndDate>2025-05-23</LearnPlanEndDate>
<FundModel>37</FundModel>
<ProgType>32</ProgType>
<DelLocPostCode>EC1V 8BR</DelLocPostCode>
<ConRefNumber>SBD-1232-674</ConRefNumber>
<CompStatus>2</CompStatus>
<LearnActEndDate>2025-05-23</LearnActEndDate>
<Outcome>1</Outcome>
<SWSupAimId>05bc5cd6-8799-4203-ae8f-a4c3fa32180f</SWSupAimId>
<LearningDeliveryFAM>
<LearnDelFAMType>FFI</LearnDelFAMType>
<LearnDelFAMCode>2</LearnDelFAMCode>
</LearningDeliveryFAM>
<LearningDeliveryFAM>
<LearnDelFAMType>SOF</LearnDelFAMType>
<LearnDelFAMCode>105</LearnDelFAMCode>
</LearningDeliveryFAM>
</LearningDelivery>
<LearningDelivery>
<LearnAimRef>Z0059748</LearnAimRef>
<AimType>3</AimType>
<AimSeqNumber>3</AimSeqNumber>
<LearnStartDate>2025-04-15</LearnStartDate>
<LearnPlanEndDate>2025-04-15</LearnPlanEndDate>
<FundModel>37</FundModel>
<ProgType>32</ProgType>
<DelLocPostCode>EC1V 8BR</DelLocPostCode>
<ConRefNumber>SBD-1232-674</ConRefNumber>
<CompStatus>2</CompStatus>
<LearnActEndDate>2025-04-15</LearnActEndDate>
<Outcome>1</Outcome>
<SWSupAimId>d2ccba98-ec61-4998-a8d6-39aff4858fea</SWSupAimId>
<LearningDeliveryFAM>
<LearnDelFAMType>FFI</LearnDelFAMType>
<LearnDelFAMCode>2</LearnDelFAMCode>
</LearningDeliveryFAM>
<LearningDeliveryFAM>
<LearnDelFAMType>SOF</LearnDelFAMType>
<LearnDelFAMCode>105</LearnDelFAMCode>
</LearningDeliveryFAM>
</LearningDelivery>
</Learner>
Binary file added schemas/xml-bug/field-clicked.jpeg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
41 changes: 41 additions & 0 deletions schemas/xml-bug/problem.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
<BugReport>
<Message1>
```md
When we have clicked on Small employer #1 we need to make sure there's an additional block added to the existing <LearnerEmploymentStatus>
```
</Message1>

<Message2>
<!-- This message is the image at ./field-clicked.jpeg -->
</Message2>

<Message3>
```md
This is what need to be added

````xml
<EmploymentStatusMonitoring>
<ESMType>OET</ESMType>
<ESMCode>2</ESMCode>
</EmploymentStatusMonitoring>
````
```
<!-- The snippet is repeated in ./snippet.xml -->
</Message3>

<Message4>
```md
This is the xml for a single learner with a small employer.
```
<!-- The message is referring to ./example-good.xml -->
</Message4>

<Message5>
```md
The xml follows the spec for R13.
```
<!-- This is referencing a government specification
It can be downloaded [here](https://guidance.submit-learner-data.service.gov.uk/23-24/ilr/appendices)
-->
</Message5>
</BugReport>
4 changes: 4 additions & 0 deletions schemas/xml-bug/snippet.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<EmploymentStatusMonitoring>
<ESMType>OET</ESMType>
<ESMCode>2</ESMCode>
</EmploymentStatusMonitoring>
Loading