Fix: Event

Deskripsi: - Fix database event - Fix style detal
2024-11-29 16:15:54 +08:00
parent 517b2bb9b0
commit 45279cd37f
36 changed files with 714 additions and 611 deletions
--- a/src/app_modules/admin/event/_view/view_table_review.tsx
+++ b/src/app_modules/admin/event/_view/view_table_review.tsx
@@ -45,6 +45,8 @@ import adminNotifikasi_funCreateToUser from "../../notifikasi/fun/create/fun_cre
 import { adminEvent_funGetListReview } from "../fun";
 import { AdminEvent_funEditStatusPublishById } from "../fun/edit/fun_edit_status_publish_by_id";
 import { AdminEvent_funEditCatatanById } from "../fun/edit/fun_edit_status_reject_by_id";
+import { event_checkStatus } from "@/app_modules/event/fun/get/fun_check_status_by_id";
+import { ComponentAdminGlobal_NotifikasiPeringatan } from "../../_admin_global/admin_notifikasi/notifikasi_peringatan";

 export default function AdminEvent_ComponentTableReview({
  listData,
@@ -104,51 +106,65 @@ export default function AdminEvent_ComponentTableReview({
    setIsAdminTriggerReview(false);
  }

-  async function onPublish(eventId: string, tanggal: Date) {
-    if (moment(tanggal).diff(Date.now(), "minutes") < 0)
-      return ComponentGlobal_NotifikasiPeringatan(
-        "Waktu acara telah lewat, Report untuk memberitahu user !"
-      );
+  async function onPublish({
+    eventId,
+    tanggalSelesai,
+  }: {
+    eventId: string;
+    tanggalSelesai: Date;
+  }) {
+    const checkStatus = await event_checkStatus({ id: eventId });

-    const res = await AdminEvent_funEditStatusPublishById(eventId, "1");
-    if (res.status === 200) {
-      const dataNotifikasi: IRealtimeData = {
-        appId: res.data?.id as any,
-        status: res.data?.EventMaster_Status?.name as any,
-        userId: res.data?.authorId as any,
-        pesan: res.data?.title as any,
-        kategoriApp: "EVENT",
-        title: "Event publish",
-      };
+    if (checkStatus) {
+      if (moment(tanggalSelesai).diff(Date.now(), "minutes") < 0)
+        return ComponentGlobal_NotifikasiPeringatan(
+          "Waktu acara telah lewat, Report untuk memberitahu user !"
+        );

-      const notif = await adminNotifikasi_funCreateToUser({
-        data: dataNotifikasi as any,
-      });
+      const res = await AdminEvent_funEditStatusPublishById(eventId, "1");
+      if (res.status === 200) {
+        const dataNotifikasi: IRealtimeData = {
+          appId: res.data?.id as any,
+          status: res.data?.EventMaster_Status?.name as any,
+          userId: res.data?.authorId as any,
+          pesan: res.data?.title as any,
+          kategoriApp: "EVENT",
+          title: "Event publish",
+        };

-      if (notif.status === 201) {
-        WibuRealtime.setData({
-          type: "notification",
-          pushNotificationTo: "USER",
-          dataMessage: dataNotifikasi,
+        const notif = await adminNotifikasi_funCreateToUser({
+          data: dataNotifikasi as any,
        });

-        WibuRealtime.setData({
-          type: "trigger",
-          pushNotificationTo: "USER",
-          dataMessage: dataNotifikasi,
+        if (notif.status === 201) {
+          WibuRealtime.setData({
+            type: "notification",
+            pushNotificationTo: "USER",
+            dataMessage: dataNotifikasi,
+          });
+
+          WibuRealtime.setData({
+            type: "trigger",
+            pushNotificationTo: "USER",
+            dataMessage: dataNotifikasi,
+          });
+        }
+
+        const loadData = await adminEvent_funGetListReview({
+          search: isSearch,
+          page: isActivePage,
        });
+        setData(loadData.data as any);
+        setNPage(loadData.nPage);
+
+        ComponentAdminGlobal_NotifikasiBerhasil("Berhasil update status");
+      } else {
+        ComponentAdminGlobal_NotifikasiGagal(res.message);
      }
-
-      const loadData = await adminEvent_funGetListReview({
-        search: isSearch,
-        page: isActivePage,
-      });
-      setData(loadData.data as any);
-      setNPage(loadData.nPage);
-
-      ComponentAdminGlobal_NotifikasiBerhasil("Berhasil update status");
    } else {
-      ComponentAdminGlobal_NotifikasiGagal(res.message);
+      ComponentAdminGlobal_NotifikasiPeringatan(
+        "Review di batalkan oleh user, reload halaman review !"
+      );
    }
  }

@@ -218,19 +234,40 @@ export default function AdminEvent_ComponentTableReview({
          <Text>{e.EventMaster_TipeAcara.name}</Text>
        </Center>
      </td>
+
      <td>
        <Center w={200}>
-          {e.tanggal.toLocaleString("id-ID", { dateStyle: "full" })}
+          <Text align="center">
+            {" "}
+            {new Intl.DateTimeFormat("id-ID", {
+              dateStyle: "full",
+            }).format(e?.tanggal)}
+            ,{" "}
+            <Text span inherit>
+              {new Intl.DateTimeFormat("id-ID", {
+                timeStyle: "short",
+              }).format(e?.tanggal)}
+            </Text>
+          </Text>
        </Center>
      </td>
      <td>
        <Center w={200}>
-          {e.tanggal.toLocaleTimeString([], {
-            timeStyle: "short",
-            hourCycle: "h24",
-          })}
+          <Text align="center">
+            {" "}
+            {new Intl.DateTimeFormat("id-ID", {
+              dateStyle: "full",
+            }).format(e?.tanggalSelesai)}
+            ,{" "}
+            <Text span inherit>
+              {new Intl.DateTimeFormat("id-ID", {
+                timeStyle: "short",
+              }).format(e?.tanggalSelesai)}
+            </Text>
+          </Text>
        </Center>
      </td>
+      
      <td>
        <Center w={400}>
          <Spoiler hideLabel="sembunyikan" maxHeight={50} showLabel="tampilkan">
@@ -246,7 +283,12 @@ export default function AdminEvent_ComponentTableReview({
              color={"green"}
              leftIcon={<IconCircleCheck />}
              radius={"xl"}
-              onClick={() => onPublish(e.id, e.tanggal)}
+              onClick={() =>
+                onPublish({
+                  eventId: e.id,
+                  tanggalSelesai: e.tanggalSelesai,
+                })
+              }
            >
              Publish
            </Button>
@@ -254,9 +296,17 @@ export default function AdminEvent_ComponentTableReview({
              color={"red"}
              leftIcon={<IconBan />}
              radius={"xl"}
-              onClick={() => {
-                open();
-                setEventId(e.id);
+              onClick={async () => {
+                const checkStatus = await event_checkStatus({ id: eventId });
+
+                if (checkStatus) {
+                  open();
+                  setEventId(e.id);
+                } else {
+                  ComponentAdminGlobal_NotifikasiPeringatan(
+                    "Review di batalkan oleh user, muat kembali halaman ini !"
+                  );
+                }
              }}
            >
              Reject
@@ -334,10 +384,10 @@ export default function AdminEvent_ComponentTableReview({
                    <Center>Tipe Acara</Center>
                  </th>
                  <th>
-                    <Center>Tanggal</Center>
+                    <Center>Tanggal & Waktu Mulai</Center>
                  </th>
                  <th>
-                    <Center>Jam</Center>
+                    <Center>Tanggal & Waktu Selesai</Center>
                  </th>
                  <th>
                    <Center>Deskripsi</Center>
--- a/src/app_modules/admin/event/child/riwayat.tsx
+++ b/src/app_modules/admin/event/child/riwayat.tsx
@@ -1,19 +1,11 @@
 "use client";

 import { RouterAdminEvent } from "@/app/lib/router_admin/router_admin_event";
-import { RouterProfile } from "@/app/lib/router_hipmi/router_katalog";
+import { MODEL_EVENT } from "@/app_modules/event/model/interface";
 import {
-  MODEL_EVENT,
-  MODEL_EVENT_PESERTA,
-} from "@/app_modules/event/model/interface";
-import {
-  Avatar,
  Button,
  Center,
-  Divider,
-  Grid,
  Group,
-  Modal,
  Pagination,
  Paper,
  ScrollArea,
@@ -24,7 +16,6 @@ import {
  TextInput,
  Title,
 } from "@mantine/core";
-import { useDisclosure } from "@mantine/hooks";
 import { IconCircleCheck, IconSearch } from "@tabler/icons-react";
 import { useRouter } from "next/navigation";
 import { useState } from "react";
@@ -80,11 +71,14 @@ function DetailRiwayat({ listRiwayat }: { listRiwayat: any }) {
    <tr key={i}>
      <td>
        <Button
+          loaderPosition="center"
          loading={e.id === eventId && loading ? true : false}
          color={"green"}
          leftIcon={<IconCircleCheck />}
          radius={"xl"}
          onClick={() => {
+            setEventId(e.id);
+            setLoading(true);
            router.push(RouterAdminEvent.detail_peserta + e.id);
          }}
        >
@@ -112,19 +106,40 @@ function DetailRiwayat({ listRiwayat }: { listRiwayat: any }) {
          <Text>{e.EventMaster_TipeAcara.name}</Text>
        </Center>
      </td>
+
      <td>
        <Center w={200}>
-          {e.tanggal.toLocaleString("id-ID", { dateStyle: "full" })}
+          <Text align="center">
+            {" "}
+            {new Intl.DateTimeFormat("id-ID", {
+              dateStyle: "full",
+            }).format(e?.tanggal)}
+            ,{" "}
+            <Text span inherit>
+              {new Intl.DateTimeFormat("id-ID", {
+                timeStyle: "short",
+              }).format(e?.tanggal)}
+            </Text>
+          </Text>
        </Center>
      </td>
      <td>
        <Center w={200}>
-          {e.tanggal.toLocaleTimeString([], {
-            timeStyle: "short",
-            hourCycle: "h24",
-          })}
+          <Text align="center">
+            {" "}
+            {new Intl.DateTimeFormat("id-ID", {
+              dateStyle: "full",
+            }).format(e?.tanggalSelesai)}
+            ,{" "}
+            <Text span inherit>
+              {new Intl.DateTimeFormat("id-ID", {
+                timeStyle: "short",
+              }).format(e?.tanggalSelesai)}
+            </Text>
+          </Text>
        </Center>
      </td>
+
      <td>
        <Center w={400}>
          <Spoiler hideLabel="sembunyikan" maxHeight={50} showLabel="tampilkan">
@@ -183,10 +198,10 @@ function DetailRiwayat({ listRiwayat }: { listRiwayat: any }) {
                    <Center>Tipe Acara</Center>
                  </th>
                  <th>
-                    <Center>Tanggal</Center>
+                    <Center>Tanggal & Waktu Mulai</Center>
                  </th>
                  <th>
-                    <Center>Jam</Center>
+                    <Center>Tanggal & Waktu Selesai</Center>
                  </th>
                  <th>
                    <Center>Deskripsi</Center>
--- a/src/app_modules/admin/event/fun/count/fun_count_event_by_status_id.ts
+++ b/src/app_modules/admin/event/fun/count/fun_count_event_by_status_id.ts
@@ -12,9 +12,7 @@ export default async function AdminEvent_funCountByStatusId(statusId: string) {
        const count = await prisma.event.count({
          where: {
            eventMaster_StatusId: "1",
-            tanggal: {
-              gte: new Date
-            }
+            isArsip: false
          },
        });
        return count;
--- a/src/app_modules/admin/event/fun/count/fun_count_riwayat.ts
+++ b/src/app_modules/admin/event/fun/count/fun_count_riwayat.ts
@@ -6,9 +6,7 @@ export async function AdminEvent_funCountRiwayat() {
  const data = await prisma.event.count({
    where: {
      eventMaster_StatusId: "1",
-      tanggal: {
-        lte: new Date(),
-      },
+      isArsip: true,
    },
  });

--- a/src/app_modules/admin/event/fun/get/get_list_all_riwayat.ts
+++ b/src/app_modules/admin/event/fun/get/get_list_all_riwayat.ts
@@ -21,9 +21,7 @@ export async function adminEvent_funGetListAllRiwayat({
    },
    where: {
      eventMaster_StatusId: "1",
-      tanggal: {
-        lte: new Date(),
-      },
+      isArsip: true,
      title: {
        contains: search,
        mode: "insensitive",
@@ -49,9 +47,7 @@ export async function adminEvent_funGetListAllRiwayat({
  const nCount = await prisma.event.count({
    where: {
      eventMaster_StatusId: "1",
-      tanggal: {
-        lte: new Date(),
-      },
+      isArsip: true,
      title: {
        contains: search,
        mode: "insensitive",
--- a/src/app_modules/admin/event/fun/get/get_list_table_by_status_id.ts
+++ b/src/app_modules/admin/event/fun/get/get_list_table_by_status_id.ts
@@ -1,146 +0,0 @@
-"use server";
-
-import prisma from "@/app/lib/prisma";
-
-export async function AdminEvent_getListTableByStatusId(statudId: string) {
-  if (statudId === "1") {
-    const getPublish = await prisma.event.findMany({
-      orderBy: {
-        tanggal: "desc",
-      },
-      where: {
-        eventMaster_StatusId: "1",
-        tanggal: {
-          gte: new Date(),
-        },
-      },
-      select: {
-        id: true,
-        title: true,
-        lokasi: true,
-        tanggal: true,
-        deskripsi: true,
-        Author: {
-          select: {
-            id: true,
-            username: true,
-            Profile: {
-              select: {
-                name: true,
-              },
-            },
-          },
-        },
-        EventMaster_Status: {
-          select: {
-            id: true,
-            name: true,
-          },
-        },
-        EventMaster_TipeAcara: {
-          select: {
-            id: true,
-            name: true,
-          },
-        },
-        Event_Peserta: true,
-      },
-    });
-    return getPublish;
-  }
-  if (statudId === "2") {
-    const getReview = await prisma.event.findMany({
-      orderBy: {
-        updatedAt: "desc",
-      },
-      where: {
-        eventMaster_StatusId: "2",
-        active: true,
-      },
-      select: {
-        id: true,
-        title: true,
-        lokasi: true,
-        tanggal: true,
-        deskripsi: true,
-        Author: {
-          select: {
-            id: true,
-            username: true,
-            Profile: {
-              select: {
-                name: true,
-              },
-            },
-          },
-        },
-        EventMaster_Status: {
-          select: {
-            id: true,
-            name: true,
-          },
-        },
-        EventMaster_TipeAcara: {
-          select: {
-            id: true,
-            name: true,
-          },
-        },
-      },
-    });
-    return getReview;
-  }
-  if (statudId === "3") {
-    const getDraft = await prisma.event.findMany({
-      orderBy: {
-        updatedAt: "desc",
-      },
-      where: {
-        eventMaster_StatusId: "3",
-      },
-    });
-    return getDraft;
-  }
-  if (statudId === "4") {
-    const getReject = await prisma.event.findMany({
-      orderBy: {
-        updatedAt: "desc",
-      },
-      where: {
-        eventMaster_StatusId: "4",
-      },
-      select: {
-        id: true,
-        title: true,
-        lokasi: true,
-        tanggal: true,
-        deskripsi: true,
-        Author: {
-          select: {
-            id: true,
-            username: true,
-            Profile: {
-              select: {
-                name: true,
-              },
-            },
-          },
-        },
-        EventMaster_Status: {
-          select: {
-            id: true,
-            name: true,
-          },
-        },
-        EventMaster_TipeAcara: {
-          select: {
-            id: true,
-            name: true,
-          },
-        },
-        catatan: true,
-      },
-    });
-    return getReject;
-  }
-}
--- a/src/app_modules/admin/event/fun/get/status/fun_get_list_publish.ts
+++ b/src/app_modules/admin/event/fun/get/status/fun_get_list_publish.ts
@@ -1,7 +1,9 @@
 "use server";

 import prisma from "@/app/lib/prisma";
+import { ComponentAdminGlobal_NotifikasiPeringatan } from "@/app_modules/admin/_admin_global/admin_notifikasi/notifikasi_peringatan";
 import { ceil } from "lodash";
+import moment from "moment";

 export async function adminEvent_funGetListPublish({
  page,
@@ -10,6 +12,27 @@ export async function adminEvent_funGetListPublish({
  page: number;
  search?: string;
 }) {
+  const getAllData = await prisma.event.findMany({
+    where: {
+      active: true,
+      eventMaster_StatusId: "1",
+      isArsip: false,
+    },
+  });
+
+  for (let i of getAllData) {
+    if (moment(i.tanggalSelesai).diff(moment(), "minutes") < 0) {
+      await prisma.event.update({
+        where: {
+          id: i.id,
+        },
+        data: {
+          isArsip: true,
+        },
+      });
+    }
+  }
+
  let takeData = 10;
  let skipData = page * takeData - takeData;

@@ -21,9 +44,7 @@ export async function adminEvent_funGetListPublish({
    },
    where: {
      eventMaster_StatusId: "1",
-      tanggal: {
-        gte: new Date(),
-      },
+      isArsip: false,
      title: {
        contains: search,
        mode: "insensitive",
@@ -49,9 +70,7 @@ export async function adminEvent_funGetListPublish({
  const nCount = await prisma.event.count({
    where: {
      eventMaster_StatusId: "1",
-      tanggal: {
-        gte: new Date(),
-      },
+      isArsip: false,
      title: {
        contains: search,
        mode: "insensitive",
--- a/src/app_modules/admin/event/table_status/table_publish.tsx
+++ b/src/app_modules/admin/event/table_status/table_publish.tsx
@@ -1,14 +1,13 @@
 "use client";

+import { RouterAdminEvent } from "@/app/lib/router_admin/router_admin_event";
+import {
+  MODEL_EVENT
+} from "@/app_modules/event/model/interface";
 import {
-  Avatar,
-  Box,
  Button,
  Center,
-  Divider,
-  Grid,
  Group,
-  Modal,
  Pagination,
  Paper,
  ScrollArea,
@@ -17,22 +16,14 @@ import {
  Table,
  Text,
  TextInput,
-  Title,
+  Title
 } from "@mantine/core";
-import { IconCircleCheck, IconEyeShare, IconSearch } from "@tabler/icons-react";
-import { useRouter } from "next/navigation";
-import { useDisclosure } from "@mantine/hooks";
-import { RouterProfile } from "@/app/lib/router_hipmi/router_katalog";
-import {
-  MODEL_EVENT,
-  MODEL_EVENT_PESERTA,
-} from "@/app_modules/event/model/interface";
+import { IconCircleCheck, IconSearch } from "@tabler/icons-react";
 import _ from "lodash";
+import { useRouter } from "next/navigation";
 import { useState } from "react";
 import ComponentAdminGlobal_HeaderTamplate from "../../_admin_global/header_tamplate";
-import { adminEvent_getListPesertaById } from "../fun/get/get_list_peserta_by_id";
 import { adminEvent_funGetListPublish } from "../fun";
-import { RouterAdminEvent } from "@/app/lib/router_admin/router_admin_event";

 export default function AdminEvent_TablePublish({
  listPublish,
@@ -78,64 +69,102 @@ function TableStatus({ listPublish }: { listPublish: any }) {
    setNPage(loadData.nPage);
  }

-  const TableRows = data.map((e, i) => (
-    <tr key={i}>
-      <td>
-        <Center w={200}>
-          <Text>{e?.Author?.username}</Text>
-        </Center>
-      </td>
-      <td>
-        <Center w={200}>
-          <Text lineClamp={2}>{e.title}</Text>
-        </Center>
-      </td>
-      <td>
-        <Center w={200}>
-          <Text>{e.lokasi}</Text>
-        </Center>
-      </td>
-      <td>
-        <Center w={200}>
-          <Text>{e.EventMaster_TipeAcara.name}</Text>
-        </Center>
-      </td>
-      <td>
-        <Center w={200}>
-          {e.tanggal.toLocaleString("id-ID", { dateStyle: "full" })}
-        </Center>
-      </td>
-      <td>
-        <Center w={200}>
-          {e.tanggal.toLocaleTimeString([], {
-            timeStyle: "short",
-            hourCycle: "h24",
-          })}
-        </Center>
-      </td>
-      <td>
-        <Center w={400}>
-          <Spoiler hideLabel="sembunyikan" maxHeight={50} showLabel="tampilkan">
-            {e.deskripsi}
-          </Spoiler>
-        </Center>
-      </td>
-
-      <td>
-        <Button
-          loading={e.id === eventId ? (loading === true ? true : false) : false}
-          color={"green"}
-          leftIcon={<IconCircleCheck />}
-          radius={"xl"}
-          onClick={async () => {
-            router.push(RouterAdminEvent.detail_peserta + e.id);
-          }}
-        >
-          Lihat Peserta
-        </Button>
+  const TableRows = _.isEmpty(data) ? (
+    <tr>
+      <td colSpan={12}>
+        <Center>Belum Ada Data</Center>
      </td>
    </tr>
-  ));
+  ) : (
+    data.map((e, i) => (
+      <tr key={i}>
+        <td>
+          <Center w={200}>
+            <Text>{e?.Author?.username}</Text>
+          </Center>
+        </td>
+        <td>
+          <Center w={200}>
+            <Text lineClamp={2}>{e.title}</Text>
+          </Center>
+        </td>
+        <td>
+          <Center w={200}>
+            <Text>{e.lokasi}</Text>
+          </Center>
+        </td>
+        <td>
+          <Center w={200}>
+            <Text>{e.EventMaster_TipeAcara.name}</Text>
+          </Center>
+        </td>
+
+        <td>
+          <Center w={200}>
+            <Text align="center">
+              {" "}
+              {new Intl.DateTimeFormat("id-ID", {
+                dateStyle: "full",
+              }).format(e?.tanggal)}
+              ,{" "}
+              <Text span inherit>
+                {new Intl.DateTimeFormat("id-ID", {
+                  timeStyle: "short",
+                }).format(e?.tanggal)}
+              </Text>
+            </Text>
+          </Center>
+        </td>
+        <td>
+          <Center w={200}>
+            <Text align="center">
+              {" "}
+              {new Intl.DateTimeFormat("id-ID", {
+                dateStyle: "full",
+              }).format(e?.tanggalSelesai)}
+              ,{" "}
+              <Text span inherit>
+                {new Intl.DateTimeFormat("id-ID", {
+                  timeStyle: "short",
+                }).format(e?.tanggalSelesai)}
+              </Text>
+            </Text>
+          </Center>
+        </td>
+
+        <td>
+          <Center w={400}>
+            <Spoiler
+              hideLabel="sembunyikan"
+              maxHeight={50}
+              showLabel="tampilkan"
+            >
+              {e.deskripsi}
+            </Spoiler>
+          </Center>
+        </td>
+
+        <td>
+          <Button
+            loaderPosition="center"
+            loading={
+              e.id === eventId ? (loading === true ? true : false) : false
+            }
+            color={"green"}
+            leftIcon={<IconCircleCheck />}
+            radius={"xl"}
+            onClick={async () => {
+              setEventId(e.id);
+              setLoading(true);
+              router.push(RouterAdminEvent.detail_peserta + e.id);
+            }}
+          >
+            Lihat Peserta
+          </Button>
+        </td>
+      </tr>
+    ))
+  );

  return (
    <>
@@ -182,10 +211,10 @@ function TableStatus({ listPublish }: { listPublish: any }) {
                    <Center>Tipe Acara</Center>
                  </th>
                  <th>
-                    <Center>Tanggal</Center>
+                    <Center>Tanggal & Waktu Mulai</Center>
                  </th>
                  <th>
-                    <Center>Jam</Center>
+                    <Center>Tanggal & Waktu Selesai</Center>
                  </th>
                  <th>
                    <Center>Deskripsi</Center>
--- a/src/app_modules/admin/event/table_status/table_reject.tsx
+++ b/src/app_modules/admin/event/table_status/table_reject.tsx
@@ -11,6 +11,7 @@ import {
  Spoiler,
  Stack,
  Table,
+  Text,
  Textarea,
  TextInput,
  Title,
@@ -106,19 +107,40 @@ function TableStatus({ listReject }: { listReject: any }) {
      <td>
        <Center w={200}>{e.EventMaster_TipeAcara.name}</Center>
      </td>
+
      <td>
        <Center w={200}>
-          {e.tanggal.toLocaleString("id-ID", { dateStyle: "full" })}
+          <Text align="center">
+            {" "}
+            {new Intl.DateTimeFormat("id-ID", {
+              dateStyle: "full",
+            }).format(e?.tanggal)}
+            ,{" "}
+            <Text span inherit>
+              {new Intl.DateTimeFormat("id-ID", {
+                timeStyle: "short",
+              }).format(e?.tanggal)}
+            </Text>
+          </Text>
        </Center>
      </td>
      <td>
-        <Center w={100}>
-          {e.tanggal.toLocaleTimeString([], {
-            timeStyle: "short",
-            hourCycle: "h24",
-          })}
+        <Center w={200}>
+          <Text align="center">
+            {" "}
+            {new Intl.DateTimeFormat("id-ID", {
+              dateStyle: "full",
+            }).format(e?.tanggalSelesai)}
+            ,{" "}
+            <Text span inherit>
+              {new Intl.DateTimeFormat("id-ID", {
+                timeStyle: "short",
+              }).format(e?.tanggalSelesai)}
+            </Text>
+          </Text>
        </Center>
      </td>
+
      <td>
        <Center w={500}>
          <Spoiler hideLabel="sembunyikan" maxHeight={50} showLabel="tampilkan">
@@ -197,10 +219,10 @@ function TableStatus({ listReject }: { listReject: any }) {
                    <Center>Tipe Acara</Center>
                  </th>
                  <th>
-                    <Center>Tanggal</Center>
+                    <Center>Tanggal & Waktu Mulai</Center>
                  </th>
                  <th>
-                    <Center>Jam</Center>
+                    <Center>Tanggal & Waktu Selesai</Center>
                  </th>
                  <th>
                    <Center>Cacatan</Center>