diff --git a/client/.env.local b/client/.env.local index 1b55205..0980d60 100644 --- a/client/.env.local +++ b/client/.env.local @@ -1,4 +1,4 @@ -VITE_SAIL_PROJECT_ID=06470057-11a3-4b95-b4b5-ff47111f80f2 +VITE_SAIL_PROJECT_ID=11281c9d-e398-4ac2-ae06-604a53b259b6 VITE_SAIL_AUTH_CLIENT=https://test-auth.sail.codes VITE_API_BASE_URL=http://localhost:8000/api/bwwc/ VITE_ENV=local \ No newline at end of file diff --git a/client/src/utils/csv-parser.ts b/client/src/utils/csv-parser.ts index c498f51..d3e0183 100644 --- a/client/src/utils/csv-parser.ts +++ b/client/src/utils/csv-parser.ts @@ -72,20 +72,25 @@ const columnRowMap: Record> = { [Gender.Male]: 'O', [Gender.NonBinary]: 'P' }, - [Ethnicity.NativeAmerican]: { + [Ethnicity.MENA]: { [Gender.Female]: 'Q', [Gender.Male]: 'R', [Gender.NonBinary]: 'S' }, - [Ethnicity.TwoOrMore]: { + [Ethnicity.NativeAmerican]: { [Gender.Female]: 'T', [Gender.Male]: 'U', [Gender.NonBinary]: 'V' }, - [Ethnicity.Unreported]: { + [Ethnicity.TwoOrMore]: { [Gender.Female]: 'W', [Gender.Male]: 'X', [Gender.NonBinary]: 'Y' + }, + [Ethnicity.Unreported]: { + [Gender.Female]: 'Z', + [Gender.Male]: 'AA', + [Gender.NonBinary]: 'AB' } }; const extractData = (sheet: WorkSheet): TableData => { diff --git a/client/src/utils/data-format.ts b/client/src/utils/data-format.ts index a9ee8eb..795a05d 100644 --- a/client/src/utils/data-format.ts +++ b/client/src/utils/data-format.ts @@ -92,6 +92,9 @@ export interface TableRow { unreportedM: number; unreportedF: number; unreportedNB: number; + MENAM: number; + MENAF: number; + MENANB: number; } export function convertToRows(data?: TableData): TableRow[] { diff --git a/client/src/utils/ethnicity.ts b/client/src/utils/ethnicity.ts index 60c9cc2..25ca46c 100644 --- a/client/src/utils/ethnicity.ts +++ b/client/src/utils/ethnicity.ts @@ -6,7 +6,8 @@ export enum Ethnicity { Asian = 'asian', NativeAmerican = 'nativeAmerican', TwoOrMore = 'twoOrMore', - Unreported = 'unreported' + Unreported = 'unreported', + MENA = 'mena' } export const EthnicityDisplayNames: Record = { @@ -17,5 +18,6 @@ export const EthnicityDisplayNames: Record = { [Ethnicity.Asian]: 'Asian', [Ethnicity.NativeAmerican]: 'American Indian / Alaska Native', [Ethnicity.TwoOrMore]: 'Two or More Races (Not Hispanic or Latinx)', - [Ethnicity.Unreported]: 'Unreported' + [Ethnicity.Unreported]: 'Unreported', + [Ethnicity.MENA]: 'Middle Eastern / North African', };