From 98c815fa353e7cb77280c1f9ff4e1d1e5050abf4 Mon Sep 17 00:00:00 2001 From: amel Date: Mon, 13 Jan 2025 10:50:55 +0800 Subject: [PATCH 1/3] rev: batasan maximal upload file Deskripsi: - project, task, dan dokumen divisi maximal 100mb - user profile dan banner desa maximal 10mb nb: di server blm bisa NO Issues --- src/module/banner/ui/create_banner.tsx | 4 ++-- src/module/banner/ui/edit_banner.tsx | 4 ++-- src/module/document/ui/drawer_menu_document_division.tsx | 4 ++-- src/module/project/ui/add_file_detail_project.tsx | 4 ++-- src/module/project/ui/create_project.tsx | 8 ++++---- src/module/task/ui/add_file_detail_task.tsx | 4 ++-- src/module/task/ui/create_task.tsx | 4 ++-- src/module/user/member/ui/create_member.tsx | 4 ++-- src/module/user/member/ui/edit_member.tsx | 4 ++-- src/module/user/profile/ui/edit_profile.tsx | 4 ++-- 10 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/module/banner/ui/create_banner.tsx b/src/module/banner/ui/create_banner.tsx index fbd4afe..8331050 100644 --- a/src/module/banner/ui/create_banner.tsx +++ b/src/module/banner/ui/create_banner.tsx @@ -119,10 +119,10 @@ function CreateBanner() { onValidation('image', files[0]) }} activateOnClick={false} - maxSize={1 * 1024 ** 2} + maxSize={10 * 1024 ** 2} accept={['image/png', 'image/jpeg', 'image/heic']} onReject={(files) => { - return toast.error('File yang diizinkan: .png, .jpg, dan .heic dengan ukuran maksimal 1 MB') + return toast.error('File yang diizinkan: .png, .jpg, dan .heic dengan ukuran maksimal 10 MB') }} onClick={() => openRef.current?.()} > diff --git a/src/module/banner/ui/edit_banner.tsx b/src/module/banner/ui/edit_banner.tsx index 30c5d91..346c30d 100644 --- a/src/module/banner/ui/edit_banner.tsx +++ b/src/module/banner/ui/edit_banner.tsx @@ -120,10 +120,10 @@ export default function EditBanner() { onValidation('image', files[0]) }} activateOnClick={false} - maxSize={1 * 1024 ** 2} + maxSize={10 * 1024 ** 2} accept={['image/png', 'image/jpeg', 'image/heic']} onReject={(files) => { - return toast.error('File yang diizinkan: .png, .jpg, dan .heic dengan ukuran maksimal 1 MB') + return toast.error('File yang diizinkan: .png, .jpg, dan .heic dengan ukuran maksimal 10 MB') }} onClick={() => openRef.current?.()} > diff --git a/src/module/document/ui/drawer_menu_document_division.tsx b/src/module/document/ui/drawer_menu_document_division.tsx index f6de9db..a1d67bf 100644 --- a/src/module/document/ui/drawer_menu_document_division.tsx +++ b/src/module/document/ui/drawer_menu_document_division.tsx @@ -148,13 +148,13 @@ export default function DrawerMenuDocumentDivision() { onUploadFile(files[0]) }} activateOnClick={false} - maxSize={3 * 1024 ** 2} + maxSize={100 * 1024 ** 2} accept={['image/png', 'image/jpeg', 'image/heic', 'application/pdf', 'application/msword', 'application/vnd.openxmlformats-officedocument.wordprocessingml.document', 'application/vnd.ms-excel', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet']} onReject={(files) => { refresh.set(true) setOpenModal(false) setOpenDrawerDocument(false) - toast.error('File yang diizinkan: .csv, .png, .jpg, .heic, .pdf, .doc, .docx, .xls, .xlsx dengan ukuran maksimal 3 MB') + toast.error('File yang diizinkan: .csv, .png, .jpg, .heic, .pdf, .doc, .docx, .xls, .xlsx dengan ukuran maksimal 100 MB') }} > openRef.current?.()}> diff --git a/src/module/project/ui/add_file_detail_project.tsx b/src/module/project/ui/add_file_detail_project.tsx index b1ceb76..71f3582 100644 --- a/src/module/project/ui/add_file_detail_project.tsx +++ b/src/module/project/ui/add_file_detail_project.tsx @@ -105,10 +105,10 @@ export default function AddFileDetailProject() { cekFileName(files[0]) }} activateOnClick={false} - maxSize={3 * 1024 ** 2} + maxSize={100 * 1024 ** 2} accept={['image/png', 'image/jpeg', 'image/heic', 'application/pdf', 'application/msword', 'application/vnd.openxmlformats-officedocument.wordprocessingml.document', 'application/vnd.ms-excel', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet']} onReject={(files) => { - return toast.error('File yang diizinkan: .csv, .png, .jpg, .heic, .pdf, .doc, .docx, .xls, .xlsx dengan ukuran maksimal 3 MB') + return toast.error('File yang diizinkan: .csv, .png, .jpg, .heic, .pdf, .doc, .docx, .xls, .xlsx dengan ukuran maksimal 100 MB') }} > diff --git a/src/module/project/ui/create_project.tsx b/src/module/project/ui/create_project.tsx index 1a09ae0..97a2ef3 100644 --- a/src/module/project/ui/create_project.tsx +++ b/src/module/project/ui/create_project.tsx @@ -412,10 +412,10 @@ export default function CreateProject() { setListFile([...listFile, { name: files[0].name, extension: files[0].type.split("/")[1] }]) }} activateOnClick={false} - maxSize={3 * 1024 ** 2} + maxSize={100 * 1024 ** 2} accept={['image/png', 'image/jpeg', 'image/heic', 'application/pdf', 'application/msword', 'application/vnd.openxmlformats-officedocument.wordprocessingml.document', 'application/vnd.ms-excel', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet']} onReject={(files) => { - return toast.error('File yang diizinkan: .csv, .png, .jpg, .heic, .pdf, .doc, .docx, .xls, .xlsx dengan ukuran maksimal 3 MB') + return toast.error('File yang diizinkan: .csv, .png, .jpg, .heic, .pdf, .doc, .docx, .xls, .xlsx dengan ukuran maksimal 100 MB') }} > @@ -437,10 +437,10 @@ export default function CreateProject() { setListFile([...listFile, { name: files[0].name, extension: files[0].type.split("/")[1] }]) }} activateOnClick={false} - maxSize={3 * 1024 ** 2} + maxSize={100 * 1024 ** 2} accept={['image/png', 'image/jpeg', 'image/heic', 'application/pdf']} onReject={(files) => { - return toast.error('File yang diizinkan: .png, .jpg, .heic, .pdf dengan ukuran maksimal 3 MB') + return toast.error('File yang diizinkan: .png, .jpg, .heic, .pdf dengan ukuran maksimal 100 MB') }} > openRef.current?.()}> diff --git a/src/module/task/ui/add_file_detail_task.tsx b/src/module/task/ui/add_file_detail_task.tsx index a992454..25183e3 100644 --- a/src/module/task/ui/add_file_detail_task.tsx +++ b/src/module/task/ui/add_file_detail_task.tsx @@ -106,10 +106,10 @@ export default function AddFileDetailTask() { cekFileName(files[0]) }} activateOnClick={false} - maxSize={3 * 1024 ** 2} + maxSize={100 * 1024 ** 2} accept={['image/png', 'image/jpeg', 'image/heic', 'application/pdf', 'application/msword', 'application/vnd.openxmlformats-officedocument.wordprocessingml.document', 'application/vnd.ms-excel', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet']} onReject={(files) => { - return toast.error('File yang diizinkan: .csv, .png, .jpg, .heic, .pdf, .doc, .docx, .xls, .xlsx dengan ukuran maksimal 3 MB') + return toast.error('File yang diizinkan: .csv, .png, .jpg, .heic, .pdf, .doc, .docx, .xls, .xlsx dengan ukuran maksimal 100 MB') }} > diff --git a/src/module/task/ui/create_task.tsx b/src/module/task/ui/create_task.tsx index fc24332..70f4c7a 100644 --- a/src/module/task/ui/create_task.tsx +++ b/src/module/task/ui/create_task.tsx @@ -335,10 +335,10 @@ export default function CreateTask() { setListFile([...listFile, { name: files[0].name, extension: files[0].type.split("/")[1] }]) }} activateOnClick={false} - maxSize={3 * 1024 ** 2} + maxSize={100 * 1024 ** 2} accept={['image/png', 'image/jpeg', 'image/heic', 'application/pdf', 'application/msword', 'application/vnd.openxmlformats-officedocument.wordprocessingml.document', 'application/vnd.ms-excel', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet']} onReject={(files) => { - return toast.error('File yang diizinkan: .csv, .png, .jpg, .heic, .pdf, .doc, .docx, .xls, .xlsx dengan ukuran maksimal 3 MB') + return toast.error('File yang diizinkan: .csv, .png, .jpg, .heic, .pdf, .doc, .docx, .xls, .xlsx dengan ukuran maksimal 100 MB') }} > diff --git a/src/module/user/member/ui/create_member.tsx b/src/module/user/member/ui/create_member.tsx index c306312..7c78b48 100644 --- a/src/module/user/member/ui/create_member.tsx +++ b/src/module/user/member/ui/create_member.tsx @@ -283,10 +283,10 @@ export default function CreateMember() { setIMG(buffer) }} activateOnClick={false} - maxSize={1 * 1024 ** 2} + maxSize={10 * 1024 ** 2} accept={['image/png', 'image/jpeg', 'image/heic']} onReject={(files) => { - return toast.error('File yang diizinkan: .png, .jpg, dan .heic dengan ukuran maksimal 1 MB') + return toast.error('File yang diizinkan: .png, .jpg, dan .heic dengan ukuran maksimal 10 MB') }} > diff --git a/src/module/user/member/ui/edit_member.tsx b/src/module/user/member/ui/edit_member.tsx index f9acc2e..d47b630 100644 --- a/src/module/user/member/ui/edit_member.tsx +++ b/src/module/user/member/ui/edit_member.tsx @@ -215,10 +215,10 @@ export default function EditMember({ id }: { id: string }) { setIMG(buffer) }} activateOnClick={false} - maxSize={1 * 1024 ** 2} + maxSize={10 * 1024 ** 2} accept={['image/png', 'image/jpeg', 'image/heic']} onReject={(files) => { - return toast.error('File yang diizinkan: .png, .jpg, dan .heic dengan ukuran maksimal 1 MB') + return toast.error('File yang diizinkan: .png, .jpg, dan .heic dengan ukuran maksimal 10 MB') }} > diff --git a/src/module/user/profile/ui/edit_profile.tsx b/src/module/user/profile/ui/edit_profile.tsx index beee85b..e0e6750 100644 --- a/src/module/user/profile/ui/edit_profile.tsx +++ b/src/module/user/profile/ui/edit_profile.tsx @@ -178,11 +178,11 @@ export default function EditProfile() { setIMG(buffer); }} activateOnClick={false} - maxSize={1 * 1024 ** 2} + maxSize={10 * 1024 ** 2} accept={["image/png", "image/jpeg", "image/heic"]} onReject={(files) => { return toast.error( - "File yang diizinkan: .png, .jpg, dan .heic dengan ukuran maksimal 1 MB" + "File yang diizinkan: .png, .jpg, dan .heic dengan ukuran maksimal 10 MB" ); }} > From f211ec0789813ebe8fdb70066c60563abc67f7b6 Mon Sep 17 00:00:00 2001 From: amel Date: Mon, 13 Jan 2025 14:25:22 +0800 Subject: [PATCH 2/3] rev: diskusi divisi Deskripsi: - fitur arsip pada diskusi divisi No Issues --- .../[id]/(fitur-division)/discussion/page.tsx | 5 +- src/app/api/discussion/[id]/route.ts | 8 +-- src/app/api/discussion/route.ts | 3 +- src/module/discussion/index.ts | 4 +- .../discussion/ui/detail_discussion.tsx | 2 +- .../ui/drawer_detail_discussion.tsx | 10 +-- src/module/discussion/ui/list_discussion.tsx | 16 +++-- .../discussion/ui/navbar_list_discussion.tsx | 5 +- src/module/discussion/ui/tab_discussion.tsx | 68 +++++++++++++++++++ 9 files changed, 98 insertions(+), 23 deletions(-) create mode 100644 src/module/discussion/ui/tab_discussion.tsx diff --git a/src/app/(application)/division/[id]/(fitur-division)/discussion/page.tsx b/src/app/(application)/division/[id]/(fitur-division)/discussion/page.tsx index 66c768a..5d13b83 100644 --- a/src/app/(application)/division/[id]/(fitur-division)/discussion/page.tsx +++ b/src/app/(application)/division/[id]/(fitur-division)/discussion/page.tsx @@ -1,11 +1,10 @@ -import { ListDiscussion, NavbarListDiscussion } from '@/module/discussion'; -import React from 'react'; +import { NavbarListDiscussion, TabListDiscussion } from '@/module/discussion'; function Page({ params }: { params: { id: string } }) { return (
- +
); } diff --git a/src/app/api/discussion/[id]/route.ts b/src/app/api/discussion/[id]/route.ts index febd350..c8c8948 100644 --- a/src/app/api/discussion/[id]/route.ts +++ b/src/app/api/discussion/[id]/route.ts @@ -160,7 +160,7 @@ export async function PUT(request: Request, context: { params: { id: string } }) }); if (cek == 0) { - return NextResponse.json({ success: false, message: "Gagal menghapus diskusi, data tidak ditemukan" }, { status: 404 }); + return NextResponse.json({ success: false, message: "Gagal mengarsipkan diskusi, data tidak ditemukan" }, { status: 404 }); } @@ -173,12 +173,12 @@ export async function PUT(request: Request, context: { params: { id: string } }) } }); // create log user - const log = await createLogUser({ act: 'DELETE', desc: 'User menghapus data diskusi', table: 'divisionDisscussion', data: id }) + const log = await createLogUser({ act: 'DELETE', desc: 'User mengarsipkan data diskusi', table: 'divisionDisscussion', data: id }) - return NextResponse.json({ success: true, message: "Berhasil menghapus diskusi", user: user.id }, { status: 200 }); + return NextResponse.json({ success: true, message: "Berhasil mengarsipkan diskusi", user: user.id }, { status: 200 }); } catch (error) { console.error(error); - return NextResponse.json({ success: false, message: "Gagal menghapus diskusi, coba lagi nanti (error: 500)", reason: (error as Error).message, }, { status: 500 }); + return NextResponse.json({ success: false, message: "Gagal mengarsipkan diskusi, coba lagi nanti (error: 500)", reason: (error as Error).message, }, { status: 500 }); } } diff --git a/src/app/api/discussion/route.ts b/src/app/api/discussion/route.ts index c1a4660..e8e2d9c 100644 --- a/src/app/api/discussion/route.ts +++ b/src/app/api/discussion/route.ts @@ -19,6 +19,7 @@ export async function GET(request: Request) { const idDivision = searchParams.get("division"); const name = searchParams.get('search'); const page = searchParams.get('page'); + const status = searchParams.get('active'); const dataSkip = Number(page) * 10 - 10; @@ -38,7 +39,7 @@ export async function GET(request: Request) { skip: dataSkip, take: 10, where: { - isActive: true, + isActive: status == "false" ? false : true, idDivision: idDivision, desc: { contains: (name == undefined || name == "null") ? "" : name, diff --git a/src/module/discussion/index.ts b/src/module/discussion/index.ts index d40c1d6..cda4448 100644 --- a/src/module/discussion/index.ts +++ b/src/module/discussion/index.ts @@ -3,9 +3,11 @@ import FormCreateDiscussion from "./ui/form_create_discussion"; import FormEditDiscussion from "./ui/form_edit_discussion"; import ListDiscussion from "./ui/list_discussion"; import NavbarListDiscussion from "./ui/navbar_list_discussion"; +import TabListDiscussion from "./ui/tab_discussion"; export { ListDiscussion } export { NavbarListDiscussion } export { FormCreateDiscussion } export { DetailDiscussion } -export { FormEditDiscussion } \ No newline at end of file +export { FormEditDiscussion } +export { TabListDiscussion } \ No newline at end of file diff --git a/src/module/discussion/ui/detail_discussion.tsx b/src/module/discussion/ui/detail_discussion.tsx index 163da33..169fab5 100644 --- a/src/module/discussion/ui/detail_discussion.tsx +++ b/src/module/discussion/ui/detail_discussion.tsx @@ -63,7 +63,7 @@ export default function DetailDiscussion({ id, idDivision }: { id: string, idDiv } if (dataRealTime && dataRealTime.some((i: any) => i.category == 'discussion-delete' && i.id == id && i.user != isUser)) { - toast.error("Data telah di hapus, anda akan beralih ke halaman list diskusi") + toast.error("Data telah diarsipkan, anda akan beralih ke halaman list diskusi") setTimeout(() => { router.push(`/division/${param.id}/discussion`) }, 1000) diff --git a/src/module/discussion/ui/drawer_detail_discussion.tsx b/src/module/discussion/ui/drawer_detail_discussion.tsx index 053e9d6..6c97356 100644 --- a/src/module/discussion/ui/drawer_detail_discussion.tsx +++ b/src/module/discussion/ui/drawer_detail_discussion.tsx @@ -5,7 +5,7 @@ import { Box, Flex, SimpleGrid, Stack, Text } from "@mantine/core"; import { useParams, useRouter } from "next/navigation"; import { useState } from "react"; import toast from "react-hot-toast"; -import { BsTrash3 } from "react-icons/bs"; +import { BiArchive } from "react-icons/bi"; import { FaCheck, FaPencil } from "react-icons/fa6"; import { MdClose } from "react-icons/md"; import { useWibuRealtime } from "wibu-realtime"; @@ -78,7 +78,7 @@ export default function DrawerDetailDiscussion({ onSuccess, id, status, idDivisi } } catch (error) { console.error(error); - toast.error("Gagal hapus diskusi, coba lagi nanti"); + toast.error("Gagal mengarsipkan diskusi, coba lagi nanti"); } finally { setLoadingDelete(false) setValModal(false) @@ -128,10 +128,10 @@ export default function DrawerDetailDiscussion({ onSuccess, id, status, idDivisi setValModal(true)} justify={'center'} align={'center'} direction={'column'} > - + - Hapus + Arsipkan @@ -139,7 +139,7 @@ export default function DrawerDetailDiscussion({ onSuccess, id, status, idDivisi setValModal(false)} - description="Apakah Anda yakin ingin menghapus diskusi ini?" + description="Apakah Anda yakin ingin mengarsipkan diskusi ini?" onYes={(val) => { fetchDeleteDiscussion(val) }} /> diff --git a/src/module/discussion/ui/list_discussion.tsx b/src/module/discussion/ui/list_discussion.tsx index c8fcac5..cf70e63 100644 --- a/src/module/discussion/ui/list_discussion.tsx +++ b/src/module/discussion/ui/list_discussion.tsx @@ -4,7 +4,7 @@ import { useHookstate } from "@hookstate/core"; import { Avatar, Badge, Box, Divider, Flex, Grid, Group, Skeleton, Spoiler, Text, TextInput } from "@mantine/core"; import { useShallowEffect } from "@mantine/hooks"; import _ from "lodash"; -import { useParams, useRouter } from "next/navigation"; +import { useParams, useRouter, useSearchParams } from "next/navigation"; import { useEffect, useState } from "react"; import toast from "react-hot-toast"; import { GrChatOption } from "react-icons/gr"; @@ -14,7 +14,7 @@ import { funGetAllDiscussion } from "../lib/api_discussion"; import { IDataDiscussion } from "../lib/type_discussion"; -export default function ListDiscussion({ id }: { id: string }) { +export default function ListDiscussion() { const [isData, setData] = useState([]) const [searchQuery, setSearchQuery] = useState('') const param = useParams<{ id: string }>() @@ -25,6 +25,8 @@ export default function ListDiscussion({ id }: { id: string }) { const [isPage, setPage] = useState(1) const notifLoadPage = useHookstate(globalNotifPage) const [isRefresh, setRefresh] = useState(false) + const searchParams = useSearchParams() + const status = searchParams.get('active') const [dataRealTime, setDataRealtime] = useWibuRealtime({ WIBU_REALTIME_TOKEN: keyWibu, project: "sdm" @@ -33,7 +35,7 @@ export default function ListDiscussion({ id }: { id: string }) { const getData = async (loading: boolean) => { try { setLoading(loading) - const response = await funGetAllDiscussion('?division=' + id + '&search=' + searchQuery + '&page=' + isPage) + const response = await funGetAllDiscussion('?division=' + param.id + '&search=' + searchQuery + '&page=' + isPage + '&active=' + status) if (response.success) { if (isPage == 1) { setData(response.data) @@ -57,7 +59,7 @@ export default function ListDiscussion({ id }: { id: string }) { useShallowEffect(() => { setPage(1) getData(true) - }, [searchQuery]) + }, [searchQuery, status]) useEffect(() => { const handleScroll = async () => { @@ -108,7 +110,7 @@ export default function ListDiscussion({ id }: { id: string }) { return ( - + { isRefresh && {v.user_name} - {v.status === 1 ? "BUKA" : "TUTUP"} + { + status != "false" && {v.status === 1 ? "BUKA" : "TUTUP"} + } diff --git a/src/module/discussion/ui/navbar_list_discussion.tsx b/src/module/discussion/ui/navbar_list_discussion.tsx index 9d5112b..cda613f 100644 --- a/src/module/discussion/ui/navbar_list_discussion.tsx +++ b/src/module/discussion/ui/navbar_list_discussion.tsx @@ -6,19 +6,20 @@ import { useState } from "react"; import DrawerListDiscussion from "./drawer_list_discussion"; import { useParams } from "next/navigation"; import { useHookstate } from "@hookstate/core"; -import { globalIsMemberDivision } from "@/module/division_new"; +import { globalIsAdminDivision, globalIsMemberDivision } from "@/module/division_new"; export default function NavbarListDiscussion() { const [openDrawer, setOpenDrawer] = useState(false) const roleLogin = useHookstate(globalRole) const memberDivision = useHookstate(globalIsMemberDivision) + const adminDivision = useHookstate(globalIsAdminDivision) const param = useParams<{ id: string }>() const tema = useHookstate(TEMA) return ( <> + (roleLogin.get() == "user" || roleLogin.get() == "coadmin") && !adminDivision.get() ? <> : setOpenDrawer(true)} bg={tema.get().bgIcon} size="lg" radius="lg" aria-label="Settings"> diff --git a/src/module/discussion/ui/tab_discussion.tsx b/src/module/discussion/ui/tab_discussion.tsx new file mode 100644 index 0000000..89ff6e9 --- /dev/null +++ b/src/module/discussion/ui/tab_discussion.tsx @@ -0,0 +1,68 @@ +"use client"; +import { globalRole, TEMA } from "@/module/_global"; +import { globalIsAdminDivision } from "@/module/division_new"; +import { useHookstate } from "@hookstate/core"; +import { Box, rem, Tabs } from "@mantine/core"; +import { useRouter, useSearchParams } from "next/navigation"; +import { IoMdCheckmarkCircleOutline } from "react-icons/io"; +import { IoCloseCircleOutline } from "react-icons/io5"; +import ListDiscussion from "./list_discussion"; + +export default function TabListDiscussion() { + const iconStyle = { width: rem(20), height: rem(20) }; + const router = useRouter(); + const searchParams = useSearchParams(); + const status = searchParams.get("active"); + const tema = useHookstate(TEMA) + const roleLogin = useHookstate(globalRole) + const adminDivision = useHookstate(globalIsAdminDivision) + + return ( + + + { + roleLogin.get() != '' + ? + (roleLogin.get() == "user" || roleLogin.get() == "coadmin") && !adminDivision.get() ? <> + : + + } + onClick={() => { + router.push("?active=true"); + }} + > + Aktif + + } + onClick={() => { + router.push("?active=false"); + }} + > + Arsip + + + : <> + } + + + + ); +} From 65682f5f51427252e08e424c95549912b138a8c3 Mon Sep 17 00:00:00 2001 From: amel Date: Mon, 13 Jan 2025 17:38:06 +0800 Subject: [PATCH 3/3] rev: calender diviis Deskripsi: - validasi judul & tgl || tgl & jam nb: blm tampil data yg konflik No Issues --- src/app/api/calender/route.ts | 75 +++++++++++++++++++++++++++++++++-- 1 file changed, 71 insertions(+), 4 deletions(-) diff --git a/src/app/api/calender/route.ts b/src/app/api/calender/route.ts index 320d328..1ae3295 100644 --- a/src/app/api/calender/route.ts +++ b/src/app/api/calender/route.ts @@ -212,18 +212,85 @@ export async function PUT(request: Request) { } }) - const cek = await prisma.divisionCalendarReminder.count({ + const y = new Date('1970-01-01 ' + timeStart) + const x = new Date('1970-01-01 ' + timeEnd) + const timeStartFix = new Date(y.getTime() - (y.getTimezoneOffset() * 60000)).toISOString() + const timeEndFix = new Date(x.getTime() - (x.getTimezoneOffset() * 60000)).toISOString() + + const cek = await prisma.divisionCalendarReminder.findMany({ where: { isActive: true, - dateStart: new Date(dateStart), Division: { idGroup: division?.idGroup + }, + OR: [ + { + dateStart: new Date(dateStart), + DivisionCalendar: { + title: { + equals: title, + mode: "insensitive" + }, + } + }, + { + dateStart: new Date(dateStart), + OR: [ + { + timeStart: { //13:00 + lte: timeStartFix, //13:30 + }, + timeEnd: { //14:00 + gt: timeStartFix, //13:30 + } + }, + { + timeStart: { //07:00 + lt: timeEndFix, //07:30 + }, + timeEnd: { //08:00 + gt: timeEndFix, //07:30 + } + }, + { + timeStart: { //07:00 + gt: timeStartFix, //06:30 + }, + timeEnd: { //08:00 + lte: timeEndFix, //09:30 + } + } + ] + + } + ] + }, + select: { + id: true, + dateStart: true, + timeStart: true, + timeEnd: true, + DivisionCalendar: { + select: { + title: true, + } + }, + Division: { + select: { + name: true + } } } }) - if (cek > 0) { - return NextResponse.json({ success: false, message: "Tidak dapat membuat acara kalender, acara kalender sudah ada pada tanggal tersebut" }, { status: 400 }); + const dataSama = cek.map((v: any) => ({ + ..._.omit(v, ["DivisionCalendar", "Division"]), + title: v.DivisionCalendar.title, + divisi: v.Division.name + })) + + if (cek.length > 0) { + return NextResponse.json({ success: false, message: "Tidak dapat membuat acara kalender, acara kalender sudah ada pada tanggal tersebut", data: dataSama }, { status: 400 }); } else { return NextResponse.json({ success: true, message: "Berhasil membuat acara kalender" }, { status: 200 }); }