|
- {e?.name}
+ {e?.name}
|
@@ -164,7 +165,7 @@ export function AdminAppInformation_ViewKategoriPortofolio({
}}
>
-
+
@@ -193,26 +194,25 @@ export function AdminAppInformation_ViewKategoriPortofolio({
-
+
|
- Kategori
+ Kategori
|
- Status
+ Status
|
- Aksi
+ Aksi
|
@@ -225,10 +225,10 @@ export function AdminAppInformation_ViewKategoriPortofolio({
{/* Form Create */}
{isCreate ? (
-
+
- Tambah Bidang Bisnis
+ Tambah Bidang Bisnis
+
- Update Bidang Bisnis
+ Update Bidang Bisnis
},
{
id: 2,
name: "Group Chat",
jumlah: countRoom,
color: "orange",
+ icon:
},
{
id: 3,
name: "Reject",
jumlah: countReject,
color: "red",
+ icon:
},
];
return (
@@ -51,18 +56,27 @@ export default function AdminColab_Dashboard({
{listStatus.map((e, i) => (
-
-
- {e.name}
- {e.jumlah ? e.jumlah : 0}
-
-
+
+
+ {e.name}
+
+ {e.jumlah ? e.jumlah : 0}
+
+ {e.icon}
+
+
+
+
))}
diff --git a/src/app_modules/admin/colab/sub_menu/group.tsx b/src/app_modules/admin/colab/sub_menu/group.tsx
index 08f137fe..d7ba5a58 100644
--- a/src/app_modules/admin/colab/sub_menu/group.tsx
+++ b/src/app_modules/admin/colab/sub_menu/group.tsx
@@ -29,6 +29,9 @@ import { ComponentGlobal_NotifikasiGagal } from "@/app_modules/_global/notif_glo
import ComponentAdminColab_DetailData from "../component/detail_data";
import adminColab_getOneRoomChatById from "../fun/get/get_one_room_chat_by_id";
import adminColab_getListAllGroupChat from "../fun/get/get_list_all_group_chat";
+import { ComponentAdminGlobal_TitlePage } from "../../_admin_global/_component";
+import { AccentColor } from "@/app_modules/_global/color";
+import { AdminColor } from "@/app_modules/_global/color/color_pallet";
export default function AdminColab_TableGroup({
listGroup,
@@ -82,29 +85,29 @@ function TableMenu({ listGroup }: { listGroup: any }) {
const tableRow = data.map((e, i) => (
|
- {noAwal++}
+ {noAwal++}
|
-
+
{e?.ProjectCollaboration?.Author?.Profile?.name}
|
-
+
{e?.name}
|
-
+
{e?.ProjectCollaboration?.ProjectCollaborationMaster_Industri?.name}
|
-
+
{e?.ProjectCollaboration_AnggotaRoomChat.length}
|
@@ -148,43 +151,41 @@ function TableMenu({ listGroup }: { listGroup: any }) {
return (
<>
-
- Group Chat
-
-
+ >
+ }
+ />
+
|
- No
+ No
|
- Admin Room
+ Admin Room
|
- Nama Group
+ Nama Group
|
- Industri
+ Industri
|
- Anggota Group
+ Anggota Group
|
- Aksi
+ Aksi
|
diff --git a/src/app_modules/admin/colab/sub_menu/publish.tsx b/src/app_modules/admin/colab/sub_menu/publish.tsx
index acdb54fb..1c9ed06a 100644
--- a/src/app_modules/admin/colab/sub_menu/publish.tsx
+++ b/src/app_modules/admin/colab/sub_menu/publish.tsx
@@ -30,6 +30,7 @@ import _ from "lodash";
import { IconBan, IconCheck, IconEye } from "@tabler/icons-react";
import adminColab_funReportProjectById from "../fun/edit/fun_report_project_by_id";
import { ComponentGlobal_NotifikasiBerhasil } from "@/app_modules/_global/notif_global/notifikasi_berhasil";
+import { AdminColor } from "@/app_modules/_global/color/color_pallet";
export default function AdminColab_TablePublish({
listData,
@@ -74,29 +75,29 @@ function TableMenu({ listData }: { listData: any }) {
const tableRow = data.map((e, i) => (
|
- {noAwal++}
+ {noAwal++}
|
-
+
{e?.Author?.Profile?.name}
|
-
+
-
+
{e?.title}
|
-
+
{e?.ProjectCollaborationMaster_Industri.name}
|
-
+
{e?.ProjectCollaboration_Partisipasi.length}
|
@@ -209,41 +210,41 @@ function TableMenu({ listData }: { listData: any }) {
Publish
-
+
|
- No
+ No
|
- Username
+ Username
|
- Title
+ Title
|
- Industri
+ Industri
|
- Jumlah Partisipan
+ Jumlah Partisipan
|
- Aksi
+ Aksi
|
diff --git a/src/app_modules/admin/colab/sub_menu/reject.tsx b/src/app_modules/admin/colab/sub_menu/reject.tsx
index f5c51c72..50f77bf9 100644
--- a/src/app_modules/admin/colab/sub_menu/reject.tsx
+++ b/src/app_modules/admin/colab/sub_menu/reject.tsx
@@ -18,6 +18,7 @@ import ComponentAdminGlobal_HeaderTamplate from "../../_admin_global/header_tamp
import { useState } from "react";
import { MODEL_COLLABORATION } from "@/app_modules/colab/model/interface";
import adminColab_getListAllRejected from "../fun/get/get_list_all_reject";
+import { AdminColor } from "@/app_modules/_global/color/color_pallet";
export default function AdminColab_TableRejected({
listReject,
@@ -49,29 +50,29 @@ function TableMenu({ listReject }: { listReject: any }) {
const tableRow = data?.map((e, i) => (
|
- {noAwal++}
+ {noAwal++}
|
-
+
{e?.Author?.Profile?.name}
|
-
+
-
+
{e?.title}
|
-
+
{e?.ProjectCollaborationMaster_Industri.name}
|
-
+
{e?.ProjectCollaboration_Partisipasi.length}
|
@@ -129,41 +130,40 @@ function TableMenu({ listReject }: { listReject: any }) {
- Reject
+ Reject
-
+
|
- No
+ No
|
- Username
+ Username
|
- Title
+ Title
|
- Industri
+ Industri
|
- Jumlah Partisipan
+ Jumlah Partisipan
|
- Report
+ Report
|
diff --git a/src/app_modules/admin/developer/index.tsx b/src/app_modules/admin/developer/index.tsx
index 481e636f..11580659 100644
--- a/src/app_modules/admin/developer/index.tsx
+++ b/src/app_modules/admin/developer/index.tsx
@@ -24,6 +24,7 @@ import adminDeveloper_funGetListAllAdmin from "./fun/get/fun_get_list_all_admin"
import { ComponentGlobal_NotifikasiBerhasil } from "@/app_modules/_global/notif_global/notifikasi_berhasil";
import { ComponentGlobal_NotifikasiGagal } from "@/app_modules/_global/notif_global/notifikasi_gagal";
import adminDeveloper_funGetListAllUser from "./fun/get/fun_get_list_all_user";
+import { AdminColor } from "@/app_modules/_global/color/color_pallet";
export default function AdminDeveloper({
listUser,
@@ -144,7 +145,8 @@ function NewTableUser({
@@ -158,24 +160,23 @@ function NewTableUser({
}}
/>
-
+
|
- Username
+ Username
|
- Nomor
+ Nomor
|
- Aksi
+ Aksi
|
@@ -183,10 +184,10 @@ function NewTableUser({
{dataUser.map((v: any, i: any) => (
|
- {v.username}
+ {v.username}
|
- {v.nomor}
+ {v.nomor}
|
@@ -281,8 +282,9 @@ function NewTableAdmin({
<>
@@ -296,24 +298,23 @@ function NewTableAdmin({
}}
/>
-
+
|
- Username
+ Username
|
- Nomor
+ Nomor
|
- Aksi
+ Aksi
|
@@ -321,10 +322,10 @@ function NewTableAdmin({
{dataAdmin.map((v: any, i: any) => (
|
- {v.username}
+ {v.username}
|
- {v.nomor}
+ {v.nomor}
|
@@ -384,10 +385,10 @@ function TableAdmin({
const tableBody = dataAdmin.map((e) => (
|
- {e.username}
+ {e.username}
|
- {e.nomor}
+ {e.nomor}
|
@@ -404,35 +405,34 @@ function TableAdmin({
- Table Admin
+ Table Admin
}
radius={"xl"}
placeholder="Masukan username"
/>
-
+
|
- Username
+ Username
|
- Nomor
+ Nomor
|
- Aksi
+ Aksi
|
@@ -472,10 +472,10 @@ function TableUser({
const tableBody = dataUser.map((e) => (
|
- {e.username}
+ {e.username}
|
- {e.nomor}
+ {e.nomor}
|
@@ -492,35 +492,34 @@ function TableUser({
- Table User
+ Table User
}
radius={"xl"}
placeholder="Masukan username"
/>
-
+
|
- Username
+ Username
|
- Nomor
+ Nomor
|
- Aksi
+ Aksi
|
diff --git a/src/app_modules/admin/donasi/detail/detail_review.tsx b/src/app_modules/admin/donasi/detail/detail_review.tsx
index d4273c45..c5d72cf1 100644
--- a/src/app_modules/admin/donasi/detail/detail_review.tsx
+++ b/src/app_modules/admin/donasi/detail/detail_review.tsx
@@ -21,6 +21,11 @@ import { AdminDonasi_funUpdateStatusPublish } from "../fun/update/fun_status_pub
import { AdminDonasi_funUpdateStatusReject } from "../fun/update/fun_status_reject";
import { donasi_checkStatus } from "@/app_modules/donasi/fun";
import { ComponentGlobal_NotifikasiPeringatan } from "@/app_modules/_global/notif_global";
+import adminNotifikasi_funCreateToAllUser from "../../notifikasi/fun/create/fun_create_notif_to_all_user";
+import { clientLogger } from "@/util/clientLogger";
+import { apiGetAllUserWithExceptId } from "@/app_modules/_global/lib/api_user";
+import Admin_ComponentModalPublish from "../../_admin_global/_component/comp_admin_modal_publish";
+import { MainColor } from "@/app_modules/_global/color";
export default function AdminDonasi_DetailReview({
dataReview,
@@ -62,55 +67,93 @@ function ButtonOnHeader({
const router = useRouter();
const [isLoadingPublish, setLoadingPublish] = useState(false);
const [isLoadingReject, setLoadingReject] = useState(false);
- const [opened, { open, close }] = useDisclosure(false);
+ const [openedPublish, { open: openPublish, close: closePublish }] = useDisclosure(false);
+ const [openedReject, { open: openReject, close: closeReject }] = useDisclosure(false);
const [catatan, setCatatan] = useState("");
- async function onPulish() {
- const checkStatus = await donasi_checkStatus({ id: donasi.id });
+ async function onPublish() {
+ try {
+ setLoadingPublish(true);
+ const checkStatus = await donasi_checkStatus({ id: donasi.id });
- if (checkStatus) {
- const res = await AdminDonasi_funUpdateStatusPublish(donasi.id, "1");
- if (res.status === 200) {
- const dataNotifikasi: IRealtimeData = {
- appId: res.data?.id as string,
- status: res.data?.DonasiMaster_Status?.name as any,
- userId: res.data?.authorId as any,
- pesan: res.data?.title as any,
- kategoriApp: "DONASI",
- title: "Donasi publish",
- };
+ if (checkStatus) {
+ const res = await AdminDonasi_funUpdateStatusPublish(donasi.id, "1");
+ if (res.status === 200) {
+ // ===== TO CREATEOR ====== //
+ const notifikasiToCreator: IRealtimeData = {
+ appId: res.data?.id as string,
+ status: res.data?.DonasiMaster_Status?.name as any,
+ userId: res.data?.authorId as any,
+ pesan: res.data?.title as any,
+ kategoriApp: "DONASI",
+ title: "Donasi publish",
+ };
- const notif = await adminNotifikasi_funCreateToUser({
- data: dataNotifikasi as any,
- });
-
- if (notif.status === 201) {
- WibuRealtime.setData({
- type: "notification",
- pushNotificationTo: "USER",
- dataMessage: dataNotifikasi,
+ const notif = await adminNotifikasi_funCreateToUser({
+ data: notifikasiToCreator as any,
});
- WibuRealtime.setData({
- type: "trigger",
- pushNotificationTo: "USER",
- dataMessage: dataNotifikasi,
+ if (notif.status === 201) {
+ WibuRealtime.setData({
+ type: "notification",
+ pushNotificationTo: "USER",
+ dataMessage: notifikasiToCreator,
+ });
+
+ WibuRealtime.setData({
+ type: "trigger",
+ pushNotificationTo: "USER",
+ dataMessage: notifikasiToCreator,
+ });
+ }
+
+ // ===== TO CREATEOR ====== //
+
+ // TO ALL USER
+ const notificationToAll = await adminNotifikasi_funCreateToAllUser({
+ data: res.data as any,
+ authorId: donasi.authorId,
});
+ if (notificationToAll.status === 201) {
+ const dataUser = notificationToAll.data;
+ for (let i of dataUser as any) {
+ const dataNotifikasiToAll: IRealtimeData = {
+ appId: res.data?.id as string,
+ status: res.data?.DonasiMaster_Status?.name as any,
+ userId: i.id as any,
+ pesan: res.data?.title as any,
+ kategoriApp: "DONASI",
+ title: "Donasi baru terpublish",
+ };
+
+
+ WibuRealtime.setData({
+ type: "notification",
+ pushNotificationTo: "USER",
+ dataMessage: dataNotifikasiToAll,
+ });
+ }
+ }
+
const newData = await AdminDonasi_getOneById(donasi?.id);
setData(newData);
ComponentAdminGlobal_NotifikasiBerhasil(
"Berhasil Mengubah Status Donasi"
);
- setLoadingPublish(true);
+ } else {
+ setLoadingPublish(false);
+ ComponentAdminGlobal_NotifikasiPeringatan(
+ "Gagal Mengubah Status Donasi"
+ );
}
} else {
- ComponentAdminGlobal_NotifikasiPeringatan(
- "Gagal Mengubah Status Donasi"
- );
+ setLoadingPublish(false);
+ ComponentGlobal_NotifikasiPeringatan("Status donasi telah diubah user");
}
- } else {
- ComponentGlobal_NotifikasiPeringatan("Status donasi telah diubah user");
+ } catch (error) {
+ setLoadingPublish(false);
+ clientLogger.error("Error to published donasi", error);
}
}
@@ -170,14 +213,15 @@ function ButtonOnHeader({
{donasi.donasiMaster_StatusDonasiId === "2" ? (
-
@@ -188,8 +232,8 @@ function ButtonOnHeader({
{/* */}
setCatatan(val.target.value)}
buttonKiri={
@@ -197,7 +241,7 @@ function ButtonOnHeader({
{
- close();
+ closeReject();
}}
>
Batal
@@ -207,6 +251,7 @@ function ButtonOnHeader({
buttonKanan={
<>
}
/>
+
+ {
+ closePublish();
+ }}
+ >
+ Batal
+
+ >
+ }
+ buttonKanan={
+ <>
+ {
+ onPublish();
+ }}
+ >
+ Simpan
+
+ >
+ }
+ />
+
+
+
+
{/*
-
+
-
+
Gambar Donasi
@@ -127,7 +129,7 @@ function TampilanDetailDonasi({
-
+
Detail Donasi
@@ -378,25 +380,25 @@ function TampilanListDonatur({
const tableRows = lisDonatur.map((e, i) => (
|
- {e?.Author.username}
+ {e?.Author.username}
|
- {e?.DonasiMaster_Bank?.name}
+ {e?.DonasiMaster_Bank?.name}
|
-
-
+
+
|
-
+
{new Intl.DateTimeFormat("id-ID", { dateStyle: "full" }).format(
e?.createdAt
)}
|
-
+
{e?.DonasiMaster_StatusInvoice?.name}
@@ -405,7 +407,7 @@ function TampilanListDonatur({
{e?.donasiMaster_StatusInvoiceId === "1" ||
- e?.donasiMaster_StatusInvoiceId === "2" ? (
+ e?.donasiMaster_StatusInvoiceId === "2" ? (
{/* {JSON.stringify(dataDonasi, null, 2)} */}
-
- Daftar Donatur
-
- {
- onRelaod();
- }}
- >
-
-
-
-
+
+ {
+ onRelaod();
+ }}
+ >
+
+
+ | | | | | | |