placementt-core 11.0.533 → 11.0.803

package/lib/util.js

@@ -1,10 +1,17 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getPlacementFlagCodes = void 0;
 exports.objectsEqualNew = objectsEqualNew;
-const getPlacementFlagCodes = ({ placement, studentData, workflow, institute, user }) => {
+const firestore_1 = require("firebase/firestore");
+const firebaseQuery_1 = __importDefault(require("./firebase/firebaseQuery"));
+const util_1 = require("./firebase/util");
+const getPlacementFlagCodes = async ({ placement, studentData, workflow, institute, user }) => {
     var _a, _b, _c, _d, _e, _f, _g, _h, _j;
     let flags = placement.flags || [];
+    const firebaseQuery = new firebaseQuery_1.default();
     if (!studentData.details.parentEmail && !flags.find((x) => x.includes("noParentEmail"))) {
         if (((_a = workflow.find((obj) => obj.id === placement.status)) === null || _a === void 0 ? void 0 : _a.userType) === "Parent") {
             flags.includes("noParentEmailWarning") || flags.push("noParentEmailError");
@@ -22,51 +29,67 @@ const getPlacementFlagCodes = ({ placement, studentData, workflow, institute, us
     const awaitingRiskAssessment = !placement.riskAssessment || ((_e = institute === null || institute === void 0 ? void 0 : institute.awaitingPlacementRiskAssessments) === null || _e === void 0 ? void 0 : _e.includes(placement.placementId || placement.id));
     const dbsCheckNotVerified = !((_f = institute === null || institute === void 0 ? void 0 : institute.verifiedDbsChecks) === null || _f === void 0 ? void 0 : _f.includes(placement.placementId || placement.id));
     const awaitingDbsCheck = !placement.dbsCheck || ((_g = institute === null || institute === void 0 ? void 0 : institute.awaitingPlacementDbsChecks) === null || _g === void 0 ? void 0 : _g.includes(placement.placementId || placement.id));
-    if (user.userType === "Staff" && placement.insurance && placementIsPostProviderReview && placementNotEnded && providerUnverified && !awaitingProviderInsurance) {
+    const reminderCount = (await firebaseQuery.getCount(["reminders"], [(0, firestore_1.where)("oId", "==", user.oId), (0, firestore_1.where)("uid", "==", user.id), (0, firestore_1.where)("dueDate", "<=", (0, util_1.convertDate)(new Date(), "dbstring")), (0, firestore_1.where)("documentId", "==", placement.id), (0, firestore_1.where)("status", "==", "upcoming")]));
+    if (reminderCount) {
+        flags.push("reminder");
+    }
+    if (user.userType === "Staff" && user.product === "institutes" && placement.insurance && placementIsPostProviderReview && placementNotEnded && providerUnverified && !awaitingProviderInsurance) {
         console.log("Add insurance flag!");
         flags.includes("noInsurance") || flags.push("noInsurance");
     }
     else {
         flags = flags.filter((x) => x !== "noInsurance");
     }
-    if (user.userType === "Staff" && placementIsPostProviderReview && placementNotEnded && awaitingProviderInsurance) {
+    if (user.product === "providers" && placement.statusType === "requested") {
+        flags.includes("studentNotAccepted") || flags.push("studentNotAccepted");
+    }
+    else {
+        flags = flags.filter((x) => x !== "studentNotAccepted");
+    }
+    if (user.userType === "Staff" && user.product === "institutes" && placementIsPostProviderReview && placementNotEnded && awaitingProviderInsurance) {
         flags.includes("awaitingInsurance") || flags.push("awaitingInsurance");
     }
     else {
         flags = flags.filter((x) => x !== "awaitingInsurance");
     }
-    if (user.userType === "Staff" && placement.dbsCheck && workflow.find((stage) => stage.dbsCheck) && placement.dbsCheck !== true && placementIsPostProviderReview && placementNotEnded && dbsCheckNotVerified && !awaitingDbsCheck) {
+    if (user.userType === "Staff" && user.product === "institutes" && placement.dbsCheck && workflow.find((stage) => stage.dbsCheck) && placement.dbsCheck !== true && placementIsPostProviderReview && placementNotEnded && dbsCheckNotVerified && !awaitingDbsCheck) {
         flags.includes("noDbsCheck") || flags.push("noDbsCheck");
     }
     else {
         flags = flags.filter((x) => x !== "noDbsCheck");
     }
-    if (user.userType === "Staff" && placementIsPostProviderReview && workflow.find((stage) => stage.dbsCheck) && placementNotEnded && awaitingProviderInsurance) {
+    if (user.userType === "Staff" && user.product === "institutes" && placementIsPostProviderReview && workflow.find((stage) => stage.dbsCheck) && placementNotEnded && awaitingProviderInsurance) {
         flags.includes("awaitingDbsCheck") || flags.push("awaitingDbsCheck");
     }
     else {
         flags = flags.filter((x) => x !== "awaitingDbsCheck");
     }
-    if (user.userType === "Staff" && placement.riskAssessment && workflow.find((stage) => stage.riskAssessment) && placement.riskAssessment !== true && placementIsPostProviderReview && placementNotEnded && riskAssessmentNotVerified && !awaitingRiskAssessment) {
+    if (user.userType === "Staff" && user.product === "institutes" && placement.riskAssessment && workflow.find((stage) => stage.riskAssessment) && placement.riskAssessment !== true && placementIsPostProviderReview && placementNotEnded && riskAssessmentNotVerified && !awaitingRiskAssessment) {
         console.log("Add RA flag!");
         flags.includes("noRiskAssessment") || flags.push("noRiskAssessment");
     }
     else {
         flags = flags.filter((x) => x !== "noRiskAssessment");
     }
-    if (user.userType === "Staff" && placementIsPostProviderReview && workflow.find((stage) => stage.riskAssessment) && placementNotEnded && awaitingProviderInsurance) {
+    if (user.userType === "Staff" && user.product === "institutes" && placementIsPostProviderReview && workflow.find((stage) => stage.riskAssessment) && placementNotEnded && awaitingProviderInsurance) {
         flags.includes("awaitingRiskAssessment") || flags.push("awaitingRiskAssessment");
     }
     else {
         flags = flags.filter((x) => x !== "awaitingRiskAssessment");
     }
-    if (user.userType === "Staff" && user.product === "providers" && user.oId === placement.providerId && placement.onboarding && (((_h = placement.onboarding.completed) === null || _h === void 0 ? void 0 : _h.submitted) && !placement.onboarding.completed.accepted) && (placement.inProgress || placement.active)) {
+    if (placement.inProgress && user.userType === "Staff" && user.product === "providers" && user.oId === placement.providerId && placement.onboarding === null) {
+        flags.includes("addOnboarding") || flags.push("addOnboarding");
+    }
+    else {
+        flags = flags.filter((x) => x !== "addOnboarding");
+    }
+    if (placement.inProgress && user.userType === "Staff" && user.product === "providers" && user.oId === placement.providerId && placement.onboarding && (((_h = placement.onboarding.completed) === null || _h === void 0 ? void 0 : _h.submitted) && !placement.onboarding.completed.accepted) && (placement.inProgress || placement.active)) {
         flags.includes("reviewOnboarding") || flags.push("reviewOnboarding");
     }
     else {
         flags = flags.filter((x) => x !== "reviewOnboarding");
     }
-    if (user.userType === "Students" && placement.onboarding && (!placement.onboarding.completed || (placement.onboarding.completed && !((_j = placement.onboarding.completed) === null || _j === void 0 ? void 0 : _j.submitted))) && (placement.inProgress || placement.active)) {
+    if (placement.inProgress && user.userType === "Students" && placement.onboarding && (!placement.onboarding.completed || (placement.onboarding.completed && !((_j = placement.onboarding.completed) === null || _j === void 0 ? void 0 : _j.submitted))) && (placement.inProgress || placement.active)) {
         flags.includes("completeOnboarding") || flags.push("completeOnboarding");
     }
     else {

package/lib/util.js.map

@@ -1 +1 @@
-{"version":3,"file":"util.js","sourceRoot":"","sources":["../src/util.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"util.js","sourceRoot":"","sources":["../src/util.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -2,7 +2,7 @@
     "private": false,
     "name": "placementt-core",
     "author": "Placementt",
-    "version": "11.0.533",
+    "version": "11.0.803",
     "main": "lib/index.js",
     "types": "lib/index.d.ts",
     "scripts": {

package/src/constants.ts

@@ -1,4 +1,4 @@
-import {AnalyticsItem, ApplicantStage, FlagCodes, WorkflowStage} from "./typeDefinitions";
+import {AnalyticsItem, ApplicantStage, EmailTemplateConfig, FlagCodes, WorkflowStage} from "./typeDefinitions";
 
 /* eslint-disable max-len */
 export const providerCodes = {
@@ -265,7 +265,7 @@ export const defaultStudentWorkflow:WorkflowStage[] = [
     },
 ];
 
-export const flagCodes:{[k in FlagCodes]: {message: string, severity: "warning"|"error"|"info", button?: string}} = {
+export const flagCodes:{[k in FlagCodes]: {message: string, severity: "warning"|"error"|"info", button?: string, onClose?: boolean}} = {
     inactive: {
         message: "User account not yet activated.",
         severity: "warning",
@@ -349,6 +349,22 @@ export const flagCodes:{[k in FlagCodes]: {message: string, severity: "warning"|
         severity: "warning",
         button: "Review"
     },
+    addOnboarding: {
+        message: "Send onboarding documents to your student.",
+        severity: "info",
+        button: "Add onboarding",
+        onClose: true,
+    },
+    studentNotAccepted: {
+        message: "This student has not yet accepted the placement.",
+        severity: "warning",
+        button: "Share request",
+        onClose: true,
+    },
+    reminder: {
+        message: "You have outstanding reminder(s) on this placement.",
+        severity: "info"
+    },
 };
 
 export const sampleTargets: AnalyticsItem = {
@@ -705,4 +721,76 @@ export const defaultApplicantWorkflow: ApplicantStage[] = [
             y: 435,
         },
     },
-];
+];
+
+
+export const emailTemplates:{[key: string]: EmailTemplateConfig} = {
+    studentPlacementCreated: {
+        description: "Sent to the student once a placement has been created.",
+        params: ["studentForename", "studentSurname", "studentEmail", "providerName", "providerEmail", "startDate", "endDate", "parentEmail", "instituteName", "cohortContactForename", "cohortContactSurname", "cohortContactEmail", "addressLineOne", "addressLineTwo", "city", "postalCode", "country"],
+        button: {text: "View placement", link: "/institutes/placements/{{pId}}"},
+        type: "workflow"
+    },
+    parentActionRequired: {
+        description: "Sent to the parent (if required) when they need to review the placement.",
+        params: ["studentForename", "studentSurname", "studentEmail", "providerName", "providerEmail", "startDate", "endDate", "parentEmail", "instituteName", "cohortContactForename", "cohortContactSurname", "cohortContactEmail", "addressLineOne", "addressLineTwo", "city", "postalCode", "country"],
+        button: {text: "Review placement", link: "/review/{{uid}}/{{pId}}/{{key}}"},
+        type: "workflow"
+    },
+    providerActionRequired: {
+        description: "Sent to the provider when they need to review the placement.",
+        params: ["studentForename", "studentSurname", "studentEmail", "providerName", "providerEmail", "startDate", "endDate", "parentEmail", "instituteName", "providerContactForename", "providerContactSurname", "cohortContactForename", "cohortContactSurname", "cohortContactEmail", "addressLineOne", "addressLineTwo", "city", "postalCode", "country"],
+        button: {text: "Review placement", link: "/review/{{uid}}/{{pId}}/{{key}}"},
+        type: "workflow"
+    },
+    studentPlacementStarting: {
+        description: "Sent to the student 1 week before placement, and one day before the placement.",
+        params: ["studentForename", "studentSurname", "studentEmail", "providerName", "providerEmail", "startDate", "endDate", "parentEmail", "daysUntilPlacement", "instituteName", "cohortContactForename", "cohortContactSurname", "cohortContactEmail", "addressLineOne", "addressLineTwo", "city", "postalCode", "country"],
+        button: {text: "View placement", link: "/institutes/placements/{{pId}}"},
+        type: "workflow"
+    },
+    providerPlacementStarting: {
+        description: "Sent to the employer 1 week before placement.",
+        params: ["studentForename", "studentSurname", "studentEmail", "providerName", "providerEmail", "startDate", "endDate", "parentEmail", "instituteName", "cohortContactForename", "cohortContactSurname", "cohortContactEmail", "addressLineOne", "addressLineTwo", "city", "postalCode", "country"],
+        button: {text: "View placement", link: "/review/{{uid}}/{{pId}}/{{key}}"},
+        type: "workflow"
+    },
+    parentPlacementStarting: {
+        description: "Sent to the parent 1 week before placement.",
+        params: ["studentForename", "studentSurname", "studentEmail", "providerName", "providerEmail", "startDate", "endDate", "parentEmail", "instituteName", "cohortContactForename", "cohortContactSurname", "cohortContactEmail", "addressLineOne", "addressLineTwo", "city", "postalCode", "country"],
+        button: {text: "View placement", link: "/review/{{uid}}/{{pId}}/{{key}}"},
+        type: "workflow"
+    },
+    studentPostPlacement: {
+        description: "Send to the student once the placement has completed. This will contain a link to feedback.",
+        params: ["studentForename", "studentSurname", "studentEmail", "providerName", "providerEmail", "startDate", "endDate", "parentEmail", "instituteName", "cohortContactForename", "cohortContactSurname", "cohortContactEmail", "addressLineOne", "addressLineTwo", "city", "postalCode", "country"],
+        button: {text: "Complete feedback", link: "/institutes/cohorts/placements/{{pId}}"},
+        type: "feedback"
+    },
+    providerPostPlacement: {
+        description: "Send to the provider once the placement has completed. This will contain a link to feedback.",
+        params: ["studentForename", "studentSurname", "studentEmail", "providerName", "providerEmail", "startDate", "endDate", "parentEmail", "instituteName", "providerContactForename", "providerContactSurname", "cohortContactForename", "cohortContactSurname", "cohortContactEmail", "addressLineOne", "addressLineTwo", "city", "postalCode", "country"],
+        button: {text: "Complete feedback", link: "/review/{{uid}}/{{pId}}/{{key}}"},
+        type: "feedback"
+    },
+    parentPostPlacement: {
+        description: "Send to the provider once the placement has completed. This will contain a link to feedback.",
+        params: ["studentForename", "studentSurname", "studentEmail", "providerName", "providerEmail", "startDate", "endDate", "parentEmail", "instituteName", "providerContactForename", "providerContactSurname", "cohortContactForename", "cohortContactSurname", "cohortContactEmail", "addressLineOne", "addressLineTwo", "city", "postalCode", "country"],
+        button: {text: "Complete feedback", link: "/review/{{uid}}/{{pId}}/{{key}}"},
+        type: "feedback"
+    },
+    parentWelcomeEmail: {
+        description: "Send to the parent once the students account is activated.",
+        params: ["studentForename", "studentSurname", "studentEmail", "parentEmail", "instituteName", "cohortContactForename", "cohortContactSurname", "cohortContactEmail"],
+        type: "feedback"
+    },
+}
+
+export const MISQueryParams = {
+    arbor: [{
+        label: "Year group",
+        name: "year",
+        description: "Enter the year group in the below box, as it appears in the academicLevel__academicLevelName value in Arbor.",
+        placeholder: "E.g. 'Year X'",
+    }],
+};

package/src/features/analytics/useAnalytics.tsx

@@ -1,4 +1,4 @@
-import {useState, useEffect} from "react"
+import {useState} from "react"
 import FirebaseQuery from "../../firebase/firebaseQuery"
 import {where} from "firebase/firestore"
 import {StudentPlacementData, UserData} from "../../typeDefinitions"
@@ -12,30 +12,39 @@ export function useAnalyticsCard({user}: {user: UserData}){
     const [_, setPlacementsWithoutAnalytics] = useState<{[key:string]: StudentPlacementData}>();
     const firebaseQuery = new FirebaseQuery();
 
-    useEffect(() => {
-        if (!user) return
-        firebaseQuery.getCount("placements", [where("uid", "==", user.id)]).then(setTotal);
-        firebaseQuery.getCount("placements", [where("uid", "==", user.id), where("completed", "==", true)]).then(setCompleted);
-        firebaseQuery.getDocsWhere("placements", [where("uid", "==", user.id)]).then((placements) => setPlacementsWithoutAnalytics(placements as {[key:string]: StudentPlacementData}));
-    }, [user]);
+    const fetchAnalyticsCardDetails = async () => {
+        try  {
+            setTotal(await firebaseQuery.getCount("placements", [where("uid", "==", user.id)]))
+            setCompleted(await firebaseQuery.getCount("placements", [where("uid", "==", user.id), where("completed", "==", true)]))
+            setPlacementsWithoutAnalytics(await firebaseQuery.getDocsWhere("placements", [where("uid", "==", user.id)]) as {[key:string]: StudentPlacementData});
+            
+        } catch(error) {
+            console.log(error)
+        }
+      
+    }
 
 
-    return ({...{total, completed}})
+    return ({...{total, completed, fetchAnalyticsCardDetails}})
 }
 
 export function useAnalyticsViews(user: UserData | null){
     const [placementsWithoutAnalytics, setPlacementsWithoutAnalytics] = useState<{[key:string]: StudentPlacementData}>();
     const firebaseQuery = new FirebaseQuery();
 
-    useEffect(() => {
-        if (!user) return
-        firebaseQuery.getDocsWhere("placements", [where("uid", "==", user.id)]).then((placements) => {
-            const p = Object.fromEntries(Object.entries(placements as {[key:string]: StudentPlacementData}).filter(([k, v]) => (!v.units || !v.personalAnalytics)))
+    const fetchAnalyticsViews = async () => {
+        try {
+            const docs = await firebaseQuery.getDocsWhere("placements", [where("uid", "==", user?.id)])
+            const p = Object.fromEntries(Object.entries(docs as {[key:string]: StudentPlacementData}).filter(([_, v]) => (!v.units || !v.personalAnalytics)))
             setPlacementsWithoutAnalytics(p)
-        });
-    }, [user]);
 
-    return ({...{placementsWithoutAnalytics}})
+        } catch(error) {
+            console.log(error)
+        }
+      
+    };
+
+    return ({...{placementsWithoutAnalytics, fetchAnalyticsViews}})
 
 }
 
@@ -44,8 +53,7 @@ export function useReviewPlacementItem(id: string, onComplete: () => void){
     const dispatch = useAppDispatch()
 
     const submitPlacementData = async (type: "upcoming" | "completed") => {
-        if (!analytics?.units || !analytics.personalAnalytics?.[0]?.length) return;
-        console.log("PLACEMENTTTT", id);
+        if (!analytics?.units) return;
        // await firebaseQuery.update(["placements", id], analytics);
         type === "upcoming" ? dispatch(updateUpcomingStudentPlacement({placementId: id, attributes: analytics})) : dispatch(updateCompletedStudentPlacement({placementId: id, attributes: analytics}))
         onComplete()

package/src/features/global/downtime/useDowntime.tsx

@@ -1,20 +1,24 @@
 import {where} from "firebase/firestore";
 import FirebaseQuery from "../../../firebase/firebaseQuery";
-import {useEffect, useState} from "react";
+import {useState} from "react";
 import { UserData } from "../../../typeDefinitions";
 
 export function useDowntime({user}: {user: UserData}){
     const [downtime, setDowntime] = useState<{title: string, body: string}|false>();
     const firebaseQuery = new FirebaseQuery();
 
-    useEffect(() => {
-        if (!user?.product) return;
-        firebaseQuery.getDocsWhere("downtime", [where("products", "array-contains", user?.product), where("active", "==", true)]).then((docs) => {
+    const fetchDownTime = async () => {
+        try {
+            const docs = await firebaseQuery.getDocsWhere("downtime", [where("products", "array-contains", user?.product), where("active", "==", true)])
             const downtimeDocs = { ...docs as {[key: string]: {title: string, body: string}}};
             setDowntime(downtimeDocs[Object.keys(downtimeDocs)[0]] || false);
-        })
-    }, [user])
+            
+        } catch(error) {
+            console.log(error)
+        }
+      
+    }
 
-    return ({...{downtime, setDowntime}})
+    return ({...{downtime, setDowntime, fetchDownTime}})
     
 }

package/src/features/global/users/useUserFunctions.tsx

@@ -59,7 +59,7 @@ export function useContactProviderConsent({user}: {user: UserData}){
         try {
             await firebaseQuery.update(["users", user.id], {
             contactProviderConsent: consent,
-                 contactProviderConsenDate: (new Date()).toISOString()
+                 contactProviderConsentDate: (new Date()).toISOString()
             })
             // dispatch(updateUser({userId: user.id, attributes: {
             //     contactProviderConsent: consent, 

package/src/features/jobs/jobsSlice.ts

@@ -4,7 +4,11 @@ export type Job = {
    id: string
    description: string
    finished: string
-   logs: Array<string>
+   logs: Array<{
+    severity?: string,
+    title: string,
+    description: string,
+   }>
    oId: string
    outputMsg: string
    product: string
@@ -55,12 +59,14 @@ export const JobsSlice = createSlice({
             state.values[action.payload.jobId].status = action.payload.status;
             state.values[action.payload.jobId].updated = (new Date()).toISOString();
         },
-
+        updateJob: (state, action) => {
+            state.values[action.payload.jobId] = action.payload.data;
+        },
 
     },
 
 });
 
-export const {setJobs, addJob, setMarkRead, setJobStatus} = JobsSlice.actions;
+export const {setJobs, addJob, setMarkRead, setJobStatus, updateJob} = JobsSlice.actions;
 
 export default JobsSlice.reducer;

package/src/features/placements/studentPlacements/activePlacement.ts

@@ -1,7 +1,7 @@
 import {createSlice, createAsyncThunk} from "@reduxjs/toolkit";
 import FirebaseQuery from "../../../firebase/firebaseQuery";
 import { StudentPlacementData } from "../../../typeDefinitions"
-import { where } from "firebase/firestore";
+import { orderBy, where } from "firebase/firestore";
 
 type InitialActivePlacementSlice = {
     status: string
@@ -18,7 +18,7 @@ export const fetchActivePlacement = createAsyncThunk(
     async ({userId}: {userId: string}) => {
         const firebaseQuery = new FirebaseQuery();
         try {
-            const docs = await firebaseQuery.getDocsWhere(["placements"], [where("active", "==", true), where("uid", "==", userId)]);
+            const docs = await firebaseQuery.getDocsWhere(["placements"], [where("active", "==", true), where("uid", "==", userId), where("completed", "==", false), orderBy("endDate")]);
             const d = { ...docs as { [key: string]: StudentPlacementData } };
             return d[Object.keys(d)[0]] || undefined;
 
@@ -36,7 +36,12 @@ export const activePlacementSlice = createSlice({
     reducers: {
         setActivePlacement: (state, action) => {
             state.values = action.payload
+        },
+
+        editActivePlacement: (state, action) => {
+            state.values = {...state.values, ...action.payload}
         }
+     
     },
 
     extraReducers(builder) {
@@ -59,6 +64,6 @@ export const activePlacementSlice = createSlice({
 })
 
 
-export const {setActivePlacement} = activePlacementSlice.actions
+export const {setActivePlacement, editActivePlacement} = activePlacementSlice.actions
 
 export default activePlacementSlice.reducer;

package/src/features/placements/studentPlacements/completedStudentPlacementsSlice.ts

@@ -1,6 +1,7 @@
 import {createSlice, createAsyncThunk} from "@reduxjs/toolkit";
 import FirebaseQuery from "../../../firebase/firebaseQuery";
 import { PlacementState } from "../types";
+import { StudentPlacementData } from "../../../typeDefinitions";
 
 const initialState: PlacementState = {
     status: "",
@@ -11,7 +12,7 @@ const initialState: PlacementState = {
 
   export const updateCompletedStudentPlacement = createAsyncThunk(
     "completedStudentPlacements/updateStudentPlacement",
-    async ({ placementId, attributes }:{placementId: string, attributes: any}, {rejectWithValue}) => {
+    async ({ placementId, attributes }:{placementId: string, attributes: Partial<StudentPlacementData>}, {rejectWithValue}) => {
         const firebaseQuery = new FirebaseQuery();
         try {
             await firebaseQuery.update(["placements", placementId], attributes);
@@ -76,7 +77,9 @@ export const completedStudentPlacementsSlice = createSlice({
     extraReducers(builder){
         builder
         .addCase(updateCompletedStudentPlacement.fulfilled, (state, action) => {
-            state.values[action.payload.placementId] = { ...state.values[action.payload.placementId], ...action.payload.attributes };
+            const {attributes, placementId} = action.payload
+            if (!placementId) return
+            state.values[placementId] = {...state.values[placementId], ...attributes};
         })
 
 

package/src/features/placements/studentPlacements/upcomingStudentPlacementsSlice.ts

@@ -18,7 +18,7 @@ const initialState: UpcomingPlacementState = {
 
   export const updateUpcomingStudentPlacement = createAsyncThunk(
     "upcomingStudentPlacements/updateStudentPlacement",
-    async ({ placementId, attributes }:{placementId: string, attributes: any}, {rejectWithValue}) => {
+    async ({ placementId, attributes }:{placementId: string, attributes: Partial<StudentPlacementData>}, {rejectWithValue}) => {
         const firebaseQuery = new FirebaseQuery();
         try {
             await firebaseQuery.update(["placements", placementId], attributes);
@@ -90,7 +90,7 @@ export const upcomingStudentsPlacementsSlice = createSlice({
         .addCase(updateUpcomingStudentPlacement.fulfilled, (state, action) => {
             const {attributes, placementId} = action.payload
             if (!placementId) return
-            state.values[placementId] = attributes;
+            state.values[placementId] = {...state.values[placementId], ...attributes};
         })
 
 

package/src/features/placements/studentPlacements/useStudentPlacements.tsx

@@ -1,33 +1,9 @@
-import { QueryConstraint, where } from "firebase/firestore";
-import { useEffect, useState } from "react";
-import FirebaseQuery from "../../../firebase/firebaseQuery";
-import { getPlacementsWhere } from "../../../firebase/readDatabase";
-import { convertDate } from "../../../firebase/util";
+import { QueryConstraint } from "firebase/firestore";
 import { useStudentPlacementList } from "../../../hooks";
-import { StudentPlacementData, UserData } from "../../../typeDefinitions";
+import { UserData } from "../../../typeDefinitions";
 
-export function useStudentPlacements({user, uid, queryConstraint}: {user: UserData, uid?: string, queryConstraint?: QueryConstraint[]}){    const firebaseQuery = new FirebaseQuery()
-    const [activePlacement, setActivePlacement] = useState<StudentPlacementData>();
+export function useStudentPlacements({user, uid, queryConstraint}: {user: UserData, uid?: string, queryConstraint?: QueryConstraint[]}){ 
     const {placements, loadMoreIcon, loadMorePlacements, setQuery, setInitialQueryLimit, reset} = useStudentPlacementList({...{user: user as UserData, uid: uid || user?.id, queryConstraint}})
 
-    useEffect(() => {
-        firebaseQuery.getDocsWhere(["placements"], [where("active", "==", true), where("uid", "==", user?.id)]).then((docs) => {
-             const d = {...docs as {[key:string]: StudentPlacementData}}
-             setActivePlacement(d[Object.keys(d)[0]] || undefined);
-         });
-     }, [user?.id]);
-
-    const getUserPlacements = async () => {
-        return await getPlacementsWhere({w: where("uid", "==", user?.id)})
-    }
-
-    const getPlacementsStart = async (start: Date, end: Date) => {
-        return await firebaseQuery.getDocsWhere("placements", [where("uid", "==", user?.id), where("startDate", ">=", convertDate(start, "dbstring")), where("startDate", "<=", convertDate(end, "dbstring"))]) as {[key:string]: StudentPlacementData};
-    }
-
-    const getPlacementsEnd = async (end: Date) => {
-        return await firebaseQuery.getDocsWhere("placements", [where("uid", "==", user?.id), where("endDate", ">=", convertDate(end, "dbstring")), where("endDate", "<=", convertDate(end, "dbstring"))]) as {[key:string]: StudentPlacementData};
-    }
-
-    return ({...{placements, loadMoreIcon, loadMorePlacements, setQuery, setInitialQueryLimit, resetPlacements: reset, getUserPlacements, getPlacementsStart, getPlacementsEnd, activePlacement}});
+    return ({...{placements, loadMoreIcon, loadMorePlacements, setQuery, setInitialQueryLimit, resetPlacements: reset}});
 }

package/src/features/updates/useUpdates.tsx

@@ -1,22 +1,24 @@
 import FirebaseQuery from "../../firebase/firebaseQuery";
 import {orderBy, limit, arrayUnion} from "firebase/firestore";
-import {useState, useEffect}  from "react";
+import {useState}  from "react";
 import { UserData } from "../../typeDefinitions";
 
 export function useUpdates({user}: {user: UserData}){
    const [active, setActive] = useState<{title: string, body: string, id: string}>();
    const firebaseQuery = new FirebaseQuery();
 
-   useEffect(() => {
-        setTimeout(() => {
-            firebaseQuery.getDocsWhere("updates", [orderBy("created", "desc"), limit(1)]).then((result) => {
-                const item = Object.values(result as {[key:string]: {title: string, body: string, id: string}})[0];
-                if (!user?.readUpdates?.includes(item.id)) {
-                    setActive(item);
-                }
-            })
-        }, 1000);
-    }, []);
+   const fetchUpdates = async () => {
+    try {
+        const docs = await firebaseQuery.getDocsWhere("updates", [orderBy("created", "desc"), limit(1)])
+        const item = Object.values(docs as {[key:string]: {title: string, body: string, id: string}})[0];
+        if (!user?.readUpdates?.includes(item.id)) setActive(item);
+
+    } catch(error) {
+         console.log(error)
+    }
+    
+}
+  
 
     const dismiss = () => {
         if (!user) return
@@ -31,6 +33,6 @@ export function useUpdates({user}: {user: UserData}){
         }
     }
 
-  return ({...{active, dismiss}})
+  return ({...{active, dismiss, fetchUpdates}})
 
 }