From 0ca0eb5b8d6a6834314f3894ba57bc6ae5a7bc2b Mon Sep 17 00:00:00 2001 From: charlesjin123 Date: Tue, 31 Dec 2024 22:47:06 +0800 Subject: [PATCH] minor fixes --- client/src/SubmissionForms/KitchenOutcome.tsx | 21 ++++---- client/src/SubmissionForms/ProgramOutcome.tsx | 53 ++++++++++++------- .../src/Visualizations/ProgramOutcomesViz.tsx | 1 + .../program.outcomes.controller.ts | 11 ++-- server/src/models/program.outcomes.model.ts | 2 +- 5 files changed, 56 insertions(+), 32 deletions(-) diff --git a/client/src/SubmissionForms/KitchenOutcome.tsx b/client/src/SubmissionForms/KitchenOutcome.tsx index 2709bdc2..c676379a 100644 --- a/client/src/SubmissionForms/KitchenOutcome.tsx +++ b/client/src/SubmissionForms/KitchenOutcome.tsx @@ -187,8 +187,7 @@ export default function KitchenOutcome() { formState.mealsFemale + formState.mealsMale + formState.mealsNonBinary + - formState.mealsGenderUnknown + - formState.mealsTrangender; + formState.mealsGenderUnknown; const mealFundingSum = formState.mealFundingPublic + formState.mealFundingPrivateContracts + @@ -303,6 +302,9 @@ export default function KitchenOutcome() { fetchOrganizationNameById(); // eslint-disable-next-line react-hooks/exhaustive-deps }, [formState.orgId]); + + const currYear = new Date().getFullYear(); + return (

@@ -343,12 +345,13 @@ export default function KitchenOutcome() {

Hunger Relief Impact Funding

Hunger Relief Meals Served: Total number of meals prepared for low - income individuals in 2023 by your organization. Hunger Relief Meals are - prepared meals: hot, cold, frozen, ready-to-eat or reheat.

{' '} - They do not include grocery/pantry boxes. Meal kits, specific boxed mix - of perishable and non-perishable ingredients with recipes(e.g. “Blue - Apron style”) are included in community meals. Include all prepared - meals whether sold on contract or funded through grants or fundraising. + income individuals in {currYear} by your organization. Hunger Relief + Meals are prepared meals: hot, cold, frozen, ready-to-eat or reheat.{' '} +

They do not include grocery/pantry boxes. Meal kits, + specific boxed mix of perishable and non-perishable ingredients with + recipes(e.g. “Blue Apron style”) are included in community meals. + Include all prepared meals whether sold on contract or funded through + grants or fundraising.

Retail Social Enterprise Revenue

- Total combined gross revenue in 2023 from all foodservice social + Total combined gross revenue in {currYear} from all foodservice social enterprises, excluding contract hunger relief

diff --git a/client/src/SubmissionForms/ProgramOutcome.tsx b/client/src/SubmissionForms/ProgramOutcome.tsx index f2f3b316..c4001ddb 100644 --- a/client/src/SubmissionForms/ProgramOutcome.tsx +++ b/client/src/SubmissionForms/ProgramOutcome.tsx @@ -75,6 +75,7 @@ export default function ProgramOutcome() { type FormState = { emailAddress: string; orgId: string; + year: Date; shareSurvey: boolean; organizationName: string; responderName: string; @@ -201,7 +202,7 @@ export default function ProgramOutcome() { fundingPercentFromPrivateFunding?: number; fundingPercentFromSocialEnterpriseOrGeneratedRevenue?: number; SNAPEAndT?: 'Yes' | 'NoButInterested' | 'NoNotInterested' | 'NoRejected'; - WIOA?: 'Yes' | 'No But' | 'No And'; + WIOA?: 'Yes' | 'NoButInterested' | 'NoNotInterested' | 'NoRejected'; curriculum?: 'All' | 'Part' | 'None'; programCertifications: string[]; otherProgramCertifications?: string; @@ -217,6 +218,7 @@ export default function ProgramOutcome() { const noState: FormState = { emailAddress: '', orgId: '', + year: new Date(new Date().getFullYear()), shareSurvey: false, organizationName: '', responderName: '', @@ -910,6 +912,9 @@ export default function ProgramOutcome() { } } }; + + const currYear = new Date().getFullYear(); + return (

Submit Program Outcomes for {formState.organizationName}

@@ -935,9 +940,7 @@ export default function ProgramOutcome() { will be included as we distribute that support across the country.

- - Calendar year data for the current year is preferred but not required - + Calendar year data for {currYear} is preferred but not required
Please submit data for the current calendar year if you are able. If you operate on non-calendar operating years, and calendar year data is @@ -1076,8 +1079,8 @@ export default function ProgramOutcome() {

Youth: Trained

Total # of youth who participated in foodservice job training - programming in 2023 or during the most recent 12-month period for - which you have complete data. This is the{' '} + programming in {currYear} or during the most recent 12-month period + for which you have complete data. This is the{' '} total number enrolled in all your youth specific programs.

@@ -2357,10 +2360,9 @@ export default function ProgramOutcome() { }} /> -

Barrier: Intellectual or Developmental Disability

+

Barrier: Neurodiversity

- Percentage of trainee population who have intellectual or - developmental disabilities. + Percentage of trainee population who are neurodiverse.

setFormState({ ...formState, - WIOA: e.target.value as 'Yes' | 'No But' | 'No And' | undefined, + WIOA: e.target.value as + | 'Yes' + | 'NoButInterested' + | 'NoNotInterested' + | 'NoRejected', }) } > Yes, we receive WIOA funds - + No, but we would like to be able to access WIOA funding - + No, and we have do not have interest in the funding + + No, and we have applied and been rejected in the past + @@ -3088,11 +3097,11 @@ export default function ProgramOutcome() { {/* Other Fields */}

Minimum Wage in Currnet Year

- What was your local minimum wage for most of the current year? If your - city, county, and/or state minimum wages are different, please list the - one that reflects where most of your graduates are placed in jobs. If - your local minimum wage has different tiers (i.e. by size of employer), - list the highest rate. + What was your local minimum wage for most of {currYear}? If your city, + county, and/or state minimum wages are different, please list the one + that reflects where most of your graduates are placed in jobs. If your + local minimum wage has different tiers (i.e. by size of employer), list + the highest rate.

Alumni Hired by Org

The number of alumni of your training programs that worked for your - organization in the current year? Approximate number is OK. + organization in {currYear}? Approximate number is OK. +

+

+ This number should refer to hires, whether full time or part time, in + roles that are permanent at the organization. These roles should not be + dependent on status as a student or graduate, e.g. students who are paid + during the program, temporary hires post-program, or + apprenticeships/transitional hires only supported by programmatic + funding.