Merge pull request #374 from bipproduction/amalia/13-jan-25

Amalia/13 jan 25

src/app/(application)/division/[id]/(fitur-division)/discussion/page.tsx

@@ -1,11 +1,10 @@
-import { ListDiscussion, NavbarListDiscussion } from '@/module/discussion';
+import { NavbarListDiscussion, TabListDiscussion } from '@/module/discussion';
-import React from 'react';
 
 function Page({ params }: { params: { id: string } }) {
   return (
     <div>
       <NavbarListDiscussion />
-      <ListDiscussion id={params.id} />
+      <TabListDiscussion />
     </div>
   );
 }

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) {
+        const dataSama = cek.map((v: any) => ({
-            return NextResponse.json({ success: false, message: "Tidak dapat membuat acara kalender, acara kalender sudah ada pada tanggal tersebut" }, { status: 400 });
+            ..._.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 });
         }

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 });
     }
 }
 

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,

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?.()}
             >

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?.()}
             >

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 }
+export { TabListDiscussion }

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)

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
 
                <Flex onClick={() => setValModal(true)} justify={'center'} align={'center'} direction={'column'} >
                   <Box>
-                     <BsTrash3 size={30} color={tema.get().utama} />
+                     <BiArchive size={30} color={tema.get().utama} />
                   </Box>
                   <Box>
-                     <Text c={tema.get().utama}>Hapus</Text>
+                     <Text c={tema.get().utama}>Arsipkan</Text>
                   </Box>
                </Flex>
 
@@ -139,7 +139,7 @@ export default function DrawerDetailDiscussion({ onSuccess, id, status, idDivisi
          </Stack>
 
          <LayoutModal loading={loadingDelete} opened={isValModal} onClose={() => setValModal(false)}
-            description="Apakah Anda yakin ingin menghapus diskusi ini?"
+            description="Apakah Anda yakin ingin mengarsipkan diskusi ini?"
             onYes={(val) => { fetchDeleteDiscussion(val) }} />
 
 

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<IDataDiscussion[]>([])
    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 (
-      <Box p={20}>
+      <Box py={20}>
          {
             isRefresh &&
             <ReloadButtonTop
@@ -207,7 +209,9 @@ export default function ListDiscussion({ id }: { id: string }) {
                                  <Text c={tema.get().utama} fw={"bold"} lineClamp={1}>
                                     {v.user_name}
                                  </Text>
-                                 <Badge color={v.status === 1 ? "green" : "red"} size="sm">{v.status === 1 ? "BUKA" : "TUTUP"}</Badge>
+                                 {
+                                    status != "false" && <Badge color={v.status === 1 ? "green" : "red"} size="sm">{v.status === 1 ? "BUKA" : "TUTUP"}</Badge>
+                                 }
                               </Box>
                            </Grid.Col>
                            <Grid.Col span={4}>

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 (
       <>
          <LayoutNavbarNew back={`/division/${param.id}`} title="Diskusi"
             menu={
-               (roleLogin.get() == "user" || roleLogin.get() == "coadmin") && !memberDivision.get() ? <></>
+               (roleLogin.get() == "user" || roleLogin.get() == "coadmin") && !adminDivision.get() ? <></>
                   :
                   <ActionIcon variant="light" onClick={() => setOpenDrawer(true)} bg={tema.get().bgIcon} size="lg" radius="lg" aria-label="Settings">
                      <HiMenu size={20} color='white' />

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 (
+      <Box p={20}>
+         <Tabs
+            variant="pills"
+            color={tema.get().bgFiturHome}
+            radius="xl"
+            defaultValue={status == "false" ? "false" : "true"}
+         >
+            {
+               roleLogin.get() != ''
+                  ?
+                  (roleLogin.get() == "user" || roleLogin.get() == "coadmin") && !adminDivision.get() ? <></>
+                     :
+                     <Tabs.List
+                        bg={"white"}
+                        style={{
+                           border: `1px solid ${"#EDEDED"}`,
+                           padding: 5,
+                           borderRadius: 100,
+                        }}
+                     >
+                        <Tabs.Tab
+                           value="true"
+                           w={"45%"}
+                           leftSection={<IoMdCheckmarkCircleOutline style={iconStyle} />}
+                           onClick={() => {
+                              router.push("?active=true");
+                           }}
+                        >
+                           Aktif
+                        </Tabs.Tab>
+                        <Tabs.Tab
+                           value="false"
+                           w={"53%"}
+                           leftSection={<IoCloseCircleOutline style={iconStyle} />}
+                           onClick={() => {
+                              router.push("?active=false");
+                           }}
+                        >
+                           Arsip
+                        </Tabs.Tab>
+                     </Tabs.List>
+                  : <></>
+            }
+            <ListDiscussion />
+         </Tabs>
+      </Box>
+   );
+}

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')
                 }}
               >
                 <Flex justify={'center'} align={'center'} direction={'column'} mb={20} onClick={() => openRef.current?.()}>

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')
                   }}
                >
                </Dropzone>

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')
         }}
       ></Dropzone>
 
@@ -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')
             }}
           >
             <Box onClick={() => openRef.current?.()}>

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')
                   }}
                >
                </Dropzone>

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')
         }}
       ></Dropzone>
 

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')
           }}
         >
         </Dropzone>

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')
                }}
             >
             </Dropzone>

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"
             );
           }}
         ></Dropzone>