placementt-core 1.20.211 → 11.10.151

package/src/index.ts

@@ -1,34 +1,34 @@
-
-export * from "./firebase/firebase";
-export * from "./firebase/readDatabase";
-export * from "./firebase/writeDatabase";
-export * from "./firebase/util";
-export * from "./firebase/firebaseConfig";
-export * from "./firebase/firebaseQuery";
-
-export * from "./typeDefinitions";
-export * from "./tutorialTips";
-export * from "./constants";
-export * from "./hooks";
-export * from "./util";
-export * from "./images/GatsbyBenchmarks";
-export * from "./databaseTypes";
-export * from "./tasksAndTips";
-export * from "./config";
-export * from "./features/jobs/jobsSlice";
-export * from "./features/analytics/useAnalytics"
-export * from "./features/global/downtime/useDowntime";
-export * from "./features/dropdown/useDropdown";
-export * from "./features/contacts/useContacts";
-export * from "./features/contacts/contactsSlice";
-export * from "./features/placements/studentPlacements/upcomingStudentPlacementsSlice";
-export * from "./features/placements/studentPlacements/completedStudentPlacementsSlice";
-export * from "./features/placements/studentPlacements/useStudentPlacements";
-export * from "./features/referrals/useReferrals";
-export * from "./features/updates/useUpdates";
-export * from "./features/global/users/useUserFunctions";
-export * from "./apiCalls";
-export * from "./DatabaseDefinitions";
-export * from "./reduxHooks"
-
-
+
+export * from "./firebase/firebase";
+export * from "./firebase/readDatabase";
+export * from "./firebase/writeDatabase";
+export * from "./firebase/util";
+export * from "./firebase/firebaseConfig";
+export * from "./firebase/firebaseQuery";
+
+export * from "./typeDefinitions";
+export * from "./tutorialTips";
+export * from "./constants";
+export * from "./hooks";
+export * from "./util";
+export * from "./images/GatsbyBenchmarks";
+export * from "./databaseTypes";
+export * from "./tasksAndTips";
+export * from "./config";
+export * from "./features/jobs/jobsSlice";
+export * from "./features/analytics/useAnalytics"
+export * from "./features/global/downtime/useDowntime";
+export * from "./features/dropdown/useDropdown";
+export * from "./features/contacts/useContacts";
+export * from "./features/contacts/contactsSlice";
+export * from "./features/placements/studentPlacements/upcomingStudentPlacementsSlice";
+export * from "./features/placements/studentPlacements/completedStudentPlacementsSlice";
+export * from "./features/placements/studentPlacements/useStudentPlacements";
+export * from "./features/referrals/useReferrals";
+export * from "./features/updates/useUpdates";
+export * from "./features/global/users/useUserFunctions";
+export * from "./apiCalls";
+export * from "./DatabaseDefinitions";
+export * from "./reduxHooks"
+
+

package/src/readDatabase.tsx

@@ -1,4 +1,4 @@
-
-export const getContact = async (contactId: number, ) => {
-
+
+export const getContact = async (contactId: number, ) => {
+
 }

package/src/reduxHooks.ts

@@ -1,201 +1,232 @@
-import { orderBy, where } from "firebase/firestore"
-import { TypedUseSelectorHook, useDispatch, useSelector } from "react-redux"
-import { AppDispatch, RootState } from "./config"
-import { addContact, deleteContact, setContacts, updateContact } from "./features/contacts/contactsSlice"
-import { Job, addJob, setJobStatus, setJobs, setMarkRead } from "./features/jobs/jobsSlice"
-import { editActivePlacement, fetchActivePlacement, setActivePlacement } from "./features/placements/studentPlacements/activePlacement"
-import { addCompletedStudentPlacements, deleteCompletedStudentPlacement, setCompletedStudentPlacements, updateCompletedStudentPlacement } from "./features/placements/studentPlacements/completedStudentPlacementsSlice"
-import { addUpcomingStudentPlacements, deleteUpcomingStudentPlacement, setUpcoming, setUpcomingStudentPlacements, updateUpcomingStudentPlacement } from "./features/placements/studentPlacements/upcomingStudentPlacementsSlice"
-import FirebaseQuery from "./firebase/firebaseQuery"
-import { Contact, StudentPlacementData, UserData } from "./typeDefinitions"
-import { getPlacementsWhere } from "./firebase/readDatabase"
-import { convertDate } from "./firebase/util"
-
-export const useAppSelector: TypedUseSelectorHook<RootState> = useSelector
-export const useAppDispatch = () => useDispatch<AppDispatch>();
-
-
-export function useStudent({user} : {user: UserData}) {
-    if (!user || user.product !== "students") return {};
-    
-    const upcomingPlacements = useAppSelector((state) => state.upcomingStudentPlacements.values)
-    const completedPlacements = useAppSelector((state) => state.completedStudentPlacements.values)
-    const activePlacement = useAppSelector((state) => state.activePlacement.values)
-    const upcoming = useAppSelector((state) => state.upcomingStudentPlacements.upcoming)
-    const contacts = useAppSelector((state) => state.contacts.values)
-    const firebaseQuery = new FirebaseQuery();
-    
-    const dispatch = useAppDispatch();
-
-    const today = new Date();
-
- 
-    const dispatchActivePlacement = () => {
-        dispatch(fetchActivePlacement({userId: user.id}))
-    }
-
-    const fetchUpcomingPlacements = () => {
-        const constraints = [where("uid", "==", user.id), where("inProgress", "==", true), orderBy("startDate")]
-        firebaseQuery.collectionSnapshot(setUpcomingStudentPlacements, "placements", constraints, dispatch);
-    }
-
-    const fetchCompletedPlacements = () => {
-        const constraints = [where("uid", "==", user.id), where("completed", "==", true), orderBy("startDate")]
-        firebaseQuery.collectionSnapshot(setCompletedStudentPlacements, "placements", constraints, dispatch);
-    }
-
-    const fetchContacts = () => {
-        const constraints = [where("uid", "==", user.id)]
-        firebaseQuery.collectionSnapshot(setContacts, "contacts", constraints, dispatch);
-    }
-
-    const updateUpcomingPlacement = () => {
-        if (!upcomingPlacements || !Object.entries(upcomingPlacements).length) {
-            dispatch(setUpcoming(undefined));
-            return;
-        }
-        const upcomingPlacement = Object.entries(upcomingPlacements).find(([, v]) => new Date(v.startDate).getTime() > today.getTime())
-        upcomingPlacement ? dispatch(setUpcoming(upcomingPlacement[1])) : dispatch(setUpcoming(undefined))
-    }
-
-    const updateActivePlacement = () => {
-        const key = Object.keys(upcomingPlacements).find((key) => {
-            const placement = upcomingPlacements[key]
-            return placement.active
-        })
-        key ? dispatch(setActivePlacement(upcomingPlacements[key])) : dispatch(setActivePlacement(null))
-    }
-
-    const getItemById = async (path: "contacts"|"placements", id: string) => {
-        return await firebaseQuery.getDocData([path, id]) 
-    }
-
-    const handleDeletePlacement = async (id: string) => {
-        if (upcomingPlacements[id]) dispatch(deleteUpcomingStudentPlacement({placementId: id}))
-        else dispatch(deleteCompletedStudentPlacement({placementId: id}))
-    }
-
-    const handleUpdatePlacement = async (id: string, attributes: Partial<StudentPlacementData>)  => {
-        if (upcomingPlacements[id]) dispatch(updateUpcomingStudentPlacement({placementId: id, attributes}))
-        else dispatch(updateCompletedStudentPlacement({placementId: id, attributes}))
-    }
-
-    const handleAddPlacement = async (formData: StudentPlacementData) => {
-       if (formData.completed) dispatch(addCompletedStudentPlacements({formData}))
-       else dispatch(addUpcomingStudentPlacements({formData}))
-    }
-
-    const getUserPlacements = async () => {
-        return await getPlacementsWhere({w: where("uid", "==", user?.id)})
-    }
-
-    const getPlacementsStart = async (start: Date, end: Date) => {
-        return await firebaseQuery.getDocsWhere("placements", [where("uid", "==", user?.id), where("startDate", ">=", convertDate(start, "dbstring")), where("startDate", "<=", convertDate(end, "dbstring"))]) as {[key:string]: StudentPlacementData};
-    }
-
-    const getPlacementsEnd = async (end: Date) => {
-        return await firebaseQuery.getDocsWhere("placements", [where("uid", "==", user?.id), where("endDate", ">=", convertDate(end, "dbstring")), where("endDate", "<=", convertDate(end, "dbstring"))]) as {[key:string]: StudentPlacementData};
-    }
-
-    return {
-        contacts: {
-            add: async (contactForm: Contact) => await dispatch(addContact({contactForm: contactForm, userId: user.id})),
-            update: async (contactId: string, data: Partial<Contact>) => await dispatch(updateContact({contactId: contactId, attributes: data})),
-            delete: async (contactId: string) => await dispatch(deleteContact({contactId: contactId})),
-            contacts,
-            fetchContacts,
-            getById: async (item: string) => await getItemById("contacts", item)
-        },
-
-        placements: {
-            add: async (formData: StudentPlacementData) => await handleAddPlacement(formData),
-            update: async (placementId: string, attributes: Partial<StudentPlacementData>) => await handleUpdatePlacement(placementId, attributes),
-            delete: async (id: string) => await handleDeletePlacement(id),
-            getUserPlacements,
-            getPlacementsStart,
-            getPlacementsEnd,
-            activePlacement,
-            editActivePlacement: (attributes: Partial<StudentPlacementData>) => dispatch(editActivePlacement(attributes)),
-            updateActivePlacement,
-            updateUpcomingPlacement,
-            fetchUpcomingPlacements,
-            fetchCompletedPlacements,
-            dispatchActivePlacement,
-            upcoming,
-            upcomingPlacements: upcomingPlacements || {}, 
-            completedPlacements: completedPlacements || {},
-            getById: async (item: string) => await getItemById("placements", item)
-        }
-    } ;
-};
-
-
-export function useInstituteStaff({user}: {user: UserData}) {
-    const firebaseQuery = new FirebaseQuery();
-    const dispatch = useAppDispatch();
-
-    if (!user || user?.product !== "institutes" || user.userType !== "Staff") return {};
-
-    const getJobById = async (id: string) => {
-        try {
-            const job = await firebaseQuery.getDocData(["jobs", id]) 
-            return job
-           
-          } catch (error) {
-            throw error
-          }
-    }
-
-    return {
-        jobs: {
-            setJobs: async (jobs: {[jobId: string]: Job}) => dispatch(setJobs(jobs)),
-            addJob: async ({job, jobId} : {job: Partial<Job>, jobId: string}) => dispatch(addJob({job: job, jobId: jobId})),
-            setMarkRead: async (payload) =>  dispatch(setMarkRead(payload)),
-            setJobStatus: async ({jobId, status}: {jobId: string, status: string}) => dispatch(setJobStatus({jobId: jobId, status: status})),
-            getById: getJobById
-        }
-    }
-
-
-}
-
-export function useInstituteStudent({user}: {user: UserData}) {
-    const {contacts, placements} = useStudent({user});
-
-    if (!user || user?.product !== "institutes" || user.userType !== "Students") return {};
-
-    return {
-        contacts,
-        placements
-    }
-
-}
-
-export function useProvider({user}: {user: UserData}) {
-    if (!user || user?.product !== "providers") return {};
-    
-    const {jobs} = useInstituteStaff({user});
-
-    return {
-        jobs
-    }
-
-}
-
-
-
-// function MyContactComponent() {
-//     const {contacts} = useStudent({});
-
-//     contacts.add({data})
-
-//     return null
-// }
-
-// function MyPlacementComponent() {
-//     const {placements} = useStudent();
-
-//     placements.add({data})
-
-//     return null
+import { orderBy, where } from "firebase/firestore"
+import { useEffect, useState } from "react"
+import { TypedUseSelectorHook, useDispatch, useSelector } from "react-redux"
+import { AppDispatch, RootState } from "./config"
+import { addContact, deleteContact, setContacts, updateContact } from "./features/contacts/contactsSlice"
+import { Job, addJob, setJobStatus, setJobs, setMarkRead } from "./features/jobs/jobsSlice"
+import { editActivePlacement, fetchActivePlacement, setActivePlacement } from "./features/placements/studentPlacements/activePlacement"
+import { addCompletedStudentPlacements, deleteCompletedStudentPlacement, setCompletedStudentPlacements, updateCompletedStudentPlacement } from "./features/placements/studentPlacements/completedStudentPlacementsSlice"
+import { addUpcomingStudentPlacements, deleteUpcomingStudentPlacement, setUpcoming, setUpcomingStudentPlacements, updateUpcomingStudentPlacement } from "./features/placements/studentPlacements/upcomingStudentPlacementsSlice"
+import FirebaseQuery from "./firebase/firebaseQuery"
+import { Address, Application, Contact, PlacementListing, ProviderData, StudentPlacementData, UserData } from "./typeDefinitions"
+import {getPlacementsWhere} from "./firebase/readDatabase"
+import {convertDate} from "./firebase/util"
+
+export const useAppSelector: TypedUseSelectorHook<RootState> = useSelector
+export const useAppDispatch = () => useDispatch<AppDispatch>();
+
+
+export function useStudent({user} : {user: UserData}) {
+    if (!user || user.product !== "students") return {};
+    
+    const upcomingPlacements = useAppSelector((state) => state.upcomingStudentPlacements.values)
+    const completedPlacements = useAppSelector((state) => state.completedStudentPlacements.values)
+    const activePlacement = useAppSelector((state) => state.activePlacement.values)
+    const upcoming = useAppSelector((state) => state.upcomingStudentPlacements.upcoming)
+    const contacts = useAppSelector((state) => state.contacts.values)
+    const [applications, setApplications] = useState<{[key: string]: Application&{listing: PlacementListing|false, provider: ProviderData, address: Address}}>();
+    const firebaseQuery = new FirebaseQuery();
+    
+    const dispatch = useAppDispatch();
+
+    const today = new Date();
+
+    const applicationsConstraints = [where("uid", "==", user.id)]
+    const upcomingPlacementsConstraints = [where("uid", "==", user.id), where("inProgress", "==", true)]
+    const completedPlacementsConstraints = [where("uid", "==", user.id), where("completed", "==", true)]
+    const contactsConstraints = [where("uid", "==", user.id)]
+
+    useEffect(() => {
+        firebaseQuery.collectionSnapshot(setUpcomingStudentPlacements, "placements", upcomingPlacementsConstraints, dispatch);
+        firebaseQuery.collectionSnapshot(setCompletedStudentPlacements, "placements", completedPlacementsConstraints, dispatch);
+        firebaseQuery.collectionSnapshot(setContacts, "contacts", contactsConstraints, dispatch);
+        firebaseQuery.collectionSnapshot(async (fApplications: {[key: string]: Application}) => {
+
+            const applicationsWithProviderAndListing:{[key: string]: Application&{listing: PlacementListing, provider: ProviderData, address: Address}} = Object.fromEntries(await Promise.all(Object.entries(fApplications).map(async ([id, application]) => {
+                const provider = await firebaseQuery.getDocData(["providers", application.providerId]) as ProviderData;
+                const listing = await firebaseQuery.getDocData(["placementListings", application.listingId]).catch(() => false) as PlacementListing|false;
+                const address = listing && listing?.addressId && await firebaseQuery.getDocData(["addresses", listing.addressId]) as Address;
+
+                return [id, {...application, listing: listing, provider: provider, address: address}];
+            })));
+
+            setApplications(applicationsWithProviderAndListing);
+
+        }, "applications", applicationsConstraints);
+    }, [user.id]);
+/*
+    useEffect(() => {
+        if (!user.id) return
+        dispatch(fetchActivePlacement({userId: user.id}))
+    }, [dispatch, user.id, upcomingPlacements]);
+*/
+    const fetchUpcomingPlacements = () => {
+        const constraints = [where("uid", "==", user.id), where("inProgress", "==", true), orderBy("startDate")]
+        firebaseQuery.collectionSnapshot(setUpcomingStudentPlacements, "placements", constraints, dispatch);
+    }
+
+    const fetchCompletedPlacements = () => {
+        const constraints = [where("uid", "==", user.id), where("completed", "==", true), orderBy("startDate")]
+        firebaseQuery.collectionSnapshot(setCompletedStudentPlacements, "placements", constraints, dispatch);
+    }
+
+    const fetchContacts = () => {
+        const constraints = [where("uid", "==", user.id)]
+        firebaseQuery.collectionSnapshot(setContacts, "contacts", constraints, dispatch);
+    }
+
+    const updateUpcomingPlacement = () => {
+        if (!upcomingPlacements || !Object.entries(upcomingPlacements).length) {
+            dispatch(setUpcoming(undefined));
+            return;
+        }
+        const upcomingPlacement = Object.entries(upcomingPlacements).find(([, v]) => new Date(v.startDate).getTime() > today.getTime())
+        upcomingPlacement ? dispatch(setUpcoming(upcomingPlacement[1])) : dispatch(setUpcoming(undefined))
+    }
+
+    const updateActivePlacement = () => {
+        const key = Object.keys(upcomingPlacements).find((key) => {
+            const placement = upcomingPlacements[key]
+            return placement.active
+        })
+        key ? dispatch(setActivePlacement(upcomingPlacements[key])) : dispatch(setActivePlacement(null))
+    }
+
+    const getItemById = async (path: "contacts"|"placements", id: string) => {
+        return await firebaseQuery.getDocData([path, id]) 
+    }
+
+    const handleDeletePlacement = async (id: string) => {
+        if (upcomingPlacements[id]) dispatch(deleteUpcomingStudentPlacement({placementId: id}))
+        else dispatch(deleteCompletedStudentPlacement({placementId: id}))
+    }
+
+    const handleUpdatePlacement = async (id: string, attributes: Partial<StudentPlacementData>)  => {
+        if (upcomingPlacements[id]) dispatch(updateUpcomingStudentPlacement({placementId: id, attributes}))
+        else dispatch(updateCompletedStudentPlacement({placementId: id, attributes}))
+    }
+
+    const handleAddPlacement = async (formData: StudentPlacementData) => {
+       if (formData.completed) dispatch(addCompletedStudentPlacements({formData}))
+       else dispatch(addUpcomingStudentPlacements({formData}))
+    }
+
+    const getUserPlacements = async () => {
+        return await getPlacementsWhere({w: where("uid", "==", user?.id)})
+    }
+
+    const getPlacementsStart = async (start: Date, end: Date) => {
+        return await firebaseQuery.getDocsWhere("placements", [where("uid", "==", user?.id), where("startDate", ">=", convertDate(start, "dbstring")), where("startDate", "<=", convertDate(end, "dbstring"))]) as {[key:string]: StudentPlacementData};
+    }
+
+    const getPlacementsEnd = async (end: Date) => {
+        return await firebaseQuery.getDocsWhere("placements", [where("uid", "==", user?.id), where("endDate", ">=", convertDate(end, "dbstring")), where("endDate", "<=", convertDate(end, "dbstring"))]) as {[key:string]: StudentPlacementData};
+    }
+
+    const dispatchActivePlacement = () => {
+        dispatch(fetchActivePlacement({userId: user.id}))
+    }
+
+    return {
+        contacts: {
+            add: async (contactForm: Contact) => await dispatch(addContact({contactForm: contactForm, userId: user.id})),
+            update: async (contactId: string, data: Partial<Contact>) => await dispatch(updateContact({contactId: contactId, attributes: data})),
+            delete: async (contactId: string) => await dispatch(deleteContact({contactId: contactId})),
+            contacts,
+            fetchContacts,
+            getById: async (item: string) => await getItemById("contacts", item)
+        },
+
+        placements: {
+            add: async (formData: StudentPlacementData) => await handleAddPlacement(formData),
+            update: async (placementId: string, attributes: Partial<StudentPlacementData>) => await handleUpdatePlacement(placementId, attributes),
+            delete: async (id: string) => await handleDeletePlacement(id),
+            getUserPlacements,
+            getPlacementsStart,
+            getPlacementsEnd,
+            activePlacement,
+            editActivePlacement: (attributes: Partial<StudentPlacementData>) => dispatch(editActivePlacement(attributes)),
+            updateActivePlacement,
+            updateUpcomingPlacement,
+            fetchUpcomingPlacements,
+            fetchCompletedPlacements,
+            dispatchActivePlacement,
+            upcoming,
+            upcomingPlacements: upcomingPlacements || {}, 
+            completedPlacements: completedPlacements || {},
+            getById: async (item: string) => await getItemById("placements", item)
+        },
+        applications: applications,
+    } ;
+};
+
+
+export function useInstituteStaff({user}: {user: UserData}) {
+    const firebaseQuery = new FirebaseQuery();
+    const dispatch = useAppDispatch();
+
+    if (!user || user?.product !== "institutes" || user.userType !== "Staff") return {};
+
+    const getJobById = async (id: string) => {
+        try {
+            const job = await firebaseQuery.getDocData(["jobs", id]) 
+            return job
+           
+          } catch (error) {
+            throw error
+          }
+    }
+
+    return {
+        jobs: {
+            setJobs: async (jobs: {[jobId: string]: Job}) => dispatch(setJobs(jobs)),
+            addJob: async ({job, jobId} : {job: Partial<Job>, jobId: string}) => dispatch(addJob({job: job, jobId: jobId})),
+            setMarkRead: async (payload) =>  dispatch(setMarkRead(payload)),
+            setJobStatus: async ({jobId, status}: {jobId: string, status: string}) => dispatch(setJobStatus({jobId: jobId, status: status})),
+            getById: getJobById
+        }
+    }
+
+
+}
+
+export function useInstituteStudent({user}: {user: UserData}) {
+    const {contacts, placements} = useStudent({user});
+
+    if (!user || user?.product !== "institutes" || user.userType !== "Students") return {};
+
+    return {
+        contacts,
+        placements
+    }
+
+}
+
+export function useProvider({user}: {user: UserData}) {
+    if (!user || user?.product !== "providers") return {};
+    
+    const {jobs} = useInstituteStaff({user});
+
+    return {
+        jobs
+    }
+
+}
+
+
+
+// function MyContactComponent() {
+//     const {contacts} = useStudent({});
+
+//     contacts.add({data})
+
+//     return null
+// }
+
+// function MyPlacementComponent() {
+//     const {placements} = useStudent();
+
+//     placements.add({data})
+
+//     return null
 // }