Add victimName and victimGender to forms

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

Hide file tree

Showing 3 changed files with 88 additions and 2 deletions.
diff --git a/client/src/FormPage/PageTwo.tsx b/client/src/FormPage/PageTwo.tsx
@@ -16,6 +16,7 @@ import { DesktopDatePicker } from '@mui/x-date-pickers/DesktopDatePicker';
 import { Theme, useTheme } from '@mui/material/styles';
 import IReferral from '../util/types/referral';
 import { ChangeEvent } from 'react';
+import { genderDropdown } from '../util/dropdown';
 
 function getStyles(val: string, valArr: string[], theme: Theme) {
   return {
@@ -291,6 +292,48 @@ export default function PageTwo({ data, setData }: Props) {
         </Select>
       </FormControl>
 
+      <FormControl required sx={{ m: 1, minWidth: 420 }}>
+        <TextField
+          required
+          value={data?.victimName}
+          id="outlined-basic"
+          label="Name of Victim"
+          variant="outlined"
+          onChange={(event) =>
+            setData({
+              ...data,
+              victimName: event.target.value,
+            })
+          }
+        />
+      </FormControl>
+
+      <FormControl sx={{ m: 1, minWidth: 420 }} required >
+        <InputLabel id="demo-simple-select-label" required>
+          Gender of Victim
+        </InputLabel>
+        <Select
+          required
+          value={data?.victimGender}
+          labelId="demo-simple-select-label"
+          id="demo-simple-select-label"
+          label="Gender of Victim"
+          onChange={(event) =>
+            setData({ ...data, victimGender: event.target.value as string })
+          }
+        >
+          {genderDropdown.map((val) => (
+            <MenuItem
+              key={val}
+              value={val}
+              style={getStyles(val, genderDropdown, theme)}
+            >
+              {val}
+            </MenuItem>
+          ))}
+        </Select>
+      </FormControl>
+
       {homicideFields}
 
       <br />

diff --git a/client/src/ReferralView/VictimCrime.tsx b/client/src/ReferralView/VictimCrime.tsx
@@ -21,6 +21,7 @@ import { CheckCircleOutline, ErrorOutline } from '@material-ui/icons';
 import { green } from '@mui/material/colors';
 import { useParams } from 'react-router-dom';
 import { putData } from '../util/api';
+import { genderDropdown } from '../util/dropdown';
 
 function getStyles(val: string, valArr: string[], theme: Theme) {
   return {
@@ -304,7 +305,7 @@ export default function PageTwo({ referral, setReferral }: Props) {
           Police District of Incident
         </InputLabel>
         <Select
-          value={data?.crimeDistrict}
+          value={data?.victimGender}
           labelId="demo-simple-select-label"
           id="demo-simple-select-label"
           label="Police District of Incident"
@@ -324,6 +325,48 @@ export default function PageTwo({ referral, setReferral }: Props) {
         </Select>
       </FormControl>
 
+      <FormControl required sx={{ m: 1, minWidth: 420 }}>
+        <TextField
+          required
+          value={data?.victimName}
+          id="outlined-basic"
+          label="Name of Victim"
+          variant="outlined"
+          onChange={(event) =>
+            setData({
+              ...data,
+              victimName: event.target.value,
+            })
+          }
+        />
+      </FormControl>
+
+      <FormControl sx={{ m: 1, minWidth: 420 }} required >
+        <InputLabel id="demo-simple-select-label" required>
+          Gender of Victim
+        </InputLabel>
+        <Select
+          required
+          value={data?.crimeDistrict}
+          labelId="demo-simple-select-label"
+          id="demo-simple-select-label"
+          label="Gender of Victim"
+          onChange={(event) =>
+            setData({ ...data, victimGender: event.target.value as string })
+          }
+        >
+          {genderDropdown.map((val) => (
+            <MenuItem
+              key={val}
+              value={val}
+              style={getStyles(val, genderDropdown, theme)}
+            >
+              {val}
+            </MenuItem>
+          ))}
+        </Select>
+      </FormControl>
+
       {homicideFields}
 
       <br />

diff --git a/server/src/models/referral.model.ts b/server/src/models/referral.model.ts
@@ -78,7 +78,7 @@ interface fileObject {
 const addressItemSchema = new mongoose.Schema({
   street: {
     type: String,
-    required: true,
+    required: false,
   },
   city: {
     type: String,