Skip to content

Commit e16db96

Browse files
JasonWarrenUKJasonWarrenUK
authored
Merge pull request #20 from foundersandcoders/fix/withold-oet=1-from-apprentices
Withold `OET: 2` from Apprentices
2 parents d2e0481 + 7a54448 commit e16db96

File tree

8 files changed

+81
-14
lines changed

8 files changed

+81
-14
lines changed

‎.DS_Store‎

-6 KB
Binary file not shown.

‎.gitignore‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,4 +63,5 @@ temp/
6363
.tmp/
6464

6565
# Claude Code configuration
66-
.claude/
66+
.claude/
67+
.DS_Store

docs/inputs/25_26 Values.csv renamed to docs/inputs/25_26 Example.csv

File renamed without changes.

docs/inputs/25_26 Columns.csv renamed to docs/reference/Columns All.csv

File renamed without changes.

‎docs/reference/Columns Important.md‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
# Notable Airtable Columns
2+
## Bootcamp Fields
3+
| i0 | Name | Notes |
4+
|----|------|-------|
5+
| 44 | Contract Ref (aim 1) | |
6+
7+
## Employment Status Fields
8+
### Employment Status #1
9+
| i0 | Name | Notes |
10+
|----|------|-------|
11+
| 20 | Small Employer #1 | |
12+
13+
### Employment Status #2
14+
| i0 | Name | Notes |
15+
|----|------|-------|
16+
| 32 | Small Employer #2 | |
17+
18+
### Employment Status #3
19+
| i0 | Name | Notes |
20+
|----|------|-------|
21+
| 198 | Small Employer #3 | |
22+
23+
### Employment Status #4
24+
| i0 | Name | Notes |
25+
|----|------|-------|
26+
| 207 | Small Employer #4 | |
27+
28+
### Employment Status #5
29+
| i0 | Name | Notes |
30+
|----|------|-------|
31+
| 216 | Small Employer #5 | |

docs/inputs/Status-Comparison.md renamed to docs/reference/Status-Comparison.md

File renamed without changes.

‎src/utils/buildEmploymentArray.js‎

Lines changed: 46 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,15 @@ function buildEmploymentArray(dataArray, i) {
2525
? [{ ESMType: "SEI", ESMCode: "1" }]
2626
: []
2727
),
28-
...(/* Small employer #1 */ dataArray[i][20]
29-
? [{ ESMType: "SEM", ESMCode: "1" }, { ESMType: "OET", ESMCode: "2" }]
28+
...(/* Small employer #1 & Contract Ref */ (dataArray[i][20] && dataArray[i][44])
29+
? [
30+
{ ESMType: "SEM", ESMCode: "1" },
31+
{ ESMType: "OET", ESMCode: "2" }
32+
]
33+
: []
34+
),
35+
...(/* Small employer #1, No Contract Ref */ (dataArray[i][20] && !dataArray[i][44])
36+
? [{ ESMType: "SEM", ESMCode: "1" }]
3037
: []
3138
),
3239
...(/* Has the learner been made redundant? #1 */ dataArray[i][22]
@@ -62,8 +69,15 @@ function buildEmploymentArray(dataArray, i) {
6269
? [{ ESMType: "SEI", ESMCode: "1" }]
6370
: []
6471
),
65-
...(/* Small employer #2 */ dataArray[i][32]
66-
? [{ ESMType: "SEM", ESMCode: "1" }, { ESMType: "OET", ESMCode: "2" }]
72+
...(/* Small employer #2 & Contract Ref */ (dataArray[i][32] && dataArray[i][44])
73+
? [
74+
{ ESMType: "SEM", ESMCode: "1" },
75+
{ ESMType: "OET", ESMCode: "2" }
76+
]
77+
: []
78+
),
79+
...(/* Small employer #2, No Contract Ref */ (dataArray[i][32] && !dataArray[i][44])
80+
? [{ ESMType: "SEM", ESMCode: "1" }]
6781
: []
6882
),
6983
...(/* Has the learner been made redundant? #2 */ dataArray[i][30]
@@ -99,8 +113,15 @@ function buildEmploymentArray(dataArray, i) {
99113
? [{ ESMType: "SEI", ESMCode: "1" }]
100114
: []
101115
),
102-
...(/* Small employer #3 */ dataArray[i][198]
103-
? [{ ESMType: "SEM", ESMCode: "1" }, { ESMType: "OET", ESMCode: "2" }]
116+
...(/* Small employer #3 & Contract Ref */ (dataArray[i][198] && dataArray[i][44])
117+
? [
118+
{ ESMType: "SEM", ESMCode: "1" },
119+
{ ESMType: "OET", ESMCode: "2" }
120+
]
121+
: []
122+
),
123+
...(/* Small employer #3, No Contract Ref */ (dataArray[i][198] && !dataArray[i][44])
124+
? [{ ESMType: "SEM", ESMCode: "1" }]
104125
: []
105126
),
106127
...(/* Has the learner been made redundant? #3 */ dataArray[i][200]
@@ -136,8 +157,15 @@ function buildEmploymentArray(dataArray, i) {
136157
? [{ ESMType: "SEI", ESMCode: "1" }]
137158
: []
138159
),
139-
...(/* Small employer #4 */ dataArray[i][207]
140-
? [{ ESMType: "SEM", ESMCode: "1" }, { ESMType: "OET", ESMCode: "2" }]
160+
...(/* Small employer #4 & Contract Ref */ (dataArray[i][207] && dataArray[i][44])
161+
? [
162+
{ ESMType: "SEM", ESMCode: "1" },
163+
{ ESMType: "OET", ESMCode: "2" }
164+
]
165+
: []
166+
),
167+
...(/* Small employer #4, No Contract Ref */ (dataArray[i][207] && !dataArray[i][44])
168+
? [{ ESMType: "SEM", ESMCode: "1" }]
141169
: []
142170
),
143171
...(/* Has the learner been made redundant? #4 */ dataArray[i][209]
@@ -173,8 +201,15 @@ function buildEmploymentArray(dataArray, i) {
173201
? [{ ESMType: "SEI", ESMCode: "1" }]
174202
: []
175203
),
176-
...(/* Small employer #5 */ dataArray[i][216]
177-
? [{ ESMType: "SEM", ESMCode: "1" }, { ESMType: "OET", ESMCode: "2" }]
204+
...(/* Small employer #25 & Contract Ref */ (dataArray[i][216] && dataArray[i][44])
205+
? [
206+
{ ESMType: "SEM", ESMCode: "1" },
207+
{ ESMType: "OET", ESMCode: "2" }
208+
]
209+
: []
210+
),
211+
...(/* Small employer #5, No Contract Ref */ (dataArray[i][216] && !dataArray[i][44])
212+
? [{ ESMType: "SEM", ESMCode: "1" }]
178213
: []
179214
),
180215
...(/* Has the learner been made redundant? #5 */ dataArray[i][218]
@@ -188,4 +223,4 @@ function buildEmploymentArray(dataArray, i) {
188223
]
189224
}
190225

191-
module.exports = { buildEmploymentArray };
226+
module.exports = { buildEmploymentArray };

‎src/utils/pushLearners.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ const { buildLearningDeliveryArray } = require("./buildLearningDeliveryArray");
44
function pushLearners(dataArray, xmlBase) {
55
for (let i = 1; i < dataArray.length; i++) {
66
const refNumber = i
7-
.toString()
8-
.padStart(4, "0");
7+
.toString()
8+
.padStart(4, "0");
99

1010
const employmentStatusArray = buildEmploymentArray(dataArray, i);
1111
const learningDeliveryArray = buildLearningDeliveryArray(dataArray, i);

0 commit comments

Comments
 (0)