Org Table Changes

client/src/AdminDashboard/AdminDashboardPage.tsx

@@ -12,7 +12,9 @@ function AdminDashboardPage() {
   return (
     <ScreenGrid>
       <Grid item>
-        <Typography variant="h2">Welcome to the Admin Dashboard</Typography>
+        <Typography variant="h2">
+          Welcome to the Admin User Dashboard
+        </Typography>
       </Grid>
       <Grid item container width="60vw" justifyContent="flex-end">
         <InviteUserButton />

client/src/AdminDashboard/OrgAdminPage.tsx

@@ -12,7 +12,9 @@ function OrgAdminPage() {
   return (
     <ScreenGrid>
       <Grid item>
-        <Typography variant="h2">Welcome to the Admin Dashboard</Typography>
+        <Typography variant="h2">
+          Welcome to the Admin Organization Dashboard
+        </Typography>
       </Grid>
       <Grid item>
         <div style={{ height: '60vh', width: '60vw' }}>

client/src/AdminDashboard/OrgTable.tsx

@@ -78,9 +78,8 @@ function OrgTable() {
     try {
       const [kitchenRes, programRes] = await Promise.all([
         getData(`kitchen_outcomes/get/all/${organizationId}`),
-        getData(`program_outcomes/get/all/${organizationId}`),
+        getData(`program_outcomes/org/${organizationId}/all`),
       ]);
-
       setKitchenOutcomes(kitchenRes.data);
       setProgramOutcomes(programRes.data);
 
@@ -146,7 +145,7 @@ function OrgTable() {
       ),
     }));
 
-    const programRows: OutcomeRow[] = programOutcomes.map((outcome) => ({
+    const programRows: OutcomeRow[] = programOutcomes.map((outcome: any) => ({
       // eslint-disable-next-line no-underscore-dangle
       key: outcome._id,
       date: new Date(outcome.year).toISOString().slice(0, 10),
@@ -197,12 +196,8 @@ function OrgTable() {
           </MenuItem>
         ))}
       </Select>
-
-      <Box mt={2} />
-
       {/* Outcomes Table */}
       <PaginationTable rows={createOutcomeRows()} columns={columns} />
-
       {/* Notification Snackbar */}
       <Snackbar
         open={notification.open}

server/src/services/program.outcomes.service.ts

@@ -18,7 +18,7 @@ const getOneProgramOutcomes = async (year: Date, orgId: string) => {
   const endDate = new Date(Date.UTC(year.getFullYear() + 1, 0, 1));
 
   const outcomes = await ProgramOutcomes.findOne({
-    orgId: orgId,
+    orgId,
     year: {
       $gte: startDate,
       $lt: endDate,
@@ -40,7 +40,7 @@ const getAllProgramOutcomesByOrg = async (orgId: string) => {
 const getDistinctYearsByOrgId = async (orgId: string): Promise<number[]> => {
   console.log('Service - Getting years for orgId:', orgId);
   const outcomes = await ProgramOutcomes.find({ orgId }, ['year']);
-  const years = outcomes.map((outcome) => outcome.year.getUTCFullYear());
+  const years = outcomes.map((outcome: any) => outcome.year.getUTCFullYear());
   return [...new Set(years)].sort((a, b) => b - a);
 };
 
@@ -112,20 +112,20 @@ const getNetworkAverage = async (
 
 const getFieldValuesByYear = async (
   orgId: string,
-  field: keyof IProgramOutcomes
+  field: keyof IProgramOutcomes,
 ): Promise<Map<number, number | null>> => {
   try {
     const outcomes = await ProgramOutcomes.find(
-      { 
+      {
         orgId,
-        [field]: { $exists: true }
+        [field]: { $exists: true },
       },
-      ['year', field]
+      ['year', field],
     ).exec();
 
     const valuesByYear = new Map<number, number | null>();
-    
-    outcomes.forEach(outcome => {
+
+    outcomes.forEach((outcome: any) => {
       const year = outcome.year.getUTCFullYear();
       const value = outcome[field] as number | null;
       valuesByYear.set(year, value);