upd: kalender

Deskripsi:
- mengeluarkan anggota
- edit api acara kalender
- log user

No Issues

src/app/api/calender/[id]/member/route.ts

@@ -55,3 +55,56 @@ export async function POST(request: Request, context: { params: { id: string } }
 
 
 }
+
+// MENGELUARKAN ANGGOTA
+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 { idUser } = (await request.json());
+
+      const data = await prisma.divisionCalendar.count({
+         where: {
+            id: id,
+         },
+      });
+
+
+      if (data == 0) {
+         return NextResponse.json(
+            {
+               success: false,
+               message: "Gagal mengeluarkan anggota, data tidak ditemukan",
+            },
+            { status: 404 }
+         );
+      }
+
+      const del = await prisma.divisionCalendarMember.deleteMany({
+         where: {
+            idUser: idUser,
+            idCalendar: id
+         }
+      })
+
+
+      // create log user
+      const log = await createLogUser({ act: 'DELETE', desc: 'User mengeluarkan anggota acara kalender', table: 'divisionCalendar', data: String(id) })
+
+
+      return NextResponse.json(
+         {
+            success: true,
+            message: "Berhasil mengeluarkan anggota",
+         },
+         { status: 200 }
+      );
+   } catch (error) {
+      console.error(error);
+      return NextResponse.json({ success: false, message: "Gagal mengeluarkan anggota, coba lagi nanti", reason: (error as Error).message, }, { status: 500 });
+   }
+}

src/app/api/calender/[id]/route.ts

@@ -1,7 +1,7 @@
-
 import { prisma } from "@/module/_global";
 import { funGetUserByCookies } from "@/module/auth";
-import _, { result } from "lodash";
+import { createLogUser } from "@/module/user";
+import _ from "lodash";
 import moment from "moment";
 import { NextResponse } from "next/server";
 
@@ -52,7 +52,7 @@ export async function GET(request: Request, context: { params: { id: string } })
         const timeStart = moment.utc(dataCalender?.timeStart).format("HH:mm")
         const timeEnd = moment.utc(dataCalender?.timeEnd).format("HH:mm")
 
-        const result = { ...dataCalender, timeStart, timeEnd  }
+        const result = { ...dataCalender, timeStart, timeEnd }
 
 
         const member = await prisma.divisionCalendarMember.findMany({
@@ -135,6 +135,9 @@ export async function DELETE(request: Request, context: { params: { id: string }
             }
         });
 
+        // create log user
+        const log = await createLogUser({ act: 'DELETE', desc: 'User menghapus data acara kalender', table: 'divisionCalendar', data: id })
+
         return NextResponse.json({ success: true, message: "Berhasil menghapus calender", data }, { status: 200 });
 
     } catch (error) {
@@ -159,7 +162,7 @@ export async function PUT(request: Request, context: { params: { id: string } })
 
         const { id } = context.params
         const userId = user.id
-        const { title, desc, timeStart, dateStart, timeEnd, linkMeet, repeatEventTyper, member } = await request.json()
+        const { title, desc, timeStart, dateStart, timeEnd, linkMeet, repeatEventTyper } = await request.json()
 
         const cek = await prisma.divisionCalendar.count({
             where: {
@@ -171,7 +174,7 @@ export async function PUT(request: Request, context: { params: { id: string } })
             return NextResponse.json(
                 {
                     success: false,
-                    message: "Gagal mengedit calender, data tidak ditemukan",
+                    message: "Gagal mengedit acara, data tidak ditemukan",
                 },
                 { status: 404 }
             );
@@ -199,31 +202,17 @@ export async function PUT(request: Request, context: { params: { id: string } })
             }
         });
 
-       const del =  await prisma.divisionCalendarMember.deleteMany({
-            where: {
-                idCalendar: id
-            }
-        })
 
-        const omitMember = member.map((v: any) => ({
+        // create log user
-            ..._.omit(v, ["name", "idUser"]),
+        const log = await createLogUser({ act: 'UPDATE', desc: 'User mengupdate data acara kalender', table: 'divisionCalendar', data: id })
-            idCalendar: data.id,
-            idUser: v.idUser
-        }))
 
-        const insertMember = await prisma.divisionCalendarMember.createMany({
+        return NextResponse.json({ success: true, message: "Berhasil mengedit acara" }, { status: 200 });
-            data: omitMember
-        });
-
-
-
-        return NextResponse.json({ success: true, message: "Berhasil mengedit calender" }, { status: 200 });
 
     } catch (error) {
         return NextResponse.json(
             {
                 success: false,
-                message: "Gagal mengedit calender, coba lagi nanti",
+                message: "Gagal mengedit acara, coba lagi nanti",
             },
             { status: 500 }
         );

src/app/api/calender/history/route.ts

@@ -80,15 +80,15 @@ export async function GET(request: Request) {
                 }
             })
 
-            return NextResponse.json({ success: true, message: "Berhasil mendapatkan calender", data: result }, { status: 200 });
+            return NextResponse.json({ success: true, message: "Berhasil mendapatkan riwayat acara kalender", data: result }, { status: 200 });
 
         } else {
-            return NextResponse.json({ success: false, message: "Gagal mendapatkan calender, data tidak ditemukan" }, { status: 404 });
+            return NextResponse.json({ success: false, message: "Gagal mendapatkan riwayat acara kalender, coba lagi nanti" }, { status: 404 });
 
         }
 
     } catch (error) {
         console.error(error)
-        return NextResponse.json({ success: false, message: "Gagal mendapatkan calender, data tidak ditemukan" }, { status: 404 });
+        return NextResponse.json({ success: false, message: "Gagal mendapatkan riwayat acara kalender, coba lagi nanti" }, { status: 404 });
     }
 }

src/app/api/calender/route.ts

@@ -5,6 +5,7 @@ import _ from "lodash";
 import moment from "moment";
 import { NextResponse } from "next/server";
 import "moment/locale/id";
+import { createLogUser } from '@/module/user';
 
 //GET ALL CALENDER
 export async function GET(request: Request) {
@@ -139,11 +140,13 @@ export async function POST(request: Request) {
         });
 
 
+        // create log user
+        const log = await createLogUser({ act: 'CREATE', desc: 'User membuat data acara kalender', table: 'divisionCalendar', data: data.id })
 
-        return NextResponse.json({ success: true, message: "Berhasil mendapatkan calender" }, { status: 200 });
+        return NextResponse.json({ success: true, message: "Berhasil membuat acara kalender" }, { status: 200 });
 
     } catch (error) {
         console.error(error);
-        return NextResponse.json({ success: false, message: "Gagal mendapatkan calender, coba lagi nanti", reason: (error as Error).message, }, { status: 500 });
+        return NextResponse.json({ success: false, message: "Gagal membuat acara kalender, coba lagi nanti", reason: (error as Error).message, }, { status: 500 });
     }
 }

src/module/calender/lib/api_calender.ts

@@ -59,3 +59,14 @@ export const funAddMemberCalender = async (path: string, data: IFormMemberCalend
     });
     return await response.json().catch(() => null);
 };
+
+export const funDeleteMemberCalender = async (path: string, data: { idUser: string }) => {
+    const response = await fetch(`/api/calender/${path}/member`, {
+       method: "DELETE",
+       headers: {
+          "Content-Type": "application/json",
+       },
+       body: JSON.stringify(data),
+    });
+    return await response.json().catch(() => null);
+ };

src/module/calender/lib/type_calender.ts

@@ -73,7 +73,7 @@ export interface IEditCalender {
     linkMeet?: string
     repeatEventTyper?: string
     desc?: string,
-    member?: IFormMemberCalender[]
+    // member?: IFormMemberCalender[]
 }
 
 export interface IEditMemberCalender {

src/module/calender/ui/date_event_division.tsx

@@ -109,7 +109,7 @@ export default function DateEventDivision() {
       </Group>
       <Box>
         <Text mb={10} mt={20} fw={"bold"}>
-          Event
+          Acara
         </Text>
         {loading ?
           Array(6)
@@ -123,7 +123,7 @@ export default function DateEventDivision() {
           _.isEmpty(isData)
             ?
             <Box style={{ display: 'flex', justifyContent: 'center', alignItems: 'center', height: '20vh' }}>
-              <Text c="dimmed" ta={"center"} fs={"italic"}>Tidak ada event</Text>
+              <Text c="dimmed" ta={"center"} fs={"italic"}>Tidak ada acara</Text>
             </Box>
             :
             isData.map((event, index) => {

src/module/calender/ui/dawer_division_calender.tsx

@@ -18,7 +18,7 @@ export default function DawerDivisionCalender() {
               <IoAddCircle size={30} color={WARNA.biruTua} />
             </Box>
             <Box>
-              <Text ta={"center"} c={WARNA.biruTua}>Tambah Kalender</Text>
+              <Text ta={"center"} c={WARNA.biruTua}>Tambah Acara</Text>
             </Box>
           </Flex>
           <Flex onClick={() => window.location.href = `/division/${param.id}/calender/history`} justify={'center'} align={'center'} direction={'column'} >

src/module/calender/ui/detail_event_division.tsx

@@ -10,7 +10,7 @@ import { TbCopy } from 'react-icons/tb';
 import { HiMenu } from 'react-icons/hi';
 import DrawerDetailEvent from './drawer_detail_event';
 import { useParams, useRouter } from 'next/navigation';
-import { funGetOneCalender } from '../lib/api_calender';
+import { funDeleteMemberCalender, funGetOneCalender } from '../lib/api_calender';
 import { useShallowEffect } from '@mantine/hooks';
 import moment from "moment";
 import "moment/locale/id";
@@ -18,6 +18,7 @@ import { IDataDetailByIdCalender, IDataDetailByIdMember } from '../lib/type_cale
 import SkeletonDetailEvent from './skeleton_detail_event';
 import { IoIosCloseCircle } from 'react-icons/io';
 import LayoutModal from '@/module/_global/layout/layout_modal';
+import toast from 'react-hot-toast';
 
 export default function DetailEventDivision() {
   const param = useParams<{ id: string, detail: string }>()
@@ -29,6 +30,7 @@ export default function DetailEventDivision() {
   const [openDrawerUser, setOpenDrawerUser] = useState(false)
   const [isOpenModal, setOpenModal] = useState(false)
   const router = useRouter()
+  const [dataChoose, setDataChoose] = useState({ id: '', name: '' })
 
 
   const getData = async () => {
@@ -50,9 +52,27 @@ export default function DetailEventDivision() {
     getData()
   }, [])
 
+  async function onSubmit() {
+    try {
+      const res = await funDeleteMemberCalender(param.detail, { idUser: dataChoose.id });
+      if (res.success) {
+        toast.success(res.message)
+        setDataChoose({ id: '', name: '' })
+        getData()
+        setOpenDrawer(false)
+        setOpenDrawerUser(false)
+      } else {
+        toast.error(res.message)
+      }
+    } catch (error) {
+      console.error(error);
+      toast.error("Gagal mengeluarkan anggota, coba lagi nanti");
+    }
+  }
+
   return (
     <Box>
-      <LayoutNavbarNew back={`/division/${param.id}/calender/`} title="Detail Kalender"
+      <LayoutNavbarNew back={`/division/${param.id}/calender/`} title="Detail Acara"
         menu={<ActionIcon variant="light" onClick={() => setOpenDrawer(true)} bg={WARNA.bgIcon} size="lg" radius="lg" aria-label="Settings">
           <HiMenu size={20} color='white' />
         </ActionIcon>} />
@@ -242,7 +262,10 @@ export default function DetailEventDivision() {
                         {
                           isDataAnggota.map((v, i) => {
                             return (
-                              <Box onClick={() => setOpenDrawerUser(true)} key={i}>
+                              <Box onClick={() => {
+                                setDataChoose({ id: v.idUser, name: v.name })
+                                setOpenDrawerUser(true)
+                              }} key={i}>
                                 <Box my={10}>
                                   <Grid align='center' gutter={"lg"}>
                                     <Grid.Col span={{
@@ -283,14 +306,14 @@ export default function DetailEventDivision() {
 
 
 
-      <LayoutDrawer opened={openDrawerUser} title={<Text lineClamp={1}>Menu</Text>} onClose={() => setOpenDrawerUser(false)}>
+      <LayoutDrawer opened={openDrawerUser} title={<Text lineClamp={1}>{dataChoose.name}</Text>} onClose={() => setOpenDrawerUser(false)}>
         <Box>
           <Stack pt={10}>
             <SimpleGrid
               cols={{ base: 2, sm: 3, lg: 3 }}
             >
               <Flex
-                // onClick={() => { router.push('/member/' + ) }}
+                onClick={() => { router.push('/member/' + dataChoose.id) }}
                 justify={'center'} align={'center'} direction={'column'} >
                 <Box>
                   <FaUser size={30} color={WARNA.biruTua} />
@@ -317,7 +340,7 @@ export default function DetailEventDivision() {
         description="Apakah Anda yakin ingin mengeluarkan anggota?"
         onYes={(val) => {
           if (val) {
-            // onSubmit()
+            onSubmit()
           }
           setOpenModal(false)
         }} />

src/module/calender/ui/drawer_detail_event.tsx

@@ -49,7 +49,7 @@ export default function DrawerDetailEvent() {
               <MdDelete size={30} color={WARNA.biruTua} />
             </Box>
             <Box>
-              <Text ta={"center"} c={WARNA.biruTua}>Hapus</Text>
+              <Text ta={"center"} c={WARNA.biruTua}>Hapus Acara</Text>
             </Box>
           </Flex>
           <Flex onClick={() => router.push(`/division/${param.id}/calender/update/${param.detail}`)} justify={'center'} align={'center'} direction={'column'} >
@@ -57,7 +57,7 @@ export default function DrawerDetailEvent() {
               <MdEdit size={30} color={WARNA.biruTua} />
             </Box>
             <Box>
-              <Text c={WARNA.biruTua}>Edit Kalender</Text>
+              <Text c={WARNA.biruTua}>Edit Acara</Text>
             </Box>
           </Flex>
           <Flex onClick={() => router.push(`/division/${param.id}/calender/${param.detail}/add-member`)} justify={'center'} align={'center'} direction={'column'} >

src/module/calender/ui/navbar_division_calender.tsx

@@ -12,7 +12,7 @@ export default function NavbarDivisionCalender() {
   const param = useParams<{ id: string }>()
   return (
     <div>
-      <LayoutNavbarNew back={`/division/${param.id}`} title="Divisi - kalender"
+      <LayoutNavbarNew back={`/division/${param.id}`} title="Kalender"
         menu={
           <ActionIcon variant="light" onClick={() => setOpenDrawer(true)} bg={WARNA.bgIcon} size="lg" radius="lg" aria-label="Settings">
             <HiMenu size={20} color='white' />

src/module/calender/ui/update_division_calender.tsx

@@ -19,8 +19,8 @@ import UpdateListUsers from './update_list_users';
 export default function UpdateDivisionCalender() {
   const [isModal, setModal] = useState(false)
   const param = useParams<{ id: string, detail: string }>()
-  const memberUser = useHookstate(globalCalender)
+  // const memberUser = useHookstate(globalCalender)
-  const memberValue = memberUser.get() as IFormMemberCalender[]
+  // const memberValue = memberUser.get() as IFormMemberCalender[]
   const [isDataCalender, setDataCalender] = useState<IDetailByIdCalender>()
   const [openMember, setOpenMember] = useState(false)
   const [loading, setLoading] = useState(true)
@@ -38,7 +38,7 @@ export default function UpdateDivisionCalender() {
       setLoading(true)
       const response = await funGetOneCalender(param.detail)
       setDataCalender(response.data.calender)
-      memberUser.set(response.data.member)
+      // memberUser.set(response.data.member)
     } catch (error) {
       console.error(error)
     } finally {
@@ -63,7 +63,7 @@ export default function UpdateDivisionCalender() {
           linkMeet: isDataCalender?.linkMeet,
           repeatEventTyper: isDataCalender?.repeatEventTyper,
           desc: isDataCalender?.desc,
-          member: memberValue
+          // member: memberValue
         })
 
         if (response.success) {
@@ -88,12 +88,11 @@ export default function UpdateDivisionCalender() {
 
   return (
     <Box>
-      <LayoutNavbarNew back={`/division/${param.id}/calender/${param.detail}`} title="Edit kalender" menu />
+      <LayoutNavbarNew back={`/division/${param.id}/calender/${param.detail}`} title="Edit acara" menu />
       <Box p={20}>
         <Stack>
           {loading ?
             <>
-              <Skeleton height={40} mt={25} radius={10} />
               <Skeleton height={40} mt={25} radius={10} />
               <Group justify='space-between'>
                 <Skeleton height={40} width={"47%"} mt={20} radius={10} />
@@ -102,7 +101,6 @@ export default function UpdateDivisionCalender() {
               <Skeleton height={40} mt={25} radius={10} />
               <Skeleton height={40} mt={25} radius={10} />
               <Skeleton height={80} mt={25} radius={10} />
-              <Skeleton height={40} mt={20} radius={10} />
             </>
             :
             <>
@@ -114,8 +112,8 @@ export default function UpdateDivisionCalender() {
                   },
                 }}
                 size="md"
-                placeholder="Event Nama"
+                placeholder="Acara"
-                label="Event Nama"
+                label="Acara"
                 defaultValue={isDataCalender?.title}
                 onChange={
                   (event) => {
@@ -250,8 +248,8 @@ export default function UpdateDivisionCalender() {
                   },
                 }}
                 size="md"
-                placeholder="Ulangi Event"
+                placeholder="Ulangi Acara"
-                label="Ulangi Event"
+                label="Ulangi Acara"
                 data={[
                   { value: '1', label: 'Acara 1 Kali' },
                   { value: '2', label: 'Hari Kerja (Sen - Jum)' },
@@ -273,7 +271,7 @@ export default function UpdateDivisionCalender() {
                 onBlur={() => setTouched({ ...touched, repeatEventTyper: true })}
                 error={
                   touched.repeatEventTyper && (
-                    isDataCalender?.repeatEventTyper == "" ? "Ulangi Event Tidak Boleh Kosong" : null
+                    isDataCalender?.repeatEventTyper == "" ? "Ulangi Acara Tidak Boleh Kosong" : null
                   )
                 }
                 required
@@ -379,7 +377,7 @@ export default function UpdateDivisionCalender() {
         }
       </Box>
       <LayoutModal opened={isModal} onClose={() => setModal(false)}
-        description="Apakah Anda yakin ingin menambahkan data?"
+        description="Apakah Anda yakin ingin mengubah data?"
         onYes={(val) => { onSubmit(val) }} />
     </Box>
   );