Merge branch 'staging' into master

mokletdev · Sep 18, 2024 · f3307d3 · f3307d3
2 parents a835be7 + 7a1331c
commit f3307d3
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 11 deletions.
diff --git a/src/app/(admin)/admin/tim/[id]/components/ProfileTim.tsx b/src/app/(admin)/admin/tim/[id]/components/ProfileTim.tsx
@@ -39,6 +39,14 @@ function TimLayout({ tim }: Readonly<{ tim: TimWithRelations }>) {
   const [official] = useState(
     tim.anggotas.find((value) => value.posisi === "OFFICIAL")
   );
+
+  const [cc1] = useState(
+    tim.anggotas.find((value) => value.posisi === "CERDAS_CERMAT1")
+  );
+  const [cc2] = useState(
+    tim.anggotas.find((value) => value.posisi === "CERDAS_CERMAT2")
+  );
+
   const tim_id = tim.id;
 
   return (
@@ -82,23 +90,19 @@ function TimLayout({ tim }: Readonly<{ tim: TimWithRelations }>) {
           <AnggotaCardsWrapper>
             <AnggotaCard
               href={`/admin/tim/${tim_id}/cerdas_cermat1`}
-              image={tim.foto_mascot ?? "/placeholder-profile-picture.jpg"}
+              image={cc1?.foto ?? "/placeholder-profile-picture.jpg"}
               name={
-                tim.foto_mascot
-                  ? "cerdas cermat 1 " + tim.nama_tim
-                  : "Belum Diisi"
+                cc1?.foto ? "cerdas cermat 1 " + tim.nama_tim : "Belum Diisi"
               }
-              posisi={"Cerdas Cermat 2"}
+              posisi={"Cerdas Cermat 1"}
             />
             <AnggotaCard
               href={`/admin/tim/${tim_id}/cerdas_cermat2`}
-              image={tim.foto_mascot ?? "/placeholder-profile-picture.jpg"}
+              image={cc2?.foto ?? "/placeholder-profile-picture.jpg"}
               name={
-                tim.foto_mascot
-                  ? "cerdas cermat 2 " + tim.nama_tim
-                  : "Belum Diisi"
+                cc2?.foto ? "cerdas cermat 2 " + tim.nama_tim : "Belum Diisi"
               }
-              posisi={"Cerdas Cermat 1"}
+              posisi={"Cerdas Cermat 2"}
             />
           </AnggotaCardsWrapper>
         )}

diff --git a/src/app/(admin)/admin/tim/components/Table.tsx b/src/app/(admin)/admin/tim/components/Table.tsx
@@ -39,8 +39,9 @@ export default function TimTable({ data }: { data: TimWithRelations[] }) {
       cell: (row: TimWithRelations) => (
         <span className={"bg-[#]"}>{row.anggotas.length}</span>
       ),
+      selector: (row: TimWithRelations) => row.anggotas.length,
 
-      sortable: false,
+      sortable: true,
     },
   ];