placementt-core 11.0.533 → 11.0.892

package/src/hooks.tsx

@@ -1,5 +1,5 @@
 import {
-    DocumentData, QueryConstraint, QueryDocumentSnapshot, QueryFieldFilterConstraint, QuerySnapshot, Unsubscribe, collection, documentId,
+    DocumentData, QueryConstraint, QueryDocumentSnapshot, QueryFieldFilterConstraint, QueryOrderByConstraint, QuerySnapshot, Unsubscribe, collection, documentId,
     endAt, endBefore, getDocs, limit, limitToLast, onSnapshot, orderBy, query, startAfter, where
 } from "firebase/firestore";
 import { useCallback, useEffect, useRef, useState } from "react";
@@ -11,13 +11,13 @@ import { getFiles, getFormsFromId, getPlacementbyId, getPlacementsWhere, getUser
 import { arrayUniqueValues, arraysEqual, convertDate, editNestedObject, getAccess, getDateDiff, getUniqueId, objectsEqual, validateEmail } from "./firebase/util";
 import { addPlacement, editPlacementStage, uploadFiles } from "./firebase/writeDatabase";
 import {
-    Address,
+    AlumniConvoUser,
     ApplicantStage,
-    ApplicantWorkflow,
     Application,
-    ArrowObject, CohortData, FileItem, FlagCodes, InstituteData, OnboardingDocs, PlacementListing, Products,
+    ArrowObject, CohortData, CustomFormSchema, FileItem, FlagCodes, InstituteData, OnboardingDocs, PlacementListing, Products,
+    ProviderContactData,
     ProviderData,
-    QueryObject, SavedPlacement, StudentPlacementData, UserData, UserGroupData, WorkflowStage
+    QueryObject, QueryObjectConstraint, SchoolData, Sorts, StudentPlacementData, UserData, UserGroupData, WorkflowStage
 } from "./typeDefinitions";
 import algoliasearch from "algoliasearch";
 import {getDownloadURL, ref} from "firebase/storage";
@@ -28,7 +28,7 @@ type StudentPlacementListParams = {
     user: UserData,
     student?: UserData,
     queryConstraint?: QueryConstraint[],
-    ql?: number
+    ql?: number // query limit
 }
 
 const DEFAULTQUERYLIMIT = 5;
@@ -60,20 +60,20 @@ export function useStudentPlacementList({user, student, queryConstraint, ql=DEFA
         setStudentId(student.id);
         return;
        }
-       if (!user.viewCohorts || !user.viewUsers || user.viewCohorts === "none") {
+       if (!user.viewCohorts || !user.viewStudents || user.viewCohorts === "none") {
         setStudentId(undefined);
         return;
        }
-       if (user.viewCohorts === "all" && user.viewUsers == "all") {
+       if (user.viewCohorts === "all" && user.viewStudents == "all") {
         setStudentId(student.id);
        }
-       if (user.viewCohorts === "some" && user.visibleCohorts?.split(",").includes(student.cohort || "")) {
-        if (user.viewUsers === "all") {
+       if (user.viewCohorts === "some" && user.visibleCohorts?.includes(student.cohort || "")) {
+        if (user.viewStudents === "all") {
             setStudentId(student.id);
             return;
         }
         
-        if (user.studentFilterValues?.split(", ").includes(student.details[user.studentFilter || ""])) {
+        if (user.studentFilterValues?.includes(student.details[user.studentFilter || ""])) {
             setStudentId(student.id);
             return;
         }
@@ -152,7 +152,22 @@ type InstitutePlacementParams = {
 }
 
 
-export function useNewInstitutePlacementList({id, user, cohort, queryConstraint, ql=DEFAULTQUERYLIMIT, inProgress}:InstitutePlacementParams) {
+type NewInstitutePlacementParams = {
+    id?: string,
+    user: UserData,
+    cohort?: string,
+    queryConstraints?: QueryObjectConstraint,
+    ql?: number,
+    inProgress?: boolean,
+    view: "list"|"table",
+    filters?: FilterObject,
+}
+
+
+
+
+
+export function useOldInstitutePlacementList({id, user, cohort, queryConstraint, ql=DEFAULTQUERYLIMIT, inProgress}:InstitutePlacementParams) {
     const [loadMoreIcon, setLoadMoreIcon] = useState(true);
     const [query, setQuery] = useState<string>();
     const [initialQueryLimit, setInitialQueryLimit] = useState(ql);
@@ -165,7 +180,6 @@ export function useNewInstitutePlacementList({id, user, cohort, queryConstraint,
 
     const algoliaClient = algoliasearch(process.env.NODE_ENV === "development" ? "A0ZB50I7VS" : "XMPXCMUUOJ", user.algoliaKey);
     const placementsIndex = algoliaClient.initIndex("placements");
-    const usersIndex = algoliaClient.initIndex("users");
 
     useEffect(() => {
         if (user.product !== "institutes" || user.userType !== "Staff") {
@@ -190,36 +204,6 @@ export function useNewInstitutePlacementList({id, user, cohort, queryConstraint,
                 student: UserData;
             }} = {}
 
-            let userSearchString = `userType:Students AND status:active AND oId:${user.oId} AND product:${user.product}`
-            if (cohort) {
-                userSearchString = userSearchString + ` AND cohort:${cohort}`;
-            }
-            if (user.product === "institutes" && user.userType === "Staff") {
-                const searchStudentHits = await usersIndex.search<UserData>(query, {
-                    filters: userSearchString
-                });
-
-                if (searchStudentHits) {
-                    console.log("FOUND", searchStudentHits.hits.length, "students");
-
-                    await Promise.all(searchStudentHits.hits.map(async (hit) => {
-                        console.log("STUDENT", hit.objectID);
-                        const constraints = [...(cohort ? [where("cohort", "==", cohort)] : [])]
-                        if (inProgress !== undefined) {
-                            constraints.push(inProgress ? where("inProgress", "==", true) : where("completed", "==", true));
-                        }
-                        const fPlacements = await getPlacementsWhere({w: constraints, uid: hit.objectID, oId: hit.oId}) as {[key: string]: StudentPlacementData};
-                                
-                        console.log("PLACEMENTS", fPlacements)
-                        Object.entries(fPlacements).forEach(([k, v]) => {
-                            placementsFound[k] = {...v, student: hit};
-                        })
-                    }))
-                }
-            }
-
-
-
             let placementSearchString = `oId:${user.oId} AND ` + (inProgress !== undefined ? (inProgress ? "inProgress:true" : "completed:true" ) : "")
             if (cohort) {
                 placementSearchString = placementSearchString + ` AND cohort:${cohort}`;
@@ -248,7 +232,6 @@ export function useNewInstitutePlacementList({id, user, cohort, queryConstraint,
             setPlacements(placementsFound);
             setLoadMoreIcon(false);
         }
-
         searchPlacements()
     }, [query]);
 
@@ -275,11 +258,13 @@ export function useNewInstitutePlacementList({id, user, cohort, queryConstraint,
             return;
         }
 
+
+
         setLoadMoreIcon(true);
 
         let fPlacements:{[key:string]: StudentPlacementData&{student:UserData}} = {};
 
-        if (((user.userGroup === "admin" || (cohort && user.viewCohorts === "some" && user?.visibleCohorts?.split(",").includes(cohort as string)) || (user.viewCohorts === "all" && user.viewUsers === "all")))) {
+        if (((user.userGroup === "admin" || (cohort && user.viewCohorts === "some" && user?.visibleCohorts?.includes(cohort as string)) || (user.viewCohorts === "all" && user.viewStudents === "all")))) {
 
             const queryConstraintOrdered = Boolean(queryConstraints && queryConstraints.find((v) => v.type === "orderBy"));
 
@@ -295,16 +280,17 @@ export function useNewInstitutePlacementList({id, user, cohort, queryConstraint,
 
 
             const placementsQuery = await getPlacementsWhere({w: constraints, oId: oId, raw: true}) as QuerySnapshot;
-
+            console.log("PLACEMENTS RETRIEVED", placementsQuery.size);
             
             const placementsWithStudentData:([string, StudentPlacementData&{student:UserData}]|false)[] = placementsQuery.empty ? [] : await Promise.all(placementsQuery.docs.map(async (placement) => {
                 const pData = placement.data() as StudentPlacementData;
                 const student = pData.uid === user.id ? user : (await getUserById(pData.uid).catch(() => false)) as UserData;
-
-                if (user.viewUsers === "some") {
+                console.log("STUDENT", student, "PLACEMENT", id);
+                // if (!student) return false;
+                if (user.viewStudents === "some") {
                     if (!(user.studentFilter && user.studentFilterValues)) return false;
 
-                    if (!user.studentFilterValues.split(", ").includes(student.details[user.studentFilter])) {
+                    if (!user.studentFilterValues.includes(student.details[user.studentFilter])) {
                         return false;
                     }
                 }
@@ -332,11 +318,251 @@ export function useNewInstitutePlacementList({id, user, cohort, queryConstraint,
         }
     };
 
+
     return ({...{placements, loadMoreIcon, loadMorePlacements, setQuery, setInitialQueryLimit, reset, changeQueryConstraints}});
 }
 
 
-export function useOldInstitutePlacementList({user, cohort, queryConstraint, ql=DEFAULTQUERYLIMIT}:InstitutePlacementParams) {
+export function useNewInstitutePlacementList({id, user, filters, view, cohort, queryConstraints, ql=DEFAULTQUERYLIMIT, inProgress}:NewInstitutePlacementParams) {
+    const [query, setQuery] = useState<QueryObject[]>();
+
+    const sorts:Sorts = {
+        ["Student Forename - Asc"]: {
+            value: "studentForename",
+            direction: "asc",
+        },
+        ["Student Forename - Desc"]: {
+            value: "studentForename",
+            direction: "desc",
+        },
+        ["Student Surname - Asc"]: {
+            value: "studentSurname",
+            direction: "asc",
+        },
+        ["Student Surname - Desc"]: {
+            value: "studentSurname",
+            direction: "desc",
+        },
+        ["Student Email - Asc"]: {
+            value: "studentEmail",
+            direction: "asc",
+        },
+        ["Student Email - Desc"]: {
+            value: "studentEmaile",
+            direction: "desc",
+        },
+        ["Provider email - Asc"]: {
+            value: "providerEmail",
+            direction: "asc",
+        },
+        ["Provider email - Desc"]: {
+            value: "providerEmail",
+            direction: "desc",
+        }
+    }
+
+    const additionalProcessing = async (k, placement:StudentPlacementData) => {
+        if (user.viewStudents === "some") {
+            if (!(user.studentFilter && user.studentFilterValues)) return false;
+
+            const student = await getUserById(placement.uid).catch(() => false) as UserData|false;
+
+            if (!student) return;
+    
+            if (!user.studentFilterValues.includes(student.details[user.studentFilter])) {
+                return false;
+            }
+        }
+        return {...placement, id: k};
+    }
+
+
+    const {tableData, pageUp, pageDown, setFilters, page, setView, loading, updateSearch, updateSort, sort} = useDataViewerPaginator({view, filters, sorts, queryLimit: ql, data: query, additionalEntryProcessing: additionalProcessing, onSearch: async (s, sort, page, filters, limit) => await algoliaPlacementSearch(user, s, sort, page, filters, limit, cohort, inProgress)})
+
+    useEffect(() => {
+        // Sets the query of for the DataViewerPaginator
+        if(user.product !== "institutes" || user.userType !== "Staff") {
+            setQuery(undefined);
+            return;
+        }
+        if (((user.userGroup === "admin" || (cohort && user.viewCohorts === "some" && user?.visibleCohorts?.includes(cohort as string)) || (user.viewCohorts === "all" && user.viewStudents === "all")))) {
+            const constraints:QueryObjectConstraint = [["oId", "==", user.oId], ["draft", "==", false]];
+
+            cohort && constraints.push(["cohort", "==", cohort]);
+            queryConstraints && constraints.unshift(...queryConstraints);
+            inProgress !== undefined && constraints.push(["inProgress", "==", inProgress]);
+            
+            setQuery([{
+                path: ["placements"],
+                where: constraints
+            }])
+            return;
+        }
+        setQuery(undefined)
+    }, [user, queryConstraints, cohort])
+
+    return {tableData, page, loading, updateSearch, setFilters, setView, pageUp, pageDown, sorts, updateSort, sort}
+}
+
+
+
+type AlumniPaginatorParams = {
+    user?: UserData,
+    alumniConvoUser?: AlumniConvoUser,
+    school?: string,
+    queryConstraints?: QueryObjectConstraint,
+    ql?: number,
+    view: "list"|"table",
+    filters?: FilterObject,
+}
+
+
+
+export function useAlumniPaginator({user, alumniConvoUser, filters, view, school, queryConstraints, ql=DEFAULTQUERYLIMIT}:AlumniPaginatorParams) {
+    const [query, setQuery] = useState<QueryObject[]>();
+
+    const sorts:Sorts = {}
+
+
+    const {tableData, pageUp, pageDown, setFilters, page, setView, loading} = useDataViewerPaginator({view, filters, sorts, queryLimit: ql, data: query})
+    const firebaseQuery = new FirebaseQuery();
+
+    useEffect(() => {
+        const createQuery = async () => {
+            // Sets the query of for the DataViewerPaginator
+
+
+            const getQueryAccess = async () => {
+                const constraints:QueryObjectConstraint = [];
+
+                if (user) {
+                    constraints.push(["oId", "==", user.oId]);
+
+                    if (user.userGroup === "admin" && user.userType === "Staff") return constraints;
+        
+                    if (user.userType === "Staff") {
+                        if (user.viewSchools === "all") return constraints;
+        
+                        if (user.viewSchools === "none") return false;
+        
+                        if (user.viewSchools === "some") {
+                            if (!school) return false;
+        
+                            if (user?.visibleSchools?.includes(school as string)) return constraints;
+                        }
+                        return false;
+                    }
+                    return false;
+                }
+
+                if (alumniConvoUser) {
+                    constraints.push(["oId", "==", alumniConvoUser.oId]);
+                    console.log("ALUMNI CONVO USER");
+
+                    if ((school || alumniConvoUser.schoolId) && school === alumniConvoUser.schoolId) return constraints;
+                    console.log("ALUMNI ACCESS TRUE");
+                    if (alumniConvoUser.schoolId) { 
+                        const school = await firebaseQuery.getDocData(["schools", alumniConvoUser.schoolId]) as SchoolData;
+                        console.log("SCHOOL ACCESS", school, school.alumniConversations);
+                        return school.alumniConversations ? constraints : false;
+    
+                    } else {
+                        const institute = await firebaseQuery.getDocData(["institutes", alumniConvoUser.oId]) as InstituteData;
+                        return institute.alumniConversations ? constraints : false;
+                    }
+                }
+                return false;
+            }
+            const constraints = await getQueryAccess();
+            console.log("CONSTRAINTS", constraints);
+            if (!constraints) return;
+    
+            school && constraints.push(["schoolId", "==", school]);
+            queryConstraints && constraints.unshift(...queryConstraints);
+    
+            return constraints;
+        }
+        console.log("Creating query");
+        createQuery().then((constraints) => {
+            setQuery([{
+                path: ["alumni"],
+                where: constraints
+            }])
+        })
+    }, [user, queryConstraints, school])
+
+    useEffect(() => {
+        console.log("Alumni data", query, tableData);
+    }, [tableData]);
+
+    return {tableData, page, loading, setFilters, setView, pageUp, pageDown, sorts}
+}
+
+
+const algoliaPlacementSearch = async (user: UserData, query?: string, sort?: [string, {value: string, direction: "asc"|"desc"}], page?: number, filters?: FilterObject, limit?: number, cohort?: string, inProgress?: boolean) => {
+    const algoliaClient = algoliasearch(process.env.NODE_ENV === "development" ? "A0ZB50I7VS" : "XMPXCMUUOJ", user.algoliaKey);
+    const placementsIndex = algoliaClient.initIndex(sort ? Object.values(sort[1]).join("_") : "placements");
+    // const usersIndex = algoliaClient.initIndex("users");
+
+        // let userSearchString = `userType:Students AND status:active AND oId:${user.oId} AND product:${user.product}`
+        // if (cohort) {
+        //     userSearchString = userSearchString + ` AND cohort:${cohort}`;
+        // }
+
+        // if (user.product === "institutes" && user.userType === "Staff") {
+        //     const searchStudentHits = await usersIndex.search<UserData>(query, {
+        //         filters: userSearchString,
+        //         hitsPerPage: limit,
+        //         page: page
+        //     });
+
+        //     if (searchStudentHits) {
+        //         console.log("FOUND", searchStudentHits.hits.length, "students");
+
+        //         await Promise.all(searchStudentHits.hits.map(async (hit) => {
+        //             console.log("STUDENT", hit.objectID);
+        //             const constraints = [...(cohort ? [where("cohort", "==", cohort)] : [])]
+        //             if (inProgress !== undefined) {
+        //                 constraints.push(inProgress ? where("inProgress", "==", true) : where("completed", "==", true));
+        //             }
+        //             const fPlacements = await getPlacementsWhere({w: constraints, uid: hit.objectID, oId: hit.oId}) as {[key: string]: StudentPlacementData};
+                            
+        //             console.log("PLACEMENTS", fPlacements)
+        //             Object.entries(fPlacements).forEach(([k, v]) => {
+        //                 placementsFound[k] = {...v, student: hit};
+        //             })
+        //         }))
+        //     }
+        // }
+
+
+        let placementSearchString = `oId:${user.oId} AND ` + (inProgress !== undefined ? (inProgress ? "inProgress:true" : "completed:true" ) : "")
+        if (cohort) {
+            placementSearchString = placementSearchString + ` AND cohort:${cohort}`;
+        }
+        filters && Object.entries(filters).filter(([, filter]) => filter.value).map(([id, filter]) => {
+            placementSearchString = placementSearchString + ` AND ${id}:${filter.value}`;
+        });
+
+        const options = {
+            filters: placementSearchString,
+            hitsPerPage: limit,
+            page: page ? page - 1 : undefined,
+        }
+
+        const searchPlacementHits = await placementsIndex.search<StudentPlacementData>(query || "", options);
+
+        console.log(searchPlacementHits.hits);
+        
+        const i = (searchPlacementHits ? (await Promise.all(searchPlacementHits.hits.map(async (hit) => {
+                return [hit.objectID, hit];
+            }))) : []).filter((e) => e !== undefined) as [string, StudentPlacementData][];
+
+        return Object.fromEntries(i)
+}
+
+
+export function useVeryOldInstitutePlacementList({user, cohort, queryConstraint, ql=DEFAULTQUERYLIMIT}:InstitutePlacementParams) {
     const [loadMoreIcon, setLoadMoreIcon] = useState(true);
     const [query, setQuery] = useState("");
     const [initialQueryLimit, setInitialQueryLimit] = useState(ql);
@@ -391,7 +617,7 @@ export function useOldInstitutePlacementList({user, cohort, queryConstraint, ql=
 
         let fPlacements:{[key:string]: StudentPlacementData&{student:UserData}} = {};
 
-        if (((user.userGroup === "admin" || (cohort && user.viewCohorts === "some" && user?.visibleCohorts?.split(", ").includes(cohort as string)) || (user.viewCohorts === "all" && user.viewUsers === "all") || query) && (fStartPlacementAfter && fStartPlacementAfter[0] === "placement"))) {
+        if (((user.userGroup === "admin" || (cohort && user.viewCohorts === "some" && user?.visibleCohorts?.includes(cohort as string)) || (user.viewCohorts === "all" && user.viewStudents === "all") || query) && (fStartPlacementAfter && fStartPlacementAfter[0] === "placement"))) {
             const queryConstraintOrdered = Boolean(queryConstraints && queryConstraints.find((v) => v.type === "orderBy"));
 
             const constraints:QueryConstraint[] = fStartPlacementAfter?.length === 4 && fStartPlacementAfter[1] ?
@@ -413,10 +639,10 @@ export function useOldInstitutePlacementList({user, cohort, queryConstraint, ql=
                 const pData = placement.data() as StudentPlacementData;
                 const student = pData.uid === user.id ? user : (await getUserById(pData.uid).catch(() => false)) as UserData;
 
-                if (user.viewUsers === "some") {
+                if (user.viewStudents === "some") {
                     if (!(user.studentFilter && user.studentFilterValues)) return false;
 
-                    if (!user.studentFilterValues.split(", ").includes(student.details[user.studentFilter])) {
+                    if (!user.studentFilterValues.includes(student.details[user.studentFilter])) {
                         return false;
                     }
                 }
@@ -446,7 +672,7 @@ export function useOldInstitutePlacementList({user, cohort, queryConstraint, ql=
             }
         }
 
-        if (!(user.studentFilterValues && user.studentFilter && user.viewUsers === "some")) {
+        if (!(user.studentFilterValues && user.studentFilter && user.viewStudents === "some")) {
             console.log("fenaibn");
             return;
         };
@@ -468,7 +694,7 @@ export function useOldInstitutePlacementList({user, cohort, queryConstraint, ql=
             );
             
             if (ffStartPlacementAfter && ffStartPlacementAfter[3]) {
-                const currentFilter = user?.studentFilterValues?.split(", ")[ffStartPlacementAfter[3]];
+                const currentFilter = user?.studentFilterValues?.[ffStartPlacementAfter[3]];
 
                 if (currentFilter && user.studentFilter) {
                     constraints.push(where(user.studentFilter, "==", currentFilter));
@@ -481,7 +707,7 @@ export function useOldInstitutePlacementList({user, cohort, queryConstraint, ql=
             // console.log("student", student);
 
             // If there is no students but more filters
-            if (!student && ffStartPlacementAfter && ffStartPlacementAfter[3] + 1 < (user?.studentFilterValues?.split(", ") || []).length) {
+            if (!student && ffStartPlacementAfter && ffStartPlacementAfter[3] + 1 < (user?.studentFilterValues || []).length) {
                 // console.log("No more students. Calling recursion");
                 return await getStudentPlacements(["student", undefined, undefined, ffStartPlacementAfter[3]+1], ffPlacements);
             }
@@ -726,7 +952,7 @@ export function useFilterTablePaginator({data}:{data:{[key:string]:{[key:string]
         const listenForUpdates = () => {
             if (!Object.keys(itemList).length) return;
             console.log("Fetching filter table updates")
-            const itemListUpdateQuery = query(collection(db, "users"), where(documentId(), "in", Object.keys(itemList)));
+            const itemListUpdateQuery = query(collection(db, ...(querySchema.path as [any])), where(documentId(), "in", Object.keys(itemList)));
             const itemUpdateSnapshot = onSnapshot(itemListUpdateQuery, (querySnapshot) => {
                 querySnapshot.docs.forEach((doc) => {
                     setTableData((data) => {
@@ -762,16 +988,120 @@ export function useFilterTablePaginator({data}:{data:{[key:string]:{[key:string]
     return ({...{tableData, setPage, setFilters, page}});
 }
 
-export function usePlacementListingPaginator({data, user}:{data:QueryObject[], user: UserData}) {
-    const [tableData, setTableData] = useState<{[key:string]:PlacementListing&{savedPlacement: SavedPlacement}}>({});
-    const [page, setPage] = useState([1, 0]);
+export function useProviderContactPaginator({data, user, view, filters}:{data:QueryObject[], user: UserData, view: "list"|"table", filters?: FilterObject}) {
+    const [query, setQuery] = useState<QueryObject[]>();
+    const firebaseQuery = new FirebaseQuery();
+
+    const getAdditionalData = async (k: string, v: ProviderContactData) => {
+        if (v.savedBy?.[user.oId].activities?.includes("workExperience")) {
+            const placementsCount = await firebaseQuery.getCount("placementListings", [where(`savedBy.${user.oId}.exists`, "==", true), where("providerContactId", "==", k)]);
+            return {...v, plcaements: placementsCount};
+        }
+        return v;
+    }
+
+    const {tableData, pageUp, pageDown, setFilters, page, setView, loading} = useDataViewerPaginator({view, filters, queryLimit: 20, data: query, additionalEntryProcessing: getAdditionalData})
+
+
+    useEffect(() => {
+        const constraints:QueryObjectConstraint = [
+            [`savedBy.${user.oId}.exists`, "==", true],
+        ]
+
+        if (user.userType === "Students") {
+            constraints.push([`savedBy.${user.oId}.cohorts.${user.cohort}.listed`, "==", true]);
+        }
+        setQuery([{
+            path: ["providerContacts"],
+            where: constraints
+        }])
+    }, [user]);
+
+    return ({...{tableData, pageUp, pageDown, setFilters, page, setView, loading}});
+}
+
+type UserPaginatorParams = {
+    user: UserData,
+    cohort?: string,
+    data: QueryObject[],
+    search?: string,
+    userType: "Staff"|"Students",
+    sort?: string
+}
+
+export function useCohortUserPaginator({user, cohort, data, search, userType, sort}:UserPaginatorParams) {
+    const [tableData, setTableData] = useState<{[key:string]:{[key:string]: unknown}}>({});
+    const [queryAnchor, setQueryAnchor] = useState<{startDoc?: QueryDocumentSnapshot, endDoc?: QueryDocumentSnapshot, startQueryPos: number, endQueryPos: number}>({startDoc: undefined, endDoc: undefined, startQueryPos: 0, endQueryPos: 0});
     const [filters, setFilters] = useState<{[key:string]: unknown}>();
-    const [queryAnchor, setQueryAnchor] = useState<{startKey: string, endKey: string, startQueryPos: number, endQueryPos: number}>({startKey: "", endKey: "", startQueryPos: 0, endQueryPos: 0});
+    const [sortResultsBy, setSortResultsBy] = useState<string|undefined>(sort);
     const [prevEntryIds, setPrevEntryIds] = useState<{[key:string]:number}>({});
-    const firebaseQuery = new FirebaseQuery();
+    const [page, setPage] = useState([1, 0]);
+    const [dataListenerUnsubscribe, setDataListenerUnsubscribe] = useState<Unsubscribe|undefined>();
+    const [queries, setQueries] = useState<QueryConstraint[][]>();
+    const [prevSearch, setPrevSearch] = useState<string>();
+
+    const algoliaClient = algoliasearch(process.env.NODE_ENV === "development" ? "A0ZB50I7VS" : "XMPXCMUUOJ", user.algoliaKey);
+    const usersIndex = algoliaClient.initIndex("users");
+
+    const sortOptions = {
+        ["Forename - Asc"]: ["details.forename", "asc"],
+        ["Forename - Desc"]: ["details.forename", "desc"],
+        ["Surname - Asc"]: ["details.surname", "desc"],
+        ["Surname - Desc"]: ["details.surname", "asc"],
+        ["Email - Asc"]: ["email", "asc"],
+        ["Email - Desc"]: ["email", "desc"],
+    }
+    
+    useEffect(() => {
+        if (user.userType !== "Staff") {
+            console.log("Not a staff member", user)
+            setQueries(undefined);
+            return;
+        }
+        if (
+            (!user.viewCohorts && user.userGroup !== "admin") ||
+            (user.viewCohorts === "none" && user.userGroup !== "admin") ||
+            (user.viewCohorts === "some" && user.userGroup !== "admin" && cohort !== "all" && !user.visibleCohorts?.includes(cohort || ""))) {
+            setQueries(undefined);
+            return;
+        }
+        setQueries(() => {
+            const finalConstraints:QueryConstraint[][] = [];
+            console.log("data", data, data.length)
+            for (var i = 0; i < data.length; i++) {
+                const item = data[i]
+                console.log("item", item)
+                const constraints:QueryConstraint[] = [];
+                item.where && item.where.forEach((w) => {
+                    constraints.push(where(...w));
+                });
+
+                constraints.push(where("oId", "==", user.oId));
+                cohort && cohort !== "all" && constraints.push(where("cohort", "==", cohort));
+
+                if (user.userGroup === "admin" || user.viewStudents === "all") {
+                    finalConstraints.push(constraints);
+                    continue
+                }
+                if (!user.studentFilter || !user.studentFilterValues) continue;
+                user.studentFilterValues.forEach((filterValue) => {
+                    user.studentFilter && finalConstraints.push([...constraints, where("details."+user.studentFilter, "==", filterValue)])
+                })
+            };
+            console.log("final", finalConstraints)
+            return finalConstraints;
+        });
+    }, []);
+
 
     const getDataFromQuery = async (
-        itemList: {[key: string]: any} = {}, currentQueryAnchor=queryAnchor, cursorDirection?:"increase"|"decrease"|undefined, prevEntries=prevEntryIds, loadMoreFromQuery=false):Promise<any> => {
+        itemList: {[key: string]: QueryDocumentSnapshot<DocumentData>} = {}, currentQueryAnchor=queryAnchor, cursorDirection?:"increase"|"decrease"|undefined, prevEntries=prevEntryIds, loadMoreFromQuery=false):Promise<any> => {
+        
+        if (!queries?.length) {
+            setTableData({});
+            return;
+        }
+        console.log("q", queries)
         let cursorPos:number;
         if (page[0] > page[1]) {
             cursorPos = currentQueryAnchor.endQueryPos;
@@ -779,41 +1109,49 @@ export function usePlacementListingPaginator({data, user}:{data:QueryObject[], u
             cursorPos = currentQueryAnchor.startQueryPos;
         }
 
-        const querySchema:QueryObject = data?.[cursorPos];
-
-        const createQuery = (queryData?:QueryObject) => {
-            const constraints:any[] = [
-                where("savedById", "==", user.userType === "Staff" ? user.oId : user.id),
-                where("savedByProduct", "==", user.product),
-                where("savedByUserType", "==", user.userType === "Staff" ? "Organisation" : "Student"),
-            ]
-
-            if (user.userType === "Students") {
-                constraints.push(where("listed", "==", true));
-            }
-
-            queryData?.where && queryData.where.forEach((w) => {
-                constraints.push(where(...w));
-            });
+        const querySchema = queries[cursorPos];
+        console.log("schema", querySchema)
+        const createQuery = (mConstraints:QueryConstraint[]) => {
 
+            console.log("mConstraints", mConstraints);
+            const fConstraints = [...mConstraints];
+            
+            let addOrderBy = true;
             filters && Object.entries(filters).forEach(([key, value]) => {
-                constraints.push(where(key, "==", value));
+                if (Array.isArray(value)) {
+                    value.forEach((v) => {
+                        if (typeof v === "object") {
+                            if (v instanceof QueryOrderByConstraint) {
+                                addOrderBy = false;
+                            }
+                            fConstraints.push(v as QueryFieldFilterConstraint|QueryOrderByConstraint);
+                        } else {
+                            fConstraints.push(where(key, "==", v));
+                        }
+                    })
+                } else if (typeof value === "object") {
+                    if (value instanceof QueryOrderByConstraint) {
+                        addOrderBy = false;
+                    }
+                    fConstraints.push(value as QueryFieldFilterConstraint|QueryOrderByConstraint);
+                } else {
+                    fConstraints.push(where(key, "==", value));
+                }
             });
-
-            if (queryData?.orderBy) {
-                if (queryData.orderBy === "documentId") {
-                    constraints.push(orderBy(documentId()));
+            console.log("Add order by", addOrderBy);
+            if (addOrderBy) {
+                if (sortResultsBy) {
+                    fConstraints.push(orderBy(sortOptions[sortResultsBy][0], sortOptions[sortResultsBy][1]));
                 } else {
-                    constraints.push(orderBy(queryData.orderBy));
+                    fConstraints.push(orderBy(documentId()));
+
                 }
-            } else {
-                constraints.push(orderBy(documentId()));
             }
 
 
             if (page[0] > page[1] && !cursorDirection) { // Going up
-                currentQueryAnchor.endKey && constraints.push(startAfter(currentQueryAnchor.endKey));
-                constraints.push(limit(10));
+                currentQueryAnchor.endDoc && fConstraints.push(startAfter(currentQueryAnchor.endDoc));
+                fConstraints.push(limit(10));
                 if (!loadMoreFromQuery) {
                     currentQueryAnchor = {...currentQueryAnchor, startQueryPos: currentQueryAnchor.endQueryPos};
                 }
@@ -821,27 +1159,27 @@ export function usePlacementListingPaginator({data, user}:{data:QueryObject[], u
                 if (!loadMoreFromQuery) {
                     currentQueryAnchor = {...currentQueryAnchor, endQueryPos: currentQueryAnchor.startQueryPos};
                 }
-                constraints.push(limitToLast(10));
-                if (currentQueryAnchor.startKey) {
-                    currentQueryAnchor.startKey && constraints.push(endBefore(currentQueryAnchor.startKey));
+                fConstraints.push(limitToLast(10));
+                if (currentQueryAnchor.startDoc) {
+                    currentQueryAnchor.startDoc && fConstraints.push(endBefore(currentQueryAnchor.startDoc));
                 } else {
-                    currentQueryAnchor.startKey && constraints.push(endAt(currentQueryAnchor.startKey));
+                    currentQueryAnchor.startDoc && fConstraints.push(endAt(currentQueryAnchor.startDoc));
                 }
             } else {
                 if (cursorDirection === "decrease") {
-                    constraints.push(limitToLast(10));
+                    fConstraints.push(limitToLast(10));
                 } else {
-                    constraints.push(limit(10));
+                    fConstraints.push(limit(10));
                 }
             }
-            return constraints;
+            return fConstraints;
         };
 
         const constraints = createQuery(querySchema);
         // console.log(queryId, "constraints", constraints)
 
-        const q = query(collection(db, "savedPlacements"), ...(constraints));
-        const queryResults:{[key:string]: unknown} = {};
+        const q = query(collection(db, "users"), ...(constraints));
+        const queryResults:{[key:string]: QueryDocumentSnapshot<DocumentData>} = {};
 
         const queryData = await getDocs(q);
 
@@ -856,7 +1194,7 @@ export function usePlacementListingPaginator({data, user}:{data:QueryObject[], u
         };
 
         let index = 0;
-        reverseIfBack(queryData.docs).forEach(async (doc: QueryDocumentSnapshot) => {
+        reverseIfBack(queryData.docs).forEach((doc: QueryDocumentSnapshot) => {
             if (Object.keys(queryResults).length + Object.keys(itemList).length === 10) {
                 return;
             }
@@ -873,10 +1211,9 @@ export function usePlacementListingPaginator({data, user}:{data:QueryObject[], u
                 return;
             }
 
-            const item = doc.data() as SavedPlacement;
-            item.id = doc.id;
-            queryResults[doc.id] = item;
+            queryResults[doc.id] = doc;
             index = index+1;
+
             if (prevEntries[doc.id]) return;
             prevEntries[doc.id] = position;
         });
@@ -890,272 +1227,29 @@ export function usePlacementListingPaginator({data, user}:{data:QueryObject[], u
         setPrevEntryIds(prevEntries);
 
         if (queryData.size < 10 && Object.keys(itemList).length < 10) {
-            if (page[0] > page[1] && cursorPos+1 < data.length) {
-                console.log("Increase query index");
+            if (page[0] > page[1] && cursorPos+1 < queries.length) {
                 return getDataFromQuery(itemList, {...currentQueryAnchor, endQueryPos: currentQueryAnchor.endQueryPos+1}, "increase", prevEntries);
             } else if (page[0] < page[1] && cursorPos > 0) {
-                console.log("Decrease query index");
                 return getDataFromQuery(itemList, {...currentQueryAnchor, startQueryPos: currentQueryAnchor.startQueryPos-1}, "decrease", prevEntries);
             }
         }
 
         if (Object.keys(itemList).length < 10 && queryData.size === 10) {
-            console.log("Shorter than ten");
-            // if(loadMoreFromQuery){return}
-            return getDataFromQuery(itemList, {...currentQueryAnchor, startKey: Object.keys(itemList)[0], endKey: Object.keys(itemList).slice(-1)[0]}, undefined, prevEntries, true);
+            return getDataFromQuery(itemList, {...currentQueryAnchor, startDoc: Object.values(itemList)[0], endDoc: Object.values(itemList).slice(-1)[0]}, undefined, prevEntries, true);
         }
 
         if (queryData.size === 0 &&
             Object.keys(itemList).length === 0 &&
-            currentQueryAnchor.endQueryPos+1 === data.length &&
+            currentQueryAnchor.endQueryPos+1 === queries.length &&
             page[0] > 1) {
             setTableData({});
             setQueryAnchor((a) => ({...a, startKey: ""}));
             return;
         }
 
-        setQueryAnchor({...currentQueryAnchor, startKey: Object.keys(itemList)[0], endKey: Object.keys(itemList).slice(-1)[0]});
-
-        const finalData = Object.fromEntries(await Promise.all(Object.entries(itemList).map(async ([k, v]:[string, SavedPlacement]) => {
-            const placement = await firebaseQuery.getDocData(["placementListings", v.placementId || ""]) as PlacementListing;
-            const address = await firebaseQuery.getDocData(["addresses", placement.addressId || ""]);
-            const provider = await firebaseQuery.getDocData(["providers", placement.providerId || ""]) as ProviderData;
-            const status = getPlacementStatus(provider, placement, v);
-            return [k, {...address, ...provider, ...placement, email: placement.providerEmail, status: status, savedPlacement: v}];
-        })));
-        setTableData(finalData);
-    };
-
-    const getPlacementStatus = (provider: ProviderData, placement: PlacementListing, savedPlacement: SavedPlacement):"active"|"requiresApproval"|"awaitingProviderApproval"|"public"|"blocked"|"notReviewed"|"notPublic"|"unknown" => {
-        if (savedPlacement.status === "Blocked") return "blocked";
-        if (savedPlacement.status === "Accepted") return "active";
-
-        if (user.product === "admin") {
-            if (placement.mapConsent === undefined) return "notReviewed";
-            if (placement.mapConsent === false) return "notPublic";
-            return "unknown";
-        };
-
-        if (!provider.insurance) return "awaitingProviderApproval";
-        
-        return "requiresApproval";
-    };
-
-    useEffect(() => {
-        if (!filters) return;
-
-        setPage([1, 0]);
-        setTableData({});
-        setQueryAnchor({startKey: "", endKey: "", startQueryPos: 0, endQueryPos: 0});
-        setPrevEntryIds({});
-    }, [filters]);
-
-    // Fetch new data when queries or page change
-    useEffect(() => {
-        getDataFromQuery();
-    }, [page]);
-
-    return ({...{tableData, setPage, setFilters, page}});
-}
-
-type UserPaginatorParams = {
-    user: UserData,
-    cohort?: string,
-    data: QueryObject[],
-    search?: string,
-    userType: "Staff"|"Students"
-}
-
-export function useCohortUserPaginator({user, cohort, data, search, userType}:UserPaginatorParams) {
-    const [tableData, setTableData] = useState<{[key:string]:{[key:string]: unknown}}>({});
-    const [queryAnchor, setQueryAnchor] = useState<{startKey: string, endKey: string, startQueryPos: number, endQueryPos: number}>({startKey: "", endKey: "", startQueryPos: 0, endQueryPos: 0});
-    const [filters, setFilters] = useState<{[key:string]: unknown}>();
-    const [prevEntryIds, setPrevEntryIds] = useState<{[key:string]:number}>({});
-    const [page, setPage] = useState([1, 0]);
-    const [dataListenerUnsubscribe, setDataListenerUnsubscribe] = useState<Unsubscribe|undefined>();
-    const [queries, setQueries] = useState<QueryConstraint[][]>();
-    const [prevSearch, setPrevSearch] = useState<string>();
-
-    const algoliaClient = algoliasearch(process.env.NODE_ENV === "development" ? "A0ZB50I7VS" : "XMPXCMUUOJ", user.algoliaKey);
-    const usersIndex = algoliaClient.initIndex("users");
-    
-    useEffect(() => {
-        if (user.userType !== "Staff") {
-            console.log("Not a staff member", user)
-            setQueries(undefined);
-            return;
-        }
-        if (
-            (!user.viewCohorts && user.userGroup !== "admin") ||
-            user.viewCohorts === "none" ||
-            (user.viewCohorts === "some" && cohort !== "all" && !user.visibleCohorts?.split(",").includes(cohort || ""))) {
-            setQueries(undefined);
-            return;
-        }
-        setQueries(() => {
-            const finalConstraints:QueryConstraint[][] = [];
-            console.log("data", data, data.length)
-            for (var i = 0; i < data.length; i++) {
-                const item = data[i]
-                console.log("item", item)
-                const constraints:QueryConstraint[] = [];
-                item.where && item.where.forEach((w) => {
-                    constraints.push(where(...w));
-                });
-
-                constraints.push(where("oId", "==", user.oId));
-                cohort && cohort !== "all" && constraints.push(where("cohort", "==", cohort));
-
-                if (user.userGroup === "admin" || user.viewUsers === "all") {
-                    finalConstraints.push(constraints);
-                    continue
-                }
-                if (!user.studentFilter || !user.studentFilterValues) continue;
-                user.studentFilterValues.split(", ").forEach((filterValue) => {
-                    user.studentFilter && finalConstraints.push([...constraints, where("details."+user.studentFilter, "==", filterValue)])
-                })
-            };
-            console.log("final", finalConstraints)
-            return finalConstraints;
-        });
-    }, []);
-
-
-    const getDataFromQuery = async (
-        itemList: {[key: string]: any} = {}, currentQueryAnchor=queryAnchor, cursorDirection?:"increase"|"decrease"|undefined, prevEntries=prevEntryIds, loadMoreFromQuery=false):Promise<any> => {
-        
-        if (!queries) {
-            setTableData({});
-            return;
-        }
-        console.log("q", queries)
-        let cursorPos:number;
-        if (page[0] > page[1]) {
-            cursorPos = currentQueryAnchor.endQueryPos;
-        } else {
-            cursorPos = currentQueryAnchor.startQueryPos;
-        }
-
-        const querySchema = queries[cursorPos];
-        console.log("schema", querySchema)
-        const createQuery = (mConstraints:QueryConstraint[]) => {
-
-            console.log("mConstraints", mConstraints);
-            const fConstraints = [...mConstraints];
-            
-            filters && Object.entries(filters).forEach(([key, value]) => {
-                if (typeof value === "object") {
-                    fConstraints.push(value as QueryFieldFilterConstraint);
-                } else {
-                    fConstraints.push(where(key, "==", value));
-                }
-            });
-            fConstraints.push(orderBy(documentId()));
-
-
-            if (page[0] > page[1] && !cursorDirection) { // Going up
-                currentQueryAnchor.endKey && fConstraints.push(startAfter(currentQueryAnchor.endKey));
-                fConstraints.push(limit(10));
-                if (!loadMoreFromQuery) {
-                    currentQueryAnchor = {...currentQueryAnchor, startQueryPos: currentQueryAnchor.endQueryPos};
-                }
-            } else if (page[0] < page[1] && !cursorDirection) { // Going down
-                if (!loadMoreFromQuery) {
-                    currentQueryAnchor = {...currentQueryAnchor, endQueryPos: currentQueryAnchor.startQueryPos};
-                }
-                fConstraints.push(limitToLast(10));
-                if (currentQueryAnchor.startKey) {
-                    currentQueryAnchor.startKey && fConstraints.push(endBefore(currentQueryAnchor.startKey));
-                } else {
-                    currentQueryAnchor.startKey && fConstraints.push(endAt(currentQueryAnchor.startKey));
-                }
-            } else {
-                if (cursorDirection === "decrease") {
-                    fConstraints.push(limitToLast(10));
-                } else {
-                    fConstraints.push(limit(10));
-                }
-            }
-            return fConstraints;
-        };
-
-        const constraints = createQuery(querySchema);
-        // console.log(queryId, "constraints", constraints)
-
-        const q = query(collection(db, "users"), ...(constraints));
-        const queryResults:{[key:string]: unknown} = {};
-
-        const queryData = await getDocs(q);
-
-        // console.log("queryData.size", queryData.size)
-
-
-        const reverseIfBack = (docs:QueryDocumentSnapshot<DocumentData>[]) => {
-            if (page[0] < page[1]) {
-                return docs.reverse();
-            }
-            return docs;
-        };
-
-        let index = 0;
-        reverseIfBack(queryData.docs).forEach((doc: QueryDocumentSnapshot) => {
-            if (Object.keys(queryResults).length + Object.keys(itemList).length === 10) {
-                return;
-            }
-
-            let position = Object.keys(itemList).length+(page[0]-1)*10+index+1;
-            if (page[0] < page[1]) {
-                position = (page[0])*10-index-Object.keys(itemList).length;
-            }
-
-            // console.log(index, "doc.id", doc.id, position, "E", prevEntries[doc.id])
-
-            if (itemList[doc.id] || (prevEntries[doc.id] && prevEntries[doc.id] !== position)) {
-                console.log("Removing ", doc.id, ": E=", prevEntries[doc.id], ", G=", position);
-                return;
-            }
-
-            const item = doc.data();
-            item.id = doc.id;
-            queryResults[doc.id] = item;
-            index = index+1;
-
-            if (prevEntries[doc.id]) return;
-            prevEntries[doc.id] = position;
-        });
-
-        if (cursorDirection === "decrease" || page[0] < page[1]) {
-            itemList = {...Object.fromEntries(Object.entries(queryResults).reverse()), ...itemList};
-        } else {
-            itemList = {...itemList, ...queryResults};
-        }
-
-        setPrevEntryIds(prevEntries);
-
-        if (queryData.size < 10 && Object.keys(itemList).length < 10) {
-            if (page[0] > page[1] && cursorPos+1 < queries.length) {
-                return getDataFromQuery(itemList, {...currentQueryAnchor, endQueryPos: currentQueryAnchor.endQueryPos+1}, "increase", prevEntries);
-            } else if (page[0] < page[1] && cursorPos > 0) {
-                return getDataFromQuery(itemList, {...currentQueryAnchor, startQueryPos: currentQueryAnchor.startQueryPos-1}, "decrease", prevEntries);
-            }
-        }
-
-        if (Object.keys(itemList).length < 10 && queryData.size === 10) {
-            return getDataFromQuery(itemList, {...currentQueryAnchor, startKey: Object.keys(itemList)[0], endKey: Object.keys(itemList).slice(-1)[0]}, undefined, prevEntries, true);
-        }
-
-        if (queryData.size === 0 &&
-            Object.keys(itemList).length === 0 &&
-            currentQueryAnchor.endQueryPos+1 === queries.length &&
-            page[0] > 1) {
-            setTableData({});
-            setQueryAnchor((a) => ({...a, startKey: ""}));
-            return;
-        }
-
-        const listenForUpdates = () => {
-            if (!Object.keys(itemList).length) return;
-            console.log("Fetching cohort user data")
+        const listenForUpdates = () => {
+            if (!Object.keys(itemList).length) return;
+            console.log("Fetching cohort user data")
 
             const itemListUpdateQuery = query(collection(db, "users"), where(documentId(), "in", Object.keys(itemList)));
             const itemUpdateSnapshot = onSnapshot(itemListUpdateQuery, (querySnapshot) => {
@@ -1170,8 +1264,8 @@ export function useCohortUserPaginator({user, cohort, data, search, userType}:Us
         };
         listenForUpdates();
 
-        setQueryAnchor({...currentQueryAnchor, startKey: Object.keys(itemList)[0], endKey: Object.keys(itemList).slice(-1)[0]});
-        setTableData(itemList);
+        setQueryAnchor({...currentQueryAnchor, startDoc: Object.values(itemList)[0], endDoc: Object.values(itemList).slice(-1)[0]});
+        setTableData(Object.fromEntries(Object.entries(itemList).map(([k, v]) => [k, {id: k, ...v.data()}])));
     };
 
     const searchUsers = async () => {
@@ -1215,10 +1309,10 @@ export function useCohortUserPaginator({user, cohort, data, search, userType}:Us
         console.log("Set page");
 
         setTableData({});
-        setQueryAnchor({startKey: "", endKey: "", startQueryPos: 0, endQueryPos: 0});
+        setQueryAnchor({startQueryPos: 0, endQueryPos: 0});
         setPrevEntryIds({});
         dataListenerUnsubscribe && dataListenerUnsubscribe();
-    }, [filters, search]);
+    }, [filters, search, sortResultsBy]);
 
     // Fetch new data when queries or page change
     useEffect(() => {
@@ -1231,7 +1325,10 @@ export function useCohortUserPaginator({user, cohort, data, search, userType}:Us
         dataListenerUnsubscribe && dataListenerUnsubscribe();
     }, [page, queries, prevSearch]);
 
-    return ({...{tableData, setPage, page, setFilters}});
+
+    const setSort = (s: string) => setSortResultsBy(s);
+
+    return ({...{tableData, setPage, page, setFilters, setSort, sortOptions: Object.keys(sortOptions), sortBy: sortResultsBy}});
 }
 
 
@@ -1309,480 +1406,514 @@ export function useLazyLoadQueryList({path, constraints, number, onItemFetched}:
 }
 
 
-type PublicPlacementListingLoaderParams = {
-    providerId?: string,
-    number: number,
-}
-
-export function usePublicPlacementListingLoader({providerId, number=5}:PublicPlacementListingLoaderParams) {
-    const [items, setItems] = useState<{[key:string]:{[key:string]:unknown}}>({});
-    const [loadMoreIcon, setLoadMoreIcon] = useState<boolean>(false);
+// type PublicPlacementListingLoaderParams = {
+//     providerId?: string,
+//     number: number,
+// }
+
+// export function usePublicPlacementListingLoader({providerId, number=5}:PublicPlacementListingLoaderParams) {
+//     const [items, setItems] = useState<{[key:string]:{[key:string]:unknown}}>({});
+//     const [loadMoreIcon, setLoadMoreIcon] = useState<boolean>(false);
+
+//     const [lastItem, setLastItem] = useState<QueryDocumentSnapshot<DocumentData>>();
+//     const firebaseQuery = new FirebaseQuery();
+
+//     const reset = () => {
+//         setItems({});
+//         setLastItem(undefined);
+//     };
+
+//     const loadMore = async () => {
+//         setLoadMoreIcon(true);
+//         let formattedConstraints:QueryConstraint[] = [
+//             where("status", "==", "listed"),
+//             limit(number)
+//         ];
+
+//         if (providerId) {
+//             formattedConstraints.push(where("providerId", "==", providerId));
+//         }
+//         if (lastItem) {
+//             formattedConstraints.push(startAfter(lastItem));
+//         }
+//         const documents = await firebaseQuery.getDocsWhere("placementListings", formattedConstraints, true) as QuerySnapshot<DocumentData>;
+
+//         console.log("docs", documents.docs);
+//         setLastItem(documents.docs[documents.docs.length-1]);
+
+//         const processedItems = Object.fromEntries(await Promise.all(Object.values(documents.docs).map(async (doc) => {
+//             let itemObj = {...doc.data(), id: doc.id} as PlacementListing;
+
+//             if (itemObj.addressId) {
+//                 const address = await firebaseQuery.getDocData(["addresses", itemObj.addressId]) as Address;
+//                 delete address.id;
+//                 itemObj = {...address, ...itemObj};
+//             }
+//             if (itemObj.applicantWorkflowId) {
+//                 const applicantWorkflow = (await firebaseQuery.getDocData(["applicantWorkflows", itemObj.applicantWorkflowId]) as ApplicantWorkflow).workflow.filter((i) => i.id === 1)[0];
+//                 const applicantFiles = applicantWorkflow.files ? Object.fromEntries(await Promise.all(applicantWorkflow.files?.map(async (fileId) => {
+//                     const file = await firebaseQuery.getDocData(["files", fileId]);
+//                     file.url = await getDownloadURL(ref(storage, `providers/${itemObj.providerId}/${file.fileName}`));
+
+//                     return [fileId, file];
+//                 }))) : [];
+//                 const applicantForms = applicantWorkflow.forms ? Object.fromEntries(await Promise.all(applicantWorkflow.forms?.map(async (formId) => {
+//                     return [formId, await firebaseQuery.getDocData(["forms", formId])];
+//                 }))) : [];
+
+//                 applicantWorkflow.viewableFiles = applicantFiles;
+//                 applicantWorkflow.formDetails = applicantForms;
+//                 itemObj = {...itemObj, applicantWorkflow: [applicantWorkflow]};
+//             }
+//             return [doc.id, itemObj];
+//         })))
+
+//         setItems((i) => ({...i, ...processedItems}));
+//         setLoadMoreIcon(false);
+//     };
+//     useEffect(() => {
+//         loadMore();
+//     }, []);
+
+//     return ({...{items, loadMore, loadMoreIcon, reset}});
+// }
+
+// export type ApplicationHookParams = {
+//     successText: {
+//         submitted: {
+//             title: string;
+//             desc: string;
+//         };
+//         draftSaved: {
+//             title: string;
+//             desc: string;
+//         };
+//         stageComplete: {
+//             title: string;
+//             desc: string;
+//         };
+//         outcome: {
+//             title: string;
+//             desc: string;
+//         };
+//     };
+//     setSuccessPopup: import("react").Dispatch<import("react").SetStateAction<"submitted" | "draftSaved" | "stageComplete" | "outcome" | undefined>>;
+//     openSuccessPopup: (type: "submitted" | "draftSaved" | "stageComplete" | "outcome") => void;
+//     setFApplication: import("react").Dispatch<import("react").SetStateAction<Partial<Application>>>;
+//     fApplication: Partial<Application>;
+//     draftSaved: boolean;
+//     profileUrl: string | undefined;
+//     successPopup: "submitted" | "draftSaved" | "stageComplete" | "outcome" | undefined;
+//     fApplicationId: string | undefined;
+//     fListing: PlacementListing | false | undefined;
+//     student: UserData | undefined;
+//     fProvider: {
+//         details?: ProviderData;
+//         profile?: string;
+//         id?: string;
+//     } | undefined;
+//     onFApply: (draft?: boolean) => Promise<void>;
+//     setFormComplete: (formId: string, e: {
+//         [key: string]: unknown;
+//     }) => void;
+//     viewFile: (file: string, onOpen: (url: string) => void) => void
+//     addFile: (files: string[], fileId: number) => void;
+//     uploadedFiles?: {
+//         [key: string]: FileItem;
+//     };
+//     getCurrentStage: (stage: number) => Promise<{
+//         stage: ApplicantStage;
+//         completedSections: {
+//             submitted?: string | undefined;
+//             filesViewed?: string[] | undefined;
+//             formsCompleted?: {
+//                 [key: string]: unknown;
+//             } | undefined;
+//             filesUploaded?: {
+//                 [key: number]: string[];
+//             } | undefined;
+//         };
+//     }>;
+//     currentStageComplete?: boolean;
+//     progressStage: (type: number | "accept" | "reject", e?: {
+//         feedback?: string;
+//     }) => Promise<void>;
+// };
+
+// export function useCreateApplicationRenderer({user, listingId, listing, provider, application, applicationId, orgContext}:
+//     {user:UserData, listingId:string, applicationId?: string, listing?: PlacementListing, application?: Partial<Application>,
+//         orgContext?: {details: ProviderData, addresses: {[key: string]: OrganisationAddress}, applicantWorkflows: {[key: string]: ApplicantWorkflow}},
+//         provider?: {details?: ProviderData, profile?: string, id?: string}}) {
+
+//         const firebaseQuery = new FirebaseQuery();
+
+//         let applicationWithoutAdditionalData = {...(application || {})} as any;
+//         delete applicationWithoutAdditionalData.listing;
+//         delete applicationWithoutAdditionalData.address;
+//         delete applicationWithoutAdditionalData.provider;
+    
+//         const [fApplication, setFApplication] = useState<Partial<Application>>(application ? applicationWithoutAdditionalData : {
+//             uid: user.userType === "Students" ? user.id : undefined,
+//             listingId: listingId,
+//             addressId: listing?.addressId,
+//             stage: 1,
+//             reqUserType: "Students",
+//             status: "draft"});
+//         const [fApplicationId, setFApplicationId] = useState<string|undefined>(applicationId);
+//         const [draftSaved, setDraftSaved] = useState(false);
+//         const [fProvider, setFProvider] = useState<{details?: ProviderData, profile?: string, id?: string}|undefined>(provider);
+//         const [fListing, setFListing] = useState<PlacementListing|false|undefined>(Object.keys(listing || {}).length > 5 ? listing : undefined);
+//         const [student, setStudent] = useState<UserData|undefined>(user.userType === "Students" ? user : undefined);
+//         const [profileUrl, setProfileUrl] = useState<string>();
+//         const [successPopup, setSuccessPopup] = useState<"submitted"|"draftSaved"|"stageComplete"|"outcome">();
+//         const [uploadedFiles, setUploadedFiles] = useState<{[key: string]: FileItem}>();
+//         const [currentStageComplete, setCurrentStageComplete] = useState<boolean>();
+
+//         useEffect(() => {
+//             const getListing = async () => {
+//                 console.log("Checking ID")
+//                 if (!listingId) return;
+//                 console.log("Getting listing")
+//                 console.log("LISTING PARAM", listing, Object.keys(listing || {}).length > 5);
+
+//                 const listingData = (Object.keys(listing || {}).length > 5) ? listing : (await firebaseQuery.getDocData(["placementListings", listingId]).catch(() => false) as PlacementListing|false);
+                
+//                 console.log("LISTINGDATA", listingData, Object.keys(listing || {}).length > 5 ? {a: "string"} : "AAA");
+                
+                
+                
+//                 const address = listingData ? (user.product === "providers" && orgContext) ? orgContext.addresses[listingData.addressId || ""] : await firebaseQuery.getDocData(["addresses", listingData.addressId as string]) as Address : undefined;
+//                 const workflow = listingData ? (user.product === "providers" && orgContext) ? orgContext.applicantWorkflows[listingData.applicantWorkflowId || ""] as ApplicantWorkflow : await firebaseQuery.getDocData(["applicantWorkflows", listingData.applicantWorkflowId as string]) as ApplicantWorkflow : undefined;
+            
+//                 if (workflow && listingData) {
+//                     workflow.workflow = await Promise.all(workflow.workflow.map(async (s) => {
+//                         const applicantFiles = s.files ? Object.fromEntries(await Promise.all(s.files?.map(async (fileId: string) => {
+//                             const file = await firebaseQuery.getDocData(["files", fileId]);
+//                             file.url = await getDownloadURL(ref(storage, `providers/${listingData?.providerId}/${file.fileName}`));
+    
+//                             return [fileId, file];
+//                         }))) : [];
+//                         const applicantForms = s.forms ? Object.fromEntries(await Promise.all(s.forms?.map(async (formId: string) => {
+//                             return [formId, await firebaseQuery.getDocData(["forms", formId])];
+//                         }))) : [];
+    
+//                         return {...s, viewableFiles: applicantFiles, formDetails: applicantForms};
+//                     }));
+//                     delete workflow.id;
+//                 }
+//                 if (address) {
+//                     delete address.id;
+//                 }
+
+//                 console.log("Setting listing")
+//                 setFListing((listingData && workflow) ? {...listingData, ...address, applicantWorkflow: workflow.workflow} as PlacementListing : false);
+
+
+//                 if ((fProvider?.id === application?.providerId) && user.product === "providers") {
+//                     setFProvider({details: orgContext?.details, id: user.oId});
+//                 } else if (listingData && listingData?.providerId) {
+//                     console.log("Getting provider from DB");
+//                     const provider = await firebaseQuery.getDocData(["providers", listingData.providerId]) as ProviderData;
+//                     console.log("Provider", provider);
+//                     setFProvider({details: provider, id: listingData.providerId});
+//                 }
+//             }
+
+//             getListing();
+//         }, [listingId, listing]);
+    
+//         useEffect(() => {
+//             if (student?.id !== application?.uid) {
+//                 if (user.userType === "Students") {
+//                     setStudent(user);
+//                 } else if (user.product === "providers" && application?.uid) {
+//                     firebaseQuery.getDocData(["users", application.uid]).then((s) => setStudent(s as UserData));
+//                 }
+//             }
+//         }, []);
+    
+//         useEffect(() => {
+//             setFListing(Object.keys(listing || {}).length > 5 ? listing : undefined);
+//         }, [listing]);
+    
+//         useEffect(() => {
+//             if (provider?.profile) return;
+//             if (!provider?.id) return;
+    
+//             getDownloadURL(ref(storage, `providers/${provider?.id}/profilePic.png`)).then(setProfileUrl).catch(() => null);
+//         }, [provider]);
+    
+    
+//         useEffect(() => {
+//             console.log("APPLICATIONID", applicationId);
+//             if (!applicationId) {
+//                 if (!listingId) return;
+//                 firebaseQuery.getDocsWhere("applications", [where("status", "not-in", ["approved", "declined"]), where("uid", "==", user.id), where("listingId", "==", listingId)]).then((existingApplication) => {
+//                     console.log("EXISTING", existingApplication);
+//                     // get uploaded files
+//                     if (existingApplication && Object.keys(existingApplication).length) {
+//                         setFApplication(Object.values(existingApplication)[0]);
+//                         setFApplicationId(Object.keys(existingApplication)[0]);
+//                     }
+//                 });
+//                 return;
+//             }
+//             if (applicationId) {
+//                 setFApplicationId(applicationId);
+//                 if (application) {
+//                     let applicationWithoutAdditionalData = {...(application || {})} as any;
+//                     delete applicationWithoutAdditionalData.listing;
+//                     delete applicationWithoutAdditionalData.address;
+//                     delete applicationWithoutAdditionalData.provider;
+//                     setFApplication(applicationWithoutAdditionalData);
+//                 } else {
+//                     firebaseQuery.getDocData(["applications", applicationId]).then(setFApplication);
+//                 }
+//             }
+//         }, [application, applicationId]);
+
+//         const getCurrentStage = async (stage: number): Promise<{
+//             stage: ApplicantStage; completedSections: {
+//                 submitted?: string | undefined;
+//                 filesViewed?: string[] | undefined;
+//                 formsCompleted?: {
+//                     [key: string]: unknown;
+//                 } | undefined;
+//                 filesUploaded?: {
+//                     [key: number]: string[];
+//                 } | undefined;
+//             };
+//         }> => {
+//             console.log("fLSITING CURRENT STAGE", fListing);
+//             if (!fListing) throw new Error("Listing deleted");
+//             if (!fListing?.applicantWorkflowId) throw new Error("No workflow stage");
+
+//             const mApplicantWorkflow = (await firebaseQuery.getDocData(["applicantWorkflows", fListing.applicantWorkflowId]) as ApplicantWorkflow);
+
+//             const stageObj = mApplicantWorkflow?.workflow?.find((s) => s.id === stage);
+
+//             if (!stageObj) throw new Error("Can't find stage.");
+
+//             const applicantFiles = stageObj.files ? Object.fromEntries(await Promise.all(stageObj.files?.map(async (fileId) => {
+//                 const file = await firebaseQuery.getDocData(["files", fileId]);
+//                 file.url = await getDownloadURL(ref(storage, `providers/${mApplicantWorkflow?.oId}/${file.fileName}`));
+
+//                 return [fileId, file];
+//             }))) : [];
+//             const applicantForms = stageObj.forms ? Object.fromEntries(await Promise.all(stageObj.forms?.map(async (formId) => {
+//                 return [formId, await firebaseQuery.getDocData(["forms", formId])];
+//             }))) : [];
+
+//             stageObj.viewableFiles = applicantFiles;
+//             stageObj.formDetails = applicantForms;
+            
+//             return {stage: stageObj, completedSections: fApplication?.completedSections?.[stage] || {}};
+//         };
+    
+//         useEffect(() => {
+//             const getUploadedFiles = async () => {
+//                 if (!fApplication.completedSections) {
+//                     setUploadedFiles({});
+//                     return
+//                 };
+                
+//                 const fileIds = Object.values(fApplication.completedSections)
+//                     .flatMap(stageData =>
+//                     Object.values(stageData.filesUploaded || {}).flatMap(fileIds => fileIds)
+//                     );
+                
+//                 const fileDataPromises = fileIds.map(async (fileId) => {
+//                     const fileData = await firebaseQuery.getDocData(["files", fileId]) as FileItem;
+//                     fileData.url = await getDownloadURL(ref(storage, `userFiles/${fileData.fileName}`));
+                
+//                     return [fileId, fileData] as [string, FileItem]
+//                 });
+                
+//                 const fileDataArray = await Promise.all(fileDataPromises);
+//                 const fileDataObj = Object.fromEntries(fileDataArray)
+//                 setUploadedFiles(fileDataObj)
+//             }
+
+//             const addApplication = async () => {
+//                 console.log("ADDING APPLICATION");
+//                 if (!fListing || !fListing?.id || !fProvider?.id || !student?.id) return;
+
+//                 const applicationData = {
+//                     uid: student.id,
+//                     listingId: fListing?.id,
+//                     addressId: fListing.addressId,
+//                     applicantWorkflowId: fListing?.applicantWorkflowId,
+//                     providerId: fProvider.id,
+//                     stage: 1,
+//                     status: "draft",
+//                     created: (new Date()).toISOString(),
+//                     ...fApplication,
+//                 } as Partial<Application>;
+//                 const mApplicationId = (await firebaseQuery.add(["applications"], applicationData)).id;
+//                 console.log("APPLICATION ADDED");
+//                 setFApplicationId(mApplicationId);
+//                 setFApplication(applicationData);
+//                 setDraftSaved(true);
+//                 return;
+//             };
+//             getUploadedFiles();
+
+//             console.log("Checking IDs");
+
+//             if (!fListing || !fListing?.id || !fProvider?.id || !student?.id) return;
+//             if (user.product === "providers") return;
+
+//             console.log("Checking dates and sections");
+//             if (!fApplication.completedSections && !fApplication.startDate && !fApplication.endDate) return;
+
+//             console.log("Application updated");
+//             if (!fApplicationId && !applicationId) {
+//                 // save new
+//                 console.log("Add application")
+//                 addApplication();
+//                 return;
+//             }
+//             // update
+//             firebaseQuery.update(["applications", (fApplicationId || applicationId) as string], fApplication);
+//             setDraftSaved(true);
+//         }, [fApplication]);
+    
+//         const openSuccessPopup = (type: "submitted"|"draftSaved"|"stageComplete"|"outcome") => {
+//             setSuccessPopup(type);
+//             setTimeout(() => {
+//                 // onClose();
+//             }, 1500);
+//         };
 
-    const [lastItem, setLastItem] = useState<QueryDocumentSnapshot<DocumentData>>();
-    const firebaseQuery = new FirebaseQuery();
+//         useEffect(() => {
 
-    const reset = () => {
-        setItems({});
-        setLastItem(undefined);
-    };
+//             const areStagesCompleted = async ():Promise<boolean|undefined> => {
+//                 if (!fListing) return;
+//                 if (fApplication.stage === undefined) return undefined;
+//                 const currentStage = await getCurrentStage(fApplication.stage);
 
-    const loadMore = async () => {
-        setLoadMoreIcon(true);
-        let formattedConstraints:QueryConstraint[] = [
-            where("status", "==", "listed"),
-            limit(number)
-        ];
+//                 console.log("Checking current stage is complete");
+                
+//                 for (const fileViewed of currentStage.stage?.files || []) {
+//                     console.log("Checking file viewed", fileViewed, "in", currentStage?.completedSections?.filesViewed);
+//                     if (!currentStage?.completedSections?.filesViewed?.includes(fileViewed)) {        
+//                         console.log("File not viewed");
+//                         return false;
+//                     } else {
+//                         console.log("File viewed");
+//                     }
+//                 }
+//                 for (const formCompleted of currentStage?.stage?.forms || []) {
+//                     console.log("Checking form completed", formCompleted, "in", currentStage?.completedSections?.formsCompleted);
+
+//                     if (!Object.keys(currentStage?.completedSections?.formsCompleted || {}).includes(formCompleted)) {
+//                         console.log("Form not completed");
+//                         return false;
+//                     } else {
+//                         console.log("Form completed")
+//                     }
+//                 }
+//                 for (let i = 0; i++; i < (currentStage?.stage?.requiredFiles || []).length) {
+//                     if (!Object.keys(currentStage?.completedSections?.filesUploaded || {}).includes(i.toString())) {
+//                         console.log("Form not uploaded");
+//                         return false;
+//                     } else {
+//                     console.log("Form uploaded");
+//                     }
+//                 }
+                
+//                 return true;
+//             };
 
-        if (providerId) {
-            formattedConstraints.push(where("providerId", "==", providerId));
-        }
-        if (lastItem) {
-            formattedConstraints.push(startAfter(lastItem));
-        }
-        const documents = await firebaseQuery.getDocsWhere("placementListings", formattedConstraints, true) as QuerySnapshot<DocumentData>;
+//             areStagesCompleted().then(setCurrentStageComplete);
+//         }, [fApplication, fListing])
 
-        console.log("docs", documents.docs);
-        setLastItem(documents.docs[documents.docs.length-1]);
+//         const viewFile = (file: string, onOpen: (url: string) => void) => {
+//             if (fApplication.reqUserType !== user.userType) return;
+//             if (fApplication.stage === undefined) throw new Error("Missing applciation stage.")
+//             if (!fListing) throw new Error("No associated listing.");
 
-        const processedItems = Object.fromEntries(await Promise.all(Object.values(documents.docs).map(async (doc) => {
-            let itemObj = {...doc.data(), id: doc.id} as PlacementListing;
+//             const viewableFiles = fListing?.applicantWorkflow?.find((stage) => stage.id === fApplication.stage)?.viewableFiles;
 
-            if (itemObj.addressId) {
-                const address = await firebaseQuery.getDocData(["addresses", itemObj.addressId]) as Address;
-                delete address.id;
-                itemObj = {...address, ...itemObj};
-            }
-            if (itemObj.applicantWorkflowId) {
-                const applicantWorkflow = (await firebaseQuery.getDocData(["applicantWorkflows", itemObj.applicantWorkflowId]) as ApplicantWorkflow).workflow.filter((i) => i.id === 1)[0];
-                const applicantFiles = applicantWorkflow.files ? Object.fromEntries(await Promise.all(applicantWorkflow.files?.map(async (fileId) => {
-                    const file = await firebaseQuery.getDocData(["files", fileId]);
-                    file.url = await getDownloadURL(ref(storage, `userFiles/${file.fileName}`));
+//             setFApplication((a) => {
+//                 const oldA = {...a};
+//                 const viewedFiles = a.completedSections?.[1]?.filesViewed || [];
+//                 if (viewedFiles?.includes(file)) return a;
+    
+//                 viewableFiles?.[file].url && onOpen(viewableFiles?.[file].url);
+//                 viewedFiles?.push(file);
+    
+//                 const newA = editNestedObject(["completedSections", 1, "filesViewed"], oldA, viewedFiles) as Partial<Application>;
+//                 return newA;
+//             });
+//         };
+
+//         const addFile = (files: string[], fileId: number) => {
+//             if (fApplication.reqUserType !== user.userType) throw new Error(`Incorrect user type. Expected ${fApplication.reqUserType}, got: ${user.userType}`);
+//             if (fApplication.stage === undefined) throw new Error("Missing applciation stage.")
+
+//             if (!files.length) throw new Error("No files to upload");
+//             setFApplication((a) => editNestedObject(["completedSections", fApplication.stage as number, "filesUploaded", fileId], a, files) as Application);
+//         };
+
+//         const setFormComplete = (formId: string, e: {[key: string]: unknown}) => {
+//             if (fApplication.reqUserType !== user.userType) throw new Error(`Incorrect user type. Expected ${fApplication.reqUserType}, got: ${user.userType}`);
+//             if (fApplication.stage === undefined) throw new Error("Missing applciation stage.")
+//             setFApplication((a) => editNestedObject(["completedSections", fApplication.stage as number, "formsCompleted", formId], a, e) as Application);
+//         };
+    
+//         const successText = {
+//             submitted: {
+//                 title: "Application submitted",
+//                 desc: "We've sent your application to the placement provider. You will hear what the next steps are soon.",
+//             },
+//             draftSaved: {
+//                 title: "Draft saved",
+//                 desc: "Your draft has been saved. Go to the 'Applications' section from your home screen to edit.",
+//             },
+//             stageComplete: {
+//                 title: "Stage complete",
+//                 desc: "We have sent this to the next stage in the application process. We will update you with any progress.",
+//             },
+//             outcome: {
+//                 title: "Outcome submitted",
+//                 desc: "We have sent the student an email with the outcome of their application.",
+//             },
+//         };
+
+//         const onFApply = async (draft?: boolean) => {
+//             if (draft) {
+//                 openSuccessPopup("draftSaved")
+//                 return;
+//             }
+
+//             if (!fApplicationId) return;
+    
+//             // Check all items have been filled in.
+//             if (!fApplication.startDate || !fApplication.endDate) throw new Error("Please select dates for your placement.");
+    
+//             await executeCallable("applications-submit", {applicationId: fApplicationId});
+            
+//             const newApplication = await firebaseQuery.getDocData(["applications", fApplicationId]) as Application;
+//             setFApplication(newApplication);
+//             openSuccessPopup("submitted")
+//         };
+    
+//         const progressStage = async (type: number|"accept"|"reject", e?: {feedback?: string}) => {
+//             // Check all stages completed.
+//             if (!fApplicationId) return;
+//             if (!currentStageComplete) throw new Error("Complete all forms before submitting.");
+//             if (fApplication.reqUserType !== user.userType) throw new Error(`Incorrect user type. Expected ${fApplication.reqUserType}, got: ${user.userType}`);
+//             if (fApplication.stage === undefined) throw new Error("Missing applciation stage.")
+
+//             await executeCallable("applications-changeStage", {applicationId: fApplicationId, type: type, feedback: e?.feedback});
+//             const newApplication = await firebaseQuery.getDocData(["applications", fApplicationId]) as Application;
+//             setFApplication(newApplication);
+//         };
+    
 
-                    return [fileId, file];
-                }))) : [];
-                const applicantForms = applicantWorkflow.forms ? Object.fromEntries(await Promise.all(applicantWorkflow.forms?.map(async (formId) => {
-                    return [formId, await firebaseQuery.getDocData(["forms", formId])];
-                }))) : [];
-
-                applicantWorkflow.viewableFiles = applicantFiles;
-                applicantWorkflow.formDetails = applicantForms;
-                itemObj = {...itemObj, applicantWorkflow: [applicantWorkflow]};
-            }
-            return [doc.id, itemObj];
-        })))
-
-        setItems((i) => ({...i, ...processedItems}));
-        setLoadMoreIcon(false);
-    };
-    useEffect(() => {
-        loadMore();
-    }, []);
-
-    return ({...{items, loadMore, loadMoreIcon, reset}});
-}
-
-export type ApplicationHookParams = {
-    successText: {
-        submitted: {
-            title: string;
-            desc: string;
-        };
-        draftSaved: {
-            title: string;
-            desc: string;
-        };
-        stageComplete: {
-            title: string;
-            desc: string;
-        };
-        outcome: {
-            title: string;
-            desc: string;
-        };
-    };
-    setSuccessPopup: import("react").Dispatch<import("react").SetStateAction<"submitted" | "draftSaved" | "stageComplete" | "outcome" | undefined>>;
-    openSuccessPopup: (type: "submitted" | "draftSaved" | "stageComplete" | "outcome") => void;
-    setFApplication: import("react").Dispatch<import("react").SetStateAction<Partial<Application>>>;
-    fApplication: Partial<Application>;
-    draftSaved: boolean;
-    profileUrl: string | undefined;
-    successPopup: "submitted" | "draftSaved" | "stageComplete" | "outcome" | undefined;
-    fApplicationId: string | undefined;
-    fListing: PlacementListing | undefined;
-    student: UserData | undefined;
-    fProvider: {
-        details?: ProviderData;
-        profile?: string;
-        id?: string;
-    } | undefined;
-    onFApply: (draft?: boolean) => Promise<void>;
-    setFormComplete: (formId: string, e: {
-        [key: string]: unknown;
-    }) => void;
-    viewFile: (file: string, onOpen: (url: string) => void) => void
-    addFile: (files: string[], fileId: number) => void;
-    uploadedFiles?: {
-        [key: string]: FileItem;
-    };
-    getCurrentStage: (stage: number) => Promise<{
-        stage: ApplicantStage;
-        completedSections: {
-            submitted?: string | undefined;
-            filesViewed?: string[] | undefined;
-            formsCompleted?: {
-                [key: string]: unknown;
-            } | undefined;
-            filesUploaded?: {
-                [key: number]: string[];
-            } | undefined;
-        };
-    }>;
-    currentStageComplete?: boolean;
-    progressStage: (type: number | "accept" | "reject", e?: {
-        feedback?: string;
-    }) => Promise<void>;
-};
-
-export function useCreateApplicationRenderer({user, listingId, listing, provider, application, applicationId, orgContext}:
-    {user:UserData, listingId:string, applicationId?: string, listing?: PlacementListing, application?: Partial<Application>,
-        orgContext?: {details: ProviderData, addresses: {[key: string]: OrganisationAddress}, applicantWorkflows: {[key: string]: ApplicantWorkflow}},
-        provider?: {details?: ProviderData, profile?: string, id?: string}}) {
-
-        const firebaseQuery = new FirebaseQuery();
-
-        let applicationWithoutAdditionalData = {...(application || {})} as any;
-        delete applicationWithoutAdditionalData.listing;
-        delete applicationWithoutAdditionalData.address;
-        delete applicationWithoutAdditionalData.provider;
-    
-        const [fApplication, setFApplication] = useState<Partial<Application>>(application ? applicationWithoutAdditionalData : {
-            uid: user.userType === "Students" ? user.id : undefined,
-            listingId: listingId,
-            stage: 1,
-            reqUserType: "Students",
-            status: "draft"});
-        const [fApplicationId, setFApplicationId] = useState<string|undefined>(applicationId);
-        const [draftSaved, setDraftSaved] = useState(false);
-        const [fProvider, setFProvider] = useState<{details?: ProviderData, profile?: string, id?: string}|undefined>(provider);
-        const [fListing, setFListing] = useState<PlacementListing|undefined>(listing);
-        const [student, setStudent] = useState<UserData|undefined>(user.userType === "Students" ? user : undefined);
-        const [profileUrl, setProfileUrl] = useState<string>();
-        const [successPopup, setSuccessPopup] = useState<"submitted"|"draftSaved"|"stageComplete"|"outcome">();
-        const [uploadedFiles, setUploadedFiles] = useState<{[key: string]: FileItem}>();
-        const [currentStageComplete, setCurrentStageComplete] = useState<boolean>();
-
-        useEffect(() => {
-            const getListing = async () => {
-                console.log("Checking ID")
-                if (!listingId) return;
-                console.log("Getting listing")
-
-                const listingData = listing || await firebaseQuery.getDocData(["placementListings", listingId]) as PlacementListing;
-                const address = (user.product === "providers" && orgContext) ? orgContext.addresses[listingData.addressId || ""] : await firebaseQuery.getDocData(["addresses", listingData.addressId as string]) as Address;
-                const workflow = (user.product === "providers" && orgContext) ? orgContext.applicantWorkflows[listingData.applicantWorkflowId || ""] as ApplicantWorkflow : await firebaseQuery.getDocData(["applicantWorkflows", listingData.applicantWorkflowId as string]) as ApplicantWorkflow;
-            
-                workflow.workflow = await Promise.all(workflow.workflow.map(async (s) => {
-                    const applicantFiles = s.files ? Object.fromEntries(await Promise.all(s.files?.map(async (fileId: string) => {
-                        const file = await firebaseQuery.getDocData(["files", fileId]);
-                        file.url = await getDownloadURL(ref(storage, `userFiles/${file.fileName}`));
-
-                        return [fileId, file];
-                    }))) : [];
-                    const applicantForms = s.forms ? Object.fromEntries(await Promise.all(s.forms?.map(async (formId: string) => {
-                        return [formId, await firebaseQuery.getDocData(["forms", formId])];
-                    }))) : [];
-
-                    return {...s, viewableFiles: applicantFiles, formDetails: applicantForms};
-                }));
-
-                delete address.id;
-                delete workflow.id;
-                console.log("Setting listing")
-                setFListing({...listingData, ...address, applicantWorkflow: workflow.workflow});
-
-                console.log("Getting provider", listingData?.providerId);
-                if ((fProvider?.id === application?.providerId) && user.product === "providers") {
-                    setFProvider({details: orgContext?.details, id: user.oId});
-                } else if (listingData?.providerId) {
-                    console.log("Getting provider from DB");
-                    const provider = await firebaseQuery.getDocData(["providers", listingData.providerId]) as ProviderData;
-                    console.log("Provider", provider);
-                    setFProvider({details: provider, id: listingData.providerId});
-                }
-            }
-
-            getListing();
-        }, [listingId, listing]);
-    
-        useEffect(() => {
-            if (student?.id !== application?.uid) {
-                if (user.userType === "Students") {
-                    setStudent(user);
-                } else if (user.product === "providers" && application?.uid) {
-                    firebaseQuery.getDocData(["users", application.uid]).then((s) => setStudent(s as UserData));
-                }
-            }
-        }, []);
-    
-        useEffect(() => {
-            setFListing(listing);
-        }, [listing]);
-    
-        useEffect(() => {
-            if (provider?.profile) return;
-            if (!provider?.id) return;
-    
-            getDownloadURL(ref(storage, `providers/${provider?.id}/profilePic.png`)).then(setProfileUrl).catch(() => null);
-        }, [provider]);
-    
-    
-        useEffect(() => {
-            console.log("APPLICATIONID", applicationId);
-            if (!applicationId) {
-                if (!listingId) return;
-                firebaseQuery.getDocsWhere("applications", [where("status", "not-in", ["approved", "declined"]), where("uid", "==", user.id), where("listingId", "==", listingId)]).then((existingApplication) => {
-                    console.log("EXISTING", existingApplication);
-                    // get uploaded files
-                    if (existingApplication && Object.keys(existingApplication).length) {
-                        setFApplication(Object.values(existingApplication)[0]);
-                        setFApplicationId(Object.keys(existingApplication)[0]);
-                    }
-                });
-                return;
-            }
-            if (applicationId) setFApplicationId(applicationId);
-        }, [application, applicationId]);
-
-        const getCurrentStage = async (stage: number): Promise<{
-            stage: ApplicantStage; completedSections: {
-                submitted?: string | undefined;
-                filesViewed?: string[] | undefined;
-                formsCompleted?: {
-                    [key: string]: unknown;
-                } | undefined;
-                filesUploaded?: {
-                    [key: number]: string[];
-                } | undefined;
-            };
-        }> => {
-            if (!fListing?.applicantWorkflowId) throw new Error("No workflow stage");
-
-            const mApplicantWorkflow = (await firebaseQuery.getDocData(["applicantWorkflows", fListing.applicantWorkflowId]) as ApplicantWorkflow);
-
-            const stageObj = mApplicantWorkflow?.workflow?.find((s) => s.id === stage);
-
-            if (!stageObj) throw new Error("Can't find stage.");
-
-            const applicantFiles = stageObj.files ? Object.fromEntries(await Promise.all(stageObj.files?.map(async (fileId) => {
-                const file = await firebaseQuery.getDocData(["files", fileId]);
-                file.url = await getDownloadURL(ref(storage, `userFiles/${file.fileName}`));
-
-                return [fileId, file];
-            }))) : [];
-            const applicantForms = stageObj.forms ? Object.fromEntries(await Promise.all(stageObj.forms?.map(async (formId) => {
-                return [formId, await firebaseQuery.getDocData(["forms", formId])];
-            }))) : [];
-
-            stageObj.viewableFiles = applicantFiles;
-            stageObj.formDetails = applicantForms;
-            
-            return {stage: stageObj, completedSections: fApplication?.completedSections?.[stage] || {}};
-        };
-    
-        useEffect(() => {
-            const getUploadedFiles = async () => {
-                if (!fApplication.completedSections) {
-                    setUploadedFiles({});
-                    return
-                };
-                
-                const fileIds = Object.values(fApplication.completedSections)
-                    .flatMap(stageData =>
-                    Object.values(stageData.filesUploaded || {}).flatMap(fileIds => fileIds)
-                    );
-                
-                const fileDataPromises = fileIds.map(async (fileId) => {
-                    const fileData = await firebaseQuery.getDocData(["files", fileId]) as FileItem;
-                    fileData.url = await getDownloadURL(ref(storage, `userFiles/${fileData.fileName}`));
-                
-                    return [fileId, fileData] as [string, FileItem]
-                });
-                
-                const fileDataArray = await Promise.all(fileDataPromises);
-                const fileDataObj = Object.fromEntries(fileDataArray)
-                setUploadedFiles(fileDataObj)
-            }
-
-            const addApplication = async () => {
-                console.log("ADDING APPLICATION");
-                if (!fListing?.id || !fProvider?.id || !student?.id) return;
-
-                const applicationData = {
-                    uid: student.id,
-                    listingId: fListing?.id,
-                    applicantWorkflowId: fListing?.applicantWorkflowId,
-                    providerId: fProvider.id,
-                    stage: 1,
-                    status: "draft",
-                    created: (new Date()).toISOString(),
-                    ...fApplication,
-                } as Partial<Application>;
-                const mApplicationId = (await firebaseQuery.add(["applications"], applicationData)).id;
-                console.log("APPLICATION ADDED");
-                setFApplicationId(mApplicationId);
-                setFApplication(applicationData);
-                setDraftSaved(true);
-                return;
-            };
-            getUploadedFiles();
-
-            console.log("Checking IDs");
-            console.log(fListing?.id, fProvider?.id, student?.id);
-            if (!fListing?.id || !fProvider?.id || !student?.id) return;
-            if (user.product === "providers") throw new Error("Providers cannot create applications");
-
-            console.log("Checking dates and sections");
-            if (!fApplication.completedSections && !fApplication.startDate && !fApplication.endDate) return;
-
-            console.log("Application updated");
-            if (!fApplicationId && !applicationId) {
-                // save new
-                console.log("Add application")
-                addApplication();
-                return;
-            }
-            // update
-            firebaseQuery.update(["applications", (fApplicationId || applicationId) as string], fApplication);
-            setDraftSaved(true);
-        }, [fApplication]);
-    
-        const openSuccessPopup = (type: "submitted"|"draftSaved"|"stageComplete"|"outcome") => {
-            setSuccessPopup(type);
-            setTimeout(() => {
-                // onClose();
-            }, 1500);
-        };
-
-        useEffect(() => {
-
-            const areStagesCompleted = async ():Promise<boolean|undefined> => {
-                if (!fListing) return;
-                if (fApplication.stage === undefined) return undefined;
-                const currentStage = await getCurrentStage(fApplication.stage);
-
-                console.log("Checking current stage is complete");
-                
-                for (const fileViewed of currentStage.stage?.files || []) {
-                    console.log("Checking file viewed", fileViewed, "in", currentStage?.completedSections?.filesViewed);
-                    if (!currentStage?.completedSections?.filesViewed?.includes(fileViewed)) {        
-                        console.log("File not viewed");
-                        return false;
-                    } else {
-                        console.log("File viewed");
-                    }
-                }
-                for (const formCompleted of currentStage?.stage?.forms || []) {
-                    console.log("Checking form completed", formCompleted, "in", currentStage?.completedSections?.formsCompleted);
-
-                    if (!Object.keys(currentStage?.completedSections?.formsCompleted || {}).includes(formCompleted)) {
-                        console.log("Form not completed");
-                        return false;
-                    } else {
-                        console.log("Form completed")
-                    }
-                }
-                for (let i = 0; i++; i < (currentStage?.stage?.requiredFiles || []).length) {
-                    if (!Object.keys(currentStage?.completedSections?.filesUploaded || {}).includes(i.toString())) {
-                        console.log("Form not uploaded");
-                        return false;
-                    } else {
-                    console.log("Form uploaded");
-                    }
-                }
-                
-                return true;
-            };
-
-            areStagesCompleted().then(setCurrentStageComplete);
-        }, [fApplication, fListing])
-
-        const viewFile = (file: string, onOpen: (url: string) => void) => {
-            if (fApplication.reqUserType !== user.userType) return;
-            if (fApplication.stage === undefined) throw new Error("Missing applciation stage.")
-
-            const viewableFiles = fListing?.applicantWorkflow?.find((stage) => stage.id === fApplication.stage)?.viewableFiles;
-
-            setFApplication((a) => {
-                const oldA = {...a};
-                const viewedFiles = a.completedSections?.[1]?.filesViewed || [];
-                if (viewedFiles?.includes(file)) return a;
-    
-                viewableFiles?.[file].url && onOpen(viewableFiles?.[file].url);
-                viewedFiles?.push(file);
-    
-                const newA = editNestedObject(["completedSections", 1, "filesViewed"], oldA, viewedFiles) as Partial<Application>;
-                return newA;
-            });
-        };
-
-        const addFile = (files: string[], fileId: number) => {
-            if (fApplication.reqUserType !== user.userType) throw new Error(`Incorrect user type. Expected ${fApplication.reqUserType}, got: ${user.userType}`);
-            if (fApplication.stage === undefined) throw new Error("Missing applciation stage.")
-
-            if (!files.length) throw new Error("No files to upload");
-            setFApplication((a) => editNestedObject(["completedSections", fApplication.stage as number, "filesUploaded", fileId], a, files) as Application);
-        };
-
-        const setFormComplete = (formId: string, e: {[key: string]: unknown}) => {
-            if (fApplication.reqUserType !== user.userType) throw new Error(`Incorrect user type. Expected ${fApplication.reqUserType}, got: ${user.userType}`);
-            if (fApplication.stage === undefined) throw new Error("Missing applciation stage.")
-            setFApplication((a) => editNestedObject(["completedSections", fApplication.stage as number, "formsCompleted", formId], a, e) as Application);
-        };
-    
-        const successText = {
-            submitted: {
-                title: "Application submitted",
-                desc: "We've sent your application to the placement provider. You will hear what the next steps are soon.",
-            },
-            draftSaved: {
-                title: "Draft saved",
-                desc: "Your draft has been saved. Go to the 'Applications' section from your home screen to edit.",
-            },
-            stageComplete: {
-                title: "Stage complete",
-                desc: "We have sent this to the next stage in the application process. We will update you with any progress.",
-            },
-            outcome: {
-                title: "Outcome submitted",
-                desc: "We have sent the student an email with the outcome of their application.",
-            },
-        };
-
-        const onFApply = async (draft?: boolean) => {
-            if (draft) {
-                openSuccessPopup("draftSaved")
-                return;
-            }
-    
-            // Check all items have been filled in.
-            if (!fApplication.startDate || !fApplication.endDate) throw new Error("Please select dates for your placement.");
-    
-            await executeCallable("applications-submit", {applicationId: fApplicationId});
-            openSuccessPopup("submitted")
-        };
-    
-        const progressStage = async (type: number|"accept"|"reject", e?: {feedback?: string}) => {
-            // Check all stages completed.
-            if (!currentStageComplete) throw new Error("Complete all forms before submitting.");
-            if (fApplication.reqUserType !== user.userType) throw new Error(`Incorrect user type. Expected ${fApplication.reqUserType}, got: ${user.userType}`);
-            if (fApplication.stage === undefined) throw new Error("Missing applciation stage.")
-
-            await executeCallable("applications-changeStage", {applicationId: fApplicationId, type: type, feedback: e?.feedback});
-        };
-    
-
-    return {successText, onFApply, progressStage, currentStageComplete, uploadedFiles, getCurrentStage, setFormComplete, viewFile, addFile, setSuccessPopup, openSuccessPopup, setFApplication, fApplication, draftSaved, profileUrl, successPopup, fApplicationId, fListing, student, fProvider}
-}
+//     return {successText, onFApply, progressStage, currentStageComplete, uploadedFiles, getCurrentStage, setFormComplete, viewFile, addFile, setSuccessPopup, openSuccessPopup, setFApplication, fApplication, draftSaved, profileUrl, successPopup, fApplicationId, fListing, student, fProvider}
+// }
 
 export function useProposePlacementRenderer({user, orgContext, placement}:
     {user:UserData, orgContext?: {details: InstituteData, userGroups: {[key:string]: UserGroupData}, forms: {[key:string]: unknown}, cohorts: {[key:string]: CohortData}},
@@ -1795,8 +1926,6 @@ export function useProposePlacementRenderer({user, orgContext, placement}:
     const [student, setStudent] = useState<UserData|undefined>((user && (user?.userType === "Students")) ? user : undefined);
     const [cohort, setCohort] = useState<CohortData>();
     const [complete, setComplete] = useState(false);
-
-
     const [stage, setStage] = useState<"provider"|"address"|"dates"|"review">("dates");
 
     const sections:Array<"dates"|"provider"|"address"|"review"> = ["dates", "provider", "address", "review"];
@@ -1847,11 +1976,9 @@ export function useProposePlacementRenderer({user, orgContext, placement}:
 
     const submitSection = (type:"dates"|"provider"|"address", data:{[key:string]:unknown}) => {
         setFormData((f) => {
-            const { id, ...values } = data
             return {
               ...f,
-              ...values,
-              id: (placement?.placementId || formData?.id) as string
+              ...data
             } as StudentPlacementData;
           });
         if (placement?.placementId && type === "dates") {
@@ -1865,16 +1992,33 @@ export function useProposePlacementRenderer({user, orgContext, placement}:
         setFormData(undefined);
     };
 
-    const proposePlacement = async (draft=false) => {
+    const proposePlacement = async (draft = false) => {
+        const getPlacementStatus = (startDate: Date, endDate: Date) => {
+            const today = new Date()
+             if (startDate <= today && endDate >= today) return { active: !draft ? true : false, inProgress: true, completed: false};
+             else if (endDate <= today) return { completed: true, inProgress: false, active: false};
+             return { completed: false, inProgress: true, active: false };
+        }
+        
         if (!formData || !student) {
             throw new Error("Cannot find placement details.");
         }
-        console.log("formData", formData);
-
-        if (formData.id && formData.uid && formData.id && draft === formData.draft) {
-            return await firebaseQuery.update(["placements", formData.id], formData);
+    
+        try {
+            console.log("formData", formData);
+            const status = getPlacementStatus(new Date(formData.startDate), new Date(formData.endDate));
+            const newFormData = {...formData, ...status}
+    
+            if (newFormData.id && newFormData.uid && draft === newFormData.draft) await firebaseQuery.update(["placements", newFormData.id], newFormData);
+            else await addPlacement(newFormData, student.id, draft)
+            setComplete(true);
+            return {status}
+                
+        } catch (error) {
+            console.log("Error:", error);
+            throw error;
         }
-
+/*
         console.log("STUDENTID", student.id);
 
         return await addPlacement(formData, student.id, draft).catch((e) => {
@@ -1885,9 +2029,9 @@ export function useProposePlacementRenderer({user, orgContext, placement}:
             setComplete(true);
             return e;
         });
-
-
+*/
     };
+    
 
     const deletePlacement = async (id:string) => {
         return await firebaseQuery.delete(["placements", id]);
@@ -1989,7 +2133,7 @@ export function useCreateCohortRenderer({oId, product, initialData=defaultCohort
 type UserUploadParams = {
     userType: "Staff"|"Students",
     user: UserData,
-    onComplete?: () => void,
+    onComplete?: (e: string) => void,
     cohortId?: string,
     userGroupId?: string, 
     shareNameWithReferralLeaderboardConsent?: string,
@@ -2004,9 +2148,6 @@ export function useUserUploadHandler({product, oId, userType, user, onComplete,
     const {execute} = useExecuteCallableJob({user: user});
 
     const requiredFields = ["forename", "surname", "email"];
-    if (userType === "Students") {
-        requiredFields.push("year");
-    }
 
     const checkData = (userData: {email?: string, parentEmail?: string, year?: number, [key:string]: unknown}[]) => {
         setAlert(undefined);
@@ -2061,11 +2202,6 @@ export function useUserUploadHandler({product, oId, userType, user, onComplete,
                 }
             }
             // Add more test cases
-
-            if (userType === "Students" && (!user.year || !((user.year | 0) > 0 && user.year % 1 === 0))) {
-                setAlert({msg: "'Year' must be a number, e.g. 10.", severity: "error"});
-                return false;
-            }
         }
 
         if (emptyRequiredCell) {
@@ -2111,10 +2247,10 @@ export function useUserUploadHandler({product, oId, userType, user, onComplete,
         setAlert(undefined);
         if (fUsers.length) {
             console.log("fUsers", fUsers);
-            execute("userManagement-addUsers", {product: product, oId: oId, users: fUsers, userType: userType, userGroupId: userGroupId, cohortId: cohortId});
+            const jobId = await execute("userManagement-addUsers", {product: product, oId: oId, users: fUsers, userType: userType, userGroupId: userGroupId, cohortId: cohortId});
+            onComplete && onComplete(jobId);
         }
         console.log("Complete", onComplete);
-        onComplete && onComplete();
         console.log("Finished");
     };
 
@@ -2831,41 +2967,42 @@ function useGenericWorkflowEditor({user, initialData, defaultData, onSubmit}: Ge
         onDeleteArrow, fWorkflowNodes, containerRef, setError, setArrows, setFWorkflowNodes}});
 }
 
-type InstitutePlacementListingUploadParams = {
+type InstituteProviderContactUploadParams = {
     user: UserData,
     onComplete?: () => void
 }
 
-export type InstitutePlacementListingUpload = {
-    provider: string;
-    jobTitle: string;
+export type InstituteProviderContactUpload = {
+    business: string;
+    forename?: string;
+    surname?: string;
     email: string;
     phone?: string;
-    addressOne: string;
-    addressTwo: string;
-    city: string;
-    postcode: string;
-    country: string;
+    addressOne?: string;
+    addressTwo?: string;
+    city?: string;
+    postcode?: string;
+    country?: string;
 };
 
-export function useInstitutePlacementListingHandler({user}: InstitutePlacementListingUploadParams) {
+export function useInstituteProviderContactsHandler({user}: InstituteProviderContactUploadParams) {
     const [emptyCellsWarning, setEmptyCellsWarning] = useState(false);
     const [alert, setAlert] = useState<{severity: "warning"|"error"|"success"|"info", msg: string}>();
 
-    const requiredFields = ["name", "jobTitle", "email", "addressOne", "city", "postCode", "country"];
+    const requiredFields = ["business", "forename", "email"];
     const {execute} = useExecuteCallableJob({user: user});
 
-    const checkData = (placements: InstitutePlacementListingUpload[]) => {
+    const checkData = (providerContacts: InstituteProviderContactUpload[]) => {
         setAlert(undefined);
 
-        placements = placements.filter((u) => Object.entries(u).some(([, v]) => v));
+        providerContacts = providerContacts.filter((u) => Object.entries(u).some(([, v]) => v));
 
-        if (!Object.entries(placements)) {
+        if (!Object.entries(providerContacts)) {
             return [];
         }
-        console.log("P", placements);
+        console.log("P", providerContacts);
 
-        if (placements.filter((u) => u.email).length < placements.length) {
+        if (providerContacts.filter((u) => u.email).length < providerContacts.length) {
             setAlert({msg: "Your data contains missing email addresses.", severity: "error"});
             return false;
         }
@@ -2873,18 +3010,18 @@ export function useInstitutePlacementListingHandler({user}: InstitutePlacementLi
         let emptyOptionalCell = false;
         let emptyRequiredCell = false;
 
-        for (const placement of placements ) {
-            if (!checkEmailValidity(placement)) {
+        for (const providerContact of providerContacts ) {
+            if (!checkEmailValidity(providerContact)) {
                 return false;
             }
 
-            if (Object.keys(placement).includes("")) {
+            if (Object.keys(providerContact).includes("")) {
                 setAlert({msg: "Data cannot be uploaded in unnamed columns.", severity: "error"});
                 return false;
             }
 
-            for (const field in placement) {
-                if (!placement[field]) {
+            for (const field in providerContact) {
+                if (!providerContact[field]) {
                     if (requiredFields.includes(field)) {
                         setAlert({msg: "All users must contain "+requiredFields.join(", "), severity: "error"});
                         emptyRequiredCell = true;
@@ -2905,44 +3042,30 @@ export function useInstitutePlacementListingHandler({user}: InstitutePlacementLi
         } else {
             setEmptyCellsWarning(false);
         }
-        return placements;
+        return providerContacts;
     };
 
-    const checkEmailValidity = (placement: InstitutePlacementListingUpload) => {
-        if (!validateEmail(placement.email as string)) {
-            setAlert({msg: `Error in email formatting: ${placement.email}. Amend errors and reupload.`, severity: "error"});
+    const checkEmailValidity = (providerContact: InstituteProviderContactUpload) => {
+        if (!validateEmail(providerContact.email as string)) {
+            setAlert({msg: `Error in email formatting: ${providerContact.email}. Amend errors and reupload.`, severity: "error"});
             return false;
         }
         return true;
     };
 
-    const uploadPlacements = async (placements: InstitutePlacementListingUpload[]) => {
-        let fPlacements:InstitutePlacementListingUpload[] = [];
-        console.log("PP", placements);
+    const uploadProviderContacts = async (providers: InstituteProviderContactUpload[], schoolId?: string) => {
+        let fProviders:InstituteProviderContactUpload[] = [];
+        console.log("PP", providers);
 
-        const cleanUpload = checkData(placements);
+        const cleanUpload = checkData(providers);
         if (!cleanUpload) {
             return false;
         }
-        fPlacements = cleanUpload;
+        fProviders = cleanUpload;
 
         setAlert(undefined);
-        if (fPlacements.length) {
-            const formattedPlacements = fPlacements.map((v) =>
-                ({
-                    name: v.provider,
-                    title: v.jobTitle,
-                    providerEmail: v.email,
-                    providerPhone: v.phone,
-                    ["address-line1"]: v.addressOne,
-                    ["address-line2"]: v.addressTwo,
-                    locality: v.city,
-                    postal_code: v.postcode,
-                    country: v.country,
-                }));
-            console.log("P", placements);
-            console.log("callable params", {placements: formattedPlacements, instituteId: user.product === "admin" ? "admin" : user.oId});
-            execute("placementListing-add", {data: formattedPlacements, instituteId: user.product === "admin" ? "admin" : user.oId});
+        if (fProviders.length) {
+            execute("providerContacts-add", {providerContacts: fProviders, instituteId: user.product === "admin" ? "admin" : user.oId, schoolId: schoolId});
         }
         return true;
     };
@@ -2952,7 +3075,7 @@ export function useInstitutePlacementListingHandler({user}: InstitutePlacementLi
         setEmptyCellsWarning(false);
     };
 
-    return ({...{uploadPlacements, alert, onChange}});
+    return ({...{uploadProviderContacts, alert, onChange}});
 }
 
 
@@ -2962,12 +3085,12 @@ export function useGetIndividualPlacementForPlacementPage({user, placementId, or
     const [workflow, setWorkflow] = useState<WorkflowStage[]>();
     const [cohort, setCohort] = useState<CohortData>();
     const [student, setStudent] = useState<UserData>();
-    const [wStage, setWStage] = useState<WorkflowStage>();
+    const [wStage, setWStage] = useState<WorkflowStage&{files: {[fileId: string]: {name: string, url: string}}}>();
     const [snackbar, setSnackbar] = useState<{ open: boolean; message?: string}>({open: false});
     const [disableEmail, setDisableEmail] = useState({parent: false, provider: false});
     const [rejectELIPopup, setRejectELIPopup] = useState(false);
     const [eliPopupOpen, setEliPopupOpen] = useState(false);
-    const [eliURL, setELIURL] = useState("");
+    const [eliData, setELIData] = useState<string>();
 
     const [rejectExternalDocPopup, setRejectExternalDocPopup] = useState<"riskAssessment"|"dbsCheck"|false>(false);
     const [externalDocPopupOpen, setExternalDocPopupOpen] = useState<"riskAssessment"|"dbsCheck"|false>(false);
@@ -2982,6 +3105,10 @@ export function useGetIndividualPlacementForPlacementPage({user, placementId, or
     const [uploadRA, setUploadRA] = useState(false);
     const [uploadDBS, setUploadDBS] = useState(false);
     const [onboardingPopup, setOnboardingPopup] = useState(false);
+    const [dismissOnboardingPopup, setDismissOnboardingPopup] = useState(false);
+    const [addOnboardingDocsPopup, setAddOnboardingDocsPopup] = useState(false);
+    const [shareStudentRequestPopup, setShareStudentRequestPopup] = useState(false);
+
     const [editable, setEditable] = useState(false);
 
     const [withdrawFromPlacementPopup, setWithdrawFromPlacementPopup] = useState(false);
@@ -3031,7 +3158,17 @@ export function useGetIndividualPlacementForPlacementPage({user, placementId, or
         if (user.userType === "Students") {
             setStudent(user);
         } else {
-            getUserById(placement.uid).then(setStudent);
+            if (placement.uid) {
+                getUserById(placement.uid, undefined, false).then(setStudent);
+            } else {
+                setStudent({
+                    details: {
+                        forename: placement.studentForename || "",
+                        surname: placement.studentSurname || "",
+                    },
+                    email: placement.studentEmail || ""
+                } as UserData)
+            }
         }
 
     }, [placement]);
@@ -3041,19 +3178,29 @@ export function useGetIndividualPlacementForPlacementPage({user, placementId, or
     useEffect(() => {
         if (!workflow || !placement) return;
 
-        const currentWorkflowStage = {...workflow.find((obj) => obj.id === placement.status) as WorkflowStage};
-        // console.log("currentWorkflowStage", currentWorkflowStage)
-        currentWorkflowStage.id = placement.status;
+        const getAdditionalStageData = async ():Promise<WorkflowStage&{files: {[fileId: string]: {name: string, url: string}}}> => {
 
-        // Get form data for current stage
-        if (currentWorkflowStage.forms) {
-            getFormsFromId(["forms"], currentWorkflowStage.forms).then((details) => {
-                currentWorkflowStage.formDetails = details as [{name:string}];
-                setWStage(currentWorkflowStage);
-            });
-        } else {
-            setWStage(currentWorkflowStage);
+            const currentWorkflowStage = {...workflow.find((obj) => obj.id === placement.status) as WorkflowStage&{files: {[fileId: string]: {name: string, url: string}}}};
+            // console.log("currentWorkflowStage", currentWorkflowStage)
+            currentWorkflowStage.id = placement.status;
+    
+            // Get form data for current stage
+            if (currentWorkflowStage.forms) {
+                getFormsFromId(["forms"], currentWorkflowStage.forms).then((details) => {
+                    currentWorkflowStage.formDetails = details as [{name:string}];
+                });
+            }
+            if (currentWorkflowStage.files) {
+                currentWorkflowStage.files = Object.fromEntries(await Promise.all(currentWorkflowStage.files.map(async (file) => {
+                    const fileItem = await firebaseQuery.getDocData(["files", file]) as FileItem;
+                    const url = await getDownloadURL(ref(storage, `institutes/${placement.oId}/${fileItem.fileName}`))
+                    return [file, {name: fileItem.name, url: url}];
+                })));
+            }
+            return currentWorkflowStage;
         }
+
+        getAdditionalStageData().then(setWStage);
     }, [placement, workflow]);
 
 
@@ -3097,15 +3244,14 @@ export function useGetIndividualPlacementForPlacementPage({user, placementId, or
     };
 
 
-    const onboardingStatus:"Add onboarding documents"|"Onboarding sent"|"Onboarding docs completed"|"Onboarding docs approved"|"Complete onboarding" = placement?.onboarding ? placement.onboarding.completed?.submitted ? placement.onboarding.completed.accepted ? "Onboarding docs approved" : "Onboarding docs completed" : (user.userType === "Staff" ? "Onboarding sent" : "Complete onboarding") : "Add onboarding documents";
+    const onboardingStatus:"Add onboarding documents"|"Onboarding sent"|"Onboarding docs completed"|"Onboarding docs approved"|"Complete onboarding" =
+        placement?.onboarding ? placement.onboarding.completed?.submitted ? placement.onboarding.completed.accepted ? "Onboarding docs approved" : "Onboarding docs completed" : (user.userType === "Staff" ? "Onboarding sent" : "Complete onboarding") : "Add onboarding documents";
 
     const signOffPlacements = getAccess(user, "signOffPlacements");
 
     let canEdit = false;
 
-    if ((wStage?.userType === "Staff" && user.product === "providers") && user.userGroup === "admin") {
-        canEdit = true;
-    } else if ((wStage?.userType === "Staff" && user.userType === "Staff" && user.product === "institutes") || (user.product === "providers" && wStage?.userType === "Provider") || user.userType === "Students" && wStage?.userType === "Students") {
+    if ((wStage?.userType === "Staff" && user.userType === "Staff" && user.product === "institutes") || (user.product === "providers" && wStage?.userType === "Provider") || user.userType === "Students" && wStage?.userType === "Students") {
         console.log("ALMOST CAN EDIT");
         if (user.userType === "Staff" && !signOffPlacements) {
             canEdit = false;
@@ -3116,16 +3262,19 @@ export function useGetIndividualPlacementForPlacementPage({user, placementId, or
 
 
 
-    const onFlagClick = async (e:FlagCodes) => {
+    const onFlagClick = async (e:FlagCodes, onClose?: boolean) => {
         if (!placement) return;
         if (e === "completeOnboarding" || e === "reviewOnboarding") {
             setOnboardingPopup(true);
         }
+        if (e === "studentNotAccepted") {
+            setShareStudentRequestPopup(true);
+        }
         if (e === "noInsurance") {
-            if (!eliURL) {
+            if (!eliData) {
                 const storageRef = ref(storage, `insurance/${placement.providerId}.pdf`);
-                const file = await getDownloadURL(storageRef);
-                setELIURL(file);
+                const file = await getDownloadURL(storageRef).catch(() => placement.insuranceSkippedReason);
+                setELIData(file);
             }
             setEliPopupOpen(true);
         }
@@ -3146,19 +3295,26 @@ export function useGetIndividualPlacementForPlacementPage({user, placementId, or
             }
             setExternalDocPopupOpen("dbsCheck");
         }
+        if (e === "addOnboarding") {
+            if (onClose) {
+                setDismissOnboardingPopup(true);
+            } else {
+                setAddOnboardingDocsPopup(true);
+            }
+        }
     };
 
     const approveELI = async () => {
         if (!placement) return;
-        await executeCallable("insurance-approve", {oId: user.oId, providerId: placement.providerId});
+        await executeCallable("insurance-approve", {oId: user.oId, providerContactId: placement.providerContactId});
         setEliPopupOpen(false);
     };
 
     const rejectELI = async ({reason}:{reason: string}) => {
         if (!placement || !institute) return;
 
-        console.log("Reject", {reason: reason, placement: placement, instituteName: institute.name, staffEmail: user.email});
-        await executeCallable("insurance-reject", {reason: reason, placementId: placementId, instituteName: institute.name, staffEmail: user.email});
+        console.log("Reject", {reason: reason, placement: placement, instituteName: institute.name});
+        await executeCallable("insurance-reject", {reason: reason, placementId: placementId, instituteName: institute.name});
         setRejectELIPopup(false);
         setEliPopupOpen(false);
     };
@@ -3179,15 +3335,17 @@ export function useGetIndividualPlacementForPlacementPage({user, placementId, or
     const manuallyConfigureProvider = async () => {
         if (!placement) return;
         if (!placement.providerId) {
-            const res = await executeCallable("placement-uploadProviderDetails", {
-                pId: placementId,
-                placement: Object.fromEntries(Object.entries(placement).filter(([k]) => k !== "contactId")),
-                stage: wStage,
+            const res = await executeCallable("providerContacts-uploadProviderDetails", {
+                placement: {
+                    id: placementId,
+                    data: Object.fromEntries(Object.entries(placement).filter(([k]) => k !== "contactId")),
+                    stage: wStage,
+                },
                 skipSearch: true}).catch((e) => {
                 throw e;
             });
             console.log("RETURN", res.data);
-            setPlacement((p) => ({...p, ...res.data}));
+            setPlacement((p) => ({...p, ...res.data as any}));
             if (uploadProviderDocPopup === "insurance") {
                 setUploadProviderDocPopup(undefined);
                 setUploadInsurance(true);
@@ -3206,26 +3364,28 @@ export function useGetIndividualPlacementForPlacementPage({user, placementId, or
         await executeCallable("placement-withdraw", {placementId: placementId});
     }
 
-    return {placement, wStage, student, workflow, editable, withdrawFromPlacementPopup, setWithdrawFromPlacementPopup, withdrawFromPlacement, onFlagClick, setUploadInsurance, setUploadProviderDocPopup, setUploadRA, setUploadDBS, onboardingStatus, setSkipStagePopup, onboardingPopup, setViewExternalLinkPopup, setOnboardingPopup, setRejectELIPopup, eliURL, riskAssessmentURL, dbsCheckURL, setExternalLinkCopied, skipStagePopup, snackbar, setSnackbar, cohort, disableEmail, rejectELIPopup, eliPopupOpen, rejectExternalDocPopup, externalDocPopupOpen, viewExternalLinkPopup, externalLinkCopied, uploadInsurance, uploadRA, uploadDBS, editStage, sendEmail, canEdit, approveELI, setEliPopupOpen, uploadProviderDocPopup, rejectELI, setRejectExternalDocPopup, setExternalDocPopupOpen, approveProviderDoc, rejectProviderDoc, manuallyConfigureProvider, institute}
+    return {placement, wStage, student, workflow, editable, withdrawFromPlacementPopup, addOnboardingDocsPopup, setAddOnboardingDocsPopup, dismissOnboardingPopup, setDismissOnboardingPopup, setWithdrawFromPlacementPopup, withdrawFromPlacement, onFlagClick, setUploadInsurance, setUploadProviderDocPopup, setUploadRA, setUploadDBS, onboardingStatus, setSkipStagePopup, onboardingPopup, setViewExternalLinkPopup, setOnboardingPopup, setRejectELIPopup, eliData, riskAssessmentURL, dbsCheckURL, setExternalLinkCopied, skipStagePopup, snackbar, setSnackbar, cohort, disableEmail, rejectELIPopup, eliPopupOpen, rejectExternalDocPopup, externalDocPopupOpen, viewExternalLinkPopup, externalLinkCopied, uploadInsurance, uploadRA, uploadDBS, editStage, sendEmail, canEdit, approveELI, setEliPopupOpen, uploadProviderDocPopup, rejectELI, setRejectExternalDocPopup, setExternalDocPopupOpen, approveProviderDoc, rejectProviderDoc, manuallyConfigureProvider, institute, shareStudentRequestPopup, setShareStudentRequestPopup}
 }
 
-export function useOnboardingPopup({onboarding, placementId, user, onClose}:{onboarding: (
+export function useOnboardingPopup({onboarding, providerId, placementId, user, onClose}:{onboarding: (
     OnboardingDocs&{
         completed: {
-            submitted: string|false,
+            submitted: boolean,
+            submittedDate?: string,
             accepted?: boolean,
             filesViewed?: string[],
             formsCompleted?: {[key: string]: unknown},
             filesUploaded?: {[key: number]: string[]},
         }}
-), placementId: string, user: UserData, onClose: () => void}) {
+), placementId: string, user: UserData, providerId: string, onClose: () => void}) {
 
     const [fileUploadPopup, setFileUploadPopup] = useState<false|number>(false);
     const [form, setForm] = useState<{id: string, name: string, [key:string]: unknown}>();
     const [rejectPopup, setRejectPopup] = useState(false);
     const [mOnboarding, setMOnboarding] = useState(onboarding);
     const [completedSections, setCompletedSections] = useState<{
-        submitted: string | false;
+        submitted: boolean,
+        submittedDate?: string,
         filesViewed?: string[] | undefined;
         formsCompleted?: {
             [key: string]: unknown;
@@ -3234,7 +3394,19 @@ export function useOnboardingPopup({onboarding, placementId, user, onClose}:{onb
             [key: number]: string[];
         } | undefined;
     }>();
+
     const [uploadedFiles, setUploadedFiles] = useState<{[key: string]: FileItem}>({});
+    const [viewableFiles, setViewableFiles] = useState<{[key: string]: FileItem}>();
+    const [formDetails, setFormDetails] = useState<{
+        [key: string]: {
+            name: string;
+            id: string;
+            description?: string;
+            product: Products;
+            oId: string;
+            form: CustomFormSchema;
+        };
+    }>({});
 
     const firebaseQuery = new FirebaseQuery();
 
@@ -3252,7 +3424,7 @@ export function useOnboardingPopup({onboarding, placementId, user, onClose}:{onb
             const viewedFiles = a.completed ? a.completed?.filesViewed || [] : [];
             if (viewedFiles?.includes(file)) return a;
 
-            a?.viewableFiles?.[file].url && onOpen(a?.viewableFiles?.[file].url);
+            viewableFiles?.[file].url && onOpen(viewableFiles?.[file].url);
             viewedFiles?.push(file);
 
             const newA = editNestedObject(["completed", "filesViewed"], oldA, viewedFiles) as any;
@@ -3275,7 +3447,7 @@ export function useOnboardingPopup({onboarding, placementId, user, onClose}:{onb
 
             const onboardingFiles = onboarding.files ? Object.fromEntries(await Promise.all(onboarding.files?.map(async (fileId) => {
                 const file = await firebaseQuery.getDocData(["files", fileId]);
-                file.url = await getDownloadURL(ref(storage, `userFiles/${file.fileName}`));
+                file.url = await getDownloadURL(ref(storage, `providers/${providerId}/${file.fileName}`));
 
                 return [fileId, file];
             }))) : [];
@@ -3283,8 +3455,8 @@ export function useOnboardingPopup({onboarding, placementId, user, onClose}:{onb
                 return [formId, await firebaseQuery.getDocData(["forms", formId])];
             }))) : [];
 
-            onboardingNew.viewableFiles = onboardingFiles;
-            onboardingNew.formDetails = onboardingForms;
+            setViewableFiles(onboardingFiles);
+            setFormDetails(onboardingForms);
             return onboardingNew;
         };
         getOnboardingData().then(setMOnboarding);
@@ -3346,7 +3518,8 @@ export function useOnboardingPopup({onboarding, placementId, user, onClose}:{onb
         // Check all stages completed.
         if (!placementId) return;
         if (!stagesCompleted()) throw new Error("Complete all forms before submitting.");
-        await firebaseQuery.update(["placements", placementId], {["onboarding.completed.submitted"]: convertDate(new Date(), "dbstring") as string});
+        await firebaseQuery.update(["placements", placementId], {["onboarding.completed.accepted"]: false, ["onboarding.completed.submitted"]: true, ["onboarding.completed.submittedDate"]: convertDate(new Date(), "dbstring") as string});
+        //executeCallable("sendOnboardingSubmittedEmail", {});
     };
 
     useEffect(() => {
@@ -3391,5 +3564,701 @@ export function useOnboardingPopup({onboarding, placementId, user, onClose}:{onb
         addCompletedSectionURLs();
     }, [mOnboarding]);
 
-    return {addFile, viewFile, uploadedFiles, setFormComplete, setRejectPopup, stagesCompleted, setForm, mOnboarding, form, submit, acceptOnboarding, rejectOnboarding, rejectPopup, completedSections, fileUploadPopup, setFileUploadPopup};
-}
+    return {addFile, viewFile, uploadedFiles, setFormComplete, setRejectPopup, stagesCompleted, setForm, mOnboarding, form, submit, acceptOnboarding, rejectOnboarding, rejectPopup, completedSections, fileUploadPopup, setFileUploadPopup, viewableFiles, formDetails};
+}
+
+
+
+
+
+export function useLoadAddresses(user: UserData, limitItems?: number, queryConstraint?: QueryConstraint[], request?: boolean) {
+    const [addresses, setAddresses] = useState<{[key: string]: OrganisationAddress&{listings: number}}>({});
+    const [lastDoc, setLastDoc] = useState<QueryDocumentSnapshot|null>(null);
+    const [loading, setLoading] = useState<boolean>(false);
+
+    const firebaseQuery = new FirebaseQuery();
+
+    const [queryConstraints, setQueryConstraints] = useState<QueryConstraint[]>(queryConstraint || []);
+
+    const changeQueryConstraints = (e: QueryConstraint[]) => {
+        setQueryConstraints([...(queryConstraint || []), ...e]);
+    };
+    
+    const loadAddresses = () => {
+        const constraints:QueryConstraint[] = [where("oId", "==", user.oId), where("product", "==", user.product), orderBy(documentId())]
+
+        if (limitItems) {
+            constraints.push(limit(limitItems));
+        }
+
+        if (user.viewAddresses === "all" || user.userGroup === "admin" || request) {
+            if (lastDoc?.id) {
+                constraints.push(startAfter(lastDoc?.id));
+            }
+        } else if (user.viewAddresses === "request") {
+            if (!user.visibleAddresses?.length) return;
+
+            constraints.push(where(documentId(), "in", user.visibleAddresses))
+            if (lastDoc?.id) {
+                constraints.push(startAfter(lastDoc?.id));
+            }
+        } else {
+            setLoading(false);
+            return;  // viewAddresses === "none", no need to load anything
+        }
+        queryConstraints && constraints.unshift(...queryConstraints);
+
+        return firebaseQuery.collectionSnapshot((async (snapshot: QuerySnapshot<DocumentData>) => {
+            const deletedAddresses = snapshot.docChanges().map((change) => {
+                if (change.type === "removed") {
+                    return change.doc.id;
+                }
+                return;
+            })
+
+            setAddresses((prev) => Object.fromEntries(Object.entries(prev).filter(([k]) => !deletedAddresses.includes(k))))
+
+            if (!snapshot.empty) {
+
+
+                const newAddresses:[string, OrganisationAddress][] = snapshot.docs.map(doc => ([doc.id, {id: doc.id, ...doc.data() as OrganisationAddress}]));
+
+                const withListings:{[key: string]: OrganisationAddress&{listings: number}} = Object.fromEntries(await Promise.all(newAddresses.map(async ([k, address]) => {
+                    const listings = await firebaseQuery.getCount("placementListings", [where("providerId", "==", user.oId), where("addressId", "==", k)]);
+                    return [k, {...address, listings: listings}];
+                })));
+                
+                setAddresses(prev => ({...prev, ...withListings}));
+                setLastDoc(snapshot.docs[snapshot.docs.length - 1]);
+            }
+            setLoading(false);
+        }), "addresses", constraints, undefined, true);
+    };
+
+    useEffect(() => {
+        const unsubscribe = loadAddresses();
+
+        return () => {
+            if (unsubscribe) {
+                unsubscribe();  // Unsubscribe from the snapshot listener when the component unmounts
+            }
+        };
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [queryConstraints]);
+
+    const onScrollBottom = () => {
+        if (!limitItems) return;
+        if (!loading) {
+            setLoading(true);
+            loadAddresses();
+        }
+    };
+
+    return { addresses, onScrollBottom, loading, changeQueryConstraints };
+}
+
+
+
+
+export function useLoadListings(user: UserData, queryConstraint?: QueryConstraint[], request?: boolean) {
+    const [listings, setListings] = useState<[string, PlacementListing&{applicants?: number, scheduled?: number, active?: number}][]>([]);
+    const [lastDoc, setLastDoc] = useState<QueryDocumentSnapshot|null>(null);
+    const [loading, setLoading] = useState<boolean>(false);
+
+    const firebaseQuery = new FirebaseQuery();
+    
+    const [queryConstraints, setQueryConstraints] = useState<QueryConstraint[]>(queryConstraint || []);
+
+    const changeQueryConstraints = (e: QueryConstraint[]) => {
+        setQueryConstraints([...(queryConstraint || []), ...e]);
+    };
+
+    const loadListings = () => {
+        const constraints:QueryConstraint[] = [where("providerId", "==", user.oId), limit(10), orderBy(documentId())]
+        
+        if (user.viewPlacementListings === "all" || user.userGroup === "admin" || request) {
+            if (lastDoc?.id) {
+                constraints.push(startAfter(lastDoc));
+            }
+        } else {
+            if (!user.visibleListings?.length) return;
+            constraints.push(where(documentId(), 'in', user.visibleListings));
+            if (lastDoc?.id) {
+                constraints.push(startAfter(lastDoc));
+            }
+        }
+
+        if (user.viewAddresses !== "all" && user.viewPlacementListings === "all" && user.userGroup !== "admin") {
+            if (!user.visibleAddresses?.length) return;
+
+            constraints.push(where('addressId', 'in', user.visibleAddresses));
+        }
+        queryConstraints && constraints.unshift(...queryConstraints);
+
+        return firebaseQuery.collectionSnapshot((async (snapshot: QuerySnapshot<DocumentData>) => {
+            const deletedListings = snapshot.docChanges().map((change) => {
+                if (change.type === "removed") {
+                    return change.doc.id;
+                }
+                return;
+            })
+
+            setListings((prev) => prev.filter(([k]) => !deletedListings.includes(k)))
+
+            if (!snapshot.empty) {
+                const newListings:[string, PlacementListing][] = snapshot.docs.map(doc => ([doc.id, {...doc.data() as PlacementListing, id: doc.id}]));
+
+                const listingsWithAdditionalData:[string, PlacementListing&{applicants?: number, scheduled?: number, active?: number}][] = await Promise.all(newListings.map(async ([id, listing]) => {
+                    const listingWithAdditionalData = {...listing} as PlacementListing&{applicants?: number, scheduled?: number, active?: number};
+    
+                    if (listingWithAdditionalData.applicants !== undefined) return [id, listingWithAdditionalData];
+    
+                    listingWithAdditionalData.applicants = await firebaseQuery.getCount("applications", [where("providerId", "==", user.oId), where("placementId", "==", id), where("status", "==", "submitted")]);
+                    listingWithAdditionalData.scheduled = await firebaseQuery.getCount("placements", [where("providerId", "==", user.oId), where("placementId", "==", id), where("inProgress", "==", true), where("startDate", ">", convertDate(new Date(), "dbstring"))]);
+                    listingWithAdditionalData.active = await firebaseQuery.getCount("placements", [where("providerId", "==", user.oId), where("placementId", "==", id), where("active", "==", true)]);
+    
+                    return [id, listingWithAdditionalData];
+                }));
+                setListings(prev => (Object.entries({...Object.fromEntries(prev), ...Object.fromEntries(listingsWithAdditionalData)})));
+                setLastDoc(snapshot.docs[snapshot.docs.length - 1]);
+            }
+            setLoading(false);
+        }), "placementListings", constraints, undefined, true);
+    };
+
+    useEffect(() => {
+
+        loadListings();
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [queryConstraints]);
+
+    const onScrollBottom = () => {
+        if (!loading) {
+            setLoading(true);
+            loadListings();
+        }
+    };
+
+    return { listings, onScrollBottom, loading, changeQueryConstraints };
+}
+
+
+
+export function useLoadProviderPlacements(user: UserData, queryConstraint?: QueryConstraint[], placementId?: string) {
+    const [placements, setPlacements] = useState<[string, StudentPlacementData&{applicants?: number, scheduled?: number, active?: number}][]>([]);
+    const [lastDoc, setLastDoc] = useState<QueryDocumentSnapshot|null>(null);
+    const [loading, setLoading] = useState<boolean>(false);
+
+    const firebaseQuery = new FirebaseQuery();
+    
+    const [queryConstraints, setQueryConstraints] = useState<QueryConstraint[]>(queryConstraint || []);
+
+    if (user.product !== "providers") throw new Error("Only providers can use this hook.");
+
+    const changeQueryConstraints = (e: QueryConstraint[]) => {
+        setQueryConstraints([...(queryConstraint || []), ...e]);
+    };
+
+    const loadListings = () => {
+        const constraints:QueryConstraint[] = [where("providerId", "==", user.oId), limit(10), orderBy(documentId())]
+
+        if (placementId) {
+            constraints.push(where("placementId", "==", placementId));
+        }
+        
+        if (user.viewPlacementListings === "all" || user.userGroup === "admin") {
+            if (lastDoc?.id) {
+                constraints.push(startAfter(lastDoc));
+            }
+        } else {
+            if (!user.visibleListings?.length) return;
+            constraints.push(where("placementId", 'in', user.visibleListings));
+            if (lastDoc?.id) {
+                constraints.push(startAfter(lastDoc));
+            }
+        }
+
+        if (user.viewAddresses !== "all" && user.viewPlacementListings === "all" && user.userGroup !== "admin") {
+            if (!user.visibleAddresses?.length) return;
+
+            constraints.push(where('addressId', 'in', user.visibleAddresses));
+        }
+        queryConstraints && constraints.unshift(...queryConstraints);
+
+        return firebaseQuery.collectionSnapshot((async (snapshot: QuerySnapshot<DocumentData>) => {
+            const deletedListings = snapshot.docChanges().map((change) => {
+                if (change.type === "removed") {
+                    return change.doc.id;
+                }
+                return;
+            })
+
+            setPlacements((prev) => prev.filter(([k]) => !deletedListings.includes(k)))
+
+            if (!snapshot.empty) {
+                const newPlacements:[string, StudentPlacementData][] = snapshot.docs.map(doc => ([doc.id, {...doc.data() as StudentPlacementData, id: doc.id}]));
+
+                const withAdditionalData = await Promise.all(newPlacements.map(async ([id, placement]) => {
+                    const student = placement.uid ? await firebaseQuery.getDocData(["users", placement.uid || ""]).catch(() => false) as UserData|false :
+                    {
+                        details: {
+                            forename: placement.studentForename,
+                            surname: placement.studentSurname,
+                        },
+                        email: placement.studentEmail
+                    };
+                    const listing = await firebaseQuery.getDocData(["placementListings", placement.placementId || ""]).catch(() => false) as PlacementListing;
+    
+                    return [id, {...placement, student: student, listing: listing}];
+                }));
+                setPlacements(prev => (Object.entries({...Object.fromEntries(prev), ...Object.fromEntries(withAdditionalData)})));
+                setLastDoc(snapshot.docs[snapshot.docs.length - 1]);
+            }
+            setLoading(false);
+        }), "placements", constraints, undefined, true);
+    };
+
+    useEffect(() => {
+        loadListings();
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [queryConstraints]);
+
+    const onScrollBottom = () => {
+        if (!loading) {
+            setLoading(true);
+            loadListings();
+        }
+    };
+
+    return { placements: Object.fromEntries(placements), onScrollBottom, loading, changeQueryConstraints };
+}
+
+
+
+export function useLoadApplications({user, applicationType, listingId, queryConstraint}:{user: UserData, applicationType?: "all"|"actionRequired"|"awaitingStudent"|"closed", listingId?: string, queryConstraint?: QueryConstraint[]}) {
+    const [applications, setApplications] = useState<[string, Application][]>([]);
+    const [lastDoc, setLastDoc] = useState<QueryDocumentSnapshot|null>(null);
+    const [loading, setLoading] = useState<boolean>(false);
+    const [type, setType] = useState<"actionRequired"|"awaitingStudent"|"closed"|"all">(applicationType || "all");
+
+    const firebaseQuery = new FirebaseQuery();
+
+    const [queryConstraints, setQueryConstraints] = useState<QueryConstraint[]>(queryConstraint || []);
+
+    const changeQueryConstraints = (e: QueryConstraint[]) => {
+        setQueryConstraints([...(queryConstraint || []), ...e]);
+    };
+
+    const loadApplications = () => {
+        const constraints:QueryConstraint[] = [where("providerId", "==", user.oId), limit(10), orderBy(documentId())]
+        
+ 
+        if (lastDoc?.id) {
+            constraints.push(startAfter(lastDoc));
+        }
+        
+        switch (type) {
+            case "actionRequired":
+                constraints.push(where("status", "==", "submitted"), where("reqUserType", "==", "Staff"));
+                break;
+            case "awaitingStudent":
+                constraints.push(where("status", "==", "submitted"), where("reqUserType", "==", "Students"));
+                break;
+            case "closed":
+                constraints.push(where("status", "in", ["approved", "declined"]));
+                break;
+            default:
+                constraints.push(where("status", "==", "submitted"));
+            }
+            if (listingId) {
+                constraints.push(where("listingId", "==", listingId));
+            }
+        
+        console.log("Constraints before user group check", constraints);
+        if (user.viewAddresses !== "all" && user.userGroup !== "admin") {
+            if (user.viewPlacementListings === "all") {
+                if (!user.visibleAddresses?.length) return;
+                constraints.push(where('addressId', 'in', user.visibleAddresses));
+            } else {
+                if (!user.visibleListings?.length) return;
+                constraints.push(where('placementId', 'in', user.visibleListings));
+            }
+        }
+
+        queryConstraints && constraints.unshift(...queryConstraints);
+        console.log("Constraints after user group check", constraints);
+
+        return firebaseQuery.collectionSnapshot((async (snapshot: QuerySnapshot<DocumentData>) => {
+            const deletedApplications = snapshot.docChanges().map((change) => {
+                if (change.type === "removed") {
+                    return change.doc.id;
+                }
+                return;
+            })
+
+            console.log("applicantCount", snapshot.size);
+
+            setApplications((prev) => prev.filter(([k]) => !deletedApplications.includes(k)))
+
+            if (!snapshot.empty) {
+                const newApplications:[string, Application][] = snapshot.docs.map(doc => ([doc.id, {id: doc.id, ...doc.data() as Application}])).filter(([, v]) => (v as Application).status !== "draft") as [string, Application][];
+
+                setApplications(prev => ([...prev, ...newApplications]));
+                setLastDoc(snapshot.docs[snapshot.docs.length - 1]);
+            } else {
+                setApplications([]);
+                setLastDoc(null);
+            }
+            setLoading(false);
+        }), "applications", constraints, undefined, true);
+    };
+
+    useEffect(() => {
+        loadApplications();
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [type, queryConstraints]);
+
+    const onScrollBottom = () => {
+        if (!loading) {
+            setLoading(true);
+            loadApplications();
+        }
+    };
+
+    return { applications, type, setType, onScrollBottom, loading, changeQueryConstraints };
+}
+
+
+
+export type FilterObject = {
+    [key: string]: {
+        label: string,
+        value?: unknown,
+        values?: {[key:string|number]: string|{label: string, test: QueryFieldFilterConstraint}},
+        type: "dropdown"|"string"|"number"
+    }
+}
+
+export type DataViewerPaginater = {
+    view: "list"|"table";
+    queryLimit?: number;
+    formatItems?: (key: string, item: any) => Promise<{ key: string, item: any }> | { key: string, item: any };
+    snapshot?: boolean;
+    filters?: FilterObject;
+    onSearch?: boolean | ((search?: string, sort?: [string, {value: string, direction: "asc"|"desc"}], page?: number, filters?:FilterObject, limit?: number) => Promise<{ [key: string]: any }>);
+    data?: {[key:string]:{[key:string]: unknown}}|QueryObject[];
+    additionalEntryProcessing?: (k: string, v: any) => Promise<any> | any,
+    sorts?: Sorts
+}
+
+export function useDataViewerPaginator({view: initialView, sorts, queryLimit=10, additionalEntryProcessing, formatItems, snapshot, filters: initialFilters, onSearch, data}:DataViewerPaginater) {
+    const [tableData, setTableData] = useState<{[key:string]:{[key:string]: unknown}}>(Array.isArray(data) ? Object.fromEntries(Object.entries(data).slice(0, queryLimit)) : {});
+    const [page, setPage] = useState([1, 0]);
+    const [view, setView] = useState(initialView);
+    const [filters, setFilters] = useState<FilterObject|undefined>(initialFilters);
+    const [queryAnchor, setQueryAnchor] = useState<{startKey: string, endKey: string, startQueryPos: number, endQueryPos: number}>({startKey: "", endKey: "", startQueryPos: 0, endQueryPos: 0});
+    const [prevEntryIds, setPrevEntryIds] = useState<{[key:string]:number}>({});
+    const [dataListenerUnsubscribe, setDataListenerUnsubscribe] = useState<{[key: string] : Unsubscribe}>();
+    const [loading, setLoading] = useState<boolean|"loaded">(true);
+    const [searchString, setSearchString] = useState<string>();
+    const [sort, setSort] = useState<[string, {value: string, direction: "asc"|"desc"}]>();
+
+
+
+    const processedData = async (k: string, v: any) => additionalEntryProcessing ? await additionalEntryProcessing(k, v) : v;
+
+    const setTableDataFromDefinedData = async () => {
+        if (!data || Array.isArray(data)) return;
+
+        const dataWithAdditionalProcessingPossibleNulls: [string, any][] = (await Promise.all(Object.entries(data).map(async ([k, v]) => [k, await processedData(k, v)])))
+        const dataWithAdditionalProcessing = dataWithAdditionalProcessingPossibleNulls.filter(([k, v]) => v);
+
+        const searchedData: [string, any][] = searchString ? dataWithAdditionalProcessing.filter(([, v]) => {
+            const values = Object.values(v).join(", ");
+            console.log("VALUESTRING", v);
+            return values.includes(searchString);
+        }) : dataWithAdditionalProcessing;
+
+        const filteredData:[string, any][] = filters && Object.keys(filters).length > 0 ? searchedData.filter(([, dataValue]) => Object.entries(filters).every(([filterKey, filterValue]) => {
+            const value = dataValue[filterKey];
+            if ((typeof value === "number") && value === parseInt(filterValue.value as string)) return true;
+            if ((typeof value === "boolean") && value === (filterValue.value === "true")) return true;
+            if ((typeof value === "boolean") && value === (filterValue.value === "false")) return true;
+
+            if ((typeof value === "string" || Array.isArray(value)) && value.includes(filterValue.value as string)) return true;
+            return false;
+        })) : searchedData;
+        if (view === "table") {
+            if (!queryLimit) throw new Error("Tables must have a limit defined.");
+            const newData:[string, any][] = filteredData.slice((page[0] - 1)*queryLimit, page[0]*queryLimit);
+            setTableData(Object.fromEntries(newData));
+            if (Object.keys(Object.fromEntries(newData)).pop() === Object.keys(data).pop()) {
+                setLoading("loaded");
+            } else {
+                setLoading(false);
+            }
+            return;
+        }
+        if (view === "list") {
+            setTableData(Object.fromEntries(filteredData));
+            setLoading("loaded");
+        }
+    };
+
+    const getDataFromQuery = async (
+        itemList: {[key: string]: any} = {}, currentQueryAnchor=queryAnchor, cursorDirection?:"increase"|"decrease"|undefined, prevEntries=prevEntryIds, loadMoreFromQuery=false):Promise<any> => {
+        
+        // if (!filters) return;
+        setLoading(true);
+        if (!Array.isArray(data)) {
+            setTableDataFromDefinedData();
+            return;
+        }
+        if (!queryLimit) throw new Error("Firestore queries must have a limit defined.");
+
+        if (onSearch && (searchString || sort)) {
+            if (typeof onSearch === "boolean") throw new Error("When using Firestore queries, an onSearch function should be passed to retrieve data externally. Additional processing is however completed in this hook.");
+            const data = await onSearch(searchString, sort, page[0], filters, queryLimit);
+            const dataWithAdditionalProcessing: [string, any][] = await Promise.all(Object.entries(data).map(async ([k, v]) => [k, await processedData(k, v)]));
+
+            setTableData((old) => {
+                if (view === "table") {
+                    return {...Object.fromEntries(dataWithAdditionalProcessing)};
+                }
+                return {...old, ...Object.fromEntries(dataWithAdditionalProcessing)};
+            });
+
+            if (dataWithAdditionalProcessing.length < queryLimit) {
+                setLoading("loaded");
+            } else {
+                setLoading(false);
+            }
+            return;
+        }
+
+
+
+        let cursorPos:number;
+        if (page[0] > page[1]) {
+            cursorPos = currentQueryAnchor.endQueryPos;
+        } else {
+            cursorPos = currentQueryAnchor.startQueryPos;
+        }
+
+        const querySchema:QueryObject = data[cursorPos];
+
+        const createQuery = (queryData:QueryObject) => {
+            const constraints:any[] = [];
+            queryData.where && queryData.where.forEach((w) => {
+                constraints.push(where(...w));
+            });
+
+            filters && Object.entries(filters).filter(([, value]) => value.value).forEach(([key, value]) => {
+                const filterValue = (value.type === "number" || value.type === "dropdown") ? parseInt(value.value as string) || value.value : value.value;
+                constraints.push(where(key, "==", filterValue));
+            });
+
+            constraints.push(orderBy(queryData.orderBy ? queryData.orderBy === "documentId" ? documentId() : queryData.orderBy : documentId()));
+
+            if (page[0] > page[1] && !cursorDirection) { // Going up
+                currentQueryAnchor.endKey && constraints.push(startAfter(currentQueryAnchor.endKey));
+                constraints.push(limit(queryLimit));
+                if (!loadMoreFromQuery) {
+                    currentQueryAnchor = {...currentQueryAnchor, startQueryPos: currentQueryAnchor.endQueryPos};
+                }
+            } else if (page[0] < page[1] && !cursorDirection) { // Going down
+                if (!loadMoreFromQuery) {
+                    currentQueryAnchor = {...currentQueryAnchor, endQueryPos: currentQueryAnchor.startQueryPos};
+                }
+                constraints.push(limitToLast(queryLimit));
+                if (currentQueryAnchor.startKey) {
+                    currentQueryAnchor.startKey && constraints.push(endBefore(currentQueryAnchor.startKey));
+                } else {
+                    currentQueryAnchor.startKey && constraints.push(endAt(currentQueryAnchor.startKey));
+                }
+            } else {
+                if (cursorDirection === "decrease") {
+                    constraints.push(limitToLast(queryLimit));
+                } else {
+                    constraints.push(limit(queryLimit));
+                }
+            }
+            return constraints;
+        };
+
+        const constraints = createQuery(querySchema);
+        const q = query(collection(db, ...(querySchema.path as [any])), ...(constraints));
+
+        console.log("Fetching docs", constraints);
+
+        if (snapshot) {
+            // Use onSnapshot to get real-time updates
+            const unsubscribe = onSnapshot(q, (querySnapshot) => {
+                handleQuerySnapshot(querySnapshot);
+            });
+            // Save the unsubscribe function to state so we can dispose of it later
+            setDataListenerUnsubscribe((d) => ({...(d || {}), [cursorPos]: unsubscribe}));
+            return;
+        } else {
+            // Just get the docs without setting up a listener
+            const queryData = await getDocs(q);
+            handleQuerySnapshot(queryData);
+        }
+
+        // Function to handle query snapshot
+        async function handleQuerySnapshot(querySnapshot: QuerySnapshot) {
+            if (!Array.isArray(data)) throw new Error("Called querySnapshot but data is defined.");
+            if (!queryLimit) throw new Error("Firestore queries must have a limit defined.");
+
+            const queryResults: { [key: string]: { [key: string]: unknown } } = {};
+            let index = 0; // Declare the index variable
+
+            const reverseIfBack = (docs: QueryDocumentSnapshot<DocumentData>[]) =>
+                page[0] < page[1] ? docs.reverse() : docs;
+
+            // Process each document in the querySnapshot
+            for (const doc of reverseIfBack(querySnapshot.docs)) {
+                if ((Object.keys(queryResults).length + Object.keys(itemList).length) === queryLimit) {
+                    break;
+                }
+
+                let position = Object.keys(itemList).length+(page[0]-1)*queryLimit+index+1;
+                if (page[0] < page[1]) {
+                    position = (page[0])*queryLimit-index-Object.keys(itemList).length;
+                }
+
+
+                if (itemList[doc.id] || (prevEntries[doc.id] && prevEntries[doc.id] !== position)) {
+                    console.log("Removing ", doc.id, ": E=", prevEntries[doc.id], ", G=", position);
+                    continue;
+                }
+
+                let item: {[key: string]: unknown}|false = doc.data();
+                item.id = doc.id;
+
+                // Apply additionalEntryProcessing if provided
+                if (additionalEntryProcessing) {
+                    item = await additionalEntryProcessing(doc.id, item);
+                }
+                if (!item) continue;
+
+                queryResults[doc.id] = item;
+                index += 1;
+
+                if (prevEntries[doc.id]) continue;
+                prevEntries[doc.id] = position;
+            }
+
+            if (cursorDirection === "decrease" || page[0] < page[1]) {
+                itemList = {...Object.fromEntries(Object.entries(queryResults).reverse()), ...itemList};
+            } else {
+                itemList = {...itemList, ...queryResults};
+            }
+
+            // Updating state with the new data and query anchors
+
+
+            setPrevEntryIds(prevEntries);
+
+            if (querySnapshot.size < queryLimit && Object.keys(itemList).length < queryLimit) {
+                // If we have ran out of entries, increase or decrease the index.
+                if (page[0] > page[1] && cursorPos+1 < data.length) {
+                    return getDataFromQuery(itemList, {...currentQueryAnchor, endQueryPos: currentQueryAnchor.endQueryPos+1}, "increase", prevEntries);
+                } else if (page[0] < page[1] && cursorPos > 0) {
+                    return getDataFromQuery(itemList, {...currentQueryAnchor, startQueryPos: currentQueryAnchor.startQueryPos-1}, "decrease", prevEntries);
+                }
+            }
+
+            if (Object.keys(itemList).length < queryLimit && querySnapshot.size === queryLimit) {
+                console.log("Shorter than ten");
+                return getDataFromQuery(itemList, {...currentQueryAnchor, startKey: Object.keys(itemList)[0], endKey: Object.keys(itemList).slice(-1)[0]}, undefined, prevEntries, true);
+            }
+
+            if (querySnapshot.size === 0 &&
+                Object.keys(itemList).length === 0 &&
+                currentQueryAnchor.endQueryPos+1 === data.length &&
+                page[0] > 1) {
+                if (view === "table") {
+                    setTableData({});
+                }
+                setQueryAnchor((a) => ({...a, startKey: ""}));
+                setLoading("loaded");
+                return;
+            }
+
+            if (querySnapshot.size < queryLimit) {
+                setLoading("loaded");
+            } else {
+                setLoading(false);
+            }
+
+            setQueryAnchor({...currentQueryAnchor, startKey: Object.keys(itemList)[0], endKey: Object.keys(itemList).slice(-1)[0]});
+
+            setTableData((old) => {
+                if (view === "table") {
+                    return {...itemList};
+                }
+                return {...old, ...itemList};
+            });
+        }
+    };
+
+    const reset = () => {
+        console.log("Resetting after filters?");
+        setPage([1, 0]);
+        setTableData({});
+        setQueryAnchor({startKey: "", endKey: "", startQueryPos: 0, endQueryPos: 0});
+        setPrevEntryIds({});
+        dataListenerUnsubscribe && Object.values(dataListenerUnsubscribe).map((u) => u());
+        setDataListenerUnsubscribe(undefined);
+    };
+
+    useEffect(() => {
+        console.log("Filters updates", filters);
+        if (!filters) return;
+        console.log("Resetting cus filters");
+        reset();
+    }, [filters]);
+
+    useEffect(() => {
+        console.log("View reset.")
+        reset();
+    }, [view]);
+
+    useEffect(() => {
+        console.log("search reset.")
+        reset();
+    }, [searchString]);
+
+    useEffect(() => {
+        console.log("data reset.")
+        reset();
+    }, [data]);
+
+    useEffect(() => {
+        console.log("sort reset.")
+        reset();
+    }, [sort]);
+
+
+    // Fetch new data when queries or page change
+    useEffect(() => {
+        getDataFromQuery();
+        dataListenerUnsubscribe && Object.values(dataListenerUnsubscribe).map((u) => u());
+    }, [page]);
+
+    const pageUp = () => {
+        setPage((p) => ([p[0]+1, p[0]]));
+    };
+
+    const pageDown = () => {
+        setPage((p) => ([p[0]-1, p[0]]));
+    };
+
+    const updateSort = (sortLabel: string) => {
+        if (!sorts || !sorts[sortLabel]) return;
+        setSort([sortLabel, sorts[sortLabel]]);
+    }
+
+    return ({...{tableData, pageUp, pageDown, setFilters, page: page[0], sorts, loading, sort, updateSort: updateSort, setView, updateSearch: setSearchString}});
+};