diff --git a/src/app/api/division/[id]/route.ts b/src/app/api/division/[id]/route.ts
index 07b33c8..85b6110 100644
--- a/src/app/api/division/[id]/route.ts
+++ b/src/app/api/division/[id]/route.ts
@@ -36,7 +36,8 @@ export async function GET(request: Request, context: { params: { id: string } })
idUser: true,
User: {
select: {
- name: true
+ name: true,
+ img: true
}
}
},
@@ -47,7 +48,8 @@ export async function GET(request: Request, context: { params: { id: string } })
const fixMember = member.map((v: any) => ({
..._.omit(v, ["User"]),
- name: v.User.name
+ name: v.User.name,
+ img: v.User.img
}))
const dataFix = {
diff --git a/src/module/division_new/lib/type_division.ts b/src/module/division_new/lib/type_division.ts
index 3572cec..ea6bbf0 100644
--- a/src/module/division_new/lib/type_division.ts
+++ b/src/module/division_new/lib/type_division.ts
@@ -55,5 +55,6 @@ export interface IDataMemberDivision {
idUser: string,
isAdmin: string,
isLeader: string,
- name: string
+ name: string,
+ img: string
}
\ No newline at end of file
diff --git a/src/module/task/ui/create_task.tsx b/src/module/task/ui/create_task.tsx
index ed0f1e6..e2911ea 100644
--- a/src/module/task/ui/create_task.tsx
+++ b/src/module/task/ui/create_task.tsx
@@ -153,7 +153,7 @@ export default function CreateTask() {
borderRadius: 10,
}}
>
- Tambah Anggota
+ Tambah Anggota
@@ -205,7 +205,7 @@ export default function CreateTask() {
{
member.length > 0 &&
-
+
Anggota Terpilih
Total {member.length} Anggota
@@ -229,7 +229,7 @@ export default function CreateTask() {
key={i}
>
-
+
{v.name}
diff --git a/src/module/task/ui/create_users_project.tsx b/src/module/task/ui/create_users_project.tsx
index 1b15d8d..20079fe 100644
--- a/src/module/task/ui/create_users_project.tsx
+++ b/src/module/task/ui/create_users_project.tsx
@@ -4,18 +4,15 @@ import { funGetDivisionById, IDataMemberDivision } from "@/module/division_new";
import { useHookstate } from "@hookstate/core";
import {
ActionIcon,
- Anchor,
Avatar,
Box,
Button,
- Checkbox,
Divider,
Flex,
Group,
rem,
Skeleton,
Text,
- TextInput,
} from "@mantine/core";
import { useShallowEffect } from "@mantine/hooks";
import { useParams, useRouter } from "next/navigation";
@@ -23,6 +20,8 @@ import React, { useState } from "react";
import toast from "react-hot-toast";
import { globalMemberTask } from "../lib/val_task";
import { FaCheck } from "react-icons/fa6";
+import { RiListCheck } from "react-icons/ri";
+import { BsListCheck } from "react-icons/bs";
export default function CreateUsersProject({ onClose }: { onClose: (val: any) => void }) {
const router = useRouter()
@@ -64,7 +63,7 @@ export default function CreateUsersProject({ onClose }: { onClose: (val: any) =>
if (selectedFiles.some((i: any) => i.idUser == isData[index].idUser)) {
setSelectedFiles(selectedFiles.filter((i: any) => i.idUser != isData[index].idUser))
} else {
- setSelectedFiles([...selectedFiles, { idUser: isData[index].idUser, name: isData[index].name }])
+ setSelectedFiles([...selectedFiles, { idUser: isData[index].idUser, name: isData[index].name, img: isData[index].img }])
}
};
@@ -76,7 +75,7 @@ export default function CreateUsersProject({ onClose }: { onClose: (val: any) =>
for (let index = 0; index < isData.length; index++) {
if (!selectedFiles.some((i: any) => i.idUser == isData[index].idUser)) {
const newArr = {
- idUser: isData[index].idUser, name: isData[index].name
+ idUser: isData[index].idUser, name: isData[index].name, img: isData[index].img
}
setSelectedFiles((selectedFiles: any) => [...selectedFiles, newArr])
}
@@ -112,10 +111,10 @@ export default function CreateUsersProject({ onClose }: { onClose: (val: any) =>
Pilih Semua Anggota
- {selectAll ? : ""}
+
}
-
+
{loading ?
Array(3)
.fill(null)
@@ -146,7 +145,7 @@ export default function CreateUsersProject({ onClose }: { onClose: (val: any) =>
handleFileClick(i)}>
-
+