commit

components/Extras/calendar.view.js

@@ -20,6 +20,8 @@ import { ToastContainer, toast } from "react-toastify";
 import { Formik, Form, Field, ErrorMessage } from "formik";
 import * as Yup from "yup";
 import Datetime from "react-datetime";
+import 'moment/locale/id';
+moment.locale('id')
 
 const status = [
 	{ value: "Ditindaklanjuti DIKTI", label: "Ditindaklanjuti DIKTI", className: "State-ACT" },
@@ -309,6 +311,7 @@ class Calendar extends Component {
 																				{({ field, form }) => (
 																					<Datetime
 																						timeFormat={false}
+																						locale="en-gb"
 																						inputProps={{ className: "form-control" }}
 																						value={field.value}
 																						onChange={(e) => {
@@ -327,6 +330,7 @@ class Calendar extends Component {
 																				{({ field, form }) => (
 																					<Datetime
 																						timeFormat={false}
+																						locale="en-gb"
 																						inputProps={{ className: "form-control" }}
 																						value={field.value}
 																						onChange={(e) => {

components/Riwayat/ChartDataBar.js

@@ -3,6 +3,7 @@ import ContentWrapper from "@/components/Layout/ContentWrapper";
 import { Container, Row, Col, Card, CardHeader, CardBody } from "reactstrap";
 import { connect } from "react-redux";
 import { jumlahLaporan } from "@/actions/pelaporan";
+import { getjumlahStatusLaporan } from "@/actions/graph";
 import dynamic from "next/dynamic";
 const ReactApexChart = dynamic(() => import("react-apexcharts"), { ssr: false });
 
@@ -83,6 +84,11 @@ class ChartDataBar extends React.Component {
 			},
 		}));
 	}
+	// async componentDidMount() {
+	// 	const { token } = this.props;
+	// 	const data = await getjumlahStatusLaporan(token);
+	// 	console.log(data.data);
+	// }
 
 	render() {
 		return (

components/Riwayat/TableRadar.js

@@ -66,7 +66,7 @@ function TableRadar() {
                                 <td>-</td>
                                 <td>-</td>
                                 <td>-</td>
-                                <td>-444</td>
+                                <td>-</td>
                                 <td>-</td>
                                 <td>-</td>
                                 <td>-</td>

components/Riwayat/TableRiwayatt.js

@@ -20,7 +20,7 @@ class TableRiwayatt extends Component {
     }
 
     render() {
-        console.log(this.state.dataRiwayat.data?.map(e => e.id))
+        // console.log(this.state.dataRiwayat.data?.map(e => e.id))
         return (
             <div className="card b ">
                 <div style={{ height: 500 }} className="card-body card-over">

pages/app/laporan-delegasi/detail.js

@@ -3,7 +3,7 @@ import Header from "@/components/Main/Header";
 import DetailPT from "@/components/Main/DetailPT";
 import { getOneLaporan } from "@/actions/pelaporan";
 import { getLog } from "@/actions/log";
-import DetailLaporan from "@/components/Main/DetailLaporan";
+import DetailLaporan from "@/components/Delegasi/DetailLaporan";
 import Link from "next/link";
 import ContentWrapper from "@/components/Layout/ContentWrapper";
 import { Row, Col, Card, CardBody, Button, FormGroup } from "reactstrap";
@@ -28,11 +28,12 @@ class DetailPelaporan extends Component {
 
 	componentDidMount = async () => {
 		const { token, query } = this.props;
-		const pelaporan = await getOneLaporan(this.props.token, query.id + "?delegasi=true");
-		await createLog(token, { aktivitas: `Mengakses halaman detail Laporan Delegasi dengan No. Laporan ${pelaporan.data.no_laporan}`, menu: "Laporan Delegasi" });
+		const pelaporan = await getOneLaporan(this.props.token, query.id + "?delegasi=true&?aktif=false");
+		// await createLog(token, { aktivitas: `Mengakses halaman detail Laporan Delegasi dengan No. Laporan ${pelaporan.data.no_laporan}`, menu: "Laporan Delegasi" });
 		const pemantauan = await getLog(this.props.token, query.id + "?delegasi=true&asc=true");
 		pemantauan.data = pemantauan.data.filter((e) => e.action != "CREATE LAPORAN");
 		this.setState({ pelaporan, pemantauan });
+		console.log(pelaporan);
 	};
 
 	render() {

pages/app/pencabutan-sanksi/detail.js

@@ -238,57 +238,111 @@ class JawabanPencabutanSanksi extends Component {
 															) : (
 																""
 															)}
-															<FormGroup>
-																<label className="row-form-label">Upload Dokumen:</label>
-																<div className="row-md-10">
-																	<Field name="dokumen">
-																		{({ field, form }) => (
-																			<DropzoneWrapper
-																				className=""
-																				onDrop={(e) => {
-																					this.onDrop(e);
-																					form.setFieldValue(field.name, e);
-																				}}
-																			>
-																				{({ getRootProps, getInputProps, isDragActive }) => {
-																					return (
-																						<div {...getRootProps()} className={"dropzone card p-3 " + (isDragActive ? "dropzone-drag-active" : "")}>
-																							<input {...getInputProps()} />
-																							<div className="dropzone-previews flex">
-																								<div className="dropzone-style-1">
-																									<div className="center-ver-hor dropzone-previews flex">{this.state.files.length > 0 ? <Row><span className="text-left">{thumbs}</span></Row> :
-																										<div className="text-center fa-2x icon-cloud-upload mr-2 ">
-																											<h5 className="text-center dz-default dz-message">Klik untuk upload dokumen</h5>
+															{selectedOption && selectedOption.value === "Rekomendasi Perbaikan" ? (
+																<FormGroup>
+																	<label className="row-form-label">Upload Dokumen  &#40;Opsional&#41; :</label>
+																	<div className="row-md-10">
+																		<Field name="dokumen">
+																			{({ field, form }) => (
+																				<DropzoneWrapper
+																					className=""
+																					onDrop={(e) => {
+																						this.onDrop(e);
+																						form.setFieldValue(field.name, e);
+																					}}
+																				>
+																					{({ getRootProps, getInputProps, isDragActive }) => {
+																						return (
+																							<div {...getRootProps()} className={"dropzone card p-3 " + (isDragActive ? "dropzone-drag-active" : "")}>
+																								<input {...getInputProps()} />
+																								<div className="dropzone-previews flex">
+																									<div className="dropzone-style-1">
+																										<div className="center-ver-hor dropzone-previews flex">{this.state.files.length > 0 ? <Row><span className="text-left">{thumbs}</span></Row> :
+																											<div className="text-center fa-2x icon-cloud-upload mr-2 ">
+																												<h5 className="text-center dz-default dz-message">Klik untuk upload dokumen</h5>
+																											</div>
+																										}
 																										</div>
-																									}
-																									</div>
-																								</div>																							</div>
-																							<div className="d-flex align-items-center">
-																								<small className="ml-auto">
-																									<button
-																										type="button"
-																										className="btn btn-link"
-																										onClick={(e) => {
-																											this.clearFiles(e);
-																											form.setFieldValue(field.name, []);
-																										}}
-																									>
-																										Reset dokumen
-																									</button>
-																								</small>
+																									</div>																							</div>
+																								<div className="d-flex align-items-center">
+																									<small className="ml-auto">
+																										<button
+																											type="button"
+																											className="btn btn-link"
+																											onClick={(e) => {
+																												this.clearFiles(e);
+																												form.setFieldValue(field.name, []);
+																											}}
+																										>
+																											Reset dokumen
+																										</button>
+																									</small>
+																								</div>
 																							</div>
-																						</div>
-																					);
-																				}}
-																			</DropzoneWrapper>
-																		)}
-																	</Field>
-																	<ErrorMessage name="dokumen" component="div" className="form-text text-danger" />
-																	<p className="mrgn-top-5">
-																		Ukuran setiap dokumen maksimal 15mb
-																	</p>
-																</div>
-															</FormGroup>
+																						);
+																					}}
+																				</DropzoneWrapper>
+																			)}
+																		</Field>
+																		<ErrorMessage name="dokumen" component="div" className="form-text text-danger" />
+																		<p className="mrgn-top-5">
+																			Ukuran setiap dokumen maksimal 15mb
+																		</p>
+																	</div>
+																</FormGroup>
+															) : (
+																<FormGroup>
+																	<label className="row-form-label">Upload Dokumen <span className=" text-danger">*</span>:</label>
+																	<div className="row-md-10">
+																		<Field name="dokumen">
+																			{({ field, form }) => (
+																				<DropzoneWrapper
+																					className=""
+																					onDrop={(e) => {
+																						this.onDrop(e);
+																						form.setFieldValue(field.name, e);
+																					}}
+																				>
+																					{({ getRootProps, getInputProps, isDragActive }) => {
+																						return (
+																							<div {...getRootProps()} className={"dropzone card p-3 " + (isDragActive ? "dropzone-drag-active" : "")}>
+																								<input {...getInputProps()} />
+																								<div className="dropzone-previews flex">
+																									<div className="dropzone-style-1">
+																										<div className="center-ver-hor dropzone-previews flex">{this.state.files.length > 0 ? <Row><span className="text-left">{thumbs}</span></Row> :
+																											<div className="text-center fa-2x icon-cloud-upload mr-2 ">
+																												<h5 className="text-center dz-default dz-message">Klik untuk upload dokumen</h5>
+																											</div>
+																										}
+																										</div>
+																									</div>																							</div>
+																								<div className="d-flex align-items-center">
+																									<small className="ml-auto">
+																										<button
+																											type="button"
+																											className="btn btn-link"
+																											onClick={(e) => {
+																												this.clearFiles(e);
+																												form.setFieldValue(field.name, []);
+																											}}
+																										>
+																											Reset dokumen
+																										</button>
+																									</small>
+																								</div>
+																							</div>
+																						);
+																					}}
+																				</DropzoneWrapper>
+																			)}
+																		</Field>
+																		<ErrorMessage name="dokumen" component="div" className="form-text text-danger" />
+																		<p className="mrgn-top-5">
+																			Ukuran setiap dokumen maksimal 15mb
+																		</p>
+																	</div>
+																</FormGroup>
+															)}
 															<FormGroup>
 																<div className="row-xl-10">
 																	<Button color className="color-3e3a8e" type="submit">

pages/app/riwayat/index.js

@@ -3,7 +3,6 @@ import ContentWrapper from "@/components/Layout/ContentWrapper";
 import Link from "next/link";
 import { Row, Col, Button } from "reactstrap";
 import { getPelaporan } from "@/actions/pelaporan";
-import { getGraph, getExcel } from "@/actions/graph";
 import CaseProgress from "@/components/Pelaporan/CaseProgress";
 import TableLaporan from "@/components/Pelaporan/TableLaporan";
 import { connect } from "react-redux";
@@ -18,9 +17,25 @@ 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";
 
 
 class Riwayat extends Component {
+  constructor(props) {
+    super(props);
+    this.state = {
+    };
+  }
+
+  componentDidMount = async () => {
+    const { token } = this.props;
+    let jumlahStatusLaporan = await getjumlahStatusLaporan(token);
+    this.setState({ jumlahStatusLaporan });
+    console.log(jumlahStatusLaporan.data[1].jumlah_jadwal_evaluasi);
+    // console.log(jumlahStatusLaporan);
+  };
+
   render() {
     return (
       <ContentWrapper>
@@ -40,6 +55,7 @@ class Riwayat extends Component {
           <Col lg="6">
             <ChartRadarSudah />
           </Col>
+          {/* <TableRadarr /> */}
           <TableRadar />
           <ChartData />
           {/* <TableRiwayat /> */}