diff --git a/src/app_modules/admin/vote/child/riwayat/index.tsx b/src/app_modules/admin/vote/child/riwayat/index.tsx
index 2baf90a6..ed72f0d4 100644
--- a/src/app_modules/admin/vote/child/riwayat/index.tsx
+++ b/src/app_modules/admin/vote/child/riwayat/index.tsx
@@ -32,6 +32,8 @@ import ComponentAdminVote_DetailHasil from "../../component/detail_hasil";
import { AdminVote_getHasilById } from "../../fun/get/get_hasil_by_id";
import { AdminVote_getListKontributorById } from "../../fun/get/get_list_kontributor_by_id";
import { apiGetAdminVotingRiwayat } from "../../lib/api_fetch_admin_voting";
+import Admin_DetailButton from "@/app_modules/admin/_admin_global/_component/button/detail_button";
+import { RouterAdminVote } from "@/lib/router_admin/router_admin_vote";
export default function AdminVote_Riwayat() {
return (
@@ -104,7 +106,7 @@ function TableStatus() {
return data.map((e, i) => (
- |
+ {/* |
- |
+ */}
{e?.Author?.username}
|
{e?.title}
|
-
+ {/* |
- |
-
+ | */}
+ {/*
{e?.Voting_DaftarNamaVote.map((v) => (
@@ -150,7 +152,7 @@ function TableStatus() {
))}
- |
+ */}
@@ -166,6 +168,13 @@ function TableStatus() {
}).format(new Date(e?.akhirVote))}
|
+
+
+
+
+
+ |
+
));
};
@@ -204,27 +213,21 @@ function TableStatus() {
>
- |
- Aksi
- |
Username
|
Judul
|
-
- Deskripsi
- |
-
- Pilihan
- |
Mulai Vote
|
Selesai Vote
|
+
+ Aksi
+ |
{renderTableBody()}
diff --git a/src/app_modules/admin/vote/component/comp_detail.tsx b/src/app_modules/admin/vote/component/comp_detail.tsx
index d954e8cf..03ef4942 100644
--- a/src/app_modules/admin/vote/component/comp_detail.tsx
+++ b/src/app_modules/admin/vote/component/comp_detail.tsx
@@ -9,6 +9,8 @@ interface Props {
}
export function AdminVoting_ComponentDetail({ data }: Props) {
+ const cekHari = moment(data.akhirVote).diff(new Date(), "minutes");
+
const listData = [
{
title: "Username",
@@ -32,7 +34,9 @@ export function AdminVoting_ComponentDetail({ data }: Props) {
},
{
title: "Status",
- value: {data.Voting_Status.name},
+ value: (
+ {cekHari < 0 ? "Riwayat" : "Publish"}
+ ),
},
];
diff --git a/src/app_modules/admin/vote/detail/detail_voting.tsx b/src/app_modules/admin/vote/detail/detail_voting.tsx
index e4ff6c96..a8d3bd22 100644
--- a/src/app_modules/admin/vote/detail/detail_voting.tsx
+++ b/src/app_modules/admin/vote/detail/detail_voting.tsx
@@ -49,11 +49,11 @@ export function AdminVote_DetailVoting() {
)}
- {data && data.voting_StatusId === "1" ? (
+ {data && data.Voting_Status.name === "Publish" ? (
- ) : data && data.voting_StatusId === "2" ? (
+ ) : data && data.Voting_Status.name === "Review" ? (
- ) : data && data.voting_StatusId === "4" ? (
+ ) : data && data.Voting_Status.name === "Reject" ? (
) : (
""