diff --git a/src/app/api/calender/[id]/route.ts b/src/app/api/calender/[id]/route.ts index d59d363..34149d1 100644 --- a/src/app/api/calender/[id]/route.ts +++ b/src/app/api/calender/[id]/route.ts @@ -66,17 +66,17 @@ export async function GET(request: Request, context: { params: { id: string } }) select: { id: true, name: true, - email: true + email: true, + img: true } } } }) const fixMember = member.map((v: any) => ({ ..._.omit(v, ["User"]), - name: v.User.name, email: v.User.email, - + img: v.User.img })) diff --git a/src/app/api/discussion/[id]/route.ts b/src/app/api/discussion/[id]/route.ts index 71e9848..9067a37 100644 --- a/src/app/api/discussion/[id]/route.ts +++ b/src/app/api/discussion/[id]/route.ts @@ -43,7 +43,8 @@ export async function GET(request: Request, context: { params: { id: string } }) createdAt: true, User: { select: { - name: true + name: true, + img: true } }, DivisionDisscussionComment: { @@ -53,7 +54,8 @@ export async function GET(request: Request, context: { params: { id: string } }) createdAt: true, User: { select: { - name: true + name: true, + img: true } } } @@ -63,16 +65,17 @@ export async function GET(request: Request, context: { params: { id: string } }) const { ...userMember } = data const username = data?.User.name + const user_img = data?.User.img const createdAt = moment(data?.createdAt).format("LL") - const result = { ...userMember, username, createdAt } + const result = { ...userMember, username, createdAt, user_img } const omitData = _.omit(result, ["User"]) const comments = omitData.DivisionDisscussionComment.map((comment: any) => { - return { ...comment, username: comment.User.name }; + return { ...comment, username: comment.User.name, img: comment.User.img }; }); diff --git a/src/app/api/discussion/route.ts b/src/app/api/discussion/route.ts index e753077..467d1f8 100644 --- a/src/app/api/discussion/route.ts +++ b/src/app/api/discussion/route.ts @@ -53,7 +53,8 @@ export async function GET(request: Request) { createdAt: true, User: { select: { - name: true + name: true, + img: true } }, DivisionDisscussionComment: { @@ -69,6 +70,7 @@ export async function GET(request: Request) { const fixData = data.map((v: any) => ({ ..._.omit(v, ["User", "DivisionDisscussionComment", "createdAt"]), user_name: v.User.name, + img: v.User.img, total_komentar: v.DivisionDisscussionComment.length, createdAt: moment(v.createdAt).format("LL") })) diff --git a/src/app/api/project/[id]/member/route.ts b/src/app/api/project/[id]/member/route.ts index ff1ad44..c8bed6f 100644 --- a/src/app/api/project/[id]/member/route.ts +++ b/src/app/api/project/[id]/member/route.ts @@ -160,6 +160,7 @@ export async function GET(request: Request, context: { params: { id: string } }) id: true, name: true, email: true, + img: true } }) @@ -167,7 +168,7 @@ export async function GET(request: Request, context: { params: { id: string } }) idUser: v.id, name: v.name, email: v.email, - + img: v.img })) const dataFix = { diff --git a/src/app/api/project/[id]/route.ts b/src/app/api/project/[id]/route.ts index f08b29f..454c745 100644 --- a/src/app/api/project/[id]/route.ts +++ b/src/app/api/project/[id]/route.ts @@ -108,9 +108,10 @@ export async function GET(request: Request, context: { params: { id: string } }) User: { select: { name: true, - email: true + email: true, + img: true } - } + }, } }) @@ -118,6 +119,7 @@ export async function GET(request: Request, context: { params: { id: string } }) ..._.omit(v, ["User"]), name: v.User.name, email: v.User.email, + img: v.User.img })) allData = fix diff --git a/src/app/api/task/[id]/route.ts b/src/app/api/task/[id]/route.ts index b68849f..71ad514 100644 --- a/src/app/api/task/[id]/route.ts +++ b/src/app/api/task/[id]/route.ts @@ -112,7 +112,8 @@ export async function GET(request: Request, context: { params: { id: string } }) User: { select: { name: true, - email: true + email: true, + img: true } } } @@ -123,6 +124,7 @@ export async function GET(request: Request, context: { params: { id: string } }) ..._.omit(v, ["User"]), name: v.User.name, email: v.User.email, + img: v.User.img })) allData = fix diff --git a/src/module/calender/lib/type_calender.ts b/src/module/calender/lib/type_calender.ts index 3153c27..ce281e6 100644 --- a/src/module/calender/lib/type_calender.ts +++ b/src/module/calender/lib/type_calender.ts @@ -37,6 +37,7 @@ export interface IDataDetailByIdMember { idUser: string name: string email: string + img: string } export interface IFormCreateCalender { @@ -56,6 +57,7 @@ export interface IFormMemberCalender { idUser: { id: string name: string + img: string }[] } diff --git a/src/module/calender/ui/create_user_calender.tsx b/src/module/calender/ui/create_user_calender.tsx index 3462e6c..c33030a 100644 --- a/src/module/calender/ui/create_user_calender.tsx +++ b/src/module/calender/ui/create_user_calender.tsx @@ -49,7 +49,7 @@ export default function CreateUserCalender({ 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 }]) } }; @@ -61,7 +61,7 @@ export default function CreateUserCalender({ 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]) } @@ -111,7 +111,7 @@ export default function CreateUserCalender({ onClose }: { onClose: (val: any) => handleFileClick(i)}> - + - + {v.name} diff --git a/src/module/calender/ui/navbar_create_division_calender.tsx b/src/module/calender/ui/navbar_create_division_calender.tsx index 743cab1..507273f 100644 --- a/src/module/calender/ui/navbar_create_division_calender.tsx +++ b/src/module/calender/ui/navbar_create_division_calender.tsx @@ -18,8 +18,8 @@ export default function NavbarCreateDivisionCalender() { const [value, setValue] = useState(null); const router = useRouter() const [isModal, setModal] = useState(false) - const memberUser = useHookstate(globalCalender) - const memberValue = memberUser.get() as IFormMemberCalender[] + const member = useHookstate(globalCalender) + const memberValue = member.get() as IFormMemberCalender[] const [openMember, setOpenMember] = useState(false) const param = useParams<{ id: string, detail: string }>() const [touched, setTouched] = useState({ @@ -63,7 +63,7 @@ export default function NavbarCreateDivisionCalender() { setModal(false) router.push(`/division/${param.id}/calender`) toast.success(response.message) - memberUser.set([]) + member.set([]) } else { toast.error(response.message) setModal(false) @@ -244,11 +244,11 @@ export default function NavbarCreateDivisionCalender() { { - memberUser.length > 0 && + member.length > 0 && Anggota Terpilih - Total {memberUser.length} Anggota + Total {member.length} Anggota @@ -260,28 +260,34 @@ export default function NavbarCreateDivisionCalender() { px={20} py={10} > - {memberUser.get().map((v: any, i: any) => { - return ( - - - - - - {v.name} - - - - - Anggota - - - ); - })} + {member.length == 0 ? + + Tidak ada Anggota + + : + + member.get().map((v: any, i: any) => { + return ( + + + + + + {v.name} + + + + + Anggota + + + ); + })} diff --git a/src/module/calender/ui/update_division_calender.tsx b/src/module/calender/ui/update_division_calender.tsx index 1011cf7..35c3d0a 100644 --- a/src/module/calender/ui/update_division_calender.tsx +++ b/src/module/calender/ui/update_division_calender.tsx @@ -339,7 +339,7 @@ export default function UpdateDivisionCalender() { key={i} > - + {v.name} diff --git a/src/module/calender/ui/update_list_users.tsx b/src/module/calender/ui/update_list_users.tsx index 7de9821..5c5b64b 100644 --- a/src/module/calender/ui/update_list_users.tsx +++ b/src/module/calender/ui/update_list_users.tsx @@ -145,7 +145,7 @@ export default function UpdateListUsers({ onClose }: { onClose: (val: any) => vo handleFileClick(i)}> - + {isData?.username ? - + {isData?.username} @@ -142,7 +142,7 @@ export default function DetailDiscussion({ id, idDivision }: { id: string, idDiv > {isData?.username ? - + {isData?.username} @@ -216,7 +216,7 @@ export default function DetailDiscussion({ id, idDivision }: { id: string, idDiv align={"center"} > - + {v.username} diff --git a/src/module/discussion/ui/list_discussion.tsx b/src/module/discussion/ui/list_discussion.tsx index 3d5da8a..b6abb94 100644 --- a/src/module/discussion/ui/list_discussion.tsx +++ b/src/module/discussion/ui/list_discussion.tsx @@ -110,7 +110,7 @@ export default function ListDiscussion({ id }: { id: string }) { }} > - + {v.user_name} diff --git a/src/module/division_new/ui/create_anggota_division.tsx b/src/module/division_new/ui/create_anggota_division.tsx index d5995a2..aaa10d3 100644 --- a/src/module/division_new/ui/create_anggota_division.tsx +++ b/src/module/division_new/ui/create_anggota_division.tsx @@ -112,7 +112,7 @@ export default function CreateAnggotaDivision() { )) : - + {dataMember.map((v: any, index: any) => { const isSelected = selectedFiles.some((i: any) => i.idUser == dataMember[index].id) const found = memberDb.some((i: any) => i.idUser == v.id) @@ -120,7 +120,7 @@ export default function CreateAnggotaDivision() { (!found) ? handleFileClick(index) : null}> - + {v.name} {(found) ? "sudah menjadi anggota divisi" : ""} diff --git a/src/module/division_new/ui/information_division.tsx b/src/module/division_new/ui/information_division.tsx index c39520b..0aca711 100644 --- a/src/module/division_new/ui/information_division.tsx +++ b/src/module/division_new/ui/information_division.tsx @@ -191,7 +191,7 @@ export default function InformationDivision() { onClick={() => { onClickMember(v.id, (v.isAdmin) ? true : false), setChooseMemberName(v.name) }} > - + {v.name} diff --git a/src/module/division_new/ui/navbar_create_users.tsx b/src/module/division_new/ui/navbar_create_users.tsx index 4b3f724..b30efa7 100644 --- a/src/module/division_new/ui/navbar_create_users.tsx +++ b/src/module/division_new/ui/navbar_create_users.tsx @@ -89,7 +89,7 @@ export default function NavbarCreateUsers({ grup, onClose }: { grup?: string, on .fill(null) .map((_, i) => ( - + ))} @@ -114,7 +114,7 @@ export default function NavbarCreateUsers({ grup, onClose }: { grup?: string, on onClick={() => handleFileClick(index)} >
- +
{v.name} diff --git a/src/module/project/lib/type_project.ts b/src/module/project/lib/type_project.ts index 8eedbc8..e7859fd 100644 --- a/src/module/project/lib/type_project.ts +++ b/src/module/project/lib/type_project.ts @@ -26,6 +26,7 @@ export interface IDataMemberProject { idUser: string name: string email: string + img: string } export interface IFormProject { @@ -44,7 +45,8 @@ export interface IFormDateProject { export interface IFormMemberProject { idUser: string, - name: string + name: string, + img: string } @@ -63,7 +65,8 @@ export interface IDataMemberProjectDetail { id: string, idUser: string, isLeader: string, - name: string + name: string, + img: string } export interface IListFileTaskProject { diff --git a/src/module/project/ui/add_member_detail_project.tsx b/src/module/project/ui/add_member_detail_project.tsx index 217dce5..83ea2ad 100644 --- a/src/module/project/ui/add_member_detail_project.tsx +++ b/src/module/project/ui/add_member_detail_project.tsx @@ -133,7 +133,7 @@ export default function AddMemberDetailProject() { (!found) ? handleFileClick(i) : null}> - + - Tanggal Berakhir + Tanggal Berakhir - + - + {v.name} diff --git a/src/module/project/ui/create_users_project.tsx b/src/module/project/ui/create_users_project.tsx index 32bf50d..b673d9d 100644 --- a/src/module/project/ui/create_users_project.tsx +++ b/src/module/project/ui/create_users_project.tsx @@ -24,7 +24,7 @@ export default function CreateUsersProject({ grup, onClose }: { grup?: string, o if (selectedFiles.some((i: any) => i.idUser == dataMember[index].id)) { setSelectedFiles(selectedFiles.filter((i: any) => i.idUser != dataMember[index].id)) } else { - setSelectedFiles([...selectedFiles, { idUser: dataMember[index].id, name: dataMember[index].name }]) + setSelectedFiles([...selectedFiles, { idUser: dataMember[index].id, name: dataMember[index].name, img: dataMember[index].img }]) } }; @@ -114,7 +114,7 @@ export default function CreateUsersProject({ grup, onClose }: { grup?: string, o onClick={() => handleFileClick(index)} >
- +
{v.name} diff --git a/src/module/project/ui/list_anggota_detail_project.tsx b/src/module/project/ui/list_anggota_detail_project.tsx index 24878fc..18c0852 100644 --- a/src/module/project/ui/list_anggota_detail_project.tsx +++ b/src/module/project/ui/list_anggota_detail_project.tsx @@ -100,7 +100,7 @@ export default function ListAnggotaDetailProject() { }} > - + {v.name} diff --git a/src/module/task/lib/type_task.ts b/src/module/task/lib/type_task.ts index 6c89dce..cefc296 100644 --- a/src/module/task/lib/type_task.ts +++ b/src/module/task/lib/type_task.ts @@ -60,6 +60,7 @@ export interface IDataMemberTaskDivision { idUser: string name: string email: string + img: string } export interface IDataFileTaskDivision { diff --git a/src/module/task/ui/add_member_detail_task.tsx b/src/module/task/ui/add_member_detail_task.tsx index 36d6912..eab2ad7 100644 --- a/src/module/task/ui/add_member_detail_task.tsx +++ b/src/module/task/ui/add_member_detail_task.tsx @@ -150,7 +150,7 @@ export default function AddMemberDetailTask() { (!found) ? handleFileClick(i) : null}> - + - + {v.name} diff --git a/src/module/user/lib/type_user.ts b/src/module/user/lib/type_user.ts index 0b94cec..8f50a70 100644 --- a/src/module/user/lib/type_user.ts +++ b/src/module/user/lib/type_user.ts @@ -7,5 +7,6 @@ export type TypeUser = { gender: string isActive: boolean, group: string, + img: string position: string }[] \ No newline at end of file