Merge branch 'main' of github.com:charlesjin123/catalyst-kitchens-fa24

merging
hack4impact-upenn · Jan 11, 2025 · 0689838 · 0689838
2 parents 153540c + 51218ab
commit 0689838
Show file tree

Hide file tree

Showing 5 changed files with 72 additions and 15 deletions.
diff --git a/client/src/AddOrganization/AddOrganization.tsx b/client/src/AddOrganization/AddOrganization.tsx
@@ -201,6 +201,19 @@ export default function AddOrganization() {
           />
         </Grid>
 
+        <Grid item xs={12} sm={6}>
+          <TextField
+            select
+            label="Status"
+            value={newOrg.status}
+            onChange={(e) => setNewOrg({ ...newOrg, status: e.target.value })}
+            fullWidth
+          >
+            <MenuItem value="Member">Member</MenuItem>
+            <MenuItem value="Model Member">Model Member</MenuItem>
+          </TextField>
+        </Grid>
+
         <Grid item xs={12}>
           <Button
             fullWidth

diff --git a/client/src/EditOrganization/EditOrganization.tsx b/client/src/EditOrganization/EditOrganization.tsx
@@ -105,14 +105,15 @@ export default function EditOrganization() {
         console.log(result);
         if (result) {
           const { data } = result;
-          setNewOrg({
-            ...newOrg,
-            organizationName: data?.organizationName,
-            street: data?.street,
-            city: data?.city,
-            state: data?.state,
-            zip: data?.zip,
-          });
+          // setNewOrg({
+          //   ...newOrg,
+          //   organizationName: data?.organizationName,
+          //   street: data?.street,
+          //   city: data?.city,
+          //   state: data?.state,
+          //   zip: data?.zip,
+          // });
+          setNewOrg(data);
         } else {
           console.log('No available organization');
         }
@@ -228,6 +229,18 @@ export default function EditOrganization() {
             }}
           />
         </Grid>
+        <Grid item xs={12} sm={6}>
+          <TextField
+            select
+            label="Status"
+            value={newOrg.status}
+            onChange={(e) => setNewOrg({ ...newOrg, status: e.target.value })}
+            fullWidth
+          >
+            <MenuItem value="Member">Member</MenuItem>
+            <MenuItem value="Model Member">Model Member</MenuItem>
+          </TextField>
+        </Grid>
 
         <Grid item xs={12}>
           <Button

diff --git a/client/src/SubmissionForms/ProgramOutcome.tsx b/client/src/SubmissionForms/ProgramOutcome.tsx
@@ -25,7 +25,7 @@ import {
 } from '@mui/material';
 import { Link } from 'react-router-dom';
 import { useSelector } from 'react-redux';
-import { postData } from '../util/api';
+import { getData, postData } from '../util/api';
 import { RootState } from '../util/redux/store';
 
 export default function ProgramOutcome() {
@@ -374,10 +374,38 @@ export default function ProgramOutcome() {
 
   const [errorOpen, setErrorOpen] = useState(false);
   const [errorMessages, setErrorMessages] = useState<string[]>([]);
-  const validateInputs = () => {
+  const validateInputs = async () => {
     console.log('Validating inputs');
     let hasError = false;
     const allErrorMessages: string[] = [];
+
+    const year = formState.currYear;
+
+    if (
+      Number.isNaN(year) ||
+      year < 2017 ||
+      year > new Date().getFullYear() + 5
+    ) {
+      hasError = true;
+      console.log('year:', year);
+      allErrorMessages.push('The year is too old or too far in the future.');
+    } else {
+      try {
+        console.log('Checking year:', year);
+        const response = await getData(
+          `program_outcomes/org/${formState.orgId}/${year - 2}`,
+        );
+        console.log('Response:', response);
+        console.log(response.data != null);
+        if (response.data != null && response.data !== '') {
+          hasError = true;
+          allErrorMessages.push('A submission for this year already exists.');
+        }
+      } catch (error) {
+        console.error('Error checking year:', error);
+      }
+    }
+
     if (
       formState.programCostPerTrainee !== undefined &&
       formState.programCostPerTrainee < 0
@@ -900,7 +928,7 @@ export default function ProgramOutcome() {
   };
   const handleSubmit = async () => {
     console.log('handling submit');
-    if (validateInputs()) {
+    if (await validateInputs()) {
       try {
         const formData = {
           ...formState,

diff --git a/server/src/controllers/organization.controller.ts b/server/src/controllers/organization.controller.ts
@@ -58,6 +58,8 @@ const addOrganizationController = async (
   res: express.Response,
   next: express.NextFunction,
 ) => {
+  console.log('Add org controller');
+  console.log(req.body);
   const { status, street, city, zip, state, organizationName } = req.body;
   addOrganization(status, street, city, state, zip, organizationName)
     .then((org: unknown) => {
@@ -110,8 +112,9 @@ const editOrganizationController = async (
   res: express.Response,
   next: express.NextFunction,
 ) => {
-  const { id, organizationName, status, street, city, state, zip } = req.body;
-  if (!id) {
+  const { _id, organizationName, status, street, city, state, zip } = req.body;
+  console.log(req.body);
+  if (!_id) {
     next(ApiError.missingFields(['id']));
   }
   try {
@@ -120,7 +123,7 @@ const editOrganizationController = async (
     const org = await editOrganization(
       status,
       organizationName,
-      id,
+      _id,
       street,
       city,
       state,

diff --git a/server/src/models/organization.model.ts b/server/src/models/organization.model.ts
@@ -17,7 +17,7 @@ const OrganizationSchema = new mongoose.Schema(
     },
     status: {
       type: String,
-      enum: ['Member', 'DJIBRIL', 'Model Member'],
+      enum: ['Member', 'Model Member'],
       required: true,
     },
     street: { type: String, required: true },