upd : task divisi
Deskripsi - image member No Issues
This commit is contained in:
@@ -36,7 +36,8 @@ export async function GET(request: Request, context: { params: { id: string } })
|
|||||||
idUser: true,
|
idUser: true,
|
||||||
User: {
|
User: {
|
||||||
select: {
|
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) => ({
|
const fixMember = member.map((v: any) => ({
|
||||||
..._.omit(v, ["User"]),
|
..._.omit(v, ["User"]),
|
||||||
name: v.User.name
|
name: v.User.name,
|
||||||
|
img: v.User.img
|
||||||
}))
|
}))
|
||||||
|
|
||||||
const dataFix = {
|
const dataFix = {
|
||||||
|
|||||||
@@ -55,5 +55,6 @@ export interface IDataMemberDivision {
|
|||||||
idUser: string,
|
idUser: string,
|
||||||
isAdmin: string,
|
isAdmin: string,
|
||||||
isLeader: string,
|
isLeader: string,
|
||||||
name: string
|
name: string,
|
||||||
|
img: string
|
||||||
}
|
}
|
||||||
@@ -153,7 +153,7 @@ export default function CreateTask() {
|
|||||||
borderRadius: 10,
|
borderRadius: 10,
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
<Text c={WARNA.biruTua}>Tambah Anggota</Text>
|
<Text>Tambah Anggota</Text>
|
||||||
<IoIosArrowDropright size={25} />
|
<IoIosArrowDropright size={25} />
|
||||||
</Group>
|
</Group>
|
||||||
</Box>
|
</Box>
|
||||||
@@ -205,7 +205,7 @@ export default function CreateTask() {
|
|||||||
|
|
||||||
{
|
{
|
||||||
member.length > 0 &&
|
member.length > 0 &&
|
||||||
<Box pt={30} mb={60}>
|
<Box pt={30} mb={100}>
|
||||||
<Group justify="space-between">
|
<Group justify="space-between">
|
||||||
<Text c={WARNA.biruTua}>Anggota Terpilih</Text>
|
<Text c={WARNA.biruTua}>Anggota Terpilih</Text>
|
||||||
<Text c={WARNA.biruTua}>Total {member.length} Anggota</Text>
|
<Text c={WARNA.biruTua}>Total {member.length} Anggota</Text>
|
||||||
@@ -229,7 +229,7 @@ export default function CreateTask() {
|
|||||||
key={i}
|
key={i}
|
||||||
>
|
>
|
||||||
<Group>
|
<Group>
|
||||||
<Avatar src={"v.image"} alt="it's me" size="lg" />
|
<Avatar src={`/api/file/img?cat=user&file=${v.img}`} alt="it's me" size="lg" />
|
||||||
<Box>
|
<Box>
|
||||||
<Text c={WARNA.biruTua} fw={"bold"}>
|
<Text c={WARNA.biruTua} fw={"bold"}>
|
||||||
{v.name}
|
{v.name}
|
||||||
|
|||||||
@@ -4,18 +4,15 @@ import { funGetDivisionById, IDataMemberDivision } from "@/module/division_new";
|
|||||||
import { useHookstate } from "@hookstate/core";
|
import { useHookstate } from "@hookstate/core";
|
||||||
import {
|
import {
|
||||||
ActionIcon,
|
ActionIcon,
|
||||||
Anchor,
|
|
||||||
Avatar,
|
Avatar,
|
||||||
Box,
|
Box,
|
||||||
Button,
|
Button,
|
||||||
Checkbox,
|
|
||||||
Divider,
|
Divider,
|
||||||
Flex,
|
Flex,
|
||||||
Group,
|
Group,
|
||||||
rem,
|
rem,
|
||||||
Skeleton,
|
Skeleton,
|
||||||
Text,
|
Text,
|
||||||
TextInput,
|
|
||||||
} from "@mantine/core";
|
} from "@mantine/core";
|
||||||
import { useShallowEffect } from "@mantine/hooks";
|
import { useShallowEffect } from "@mantine/hooks";
|
||||||
import { useParams, useRouter } from "next/navigation";
|
import { useParams, useRouter } from "next/navigation";
|
||||||
@@ -23,6 +20,8 @@ import React, { useState } from "react";
|
|||||||
import toast from "react-hot-toast";
|
import toast from "react-hot-toast";
|
||||||
import { globalMemberTask } from "../lib/val_task";
|
import { globalMemberTask } from "../lib/val_task";
|
||||||
import { FaCheck } from "react-icons/fa6";
|
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 }) {
|
export default function CreateUsersProject({ onClose }: { onClose: (val: any) => void }) {
|
||||||
const router = useRouter()
|
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)) {
|
if (selectedFiles.some((i: any) => i.idUser == isData[index].idUser)) {
|
||||||
setSelectedFiles(selectedFiles.filter((i: any) => i.idUser != isData[index].idUser))
|
setSelectedFiles(selectedFiles.filter((i: any) => i.idUser != isData[index].idUser))
|
||||||
} else {
|
} 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++) {
|
for (let index = 0; index < isData.length; index++) {
|
||||||
if (!selectedFiles.some((i: any) => i.idUser == isData[index].idUser)) {
|
if (!selectedFiles.some((i: any) => i.idUser == isData[index].idUser)) {
|
||||||
const newArr = {
|
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])
|
setSelectedFiles((selectedFiles: any) => [...selectedFiles, newArr])
|
||||||
}
|
}
|
||||||
@@ -112,10 +111,10 @@ export default function CreateUsersProject({ onClose }: { onClose: (val: any) =>
|
|||||||
<Text c={WARNA.biruTua} fw={"bold"}>
|
<Text c={WARNA.biruTua} fw={"bold"}>
|
||||||
Pilih Semua Anggota
|
Pilih Semua Anggota
|
||||||
</Text>
|
</Text>
|
||||||
{selectAll ? <FaCheck style={{ marginRight: 10 }} /> : ""}
|
<BsListCheck size={25} style={{ marginRight: 5 }} color={WARNA.biruTua}/>
|
||||||
</Group>
|
</Group>
|
||||||
}
|
}
|
||||||
<Box mt={15} mb={60}>
|
<Box mt={15} mb={100}>
|
||||||
{loading ?
|
{loading ?
|
||||||
Array(3)
|
Array(3)
|
||||||
.fill(null)
|
.fill(null)
|
||||||
@@ -146,7 +145,7 @@ export default function CreateUsersProject({ onClose }: { onClose: (val: any) =>
|
|||||||
<Box mb={15} key={i} onClick={() => handleFileClick(i)}>
|
<Box mb={15} key={i} onClick={() => handleFileClick(i)}>
|
||||||
<Flex justify={"space-between"} align={"center"}>
|
<Flex justify={"space-between"} align={"center"}>
|
||||||
<Group>
|
<Group>
|
||||||
<Avatar src={"v.image"} alt="it's me" size="lg" />
|
<Avatar src={`/api/file/img?cat=user&file=${v.img}`} alt="it's me" size="lg" />
|
||||||
<Text style={{
|
<Text style={{
|
||||||
cursor: 'pointer',
|
cursor: 'pointer',
|
||||||
display: 'flex',
|
display: 'flex',
|
||||||
|
|||||||
Reference in New Issue
Block a user