placementt-core 11.0.803 → 11.0.914

package/src/tasksAndTips.ts

@@ -1,7 +1,7 @@
-import {arrayUnion, documentId, orderBy, where} from "firebase/firestore";
+import {arrayUnion, where} from "firebase/firestore";
 import FirebaseQuery from "./firebase/firebaseQuery";
-import {CohortData, InstituteData, OrganisationAddress, PlacementListing, ProviderData, RegistrationRequest, StudentPlacementData, UserData} from "./typeDefinitions";
-import {camelCaseToNormal, capitaliseWords, dateToString, getAccess} from "./firebase/util";
+import {CohortData, InstituteData, OrganisationAddress, ProviderData, SchoolData, StudentPlacementData, UserData} from "./typeDefinitions";
+import {getAccess} from "./firebase/util";
 import { convertDate } from "./firebase/util";
 
 const firebaseQuery = new FirebaseQuery;
@@ -10,7 +10,7 @@ type InstituteTipNames = "createCohort"|"addSchools"|"uploadStaff"|"assignStaffR
 type ProviderTipNames = string
 type StudentTipNames = string
 
-export type InstituteTaskNames = "missingParentEmail"|"outstandingReminders"|"invalidStaffEmails"|"invalidStudentEmails"|"invalidParentEmails"|"invalidProviderEmails"|"verifyInsurance"|"verifyRiskAssessment"|"verifyDbsCheck"|"inactiveStudents"|"uploadStudents"|"inactiveStaff"|"requiredStage"|"approveExternalPlacement"|"overdueStage"
+export type InstituteTaskNames = "missingParentEmail"|"approveAlumniConversation"|"outstandingReminders"|"invalidStaffEmails"|"invalidStudentEmails"|"invalidParentEmails"|"invalidProviderEmails"|"verifyInsurance"|"verifyRiskAssessment"|"verifyDbsCheck"|"inactiveStudents"|"uploadStudents"|"inactiveStaff"|"requiredStage"|"approveExternalPlacement"|"overdueStage"
 export type StudentTaskNames = "completeOnboarding"
 export type ProviderTaskNames = "applicationRequireReview"|"activateStaff"|"requestedVisiblePlacementListings"|"requestedVisibleAddresses"|"completeStudentDocs"|"uploadOnboarding"|"reviewOnboarding"|"completeListing"|"completeAddress"|"registrationRequests"|"placementStarting"|"completeFeedback"|"setUpFeedback"
 
@@ -34,7 +34,7 @@ type TasksObject = {
 */
 type InstituteTipsObject = {
     [key in InstituteTipNames]: {
-        callback: (user: UserData, organisation?:InstituteData|ProviderData, additional?:{[key: string]: OrganisationAddress}) => Promise<TaskQueryReturnObject|TaskQueryReturnObject[]>,
+        callback: (user: UserData, organisation?:InstituteData&ProviderData, additional?:{[key: string]: OrganisationAddress}) => Promise<TaskQueryReturnObject|TaskQueryReturnObject[]>,
     };
 };
 type ProviderTipsObject = {
@@ -50,7 +50,7 @@ type StudentTipsObject = {
 
 export type InstituteTaskObject = {
     [key in InstituteTaskNames]: {
-        callback: (user: UserData, organisation:InstituteData|ProviderData, cohort: CohortData|[string, CohortData][]) => Promise<TaskQueryReturnObject|TaskQueryReturnObject[]>,
+        callback: ({user, organisation, cohorts, schools}:{user: UserData, organisation:InstituteData&ProviderData, cohorts: CohortData|[string, CohortData][], schools?: SchoolData|[string, SchoolData][]}) => Promise<TaskQueryReturnObject|TaskQueryReturnObject[]>,
     };
 };
 
@@ -199,8 +199,8 @@ const instituteTips:InstituteTipsObject = {
 
 const instituteTasks:InstituteTaskObject = {
     invalidStaffEmails: {
-        callback: async (user, organisation, cohort) => {
-            if (!getAccess(user, "viewStaff") || !Array.isArray(cohort)) return;
+        callback: async ({user, cohorts}) => {
+            if (!getAccess(user, "viewStaff") || !Array.isArray(cohorts)) return;
 
             const staffCount = (await firebaseQuery.getCount(["users"], [where("oId", "==", user.oId), where("userType", "==", "Staff"), where("flags", "array-contains", "userEmailFailed")]));
             if (staffCount > 0) {
@@ -209,14 +209,62 @@ const instituteTasks:InstituteTaskObject = {
                     severity: "error",
                     title: `${staffCount} staff have invalid emails.`,
                     message: `${staffCount} staff accounts have invalid email addresses. Delete and reupload these users.`,
-                    link: "/institutes/cohorts/staff/all",
+                    link: "/institutes/organisation/staff/all",
                 };
             }
             return;
         },
     },
+    approveAlumniConversation: {
+        callback: async ({user, organisation, schools}) => {
+            if (!schools) {
+                if (!organisation.alumniConversations) return;
+                const convos = (await firebaseQuery.getCount(["alumniConversations"], [where("oId", "==", user.oId), where("open", "==", true), where("delivered", "==", "pending")]));
+                if (convos > 0) {
+                    return {
+                        dismissible: false,
+                        severity: "info",
+                        title: `${convos} alumni conversation message${convos > 1 ? "s" : ""} needs approval.`,
+                        message: `There are ${convos} message${convos > 1 ? "s" : ""} to alumni for you to review and release.`,
+                        link: "/institutes/network/alumni/conversations",
+                    };
+                }
+                return;
+            }
+            if (!Array.isArray(schools)) {
+                // One school
+                const convos = (await firebaseQuery.getCount(["alumniConversations"], [where("oId", "==", user.oId), where("schoolId", "==", schools.id), where("open", "==", true), where("delivered", "==", "pending")]));
+                if (convos > 0) {
+                    return {
+                        dismissible: false,
+                        severity: "info",
+                        title: `${convos} alumni conversation message${convos > 1 ? "s" : ""} needs approval.`,
+                        message: `There are ${convos} message${convos > 1 ? "s" : ""} to alumni for you to review and release.`,
+                        link: `/institutes/network/alumni/conversations/${schools.id}`,
+                    };
+                }
+                return;
+            }
+
+            const items = await Promise.all(schools.map(async ([id, school]) => {
+                if (!school.alumniConversations) return;
+                const convos = (await firebaseQuery.getCount(["alumniConversations"], [where("oId", "==", user.oId), where("schoolId", "==", id), where("open", "==", true), where("delivered", "==", "pending")]));
+                if (convos > 0) {
+                    return {
+                        dismissible: false,
+                        severity: "info",
+                        title: `${convos} alumni conversation message${convos > 1 ? "s" : ""} needs approval.`,
+                        message: `${school.name}, has ${convos} outstanding alumni message${convos > 1 ? "s" : ""} to approve. Click to view.`,
+                        link: `/institutes/network/alumni/conversations/${school.id}`,
+                    } as TaskQueryReturnObject;
+                }
+                return;
+            }));
+            return items.filter((v) => v);
+        },
+    },
     invalidStudentEmails: {
-        callback: async (user, organisation, cohorts) => {
+        callback: async ({user, cohorts}) => {
             if (!getAccess(user, "viewStudents") || user.viewStudents === "none") return;
 
             if (!Array.isArray(cohorts)) {
@@ -250,7 +298,7 @@ const instituteTasks:InstituteTaskObject = {
         },
     },
     outstandingReminders: {
-        callback: async (user, organisation, cohorts) => {
+        callback: async ({user, cohorts}) => {
             if (!Array.isArray(cohorts)) {
                 const reminderCount = (await firebaseQuery.getCount(["reminders"], [where("oId", "==", user.oId), where("uid", "==", user.id), where("dueDate", "<=", convertDate(new Date(), "dbstring") as string), where("cohort", "==", cohorts.id), where("status", "==", "upcoming")]));
                 if (reminderCount > 0) {
@@ -282,7 +330,7 @@ const instituteTasks:InstituteTaskObject = {
         },
     },
     invalidParentEmails: {
-        callback: async (user, _, cohorts) => {
+        callback: async ({user, cohorts}) => {
             if (!getAccess(user, "signOffPlacements") || user.viewStudents === "none") return;
 
             if (!Array.isArray(cohorts)) {
@@ -317,7 +365,7 @@ const instituteTasks:InstituteTaskObject = {
         },
     },
     invalidProviderEmails: {
-        callback: async (user, organisation, cohorts) => {
+        callback: async ({user, cohorts}) => {
             if (!getAccess(user, "signOffPlacements") || user.viewStudents === "none") return;
 
             if (!Array.isArray(cohorts)) {
@@ -352,7 +400,7 @@ const instituteTasks:InstituteTaskObject = {
         },
     },
     requiredStage: {
-        callback: async (user, _, cohorts) => {
+        callback: async ({user, cohorts}) => {
             if (!getAccess(user, "signOffPlacements") || user.viewStudents === "none") return;
 
             if (!Array.isArray(cohorts)) {
@@ -387,7 +435,7 @@ const instituteTasks:InstituteTaskObject = {
         },
     },
     verifyInsurance: {
-        callback: async (user, _, cohorts) => {
+        callback: async ({user, cohorts}) => {
             if (!getAccess(user, "verifyInsurance") || user.viewStudents === "none") return;
 
             if (!Array.isArray(cohorts)) {
@@ -422,7 +470,7 @@ const instituteTasks:InstituteTaskObject = {
         },
     },
     verifyDbsCheck: {
-        callback: async (user, _, cohorts) => {
+        callback: async ({user, cohorts}) => {
             if (!getAccess(user, "verifyDbsChecks") || user.viewStudents === "none") return;
 
             if (!Array.isArray(cohorts)) {
@@ -457,7 +505,7 @@ const instituteTasks:InstituteTaskObject = {
         },
     },
     verifyRiskAssessment: {
-        callback: async (user, _, cohorts) => {
+        callback: async ({user, cohorts}) => {
             if (!getAccess(user, "verifyRiskAssessments") || user.viewStudents === "none") return;
 
             if (!Array.isArray(cohorts)) {
@@ -492,7 +540,7 @@ const instituteTasks:InstituteTaskObject = {
         },
     },
     missingParentEmail: {
-        callback: async (user, _, cohorts) => {
+        callback: async ({user, cohorts}) => {
             if (!getAccess(user, "editStudents") || user.viewStudents === "none") return;
             if (!Array.isArray(cohorts)) {
                 const requiresParents = Boolean(cohorts.workflow.find((node) => node.userType === "Parent"))
@@ -539,7 +587,7 @@ const instituteTasks:InstituteTaskObject = {
         },
     },
     inactiveStudents: {
-        callback: async (user, _, cohorts) => {
+        callback: async ({user, cohorts}) => {
             if (!getAccess(user, "activateStudents") || user.viewStudents === "none") return;
             if (!Array.isArray(cohorts)) {
                 const constraints = [where("oId", "==", user.oId), where("cohort", "==", cohorts.id), where("status", "==", "inactive")];
@@ -583,7 +631,7 @@ const instituteTasks:InstituteTaskObject = {
         },
     },
     uploadStudents: {
-        callback: async (user, _, cohorts) => {
+        callback: async ({user, cohorts}) => {
             if (!Array.isArray(cohorts)) return;
             if (!getAccess(user, "addStudents") || user.viewStudents === "none") return;
             if (user.product !== "institutes") return;
@@ -609,7 +657,7 @@ const instituteTasks:InstituteTaskObject = {
         },
     },
     inactiveStaff: {
-        callback: async (user, _, cohorts) => {
+        callback: async ({user, cohorts}) => {
             if (!getAccess(user, "addStaff")) return;
 
             if (!Array.isArray(cohorts) || user.product === "students") return;
@@ -630,15 +678,15 @@ const instituteTasks:InstituteTaskObject = {
         },
     },
     overdueStage: {
-        callback: async (user, _, cohort) => {
-            console.log(user, cohort);
+        callback: async ({user, cohorts}) => {
+            console.log(user, cohorts);
             return undefined;
         },
     },
     approveExternalPlacement: {
-        callback: async (user, _, cohort) => {
+        callback: async ({user, cohorts}) => {
             if (!getAccess(user, "verifyListings")) return;
-            if (!Array.isArray(cohort)) return;
+            if (!Array.isArray(cohorts)) return;
             const externalCount = await firebaseQuery.getCount(["placementListings"],
                 [where(`savedBy.${user.oId}.exists`, "==", true), where(`savedBy.${user.oId}.status`, "==", "uploaded"), where("mapConsent", "==", "institute")]);
             console.log("EXT", externalCount);
@@ -675,408 +723,408 @@ const studentTasks:StudentTaskObject = {
     }
 }
 
-const providerTasks:ProviderTaskObject = {
-    requestedVisibleAddresses: {
-        callback: async (user) => {
-            if (!getAccess(user, "addStaff")) return;
-            const accessRequests = await firebaseQuery.getCount("users", [where("oId", "==", user.oId), where("product", "==", "providers"), orderBy("requestedVisibleAddresses")]) - ((Array.isArray(user?.requestedVisibleAddresses) && user?.requestedVisibleAddresses.length > 0) ? 1 : 0);
-            if (accessRequests === 0) return;
-            if (accessRequests === 1) {
-                const userRequestingAccess = Object.entries(await firebaseQuery.getDocsWhere("users", [where("product", "==", "providers"), where("oId", "==", user.oId), orderBy("requestedVisibleAddresses")]) || {})[0] as [string, UserData];
-                return {
-                    dismissible: false,
-                    severity: "primary",
-                    title: `${userRequestingAccess[1].details.forename} ${userRequestingAccess[1].details.surname} has requested access to view addresses.`,
-                    message: `Click to review the addresses and grant access to the user.`,
-                    link: `/${user.product}/users/${userRequestingAccess[0]}`,
-                    buttonTitle: "View request",
-                } as TaskQueryReturnObject;
-        }
-
-            return {
-                dismissible: false,
-                severity: "warning",
-                title: `Multiple users have requested access to view addresses.`,
-                message: `Click to review the addresses and grant access to the user.`,
-                link: `/${user.product}/organisation/staff/all`,
-                buttonTitle: "View request",
-            } as TaskQueryReturnObject;
-        },
-    },
-    requestedVisiblePlacementListings: {
-        callback: async (user) => {
-            if (!getAccess(user, "addStaff")) return;
-            const accessRequests = await firebaseQuery.getCount("users", [where("oId", "==", user.oId), where("product", "==", "providers"), orderBy("requestedVisibleListings")])- ((Array.isArray(user?.requestedVisibleListings) && user?.requestedVisibleListings.length > 0) ? 1 : 0);;
-            if (accessRequests === 0) return;
-            if (accessRequests === 1) {
-                const userRequestingAccess = Object.entries(await firebaseQuery.getDocsWhere("users", [where("oId", "==", user.oId), where("product", "==", "providers"), orderBy("requestedVisibleListings")]) || {})[0] as [string, UserData];
-                return {
-                    dismissible: false,
-                    severity: "primary",
-                    title: `${userRequestingAccess[1].details.forename} ${userRequestingAccess[1].details.surname} has requested access to view placement listings.`,
-                    message: `Click to review the placement listings and grant access to the user.`,
-                    link: `/${user.product}/users/${userRequestingAccess[0]}`,
-                    buttonTitle: "View request",
-                } as TaskQueryReturnObject;
-        }
-
-            return {
-                dismissible: false,
-                severity: "warning",
-                title: `Multiple users have requested access to view placement listings.`,
-                message: `Click to review the placement listings and grant access to the user.`,
-                link: `/${user.product}/organisation/staff/all`,
-                buttonTitle: "View request",
-            } as TaskQueryReturnObject;
-        },
-    },
-    applicationRequireReview: {
-        callback: async (user) => {
-            const constraints = [where("providerId", "==", user.oId), where("reqUserType", "==", "Staff"), where("status", "==", "submitted")];
-
-            if (user.userGroup !== "admin") {
+// const providerTasks:ProviderTaskObject = {
+//     requestedVisibleAddresses: {
+//         callback: async (user) => {
+//             if (!getAccess(user, "addStaff")) return;
+//             const accessRequests = await firebaseQuery.getCount("users", [where("oId", "==", user.oId), where("product", "==", "providers"), orderBy("requestedVisibleAddresses")]) - ((Array.isArray(user?.requestedVisibleAddresses) && user?.requestedVisibleAddresses.length > 0) ? 1 : 0);
+//             if (accessRequests === 0) return;
+//             if (accessRequests === 1) {
+//                 const userRequestingAccess = Object.entries(await firebaseQuery.getDocsWhere("users", [where("product", "==", "providers"), where("oId", "==", user.oId), orderBy("requestedVisibleAddresses")]) || {})[0] as [string, UserData];
+//                 return {
+//                     dismissible: false,
+//                     severity: "primary",
+//                     title: `${userRequestingAccess[1].details.forename} ${userRequestingAccess[1].details.surname} has requested access to view addresses.`,
+//                     message: `Click to review the addresses and grant access to the user.`,
+//                     link: `/${user.product}/users/${userRequestingAccess[0]}`,
+//                     buttonTitle: "View request",
+//                 } as TaskQueryReturnObject;
+//         }
+
+//             return {
+//                 dismissible: false,
+//                 severity: "warning",
+//                 title: `Multiple users have requested access to view addresses.`,
+//                 message: `Click to review the addresses and grant access to the user.`,
+//                 link: `/${user.product}/organisation/staff/all`,
+//                 buttonTitle: "View request",
+//             } as TaskQueryReturnObject;
+//         },
+//     },
+//     requestedVisiblePlacementListings: {
+//         callback: async (user) => {
+//             if (!getAccess(user, "addStaff")) return;
+//             const accessRequests = await firebaseQuery.getCount("users", [where("oId", "==", user.oId), where("product", "==", "providers"), orderBy("requestedVisibleListings")])- ((Array.isArray(user?.requestedVisibleListings) && user?.requestedVisibleListings.length > 0) ? 1 : 0);;
+//             if (accessRequests === 0) return;
+//             if (accessRequests === 1) {
+//                 const userRequestingAccess = Object.entries(await firebaseQuery.getDocsWhere("users", [where("oId", "==", user.oId), where("product", "==", "providers"), orderBy("requestedVisibleListings")]) || {})[0] as [string, UserData];
+//                 return {
+//                     dismissible: false,
+//                     severity: "primary",
+//                     title: `${userRequestingAccess[1].details.forename} ${userRequestingAccess[1].details.surname} has requested access to view placement listings.`,
+//                     message: `Click to review the placement listings and grant access to the user.`,
+//                     link: `/${user.product}/users/${userRequestingAccess[0]}`,
+//                     buttonTitle: "View request",
+//                 } as TaskQueryReturnObject;
+//         }
+
+//             return {
+//                 dismissible: false,
+//                 severity: "warning",
+//                 title: `Multiple users have requested access to view placement listings.`,
+//                 message: `Click to review the placement listings and grant access to the user.`,
+//                 link: `/${user.product}/organisation/staff/all`,
+//                 buttonTitle: "View request",
+//             } as TaskQueryReturnObject;
+//         },
+//     },
+//     applicationRequireReview: {
+//         callback: async (user) => {
+//             const constraints = [where("providerId", "==", user.oId), where("reqUserType", "==", "Staff"), where("status", "==", "submitted")];
+
+//             if (user.userGroup !== "admin") {
                 
-                if (!user.viewPlacementListings || user.viewPlacementListings === "none") return;
-                if (!user.viewAddresses || user.viewAddresses === "none") return;
-
-                if (user.viewPlacementListings === "request") {
-                    if (!user.visibleListings || user.visibleListings?.length === 0) return;
-                    constraints.push(where("listingId", 'in', user.visibleListings));
-                } else {
-                    // viewPlacementListings must be 'all'
-
-                    if (user.viewAddresses === "request") {
-                        if (!user.visibleAddresses || user.visibleAddresses?.length === 0) return;
-                        constraints.push(where("addressId", 'in', user.visibleAddresses));
-                    }
-                }
-            }
-            const applicationCount = await firebaseQuery.getCount("applications", constraints);
-            if (applicationCount === 0) return;
-
-            return {
-                dismissible: false,
-                severity: "primary",
-                title: `${applicationCount} applications require your review.`,
-                message: `Click to view ${applicationCount} that require your attention.`,
-                link: `/${user.product}/placementListings/applicants`,
-                buttonTitle: "View applications",
-            } as TaskQueryReturnObject;
-        },
-    },
-    completeStudentDocs: {
-        callback: async (user) => {
-            return;
-            return {} as TaskQueryReturnObject;
-        },
-    },
-    reviewOnboarding: {
-        callback: async (user) => {
-            const constraints = [where("providerId", "==", user.oId), where("onboarding.completed.accepted", "==", false), where("onboarding.completed.submitted", "==", true), where("endDate", ">=", dateToString(new Date()))]
-
-            if (user.userGroup !== "admin") {
+//                 if (!user.viewPlacementListings || user.viewPlacementListings === "none") return;
+//                 if (!user.viewAddresses || user.viewAddresses === "none") return;
+
+//                 if (user.viewPlacementListings === "request") {
+//                     if (!user.visibleListings || user.visibleListings?.length === 0) return;
+//                     constraints.push(where("listingId", 'in', user.visibleListings));
+//                 } else {
+//                     // viewPlacementListings must be 'all'
+
+//                     if (user.viewAddresses === "request") {
+//                         if (!user.visibleAddresses || user.visibleAddresses?.length === 0) return;
+//                         constraints.push(where("addressId", 'in', user.visibleAddresses));
+//                     }
+//                 }
+//             }
+//             const applicationCount = await firebaseQuery.getCount("applications", constraints);
+//             if (applicationCount === 0) return;
+
+//             return {
+//                 dismissible: false,
+//                 severity: "primary",
+//                 title: `${applicationCount} applications require your review.`,
+//                 message: `Click to view ${applicationCount} that require your attention.`,
+//                 link: `/${user.product}/placementListings/applicants`,
+//                 buttonTitle: "View applications",
+//             } as TaskQueryReturnObject;
+//         },
+//     },
+//     completeStudentDocs: {
+//         callback: async (user) => {
+//             return;
+//             return {} as TaskQueryReturnObject;
+//         },
+//     },
+//     reviewOnboarding: {
+//         callback: async (user) => {
+//             const constraints = [where("providerId", "==", user.oId), where("onboarding.completed.accepted", "==", false), where("onboarding.completed.submitted", "==", true), where("endDate", ">=", dateToString(new Date()))]
+
+//             if (user.userGroup !== "admin") {
                 
-                if (!user.viewPlacementListings || user.viewPlacementListings === "none") return;
-                if (!user.viewAddresses || user.viewAddresses === "none") return;
-
-                if (user.viewPlacementListings === "request") {
-                    if (!user.visibleListings || user.visibleListings?.length === 0) return;
-                    constraints.push(where("placementId", 'in', user.visibleListings));
-                } else {
-                    // viewPlacementListings must be 'all'
-
-                    if (user.viewAddresses === "request") {
-                        if (!user.visibleAddresses || user.visibleAddresses?.length === 0) return;
-                        constraints.push(where("addressId", 'in', user.visibleAddresses));
-                    }
-                }
-            }
-            const toReview = await firebaseQuery.getCount("placements", constraints);
+//                 if (!user.viewPlacementListings || user.viewPlacementListings === "none") return;
+//                 if (!user.viewAddresses || user.viewAddresses === "none") return;
+
+//                 if (user.viewPlacementListings === "request") {
+//                     if (!user.visibleListings || user.visibleListings?.length === 0) return;
+//                     constraints.push(where("placementId", 'in', user.visibleListings));
+//                 } else {
+//                     // viewPlacementListings must be 'all'
+
+//                     if (user.viewAddresses === "request") {
+//                         if (!user.visibleAddresses || user.visibleAddresses?.length === 0) return;
+//                         constraints.push(where("addressId", 'in', user.visibleAddresses));
+//                     }
+//                 }
+//             }
+//             const toReview = await firebaseQuery.getCount("placements", constraints);
             
-            if (toReview === 0) return;
-            if (toReview === 1) {
-                const placement = Object.entries(await firebaseQuery.getDocsWhere("placements", constraints) || {})[0] as [string, StudentPlacementData];
-                const student = await firebaseQuery.getDocData(["users", placement[1].uid]) as UserData;
-                return {
-                    dismissible: false,
-                    severity: "primary",
-                    title: `${student.details.forename} ${student.details.surname} has completed their onboarding for their placement from ${convertDate(placement[1].startDate, "visual")} to ${convertDate(placement[1].endDate, "visual")}`,
-                    message: `Click to view the placement and review the onboarding.`,
-                    link: `/${user.product}/placements/${placement[0]}`,
-                    buttonTitle: "View",
-                } as TaskQueryReturnObject;
-        }
-
-            return {
-                dismissible: false,
-                severity: "primary",
-                title: `${toReview} student have completed their onboarding.`,
-                message: `Click to view your placements and approve completed onboarding`,
-                link: `/${user.product}/placementListings/placements`,
-                buttonTitle: "View placements",
-            } as TaskQueryReturnObject;
-        },
-    },
-    uploadOnboarding: {
-        callback: async (user) => {
+//             if (toReview === 0) return;
+//             if (toReview === 1) {
+//                 const placement = Object.entries(await firebaseQuery.getDocsWhere("placements", constraints) || {})[0] as [string, StudentPlacementData];
+//                 const student = await firebaseQuery.getDocData(["users", placement[1].uid]) as UserData;
+//                 return {
+//                     dismissible: false,
+//                     severity: "primary",
+//                     title: `${student.details.forename} ${student.details.surname} has completed their onboarding for their placement from ${convertDate(placement[1].startDate, "visual")} to ${convertDate(placement[1].endDate, "visual")}`,
+//                     message: `Click to view the placement and review the onboarding.`,
+//                     link: `/${user.product}/placements/${placement[0]}`,
+//                     buttonTitle: "View",
+//                 } as TaskQueryReturnObject;
+//         }
+
+//             return {
+//                 dismissible: false,
+//                 severity: "primary",
+//                 title: `${toReview} student have completed their onboarding.`,
+//                 message: `Click to view your placements and approve completed onboarding`,
+//                 link: `/${user.product}/placementListings/placements`,
+//                 buttonTitle: "View placements",
+//             } as TaskQueryReturnObject;
+//         },
+//     },
+//     uploadOnboarding: {
+//         callback: async (user) => {
             
-            const constraints = [where("providerId", "==", user.oId), where("onboarding", "==", null), where("endDate", ">=", dateToString(new Date()))];
+//             const constraints = [where("providerId", "==", user.oId), where("onboarding", "==", null), where("endDate", ">=", dateToString(new Date()))];
 
 
-            if (user.userGroup !== "admin") {
+//             if (user.userGroup !== "admin") {
                 
-                if (!user.viewPlacementListings || user.viewPlacementListings === "none") return;
-                if (!user.viewAddresses || user.viewAddresses === "none") return;
-
-                if (user.viewPlacementListings === "request") {
-                    if (!user.visibleListings || user.visibleListings?.length === 0) return;
-                    constraints.push(where("placementId", 'in', user.visibleListings));
-                } else {
-                    // viewPlacementListings must be 'all'
-
-                    if (user.viewAddresses === "request") {
-                        if (!user.visibleAddresses || user.visibleAddresses?.length === 0) return;
-                        constraints.push(where("addressId", 'in', user.visibleAddresses));
-                    }
-                }
-            }
-
-            const withoutOnboarding = await firebaseQuery.getCount("placements", constraints);
-
-            if (withoutOnboarding === 0) return;
-            if (withoutOnboarding === 1) {
-                const placement = Object.entries(await firebaseQuery.getDocsWhere("placements", constraints) || {})[0] as [string, StudentPlacementData];
-                const student = await firebaseQuery.getDocData(["users", placement[1].uid]) as UserData;
-                return {
-                    dismissible: false,
-                    severity: "primary",
-                    title: `Send onboarding documents to ${student.details.forename} ${student.details.surname}'s placement from ${convertDate(placement[1].startDate, "visual")} to ${convertDate(placement[1].endDate, "visual")}`,
-                    message: `Click to view the placement and add or dismiss onboarding reminders.`,
-                    link: `/${user.product}/placements/${placement[0]}`,
-                    buttonTitle: "View",
-                } as TaskQueryReturnObject;
-        }
-
-            return {
-                dismissible: false,
-                severity: "primary",
-                title: `Set up onboarding for ${withoutOnboarding} placements to prepare yourself and your students.`,
-                message: `Click to view your placements and add or dismiss onboarding reminders.`,
-                link: `/${user.product}/placementListings/placements`,
-                buttonTitle: "View placements",
-            } as TaskQueryReturnObject;
-        },
-    },
-    completeListing: {
-        callback: async (user) => {
-            const constraints = [where("providerId", "==", user.oId), where("status", "==", "draft")];
-
-
-            if (user.userGroup !== "admin") {
+//                 if (!user.viewPlacementListings || user.viewPlacementListings === "none") return;
+//                 if (!user.viewAddresses || user.viewAddresses === "none") return;
+
+//                 if (user.viewPlacementListings === "request") {
+//                     if (!user.visibleListings || user.visibleListings?.length === 0) return;
+//                     constraints.push(where("placementId", 'in', user.visibleListings));
+//                 } else {
+//                     // viewPlacementListings must be 'all'
+
+//                     if (user.viewAddresses === "request") {
+//                         if (!user.visibleAddresses || user.visibleAddresses?.length === 0) return;
+//                         constraints.push(where("addressId", 'in', user.visibleAddresses));
+//                     }
+//                 }
+//             }
+
+//             const withoutOnboarding = await firebaseQuery.getCount("placements", constraints);
+
+//             if (withoutOnboarding === 0) return;
+//             if (withoutOnboarding === 1) {
+//                 const placement = Object.entries(await firebaseQuery.getDocsWhere("placements", constraints) || {})[0] as [string, StudentPlacementData];
+//                 const student = await firebaseQuery.getDocData(["users", placement[1].uid]) as UserData;
+//                 return {
+//                     dismissible: false,
+//                     severity: "primary",
+//                     title: `Send onboarding documents to ${student.details.forename} ${student.details.surname}'s placement from ${convertDate(placement[1].startDate, "visual")} to ${convertDate(placement[1].endDate, "visual")}`,
+//                     message: `Click to view the placement and add or dismiss onboarding reminders.`,
+//                     link: `/${user.product}/placements/${placement[0]}`,
+//                     buttonTitle: "View",
+//                 } as TaskQueryReturnObject;
+//         }
+
+//             return {
+//                 dismissible: false,
+//                 severity: "primary",
+//                 title: `Set up onboarding for ${withoutOnboarding} placements to prepare yourself and your students.`,
+//                 message: `Click to view your placements and add or dismiss onboarding reminders.`,
+//                 link: `/${user.product}/placementListings/placements`,
+//                 buttonTitle: "View placements",
+//             } as TaskQueryReturnObject;
+//         },
+//     },
+//     completeListing: {
+//         callback: async (user) => {
+//             const constraints = [where("providerId", "==", user.oId), where("status", "==", "draft")];
+
+
+//             if (user.userGroup !== "admin") {
                 
-                if (!user.viewPlacementListings || user.viewPlacementListings === "none") return;
-                if (!user.viewAddresses || user.viewAddresses === "none") return;
-
-                if (user.viewPlacementListings === "request") {
-                    if (!user.visibleListings || user.visibleListings?.length === 0) return;
-                    constraints.push(where(documentId(), 'in', user.visibleListings));
-                } else {
-                    // viewPlacementListings must be 'all'
-
-                    if (user.viewAddresses === "request") {
-                        if (!user.visibleAddresses || user.visibleAddresses?.length === 0) return;
-                        constraints.push(where("addressId", 'in', user.visibleAddresses));
-                    }
-                }
-            }
-            const incompleteListings = await firebaseQuery.getCount("placementListings", constraints);
-            if (incompleteListings === 0) return;
-            if (incompleteListings === 1) {
-                const incompleteListing = Object.entries(await firebaseQuery.getDocsWhere("placementListings", constraints) || {})[0] as [string, PlacementListing];
-                const address = incompleteListing[1].addressId ? await firebaseQuery.getDocData(["addresses", incompleteListing[1].addressId]) as OrganisationAddress : undefined;
-                return {
-                    dismissible: false,
-                    severity: "info",
-                    title: `Your listing '${incompleteListing[1].title || "unnamed"}' at ${address ? `${address["address-line1"]}, ${address.postal_code.toUpperCase()}, ${capitaliseWords(camelCaseToNormal(address.country))}` : "unknown address"} requires more information before publishing.`,
-                    message: `Click to complete and publish the placement listing.`,
-                    link: `/${user.product}/addListing/${incompleteListing[0]}`,
-                    buttonTitle: "View listing",
-                } as TaskQueryReturnObject;
-        }
-
-            return {
-                dismissible: false,
-                severity: "info",
-                title: `You have ${incompleteListings} draft listings waiting to be published.`,
-                message: `Click to review and publish the placement listings.`,
-                link: `/${user.product}/placementListings/listings`,
-                buttonTitle: "View listings",
-            } as TaskQueryReturnObject;
-        },
-    },
-    completeAddress: {
-        callback: async (user) => {
-            const constraints = [where("product", "==", "providers"), where("oId", "==", user.oId), where("stage", "!=", "complete")];
-
-
-            if (user.userGroup !== "admin") {
-                if (!user.viewAddresses || user.viewAddresses === "none") return;
-
-                if (user.viewAddresses === "request") {
-                    if (!user.visibleAddresses || user.visibleAddresses?.length === 0) return;
-                    constraints.push(where("addressId", 'in', user.visibleAddresses));
-                }
-            }
-            const incompleteAddresses = await firebaseQuery.getCount("addresses", constraints);
-            if (incompleteAddresses === 0) return;
-            if (incompleteAddresses === 1) {
-                const address = Object.entries(await firebaseQuery.getDocsWhere("addresses", constraints) || {})[0] as [string, OrganisationAddress];
-                return {
-                    dismissible: false,
-                    severity: "info",
-                    title: `Your address: ${address[1]["address-line1"]}, ${address[1].postal_code.toUpperCase()}, ${capitaliseWords(camelCaseToNormal(address[1].country))} is currently incomplete.`,
-                    message: `Click to complete the addresses.`,
-                    link: `/${user.product}/addAddress/${address[0]}`,
-                    buttonTitle: "View address",
-                } as TaskQueryReturnObject;
-        }
-
-            return {
-                dismissible: false,
-                severity: "info",
-                title: `You have ${incompleteAddresses} draft addresses waiting to be published.`,
-                message: `Click to review the addresses.`,
-                link: `/${user.product}/organisation/addresses`,
-                buttonTitle: "View addresses",
-            } as TaskQueryReturnObject;
-        },
-    },
-    registrationRequests: {
-        callback: async (user) => {
-            if (!getAccess(user, "addStaff")) return;
-
-            const regRequests = await firebaseQuery.getCount("requests", [where("product", "==", user.product), where("oId", "==", user.oId)]);
-
-            if (regRequests === 0) return;
-            if (regRequests === 1) {
-                const request = Object.entries(await firebaseQuery.getDocsWhere("requests", [where("product", "==", user.product), where("oId", "==", user.oId)]) || {})[0] as [string, RegistrationRequest];
-                return {
-                    dismissible: false,
-                    severity: "primary",
-                    title: `${request[1].forename} ${request[1].surname} has requested to access your organisation.`,
-                    message: `Click to review these request.`,
-                    link: `/${user.product}/organisation/staff/requests`,
-                    buttonTitle: "View requests",
-                } as TaskQueryReturnObject;
-        }
-
-            return {
-                dismissible: false,
-                severity: "primary",
-                title: `${regRequests} people have requested to register with your organisation.`,
-                message: `Click to review these requests.`,
-                link: `/${user.product}/organisation/staff/requests`,
-                buttonTitle: "View requests",
-            } as TaskQueryReturnObject;
-        },
-    },
-    activateStaff: {
-        callback: async (user) => {
-            if (!getAccess(user, "addStaff")) return;
-
-            const inactiveAccounts = await firebaseQuery.getCount("users", [where("product", "==", user.product), where("oId", "==", user.oId), where("status", "==", "inactive")]);
-
-            if (inactiveAccounts === 0) return;
-            if (inactiveAccounts === 1) {
-                const account = Object.entries(await firebaseQuery.getDocsWhere("users", [where("product", "==", user.product), where("oId", "==", user.oId), where("status", "==", "inactive")]) || {})[0] as [string, UserData];
-                return {
-                    dismissible: false,
-                    severity: "info",
-                    title: `Activate ${account[1].details.forename} ${account[1].details.surname}'s staff account.`,
-                    message: "Activate this account to give the user access to Placementt.",
-                    link: `/${user.product}/organisation/staff/all`,
-                    buttonTitle: "View accounts",
-                } as TaskQueryReturnObject;
-        }
-
-            return {
-                dismissible: false,
-                severity: "info",
-                title: `${inactiveAccounts} staff have inactive active accounts.`,
-                message: "Activate these accounts to give the user access to Placementt.",
-                link: `/${user.product}/organisation/staff/all`,
-                buttonTitle: "View accounts",
-            } as TaskQueryReturnObject;
-        },
-    },
-    placementStarting: {
-        callback: async (user) => {
-            const sevenDaysInFuture = new Date();
-            sevenDaysInFuture.setDate(sevenDaysInFuture.getDate() + 7)
-
-            const constraints = [where("providerId", "==", user.oId), where("startDate", "<=", convertDate(sevenDaysInFuture, "dbstring")), where("startDate", ">", dateToString(new Date()))];
-
-            if (user.userGroup !== "admin") {
+//                 if (!user.viewPlacementListings || user.viewPlacementListings === "none") return;
+//                 if (!user.viewAddresses || user.viewAddresses === "none") return;
+
+//                 if (user.viewPlacementListings === "request") {
+//                     if (!user.visibleListings || user.visibleListings?.length === 0) return;
+//                     constraints.push(where(documentId(), 'in', user.visibleListings));
+//                 } else {
+//                     // viewPlacementListings must be 'all'
+
+//                     if (user.viewAddresses === "request") {
+//                         if (!user.visibleAddresses || user.visibleAddresses?.length === 0) return;
+//                         constraints.push(where("addressId", 'in', user.visibleAddresses));
+//                     }
+//                 }
+//             }
+//             const incompleteListings = await firebaseQuery.getCount("placementListings", constraints);
+//             if (incompleteListings === 0) return;
+//             if (incompleteListings === 1) {
+//                 const incompleteListing = Object.entries(await firebaseQuery.getDocsWhere("placementListings", constraints) || {})[0] as [string, PlacementListing];
+//                 const address = incompleteListing[1].addressId ? await firebaseQuery.getDocData(["addresses", incompleteListing[1].addressId]) as OrganisationAddress : undefined;
+//                 return {
+//                     dismissible: false,
+//                     severity: "info",
+//                     title: `Your listing '${incompleteListing[1].title || "unnamed"}' at ${address ? `${address["address-line1"]}, ${address.postal_code.toUpperCase()}, ${capitaliseWords(camelCaseToNormal(address.country))}` : "unknown address"} requires more information before publishing.`,
+//                     message: `Click to complete and publish the placement listing.`,
+//                     link: `/${user.product}/addListing/${incompleteListing[0]}`,
+//                     buttonTitle: "View listing",
+//                 } as TaskQueryReturnObject;
+//         }
+
+//             return {
+//                 dismissible: false,
+//                 severity: "info",
+//                 title: `You have ${incompleteListings} draft listings waiting to be published.`,
+//                 message: `Click to review and publish the placement listings.`,
+//                 link: `/${user.product}/placementListings/listings`,
+//                 buttonTitle: "View listings",
+//             } as TaskQueryReturnObject;
+//         },
+//     },
+//     completeAddress: {
+//         callback: async (user) => {
+//             const constraints = [where("product", "==", "providers"), where("oId", "==", user.oId), where("stage", "!=", "complete")];
+
+
+//             if (user.userGroup !== "admin") {
+//                 if (!user.viewAddresses || user.viewAddresses === "none") return;
+
+//                 if (user.viewAddresses === "request") {
+//                     if (!user.visibleAddresses || user.visibleAddresses?.length === 0) return;
+//                     constraints.push(where("addressId", 'in', user.visibleAddresses));
+//                 }
+//             }
+//             const incompleteAddresses = await firebaseQuery.getCount("addresses", constraints);
+//             if (incompleteAddresses === 0) return;
+//             if (incompleteAddresses === 1) {
+//                 const address = Object.entries(await firebaseQuery.getDocsWhere("addresses", constraints) || {})[0] as [string, OrganisationAddress];
+//                 return {
+//                     dismissible: false,
+//                     severity: "info",
+//                     title: `Your address: ${address[1]["address-line1"]}, ${address[1].postal_code.toUpperCase()}, ${capitaliseWords(camelCaseToNormal(address[1].country))} is currently incomplete.`,
+//                     message: `Click to complete the addresses.`,
+//                     link: `/${user.product}/addAddress/${address[0]}`,
+//                     buttonTitle: "View address",
+//                 } as TaskQueryReturnObject;
+//         }
+
+//             return {
+//                 dismissible: false,
+//                 severity: "info",
+//                 title: `You have ${incompleteAddresses} draft addresses waiting to be published.`,
+//                 message: `Click to review the addresses.`,
+//                 link: `/${user.product}/organisation/addresses`,
+//                 buttonTitle: "View addresses",
+//             } as TaskQueryReturnObject;
+//         },
+//     },
+//     registrationRequests: {
+//         callback: async (user) => {
+//             if (!getAccess(user, "addStaff")) return;
+
+//             const regRequests = await firebaseQuery.getCount("requests", [where("product", "==", user.product), where("oId", "==", user.oId)]);
+
+//             if (regRequests === 0) return;
+//             if (regRequests === 1) {
+//                 const request = Object.entries(await firebaseQuery.getDocsWhere("requests", [where("product", "==", user.product), where("oId", "==", user.oId)]) || {})[0] as [string, RegistrationRequest];
+//                 return {
+//                     dismissible: false,
+//                     severity: "primary",
+//                     title: `${request[1].forename} ${request[1].surname} has requested to access your organisation.`,
+//                     message: `Click to review these request.`,
+//                     link: `/${user.product}/organisation/staff/requests`,
+//                     buttonTitle: "View requests",
+//                 } as TaskQueryReturnObject;
+//         }
+
+//             return {
+//                 dismissible: false,
+//                 severity: "primary",
+//                 title: `${regRequests} people have requested to register with your organisation.`,
+//                 message: `Click to review these requests.`,
+//                 link: `/${user.product}/organisation/staff/requests`,
+//                 buttonTitle: "View requests",
+//             } as TaskQueryReturnObject;
+//         },
+//     },
+//     activateStaff: {
+//         callback: async (user) => {
+//             if (!getAccess(user, "addStaff")) return;
+
+//             const inactiveAccounts = await firebaseQuery.getCount("users", [where("product", "==", user.product), where("oId", "==", user.oId), where("status", "==", "inactive")]);
+
+//             if (inactiveAccounts === 0) return;
+//             if (inactiveAccounts === 1) {
+//                 const account = Object.entries(await firebaseQuery.getDocsWhere("users", [where("product", "==", user.product), where("oId", "==", user.oId), where("status", "==", "inactive")]) || {})[0] as [string, UserData];
+//                 return {
+//                     dismissible: false,
+//                     severity: "info",
+//                     title: `Activate ${account[1].details.forename} ${account[1].details.surname}'s staff account.`,
+//                     message: "Activate this account to give the user access to Placementt.",
+//                     link: `/${user.product}/organisation/staff/all`,
+//                     buttonTitle: "View accounts",
+//                 } as TaskQueryReturnObject;
+//         }
+
+//             return {
+//                 dismissible: false,
+//                 severity: "info",
+//                 title: `${inactiveAccounts} staff have inactive active accounts.`,
+//                 message: "Activate these accounts to give the user access to Placementt.",
+//                 link: `/${user.product}/organisation/staff/all`,
+//                 buttonTitle: "View accounts",
+//             } as TaskQueryReturnObject;
+//         },
+//     },
+//     placementStarting: {
+//         callback: async (user) => {
+//             const sevenDaysInFuture = new Date();
+//             sevenDaysInFuture.setDate(sevenDaysInFuture.getDate() + 7)
+
+//             const constraints = [where("providerId", "==", user.oId), where("startDate", "<=", convertDate(sevenDaysInFuture, "dbstring")), where("startDate", ">", dateToString(new Date()))];
+
+//             if (user.userGroup !== "admin") {
                 
-                if (!user.viewPlacementListings || user.viewPlacementListings === "none") return;
-                if (!user.viewAddresses || user.viewAddresses === "none") return;
-
-                if (user.viewPlacementListings === "request") {
-                    if (!user.visibleListings || user.visibleListings?.length === 0) return;
-                    constraints.push(where(documentId(), 'in', user.visibleListings));
-                } else {
-                    // viewPlacementListings must be 'all'
-
-                    if (user.viewAddresses === "request") {
-                        if (!user.visibleAddresses || user.visibleAddresses?.length === 0) return;
-                        constraints.push(where("addressId", 'in', user.visibleAddresses));
-                    }
-                }
-            }
-            const placementsStartingSoon = await firebaseQuery.getCount("placements", constraints);
+//                 if (!user.viewPlacementListings || user.viewPlacementListings === "none") return;
+//                 if (!user.viewAddresses || user.viewAddresses === "none") return;
+
+//                 if (user.viewPlacementListings === "request") {
+//                     if (!user.visibleListings || user.visibleListings?.length === 0) return;
+//                     constraints.push(where(documentId(), 'in', user.visibleListings));
+//                 } else {
+//                     // viewPlacementListings must be 'all'
+
+//                     if (user.viewAddresses === "request") {
+//                         if (!user.visibleAddresses || user.visibleAddresses?.length === 0) return;
+//                         constraints.push(where("addressId", 'in', user.visibleAddresses));
+//                     }
+//                 }
+//             }
+//             const placementsStartingSoon = await firebaseQuery.getCount("placements", constraints);
             
-            if (placementsStartingSoon === 0) return;
-            if (placementsStartingSoon === 1) {
-                const placement = Object.entries(await firebaseQuery.getDocsWhere("placements", constraints) || {})[0] as [string, StudentPlacementData];
-                const student = placement[1].uid ? await firebaseQuery.getDocData(["users", placement[1].uid]) as UserData : {
-                    details: {
-                        forename: placement[1].studentForename,
-                        surname: placement[1].studentSurname,
-                    }
-                };
-                return {
-                    dismissible: false,
-                    severity: "success",
-                    title: `${student.details.forename} ${student.details.surname}'s placement from ${convertDate(placement[1].startDate, "visual")} to ${convertDate(placement[1].endDate, "visual")} is starting in less than a week.`,
-                    message: `Click to view the placement and acquaint yourself with the student.`,
-                    link: `/${user.product}/placements/${placement[0]}`,
-                    buttonTitle: "View",
-                } as TaskQueryReturnObject;
-        }
-
-            return {
-                dismissible: false,
-                severity: "success",
-                title: `${placementsStartingSoon} placements starting soon.`,
-                message: `Click to view scheduled placements.`,
-                link: `/${user.product}/placementListings/placements`,
-                buttonTitle: "View placements",
-            } as TaskQueryReturnObject;
-        },
-    },
-    completeFeedback: {
-        callback: async (user) => {
-            return;
-            return {} as TaskQueryReturnObject;
-        },
-    },
-    setUpFeedback: {
-        callback: async (user) => {
-            return;
-            return {} as TaskQueryReturnObject;
-        },
-    },
-}
+//             if (placementsStartingSoon === 0) return;
+//             if (placementsStartingSoon === 1) {
+//                 const placement = Object.entries(await firebaseQuery.getDocsWhere("placements", constraints) || {})[0] as [string, StudentPlacementData];
+//                 const student = placement[1].uid ? await firebaseQuery.getDocData(["users", placement[1].uid]) as UserData : {
+//                     details: {
+//                         forename: placement[1].studentForename,
+//                         surname: placement[1].studentSurname,
+//                     }
+//                 };
+//                 return {
+//                     dismissible: false,
+//                     severity: "success",
+//                     title: `${student.details.forename} ${student.details.surname}'s placement from ${convertDate(placement[1].startDate, "visual")} to ${convertDate(placement[1].endDate, "visual")} is starting in less than a week.`,
+//                     message: `Click to view the placement and acquaint yourself with the student.`,
+//                     link: `/${user.product}/placements/${placement[0]}`,
+//                     buttonTitle: "View",
+//                 } as TaskQueryReturnObject;
+//         }
+
+//             return {
+//                 dismissible: false,
+//                 severity: "success",
+//                 title: `${placementsStartingSoon} placements starting soon.`,
+//                 message: `Click to view scheduled placements.`,
+//                 link: `/${user.product}/placementListings/placements`,
+//                 buttonTitle: "View placements",
+//             } as TaskQueryReturnObject;
+//         },
+//     },
+//     completeFeedback: {
+//         callback: async (user) => {
+//             return;
+//             return {} as TaskQueryReturnObject;
+//         },
+//     },
+//     setUpFeedback: {
+//         callback: async (user) => {
+//             return;
+//             return {} as TaskQueryReturnObject;
+//         },
+//     },
+// }
 
 export const getTips = async (user: UserData, organisation: InstituteData|ProviderData, addresses?: {[key: string]: OrganisationAddress}):Promise<(TaskQueryReturnObject)[]> => {
     const tipsObject = {
@@ -1106,17 +1154,17 @@ export const getTips = async (user: UserData, organisation: InstituteData|Provid
     return processedTips;
 }
 
-export const getTasks = async (user: UserData, organisation?: InstituteData|ProviderData, cohort?: CohortData):Promise<(TaskQueryReturnObject)[]> => {
+export const getTasks = async ({user, organisation, cohort, school}:{user: UserData, organisation?: InstituteData&ProviderData, cohort?: CohortData, school?: SchoolData}):Promise<(TaskQueryReturnObject)[]> => {
     // Cohort is either a specific one or all.
 
     if (user.product === "institutes" && user.userType === "Staff" && organisation) {
-        return await getInstituteTasks(user, organisation, cohort);
+        return await getInstituteTasks({user, organisation, cohort, school});
     }
     if (user.product === "students" || user.userType === "Students") {
         return await getStudentTasks(user, organisation, cohort);
     }
     if (user.product === "providers" && organisation) {
-        return await getProviderTasks(user, organisation);
+        // return await getProviderTasks(user, organisation);
     }
 
     return [];
@@ -1137,49 +1185,59 @@ const getStudentTasks = async (user: UserData, organisation?: InstituteData|Prov
     return processedTasks;
 };
 
-const getProviderTasks = async (user: UserData, organisation: InstituteData|ProviderData, cohort?: CohortData):Promise<(TaskQueryReturnObject)[]> => {
-    const processedTasks = await Object.entries(providerTasks).reduce(async (acc, [itemName, item]) => {
+// const getProviderTasks = async (user: UserData, organisation: InstituteData|ProviderData, cohort?: CohortData):Promise<(TaskQueryReturnObject)[]> => {
+//     const processedTasks = await Object.entries(providerTasks).reduce(async (acc, [itemName, item]) => {
 
-        const queryResult = await item.callback(user);
-        if (!queryResult) return await acc;
+//         const queryResult = await item.callback(user);
+//         if (!queryResult) return await acc;
 
-        const queryResultArray = Array.isArray(queryResult) ? queryResult : [queryResult];
-        const results = queryResultArray.map((r) => ({itemName: itemName as ProviderTaskNames, ...r}));
+//         const queryResultArray = Array.isArray(queryResult) ? queryResult : [queryResult];
+//         const results = queryResultArray.map((r) => ({itemName: itemName as ProviderTaskNames, ...r}));
 
-        (await acc).push(...results);
-        return await acc;
-    }, Promise.resolve<TaskQueryReturnObject[]>([]));
-    return processedTasks;};
+//         (await acc).push(...results);
+//         return await acc;
+//     }, Promise.resolve<TaskQueryReturnObject[]>([]));
+//     return processedTasks;};
 
-const getInstituteTasks = async (user: UserData, organisation: InstituteData|ProviderData, cohort?: CohortData):Promise<(TaskQueryReturnObject)[]> => {
+const getInstituteTasks = async ({user, organisation, cohort, school}:{user: UserData, organisation: InstituteData&ProviderData, cohort?: CohortData, school?: SchoolData}):Promise<(TaskQueryReturnObject)[]> => {
     let fCohort:CohortData|[string, CohortData][]|undefined = cohort;
-
-    if (!fCohort) {
-        // get all associated cohorts.
-        if (user.viewCohorts === "none") return([]);
-        if (user.userGroup === "admin" || user.viewCohorts === "all") {
-            const cohorts = await firebaseQuery.getDocsWhere("cohorts", [where("product", "==", user.product), where("oId", "==", user.oId), where("stage", "==", "created")]) as {[key:string]: CohortData};
-            fCohort = Object.entries(cohorts);
+    let fSchool:SchoolData|[string, SchoolData][]|undefined = school;
+
+    const getCohortsOrSchoolsIfNotProvided = async (type: "cohorts"|"schools") => {
+        if (user[`view${type}`] === "none") return([]);
+        if (user.userGroup === "admin" || user[`view${type}`] === "all") {
+            const constraints = [where("oId", "==", user.oId)];
+            if (type === "cohorts") {
+                constraints.push(where("product", "==", user.product), where("stage", "==", "created"));
+            }
+            const cohorts = await firebaseQuery.getDocsWhere(type, constraints) as {[key:string]: CohortData|SchoolData};
+            return Object.entries(cohorts);
         }
-        if (user.viewCohorts === "some") {
-            const cohorts = await user.visibleCohorts?.reduce(async (acc, cohortId) => {
-                const cohort = await firebaseQuery.getDocData(["cohorts", cohortId]) as CohortData;
-                if (cohort.stage !== "created") {
+        if (user[`view${type}`] === "some") {
+            const items = await user[`visible${type}s`]?.reduce(async (acc, itemId) => {
+                const item = await firebaseQuery.getDocData([type, itemId]) as CohortData;
+                if (type === "cohorts" && item.stage !== "created") {
                     return acc;
                 }
-                acc[cohortId] = cohort;
+                acc[itemId] = item;
                 return acc;
             }, Promise.resolve<[string, CohortData][]>([]));
-            fCohort = cohorts;
+            return items;
         }
     }
-    
+
+    if (!fCohort) {
+        fCohort = await getCohortsOrSchoolsIfNotProvided("cohorts");
+    }
+    if (!fSchool) {
+        fSchool = await getCohortsOrSchoolsIfNotProvided("schools");
+    }
     const processedTasks = await Object.entries(instituteTasks).reduce(async (acc, [itemName, item]) => {
         if (!fCohort) {
             console.log("No cohorts to retrieve tasks for");
             return([]);
         }
-        const queryResult = await item.callback(user, organisation, fCohort);
+        const queryResult = await item.callback({user, organisation, cohorts: fCohort, schools: fSchool});
         if (!queryResult) return await acc;
 
         const queryResultArray = Array.isArray(queryResult) ? queryResult : [queryResult];