diff --git a/.DS_Store b/.DS_Store deleted file mode 100644 index 2366b32..0000000 Binary files a/.DS_Store and /dev/null differ diff --git a/.gitignore b/.gitignore index f8b8bb7..e1667b3 100644 --- a/.gitignore +++ b/.gitignore @@ -63,4 +63,5 @@ temp/ .tmp/ # Claude Code configuration -.claude/ \ No newline at end of file +.claude/ +.DS_Store diff --git a/docs/inputs/25_26 Values.csv b/docs/inputs/25_26 Example.csv similarity index 100% rename from docs/inputs/25_26 Values.csv rename to docs/inputs/25_26 Example.csv diff --git a/docs/inputs/25_26 Columns.csv b/docs/reference/Columns All.csv similarity index 100% rename from docs/inputs/25_26 Columns.csv rename to docs/reference/Columns All.csv diff --git a/docs/reference/Columns Important.md b/docs/reference/Columns Important.md new file mode 100644 index 0000000..08666a7 --- /dev/null +++ b/docs/reference/Columns Important.md @@ -0,0 +1,31 @@ +# Notable Airtable Columns +## Bootcamp Fields +| i0 | Name | Notes | +|----|------|-------| +| 44 | Contract Ref (aim 1) | | + +## Employment Status Fields +### Employment Status #1 +| i0 | Name | Notes | +|----|------|-------| +| 20 | Small Employer #1 | | + +### Employment Status #2 +| i0 | Name | Notes | +|----|------|-------| +| 32 | Small Employer #2 | | + +### Employment Status #3 +| i0 | Name | Notes | +|----|------|-------| +| 198 | Small Employer #3 | | + +### Employment Status #4 +| i0 | Name | Notes | +|----|------|-------| +| 207 | Small Employer #4 | | + +### Employment Status #5 +| i0 | Name | Notes | +|----|------|-------| +| 216 | Small Employer #5 | | \ No newline at end of file diff --git a/docs/inputs/Status-Comparison.md b/docs/reference/Status-Comparison.md similarity index 100% rename from docs/inputs/Status-Comparison.md rename to docs/reference/Status-Comparison.md diff --git a/src/utils/buildEmploymentArray.js b/src/utils/buildEmploymentArray.js index c0f7858..ec63946 100644 --- a/src/utils/buildEmploymentArray.js +++ b/src/utils/buildEmploymentArray.js @@ -25,8 +25,15 @@ function buildEmploymentArray(dataArray, i) { ? [{ ESMType: "SEI", ESMCode: "1" }] : [] ), - ...(/* Small employer #1 */ dataArray[i][20] - ? [{ ESMType: "SEM", ESMCode: "1" }, { ESMType: "OET", ESMCode: "2" }] + ...(/* Small employer #1 & Contract Ref */ (dataArray[i][20] && dataArray[i][44]) + ? [ + { ESMType: "SEM", ESMCode: "1" }, + { ESMType: "OET", ESMCode: "2" } + ] + : [] + ), + ...(/* Small employer #1, No Contract Ref */ (dataArray[i][20] && !dataArray[i][44]) + ? [{ ESMType: "SEM", ESMCode: "1" }] : [] ), ...(/* Has the learner been made redundant? #1 */ dataArray[i][22] @@ -62,8 +69,15 @@ function buildEmploymentArray(dataArray, i) { ? [{ ESMType: "SEI", ESMCode: "1" }] : [] ), - ...(/* Small employer #2 */ dataArray[i][32] - ? [{ ESMType: "SEM", ESMCode: "1" }, { ESMType: "OET", ESMCode: "2" }] + ...(/* Small employer #2 & Contract Ref */ (dataArray[i][32] && dataArray[i][44]) + ? [ + { ESMType: "SEM", ESMCode: "1" }, + { ESMType: "OET", ESMCode: "2" } + ] + : [] + ), + ...(/* Small employer #2, No Contract Ref */ (dataArray[i][32] && !dataArray[i][44]) + ? [{ ESMType: "SEM", ESMCode: "1" }] : [] ), ...(/* Has the learner been made redundant? #2 */ dataArray[i][30] @@ -99,8 +113,15 @@ function buildEmploymentArray(dataArray, i) { ? [{ ESMType: "SEI", ESMCode: "1" }] : [] ), - ...(/* Small employer #3 */ dataArray[i][198] - ? [{ ESMType: "SEM", ESMCode: "1" }, { ESMType: "OET", ESMCode: "2" }] + ...(/* Small employer #3 & Contract Ref */ (dataArray[i][198] && dataArray[i][44]) + ? [ + { ESMType: "SEM", ESMCode: "1" }, + { ESMType: "OET", ESMCode: "2" } + ] + : [] + ), + ...(/* Small employer #3, No Contract Ref */ (dataArray[i][198] && !dataArray[i][44]) + ? [{ ESMType: "SEM", ESMCode: "1" }] : [] ), ...(/* Has the learner been made redundant? #3 */ dataArray[i][200] @@ -136,8 +157,15 @@ function buildEmploymentArray(dataArray, i) { ? [{ ESMType: "SEI", ESMCode: "1" }] : [] ), - ...(/* Small employer #4 */ dataArray[i][207] - ? [{ ESMType: "SEM", ESMCode: "1" }, { ESMType: "OET", ESMCode: "2" }] + ...(/* Small employer #4 & Contract Ref */ (dataArray[i][207] && dataArray[i][44]) + ? [ + { ESMType: "SEM", ESMCode: "1" }, + { ESMType: "OET", ESMCode: "2" } + ] + : [] + ), + ...(/* Small employer #4, No Contract Ref */ (dataArray[i][207] && !dataArray[i][44]) + ? [{ ESMType: "SEM", ESMCode: "1" }] : [] ), ...(/* Has the learner been made redundant? #4 */ dataArray[i][209] @@ -173,8 +201,15 @@ function buildEmploymentArray(dataArray, i) { ? [{ ESMType: "SEI", ESMCode: "1" }] : [] ), - ...(/* Small employer #5 */ dataArray[i][216] - ? [{ ESMType: "SEM", ESMCode: "1" }, { ESMType: "OET", ESMCode: "2" }] + ...(/* Small employer #25 & Contract Ref */ (dataArray[i][216] && dataArray[i][44]) + ? [ + { ESMType: "SEM", ESMCode: "1" }, + { ESMType: "OET", ESMCode: "2" } + ] + : [] + ), + ...(/* Small employer #5, No Contract Ref */ (dataArray[i][216] && !dataArray[i][44]) + ? [{ ESMType: "SEM", ESMCode: "1" }] : [] ), ...(/* Has the learner been made redundant? #5 */ dataArray[i][218] @@ -188,4 +223,4 @@ function buildEmploymentArray(dataArray, i) { ] } -module.exports = { buildEmploymentArray }; \ No newline at end of file +module.exports = { buildEmploymentArray }; diff --git a/src/utils/pushLearners.js b/src/utils/pushLearners.js index 22ba82f..b1d39b6 100644 --- a/src/utils/pushLearners.js +++ b/src/utils/pushLearners.js @@ -4,8 +4,8 @@ const { buildLearningDeliveryArray } = require("./buildLearningDeliveryArray"); function pushLearners(dataArray, xmlBase) { for (let i = 1; i < dataArray.length; i++) { const refNumber = i - .toString() - .padStart(4, "0"); + .toString() + .padStart(4, "0"); const employmentStatusArray = buildEmploymentArray(dataArray, i); const learningDeliveryArray = buildLearningDeliveryArray(dataArray, i);