Skip to content

Commit 0eece34

Browse files
committed
fix: add logic to distinguish bootcamp learners from apprentices
1 parent d258fba commit 0eece34

File tree

1 file changed

+47
-11
lines changed

1 file changed

+47
-11
lines changed

src/utils/buildEmploymentArray.js

Lines changed: 47 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,10 +113,18 @@ 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
),
127+
),
106128
...(/* Has the learner been made redundant? #3 */ dataArray[i][200]
107129
? [{ ESMType: "OET", ESMCode: "1" }]
108130
: []
@@ -136,8 +158,15 @@ function buildEmploymentArray(dataArray, i) {
136158
? [{ ESMType: "SEI", ESMCode: "1" }]
137159
: []
138160
),
139-
...(/* Small employer #4 */ dataArray[i][207]
140-
? [{ ESMType: "SEM", ESMCode: "1" }, { ESMType: "OET", ESMCode: "2" }]
161+
...(/* Small employer #4 & Contract Ref */ (dataArray[i][207] && dataArray[i][44])
162+
? [
163+
{ ESMType: "SEM", ESMCode: "1" },
164+
{ ESMType: "OET", ESMCode: "2" }
165+
]
166+
: []
167+
),
168+
...(/* Small employer #4, No Contract Ref */ (dataArray[i][207] && !dataArray[i][44])
169+
? [{ ESMType: "SEM", ESMCode: "1" }]
141170
: []
142171
),
143172
...(/* Has the learner been made redundant? #4 */ dataArray[i][209]
@@ -173,8 +202,15 @@ function buildEmploymentArray(dataArray, i) {
173202
? [{ ESMType: "SEI", ESMCode: "1" }]
174203
: []
175204
),
176-
...(/* Small employer #5 */ dataArray[i][216]
177-
? [{ ESMType: "SEM", ESMCode: "1" }, { ESMType: "OET", ESMCode: "2" }]
205+
...(/* Small employer #25 & Contract Ref */ (dataArray[i][216] && dataArray[i][44])
206+
? [
207+
{ ESMType: "SEM", ESMCode: "1" },
208+
{ ESMType: "OET", ESMCode: "2" }
209+
]
210+
: []
211+
),
212+
...(/* Small employer #5, No Contract Ref */ (dataArray[i][216] && !dataArray[i][44])
213+
? [{ ESMType: "SEM", ESMCode: "1" }]
178214
: []
179215
),
180216
...(/* Has the learner been made redundant? #5 */ dataArray[i][218]
@@ -188,4 +224,4 @@ function buildEmploymentArray(dataArray, i) {
188224
]
189225
}
190226

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

0 commit comments

Comments
 (0)