Minor fixes to VSR fields & individual view

TritonSE · Feb 25, 2024 · 8eedf26 · 8eedf26
1 parent 5321b1d
commit 8eedf26
Show file tree

Hide file tree

Showing 11 changed files with 79 additions and 60 deletions.
diff --git a/backend/src/controllers/vsr.ts b/backend/src/controllers/vsr.ts
@@ -41,11 +41,10 @@ export const createVSR: RequestHandler = async (req, res, next) => {
     validationErrorParser(errors);
 
     // Get the current date as a timestamp for when VSR was submitted
-    const date = new Date();
+    const currentDate = new Date();
 
     const vsr = await VSRModel.create({
       name,
-      date,
       gender,
       age,
       maritalStatus,
@@ -56,6 +55,10 @@ export const createVSR: RequestHandler = async (req, res, next) => {
       employmentStatus,
       incomeLevel,
       sizeOfHome,
+
+      // Use current date as timestamp for received & updated
+      dateReceived: currentDate,
+      lastUpdated: currentDate,
     });
 
     // 201 means a new resource has been created successfully

diff --git a/backend/src/models/vsr.ts b/backend/src/models/vsr.ts
@@ -32,10 +32,8 @@ const vsrSchema = new Schema({
   livingRoomFurnishing: { type: [String], required: true },
   diningRoomFurnishing: { type: [String], required: true },
   otherFurnishing: { type: [String], required: true },
-  date: { type: String, required: true },
-  caseId: { type: String, required: true },
-  dateReceived: { type: String, required: true },
-  lastUpdated: { type: String, required: true },
+  dateReceived: { type: Date, required: true },
+  lastUpdated: { type: Date, required: true },
   status: { type: String, required: true },
 });
 

diff --git a/frontend/__tests__/sampleData/pap.vsrs.json b/frontend/__tests__/sampleData/pap.vsrs.json
@@ -7,7 +7,6 @@
     "gender": "Female",
     "age": "25",
     "agesOfGirls": ["11"],
-    "date": "02/02/2024",
     "employmentStatus": "Employed",
     "ethnicity": "Asian",
     "incomeLevel": "$12,500 - $25,000",
@@ -30,7 +29,6 @@
     "petCompanion": "Yes-1",
     "serviceConnected": "Yes-1",
     "bathroomFurnishing": ["Toiletries"],
-    "caseId": "A168868",
     "dateReceived": "02-04-2024 [10:00 AM]",
     "diningRoomFurnishing": ["Chairs", "Table"],
     "kitchenFurnishing": ["Oven"],

diff --git a/frontend/package-lock.json b/frontend/package-lock.json
diff --git a/frontend/package.json b/frontend/package.json
@@ -17,7 +17,6 @@
     "@emotion/react": "^11.11.3",
     "@emotion/styled": "^11.11.0",
     "@material/textfield": "^14.0.0",
-    "@mui/material": "^5.15.5",
     "@mui/material": "^5.15.6",
     "@mui/styled-engine-sc": "^6.0.0-alpha.13",
     "@testing-library/jest-dom": "^6.1.4",
@@ -26,6 +25,7 @@
     "firebase": "^10.6.0",
     "jest": "^29.7.0",
     "jest-environment-jsdom": "^29.7.0",
+    "moment": "^2.30.1",
     "next": "14.0.3",
     "react": "^18",
     "react-dom": "^18",

diff --git a/frontend/src/api/VSRs.ts b/frontend/src/api/VSRs.ts
@@ -3,7 +3,6 @@ import { APIResult, handleAPIError, post, get } from "@/api/requests";
 export interface VSRJson {
   _id: string;
   name: string;
-  date: string;
   gender: string;
   age: number;
   maritalStatus: string;
@@ -23,17 +22,16 @@ export interface VSRJson {
   branch: string[];
   conflicts: string[];
   dischargeStatus: string;
-  serviceConnected: string;
+  serviceConnected: boolean;
   lastRank: string;
   militaryId: number;
-  petCompanion: string;
+  petCompanion: boolean;
   bedroomFurnishing: string[];
   bathroomFurnishing: string[];
   kitchenFurnishing: string[];
   livingRoomFurnishing: string[];
   diningRoomFurnishing: string[];
   otherFurnishing: string[];
-  caseId: string;
   dateReceived: string;
   lastUpdated: string;
   status: string;
@@ -43,7 +41,6 @@ export interface VSRJson {
 export interface VSR {
   _id: string;
   name: string;
-  date: string;
   gender: string;
   age: number;
   maritalStatus: string;
@@ -63,19 +60,18 @@ export interface VSR {
   branch: string[];
   conflicts: string[];
   dischargeStatus: string;
-  serviceConnected: string;
+  serviceConnected: boolean;
   lastRank: string;
   militaryId: number;
-  petCompanion: string;
+  petCompanion: boolean;
   bedroomFurnishing: string[];
   bathroomFurnishing: string[];
   kitchenFurnishing: string[];
   livingRoomFurnishing: string[];
   diningRoomFurnishing: string[];
   otherFurnishing: string[];
-  caseId: string;
-  dateReceived: string;
-  lastUpdated: string;
+  dateReceived: Date;
+  lastUpdated: Date;
   status: string;
   hearFrom: string;
 }
@@ -92,37 +88,35 @@ export interface CreateVSRRequest {
   employmentStatus: string;
   incomeLevel: string;
   sizeOfHome: string;
-  streetAddress: string;
-  city: string;
-  state: string;
-  zipCode: number;
-  phoneNumber: string;
-  email: string;
-  branch: string[];
-  conflicts: string[];
-  dischargeStatus: string;
-  serviceConnected: string;
-  lastRank: string;
-  militaryId: number;
-  petCompanion: string;
-  bedroomFurnishing: string[];
-  bathroomFurnishing: string[];
-  kitchenFurnishing: string[];
-  livingRoomFurnishing: string[];
-  diningRoomFurnishing: string[];
-  otherFurnishing: string[];
-  caseId: string;
-  dateReceived: string;
-  lastUpdated: string;
-  status: string;
-  hearFrom: string;
+
+  // Comment-out page 2 & 3 fields for now because they're not implemented on the form yet
+  // streetAddress: string;
+  // city: string;
+  // state: string;
+  // zipCode: number;
+  // phoneNumber: string;
+  // email: string;
+  // branch: string[];
+  // conflicts: string[];
+  // dischargeStatus: string;
+  // serviceConnected: boolean;
+  // lastRank: string;
+  // militaryId: number;
+  // petCompanion: boolean;
+  // bedroomFurnishing: string[];
+  // bathroomFurnishing: string[];
+  // kitchenFurnishing: string[];
+  // livingRoomFurnishing: string[];
+  // diningRoomFurnishing: string[];
+  // otherFurnishing: string[];
+  // status: string;
+  // hearFrom: string;
 }
 
 function parseVSR(vsr: VSRJson) {
   return {
     _id: vsr._id,
     name: vsr.name,
-    date: new Date(vsr.date).toISOString(),
     gender: vsr.gender,
     age: vsr.age,
     maritalStatus: vsr.maritalStatus,
@@ -152,9 +146,8 @@ function parseVSR(vsr: VSRJson) {
     livingRoomFurnishing: vsr.livingRoomFurnishing,
     diningRoomFurnishing: vsr.diningRoomFurnishing,
     otherFurnishing: vsr.otherFurnishing,
-    caseId: vsr.caseId,
-    dateReceived: vsr.dateReceived,
-    lastUpdated: vsr.lastUpdated,
+    dateReceived: new Date(vsr.dateReceived),
+    lastUpdated: new Date(vsr.lastUpdated),
     status: vsr.status,
     hearFrom: vsr.hearFrom,
   };

diff --git a/frontend/src/app/vsr/page.tsx b/frontend/src/app/vsr/page.tsx
@@ -299,7 +299,7 @@ const VeteranServiceRequest: React.FC = () => {
                 ) : null}
 
                 <p className={styles.sectionHeader}>Children (under 18)</p>
-                
+
                 <div className={styles.formRow}>
                   {renderChildInput("boy")}
                   {renderChildInput("girl")}

diff --git a/frontend/src/components/VSRIndividual/AdditionalInfo/AdditionalInfo.tsx b/frontend/src/components/VSRIndividual/AdditionalInfo/AdditionalInfo.tsx
@@ -51,7 +51,7 @@ export const AdditionalInfo = ({ vsr }: AdditionalInfoProps) => {
             <div className={styles.row}>
               <ListDetail
                 title="Are you interested in a companionship animal (pet)?"
-                values={[vsr.petCompanion]}
+                values={[vsr.petCompanion ? "Yes" : "No"]}
               />
             </div>
             <div className={styles.row}>

diff --git a/frontend/src/components/VSRIndividual/CaseDetails/CaseDetails.tsx b/frontend/src/components/VSRIndividual/CaseDetails/CaseDetails.tsx
@@ -5,12 +5,23 @@ import AccordionDetails from "@mui/material/AccordionDetails";
 import Typography from "@mui/material/Typography";
 import { SingleDetail, DropdownDetail } from "@/components/VSRIndividual";
 import { type VSR } from "@/api/VSRs";
+import moment from "moment";
 
 export interface CaseDetailsProp {
   vsr: VSR;
 }
 export const CaseDetails = ({ vsr }: CaseDetailsProp) => {
   const expanded = true;
+
+  /**
+   * Formats a Date object as a string in our desired format, using Moment.js library
+   */
+  const formatDate = (date: Date) => {
+    const dateMoment = moment(date);
+    // We need to do 2 separate format() calls because Moment treats brackets ("[]") as escape chars
+    return `${dateMoment.format("MM-DD-YYYY")} [${dateMoment.format("hh:mm A")}]`;
+  };
+
   return (
     <div className={styles.box}>
       <Accordion className={styles.accordian} defaultExpanded expanded={expanded}>
@@ -23,9 +34,17 @@ export const CaseDetails = ({ vsr }: CaseDetailsProp) => {
         </AccordionSummary>
         <AccordionDetails>
           <div className={styles.details}>
-            <SingleDetail title="Case ID:" value={vsr.caseId} valueFontSize="20px" />
-            <SingleDetail title="Date Received:" value={vsr.dateReceived} valueFontSize="20px" />
-            <SingleDetail title="Last Updated:" value={vsr.lastUpdated} valueFontSize="20px" />
+            <SingleDetail title="Case ID:" value={vsr._id} valueFontSize="20px" />
+            <SingleDetail
+              title="Date Received:"
+              value={formatDate(vsr.dateReceived)}
+              valueFontSize="20px"
+            />
+            <SingleDetail
+              title="Last Updated:"
+              value={formatDate(vsr.lastUpdated)}
+              valueFontSize="20px"
+            />
             <DropdownDetail
               title="Status:"
               value={vsr.status != undefined ? vsr.status : "Received"}

diff --git a/frontend/src/components/VSRIndividual/MilitaryBackground/MilitaryBackground.tsx b/frontend/src/components/VSRIndividual/MilitaryBackground/MilitaryBackground.tsx
@@ -73,11 +73,7 @@ export const MilitaryBackground = ({ vsr }: MilitaryBackgroundProps) => {
             <div className={styles.row}>
               <ListDetail
                 title="Service Connected"
-                values={
-                  vsr.serviceConnected && vsr.serviceConnected.length
-                    ? [vsr.serviceConnected]
-                    : ["N/A"]
-                }
+                values={[vsr.serviceConnected ? "Yes" : "No"]}
               />
             </div>
             <div className={styles.row}>

diff --git a/frontend/src/components/VSRIndividual/PersonalInformation/PersonalInformation.tsx b/frontend/src/components/VSRIndividual/PersonalInformation/PersonalInformation.tsx
@@ -70,23 +70,26 @@ export const PersonalInformation = ({ vsr }: PersonalInformationProps) => {
               />
             </div>
             <div className={styles.row}>
-              <SingleDetail title="Number of boy(s)" value="2" />
+              <SingleDetail title="Number of boy(s)" value={vsr.agesOfBoys?.length ?? 0} />
               <SingleDetail
                 className={styles.second}
                 title="Age(s)"
                 value={vsr.agesOfBoys && vsr.agesOfBoys.length > 0 ? vsr.agesOfBoys : "N/A"}
               />
             </div>
             <div className={styles.row}>
-              <SingleDetail title="Number of girl(s)" value="2" />
+              <SingleDetail title="Number of girl(s)" value={vsr.agesOfGirls?.length ?? 0} />
               <SingleDetail
                 className={styles.second}
                 title="Age(s)"
                 value={vsr.agesOfGirls && vsr.agesOfGirls.length > 0 ? vsr.agesOfGirls : "N/A"}
               />
             </div>
             <div className={styles.row}>
-              <ListDetail title="Ethnicity" values={[vsr.ethnicity]} />
+              <ListDetail
+                title="Ethnicity"
+                values={vsr.ethnicity && vsr.ethnicity.length > 0 ? vsr.ethnicity : ["N/A"]}
+              />
             </div>
             <div className={styles.row}>
               <ListDetail title="Employment Status" values={[vsr.employmentStatus]} />