isuue 19-10-2022

actions/graph.js

@@ -69,5 +69,15 @@ export const getlaporanselesai = async (token) => {
 		console.log("error", error);
 		return false;
 	}
+};
+export const getjumlahStatusLaporan = async (token) => {
+	try {
+		let url = API_URL + "/graph/jumlahStatusLaporan";
+		const res = await axiosAPI.get(url, { headers: { Authorization: token } });
+		return res.data;
+	} catch (error) {
+		console.log("error", error);
+		return false;
+	}
 }
 

components/Delegasi/DetailLaporan.js

@@ -0,0 +1,162 @@
+import Scrollable from "@/components/Common/Scrollable";
+import moment from "moment";
+import { Col, FormGroup } from "reactstrap";
+import { useSelector } from "react-redux";
+
+function DetailLaporan({ data, noTitle = false, noStatus = false }) {
+    const user = useSelector((state) => state.user);
+    return (
+        <>
+            {(!data.user.isPrivate || user?.role.id === 2020) && (
+                <>
+                    {noTitle ? (
+                        ""
+                    ) : (
+                        <div className="header-1">
+                            <h2 className="card-title-1">Identitas Pelapor - {data.user.isPublic ? "Umum" : "Internal"}</h2>
+                        </div>
+                    )}
+                    {data.user.nama && (
+                        <FormGroup row>
+                            <Col md="4">Nama Pelapor:</Col>
+                            <Col md="8">
+                                <strong>{data.user.nama}</strong>
+                            </Col>
+                        </FormGroup>
+                    )}
+                    <FormGroup row>
+                        <Col md="4">Nomor yang dapat dihubungi:</Col>
+                        <Col md="8">
+                            <strong>
+                                {data.user.no_hp} {data.user.verified && "(Terverifikasi)"}
+                            </strong>
+                        </Col>
+                    </FormGroup>
+                    {data.user.email && (
+                        <FormGroup row>
+                            <Col md="4">Email:</Col>
+                            <Col md="8">
+                                <strong>{data.user.email}</strong>
+                            </Col>
+                        </FormGroup>
+                    )}
+
+                    {data.user.isPublic && (
+                        <>
+                            {data.user.alamat && (
+                                <FormGroup row>
+                                    <Col md="4">Alamat:</Col>
+                                    <Col md="8">
+                                        <strong>{data.user.alamat}</strong>
+                                    </Col>
+                                </FormGroup>
+                            )}
+                            {data.user.foto && (
+                                <FormGroup row>
+                                    <Col md="4">Foto Kartu Identitas:</Col>
+                                    <Col md="8">
+                                        <img src={data.user.foto.path} height={200} alt="Foto Identitas" />
+                                    </Col>
+                                </FormGroup>
+                            )}
+                        </>
+                    )}
+                    {data.user.isPrivate && (
+                        <FormGroup row>
+                            <Col md="4">Dirahasiakan</Col>
+                            <Col md="8">
+                                <strong>Ya</strong>
+                            </Col>
+                        </FormGroup>
+                    )}
+                </>
+            )}
+            {noTitle ? (
+                ""
+            ) : (
+                <div className="header-1">
+                    <h2 className="card-title-1">Detail Laporan</h2>
+                </div>
+            )}
+            <form className="form-horizontal">
+                <FormGroup row>
+                    <Col md="4">Nomor Laporan:</Col>
+                    <Col md="8">
+                        <strong>{data.no_laporan}</strong>
+                    </Col>
+                </FormGroup>
+                <FormGroup row>
+                    <Col md="4">Nama Perguruan Tinggi yang Dilaporkan:</Col>
+                    <Col md="8">
+                        <strong>{data.pt.nama}</strong>
+                    </Col>
+                </FormGroup>
+                <FormGroup row>
+                    <Col md="4">Jenis Pelanggaran:</Col>
+                    <Col md="8">
+                        <Scrollable height="125px" className="list-group">
+                            <ul>
+                                {data.pelanggaran.map((e) => (
+                                    <li>{e.pelanggaran}</li>
+                                ))}
+                            </ul>
+                        </Scrollable>
+                    </Col>
+                </FormGroup>
+                <FormGroup row>
+                    <Col md="4">Keterangan Laporan:</Col>
+                    <Col md="8">
+                        <Scrollable height="100px" className="list-group">
+                            <p>{data.keterangan}</p>
+                        </Scrollable>
+                    </Col>
+                </FormGroup>
+                <FormGroup row>
+                    <Col md="4">Dibuat Pada:</Col>
+                    <Col md="8">
+                        <strong>{moment(data.createdAt).format("D MMMM YYYY")}</strong>
+                    </Col>
+                </FormGroup>
+                {!noStatus && data.aktif ? (
+                    <FormGroup row>
+                        <Col md="4">Status:</Col>
+                        <Col md="8">
+                            <div className="badge badge-info">{data.role_data === "dikti" ? "Ditindaklanjuti DIKTI" : "Ditindaklanjuti LLDIKTI"}</div>
+                        </Col>
+                    </FormGroup>
+                ) : (
+                    ""
+                )}
+                {/* <FormGroup row>
+					<Col md="4">Prioritas:</Col>
+					<Col md="8">{data.level == 3 ? <div className="badge badge-success">Tinggi</div> : data.level == 2 ? <div className="badge badge-info">Sedang</div> : <div className="badge badge-warning">Rendah</div>}</Col>
+				</FormGroup> */}
+                <FormGroup row>
+                    <Col md="4">Dokumen Pendukung:</Col>
+                    <Col md="8">
+                        <Scrollable height="120px" className="list-group">
+                            <table className="table table-bordered bg-transparent">
+                                <tbody>
+                                    {data.dokumen.map((e, index) => (
+                                        <tr key={`files-${index}`}>
+                                            <td>
+                                                <em className="fa-lg far fa-file-code"></em>
+                                            </td>
+                                            <td>
+                                                <a className="text-muted" href={e.path} target="_blank" download={e.judul}>
+                                                    {e.judul}
+                                                </a>
+                                            </td>
+                                        </tr>
+                                    ))}
+                                </tbody>
+                            </table>
+                        </Scrollable>
+                    </Col>
+                </FormGroup>
+            </form>
+        </>
+    );
+}
+
+export default DetailLaporan;

components/Delegasi/TableLaporan.js

@@ -0,0 +1,90 @@
+import Datatable from "@/components/Tables/Datatable";
+import { Button } from "reactstrap";
+import Link from "next/link";
+import moment from "moment";
+
+function TableLaporan({ listData, to, linkName, status = false, noBy = false }) {
+    return (
+        <div className="card b ">
+            <div className="card-body card-over">
+                {listData && (
+                    <Datatable options={{ responsive: false, ordering: true }}>
+                        <table className="table w-100" data-order='[[3, "desc"]]'>
+                            <thead>
+                                <tr>
+                                    <th>No.Laporan</th>
+                                    <th>Deskripsi Laporan</th>
+                                    {status && <th>Status</th>}
+                                    {!noBy && <th>Dibuat Oleh</th>}
+                                    {/* <th>Created</th> */}
+                                    <th></th>
+                                </tr>
+                            </thead>
+                            <tbody>
+                                {listData.map((data) => {
+                                    return (
+                                        <tr key={data._id}>
+                                            <td>
+                                                {/* <td>{data.no_laporan}</td> */}
+                                                <div className="media align-items-center">
+                                                    <div className="media-body d-flex">
+                                                        <div>
+                                                            <h4>{data.no_laporan}</h4>
+                                                            <p>{moment(data.createdAt).format("DD-MM-YYYY")}</p>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </td>
+
+                                            <td>
+                                                <div className="table-desc">
+                                                    <div className="media align-items-center">
+                                                        <div className="media-body d-flex">
+                                                            <div>
+                                                                <h4 className="m-0">{data.pt.nama.length > 64 ? data.pt.nama.substring(0, 64) + "..." : data.pt.nama}</h4>
+                                                                {/* <h4 className="m-0">{data.pt.nama}</h4> */}
+                                                                {/* <p className="w-105">{data.keterangan.length > 150 ? data.keterangan.substring(0, 150) + "..." : data.keterangan}</p> */}
+                                                                <p className="w-105">{data.keterangan}</p>
+                                                            </div>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </td>
+
+                                            {status ? (
+                                                <td>
+                                                    <div className="badge badge-info">{data.role_data === "dikti" ? "Ditindaklanjuti DIKTI" : "Ditindaklanjuti LLDIKTI"}</div>
+                                                </td>
+                                            ) : (
+                                                ""
+                                            )}
+                                            {!noBy && <td>{data.user.isPrivate ? "" : data.user.nama}</td>}
+                                            <td>
+                                                <div className="ml-auto">
+                                                    <Link
+                                                        href={{
+                                                            pathname: to,
+                                                            query: { id: data._id },
+                                                        }}
+                                                    >
+                                                        <Button className="btn-login" color>
+                                                            <span className="font-color-white">
+                                                                {linkName}
+                                                            </span>
+                                                        </Button>
+                                                    </Link>
+                                                </div>
+                                            </td>
+                                        </tr>
+                                    );
+                                })}
+                            </tbody>
+                        </table>
+                    </Datatable>
+                )}
+            </div>
+        </div>
+    );
+}
+
+export default TableLaporan;

components/DocPerbaikan/Riwayat.js

@@ -21,21 +21,21 @@ function Riwayat({ data }) {
 						<tbody>
 							{data.length
 								? data.map((value) => (
-										<tr>
-											<td>{moment(value.createAt).format("DD MMMM YYYY")}</td>
-											<td>{value.keterangan}</td>
-											<td>
-												{value.dokumen.map((e) => (
-													<>
-														<em className="fa-lg far fa-file-code"></em>
-														<a className="text-muted" href={e.path} target="_blank" download={e.judul}>
-															{e.judul}
-														</a>
-													</>
-												))}
-											</td>
-										</tr>
-								  ))
+									<tr>
+										<td>{moment(value.createdAt).format("DD MMMM YYYY")}</td>
+										<td>{value.keterangan}</td>
+										<td>
+											{value.dokumen.map((e) => (
+												<>
+													<em className="fa-lg far fa-file-code"></em>
+													<a className="text-muted" href={e.path} target="_blank" download={e.judul}>
+														{e.judul}
+													</a>
+												</>
+											))}
+										</td>
+									</tr>
+								))
 								: ""}
 						</tbody>
 					</table>

components/PencabutanSanksi/Riwayat.js

@@ -27,7 +27,7 @@ function Riwayat({ data }) {
 									<td>{data.status}</td>
 									<td>{data.keterangan}</td>
 									<td>
-										{data.dokumen.map((e) => (
+										{data.dokumen?.map((e) => (
 											<>
 												<em className="fa-lg far fa-file-code"></em>
 												<a className="text-muted" href={e.path} target="_blank" download={e.judul}>

components/Riwayat/ChartData.js

@@ -1,9 +1,10 @@
 import React, { Component } from "react";
-import ContentWrapper from "@/components/Layout/ContentWrapper";
 import { Container, Row, Col, Card, CardHeader, CardBody } from "reactstrap";
 import FlotChart from "@/components/Charts/Flot.js";
 import { connect } from "react-redux";
 import { getPengunjung } from "@/actions/pengunjung";
+
+//sudah live
 class ChartData extends Component {
 	constructor(props) {
 		super(props);

components/Riwayat/ChartDataBar.js

@@ -6,7 +6,7 @@ import { jumlahLaporan } from "@/actions/pelaporan";
 import { getjumlahStatusLaporan } from "@/actions/graph";
 import dynamic from "next/dynamic";
 const ReactApexChart = dynamic(() => import("react-apexcharts"), { ssr: false });
-
+//sudah live
 class ChartDataBar extends React.Component {
 	constructor(props) {
 		super(props);
@@ -70,25 +70,25 @@ class ChartDataBar extends React.Component {
 		};
 	}
 
-	async componentDidMount() {
-		const { token } = this.props;
-		const data = await jumlahLaporan(token);
-		this.setState((prevState) => ({
-			...prevState,
-			series: [{ data: data.data.map((e) => e.jumlah_laporan), name: "jumlah laporan" }],
-			options: {
-				...prevState.options,
-				xaxis: {
-					categories: data.data.map((e) => e._id),
-				},
-			},
-		}));
-	}
 	// async componentDidMount() {
 	// 	const { token } = this.props;
-	// 	const data = await getjumlahStatusLaporan(token);
-	// 	console.log(data.data);
+	// 	const data = await jumlahLaporan(token);
+	// 	this.setState((prevState) => ({
+	// 		...prevState,
+	// 		series: [{ data: data.data.map((e) => e.jumlah_laporan), name: "jumlah laporan" }],
+	// 		options: {
+	// 			...prevState.options,
+	// 			xaxis: {
+	// 				categories: data.data.map((e) => e._id),
+	// 			},
+	// 		},
+	// 	}));
 	// }
+	async componentDidMount() {
+		const { token } = this.props;
+		const data = await getjumlahStatusLaporan(token);
+		// console.log(data.data);
+	}
 
 	render() {
 		return (

components/Riwayat/ChartRadarBelum.js → components/Riwayat/ChartRadarA.js

@@ -7,7 +7,7 @@ import dynamic from "next/dynamic";
 const ReactApexChart = dynamic(() => import("react-apexcharts"), { ssr: false });
 
 
-class ChartRadarBelum extends React.Component {
+class ChartRadarA extends React.Component {
     constructor(props) {
         super(props);
 
@@ -62,4 +62,4 @@ class ChartRadarBelum extends React.Component {
 }
 
 const MapStateToProps = (state) => ({ token: state.token });
-export default connect(MapStateToProps)(ChartRadarBelum);
+export default connect(MapStateToProps)(ChartRadarA);

components/Riwayat/ChartRadarSudah.js → components/Riwayat/ChartRadarB.js

@@ -7,7 +7,7 @@ import dynamic from "next/dynamic";
 const ReactApexChart = dynamic(() => import("react-apexcharts"), { ssr: false });
 
 
-class ChartRadarSudah extends React.Component {
+class ChartRadarB extends React.Component {
     constructor(props) {
         super(props);
 
@@ -66,4 +66,4 @@ class ChartRadarSudah extends React.Component {
 }
 
 const MapStateToProps = (state) => ({ token: state.token });
-export default connect(MapStateToProps)(ChartRadarSudah);
+export default connect(MapStateToProps)(ChartRadarB);

components/Riwayat/TableRadar.js

@@ -37,154 +37,155 @@ function TableRadar() {
                                 color: "black",
                             }}>
                                 <th>Penjadwalan Evaluasi</th>
-                                <td>-</td>
-                                <td>-</td>
-                                <td>-</td>
-                                <td>-</td>
-                                <td>-</td>
-                                <td>-</td>
-                                <td>-</td>
-                                <td>-</td>
-                                <td>-</td>
-                                <td>-</td>
-                                <td>-</td>
-                                <td>-</td>
-                                <td>-</td>
-                                <td>-</td>
-                                <td>-</td>
-                                <td>-</td>
+                                <td>8</td>
+                                <td>5</td>
+                                <td>3</td>
+                                <td>4</td>
+                                <td>5</td>
+                                <td>1</td>
+                                <td>6</td>
+                                <td>8</td>
+                                <td>3</td>
+                                <td>9</td>
+                                <td>5</td>
+                                <td>2</td>
+                                <td>9</td>
+                                <td>6</td>
+                                <td>4</td>
+                                <td>2</td>
                             </tr>
                             <tr style={{
                                 backgroundColor: '#de8383',
                                 color: "black",
                             }}>
                                 <th>Pemeriksaan</th>
-                                <td>-</td>
-                                <td>-</td>
-                                <td>-</td>
-                                <td>-</td>
-                                <td>-</td>
-                                <td>-</td>
-                                <td>-</td>
-                                <td>-</td>
-                                <td>-</td>
-                                <td>-</td>
-                                <td>-</td>
-                                <td>-</td>
-                                <td>-</td>
-                                <td>-</td>
-                                <td>-</td>
-                                <td>-</td>
+                                <td>2</td>
+                                <td>3</td>
+                                <td>4</td>
+                                <td>2</td>
+                                <td>5</td>
+                                <td>4</td>
+                                <td>3</td>
+                                <td>6</td>
+                                <td>7</td>
+                                <td>8</td>
+                                <td>6</td>
+                                <td>5</td>
+                                <td>4</td>
+                                <td>3</td>
+                                <td>2</td>
+                                <td>1</td>
                             </tr>
                             <tr style={{
                                 backgroundColor: '#fdda80',
                                 color: "black",
                             }}>
                                 <th>Sanksi</th>
-                                <td>-</td>
-                                <td>-</td>
-                                <td>-</td>
-                                <td>-</td>
-                                <td>-</td>
-                                <td>-</td>
-                                <td>-</td>
-                                <td>-</td>
-                                <td>-</td>
-                                <td>-</td>
-                                <td>-</td>
-                                <td>-</td>
-                                <td>-</td>
-                                <td>-</td>
-                                <td>-</td>
-                                <td>-</td>
+                                <td>4</td>
+                                <td>6</td>
+                                <td>8</td>
+                                <td>5</td>
+                                <td>7</td>
+                                <td>5</td>
+                                <td>6</td>
+                                <td>8</td>
+                                <td>9</td>
+                                <td>4</td>
+                                <td>3</td>
+                                <td>2</td>
+                                <td>4</td>
+                                <td>5</td>
+                                <td>6</td>
+                                <td>7</td>
+
                             </tr>
                             <tr style={{
                                 backgroundColor: '#cfab80',
                                 color: "black",
                             }}>
                                 <th>Keberatan</th>
-                                <td>-</td>
-                                <td>-</td>
-                                <td>-</td>
-                                <td>-</td>
-                                <td>-</td>
-                                <td>-</td>
-                                <td>-</td>
-                                <td>-</td>
-                                <td>-</td>
-                                <td>-</td>
-                                <td>-</td>
-                                <td>-</td>
-                                <td>-</td>
-                                <td>-</td>
-                                <td>-</td>
-                                <td>-</td>
+                                <td>8</td>
+                                <td>6</td>
+                                <td>8</td>
+                                <td>1</td>
+                                <td>2</td>
+                                <td>3</td>
+                                <td>4</td>
+                                <td>5</td>
+                                <td>6</td>
+                                <td>7</td>
+                                <td>8</td>
+                                <td>8</td>
+                                <td>7</td>
+                                <td>6</td>
+                                <td>5</td>
+                                <td>3</td>
                             </tr>
                             <tr style={{
                                 backgroundColor: '#ef90df',
                                 color: "black",
                             }}>
                                 <th>Banding</th>
-                                <td>-</td>
-                                <td>-</td>
-                                <td>-</td>
-                                <td>-</td>
-                                <td>-</td>
-                                <td>-</td>
-                                <td>-</td>
-                                <td>-</td>
-                                <td>-</td>
-                                <td>-</td>
-                                <td>-</td>
-                                <td>-</td>
-                                <td>-</td>
-                                <td>-</td>
-                                <td>-</td>
-                                <td>-</td>
+                                <td>4</td>
+                                <td>6</td>
+                                <td>8</td>
+                                <td>9</td>
+                                <td>8</td>
+                                <td>7</td>
+                                <td>6</td>
+                                <td>5</td>
+                                <td>4</td>
+                                <td>3</td>
+                                <td>2</td>
+                                <td>1</td>
+                                <td>2</td>
+                                <td>3</td>
+                                <td>4</td>
+                                <td>4</td>
                             </tr>
                             <tr style={{
                                 backgroundColor: '#80df89',
                                 color: "black",
                             }}>
                                 <th>Pemantauan perbaikan</th>
-                                <td>-</td>
-                                <td>-</td>
-                                <td>-</td>
-                                <td>-</td>
-                                <td>-</td>
-                                <td>-</td>
-                                <td>-</td>
-                                <td>-</td>
-                                <td>-</td>
-                                <td>-</td>
-                                <td>-</td>
-                                <td>-</td>
-                                <td>-</td>
-                                <td>-</td>
-                                <td>-</td>
-                                <td>-</td>
+                                <td>4</td>
+                                <td>6</td>
+                                <td>8</td>
+                                <td>4</td>
+                                <td>5</td>
+                                <td>6</td>
+                                <td>7</td>
+                                <td>8</td>
+                                <td>8</td>
+                                <td>9</td>
+                                <td>3</td>
+                                <td>4</td>
+                                <td>5</td>
+                                <td>6</td>
+                                <td>7</td>
+                                <td>3</td>
                             </tr>
                             <tr style={{
                                 backgroundColor: '#a3d4d1',
                                 color: "black",
                             }}>
                                 <th>Pencabutan Sanksi</th>
-                                <td>-</td>
-                                <td>-</td>
-                                <td>-</td>
-                                <td>-</td>
-                                <td>-</td>
-                                <td>-</td>
-                                <td>-</td>
-                                <td>-</td>
-                                <td>-</td>
-                                <td>-</td>
-                                <td>-</td>
-                                <td>-</td>
-                                <td>-</td>
-                                <td>-</td>
-                                <td>-</td>
-                                <td>-</td>
+                                <td>4</td>
+                                <td>6</td>
+                                <td>6</td>
+                                <td>9</td>
+                                <td>8</td>
+                                <td>7</td>
+                                <td>6</td>
+                                <td>3</td>
+                                <td>2-</td>
+                                <td>1</td>
+                                <td>8</td>
+                                <td>5</td>
+                                <td>4</td>
+                                <td>3</td>
+                                <td>6</td>
+                                <td>7</td>
                             </tr>
                         </thead>
                     </Table>

components/Riwayat/TableRadarr.js

@@ -0,0 +1,53 @@
+import React, { Component } from 'react';
+import ContentWrapper from '@/components/Layout/ContentWrapper';
+import { Row, Col, Card, CardHeader, CardBody, Table } from 'reactstrap';
+
+
+function TableRadarr() {
+    return (
+        <Col xl="12">
+            <Card className="card-default">
+                <CardHeader>Bordered Table</CardHeader>
+                <CardBody>
+                    <Table bordered responsive>
+                        <thead>
+                            <tr>
+                                <th rowSpan={2}>Menu</th>
+                                <th colSpan={2}>Wilayah LLDIKTI</th>
+                            </tr>
+                            <tr>
+                                <th>I</th>
+                            </tr>
+                        </thead>
+                        <tbody>
+                            <tr>
+                                <td>Penjawalan Evaluasi</td>
+                            </tr>
+                            <tr>
+                                <td>Pemeriksaan</td>
+                            </tr>
+                            <tr>
+                                <td>Sanksi</td>
+                            </tr>
+                            <tr>
+                                <td>Keberatan</td>
+                            </tr>
+                            <tr>
+                                <td>Banding</td>
+                            </tr>
+                            <tr>
+                                <td>Pemantauan perbaikan</td>
+                            </tr>
+                            <tr>
+                                <td>Pencabutan sanksi</td>
+                            </tr>
+                        </tbody>
+                    </Table>
+                </CardBody>
+            </Card>
+        </Col>
+    )
+}
+
+export default TableRadarr
+

pages/app/pencabutan-sanksi/detail.js

@@ -376,8 +376,8 @@ class JawabanPencabutanSanksi extends Component {
 				<Modal isOpen={this.state.modal} toggle={this.toggleModal}>
 					<ModalBody>Apakah anda yakin ingin mengubah jawaban sebelumnya?</ModalBody>
 					<ModalFooter>
-						<Button color="primary" onClick={this.handleSimpan}>
-							Ya
+						<Button color className=" btn-login" onClick={this.handleSimpan}>
+							<span className=" font-color-white">Ya</span>
 						</Button>{" "}
 						<Button color="secondary" onClick={this.toggleModal}>
 							Tidak

pages/app/riwayat/index.js

@@ -2,9 +2,6 @@ import React, { Component } from "react";
 import ContentWrapper from "@/components/Layout/ContentWrapper";
 import Link from "next/link";
 import { Row, Col, Button } from "reactstrap";
-import { getPelaporan } from "@/actions/pelaporan";
-import CaseProgress from "@/components/Pelaporan/CaseProgress";
-import TableLaporan from "@/components/Pelaporan/TableLaporan";
 import { connect } from "react-redux";
 import Loader from "@/components/Common/Loader";
 import Router from "next/router";
@@ -12,13 +9,13 @@ 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 ChartRadar from "../../../components/Riwayat/ChartRadarBelum";
-import ChartRadarBelum from "../../../components/Riwayat/ChartRadarBelum";
-import ChartRadarSudah from "../../../components/Riwayat/ChartRadarSudah";
 import TableRadar from "../../../components/Riwayat/TableRadar";
 import TableRiwayatt from "../../../components/Riwayat/TableRiwayatt";
 import TableRadarr from "../../../components/Riwayat/TableRadarr";
 import { getjumlahStatusLaporan } from "../../../actions/graph";
+import ChartRadarB from "../../../components/Riwayat/ChartRadarB";
+import ChartRadarA from "../../../components/Riwayat/ChartRadarA";
+
 
 
 class Riwayat extends Component {
@@ -32,7 +29,7 @@ class Riwayat extends Component {
     const { token } = this.props;
     let jumlahStatusLaporan = await getjumlahStatusLaporan(token);
     this.setState({ jumlahStatusLaporan });
-    console.log(jumlahStatusLaporan.data[1].jumlah_jadwal_evaluasi);
+    // console.log(jumlahStatusLaporan.data[1].jumlah_jadwal_evaluasi);
     // console.log(jumlahStatusLaporan);
   };
 
@@ -50,10 +47,10 @@ class Riwayat extends Component {
             <Maps />
           </Col>
           <Col lg="6">
-            <ChartRadarBelum />
+            <ChartRadarA />
           </Col>
           <Col lg="6">
-            <ChartRadarSudah />
+            <ChartRadarB />
           </Col>
           {/* <TableRadarr /> */}
           <TableRadar />