Skip to content

Commit 407e54a

Browse files
JasonWarrenUKJasonWarrenUK
authored
Merge pull request #17 from foundersandcoders/fix/employment-status-monitoring-field
Fix/employment status monitoring field
2 parents bdb9c8d + d07a3e2 commit 407e54a

File tree

6 files changed

+269
-0
lines changed

6 files changed

+269
-0
lines changed

‎main.js‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -199,6 +199,10 @@ ipcMain.on("upload-csv", (event, dataArray, version) => {
199199
ESMType: "SEM",
200200
ESMCode: "1",
201201
},
202+
{
203+
ESMType: "OET",
204+
ESMCode: "2",
205+
},
202206
]
203207
: []),
204208
...(dataArray[i][22]
@@ -250,6 +254,10 @@ ipcMain.on("upload-csv", (event, dataArray, version) => {
250254
ESMType: "SEM",
251255
ESMCode: "1",
252256
},
257+
{
258+
ESMType: "OET",
259+
ESMCode: "2",
260+
},
253261
]
254262
: []),
255263
...(dataArray[i][30]

‎schemas/xml-bug/example-bad.xml‎

Lines changed: 106 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,106 @@
1+
<Learner>
2+
<LearnRefNumber>0193</LearnRefNumber>
3+
<ULN>8938361038</ULN>
4+
<FamilyName>Rignell</FamilyName>
5+
<GivenNames>Milo</GivenNames>
6+
<DateOfBirth>1996-10-21</DateOfBirth>
7+
<Ethnicity>31</Ethnicity>
8+
<Sex>M</Sex>
9+
<LLDDHealthProb>9</LLDDHealthProb>
10+
<NINumber>PX059549B</NINumber>
11+
<PlanLearnHours>240</PlanLearnHours>
12+
<PostcodePrior>W1G 8PD</PostcodePrior>
13+
<Postcode>W1G 8PD</Postcode>
14+
<AddLine1>19 Wimpole Mews</AddLine1>
15+
<PriorAttain>
16+
<PriorLevel>9</PriorLevel>
17+
<DateLevelApp>2025-04-07</DateLevelApp>
18+
</PriorAttain>
19+
<LearnerEmploymentStatus>
20+
<EmpStat>10</EmpStat>
21+
<DateEmpStatApp>2025-03-31</DateEmpStatApp>
22+
<EmploymentStatusMonitoring>
23+
<ESMType>LOE</ESMType>
24+
<ESMCode>4</ESMCode>
25+
</EmploymentStatusMonitoring>
26+
<EmploymentStatusMonitoring>
27+
<ESMType>EII</ESMType>
28+
<ESMCode>8</ESMCode>
29+
</EmploymentStatusMonitoring>
30+
<EmploymentStatusMonitoring>
31+
<ESMType>SEM</ESMType>
32+
<ESMCode>1</ESMCode>
33+
</EmploymentStatusMonitoring>
34+
<!-- WARNING: Lacks an additional <EmploymentStatusMonitoring> tag -->
35+
</LearnerEmploymentStatus>
36+
<LearningDelivery>
37+
<LearnAimRef>ZPROG001</LearnAimRef>
38+
<AimType>1</AimType>
39+
<AimSeqNumber>1</AimSeqNumber>
40+
<LearnStartDate>2025-04-14</LearnStartDate>
41+
<LearnPlanEndDate>2025-05-23</LearnPlanEndDate>
42+
<FundModel>37</FundModel>
43+
<PHours>240</PHours>
44+
<ProgType>32</ProgType>
45+
<DelLocPostCode>EC1V 8BR</DelLocPostCode>
46+
<ConRefNumber>SBD-1232-674</ConRefNumber>
47+
<CompStatus>2</CompStatus>
48+
<LearnActEndDate>2025-05-23</LearnActEndDate>
49+
<Outcome>8</Outcome>
50+
<SWSupAimId>44002ec6-e19c-4b8d-9e9e-9c818aaa0464</SWSupAimId>
51+
<LearningDeliveryFAM>
52+
<LearnDelFAMType>FFI</LearnDelFAMType>
53+
<LearnDelFAMCode>2</LearnDelFAMCode>
54+
</LearningDeliveryFAM>
55+
<LearningDeliveryFAM>
56+
<LearnDelFAMType>SOF</LearnDelFAMType>
57+
<LearnDelFAMCode>105</LearnDelFAMCode>
58+
</LearningDeliveryFAM>
59+
</LearningDelivery>
60+
<LearningDelivery>
61+
<LearnAimRef>Z0060503</LearnAimRef>
62+
<AimType>3</AimType>
63+
<AimSeqNumber>2</AimSeqNumber>
64+
<LearnStartDate>2025-04-14</LearnStartDate>
65+
<LearnPlanEndDate>2025-05-23</LearnPlanEndDate>
66+
<FundModel>37</FundModel>
67+
<ProgType>32</ProgType>
68+
<DelLocPostCode>EC1V 8BR</DelLocPostCode>
69+
<ConRefNumber>SBD-1232-674</ConRefNumber>
70+
<CompStatus>2</CompStatus>
71+
<LearnActEndDate>2025-05-23</LearnActEndDate>
72+
<Outcome>1</Outcome>
73+
<SWSupAimId>05bc5cd6-8799-4203-ae8f-a4c3fa32180f</SWSupAimId>
74+
<LearningDeliveryFAM>
75+
<LearnDelFAMType>FFI</LearnDelFAMType>
76+
<LearnDelFAMCode>2</LearnDelFAMCode>
77+
</LearningDeliveryFAM>
78+
<LearningDeliveryFAM>
79+
<LearnDelFAMType>SOF</LearnDelFAMType>
80+
<LearnDelFAMCode>105</LearnDelFAMCode>
81+
</LearningDeliveryFAM>
82+
</LearningDelivery>
83+
<LearningDelivery>
84+
<LearnAimRef>Z0059748</LearnAimRef>
85+
<AimType>3</AimType>
86+
<AimSeqNumber>3</AimSeqNumber>
87+
<LearnStartDate>2025-04-15</LearnStartDate>
88+
<LearnPlanEndDate>2025-04-15</LearnPlanEndDate>
89+
<FundModel>37</FundModel>
90+
<ProgType>32</ProgType>
91+
<DelLocPostCode>EC1V 8BR</DelLocPostCode>
92+
<ConRefNumber>SBD-1232-674</ConRefNumber>
93+
<CompStatus>2</CompStatus>
94+
<LearnActEndDate>2025-04-15</LearnActEndDate>
95+
<Outcome>1</Outcome>
96+
<SWSupAimId>d2ccba98-ec61-4998-a8d6-39aff4858fea</SWSupAimId>
97+
<LearningDeliveryFAM>
98+
<LearnDelFAMType>FFI</LearnDelFAMType>
99+
<LearnDelFAMCode>2</LearnDelFAMCode>
100+
</LearningDeliveryFAM>
101+
<LearningDeliveryFAM>
102+
<LearnDelFAMType>SOF</LearnDelFAMType>
103+
<LearnDelFAMCode>105</LearnDelFAMCode>
104+
</LearningDeliveryFAM>
105+
</LearningDelivery>
106+
</Learner>

‎schemas/xml-bug/example-good.xml‎

Lines changed: 110 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,110 @@
1+
<Learner>
2+
<LearnRefNumber>0193</LearnRefNumber>
3+
<ULN>8938361038</ULN>
4+
<FamilyName>Rignell</FamilyName>
5+
<GivenNames>Milo</GivenNames>
6+
<DateOfBirth>1996-10-21</DateOfBirth>
7+
<Ethnicity>31</Ethnicity>
8+
<Sex>M</Sex>
9+
<LLDDHealthProb>9</LLDDHealthProb>
10+
<NINumber>PX059549B</NINumber>
11+
<PlanLearnHours>240</PlanLearnHours>
12+
<PostcodePrior>W1G 8PD</PostcodePrior>
13+
<Postcode>W1G 8PD</Postcode>
14+
<AddLine1>19 Wimpole Mews</AddLine1>
15+
<PriorAttain>
16+
<PriorLevel>9</PriorLevel>
17+
<DateLevelApp>2025-04-07</DateLevelApp>
18+
</PriorAttain>
19+
<LearnerEmploymentStatus>
20+
<EmpStat>10</EmpStat>
21+
<DateEmpStatApp>2025-03-31</DateEmpStatApp>
22+
<EmploymentStatusMonitoring>
23+
<ESMType>LOE</ESMType>
24+
<ESMCode>4</ESMCode>
25+
</EmploymentStatusMonitoring>
26+
<EmploymentStatusMonitoring>
27+
<ESMType>EII</ESMType>
28+
<ESMCode>8</ESMCode>
29+
</EmploymentStatusMonitoring>
30+
<EmploymentStatusMonitoring>
31+
<ESMType>SEM</ESMType>
32+
<ESMCode>1</ESMCode>
33+
</EmploymentStatusMonitoring>
34+
<!-- NOTE: Includes the additional <EmploymentStatusMonitoring> tag -->
35+
<EmploymentStatusMonitoring>
36+
<ESMType>OET</ESMType>
37+
<ESMCode>2</ESMCode>
38+
</EmploymentStatusMonitoring>
39+
</LearnerEmploymentStatus>
40+
<LearningDelivery>
41+
<LearnAimRef>ZPROG001</LearnAimRef>
42+
<AimType>1</AimType>
43+
<AimSeqNumber>1</AimSeqNumber>
44+
<LearnStartDate>2025-04-14</LearnStartDate>
45+
<LearnPlanEndDate>2025-05-23</LearnPlanEndDate>
46+
<FundModel>37</FundModel>
47+
<PHours>240</PHours>
48+
<ProgType>32</ProgType>
49+
<DelLocPostCode>EC1V 8BR</DelLocPostCode>
50+
<ConRefNumber>SBD-1232-674</ConRefNumber>
51+
<CompStatus>2</CompStatus>
52+
<LearnActEndDate>2025-05-23</LearnActEndDate>
53+
<Outcome>8</Outcome>
54+
<SWSupAimId>44002ec6-e19c-4b8d-9e9e-9c818aaa0464</SWSupAimId>
55+
<LearningDeliveryFAM>
56+
<LearnDelFAMType>FFI</LearnDelFAMType>
57+
<LearnDelFAMCode>2</LearnDelFAMCode>
58+
</LearningDeliveryFAM>
59+
<LearningDeliveryFAM>
60+
<LearnDelFAMType>SOF</LearnDelFAMType>
61+
<LearnDelFAMCode>105</LearnDelFAMCode>
62+
</LearningDeliveryFAM>
63+
</LearningDelivery>
64+
<LearningDelivery>
65+
<LearnAimRef>Z0060503</LearnAimRef>
66+
<AimType>3</AimType>
67+
<AimSeqNumber>2</AimSeqNumber>
68+
<LearnStartDate>2025-04-14</LearnStartDate>
69+
<LearnPlanEndDate>2025-05-23</LearnPlanEndDate>
70+
<FundModel>37</FundModel>
71+
<ProgType>32</ProgType>
72+
<DelLocPostCode>EC1V 8BR</DelLocPostCode>
73+
<ConRefNumber>SBD-1232-674</ConRefNumber>
74+
<CompStatus>2</CompStatus>
75+
<LearnActEndDate>2025-05-23</LearnActEndDate>
76+
<Outcome>1</Outcome>
77+
<SWSupAimId>05bc5cd6-8799-4203-ae8f-a4c3fa32180f</SWSupAimId>
78+
<LearningDeliveryFAM>
79+
<LearnDelFAMType>FFI</LearnDelFAMType>
80+
<LearnDelFAMCode>2</LearnDelFAMCode>
81+
</LearningDeliveryFAM>
82+
<LearningDeliveryFAM>
83+
<LearnDelFAMType>SOF</LearnDelFAMType>
84+
<LearnDelFAMCode>105</LearnDelFAMCode>
85+
</LearningDeliveryFAM>
86+
</LearningDelivery>
87+
<LearningDelivery>
88+
<LearnAimRef>Z0059748</LearnAimRef>
89+
<AimType>3</AimType>
90+
<AimSeqNumber>3</AimSeqNumber>
91+
<LearnStartDate>2025-04-15</LearnStartDate>
92+
<LearnPlanEndDate>2025-04-15</LearnPlanEndDate>
93+
<FundModel>37</FundModel>
94+
<ProgType>32</ProgType>
95+
<DelLocPostCode>EC1V 8BR</DelLocPostCode>
96+
<ConRefNumber>SBD-1232-674</ConRefNumber>
97+
<CompStatus>2</CompStatus>
98+
<LearnActEndDate>2025-04-15</LearnActEndDate>
99+
<Outcome>1</Outcome>
100+
<SWSupAimId>d2ccba98-ec61-4998-a8d6-39aff4858fea</SWSupAimId>
101+
<LearningDeliveryFAM>
102+
<LearnDelFAMType>FFI</LearnDelFAMType>
103+
<LearnDelFAMCode>2</LearnDelFAMCode>
104+
</LearningDeliveryFAM>
105+
<LearningDeliveryFAM>
106+
<LearnDelFAMType>SOF</LearnDelFAMType>
107+
<LearnDelFAMCode>105</LearnDelFAMCode>
108+
</LearningDeliveryFAM>
109+
</LearningDelivery>
110+
</Learner>

‎schemas/xml-bug/field-clicked.jpeg‎

22.5 KB
Loading

‎schemas/xml-bug/problem.xml‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
<BugReport>
2+
<Message1>
3+
```md
4+
When we have clicked on Small employer #1 we need to make sure there's an additional block added to the existing <LearnerEmploymentStatus>
5+
```
6+
</Message1>
7+
8+
<Message2>
9+
<!-- This message is the image at ./field-clicked.jpeg -->
10+
</Message2>
11+
12+
<Message3>
13+
```md
14+
This is what need to be added
15+
16+
````xml
17+
<EmploymentStatusMonitoring>
18+
<ESMType>OET</ESMType>
19+
<ESMCode>2</ESMCode>
20+
</EmploymentStatusMonitoring>
21+
````
22+
```
23+
<!-- The snippet is repeated in ./snippet.xml -->
24+
</Message3>
25+
26+
<Message4>
27+
```md
28+
This is the xml for a single learner with a small employer.
29+
```
30+
<!-- The message is referring to ./example-good.xml -->
31+
</Message4>
32+
33+
<Message5>
34+
```md
35+
The xml follows the spec for R13.
36+
```
37+
<!-- This is referencing a government specification
38+
It can be downloaded [here](https://guidance.submit-learner-data.service.gov.uk/23-24/ilr/appendices)
39+
-->
40+
</Message5>
41+
</BugReport>

‎schemas/xml-bug/snippet.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<EmploymentStatusMonitoring>
2+
<ESMType>OET</ESMType>
3+
<ESMCode>2</ESMCode>
4+
</EmploymentStatusMonitoring>

0 commit comments

Comments
 (0)