diff --git a/client/src/SubmissionForms/KitchenOutcome.tsx b/client/src/SubmissionForms/KitchenOutcome.tsx index c676379a..99022ae5 100644 --- a/client/src/SubmissionForms/KitchenOutcome.tsx +++ b/client/src/SubmissionForms/KitchenOutcome.tsx @@ -33,6 +33,7 @@ export default function KitchenOutcome() { type FormState = { email: string | null; year: Date; + currYear: number; orgId: string | null; shareSurvey: boolean; responderName: string; @@ -109,6 +110,7 @@ export default function KitchenOutcome() { const noFormState: FormState = { email: user.email, year: new Date(new Date().getFullYear()), + currYear: new Date().getFullYear(), orgId: null, shareSurvey: true, responderName: '', @@ -187,6 +189,7 @@ export default function KitchenOutcome() { formState.mealsFemale + formState.mealsMale + formState.mealsNonBinary + + formState.mealsTrangender + formState.mealsGenderUnknown; const mealFundingSum = formState.mealFundingPublic + @@ -302,6 +305,16 @@ export default function KitchenOutcome() { fetchOrganizationNameById(); // eslint-disable-next-line react-hooks/exhaustive-deps }, [formState.orgId]); + useEffect(() => { + const setYearValue = () => { + setFormState({ + ...formState, + year: new Date(`1/1/${formState.currYear}`), + }); + }; + setYearValue(); + // eslint-disable-next-line react-hooks/exhaustive-deps + }, [formState.currYear]); const currYear = new Date().getFullYear(); @@ -342,14 +355,36 @@ export default function KitchenOutcome() { fullWidth /> +
+ While it is preferred to submit data for the current calendar year, this + section of the form allows you to select a different submission year if + needed. +
+
Hunger Relief Meals Served: Total number of meals prepared for low
- 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.
+ income individuals in {formState.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.
- Total combined gross revenue in {currYear} from all foodservice social - enterprises, excluding contract hunger relief + Total combined gross revenue in {formState.currYear} from all + foodservice social enterprises, excluding contract hunger relief
+ While it is preferred to submit data for the current calendar year, this + section of the form allows you to select a different submission year if + needed. +
+- 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. + What was your local minimum wage for most of {formState.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.
The number of alumni of your training programs that worked for your - organization in {currYear}? Approximate number is OK. + organization in {formState.currYear}? Approximate number is OK.
This number should refer to hires, whether full time or part time, in diff --git a/client/src/Visualizations/ProgramOutcomesViz.tsx b/client/src/Visualizations/ProgramOutcomesViz.tsx index d47f20f2..530f0990 100644 --- a/client/src/Visualizations/ProgramOutcomesViz.tsx +++ b/client/src/Visualizations/ProgramOutcomesViz.tsx @@ -632,6 +632,7 @@ function AdultSummaryBox({ const lineChartOptions: ChartOptions<'line'> = { responsive: true, maintainAspectRatio: false, + spanGaps: true, scales: { y: { beginAtZero: true, @@ -2060,8 +2061,8 @@ function ProgramOutcomesVisualization() { { label: 'Initial Wage', data: historicalData.wages.initial.orgValues, - borderColor: chartColors.org, - backgroundColor: chartColors.org, + borderColor: chartColors.network, + backgroundColor: chartColors.network, pointStyle: 'circle', pointRadius: 6, tension: 0.1,