merge with casePromptBox code and fix issues

omera26 · omera26 · commit 4e64eb6f5cd7 · 2023-11-03T02:40:34.000-04:00
diff --git a/backend/python/app/rest/child_routes.py b/backend/python/app/rest/child_routes.py
@@ -30,7 +30,7 @@ def get_child():
                 "childName": child.first_name,
                 "dateOfBirth": child.date_of_birth,
                 "cpinFileNumber": child.cpin_number,
-                "serviceWorker": child.service_worker,
+                "workerName": child.service_worker,
                 "specialNeeds": child.special_needs,
                 "concerns": [],
                 "childId": child.id
@@ -95,6 +95,7 @@ def run_undos():
 
     try:
         daytime_response = daytimeContact_service.create_new_daytime_contact(CreateDaytimeContactDTO(**daytimeContact_obj))
+        print(daytime_response, file=sys.stderr)
         undos.append((daytime_response,"delete_daytime_contact", daytime_response.id)) 
     except Exception as error:
         run_undos()
@@ -113,6 +114,7 @@ def run_undos():
 
     try:
         child_response = child_service.add_new_child(CreateChildDTO(**child_obj))
+        print(child_response, file=sys.stderr)
         undos.append((child_service, "delete_child", child_response.id))
     except Exception as error:
         run_undos()
@@ -137,35 +139,34 @@ def run_undos():
     providers = request.json["providers"]
 
     child_obj = {
-        "intake_id": intake_id,
         "first_name": child_details["child_name"],
         "last_name": ".",
         "date_of_birth": child_details["date_of_birth"],
         "cpin_number":  child_details["cpin_file_number"],
-        "service_worker": child_details["service_worker"],
-        "daytime_contact_id": daytimeContact_details["school_id"],
+        "service_worker": child_details["worker_name"],
         "special_needs": child_details["special_needs"],
     }
 
     try:
         child_response = child_service.edit_child(child_obj, child_details["child_id"])
+        #print(child_response, file=sys.stderr)
         # undos.append((child_service, "delete_child", child_response.id))
     except Exception as error:
         # run_undos()
         return jsonify(error),400
     
-    daytimeContact_obj ={
-        "name": daytimeContact_details["school_name"],
-        "contact_information": daytimeContact_details["school_phone_no"],
-        "address": daytimeContact_details["school_address"],
-        "dismissal_time": daytimeContact_details["dismissal_time"],
-    }
-
-    try: 
-       daytime_response = daytimeContact_service.edit_daytime_contact(daytimeContact_obj, daytimeContact_details["school_id"])
-    except Exception as error:
-        # run_undos()
-        return jsonify(error),400
+    # daytimeContact_obj ={
+    #     "name": daytimeContact_details["school_name"],
+    #     "contact_information": daytimeContact_details["school_phone_no"],
+    #     "address": daytimeContact_details["school_address"],
+    #     "dismissal_time": daytimeContact_details["dismissal_time"],
+    # }
+
+    # try: 
+    #    daytime_response = daytimeContact_service.edit_daytime_contact(daytimeContact_obj, daytimeContact_details["school_id"])
+    # except Exception as error:
+    #     # run_undos()
+    #     return jsonify(error),400
 
 
     return jsonify(child_response.__dict__), 200
diff --git a/backend/python/app/services/implementations/child_service.py b/backend/python/app/services/implementations/child_service.py
@@ -56,13 +56,11 @@ def edit_child(self, child_data, child_id):
             child = Child.query.filter_by(id=child_id).first()
             if not child:
                 raise Exception("Child with id {} not found".format(child_id))
-            child.intake_id = child_data["intake_id"]
             child.first_name = child_data["first_name"]
             child.last_name = child_data["last_name"]
             child.date_of_birth = child_data["date_of_birth"]
             child.cpin_number = child_data["cpin_number"]
             child.service_worker = child_data["service_worker"]
-            child.daytime_contact_id = child_data["daytime_contact_id"]
             child.special_needs = child_data["special_needs"]
             db.session.merge(child)
             db.session.commit()
diff --git a/frontend/src/APIClients/ChildAPIClient.ts b/frontend/src/APIClients/ChildAPIClient.ts
@@ -1,7 +1,7 @@
 import baseAPIClient from "./BaseAPIClient";
 import AUTHENTICATED_USER_KEY from "../constants/AuthConstants";
-import { getLocalStorageObjProperty } from "../utils/LocalStorageUtils";
 import { Children, ChildrenDetails } from "../types/ChildTypes";
+import { getLocalStorageObjProperty } from "../utils/LocalStorageUtils";
 
 const post = async ({
   newChild,
diff --git a/frontend/src/components/intake/IndividualDetails.tsx b/frontend/src/components/intake/IndividualDetails.tsx
@@ -1,8 +1,8 @@
 import React from "react";
 import { Button, VStack, Text, HStack, Icon, Divider } from "@chakra-ui/react";
 import { ArrowRight } from "react-feather";
-import { Children } from "../../types/ChildTypes"
 import { Caregivers } from "../../types/CaregiverDetailTypes";
+import { Children } from "../../types/ChildTypes"
 
 type IndividualDetailsProps = {
   childrenDetails: Children;
diff --git a/frontend/src/components/intake/IndividualDetailsEntry.tsx b/frontend/src/components/intake/IndividualDetailsEntry.tsx
@@ -4,9 +4,9 @@ import { Caregivers } from "../../types/CaregiverDetailTypes";
 import Stepper from "./Stepper";
 import IntakeSteps from "./intakeSteps";
 import IntakeFooter from "./IntakeFormFooter";
+import { Children } from "../../types/ChildTypes";
 import ChildrenForm from "./indivDetails/ChildrenForm";
 import CaregiverForm from "./indivDetails/CaregiverProviderForm";
-import { Children } from "../../types/ChildTypes";
 
 export type IndividualDetailsEntryProp = {
   nextStep: () => void;
diff --git a/frontend/src/components/intake/ReviewCaseForm.tsx b/frontend/src/components/intake/ReviewCaseForm.tsx
@@ -5,9 +5,9 @@ import IndividualDetails from "./IndividualDetails";
 import ReferralForm, { ReferralDetails } from "./ReferralForm";
 import CourtInformationForm, { CourtDetails } from "./CourtInformationForm";
 import ProgramForm, { ProgramDetails } from "./ProgramForm";
+import { Children } from "../../types/ChildTypes";
 import IntakeSteps from "./intakeSteps";
 import IntakeFooter from "./IntakeFormFooter";
-import { Children } from "../../types/ChildTypes";
 import { Caregivers } from "../../types/CaregiverDetailTypes";
 
 type ReviewFormProps = {
@@ -116,7 +116,7 @@ const ReviewForm = ({
       <Stack padding="32px" spacing="16px">
         <HStack w="full" display="flex" justifyContent="space-between">
           <Text color="b&w.black" textStyle="header-large">
-            Program details
+          Program details
           </Text>
           {editSectionButton(IntakeSteps.PROGRAM_DETAILS)};
         </HStack>
diff --git a/frontend/src/components/intake/child-information/AddChildPage.tsx b/frontend/src/components/intake/child-information/AddChildPage.tsx
@@ -4,13 +4,12 @@ import { ArrowLeft } from "react-feather";
 import IntakeHeader from "../IntakeHeader";
 import IntakeSteps from "../intakeSteps";
 import { Providers } from "../NewProviderModal";
+import OverviewSection from "../../../types/OverviewSection";
 import ChildInformationForm, { ChildDetails } from "./ChildInformationForm";
 import ChildProviderForm from "./ChildProviderForm";
 import FormSelector from "./FormSelector";
 import SchoolDaycareForm, { SchoolDetails } from "./SchoolDaycareForm";
-import OverviewSection from "../../../types/OverviewSection";
 import childAPIClient from "../../../APIClients/ChildAPIClient";
-
 import { Children, ChildrenDetails } from "../../../types/ChildTypes";
 
 enum AddChildSteps {
@@ -21,12 +20,14 @@ enum AddChildSteps {
 
 type AddChildProps = {
   allProviders: Providers;
-  setAllProviders: React.Dispatch<React.SetStateAction<Providers>>;
+  setAllProviders: (newProviders: Providers) => void | React.Dispatch<React.SetStateAction<Providers>>;
   setStep: React.Dispatch<React.SetStateAction<number>>;
   childrens: Children;
-  setChildren: React.Dispatch<React.SetStateAction<Children>>;
+  setChildren: (newChildren: Children) => void;
   selectedIndexChild: number;
+  setSelectedIndexChild: React.Dispatch<React.SetStateAction<number>>;
   referrer: string;
+  caseNumber?: number;
 };
 
 const AddChild = ({
@@ -36,7 +37,9 @@ const AddChild = ({
   childrens,
   setChildren,
   selectedIndexChild,
+  setSelectedIndexChild,
   referrer,
+  caseNumber,
 }: AddChildProps): React.ReactElement => {
   const [activeFormIndex, setActiveFormIndex] = useState(0);
 
@@ -54,7 +57,7 @@ const AddChild = ({
     schoolPhoneNo: "",
     schoolAddress: "",
     dismissalTime: "",
-    schoolId: ""
+    schoolId: "",
   });
   const [providers, setProviders] = useState<Providers>([]);
 
@@ -73,19 +76,25 @@ const AddChild = ({
 
     if (selectedIndexChild >= 0) {
       childrens.splice(selectedIndexChild, 1, child);
-      childAPIClient.put({
-        updatedChild: child,
-        intakeId: 1,
-      });
+      console.log(child)
+      if (caseNumber) {
+        childAPIClient.put({
+          updatedChild: child,
+          intakeId: caseNumber,
+        });
+      }
     } else {
       childrens.push(child);
-      childAPIClient.post({ newChild: child, intakeId: 1 });
+      if (caseNumber) {
+        childAPIClient.post({ newChild: child, intakeId: caseNumber });
+      }
     }
 
     setChildren([...childrens]);
     if (referrer === "intake") {
       setStep(IntakeSteps.INDIVIDUAL_DETAILS);
     } else if (referrer === "caseOverview") {
+      setSelectedIndexChild(-1);
       setStep(OverviewSection.MAIN_SECTION);
     }
   };
@@ -110,7 +119,7 @@ const AddChild = ({
         schoolPhoneNo: "",
         schoolAddress: "",
         dismissalTime: "",
-        schoolId: ""
+        schoolId: "",
       });
       setProviders([]);
     }
@@ -165,6 +174,7 @@ const AddChild = ({
             if (referrer === "intake") {
               setStep(IntakeSteps.INDIVIDUAL_DETAILS);
             } else if (referrer === "caseOverview") {
+              setSelectedIndexChild(-1);
               setStep(OverviewSection.MAIN_SECTION);
             }
           }}
diff --git a/frontend/src/components/intake/child-information/ChildProviderForm.tsx b/frontend/src/components/intake/child-information/ChildProviderForm.tsx
@@ -12,7 +12,7 @@ export type ChildProviderFormProps = {
   providers: Providers;
   setProviders: React.Dispatch<React.SetStateAction<Providers>>;
   allProviders: Providers;
-  setAllProviders: React.Dispatch<React.SetStateAction<Providers>>;
+  setAllProviders: (newProviders: Providers) => void | React.Dispatch<React.SetStateAction<Providers>> ;
 };
 
 const ChildProviderForm = ({
diff --git a/frontend/src/components/intake/indivDetails/ChildrenForm.tsx b/frontend/src/components/intake/indivDetails/ChildrenForm.tsx
@@ -1,9 +1,10 @@
 import React, { useState } from "react";
 import { UserPlus } from "react-feather";
 import { Icon } from "@chakra-ui/react";
-import { Children } from "../../../types/ChildTypes";
 import PromptBox, { IndividualDetailsOverview } from "../PromptBox";
 import IntakeSteps from "../intakeSteps";
+import { Children } from "../../../types/ChildTypes";
+
 
 type ChildrenFormProps = {
   childrens: Children;
diff --git a/frontend/src/components/pages/CaseOverview.tsx b/frontend/src/components/pages/CaseOverview.tsx
diff --git a/frontend/src/components/pages/IntakePage.tsx b/frontend/src/components/pages/IntakePage.tsx
