diff --git a/app/[locale]/(protected)/contributor/task-ta/components/columns.tsx b/app/[locale]/(protected)/contributor/task-ta/components/columns.tsx index 02ceea4f..7141b761 100644 --- a/app/[locale]/(protected)/contributor/task-ta/components/columns.tsx +++ b/app/[locale]/(protected)/contributor/task-ta/components/columns.tsx @@ -206,7 +206,7 @@ const useTableColumns = (activeTab: "ta" | "daily" | "special") => { )} - {(roleId == 11 || roleId == 12 || roleId == 19) && ( + {(roleId == 12 || roleId == 19) && ( diff --git a/app/[locale]/(protected)/contributor/task-ta/page.tsx b/app/[locale]/(protected)/contributor/task-ta/page.tsx index a1e93808..e2540832 100644 --- a/app/[locale]/(protected)/contributor/task-ta/page.tsx +++ b/app/[locale]/(protected)/contributor/task-ta/page.tsx @@ -47,7 +47,7 @@ const TaskTaPage = () => { )} */} - {roleId !== 12 && roleId !== 11 && ( + {roleId !== 12 && roleId !== 19 && ( */} + )} diff --git a/components/visualization/dashboard-viz.tsx b/components/visualization/dashboard-viz.tsx index 01a869e9..3a9782fc 100644 --- a/components/visualization/dashboard-viz.tsx +++ b/components/visualization/dashboard-viz.tsx @@ -11,7 +11,7 @@ export default function DashboardVisualization() { const state = Cookies.get("state"); const provState = Cookies.get("state-prov"); const t = useTranslations("AnalyticsDashboard"); - + const levelNumber = getCookiesDecrypt("ulne"); const [ticket1, setTicket1] = useState(); const [ticket2, setTicket2] = useState(); const [ticket3, setTicket3] = useState(); @@ -24,36 +24,28 @@ export default function DashboardVisualization() { const view1 = safeLevelName === "MABES POLRI" ? isInternational[0] - ? - "views/2023_04_MediaHUB-Viz_INTL_Rev202/db-content-monitor?" - // "views/2025_10_MediaHUB-Viz-POLDA-content-monitor_Rev100/db-content-monitor?" - : - "views/2023_09_MediaHUB-Viz-POLDA-content-monitor_Rev100/db-content-monitor?" - // "views/2025_10_MediaHUB-Viz-POLDA-content-monitor_Rev100/db-content-monitor?" - : safeLevelName.includes("POLDA") - ? - `views/2023_09_MediaHUB-Viz-ADMIN-POLDA-content-monitor_Rev100/db-content-monitor?provinsi-polda=${state}&` - // `views/2025_10_MediaHUB-Viz-POLDA-content-monitor_Rev100/db-content-monitor?provinsi-polda=${state}&` - : - `views/2023_09_MediaHUB-Viz-ADMIN-POLDA-content-monitor_Rev100/db-content-monitor?satker-selected=${state}&`; - // `views/2025_10_MediaHUB-Viz-POLDA-content-monitor_Rev100/db-content-monitor?provinsi-polda=${state}&`; + ? "views/2023_04_MediaHUB-Viz_INTL_Rev202/db-content-monitor?" + : // "views/2025_10_MediaHUB-Viz-POLDA-content-monitor_Rev100/db-content-monitor?" + "views/2023_09_MediaHUB-Viz-POLDA-content-monitor_Rev100/db-content-monitor?" + : // "views/2025_10_MediaHUB-Viz-POLDA-content-monitor_Rev100/db-content-monitor?" + safeLevelName.includes("POLDA") + ? `views/2023_09_MediaHUB-Viz-ADMIN-POLDA-content-monitor_Rev100/db-content-monitor?provinsi-polda=${state}&` + : // `views/2025_10_MediaHUB-Viz-POLDA-content-monitor_Rev100/db-content-monitor?provinsi-polda=${state}&` + `views/2023_09_MediaHUB-Viz-ADMIN-POLDA-content-monitor_Rev100/db-content-monitor?satker-selected=${state}&`; + // `views/2025_10_MediaHUB-Viz-POLDA-content-monitor_Rev100/db-content-monitor?provinsi-polda=${state}&`; const view2 = levelName == "MABES POLRI" ? isInternational[1] - ? - "views/2023_04_MediaHUB-Viz_INTL_Rev202/db-content-interaction-konten?" - // "views/2025_10_MediaHUB-Viz-POLDA_Rev201/db-content-interaction?" - : - "views/2023_04_MediaHUB-Viz-POLDA_Rev201/db-content-interaction-konten?" - // "views/2025_10_MediaHUB-Viz-POLDA_Rev201/db-content-interaction?" - : safeLevelName.includes("POLDA") - ? - `views/2023_04_MediaHUB-Viz-POLDA_Rev201/db-content-interaction-konten-polda?provinsi-polda=${state}&` - // `views/2025_10_MediaHUB-Viz-POLDA_Rev201/db-content-interaction?provinsi-polda=${state}&` - : - `views/2023_04_MediaHUB-Viz-POLDA_Rev200/db-content-interaction-konten-polda?polda-selected=${state}&`; - // `views/2025_10_MediaHUB-Viz-POLDA_Rev201/db-content-interaction?provinsi-polda=${state}&`; + ? "views/2023_04_MediaHUB-Viz_INTL_Rev202/db-content-interaction-konten?" + : // "views/2025_10_MediaHUB-Viz-POLDA_Rev201/db-content-interaction?" + "views/2023_04_MediaHUB-Viz-POLDA_Rev201/db-content-interaction-konten?" + : // "views/2025_10_MediaHUB-Viz-POLDA_Rev201/db-content-interaction?" + safeLevelName.includes("POLDA") + ? `views/2023_04_MediaHUB-Viz-POLDA_Rev201/db-content-interaction-konten-polda?provinsi-polda=${state}&` + : // `views/2025_10_MediaHUB-Viz-POLDA_Rev201/db-content-interaction?provinsi-polda=${state}&` + `views/2023_04_MediaHUB-Viz-POLDA_Rev200/db-content-interaction-konten-polda?polda-selected=${state}&`; + // `views/2025_10_MediaHUB-Viz-POLDA_Rev201/db-content-interaction?provinsi-polda=${state}&`; const view3 = levelName == "MABES POLRI" @@ -222,7 +214,64 @@ export default function DashboardVisualization() { /> )} -
+ {levelNumber !== "3" && ( + <> +
+ {isInternational[2] ? "ASSIGNMENT" : "PENUGASAN"} +
+ + {levelName === "MABES POLRI" ? ( +{t("choose_category", { defaultValue: "Choose Category" })}
+{isInternational[2] ? "ASSIGNMENT" : "PENUGASAN"}
{levelName === "MABES POLRI" ? ( @@ -272,7 +321,7 @@ export default function DashboardVisualization() { frameBorder="0" /> )} - + */} ); } diff --git a/service/task.ts b/service/task.ts index fa99c177..bcb44d03 100644 --- a/service/task.ts +++ b/service/task.ts @@ -132,6 +132,11 @@ export async function acceptAssignment(id: any) { return httpPostInterceptor(url, id); } +export async function getAcceptanceTa(id: any, isAccept: any) { + const url = `assignment-expert/acceptance?id=${id}&isAccept=${isAccept}`; + return httpGetInterceptor(url); +} + export async function acceptAssignmentTa(id: any) { const url = `assignment-expert/acceptance?id=${id}`; return httpPostInterceptor(url, id);