riwayat di pisah menjadi 2, riwayat dan dashboard

components/Layout/Menu.js

@@ -132,6 +132,12 @@ const Menu = [
 		icon: "icon-film",
 		translate: "sidebar.nav.Riwayat",
 	},
+	{
+		name: "Dashboard",
+		path: "/app/dashboard",
+		icon: "icon-film",
+		translate: "sidebar.nav.Dashboard",
+	},
 	{
 		name: "Pelaporan Tuntas",
 		path: "/app/tuntas",

components/Layout/MenuBypass.js

@@ -132,6 +132,12 @@ const MenuBypass = [
 		icon: "icon-film",
 		translate: "sidebar.nav.Riwayat",
 	},
+	{
+		name: "Dashboard",
+		path: "/app/dashboard",
+		icon: "icon-film",
+		translate: "sidebar.nav.Dashboard",
+	},
 	{
 		name: "Pelaporan Tuntas",
 		path: "/app/tuntas",

components/Layout/MenuPT.js

@@ -15,31 +15,6 @@ const MenuPT = [
 		icon: "icon-social-steam",
 		translate: "sidebar.nav.PT_PEMANTAUAN",
 	},
-	// {
-	// 	name: "Pengajuan Keberatan",
-	// 	icon: "icon-hourglass",
-	// 	translate: "sidebar.nav.PENGAJUAN_KEBERATAN",
-	// 	submenu: [
-	// 		{
-	// 			name: "a. Permohonan Keberatan",
-	// 			path: "/pt/keberatan",
-	// 		},
-	// 		{
-	// 			name: "b. Jawaban keberatan",
-	// 			path: "/pt/jawaban-keberatan",
-	// 		},
-	// 		{
-	// 			name: "c. Jawaban banding",
-	// 			path: "/pt/jawaban-banding",
-	// 		},
-	// 	],
-	// },
-	// {
-	// 	name: "Dokumen Perbaikan",
-	// 	path: "/pt/dokumen-perbaikan",
-	// 	icon: "icon-graph",
-	// 	translate: "sidebar.nav.PT_DOKUMEN_PERBAIKAN",
-	// },
 	{
 		name: "Pencabutan Sanksi",
 		icon: "icon-shield",

components/Layout/MenuReadOnly.js

@@ -110,10 +110,10 @@ const MenuReadOnly = [
 		translate: "sidebar.heading.ANALYTICS_REPORT",
 	},
 	{
-		name: "Riwayat",
-		path: "/app/riwayat",
+		name: "Dashboard",
+		path: "/app/dashboard",
 		icon: "icon-film",
-		translate: "sidebar.nav.Riwayat",
+		translate: "sidebar.nav.Dashboard",
 	},
 	{
 		name: "Pelaporan Tuntas",

components/Layout/Sidebar.js

@@ -152,7 +152,7 @@ class Sidebar extends Component {
 		// const user = await getUser();
 		const user = this.props.user;
 		if (ENV === "production") {
-			this.menu = user.user_id === "2A080F42-AE7F-407B-976E-DE5FA87BD277" ? MenuBypass : user.role.id === 2022 ? MenuPT : user.role.id === 2021 ? MenuLLDIKTI : user.role.id === 2024 ? MenuReadOnly : Menu;
+			this.menu = user.user_id === "2A080F42-AE7F-407B-976E-DE5FA87BD277" || "28DB23AE-2976-47E0-9410-241A11EE1F88" ? MenuBypass : user.role.id === 2022 ? MenuPT : user.role.id === 2021 ? MenuLLDIKTI : user.role.id === 2024 ? MenuReadOnly : Menu;
 		}
 		// if (ENV === "development") {
 		// 	this.menu = user.user_id === "28DB23AE-2976-47E0-9410-241A11EE1F88" ? MenuBypass : user.role.id === 2022 ? MenuPT : user.role.id === 2021 ? MenuLLDIKTI : user.role.id === 2024 ? MenuReadOnly : Menu;

components/Sanksi/Ringkasan.js

@@ -78,7 +78,7 @@ export class Ringkasan extends Component {
 								</Col>
 							</FormGroup>
 							<FormGroup row>
-								<Col md="4">Tanggal Dibuat Laporan::</Col>
+								<Col md="4">Tanggal Dibuat Laporan:</Col>
 								<Col md="8">
 									<strong>{moment(dataLaporan.createdAt).format("D MMMM YYYY")}</strong>
 								</Col>

pages/app/dashboard/index.js

@@ -0,0 +1,69 @@
+import React, { Component } from "react";
+import ContentWrapper from "@/components/Layout/ContentWrapper";
+import Link from "next/link";
+import { Row, Col, Button, Card, CardBody, Table } from "reactstrap";
+import { connect } from "react-redux";
+import Loader from "@/components/Common/Loader";
+import Router from "next/router";
+import ChartDataBar from "@/components/Riwayat/ChartDataBar";
+import Maps from "@/components/Riwayat/Maps"
+import TableRadar from "../../../components/Riwayat/TableRadar";
+import { getjumlahStatusLaporan } from "../../../actions/graph";
+import ChartRadarB from "../../../components/Riwayat/ChartRadarB";
+import ChartRadarA from "../../../components/Riwayat/ChartRadarA";
+
+
+
+
+class Dashboard extends Component {
+  constructor(props) {
+    super(props);
+    this.state = {
+      jumlahStatusLaporan: {}
+    };
+  }
+  handleClick = (e, idPembina) => {
+    e.preventDefault();
+    Router.push({
+      pathname: "/app/riwayat/detail",
+      query: { id: idPembina },
+    });
+  };
+
+  componentDidMount = async () => {
+    const { token } = this.props;
+    const jumlahStatusLaporan = await getjumlahStatusLaporan(token);
+    this.setState({ jumlahStatusLaporan });
+  };
+
+
+  render() {
+    const { jumlahStatusLaporan } = this.state;
+    return (
+      <ContentWrapper>
+        <div className="content-heading">
+          <span className="font-color-white">Dashboard</span>
+        </div>
+        <Row>
+          <Col lg="6">
+            <ChartDataBar />
+          </Col>
+          <Col lg="6">
+            <Maps />
+          </Col>
+          <Col lg="6">
+            <ChartRadarA />
+          </Col>
+          <Col lg="6">
+            <ChartRadarB />
+          </Col>
+          <Col lg="12">
+            {jumlahStatusLaporan?.data ? <TableRadar listData={jumlahStatusLaporan.data} to="/app/dashboard/detail" jadwal="/app/dashboard/penjadwalan" all_Laporan="/app/dashboard/all_Laporan" pemeriksaan="/app/dashboard/pemeriksaan" sanksi="/app/dashboard/sanksi" keberatan="/app/dashboard/keberatan" banding="/app/dashboard/banding" perbaikan="/app/dashboard/perbaikan" cabutSanksi="/app/dashboard/cabutSanksi" linkName="Lihat" /> : <Loader />}
+          </Col>
+        </Row>
+      </ContentWrapper>
+    );
+  }
+}
+const mapStateToProps = (state) => ({ user: state.user, token: state.token });
+export default connect(mapStateToProps)(Dashboard);

pages/app/riwayat/index.js

@@ -1,75 +1,36 @@
 import React, { Component } from "react";
 import ContentWrapper from "@/components/Layout/ContentWrapper";
-import Link from "next/link";
 import { Row, Col, Button, Card, CardBody, Table } from "reactstrap";
 import { connect } from "react-redux";
-import Loader from "@/components/Common/Loader";
-import Router from "next/router";
 import TableRiwayat from "@/components/Riwayat/TableRiwayat";
 import ChartData from "@/components/Riwayat/ChartData";
-import ChartDataBar from "@/components/Riwayat/ChartDataBar";
-import Maps from "@/components/Riwayat/Maps"
-import TableRadar from "../../../components/Riwayat/TableRadar";
-import { getjumlahStatusLaporan } from "../../../actions/graph";
-import ChartRadarB from "../../../components/Riwayat/ChartRadarB";
-import ChartRadarA from "../../../components/Riwayat/ChartRadarA";
 
 
 
 
 class Riwayat extends Component {
-  constructor(props) {
-    super(props);
-    this.state = {
-      jumlahStatusLaporan: {}
-    };
-  }
-  handleClick = (e, idPembina) => {
-    e.preventDefault();
-    Router.push({
-      pathname: "/app/riwayat/detail",
-      query: { id: idPembina },
-    });
-  };
+    constructor(props) {
+        super(props);
+        this.state = {
+        };
+    }
 
-  componentDidMount = async () => {
-    const { token } = this.props;
-    const jumlahStatusLaporan = await getjumlahStatusLaporan(token);
-    this.setState({ jumlahStatusLaporan });
-  };
 
-
-  render() {
-    const { jumlahStatusLaporan } = this.state;
-    return (
-      <ContentWrapper>
-        <div className="content-heading">
-          <span className="font-color-white">Riwayat</span>
-        </div>
-        <Row>
-          <Col lg="6">
-            <ChartDataBar />
-          </Col>
-          <Col lg="6">
-            <Maps />
-          </Col>
-          <Col lg="6">
-            <ChartRadarA />
-          </Col>
-          <Col lg="6">
-            <ChartRadarB />
-          </Col>
-          <Col lg="12">
-            {jumlahStatusLaporan?.data ? <TableRadar listData={jumlahStatusLaporan.data} to="/app/riwayat/detail" jadwal="/app/riwayat/penjadwalan" all_Laporan="/app/riwayat/all_Laporan" pemeriksaan="/app/riwayat/pemeriksaan" sanksi="/app/riwayat/sanksi" keberatan="/app/riwayat/keberatan" banding="/app/riwayat/banding" perbaikan="/app/riwayat/perbaikan" cabutSanksi="/app/riwayat/cabutSanksi" linkName="Lihat" /> : <Loader />}
-          </Col>
-          <ChartData />
-          <Col lg="12">
-            <TableRiwayat />
-          </Col>
-        </Row>
-      </ContentWrapper>
-    );
-  }
+    render() {
+        return (
+            <ContentWrapper>
+                <div className="content-heading">
+                    <span className="font-color-white">Riwayat</span>
+                </div>
+                <Row>
+                    <ChartData />
+                    <Col lg="12">
+                        <TableRiwayat />
+                    </Col>
+                </Row>
+            </ContentWrapper>
+        );
+    }
 }
 const mapStateToProps = (state) => ({ user: state.user, token: state.token });
 export default connect(mapStateToProps)(Riwayat);