diff --git a/src/app/api/task/[id]/route.ts b/src/app/api/task/[id]/route.ts index b68849f..54c312c 100644 --- a/src/app/api/task/[id]/route.ts +++ b/src/app/api/task/[id]/route.ts @@ -112,7 +112,12 @@ export async function GET(request: Request, context: { params: { id: string } }) User: { select: { name: true, - email: true + email: true, + Position: { + select: { + name: true + } + } } } } @@ -123,6 +128,7 @@ export async function GET(request: Request, context: { params: { id: string } }) ..._.omit(v, ["User"]), name: v.User.name, email: v.User.email, + position: v.User.Position.name })) allData = fix diff --git a/src/app/api/task/file/[id]/route.ts b/src/app/api/task/file/[id]/route.ts index 73eebbd..0998ba0 100644 --- a/src/app/api/task/file/[id]/route.ts +++ b/src/app/api/task/file/[id]/route.ts @@ -116,8 +116,8 @@ export async function POST(request: Request, context: { params: { id: string } } for (var pair of body.entries()) { if (String(pair[0]) == "file" + a) { const file = body.get(pair[0]) as File - const fName = file.name.split(".")[0] const fExt = file.name.split(".").pop() + const fName = file.name.replace("." + fExt, "") const insertToContainer = await prisma.containerFileDivision.create({ @@ -218,14 +218,13 @@ export async function PUT(request: Request, context: { params: { id: string } }) file: v.ContainerFileDivision.name + '.' + v.ContainerFileDivision.extension, })) - const cek = dataOmit.some((i: any) => i.file == fileName) if (cek) { - return NextResponse.json({ success: true, message: "Cek berhasil" }, { status: 200 }); - } else { return NextResponse.json({ success: false, message: "File sudah pernah diupload" }, { status: 400 }); + } else { + return NextResponse.json({ success: true, message: "Cek berhasil" }, { status: 200 }); } } catch (error) { diff --git a/src/app/api/task/route.ts b/src/app/api/task/route.ts index af82503..2e27cc6 100644 --- a/src/app/api/task/route.ts +++ b/src/app/api/task/route.ts @@ -157,8 +157,8 @@ export async function POST(request: Request) { for (var pair of body.entries()) { if (String(pair[0]) == "file" + a) { const file = body.get(pair[0]) as File - const fName = file.name.split(".")[0] const fExt = file.name.split(".").pop() + const fName = file.name.replace("." + fExt, "") const insertToContainer = await prisma.containerFileDivision.create({ diff --git a/src/module/task/lib/type_task.ts b/src/module/task/lib/type_task.ts index 6c89dce..3226642 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 + position: string } export interface IDataFileTaskDivision { diff --git a/src/module/task/ui/add_file_detail_task.tsx b/src/module/task/ui/add_file_detail_task.tsx index bbbe383..54d9076 100644 --- a/src/module/task/ui/add_file_detail_task.tsx +++ b/src/module/task/ui/add_file_detail_task.tsx @@ -20,11 +20,11 @@ import { IListFileTask } from "../lib/type_task"; import ResultsFile from "./results_file"; import { FaTrash } from "react-icons/fa6"; import { funAddFileTask, funCekNamFileUploadTask } from "../lib/api_task"; +import LayoutModal from "@/module/_global/layout/layout_modal"; export default function AddFileDetailTask() { const router = useRouter() - const [title, setTitle] = useState("") const [openModal, setOpenModal] = useState(false) const [fileForm, setFileForm] = useState([]) const [listFile, setListFile] = useState([]) @@ -139,8 +139,6 @@ export default function AddFileDetailTask() { } - - { - if ( - title !== "" - ) { + if (fileForm.length > 0) { setOpenModal(true) } else { - toast.error("Semua form harus diisi") + toast.error("Silahkan pilih file yang akan diupload") } }}> Simpan @@ -184,6 +180,15 @@ export default function AddFileDetailTask() { + setOpenModal(false)} + description="Apakah Anda yakin ingin menambahkan file?" + onYes={(val) => { + if (val) { + onSubmit() + } + setOpenModal(false) + }} /> + ); } diff --git a/src/module/task/ui/detail_list_anggota_task.tsx b/src/module/task/ui/detail_list_anggota_task.tsx index 9ddba9f..e452549 100644 --- a/src/module/task/ui/detail_list_anggota_task.tsx +++ b/src/module/task/ui/detail_list_anggota_task.tsx @@ -108,7 +108,7 @@ export default function ListAnggotaDetailTask() { {v.name} - {v.email} + {v.position}