Merge pull request #175 from bipproduction/amalia/02-september-24

Amalia/02 september 24
This commit is contained in:
Amalia
2024-09-02 13:38:12 +08:00
committed by GitHub
11 changed files with 610 additions and 73 deletions

3
.gitignore vendored
View File

@@ -39,4 +39,5 @@ yarn-error.log*
next-env.d.ts
# folder foto kandidat
/public/image/
/public/image/
/public/file/

View File

@@ -0,0 +1,7 @@
import { AddFileDetailTask } from "@/module/task";
export default function Page() {
return (
<AddFileDetailTask />
)
}

View File

@@ -2,8 +2,8 @@ import { CreateTask, FileSave } from "@/module/task";
function Page({ searchParams }: { searchParams: any }) {
if (searchParams.page == "file-save")
return <FileSave kategori="task" />
// if (searchParams.page == "file-save")
// return <FileSave kategori="task" />
return <CreateTask />
}

View File

@@ -0,0 +1,235 @@
import { prisma } from "@/module/_global";
import { funGetUserByCookies } from "@/module/auth";
import _ from "lodash";
import { NextResponse } from "next/server";
import fs from "fs";
import path from "path";
// HAPUS DETAIL FILE, HAPUS FILE DI ASSETS DAN DATABASE (BUKAN PAKE ISACTIVE)
export async function DELETE(request: Request, context: { params: { id: string } }) {
try {
const user = await funGetUserByCookies()
if (user.id == undefined) {
return NextResponse.json({ success: false, message: "Anda harus login untuk mengakses ini" }, { status: 401 });
}
const { id } = context.params;
const data = await prisma.divisionProjectFile.count({
where: {
id: id,
},
});
if (data == 0) {
return NextResponse.json(
{
success: false,
message: "Hapus file gagal, data tidak ditemukan",
},
{ status: 404 }
);
}
const dataRelasi = await prisma.divisionProjectFile.findUnique({
where: {
id: id,
}
})
const dataFile = await prisma.containerFileDivision.findUnique({
where: {
id: dataRelasi?.idFile
}
})
fs.unlink(`./public/file/task/${dataFile?.id}.${dataFile?.extension}`, (err) => { })
const deleteRelasi = await prisma.divisionProjectFile.delete({
where: {
id: id,
},
});
const deleteFile = await prisma.containerFileDivision.delete({
where: {
id: dataRelasi?.idFile,
},
});
return NextResponse.json(
{
success: true,
message: "File berhasil dihapus",
data,
},
{ status: 200 }
);
} catch (error) {
console.log(error);
return NextResponse.json({ success: false, message: "Gagal menghapus file, coba lagi nanti", reason: (error as Error).message, }, { status: 500 });
}
}
// TAMBAH FILE TASK DIVISI
export async function POST(request: Request, context: { params: { id: string } }) {
try {
const user = await funGetUserByCookies()
if (user.id == undefined) {
return NextResponse.json({ success: false, message: "Anda harus login untuk mengakses ini" }, { status: 401 });
}
const { id } = context.params;
const body = await request.formData()
const cekFile = body.has("file0")
const dataCek = await prisma.divisionProject.count({
where: {
id: id,
},
});
if (dataCek == 0) {
return NextResponse.json(
{
success: false,
message: "Tambah file tugas gagal, data tugas tidak ditemukan",
},
{ status: 404 }
);
}
const dataProject = await prisma.divisionProject.findUnique({
where: {
id: id,
},
});
let fileFix: any[] = []
if (cekFile) {
let a = 0
const root = path.join(process.cwd(), "./public/file/task/");
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 insertToContainer = await prisma.containerFileDivision.create({
data: {
idDivision: String(dataProject?.idDivision),
name: fName,
extension: String(fExt)
},
select: {
id: true
}
})
const nameFix = insertToContainer.id + '.' + fExt
const filePath = path.join(root, nameFix)
// Konversi ArrayBuffer ke Buffer
const buffer = Buffer.from(await file.arrayBuffer());
// Tulis file ke sistem
fs.writeFileSync(filePath, buffer);
const dataFile = {
idProject: id,
idDivision: dataProject?.idDivision,
idFile: insertToContainer.id,
createdBy: user.id,
}
fileFix.push(dataFile)
}
a++
}
const insertFile = await prisma.divisionProjectFile.createMany({
data: fileFix
})
}
return NextResponse.json({ success: true, message: "Berhasil membuat tugas divisi" }, { status: 200 });
} catch (error) {
console.log(error);
return NextResponse.json({ success: false, message: "Gagal membuat tugas divisi, coba lagi nanti", reason: (error as Error).message, }, { status: 500 });
}
}
// CEK FILE TASK DIVISI APAKAH PERNAH DIUPLOAD PADA TASK YG SAMA
export async function PUT(request: Request, context: { params: { id: string } }) {
try {
const user = await funGetUserByCookies()
if (user.id == undefined) {
return NextResponse.json({ success: false, message: "Anda harus login untuk mengakses ini" }, { status: 401 });
}
const { id } = context.params;
const body = await request.formData()
const file = body.get("file") as File
const fileName = file.name
const dataCek = await prisma.divisionProject.count({
where: {
id: id,
},
});
if (dataCek == 0) {
return NextResponse.json(
{
success: false,
message: "Upload file gagal, data tugas tidak ditemukan",
},
{ status: 404 }
);
}
const dataTaskFile = await prisma.divisionProjectFile.findMany({
where: {
idProject: id,
isActive: true
},
select: {
ContainerFileDivision: {
select: {
name: true,
extension: true
}
}
}
})
const dataOmit = dataTaskFile.map((v: any) => ({
..._.omit(v, ["ContainerFileDivision"]),
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 });
}
} catch (error) {
console.log(error);
return NextResponse.json({ success: false, message: "Upload file gagal, coba lagi nanti", reason: (error as Error).message, }, { status: 500 });
}
}

View File

@@ -136,7 +136,7 @@ export async function POST(request: Request) {
if (member.length > 0) {
const dataMember = member.map((v: any) => ({
..._.omit(v, ["idUser", "name"]),
..._.omit(v, ["idUser", "name", "img"]),
idDivision: idDivision,
idProject: data.id,
idUser: v.idUser,
@@ -147,66 +147,56 @@ export async function POST(request: Request) {
})
}
let fileFix: any[] = []
// if (cekFile) {
// let a = 0
// const root = path.join(process.cwd(), "./public/image/user/");
// for (var pair of body.entries()) {
// if (String(pair[0]) == "file" + a) {
// const file = body.get(pair[0]) as File
// const fName = file.name
// const fExt = fName.split(".").pop()
// console.log(file, file.name)
// const insertToContainer = await prisma.containerFileDivision.create({
// data:{
// idDivision: idDivision,
// name: fName,
// extension: String(fExt)
// }
// })
// const dataFile = {
// name: fName,
// extension: fExt,
// idDivision: idDivision,
// }
if (cekFile) {
let a = 0
const root = path.join(process.cwd(), "./public/file/task/");
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()
// fileFix.push(dataFile)
// }
// a++
// }
const insertToContainer = await prisma.containerFileDivision.create({
data: {
idDivision: idDivision,
name: fName,
extension: String(fExt)
},
select: {
id: true
}
})
// const insertFile = await prisma.divisionProjectFile.createMany({
// data: fileFix
// })
// }
const nameFix = insertToContainer.id + '.' + fExt
const filePath = path.join(root, nameFix)
// Konversi ArrayBuffer ke Buffer
const buffer = Buffer.from(await file.arrayBuffer());
// Tulis file ke sistem
fs.writeFileSync(filePath, buffer);
// if (file.length > 0) {
// file.map((v: any, index: any) => {
// const f: any = file[index].get('file')
// const fName = f.name
// const fExt = fName.split(".").pop()
const dataFile = {
idProject: data.id,
idDivision: idDivision,
idFile: insertToContainer.id,
createdBy: user.id,
}
// const dataFile = {
// name: fName,
// extension: fExt,
// idDivision: idDivision,
// idProject: data.id,
// }
// fileFix.push(dataFile)
// })
fileFix.push(dataFile)
}
a++
}
// const insertFile = await prisma.divisionProjectFile.createMany({
// data: fileFix
// })
// }
const insertFile = await prisma.divisionProjectFile.createMany({
data: fileFix
})
}
return NextResponse.json({ success: true, message: "Berhasil membuat tugas divisi" }, { status: 200 });

View File

@@ -1,4 +1,5 @@
import AddDetailTask from "./ui/add_detail_task";
import AddFileDetailTask from "./ui/add_file_detail_task";
import AddMemberDetailTask from "./ui/add_member_detail_task";
import CancelTask from "./ui/cancel_task";
import ViewDateEndTask from "./ui/create_date_end_task";
@@ -30,4 +31,5 @@ export { EditDetailTask }
export { AddDetailTask }
export { AddMemberDetailTask }
export { CancelTask }
export { EditTask }
export { EditTask }
export { AddFileDetailTask }

View File

@@ -7,7 +7,6 @@ export const funGetAllTask = async (path?: string) => {
export const funCreateTask = async (data: FormData) => {
const response = await fetch("/api/task", {
method: "POST",
body: data,
@@ -119,4 +118,30 @@ export const funEditTask = async (path: string, data: { title: string }) => {
body: JSON.stringify(data),
});
return await response.json().catch(() => null);
};
export const funDeleteFileTask = async (path: string) => {
const response = await fetch(`/api/task/file/${path}`, {
method: "DELETE",
headers: {
"Content-Type": "application/json",
},
});
return await response.json().catch(() => null);
};
export const funCekNamFileUploadTask = async (path: string, data: FormData) => {
const response = await fetch(`/api/task/file/${path}`, {
method: "PUT",
body: data,
});
return await response.json().catch(() => null);
};
export const funAddFileTask = async (path: string, data: FormData) => {
const response = await fetch(`/api/task/file/${path}`, {
method: "POST",
body: data,
});
return await response.json().catch(() => null);
};

View File

@@ -0,0 +1,189 @@
"use client";
import { LayoutDrawer, LayoutNavbarNew, WARNA } from "@/module/_global";
import {
Box,
Button,
Flex,
Group,
rem,
SimpleGrid,
Stack,
Text,
} from "@mantine/core";
import React, { useRef, useState } from "react";
import { useParams, useRouter } from "next/navigation";
import toast from "react-hot-toast";
import { IoIosArrowDropright } from "react-icons/io";
import { Dropzone } from "@mantine/dropzone";
import _ from "lodash";
import { IListFileTask } from "../lib/type_task";
import ResultsFile from "./results_file";
import { FaTrash } from "react-icons/fa6";
import { funAddFileTask, funCekNamFileUploadTask } from "../lib/api_task";
export default function AddFileDetailTask() {
const router = useRouter()
const [title, setTitle] = useState("")
const [openModal, setOpenModal] = useState(false)
const [fileForm, setFileForm] = useState<any[]>([])
const [listFile, setListFile] = useState<IListFileTask[]>([])
const param = useParams<{ id: string, detail: string }>()
const [indexDelFile, setIndexDelFile] = useState<number>(0)
const [openDrawerFile, setOpenDrawerFile] = useState(false)
const openRef = useRef<() => void>(null)
function deleteFile(index: number) {
setListFile([...listFile.filter((val, i) => i !== index)])
setFileForm([...fileForm.filter((val, i) => i !== index)])
setOpenDrawerFile(false)
}
async function cekFileName(data: any) {
try {
const fd = new FormData();
fd.append(`file`, data);
const res = await funCekNamFileUploadTask(param.detail, fd)
if (res.success) {
setFileForm([...fileForm, data])
setListFile([...listFile, { name: data.name, extension: data.type.split("/")[1] }])
} else {
toast.error(res.message)
}
} catch (error) {
console.log(error)
toast.error("Gagal menambahkan file, coba lagi nanti")
}
}
async function onSubmit() {
try {
const fd = new FormData();
for (let i = 0; i < fileForm.length; i++) {
fd.append(`file${i}`, fileForm[i]);
}
const response = await funAddFileTask(param.detail, fd)
if (response.success) {
toast.success(response.message)
setFileForm([])
setListFile([])
router.push(`/division/${param.id}/task/${param.detail}`)
} else {
toast.error(response.message)
}
} catch (error) {
console.log(error)
toast.error("Gagal menambahkan tugas divisi, coba lagi nanti");
}
}
return (
<Box>
<LayoutNavbarNew back="" title={"Tambah File"} menu />
<Box p={20}>
<Stack>
<Dropzone
openRef={openRef}
onDrop={async (files) => {
if (!files || _.isEmpty(files))
return toast.error('Tidak ada file yang dipilih')
cekFileName(files[0])
}}
activateOnClick={false}
maxSize={3 * 1024 ** 2}
accept={['text/csv', 'image/png', 'image/jpeg', 'image/heic', 'application/pdf']}
onReject={(files) => {
return toast.error('File yang diizinkan: .csv, .png, .jpg, .heic, .pdf dengan ukuran maksimal 3 MB')
}}
>
</Dropzone>
<Group
justify="space-between"
p={10}
style={{
border: `1px solid ${"#D6D8F6"}`,
borderRadius: 10,
}}
onClick={() => openRef.current?.()}
>
<Text>Upload File</Text>
<IoIosArrowDropright size={25} />
</Group>
</Stack>
{
listFile.length > 0 &&
<Box pt={20}>
<Text fw={'bold'} c={WARNA.biruTua}>File</Text>
<Box bg={"white"} style={{
borderRadius: 10,
border: `1px solid ${"#D6D8F6"}`,
padding: 20
}}>
{
listFile.map((v, i) => {
return (
<Box key={i} onClick={() => {
setIndexDelFile(i)
setOpenDrawerFile(true)
}}>
<ResultsFile name={v.name} extension={v.extension} />
</Box>
)
})
}
</Box>
</Box>
}
</Box>
<Box pos={'fixed'} bottom={0} p={rem(20)} w={"100%"} style={{
maxWidth: rem(550),
zIndex: 999,
backgroundColor: `${WARNA.bgWhite}`,
}}>
<Button
color="white"
bg={WARNA.biruTua}
size="lg" radius={30}
fullWidth
onClick={() => {
if (
title !== ""
) {
setOpenModal(true)
} else {
toast.error("Semua form harus diisi")
}
}}>
Simpan
</Button>
</Box>
<LayoutDrawer
opened={openDrawerFile}
onClose={() => setOpenDrawerFile(false)}
title={""}
>
<Stack pt={10}>
<SimpleGrid cols={{ base: 3, sm: 3, lg: 3 }} >
<Flex style={{ cursor: 'pointer' }} justify={'center'} align={'center'} direction={'column'} onClick={() => deleteFile(indexDelFile)}>
<Box>
<FaTrash size={30} color={WARNA.biruTua} />
</Box>
<Box>
<Text c={WARNA.biruTua} ta='center'>Hapus File</Text>
</Box>
</Flex>
</SimpleGrid>
</Stack>
</LayoutDrawer>
</Box>
);
}

View File

@@ -74,11 +74,11 @@ export default function CreateTask() {
if (response.success) {
toast.success(response.message)
// setTitle("")
// member.set([])
// setFileForm([])
// setListFile([])
// setDataTask([])
setTitle("")
member.set([])
setFileForm([])
setListFile([])
setDataTask([])
} else {
toast.error(response.message)
}
@@ -287,7 +287,7 @@ export default function CreateTask() {
onClose={() => setOpenDrawer(false)}
title={"Pilih File"}
>
<Flex justify={"space-around"}>
<Flex justify={"flex-start"} px={20}>
<Dropzone
openRef={openRef}
onDrop={async (files) => {
@@ -322,7 +322,7 @@ export default function CreateTask() {
<Text ta={"center"}>diperangkat</Text>
</Box>
</Dropzone>
<Box onClick={() => router.push("/task/create?page=file-save")}>
{/* <Box onClick={() => router.push("/task/create?page=file-save")}>
<Box
bg={"#DCEED8"}
style={{
@@ -339,7 +339,7 @@ export default function CreateTask() {
Pilih file yang
</Text>
<Text ta={"center"}>sudah ada</Text>
</Box>
</Box> */}
</Flex>
</LayoutDrawer>

View File

@@ -1,18 +1,24 @@
'use client'
import { SkeletonDetailListTugasTask, WARNA } from "@/module/_global";
import { Box, Group, Skeleton, Text } from "@mantine/core";
import { LayoutDrawer, SkeletonDetailListTugasTask, WARNA } from "@/module/_global";
import { Box, Flex, Group, SimpleGrid, Skeleton, Stack, Text } from "@mantine/core";
import { useShallowEffect } from "@mantine/hooks";
import { useParams } from "next/navigation";
import { useState } from "react";
import toast from "react-hot-toast";
import { BsFiletypeCsv, BsFiletypeHeic, BsFiletypeJpg, BsFiletypePdf, BsFiletypePng } from "react-icons/bs";
import { funGetTaskDivisionById } from "../lib/api_task";
import { BsFileTextFill, BsFiletypeCsv, BsFiletypeHeic, BsFiletypeJpg, BsFiletypePdf, BsFiletypePng } from "react-icons/bs";
import { funDeleteFileTask, funGetTaskDivisionById } from "../lib/api_task";
import { IDataFileTaskDivision } from "../lib/type_task";
import { FaTrash } from "react-icons/fa6";
import LayoutModal from "@/module/_global/layout/layout_modal";
export default function ListFileDetailTask() {
const [isData, setData] = useState<IDataFileTaskDivision[]>([])
const [loading, setLoading] = useState(true)
const param = useParams<{ id: string, detail: string }>()
const [openDrawer, setOpenDrawer] = useState(false)
const [isOpenModal, setOpenModal] = useState(false)
const [idData, setIdData] = useState('')
const [nameData, setNameData] = useState('')
async function getOneData() {
try {
setLoading(true)
@@ -34,6 +40,25 @@ export default function ListFileDetailTask() {
getOneData();
}, [param.detail])
async function onDelete() {
try {
const res = await funDeleteFileTask(idData);
if (res.success) {
toast.success(res.message)
getOneData()
setIdData("")
setOpenDrawer(false)
} else {
toast.error(res.message);
}
} catch (error) {
console.error(error);
toast.error("Gagal menghapus file, coba lagi nanti");
}
}
return (
<Box pt={20}>
<Text fw={'bold'} c={WARNA.biruTua}>File</Text>
@@ -67,6 +92,12 @@ export default function ListFileDetailTask() {
padding: 10
}}
mb={10}
onClick={() => {
setNameData(item.name + '.' + item.extension)
setIdData(item.id)
setOpenDrawer(true)
}}
>
<Group>
{item.extension == "pdf" && <BsFiletypePdf size={25} />}
@@ -74,13 +105,53 @@ export default function ListFileDetailTask() {
{item.extension == "png" && <BsFiletypePng size={25} />}
{item.extension == "jpg" || item.extension == "jpeg" && <BsFiletypeJpg size={25} />}
{item.extension == "heic" && <BsFiletypeHeic size={25} />}
<Text>{item.name}</Text>
<Text>{item.name + '.' + item.extension}</Text>
</Group>
</Box>
)
})
}
</Box>
<LayoutDrawer opened={openDrawer} title={nameData} onClose={() => setOpenDrawer(false)}>
<Box>
<Stack pt={10}>
<SimpleGrid
cols={{ base: 3, sm: 3, lg: 3 }}
>
<Flex onClick={() => { }} justify={'center'} align={'center'} direction={'column'} >
<Box>
<BsFileTextFill size={30} color={WARNA.biruTua} />
</Box>
<Box>
<Text c={WARNA.biruTua}>Lihat file</Text>
</Box>
</Flex>
<Flex onClick={() => { setOpenModal(true) }} justify={'center'} align={'center'} direction={'column'} >
<Box>
<FaTrash size={30} color={WARNA.biruTua} />
</Box>
<Box>
<Text c={WARNA.biruTua}>Hapus file</Text>
</Box>
</Flex>
</SimpleGrid>
</Stack>
</Box>
</LayoutDrawer>
<LayoutModal opened={isOpenModal} onClose={() => setOpenModal(false)}
description="Apakah Anda yakin ingin menghapus file ini? File yang dihapus tidak dapat dikembalikan"
onYes={(val) => {
if (val) {
onDelete()
}
setOpenModal(false)
}} />
</Box>
)
}

View File

@@ -8,7 +8,7 @@ import { funGetTaskDivisionById } from "../lib/api_task";
import { useShallowEffect } from "@mantine/hooks";
import { HiMenu } from "react-icons/hi";
import { IoAddCircle } from "react-icons/io5";
import { FaPencil, FaUsers } from "react-icons/fa6";
import { FaFileCirclePlus, FaPencil, FaUsers } from "react-icons/fa6";
import { MdCancel } from "react-icons/md";
export default function NavbarDetailDivisionTask() {
@@ -95,13 +95,15 @@ export default function NavbarDetailDivisionTask() {
style={{
cursor: 'pointer'
}}
onClick={() => { router.push(param.detail + '/cancel') }}
onClick={() => {
router.push(param.detail + '/add-file')
}}
>
<Box>
<MdCancel size={30} color={WARNA.biruTua} />
<FaFileCirclePlus size={30} color={WARNA.biruTua} />
</Box>
<Box>
<Text c={WARNA.biruTua} ta='center'>Batal</Text>
<Text c={WARNA.biruTua} ta='center'>Tambah file</Text>
</Box>
</Flex>
@@ -118,6 +120,21 @@ export default function NavbarDetailDivisionTask() {
<Text c={WARNA.biruTua} ta='center'>Edit</Text>
</Box>
</Flex>
<Flex justify={'center'} align={'center'} direction={'column'}
style={{
cursor: 'pointer'
}}
onClick={() => { router.push(param.detail + '/cancel') }}
>
<Box>
<MdCancel size={30} color={WARNA.biruTua} />
</Box>
<Box>
<Text c={WARNA.biruTua} ta='center'>Batal</Text>
</Box>
</Flex>
</SimpleGrid>
</Stack>
</Box>