placementt-core 1.20.197 → 11.0.533

package/src/databaseTypes.ts

@@ -1,42 +1,42 @@
-// import {WorkflowStage} from "./typeDefinitions";
-
-export type StudentUser = {
-    UserID: string,
-    forename: string,
-    surname: string,
-    email:string,
-    created: Date,
-    referral: string
-}
-
-export type InstituteStudentUser = {
-    UserID: string,
-    forename: string,
-    surname: string,
-    email: string,
-    created: Date,
-    activated: Date,
-    cohortID: string,
-    // cohortData: Cohort
-}
-
-export type InstituteStaffUser = {
-    UserID: string,
-    forename: string,
-    surname: string,
-    email: string,
-    created: Date,
-    activated: Date,
-}
-
-export type ProviderUser = {
-    UserID: string,
-}
-/*
-export type Cohort = {
-    CohortID: string,
-    name: string,
-    created: Date,
-    workflow: WorkflowStage[],
-}
-*/
+// import {WorkflowStage} from "./typeDefinitions";
+
+export type StudentUser = {
+    UserID: string,
+    forename: string,
+    surname: string,
+    email:string,
+    created: Date,
+    referral: string
+}
+
+export type InstituteStudentUser = {
+    UserID: string,
+    forename: string,
+    surname: string,
+    email: string,
+    created: Date,
+    activated: Date,
+    cohortID: string,
+    // cohortData: Cohort
+}
+
+export type InstituteStaffUser = {
+    UserID: string,
+    forename: string,
+    surname: string,
+    email: string,
+    created: Date,
+    activated: Date,
+}
+
+export type ProviderUser = {
+    UserID: string,
+}
+/*
+export type Cohort = {
+    CohortID: string,
+    name: string,
+    created: Date,
+    workflow: WorkflowStage[],
+}
+*/

package/src/features/analytics/useAnalytics.tsx

@@ -1,56 +1,56 @@
-import {useState, useEffect} from "react"
-import FirebaseQuery from "../../firebase/firebaseQuery"
-import {where} from "firebase/firestore"
-import {StudentPlacementData, UserData} from "../../typeDefinitions"
-import {useAppDispatch} from "../../reduxHooks"
-import {updateUpcomingStudentPlacement} from "../placements/studentPlacements/upcomingStudentPlacementsSlice"
-import { updateCompletedStudentPlacement } from "../placements/studentPlacements/completedStudentPlacementsSlice"
-
-export function useAnalyticsCard({user}: {user: UserData}){
-    const [total, setTotal] = useState<number>();
-    const [completed, setCompleted] = useState<number>();
-    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]);
-
-
-    return ({...{total, completed}})
-}
-
-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)))
-            setPlacementsWithoutAnalytics(p)
-        });
-    }, [user]);
-
-    return ({...{placementsWithoutAnalytics}})
-
-}
-
-export function useReviewPlacementItem(id: string, onComplete: () => void){
-    const [analytics, setAnalytics] = useState<{units: string|undefined, personalAnalytics: string[]|undefined}>();
-    const dispatch = useAppDispatch()
-
-    const submitPlacementData = async (type: "upcoming" | "completed") => {
-        if (!analytics?.units || !analytics.personalAnalytics?.[0]?.length) return;
-        console.log("PLACEMENTTTT", id);
-       // await firebaseQuery.update(["placements", id], analytics);
-        type === "upcoming" ? dispatch(updateUpcomingStudentPlacement({placementId: id, attributes: analytics})) : dispatch(updateCompletedStudentPlacement({placementId: id, attributes: analytics}))
-        onComplete()
-    }
-
-    return ({...{analytics, setAnalytics, submitPlacementData}})
-
+import {useState, useEffect} from "react"
+import FirebaseQuery from "../../firebase/firebaseQuery"
+import {where} from "firebase/firestore"
+import {StudentPlacementData, UserData} from "../../typeDefinitions"
+import {useAppDispatch} from "../../reduxHooks"
+import {updateUpcomingStudentPlacement} from "../placements/studentPlacements/upcomingStudentPlacementsSlice"
+import { updateCompletedStudentPlacement } from "../placements/studentPlacements/completedStudentPlacementsSlice"
+
+export function useAnalyticsCard({user}: {user: UserData}){
+    const [total, setTotal] = useState<number>();
+    const [completed, setCompleted] = useState<number>();
+    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]);
+
+
+    return ({...{total, completed}})
+}
+
+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)))
+            setPlacementsWithoutAnalytics(p)
+        });
+    }, [user]);
+
+    return ({...{placementsWithoutAnalytics}})
+
+}
+
+export function useReviewPlacementItem(id: string, onComplete: () => void){
+    const [analytics, setAnalytics] = useState<{units: string|undefined, personalAnalytics: string[]|undefined}>();
+    const dispatch = useAppDispatch()
+
+    const submitPlacementData = async (type: "upcoming" | "completed") => {
+        if (!analytics?.units || !analytics.personalAnalytics?.[0]?.length) return;
+        console.log("PLACEMENTTTT", id);
+       // await firebaseQuery.update(["placements", id], analytics);
+        type === "upcoming" ? dispatch(updateUpcomingStudentPlacement({placementId: id, attributes: analytics})) : dispatch(updateCompletedStudentPlacement({placementId: id, attributes: analytics}))
+        onComplete()
+    }
+
+    return ({...{analytics, setAnalytics, submitPlacementData}})
+
 }

package/src/features/contacts/contactsSlice.ts

@@ -1,148 +1,148 @@
-import {createSlice, createAsyncThunk} from "@reduxjs/toolkit";
-import {Contact} from "../../typeDefinitions";
-import FirebaseQuery from "../../firebase/firebaseQuery";
-import {DocumentData, QueryConstraint, QueryDocumentSnapshot, QuerySnapshot} from "firebase/firestore";
-
-type InitialContactState = {
-  status: string;
-  lastContact: QueryDocumentSnapshot<DocumentData> | undefined;
-  values: {
-      [key: string]: {
-          [key: string]: unknown;
-      };
-  };
-};
-
-
-const initialState: InitialContactState = {
-    status: "",
-    lastContact: undefined,
-    values: {},
-};
-
-export const fetchContacts = createAsyncThunk(
-    "contacts/fetchContacts",
-    async ({ formattedConstraints }: {formattedConstraints?: QueryConstraint | QueryConstraint[] }, { rejectWithValue}) => {
-      const firebaseQuery = new FirebaseQuery();
-      try {
-        const documents = await firebaseQuery.getDocsWhere("contacts", formattedConstraints, true) as QuerySnapshot<DocumentData>;
-        return documents
-       
-      } catch (error) {
-        return rejectWithValue(error);
-      }
-    }
-  );
-  
-
-  export const addContact = createAsyncThunk(
-    "contacts/addContact",
-    async ({ contactForm, userId }: { contactForm: Contact; userId: string }, { rejectWithValue }) => {
-      const firebaseQuery = new FirebaseQuery();
-      try {
-        await firebaseQuery.add(["contacts"], {...contactForm, uid: userId})
-        return contactForm
-        
-      } catch (error) {
-        return rejectWithValue(error);
-      }
-    }
-  );
-
-
-  export const updateContact = createAsyncThunk(
-    "contacts/updateContact",
-    async ({contactId, attributes }: { contactId: string, attributes: any }, { rejectWithValue }) => {
-      const firebaseQuery = new FirebaseQuery();
-      try {
-        await firebaseQuery.update(["contacts", contactId], attributes);
-        return {contactId, attributes}
-        
-      } catch (error) {
-        return rejectWithValue(error);
-      }
-    }
-  );
-
-  export const deleteContact = createAsyncThunk(
-    "contacts/deleteContact",
-    async ({ contactId }: { contactId: string }, { rejectWithValue }) => {
-      const firebaseQuery = new FirebaseQuery();
-      try {
-        await firebaseQuery.delete(["contacts", contactId])
-        return contactId
-        
-      } catch (error) {
-        return rejectWithValue(error);
-      }
-    }
-  );
-
-
-  
-
-export const contactsSlice = createSlice({
-    name: "contacts",
-    initialState,
-
-    reducers: {
-        setContacts: (state, action) => {
-            state.values = action.payload
-        },
-
-        addContacts: (state, action) => {
-          state.values = {...state.values, ...action.payload}
-        },
-
-        setLastContact: (state, action) => {
-            state.lastContact = action.payload
-        }
-    },
-
- 
-    extraReducers(builder){
-        builder
-        .addCase(fetchContacts.pending, (state) => {
-            state.status = "loading"
-        })
-
-        .addCase(fetchContacts.fulfilled, (state, action) => {
-          state.status = "success";
-          const newContacts = Object.fromEntries(
-              action.payload.docs.map(doc => [doc.id, { ...doc.data(), docPath: doc.ref }])
-          );
-          return {
-              ...state,
-              values: {
-                  ...state.values,
-                  ...newContacts
-              },
-              lastContact: action.payload.docs[action.payload.docs.length - 1]
-          };
-      })
-        .addCase(fetchContacts.rejected, (state) => {
-                state.status = "rejected"
-            })
-
-        .addCase(addContact.fulfilled, (state, action) => {
-          const newContact = action.payload
-          const newContacts = {...state.values}
-          newContacts[action.payload.id] = newContact
-        })
-
-        .addCase(updateContact.fulfilled, (state, action) => {
-          state.values[action.payload.contactId] = { ...state.values[action.payload.contactId], ...action.payload.attributes };
-        })
-
-        .addCase(deleteContact.fulfilled, (state, action) => {
-          const contactIdToDelete = action.payload;
-          const newContacts = { ...state, values: { ...state.values } };
-          delete newContacts.values[contactIdToDelete];
-          return newContacts;
-        })
-    }
-})
-
-export const {setContacts, setLastContact, addContacts} = contactsSlice.actions;
-
+import {createSlice, createAsyncThunk} from "@reduxjs/toolkit";
+import {Contact} from "../../typeDefinitions";
+import FirebaseQuery from "../../firebase/firebaseQuery";
+import {DocumentData, QueryConstraint, QueryDocumentSnapshot, QuerySnapshot} from "firebase/firestore";
+
+type InitialContactState = {
+  status: string;
+  lastContact: QueryDocumentSnapshot<DocumentData> | undefined;
+  values: {
+      [key: string]: {
+          [key: string]: unknown;
+      };
+  };
+};
+
+
+const initialState: InitialContactState = {
+    status: "",
+    lastContact: undefined,
+    values: {},
+};
+
+export const fetchContacts = createAsyncThunk(
+    "contacts/fetchContacts",
+    async ({ formattedConstraints }: {formattedConstraints?: QueryConstraint | QueryConstraint[] }, { rejectWithValue}) => {
+      const firebaseQuery = new FirebaseQuery();
+      try {
+        const documents = await firebaseQuery.getDocsWhere("contacts", formattedConstraints, true) as QuerySnapshot<DocumentData>;
+        return documents
+       
+      } catch (error) {
+        return rejectWithValue(error);
+      }
+    }
+  );
+  
+
+  export const addContact = createAsyncThunk(
+    "contacts/addContact",
+    async ({ contactForm, userId }: { contactForm: Contact; userId: string }, { rejectWithValue }) => {
+      const firebaseQuery = new FirebaseQuery();
+      try {
+        await firebaseQuery.add(["contacts"], {...contactForm, uid: userId})
+        return contactForm
+        
+      } catch (error) {
+        return rejectWithValue(error);
+      }
+    }
+  );
+
+
+  export const updateContact = createAsyncThunk(
+    "contacts/updateContact",
+    async ({contactId, attributes }: { contactId: string, attributes: any }, { rejectWithValue }) => {
+      const firebaseQuery = new FirebaseQuery();
+      try {
+        await firebaseQuery.update(["contacts", contactId], attributes);
+        return {contactId, attributes}
+        
+      } catch (error) {
+        return rejectWithValue(error);
+      }
+    }
+  );
+
+  export const deleteContact = createAsyncThunk(
+    "contacts/deleteContact",
+    async ({ contactId }: { contactId: string }, { rejectWithValue }) => {
+      const firebaseQuery = new FirebaseQuery();
+      try {
+        await firebaseQuery.delete(["contacts", contactId])
+        return contactId
+        
+      } catch (error) {
+        return rejectWithValue(error);
+      }
+    }
+  );
+
+
+  
+
+export const contactsSlice = createSlice({
+    name: "contacts",
+    initialState,
+
+    reducers: {
+        setContacts: (state, action) => {
+            state.values = action.payload
+        },
+
+        addContacts: (state, action) => {
+          state.values = {...state.values, ...action.payload}
+        },
+
+        setLastContact: (state, action) => {
+            state.lastContact = action.payload
+        }
+    },
+
+ 
+    extraReducers(builder){
+        builder
+        .addCase(fetchContacts.pending, (state) => {
+            state.status = "loading"
+        })
+
+        .addCase(fetchContacts.fulfilled, (state, action) => {
+          state.status = "success";
+          const newContacts = Object.fromEntries(
+              action.payload.docs.map(doc => [doc.id, { ...doc.data(), docPath: doc.ref }])
+          );
+          return {
+              ...state,
+              values: {
+                  ...state.values,
+                  ...newContacts
+              },
+              lastContact: action.payload.docs[action.payload.docs.length - 1]
+          };
+      })
+        .addCase(fetchContacts.rejected, (state) => {
+                state.status = "rejected"
+            })
+
+        .addCase(addContact.fulfilled, (state, action) => {
+          const newContact = action.payload
+          const newContacts = {...state.values}
+          newContacts[action.payload.id] = newContact
+        })
+
+        .addCase(updateContact.fulfilled, (state, action) => {
+          state.values[action.payload.contactId] = { ...state.values[action.payload.contactId], ...action.payload.attributes };
+        })
+
+        .addCase(deleteContact.fulfilled, (state, action) => {
+          const contactIdToDelete = action.payload;
+          const newContacts = { ...state, values: { ...state.values } };
+          delete newContacts.values[contactIdToDelete];
+          return newContacts;
+        })
+    }
+})
+
+export const {setContacts, setLastContact, addContacts} = contactsSlice.actions;
+
 export default contactsSlice.reducer;

package/src/features/contacts/useContacts.tsx

@@ -1,73 +1,73 @@
-import {where} from "firebase/firestore";
-import {useLazyLoadQueryList} from "../../hooks";
-import { useAppDispatch } from "../../reduxHooks";
-import { Contact, UserData } from "../../typeDefinitions";
-import { addContact, deleteContact, updateContact } from "./contactsSlice";
-
-export function useContacts({user}: {user: UserData}){
-    const dispatch = useAppDispatch()
-    const {items, loadMore, loadMoreIcon, reset} = useLazyLoadQueryList({path: "contacts", constraints: where("uid", "==", user?.id), number: 5});
-
-    // const contacts = user?.product === "institutes" && user.userType === "Students" ?
-    //     useInstituteStudentSelector((state) => state.contacts) :
-    //     user?.product === "students" ? useStudentSelector((state) => state.contacts) : undefined;
-    // const [loadMoreIcon, setLoadMoreIcon] = useState<boolean>(false);
-    // const firebaseQuery = new FirebaseQuery()
-    // const dispatch = user?.product === "institutes" && user.userType === "Students" ?
-    // useInstituteStudentDispatch() :
-    // user?.product === "students" ? useStudentDispatch() : undefined;
-
-    // if (!dispatch || !contacts) {
-    //     throw new Error("Cannot access featture.");
-    // }
-
-    // const reset = () => {
-    //     dispatch(setContacts({}))
-    //     dispatch(setLastContact(undefined));
-    // };
-
-    // const loadMore = async () => {
-    //     setLoadMoreIcon(true);
-    //     let formattedConstraints:QueryConstraint[] = [];
-        
-    //     if (constraints) {
-    //         formattedConstraints = (Array.isArray(constraints) ? [...constraints, limit(number)] : [constraints, limit(number)]);
-    //     }
-    //     if (contacts.lastContact) {
-    //         formattedConstraints.push(startAfter(contacts.lastContact));
-    //     }
-    //     const documents = await firebaseQuery.getDocsWhere("contacts", formattedConstraints, true) as QuerySnapshot<DocumentData>;
-    //     const lastContact = documents.docs[documents.docs.length - 1];
-    //     dispatch(setLastContact(lastContact))
-    //     console.log("docs", Object.entries(documents.docs))
-    //     dispatch(setContacts({
-    //         ...contacts,
-    //         ...Object.fromEntries(
-    //           documents.docs.map(doc => [doc.id, {...doc.data(), docPath: doc.ref}])
-    //         )
-    //         }));
-     
-    //     setLoadMoreIcon(false);
-    // };
-
-    // useEffect(() => {
-    //     loadMore();
-    // }, []);
-
-    const addContactForm =  async (contactForm: Contact) => {
-        if (!user?.id) return
-             dispatch(addContact({contactForm: contactForm, userId: user.id}))
-        }
-
-    const updateContactForm = async (contactId: string, attributes: any) => {
-        dispatch(updateContact({contactId: contactId, attributes: attributes}))
-    };
-
-    const deleteContactForm = async (contactId: string) => {
-        dispatch(deleteContact({contactId: contactId}))
-    }
-
-
-    return ({...{updateContactForm, addContactForm, deleteContactForm, contacts: items, loadMore, loadMoreIcon, reset}});
-
-    };
+import {where} from "firebase/firestore";
+import {useLazyLoadQueryList} from "../../hooks";
+import { useAppDispatch } from "../../reduxHooks";
+import { Contact, UserData } from "../../typeDefinitions";
+import { addContact, deleteContact, updateContact } from "./contactsSlice";
+
+export function useContacts({user}: {user: UserData}){
+    const dispatch = useAppDispatch()
+    const {items, loadMore, loadMoreIcon, reset} = useLazyLoadQueryList({path: "contacts", constraints: where("uid", "==", user?.id), number: 5});
+
+    // const contacts = user?.product === "institutes" && user.userType === "Students" ?
+    //     useInstituteStudentSelector((state) => state.contacts) :
+    //     user?.product === "students" ? useStudentSelector((state) => state.contacts) : undefined;
+    // const [loadMoreIcon, setLoadMoreIcon] = useState<boolean>(false);
+    // const firebaseQuery = new FirebaseQuery()
+    // const dispatch = user?.product === "institutes" && user.userType === "Students" ?
+    // useInstituteStudentDispatch() :
+    // user?.product === "students" ? useStudentDispatch() : undefined;
+
+    // if (!dispatch || !contacts) {
+    //     throw new Error("Cannot access featture.");
+    // }
+
+    // const reset = () => {
+    //     dispatch(setContacts({}))
+    //     dispatch(setLastContact(undefined));
+    // };
+
+    // const loadMore = async () => {
+    //     setLoadMoreIcon(true);
+    //     let formattedConstraints:QueryConstraint[] = [];
+        
+    //     if (constraints) {
+    //         formattedConstraints = (Array.isArray(constraints) ? [...constraints, limit(number)] : [constraints, limit(number)]);
+    //     }
+    //     if (contacts.lastContact) {
+    //         formattedConstraints.push(startAfter(contacts.lastContact));
+    //     }
+    //     const documents = await firebaseQuery.getDocsWhere("contacts", formattedConstraints, true) as QuerySnapshot<DocumentData>;
+    //     const lastContact = documents.docs[documents.docs.length - 1];
+    //     dispatch(setLastContact(lastContact))
+    //     console.log("docs", Object.entries(documents.docs))
+    //     dispatch(setContacts({
+    //         ...contacts,
+    //         ...Object.fromEntries(
+    //           documents.docs.map(doc => [doc.id, {...doc.data(), docPath: doc.ref}])
+    //         )
+    //         }));
+     
+    //     setLoadMoreIcon(false);
+    // };
+
+    // useEffect(() => {
+    //     loadMore();
+    // }, []);
+
+    const addContactForm =  async (contactForm: Contact) => {
+        if (!user?.id) return
+             dispatch(addContact({contactForm: contactForm, userId: user.id}))
+        }
+
+    const updateContactForm = async (contactId: string, attributes: any) => {
+        dispatch(updateContact({contactId: contactId, attributes: attributes}))
+    };
+
+    const deleteContactForm = async (contactId: string) => {
+        dispatch(deleteContact({contactId: contactId}))
+    }
+
+
+    return ({...{updateContactForm, addContactForm, deleteContactForm, contacts: items, loadMore, loadMoreIcon, reset}});
+
+    };