fix dashboard

components/Pemeriksaan/InputEvaluasi.js

@@ -49,7 +49,7 @@ const evaluasiSchema = Yup.object().shape({
 
 const ditutupSchema = Yup.object().shape({
 	keterangan: Yup.string().required("Harus diisi"),
-	dokumen: Yup.array().min(1).required("Wajib diisi").test("filesize", "Maksimal ukuran dokumen 15mb", checkIfFilesAreTooBig),
+	dokumen: Yup.array().test("filesize", "Maksimal ukuran dokumen 15mb", checkIfFilesAreTooBig),
 });
 let Dropzone = null;
 

components/Riwayat/TableRadar.js

@@ -1,22 +1,23 @@
 import React, { Component } from 'react';
 import Link from "next/link";
 import { Row, Col, Card, CardHeader, CardBody, Table, Button } from 'reactstrap';
+import { Line } from 'react-chartjs-2';
 
 
-function TableRadar({ listData, to, linkName, jadwal, pemeriksaan, sanksi, keberatan, banding, perbaikan, cabutSanksi, all_Laporan }) {
+function TableRadar({ listData, to, linkName, jadwal, pemeriksaan, sanksi, keberatan, banding, perbaikan, cabutSanksi, all_Laporan, ditutup, selesai, delegasi }) {
     return (
         <Card className="card-default">
             <CardBody style={{
-                            outerWidth:"700"
-                                }}>
+                outerWidth: "700"
+            }}>
                 <Table bordered responsive>
                     <thead>
                         <tr >
                             <th rowspan="2"
-                             style={{
-                                verticalAlign: "middle",
-                                textAlign: "center",
-                            }}
+                                style={{
+                                    verticalAlign: "middle",
+                                    textAlign: "center",
+                                }}
                             >Wilayah LLDikti\Menu</th>
                             <th
                                 rowspan="2"
@@ -27,11 +28,11 @@ function TableRadar({ listData, to, linkName, jadwal, pemeriksaan, sanksi, keber
                             <th
                                 colSpan="2"
                                 style={{
-                                    backgroundColor: '#80b1ff',
+                                    backgroundColor: '#e8f2f1',
                                     color: "black",
                                     textAlign: "center",
 
-                                }}>1. Pelaporan Tuntas</th>
+                                }}>Pelaporan Tuntas</th>
                             <th
                                 rowspan="2"
                                 style={{
@@ -39,7 +40,7 @@ function TableRadar({ listData, to, linkName, jadwal, pemeriksaan, sanksi, keber
                                     color: "black",
                                     textAlign: "center",
                                     verticalAlign: "middle",
-                                }}>Penjadwalan Evaluasi</th>
+                                }}>1. Penjadwalan Evaluasi</th>
                             <th
                                 rowspan="2"
                                 style={{
@@ -90,12 +91,21 @@ function TableRadar({ listData, to, linkName, jadwal, pemeriksaan, sanksi, keber
                                 }}>7. Permohonan Pencabutan Sanksi</th>
                             <th
                                 rowspan="2"
+                                id='cabutSanksi'
                                 style={{
-                                    backgroundColor: '#a3d4d1',
+                                    // backgroundColor: '#e8f2f1',
                                     color: "black",
                                     textAlign: "center",
                                     verticalAlign: "middle",
-                                }}>9. Cabut Sanksi</th>
+                                }}>Pelaporan Tuntas
+                                <hr style={{
+                                    // backgroundColor: 'black',
+                                    color: "black",
+                                
+                                }}></hr>
+                                Cabut Sanksi
+
+                            </th>
                             <th
                                 rowspan="2"
                                 style={{
@@ -107,15 +117,15 @@ function TableRadar({ listData, to, linkName, jadwal, pemeriksaan, sanksi, keber
                         </tr>
                         <tr>
                             <th
-                             style={{
-                                backgroundColor: '#e8f2f1',
-                                color: "black",
-                                textAlign: "center",
-                                verticalAlign: "middle",
-                            }}
+                                style={{
+                                    color: "black",
+                                    textAlign: "center",
+                                    verticalAlign: "middle",
+                                }}
                             >Ditutup</th>
                             <th>Delegasi LLDIKTI</th>
                         </tr>
+
                     </thead>
                     {listData.map((data) => {
                         return (
@@ -133,8 +143,30 @@ function TableRadar({ listData, to, linkName, jadwal, pemeriksaan, sanksi, keber
                                         cursor: "pointer",
                                     }}>{data.laporan.length}</td>
                                 </Link>
-                                <td>ditutup</td>
-                                <td>delegasi</td>
+                                <Link
+                                    href={{
+                                        pathname: ditutup,
+                                        query: { id: data.pembina.id },
+                                    }}
+                                >
+                                    <td style={{
+                                        color: "black",
+                                        textAlign: "center",
+                                        cursor: "pointer",
+                                    }}>{data.jumlah_ditutup}</td>
+                                </Link>
+                                <Link
+                                    href={{
+                                        pathname: delegasi,
+                                        query: { id: data.pembina.id },
+                                    }}
+                                >
+                                    <td style={{
+                                        color: "black",
+                                        textAlign: "center",
+                                        cursor: "pointer",
+                                    }}>{data.jumlah_delegasi}</td>
+                                </Link>
 
                                 <Link
                                     href={{
@@ -227,7 +259,18 @@ function TableRadar({ listData, to, linkName, jadwal, pemeriksaan, sanksi, keber
                                         cursor: "pointer",
                                     }}>{data.jumlah_pencabutan_sanksi}</td>
                                 </Link>
-                                <td>"0</td>
+                                <Link
+                                    href={{
+                                        pathname: selesai,
+                                        query: { id: data.pembina.id },
+                                    }}
+                                >
+                                    <td style={{
+                                        color: "black",
+                                        textAlign: "center",
+                                        cursor: "pointer",
+                                    }}>{data.jumlah_diterima}</td>
+                                </Link>
                                 <td>
                                     <div className="ml-auto" style={{
                                         textAlign: "center",

components/Sanksi/Redudansi.js

@@ -40,7 +40,7 @@ class DropzoneWrapper extends Component {
 }
 const ditutupSchema = Yup.object().shape({
     keterangan: Yup.string().required("Harus diisi"),
-    dokumen: Yup.array().min(1).required("Wajib diisi").test("filesize", "Maksimal ukuran dokumen 15mb", checkIfFilesAreTooBig),
+    dokumen: Yup.array().test("filesize", "Maksimal ukuran dokumen 15mb", checkIfFilesAreTooBig),
 });
 const status = [
     { value: "Sanksi", label: "Sanksi", className: "State-ACT" },
@@ -91,9 +91,9 @@ export class Redudansi extends Component {
     logDitutup = async () => {
         const getToken = await getCsrf();
         const _csrf = getToken.token;
-        const { token, query } = this.props;
-        const { id } = query;
-        await createLog(token, { aktivitas: `Berhasil menutup laporan, id: ${id}`, _csrf: _csrf, menu: "Sanksi" });
+        const { token } = this.props;
+     
+        await createLog(token, { aktivitas: `Berhasil menutup laporan, id: ${this.props.id}`, _csrf: _csrf, menu: "Sanksi" });
     }
     handleTutupLaporan = async (data, value) => {
         if (this.props.role === 2024) {
@@ -117,12 +117,16 @@ export class Redudansi extends Component {
 
             await toast.promise(updateLaporan(token, this.props.id, formdata, _csrf + `&redudansi=true`), {
                 pending: "Loading",
-                success: "Success",
+                success: {
+                    render: "success",
+                    autoClose: 1000
+                },
                 error: "Error",
-                autoClose: 1000
-            }); 
+            });
             await this.logDitutup()
-            await Router.push("/app/sanksi");
+            await Router.push({
+                pathname: "/app/sanksi",
+            });
         }
 
     };

pages/app/dashboard/index.js

@@ -58,7 +58,7 @@ class Dashboard extends Component {
             <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 />}
+            {jumlahStatusLaporan?.data ? <TableRadar listData={jumlahStatusLaporan.data} ditutup="" selesai="" delegasi="" 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>

pages/app/dashboard/pemeriksaan.js

@@ -49,7 +49,7 @@ class Pemeriksaan extends Component {
                 </div>
                 <Row>
                     <Col lg="12">
-                        {laporanPembina.data && < TableLaporan listData={laporanPembina.data.laporan} to="/app/pelaporan/detail" linkName="Detail" />}
+                        {laporanPembina.data && < TableLaporan listData={laporanPembina?.data?.laporan} to="/app/pelaporan/detail" linkName="Detail" />}
 
 
                     </Col>

pages/app/dashboard/penjadwalan.js

@@ -48,7 +48,7 @@ class Penjadwalan extends Component {
                 </div>
                 <Row>
                     <Col lg="12">
-                        {laporanPembina.data && < TableLaporan listData={laporanPembina.data.laporan} to="/app/pelaporan/detail" linkName="Detail" />}
+                        {laporanPembina.data && < TableLaporan listData={laporanPembina?.data?.laporan} to="/app/pelaporan/detail" linkName="Detail" />}
 
 
                     </Col>