Fix saving (everything except date works)

hack4impact-upenn · Nov 18, 2023 · c911d9f · c911d9f
1 parent e3fde05
commit c911d9f
Show file tree

Hide file tree

Showing 6 changed files with 137 additions and 82 deletions.
diff --git a/client/src/FormPage/PageTwo.tsx b/client/src/FormPage/PageTwo.tsx
@@ -79,12 +79,12 @@ export default function PageTwo({ data, setData }: Props) {
   const [homicideDate, sethomicideDate] = React.useState<Dayjs | null>();
 
   let homicideFields;
-  if (data.crimeType == 'Homicide') {
+  if (data?.crimeType == 'Homicide') {
     homicideFields = (
       <div>
         <FormControl required sx={{ m: 1, minWidth: 420 }}>
           <TextField
-            value={data.homMNum}
+            value={data?.homMNum}
             id="outlined-number"
             label="M#/S#/AID#"
             onChange={(event) =>
@@ -115,7 +115,7 @@ export default function PageTwo({ data, setData }: Props) {
           Type Of Crime / Victimization
         </InputLabel>
         <Select
-          value={data.crimeType}
+          value={data?.crimeType}
           labelId="demo-simple-select-label"
           id="demo-simple-select-label"
           label="Type Of Crime / Victimization"
@@ -154,9 +154,9 @@ export default function PageTwo({ data, setData }: Props) {
         <InputLabel id="demo-simple-select-label">Gun Violence?</InputLabel>
         <Select
           value={
-            data.isGunViolence
+            data?.isGunViolence
               ? 'Yes'
-              : data.isGunViolence === false
+              : data?.isGunViolence === false
               ? 'No'
               : ''
           }
@@ -185,24 +185,36 @@ export default function PageTwo({ data, setData }: Props) {
 
       <FormControl required sx={{ m: 1, minWidth: 420 }}>
         <TextField
-          value={data.incidentAddress}
+          value={data?.incidentAddressObj?.street}
           id="outlined-basic"
           label="Street Address of Incident"
           variant="outlined"
           onChange={(event) =>
-            setData({ ...data, incidentAddress: event.target.value })
+            setData({
+              ...data,
+              incidentAddressObj: {
+                ...(data?.incidentAddressObj || {}),
+                street: event.target.value,
+              },
+            })
           }
         />
       </FormControl>
 
       <FormControl required sx={{ m: 1, minWidth: 240 }}>
         <TextField
-          value={data.incidentAddressZip}
+          value={data?.incidentAddressObj?.zipcode}
           id="outlined-basic"
           label="Zip Code of Incident"
           variant="outlined"
           onChange={(event) =>
-            setData({ ...data, incidentAddressZip: event.target.value })
+            setData({
+              ...data,
+              incidentAddressObj: {
+                ...(data?.incidentAddressObj || {}),
+                zipcode: event.target.value,
+              },
+            })
           }
         />
       </FormControl>
@@ -213,9 +225,9 @@ export default function PageTwo({ data, setData }: Props) {
         <InputLabel id="demo-simple-select-label">Incident Reported to the Police?</InputLabel>
         <Select
           value={
-            data.reportedToPolice
+            data?.reportedToPolice
               ? 'Yes'
-              : data.reportedToPolice === false
+              : data?.reportedToPolice === false
               ? 'No'
               : ''
           }
@@ -244,7 +256,7 @@ export default function PageTwo({ data, setData }: Props) {
 
       <FormControl required sx={{ m: 1, minWidth: 360 }}>
         <TextField
-          value={data.crimeDCNum}
+          value={data?.crimeDCNum}
           id="outlined-number"
           label="Police Incident # (DC#)"
           type="number"
@@ -259,7 +271,7 @@ export default function PageTwo({ data, setData }: Props) {
           Police District of Incident
         </InputLabel>
         <Select
-          value={data.crimeDistrict}
+          value={data?.crimeDistrict}
           labelId="demo-simple-select-label"
           id="demo-simple-select-label"
           label="Police District of Incident"

diff --git a/client/src/ReferralView/ReferralViewPage.tsx b/client/src/ReferralView/ReferralViewPage.tsx
@@ -125,11 +125,11 @@ export default function FormPage({ globalProps, setGlobalProps }: GlobalProps) {
             <Tab sx={{ fontSize: '13px' }} label="Victimization / Crime Info" />
             <Tab label="Contact Info" />
             <Tab label="Referral Source Info" />
+            <Tab label="Additional Homicide Info" />
             <Tab sx={{ fontSize: '13px' }} label="Communication History" />
             <Tab label="Victim Services Outcome" />
             <Tab label="Counselling Services Outcome" />
             <Tab label="Youth Services Outcome" />
-            <Tab label="Additional Homicide Info" />
           </Tabs>
         </div>
         {!referral ? (
@@ -151,19 +151,19 @@ export default function FormPage({ globalProps, setGlobalProps }: GlobalProps) {
               <ReferralSource referral={data} setReferral={setData} />
             </TabPanel>
             <TabPanel value={value} index={4}>
-              <CommunicationHistory referral={data} setReferral={setData} />
+              <AdditionalHomInfo referral={data} setReferral={setData} />
             </TabPanel>
             <TabPanel value={value} index={5}>
-              <VictimServicesOutcome data={data} setData={setData} />
+              <CommunicationHistory referral={data} setReferral={setData} />
             </TabPanel>
             <TabPanel value={value} index={6}>
-              <CounselingServicesOutcome data={data} setData={setData} />
+              <VictimServicesOutcome data={data} setData={setData} />
             </TabPanel>
             <TabPanel value={value} index={7}>
-              <YouthServicesOutcome data={data} setData={setData} />
+              <CounselingServicesOutcome data={data} setData={setData} />
             </TabPanel>
             <TabPanel value={value} index={8}>
-              <AdditionalHomInfo referral={data} setReferral={setData} />
+              <YouthServicesOutcome data={data} setData={setData} />
             </TabPanel>
           </div>
         ) : (

diff --git a/client/src/ReferralView/VictimCrime.tsx b/client/src/ReferralView/VictimCrime.tsx
@@ -218,24 +218,36 @@ export default function PageTwo({ referral, setReferral }: Props) {
 
       <FormControl required sx={{ m: 1, minWidth: 420 }}>
         <TextField
-          value={data?.incidentAddress}
+          value={data?.incidentAddressObj?.street}
           id="outlined-basic"
           label="Street Address of Incident"
           variant="outlined"
           onChange={(event) =>
-            setData({ ...data, incidentAddress: event.target.value })
+            setData({
+              ...data,
+              incidentAddressObj: {
+                ...(data?.incidentAddressObj || {}),
+                street: event.target.value,
+              },
+            })
           }
         />
       </FormControl>
 
       <FormControl required sx={{ m: 1, minWidth: 240 }}>
         <TextField
-          value={data?.incidentAddressZip}
+          value={data?.incidentAddressObj?.zipcode}
           id="outlined-basic"
           label="Zip Code of Incident"
           variant="outlined"
           onChange={(event) =>
-            setData({ ...data, incidentAddressZip: event.target.value })
+            setData({
+              ...data,
+              incidentAddressObj: {
+                ...(data?.incidentAddressObj || {}),
+                zipcode: event.target.value,
+              },
+            })
           }
         />
       </FormControl>

diff --git a/server/src/controllers/referral.controller.ts b/server/src/controllers/referral.controller.ts
@@ -741,6 +741,8 @@ const updateReferral = async (
   const { id } = req.params;
 
   const {
+    staffName,
+    status,
     departmentInCharge,
     program,
     staffAssigned,
@@ -758,17 +760,17 @@ const updateReferral = async (
     survivorAge,
     survivorSchoolOrCommunitySite,
     survivorGrade,
-    survivorPreferredContactMethod,
     isGuardianResponsible,
     guardianName,
     guardianRelationship,
     guardianAddressObj,
     guardianPhone,
     guardianEmail,
     guardianPreferredContactMethod,
-    survivorAddressObj,
     survivorEmailAddress,
+    survivorAddressObj,
     survivorPhoneNumber,
+    survivorPreferredContactMethod,
     notesFromOrg,
     primaryLanguage,
     relationshipToVictim,
@@ -792,17 +794,24 @@ const updateReferral = async (
     homMNum,
     homCaseInformation,
     historyOfCommunication,
+    victimServicesOutcome,
+    counsellingServicesOutcome,
+    youthServicesOutcome,
     outreachLetterSent,
     transferredToCCWaitlist,
     followUpLetterSent,
     transferredToETO,
-    victimServicesOutcome,
-    counsellingServicesOutcome,
-    youthServicesOutcome,
-    reportedToPolice
+    incidentAddressObj,
+    incidentAddressZip,
+    incidentAddressCity,
+    incidentAddressState,
+    serviceRequestedVictim,
+    otherServiceRequestedVictim,
+    reportedToPolice,
+    victimName,
+    victimGender,
+    date,
   } = req.body;
-  // console.log("survivorAddressObj")
-  // console.log(survivorAddressObj)
 
   if (
     isReferral === undefined ||
@@ -858,6 +867,7 @@ const updateReferral = async (
     const prevReferral = await getReferralById(id);
     const referral = await updateReferralById(
       id,
+      staffName,
       status,
       departmentInCharge,
       program,
@@ -876,17 +886,17 @@ const updateReferral = async (
       survivorAge,
       survivorSchoolOrCommunitySite,
       survivorGrade,
-      survivorPreferredContactMethod,
       isGuardianResponsible,
       guardianName,
       guardianRelationship,
       guardianAddressObj,
       guardianPhone,
       guardianEmail,
       guardianPreferredContactMethod,
-      survivorAddressObj,
       survivorEmailAddress,
+      survivorAddressObj,
       survivorPhoneNumber,
+      survivorPreferredContactMethod,
       notesFromOrg,
       primaryLanguage,
       relationshipToVictim,
@@ -910,14 +920,18 @@ const updateReferral = async (
       homMNum,
       homCaseInformation,
       historyOfCommunication,
+      victimServicesOutcome,
+      counsellingServicesOutcome,
+      youthServicesOutcome,
       outreachLetterSent,
       transferredToCCWaitlist,
       followUpLetterSent,
       transferredToETO,
-      victimServicesOutcome,
-      counsellingServicesOutcome,
-      youthServicesOutcome,
+      incidentAddressObj,
       reportedToPolice,
+      victimName,
+      victimGender,
+      date
     );
 
     const staffEmail = staffAssigned?.email;

diff --git a/server/src/models/referral.model.ts b/server/src/models/referral.model.ts
@@ -88,7 +88,7 @@ const addressItemSchema = new mongoose.Schema({
     type: String,
     required: false,
   },
-  zip: {
+  zipcode: {
     type: String,
     required: false,
   },
@@ -560,6 +560,10 @@ const ReferralSchema = new mongoose.Schema({
     type: addressItemSchema,
     required: false,
   },
+  reportedToPolice: {
+    type: Boolean,
+    required: false,
+  },
   victimName: {
     type: String,
     required: true,