Merge pull request #211 from bipproduction/amalia/09-september-24

Amalia/09 september 24

package.json

@@ -51,6 +51,7 @@
     "react-simple-toasts": "^5.10.0",
     "readdirp": "^3.6.0",
     "recharts": "2",
+    "rrule": "^2.8.1",
     "yargs": "^17.7.2"
   },
   "devDependencies": {

prisma/schema.prisma

@@ -397,7 +397,8 @@ model DivisionCalendar {
   dateEnd                  DateTime?                  @db.Date
   timeStart                DateTime                   @db.Time()
   timeEnd                  DateTime                   @db.Time()
-  repeatEventTyper         String // 1 = Acara 1 Kali, 2 = hari Kerja (senin - jumat), 3 = Minggu, 4 = Bulanan, 5 = Tahunan
+  repeatEventTyper         String // once = Acara 1 Kali, weekdays = hari Kerja (senin - jumat), daily=setiap hari , weekly = setiap minggu, monthly = setiap bulan, yearly = setiap tahun
+  repeatValue              Int                        @default(1)
   reminderInterval         String?
   status                   Int                        @default(0)
   isActive                 Boolean                    @default(true)
@@ -415,7 +416,7 @@ model DivisionCalendarReminder {
   DivisionCalendar DivisionCalendar @relation(fields: [idCalendar], references: [id])
   idCalendar       String
   dateStart        DateTime         @db.Date
-  dateEnd          DateTime         @db.Date
+  dateEnd          DateTime?        @db.Date
   timeStart        DateTime         @db.Time()
   timeEnd          DateTime         @db.Time()
   status           Int              @default(0)

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

@@ -2,8 +2,74 @@ import { prisma } from "@/module/_global";
 import { funGetUserByCookies } from "@/module/auth";
 import { createLogUser } from "@/module/user";
 import _ from "lodash";
+import moment from "moment";
 import { NextResponse } from "next/server";
 
+
+// GET ONE DATA KALENDER BY ID KALENDER 
+export async function GET(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 cek = await prisma.divisionCalendar.count({
+         where: {
+            id: id
+         }
+      })
+
+      if (cek == 0) {
+         return NextResponse.json(
+            {
+               success: false,
+               message: "Gagal mendapatkan calender, data tidak ditemukan",
+            },
+            { status: 404 }
+         );
+      }
+
+      const data = await prisma.divisionCalendar.findUnique({
+         where: {
+            id: id
+         },
+         select: {
+            id: true,
+            title: true,
+            desc: true,
+            timeStart: true,
+            dateStart: true,
+            timeEnd: true,
+            createdAt: true,
+            linkMeet: true,
+            repeatValue: true,
+            repeatEventTyper: true,
+         }
+      });
+
+      const { ...dataCalender } = data
+      const timeStart = moment.utc(dataCalender?.timeStart).format("HH:mm")
+      const timeEnd = moment.utc(dataCalender?.timeEnd).format("HH:mm")
+
+      const result = { ...dataCalender, timeStart, timeEnd }
+
+      return NextResponse.json({ success: true, message: "Berhasil mendapatkan calender", data: result }, { status: 200 });
+
+   } catch (error) {
+      return NextResponse.json(
+         {
+            success: false,
+            message: "Gagal mendapatkan calender, data tidak ditemukan",
+         },
+         { status: 404 }
+      );
+   }
+}
+
+
 // TAMBAH MEMBER KALENDER
 export async function POST(request: Request, context: { params: { id: string } }) {
    try {
@@ -54,4 +120,57 @@ 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,11 +1,12 @@
-
 import { prisma } from "@/module/_global";
 import { funGetUserByCookies } from "@/module/auth";
-import _, { result } from "lodash";
+import { createLogUser } from "@/module/user";
+import _, { remove } from "lodash";
 import moment from "moment";
 import { NextResponse } from "next/server";
+import { Frequency, RRule } from 'rrule';
 
-// GET ONE CALENDER
+// GET ONE CALENDER BY ID KALENDER REMINDER
 export async function GET(request: Request, context: { params: { id: string } }) {
     try {
         const user = await funGetUserByCookies()
@@ -15,7 +16,7 @@ export async function GET(request: Request, context: { params: { id: string } })
 
         const { id } = context.params
 
-        const cek = await prisma.divisionCalendar.count({
+        const cek = await prisma.divisionCalendarReminder.count({
             where: {
                 id: id
             }
@@ -25,39 +26,51 @@ export async function GET(request: Request, context: { params: { id: string } })
             return NextResponse.json(
                 {
                     success: false,
-                    message: "Gagal mendapatkan calender, data tidak ditemukan",
+                    message: "Gagal mendapatkan acara, data tidak ditemukan",
                 },
                 { status: 404 }
             );
         }
 
-        const data = await prisma.divisionCalendar.findUnique({
+        const data: any = await prisma.divisionCalendarReminder.findUnique({
             where: {
                 id: id
             },
             select: {
                 id: true,
-                title: true,
-                desc: true,
                 timeStart: true,
                 dateStart: true,
                 timeEnd: true,
                 createdAt: true,
-                linkMeet: true,
+                DivisionCalendar: {
-                repeatEventTyper: true,
+                    select: {
+                        id: true,
+                        title: true,
+                        desc: true,
+                        linkMeet: true,
+                        repeatEventTyper: true,
+                        repeatValue: true,
+                    }
+                }
             }
         });
-
+        const { DivisionCalendar, ...dataCalender } = data
-        const { ...dataCalender } = data
         const timeStart = moment.utc(dataCalender?.timeStart).format("HH:mm")
         const timeEnd = moment.utc(dataCalender?.timeEnd).format("HH:mm")
+        const idCalendar = data?.DivisionCalendar.id
+        const title = data?.DivisionCalendar?.title
+        const desc = data?.DivisionCalendar?.desc
+        const linkMeet = data?.DivisionCalendar?.linkMeet
+        const repeatEventTyper = data?.DivisionCalendar?.repeatEventTyper
+        const repeatValue = data?.DivisionCalendar?.repeatValue
 
-        const result = { ...dataCalender, timeStart, timeEnd  }
+
+        const result = { ...dataCalender, timeStart, timeEnd, idCalendar, title, desc, linkMeet, repeatEventTyper, repeatValue }
 
 
         const member = await prisma.divisionCalendarMember.findMany({
             where: {
-                idCalendar: id
+                idCalendar: data?.DivisionCalendar.id
             },
             select: {
                 id: true,
@@ -120,7 +133,7 @@ export async function DELETE(request: Request, context: { params: { id: string }
             return NextResponse.json(
                 {
                     success: false,
-                    message: "Gagal menghapus calender, data tidak ditemukan",
+                    message: "Gagal menghapus acara kalender, data tidak ditemukan",
                 },
                 { status: 404 }
             );
@@ -135,7 +148,10 @@ export async function DELETE(request: Request, context: { params: { id: string }
             }
         });
 
-        return NextResponse.json({ success: true, message: "Berhasil menghapus calender", data }, { status: 200 });
+        // 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 acara kalender", data }, { status: 200 });
 
     } catch (error) {
         return NextResponse.json(
@@ -148,7 +164,7 @@ export async function DELETE(request: Request, context: { params: { id: string }
     }
 }
 
-// EDIT CALENDER BY ID
+// EDIT CALENDER BY IDKALENDER
 export async function PUT(request: Request, context: { params: { id: string } }) {
     try {
 
@@ -159,7 +175,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, repeatValue } = await request.json()
 
         const cek = await prisma.divisionCalendar.count({
             where: {
@@ -171,7 +187,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 }
             );
@@ -195,35 +211,59 @@ export async function PUT(request: Request, context: { params: { id: string } })
                 timeEnd: timeEndFix,
                 linkMeet: linkMeet,
                 repeatEventTyper: repeatEventTyper,
-                status: statusCalender
+                status: statusCalender,
+                repeatValue: Number(repeatValue)
+            },
+            select: {
+                idDivision: true
             }
         });
 
-       const del =  await prisma.divisionCalendarMember.deleteMany({
+        const freq: Frequency = repeatEventTyper === "yearly" ? RRule.YEARLY :
+            repeatEventTyper === "monthly" ? RRule.MONTHLY :
+                repeatEventTyper === "weekly" ? RRule.WEEKLY :
+                    repeatEventTyper === "daily" ? RRule.DAILY :
+                        repeatEventTyper === "hourly" ? RRule.HOURLY :
+                            repeatEventTyper === "minutely" ? RRule.MINUTELY :
+                                RRule.SECONDLY;
+
+        const rule = new RRule({
+            freq,
+            interval: 1,
+            dtstart: new Date(dateStart),
+            count: repeatValue
+        });
+
+        const hasil = rule.all().map(recurrenceDate => ({
+            idDivision: data.idDivision,
+            idCalendar: id,
+            dateStart: recurrenceDate,
+            timeStart: timeStartFix,
+            timeEnd: timeEndFix,
+            dateEnd: recurrenceDate
+        }));
+
+        const deleteReminder = await prisma.divisionCalendarReminder.deleteMany({
             where: {
                 idCalendar: id
             }
         })
-        
-        const omitMember = member.map((v: any) => ({
-            ..._.omit(v, ["name", "idUser"]),
-            idCalendar: data.id,
-            idUser: v.idUser
-        }))
 
-        const insertMember = await prisma.divisionCalendarMember.createMany({
+        const insertReminder = await prisma.divisionCalendarReminder.createMany({
-            data: omitMember
+            data: hasil
-        });
+        })
 
 
+        // create log user
+        const log = await createLogUser({ act: 'UPDATE', desc: 'User mengupdate data acara kalender', table: 'divisionCalendar', data: id })
 
-        return NextResponse.json({ success: true, message: "Berhasil mengedit calender" }, { status: 200 });
+        return NextResponse.json({ success: true, message: "Berhasil mengedit acara" }, { 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

@@ -29,21 +29,29 @@ export async function GET(request: Request) {
                 return NextResponse.json({ success: false, message: "Gagal mendapatkan divisi, data tidak ditemukan" }, { status: 404 });
             }
 
-            const data = await prisma.divisionCalendar.findMany({
+            const data = await prisma.divisionCalendarReminder.findMany({
                 where: {
                     isActive: true,
                     idDivision: idDivision,
-                    title: {
+                    DivisionCalendar: {
-                        contains: (name == undefined || name == "null") ? "" : name,
+                        title: {
-                        mode: "insensitive"
+                            contains: (name == undefined || name == "null") ? "" : name,
+                            mode: "insensitive"
+                        },
+                        isActive: true
                     }
+
                 },
                 select: {
                     id: true,
-                    title: true,
                     timeStart: true,
                     dateStart: true,
                     timeEnd: true,
+                    DivisionCalendar: {
+                        select: {
+                            title: true,
+                        }
+                    }
                 },
                 orderBy: [
                     {
@@ -59,8 +67,8 @@ export async function GET(request: Request) {
             });
 
             const allOmit = data.map((v: any) => ({
-                ..._.omit(v, [""]),
+                ..._.omit(v, ["DivisionCalendar"]),
-                dateStart: v.dateStart,
+                title: v.DivisionCalendar.title
             }))
 
             // groupBy untuk dateStart
@@ -80,15 +88,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/indicator/route.ts

@@ -31,13 +31,16 @@ export async function GET(request: Request) {
             return NextResponse.json({ success: false, message: "Gagal mendapatkan divisi, data tidak ditemukan" }, { status: 404 });
         }
 
-        const data = await prisma.divisionCalendar.findMany({
+        const data = await prisma.divisionCalendarReminder.findMany({
             where: {
                 isActive: true,
                 idDivision: String(idDivision),
                 dateStart: {
                     gte: new Date(awalDate),
                     lte: new Date(akhirDate),
+                },
+                DivisionCalendar: {
+                    isActive: true
                 }
             }
         })

src/app/api/calender/route.ts

@@ -1,10 +1,11 @@
-import { User } from './../../../module/discussion/lib/type_discussion';
 import { prisma } from "@/module/_global";
 import { funGetUserByCookies } from "@/module/auth";
 import _ from "lodash";
 import moment from "moment";
 import { NextResponse } from "next/server";
 import "moment/locale/id";
+import { createLogUser } from '@/module/user';
+import { Frequency, RRule } from 'rrule';
 
 //GET ALL CALENDER
 export async function GET(request: Request) {
@@ -31,25 +32,33 @@ export async function GET(request: Request) {
                 return NextResponse.json({ success: false, message: "Gagal mendapatkan divisi, data tidak ditemukan" }, { status: 404 });
             }
 
-            const data = await prisma.divisionCalendar.findMany({
+            const data = await prisma.divisionCalendarReminder.findMany({
                 where: {
                     isActive: true,
                     idDivision: idDivision,
-                    dateStart:  new Date(String(isDate))
+                    dateStart: new Date(String(isDate)),
+                    DivisionCalendar:{
+                        isActive: true
+                    }
                 },
                 select: {
                     id: true,
-                    title: true,
+                    idCalendar: true,
-                    desc: true,
-                    status: true,
                     timeStart: true,
                     dateStart: true,
                     timeEnd: true,
                     dateEnd: true,
                     createdAt: true,
-                    User: {
+                    status: true,
+                    DivisionCalendar: {
                         select: {
-                            name: true
+                            title: true,
+                            desc: true,
+                            User: {
+                                select: {
+                                    name: true
+                                }
+                            }
                         }
                     }
                 },
@@ -59,8 +68,10 @@ export async function GET(request: Request) {
             });
 
             const allOmit = data.map((v: any) => ({
-                ..._.omit(v, ["User"]),
+                ..._.omit(v, ["DivisionCalendar", "User"]),
-                user_name: v.User.name,
+                title: v.DivisionCalendar.title,
+                desc: v.DivisionCalendar.desc,
+                user_name: v.DivisionCalendar.User.name,
                 timeStart: moment.utc(v.timeStart).format('HH:mm'),
                 timeEnd: moment.utc(v.timeEnd).format('HH:mm')
             }))
@@ -87,7 +98,7 @@ export async function POST(request: Request) {
             return NextResponse.json({ success: false, message: "Anda harus login untuk mengakses ini" }, { status: 401 });
         }
 
-        const { idDivision, title, desc, timeStart, timeEnd, dateStart, dateEnd, repeatEventTyper, member, linkMeet } = (await request.json());
+        const { idDivision, title, desc, timeStart, timeEnd, dateStart, dateEnd, repeatEventTyper, member, linkMeet, repeatValue } = (await request.json());
 
 
         const userId = user.id
@@ -102,8 +113,6 @@ export async function POST(request: Request) {
             return NextResponse.json({ success: false, message: "Gagal mendapatkan divisi, data tidak ditemukan" }, { status: 404 });
         }
 
-        const statusCalender = 0
-
         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()
@@ -120,16 +129,44 @@ export async function POST(request: Request) {
                 linkMeet,
                 repeatEventTyper,
                 desc,
-                status: statusCalender
+                repeatValue: Number(repeatValue)
             },
             select: {
                 id: true,
-
             }
         });
 
+
+        const freq: Frequency = repeatEventTyper === "yearly" ? RRule.YEARLY :
+            repeatEventTyper === "monthly" ? RRule.MONTHLY :
+                repeatEventTyper === "weekly" ? RRule.WEEKLY :
+                    repeatEventTyper === "daily" ? RRule.DAILY :
+                        repeatEventTyper === "hourly" ? RRule.HOURLY :
+                            repeatEventTyper === "minutely" ? RRule.MINUTELY :
+                                RRule.SECONDLY;
+
+        const rule = new RRule({
+            freq,
+            interval: 1,
+            dtstart: new Date(dateStart),
+            count: repeatValue
+        });
+
+        const hasil = rule.all().map(recurrenceDate => ({
+            idDivision: idDivision,
+            idCalendar: data.id,
+            dateStart: recurrenceDate,
+            timeStart: timeStartFix,
+            timeEnd: timeEndFix,
+            dateEnd: recurrenceDate
+        }));
+
+        const insertReminder = await prisma.divisionCalendarReminder.createMany({
+            data: hasil
+        })
+
         const omitMember = member.map((v: any) => ({
-            ..._.omit(v, ["name", "idUser"]),
+            ..._.omit(v, ["name", "idUser", "img"]),
             idCalendar: data.id,
             idUser: v.idUser
         }))
@@ -139,11 +176,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

@@ -14,6 +14,11 @@ export const funGetOneCalender = async (path: string) => {
     return await response.json().catch(() => null);
 }
 
+export const funGetOneCalenderByIdCalendar = async (path: string) => {
+    const response = await fetch(`/api/calender/${path}/member`);
+    return await response.json().catch(() => null);
+}
+
 export const funCreateCalender = async (data: IFormCreateCalender) => {
     const response = await fetch("/api/calender", {
         method: "POST",
@@ -58,4 +63,15 @@ export const funAddMemberCalender = async (path: string, data: IFormMemberCalend
         body: JSON.stringify(data),
     });
     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

@@ -1,5 +1,6 @@
 export interface IDataCalender {
     id: string
+    idCalendar: string
     title: string
     desc: string
     status: number
@@ -23,6 +24,7 @@ export interface IHistoryCalender {
 
 export interface IDataDetailByIdCalender {
     id: string
+    idCalendar: string
     title: string
     desc: string
     timeStart: string
@@ -31,6 +33,7 @@ export interface IDataDetailByIdCalender {
     createdAt: string
     linkMeet: string
     repeatEventTyper: string
+    repeatValue: string
 }
 export interface IDataDetailByIdMember {
     id: string
@@ -49,6 +52,7 @@ export interface IFormCreateCalender {
     linkMeet: string
     repeatEventTyper: string
     desc: string,
+    repeatValue: string,
     member: IFormMemberCalender[]
 }
 
@@ -73,7 +77,8 @@ export interface IEditCalender {
     linkMeet?: string
     repeatEventTyper?: string
     desc?: string,
-    member?: IFormMemberCalender[]
+    repeatValue?: string
+    // member?: IFormMemberCalender[]
 }
 
 export interface IEditMemberCalender {
@@ -93,6 +98,7 @@ export interface IDetailByIdCalender {
     createdAt?: string
     linkMeet?: string
     repeatEventTyper?: string
+    repeatValue?: string
 }
 
 export interface IFormMemberCalenderNew {

src/module/calender/ui/create_user_detail_calender.tsx

@@ -11,12 +11,13 @@ import { HiMagnifyingGlass } from 'react-icons/hi2';
 import { IoArrowBackOutline, IoClose } from 'react-icons/io5';
 import { Carousel } from '@mantine/carousel';
 import { funAddMemberCalender, funGetOneCalender } from '../lib/api_calender';
-import { IDataDetailByIdMember } from '../lib/type_calender';
+import { IDataDetailByIdCalender, IDataDetailByIdMember } from '../lib/type_calender';
 
 export default function CreateUserDetailCalender() {
   const router = useRouter()
   const param = useParams<{ id: string, detail: string }>()
   const [selectedFiles, setSelectedFiles] = useState<any>([])
+  const [isDataCalender, setDataCalender] = useState<IDataDetailByIdCalender>()
   const [isData, setData] = useState<IDataMemberDivision[]>([])
   const [isDataAnggota, setDataAnggota] = useState<IDataDetailByIdMember[]>([])
   const [selectAll, setSelectAll] = useState(false)
@@ -30,6 +31,7 @@ export default function CreateUserDetailCalender() {
       const response = await funGetSearchMemberDivision("?search=", param.id)
       const res = await funGetOneCalender(param.detail)
       if (response.success) {
+        setDataCalender(res.data.calender)
         setDataAnggota(res.data.member)
         setData(response.data)
         setLoading(false)
@@ -84,7 +86,7 @@ export default function CreateUserDetailCalender() {
         return toast.error("Error! silahkan pilih anggota")
       }
 
-      const res = await funAddMemberCalender(param.detail, selectedFiles)
+      const res = await funAddMemberCalender(String(isDataCalender?.idCalendar), selectedFiles)
       if (res.success) {
         toast.success(res.message)
         router.push('./')

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(String(isDataCalender?.idCalendar), { 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>} />
@@ -121,11 +141,12 @@ export default function DetailEventDivision() {
                   xl: 11
                 }}>
                   <Text>
-                    {isDataCalender?.repeatEventTyper.toString() === '1' ? 'Acara 1 Kali' :
+                    {isDataCalender?.repeatEventTyper.toString() === 'once' ? 'Acara 1 Kali' :
-                      isDataCalender?.repeatEventTyper.toString() === '2' ? 'Hari Kerja (senin - jumat)' :
+                      isDataCalender?.repeatEventTyper.toString() === 'daily' ? 'Setiap Hari' :
-                        isDataCalender?.repeatEventTyper.toString() === '3' ? 'Minggu' :
+                        // isDataCalender?.repeatEventTyper.toString() === 'weekdays' ? 'Hari Kerja (senin - jumat)' :
-                          isDataCalender?.repeatEventTyper.toString() === '4' ? 'Bulanan' :
+                        isDataCalender?.repeatEventTyper.toString() === 'weekly' ? 'Mingguan' :
-                            isDataCalender?.repeatEventTyper.toString() === '5' ? 'Tahunan' :
+                          isDataCalender?.repeatEventTyper.toString() === 'monthly' ? 'Bulanan' :
+                            isDataCalender?.repeatEventTyper.toString() === 'yearly' ? 'Tahunan' :
                               ''}
                   </Text>
                 </Grid.Col>
@@ -242,7 +263,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 +307,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,12 +341,12 @@ export default function DetailEventDivision() {
         description="Apakah Anda yakin ingin mengeluarkan anggota?"
         onYes={(val) => {
           if (val) {
-            // onSubmit()
+            onSubmit()
           }
           setOpenModal(false)
         }} />
       <LayoutDrawer opened={openDrawer} title={'Menu'} onClose={() => setOpenDrawer(false)}>
-        <DrawerDetailEvent />
+        <DrawerDetailEvent idCalendar={String(isDataCalender?.idCalendar)} />
       </LayoutDrawer>
     </Box>
   );

src/module/calender/ui/drawer_detail_event.tsx

@@ -5,13 +5,11 @@ import { Box, Flex, SimpleGrid, Stack, Text } from '@mantine/core';
 import { useParams, useRouter } from 'next/navigation';
 import React, { useState } from 'react';
 import toast from 'react-hot-toast';
-import { AiOutlineFileSearch } from 'react-icons/ai';
-import { IoAddCircle } from 'react-icons/io5';
 import { MdDelete, MdEdit } from 'react-icons/md';
 import { funDeleteCalenderById } from '../lib/api_calender';
 import { FaUsers } from 'react-icons/fa6';
 
-export default function DrawerDetailEvent() {
+export default function DrawerDetailEvent({ idCalendar }: { idCalendar: string }) {
   const router = useRouter()
   const [isModal, setModal] = useState(false)
   const param = useParams<{ id: string, detail: string }>()
@@ -19,9 +17,7 @@ export default function DrawerDetailEvent() {
   async function fetchDeleteCalender(val: boolean) {
     try {
       if (val) {
-        const response = await funDeleteCalenderById(
+        const response = await funDeleteCalenderById(idCalendar)
-          param.detail
-        )
         if (response.success) {
           toast.success(response.message)
           setModal(false)
@@ -34,7 +30,7 @@ export default function DrawerDetailEvent() {
     } catch (error) {
       console.error(error);
       setModal(false)
-      toast.error("Gagal hapus calender, coba lagi nanti");
+      toast.error("Gagal hapus acara, coba lagi nanti");
     }
   }
 
@@ -49,15 +45,15 @@ 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'} >
+          <Flex onClick={() => router.push(`/division/${param.id}/calender/update/${idCalendar}`)} justify={'center'} align={'center'} direction={'column'} >
             <Box>
               <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'} >
@@ -71,7 +67,7 @@ export default function DrawerDetailEvent() {
         </SimpleGrid>
       </Stack>
       <LayoutModal opened={isModal} onClose={() => setModal(false)}
-        description="Apakah Anda yakin ingin menghapus data?"
+        description="Apakah Anda yakin ingin menghapus data acara ini? Data ini akan mempengaruhi semua data yang terkait"
         onYes={(val) => { fetchDeleteCalender(val) }} />
     </Box>
   );

src/module/calender/ui/history_division_calender.tsx

@@ -37,7 +37,7 @@ export default function HistoryDivisionCalender() {
   }, [searchQuery])
   return (
     <Box>
-      <LayoutNavbarNew back={`/division/${param.id}/calender/`} title="Riwayat kalender" menu />
+      <LayoutNavbarNew back={`/division/${param.id}/calender/`} title="Riwayat acara" menu />
       <Box p={20}>
         <TextInput
           styles={{

src/module/calender/ui/navbar_create_division_calender.tsx

@@ -1,6 +1,6 @@
 "use client"
 import { LayoutNavbarNew, WARNA } from '@/module/_global';
-import { Avatar, Box, Button, Divider, Flex, Grid, Group, Input, rem, Select, SimpleGrid, Stack, Text, Textarea, TextInput } from '@mantine/core';
+import { Avatar, Box, Button, Divider, Flex, Grid, Group, Input, NumberInput, rem, Select, SimpleGrid, Stack, Text, Textarea, TextInput } from '@mantine/core';
 import { DateInput, TimeInput } from '@mantine/dates';
 import React, { useState } from 'react';
 import { IoIosArrowDropright } from 'react-icons/io';
@@ -28,7 +28,8 @@ export default function NavbarCreateDivisionCalender() {
     timeStart: false,
     timeEnd: false,
     repeatEventTyper: false,
-    desc: false
+    desc: false,
+    repeatValue: false
   })
   const [isData, setData] = useState({
     idDivision: "",
@@ -39,6 +40,7 @@ export default function NavbarCreateDivisionCalender() {
     linkMeet: "",
     repeatEventTyper: "",
     desc: "",
+    repeatValue: "1"
   })
 
   async function onSubmit(val: boolean) {
@@ -56,6 +58,7 @@ export default function NavbarCreateDivisionCalender() {
           linkMeet: isData.linkMeet,
           repeatEventTyper: isData.repeatEventTyper,
           desc: isData.desc,
+          repeatValue: isData.repeatValue,
           member: memberValue
         })
 
@@ -80,10 +83,9 @@ export default function NavbarCreateDivisionCalender() {
 
   if (openMember) return <CreateUserCalender onClose={() => setOpenMember(false)} />
 
-
   return (
     <Box>
-      <LayoutNavbarNew back={`/division/${param.id}/calender/`} title="tambah kalender" menu />
+      <LayoutNavbarNew back={`/division/${param.id}/calender/`} title="Tambah Acara" menu />
       <Box p={20}>
         <Stack pb={100}>
           <TextInput
@@ -198,14 +200,15 @@ export default function NavbarCreateDivisionCalender() {
               },
             }}
             size="md"
-            placeholder="Ulangi Event"
+            placeholder="Ulangi Acara"
-            label="Ulangi Event"
+            label="Ulangi Acara"
             data={[
-              { value: '1', label: 'Acara 1 Kali' },
+              { value: 'once', label: 'Acara 1 Kali' },
-              { value: '2', label: 'Hari Kerja (Sen - Jum)' },
+              { value: 'daily', label: 'Setiap Hari' },
-              { value: '3', label: 'Mingguan' },
+              // { value: 'weekdays', label: 'Hari Kerja (Sen - Jum)' },
-              { value: '4', label: 'Bulanan' },
+              { value: 'weekly', label: 'Mingguan' },
-              { value: '5', label: 'Tahunan' },
+              { value: 'monthly', label: 'Bulanan' },
+              { value: 'yearly', label: 'Tahunan' },
             ]}
             value={isData.repeatEventTyper}
             onChange={(val: any) => {
@@ -216,7 +219,31 @@ export default function NavbarCreateDivisionCalender() {
             onBlur={() => setTouched({ ...touched, repeatEventTyper: true })}
             error={
               touched.repeatEventTyper && (
-                isData.repeatEventTyper == "" ? "Ulangi Event Tidak Boleh Kosong" : null
+                isData.repeatEventTyper == "" ? "Ulangi Acara Tidak Boleh Kosong" : null
+              )
+            }
+          />
+          <TextInput styles={{
+            input: {
+              border: `1px solid ${"#D6D8F6"}`,
+              borderRadius: 10,
+            },
+          }}
+            type='number'
+            required
+            label="Jumlah pengulangan"
+            size="md"
+            placeholder='Jumlah pengulangan'
+            value={isData.repeatValue}
+            onChange={(event) => {
+              setData({ ...isData, repeatValue: String(event.currentTarget.value) })
+              setTouched({ ...touched, repeatValue: false })
+            }}
+            onBlur={() => setTouched({ ...touched, repeatValue: true })}
+            error={
+              touched.repeatValue && (
+                isData.repeatValue == "" ? "Jumlah pengulangan tidak boleh kosong" : null ||
+                  Number(isData.repeatValue) <= 0 ? "Jumlah pengulangan tidak boleh 0" : null
               )
             }
           />
@@ -286,7 +313,7 @@ export default function NavbarCreateDivisionCalender() {
                               </Grid.Col>
                               <Grid.Col span={3}>
                                 <Text c={WARNA.biruTua} fw={"bold"} ta={'end'}>
-                                Anggota
+                                  Anggota
                                 </Text>
                               </Grid.Col>
                             </Grid>

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

@@ -1,26 +1,21 @@
 "use client"
 import { LayoutNavbarNew, WARNA } from '@/module/_global';
-import { Avatar, Box, Button, Divider, Flex, Grid, Group, Input, rem, Select, SimpleGrid, Skeleton, Stack, Text, Textarea, TextInput } from '@mantine/core';
+import { Box, Button, Group, rem, Select, SimpleGrid, Skeleton, Stack, Text, Textarea, TextInput } from '@mantine/core';
 import { DateInput, TimeInput } from '@mantine/dates';
 import React, { useState } from 'react';
-import { IoIosArrowDropright } from 'react-icons/io';
 import { useParams, useRouter } from 'next/navigation';
 import LayoutModal from '@/module/_global/layout/layout_modal';
 import toast from 'react-hot-toast';
-import { funEditCalenderById, funGetOneCalender } from '../lib/api_calender';
+import { funEditCalenderById, funGetOneCalender, funGetOneCalenderByIdCalendar, } from '../lib/api_calender';
 import { useShallowEffect } from '@mantine/hooks';
-import { IDataDetailByIdCalender, IDataDetailByIdMember, IDetailByIdCalender, IEditMemberCalender, IFormMemberCalender } from '../lib/type_calender';
+import { IDetailByIdCalender } from '../lib/type_calender';
 import moment from 'moment';
 import "moment/locale/id";
-import { useHookstate } from '@hookstate/core';
-import { globalCalender } from '../lib/val_calender';
 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 memberValue = memberUser.get() as IFormMemberCalender[]
   const [isDataCalender, setDataCalender] = useState<IDetailByIdCalender>()
   const [openMember, setOpenMember] = useState(false)
   const [loading, setLoading] = useState(true)
@@ -30,17 +25,22 @@ export default function UpdateDivisionCalender() {
     timeStart: false,
     timeEnd: false,
     repeatEventTyper: false,
-    desc: false
+    desc: false,
+    repeatValue: false
   })
 
   const fetchGetOne = async () => {
     try {
       setLoading(true)
-      const response = await funGetOneCalender(param.detail)
+      const response = await funGetOneCalenderByIdCalendar(param.detail)
-      setDataCalender(response.data.calender)
+      if (response.success) {
-      memberUser.set(response.data.member)
+        setDataCalender(response.data)
+      } else {
+        toast.error(response.message)
+      }
     } catch (error) {
       console.error(error)
+      toast.error("Terjadi kesalahan! Silahkan coba kembali");
     } finally {
       setLoading(false)
     }
@@ -63,7 +63,7 @@ export default function UpdateDivisionCalender() {
           linkMeet: isDataCalender?.linkMeet,
           repeatEventTyper: isDataCalender?.repeatEventTyper,
           desc: isDataCalender?.desc,
-          member: memberValue
+          repeatValue: isDataCalender?.repeatValue
         })
 
         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='' 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) => {
@@ -231,7 +229,6 @@ export default function UpdateDivisionCalender() {
                 size="md"
                 placeholder="Link Meet"
                 label="Link Meet"
-                // value={isDataCalender?.linkMeet}
                 defaultValue={isDataCalender?.linkMeet}
                 onChange={
                   (event) => {
@@ -250,14 +247,15 @@ 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: 'once', label: 'Acara 1 Kali' },
-                  { value: '2', label: 'Hari Kerja (Sen - Jum)' },
+                  { value: 'daily', label: 'Setiap Hari' },
-                  { value: '3', label: 'Mingguan' },
+                  // { value: 'weekdays', label: 'Hari Kerja (Sen - Jum)' },
-                  { value: '4', label: 'Bulanan' },
+                  { value: 'weekly', label: 'Mingguan' },
-                  { value: '5', label: 'Tahunan' },
+                  { value: 'monthly', label: 'Bulanan' },
+                  { value: 'yearly', label: 'Tahunan' },
                 ]}
                 value={isDataCalender?.repeatEventTyper}
                 defaultValue={isDataCalender?.repeatEventTyper}
@@ -273,11 +271,35 @@ 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
               />
+              <TextInput styles={{
+                input: {
+                  border: `1px solid ${"#D6D8F6"}`,
+                  borderRadius: 10,
+                },
+              }}
+                type='number'
+                required
+                label="Jumlah pengulangan"
+                size="md"
+                placeholder='Jumlah pengulangan'
+                defaultValue={isDataCalender?.repeatValue}
+                onChange={(event) => {
+                  setDataCalender({ ...isDataCalender, repeatValue: String(event.currentTarget.value) })
+                  setTouched({ ...touched, repeatValue: false })
+                }}
+                onBlur={() => setTouched({ ...touched, repeatValue: true })}
+                error={
+                  touched.repeatValue && (
+                    isDataCalender?.repeatValue == "" ? "Jumlah pengulangan tidak boleh kosong" : null ||
+                      Number(isDataCalender?.repeatValue) <= 0 ? "Jumlah pengulangan tidak boleh dibawah 1" : null
+                  )
+                }
+              />
               <Textarea styles={{
                 input: {
                   border: `1px solid ${"#D6D8F6"}`,
@@ -285,7 +307,6 @@ export default function UpdateDivisionCalender() {
                 },
               }}
                 size="md" placeholder='Deskripsi' label="Deskripsi"
-                // value={isDataCalender?.desc}
                 defaultValue={isDataCalender?.desc}
                 onChange={
                   (event) => {
@@ -296,64 +317,6 @@ export default function UpdateDivisionCalender() {
                   }
                 }
               />
-              {/* <Box mt={5} onClick={() => setOpenMember(true)}>
-                <Group
-                  justify="space-between"
-                  p={10}
-                  style={{
-                    border: `1px solid ${"#D6D8F6"}`,
-                    borderRadius: 10,
-                  }}
-                >
-                  <Text>Tambah Anggota</Text>
-                  <IoIosArrowDropright size={25} />
-                </Group>
-              </Box> */}
-              {/* <Box pt={30}>
-                <Group justify="space-between">
-                  <Text c={WARNA.biruTua}>Anggota Terpilih</Text>
-                  <Text c={WARNA.biruTua}>Total {memberUser.length} Anggota</Text>
-                </Group>
-                <Box pt={10} >
-                  <Box mb={100}>
-                    <Box
-                      style={{
-                        border: `1px solid ${"#C7D6E8"}`,
-                        borderRadius: 10,
-                      }}
-                      px={20}
-                      py={10}
-                    >
-                      {memberUser.length == 0 ?
-                        <Box style={{ display: 'flex', justifyContent: 'center', alignItems: 'center', height: '10vh' }}>
-                          <Text c="dimmed" ta={"center"} fs={"italic"}>Tidak ada Anggota</Text>
-                        </Box>
-                        :
-
-                        memberUser.get().map((v: any, i: any) => {
-                          return (
-                            <Box key={i}>
-                              <Grid align='center' mt={10}
-                              >
-                                <Grid.Col span={3}>
-                                    <Avatar src={`/api/file/img?jenis=image&cat=user&file=${v.img}`} alt="it's me" size="lg" />
-                                </Grid.Col>
-                                <Grid.Col span={9}>
-                                  <Text c={WARNA.biruTua} fw={"bold"} lineClamp={1}>
-                                    {v.name}
-                                  </Text>
-                                </Grid.Col>
-                              </Grid>
-                              <Box mt={10}>
-                                <Divider size={"xs"} />
-                              </Box>
-                            </Box>
-                          );
-                        })}
-                    </Box>
-                  </Box>
-                </Box>
-              </Box> */}
             </>
           }
         </Stack>
@@ -379,7 +342,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 acara ini? Data ini akan mempengaruhi semua data yang terkait"
         onYes={(val) => { onSubmit(val) }} />
     </Box>
   );

yarn.lock

@@ -3304,6 +3304,13 @@ rimraf@^3.0.2:
   dependencies:
     glob "^7.1.3"
 
+rrule@^2.8.1:
+  version "2.8.1"
+  resolved "https://registry.yarnpkg.com/rrule/-/rrule-2.8.1.tgz#e8341a9ce3e68ce5b8da4d502e893cd9f286805e"
+  integrity sha512-hM3dHSBMeaJ0Ktp7W38BJZ7O1zOgaFEsn41PDk+yHoEtfLV+PoJt9E9xAlZiWgf/iqEqionN0ebHFZIDAp+iGw==
+  dependencies:
+    tslib "^2.4.0"
+
 run-parallel@^1.1.9:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.2.0.tgz#66d1368da7bdf921eb9d95bd1a9229e7f21a43ee"