#397 admin-update-teams (#491)

* fix-admin-update-teams * fixing update team info --------- Co-authored-by: uwimana janet <[email protected]>
atlp-rwanda · Sep 27, 2024 · 1393242 · 1393242
1 parent 4728a7e
commit 1393242
Show file tree

Hide file tree

Showing 4 changed files with 225 additions and 55 deletions.
diff --git a/src/components/ManagerCard.tsx b/src/components/ManagerCard.tsx
@@ -144,10 +144,10 @@ function ManagerCard() {
         grade,
         teamname: team.name,
         coordinator: team?.cohort?.coordinator?.profile
-          ? team.cohort.coordinator.profile.name
-          : team?.cohort.coordinator?.email,
+          ? team.cohort?.coordinator.profile.name
+          : team?.cohort?.coordinator?.email,
         ttl: team?.ttl?.profile ? team.ttl.profile.name : team?.ttl?.email,
-        phase: team.cohort.phase.name,
+        phase: team?.cohort?.phase?.name,
         week:
           calculateWeeks(team.startingPhase) > 0
             ? calculateWeeks(team.startingPhase)
@@ -161,9 +161,7 @@ function ManagerCard() {
     });
 
   return (
-    <div
-      className="font-serif px-4 md:px-0 pb-20 w-full dark:bg-dark-frame-bg dark:text-black h-full flex overflow-x-auto "
-    >
+    <div className="font-serif px-4 md:px-0 pb-20 w-full dark:bg-dark-frame-bg dark:text-black h-full flex overflow-x-auto ">
       {loading ? (
         <div className="flex items-center justify-center w-full h-full">
           <div className="spinner" />
@@ -172,7 +170,7 @@ function ManagerCard() {
         <div className="pl-10 flex">
           {teamData &&
             teamData.map((teamProps: any, index: number) => (
-              <Link key={index} to={`/team/${(teamProps.teamname)}`}>
+              <Link key={index} to={`/team/${teamProps.teamname}`}>
                 <Card {...teamProps} />
               </Link>
             ))}

diff --git a/src/components/teamDetails.tsx b/src/components/teamDetails.tsx
@@ -78,8 +78,8 @@ function TeamDetails() {
         cohort: team?.cohort?.name,
         teamname: team.name,
         coordinator: team?.cohort?.coordinator?.profile
-          ? team.cohort.coordinator.profile.name
-          : team?.cohort.coordinator?.email,
+          ? team.cohort?.coordinator.profile.name
+          : team?.cohort?.coordinator?.email,
         ttl: team?.ttl?.profile ? team.ttl.profile.name : team?.ttl?.email,
         Qty,
         Qnty,
@@ -90,8 +90,8 @@ function TeamDetails() {
 
   const selectedTeam = teamData
     ? teamData.find(
-      (team: { teamname: string | null }) => team.teamname === teamname,
-    )
+        (team: { teamname: string | null }) => team.teamname === teamname,
+      )
     : null;
   function getColor(rating: number) {
     if (rating >= 1.5 && rating <= 2) {
@@ -232,7 +232,7 @@ function TeamDetails() {
                   </h1>
                 </div>
                 <div className="relative dark:text-black">
-                  <p>Coordinator: {selectedTeam.coordinator}</p>
+                  <p>Coordinator: {selectedTeam?.coordinator}</p>
                   <p>TTL: {selectedTeam.ttl}</p>
                 </div>
               </div>
@@ -314,8 +314,8 @@ function TeamDetails() {
                             {selectedTeam.Qty >= 1.5 && selectedTeam.Qty <= 2
                               ? 'Good'
                               : selectedTeam.Qty >= 1 && selectedTeam.Qty < 1.5
-                                ? 'Improve'
-                                : 'Poor'}
+                              ? 'Improve'
+                              : 'Poor'}
                           </span>
                         </div>
                       </div>
@@ -351,8 +351,8 @@ function TeamDetails() {
                               ? 'Good'
                               : selectedTeam.Qnty >= 1 &&
                                 selectedTeam.Qnty < 1.5
-                                ? 'Improve'
-                                : 'Poor'}
+                              ? 'Improve'
+                              : 'Poor'}
                           </span>
                         </div>
                       </div>
@@ -386,12 +386,12 @@ function TeamDetails() {
                         </ul>
                         <span style={{ color: getColor(selectedTeam.skills) }}>
                           {selectedTeam.skills >= 1.5 &&
-                            selectedTeam.skills <= 2
+                          selectedTeam.skills <= 2
                             ? 'Good'
                             : selectedTeam.skills >= 1 &&
                               selectedTeam.skills < 1.5
-                              ? 'Improve'
-                              : 'Poor'}
+                            ? 'Improve'
+                            : 'Poor'}
                         </span>
                       </div>
                     </div>

diff --git a/src/containers/admin-dashBoard/Teams.tsx b/src/containers/admin-dashBoard/Teams.tsx
@@ -34,6 +34,9 @@ export interface Team {
   name: string;
   cohort: Cohort;
   ttl: any;
+  manager: any;
+  phase: any;
+  program: any;
 }
 
 export const getAllTeam = gql`
@@ -72,6 +75,15 @@ export const getAllTeam = gql`
         quality
         professional_Skills
       }
+      phase {
+        name
+      }
+      program {
+        name
+      }
+      manager {
+        email
+      }
     }
 
     getAllCohorts(orgToken: $orgToken) {
@@ -96,6 +108,15 @@ export const getAllTeam = gql`
       role
       organizations
     }
+    getAllPrograms(orgToken: $orgToken) {
+      id
+      name
+    }
+    getAllPhases(orgToken: $orgToken) {
+      id
+      name
+      description
+    }
   }
 `;
 
@@ -224,17 +245,16 @@ function AdminTeams() {
         }),
     },
   ];
-
-  const teamData = getData?.getAllTeams.map(({ name, cohort, ttl }) => ({
-    name,
-    cohortName: cohort?.name,
-    coordinator: cohort?.coordinator?.email
-      ? cohort?.coordinator?.email
-      : 'Not Assigned',
-    phase: cohort?.phase.name,
-    programName: cohort?.program?.name,
-    ttlEmail: ttl?.profile && ttl.profile.name ? ttl?.email : 'Not Assigned',
-  }));
+  const teamData = getData?.getAllTeams.map(
+    ({ name, cohort, ttl, phase, program, manager }) => ({
+      name,
+      cohortName: cohort?.name,
+      coordinator: manager?.email ? manager?.email : cohort?.coordinator?.email,
+      phase: phase?.name ? phase?.name : cohort?.phase?.name,
+      programName: program?.name ? program?.name : cohort?.program?.name,
+      ttlEmail: ttl?.profile && ttl.profile.name ? ttl?.email : 'Not Assigned',
+    }),
+  );
 
   return (
     <>