Skip to content

Commit

Permalink
Merge branch 'main' of github.com:charlesjin123/catalyst-kitchens-fa24
Browse files Browse the repository at this point in the history 
Merging Charles' Changes
  • Loading branch information
@roshanbellary
roshanbellary committed Jan 8, 2025
2 parents 28b4f01 + 0ca0eb5 commit d827834
Show file tree
Hide file tree
Showing 3 changed files with 48 additions and 27 deletions.
21 changes: 12 additions & 9 deletions client/src/SubmissionForms/KitchenOutcome.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 +
Expand Down Expand Up @@ -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 (
<div style={{ maxWidth: '600px', margin: '0 auto' }}>
<h1 style={{ textAlign: 'center' }}>
Expand Down Expand Up @@ -343,12 +345,13 @@ export default function KitchenOutcome() {
<h4>Hunger Relief Impact Funding</h4>
<p>
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. <br /> <br />{' '}
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.{' '}
<br /> <br /> 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.
</p>
<Box mb={2}>
<TextField
Expand Down Expand Up @@ -1144,7 +1147,7 @@ export default function KitchenOutcome() {

<h4>Retail Social Enterprise Revenue</h4>
<p>
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
</p>
<Box mb={2}>
Expand Down
53 changes: 35 additions & 18 deletions client/src/SubmissionForms/ProgramOutcome.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ export default function ProgramOutcome() {
type FormState = {
emailAddress: string;
orgId: string;
year: Date;
shareSurvey: boolean;
organizationName: string;
responderName: string;
Expand Down Expand Up @@ -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;
Expand All @@ -217,6 +218,7 @@ export default function ProgramOutcome() {
const noState: FormState = {
emailAddress: '',
orgId: '',
year: new Date(new Date().getFullYear()),
shareSurvey: false,
organizationName: '',
responderName: '',
Expand Down Expand Up @@ -910,6 +912,9 @@ export default function ProgramOutcome() {
}
}
};

const currYear = new Date().getFullYear();

return (
<div style={{ maxWidth: '600px', margin: '0 auto' }}>
<h1>Submit Program Outcomes for {formState.organizationName}</h1>
Expand All @@ -935,9 +940,7 @@ export default function ProgramOutcome() {
will be included as we distribute that support across the country.
<br />
<br />
<b>
Calendar year data for the current year is preferred but not required
</b>
<b>Calendar year data for {currYear} is preferred but not required</b>
<br />
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
Expand Down Expand Up @@ -1076,8 +1079,8 @@ export default function ProgramOutcome() {
<Box mb={2}>
<h4>Youth: Trained</h4>
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{' '}
<b>total number enrolled</b> in all your youth specific programs.
<br />
<br />
Expand Down Expand Up @@ -2357,10 +2360,9 @@ export default function ProgramOutcome() {
}}
/>
</Box>
<h4>Barrier: Intellectual or Developmental Disability</h4>
<h4>Barrier: Neurodiversity</h4>
<p>
<b>Percentage</b> of trainee population who have intellectual or
developmental disabilities.
<b>Percentage</b> of trainee population who are neurodiverse.
</p>
<Box mb={2}>
<TextField
Expand Down Expand Up @@ -2866,17 +2868,24 @@ export default function ProgramOutcome() {
onChange={(e) =>
setFormState({
...formState,
WIOA: e.target.value as 'Yes' | 'No But' | 'No And' | undefined,
WIOA: e.target.value as
| 'Yes'
| 'NoButInterested'
| 'NoNotInterested'
| 'NoRejected',
})
}
>
<MenuItem value="Yes">Yes, we receive WIOA funds</MenuItem>
<MenuItem value="No But">
<MenuItem value="NoButInterested">
No, but we would like to be able to access WIOA funding
</MenuItem>
<MenuItem value="No And">
<MenuItem value="NoNotInterested">
No, and we have do not have interest in the funding
</MenuItem>
<MenuItem value="NoRejected">
No, and we have applied and been rejected in the past
</MenuItem>
</Select>
</FormControl>
</Box>
Expand Down Expand Up @@ -3088,11 +3097,11 @@ export default function ProgramOutcome() {
{/* Other Fields */}
<h4>Minimum Wage in Currnet Year</h4>
<p>
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.
</p>
<Box mb={2}>
<TextField
Expand Down Expand Up @@ -3180,7 +3189,15 @@ export default function ProgramOutcome() {
<h4>Alumni Hired by Org</h4>
<p>
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.
</p>
<p>
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.
</p>
<Box mb={2}>
<TextField
Expand Down
1 change: 1 addition & 0 deletions client/src/Visualizations/ProgramOutcomesViz.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -771,6 +771,7 @@ function ProgramOutcomesVisualization() {

if (!response || !response.data) {
console.log('No program outcomes found for this org and year');
console.log(response);
setProgramData(null);
return;
}
Expand Down

0 comments on commit d827834

Please sign in to comment.