commit

components/DocPerbaikan/Riwayat.js

@@ -15,6 +15,7 @@ function Riwayat({ data }) {
 						<thead>
 							<tr>
 								<th>Tanggal</th>
+								<th>Keterangan</th>
 								<th>Dokumen</th>
 							</tr>
 						</thead>
@@ -23,6 +24,7 @@ function Riwayat({ data }) {
 								? data.map((value) => (
 										<tr>
 											<td>{moment(value.createAt).format("DD MMMM YYYY")}</td>
+											<td>{value.description}</td>
 											<td>
 												{value.files.map((e) => (
 													<>

components/Layout/Menu.js

@@ -49,19 +49,18 @@ const Menu = [
 		icon: "icon-notebook",
 		translate: "sidebar.nav.BANDING",
 	},
-	{
-		name: "Pemantauan Perbaikan",
-		path: "/app/pemantauan-perbaikan",
-		icon: "icon-notebook",
-		translate: "sidebar.nav.PEMANTAUAN_PERBAIKAN",
-	},
 	{
 		name: "Permohonan Pencabutan Sanksi",
 		path: "/app/pencabutan-sanksi",
 		icon: "icon-notebook",
 		translate: "sidebar.nav.PENCABUTAN_SANKSI",
 	},
+	{
+		name: "Pemantauan Perbaikan",
+		path: "/app/pemantauan-perbaikan",
+		icon: "icon-notebook",
+		translate: "sidebar.nav.PEMANTAUAN_PERBAIKAN",
+	},
 ];
 
 export default Menu;
-``;

components/Main/Timeline.js

@@ -25,6 +25,8 @@ function Timeline({ data }) {
 														<img className="mr-3 rounded-circle thumb48" src={`/static/img${data.role === "PT" ? "/univ-avatar.png" : "/logo-single.png"}`} alt="Avatar" />
 														<p className="m-0">
 															<strong>{data.role_name}</strong>
+															{/* <br />
+															{data.laporan_id} */}
 															<br />
 															{data.description}
 															<br />

components/PT/Keberatan/ModalPermohonan.js

@@ -2,7 +2,6 @@ import React, { Component } from "react";
 import Router from "next/router";
 import { Row, Col, FormGroup, Button, Modal, ModalHeader, ModalBody, ModalFooter } from "reactstrap";
 import { addKeberatan } from "@/actions/keberatan";
-import { addDocPerbaikan } from "@/actions/docPerbaikan";
 import { connect } from "react-redux";
 
 let Dropzone = null;

pages/app/banding/detail.js

@@ -10,7 +10,7 @@ import Riwayat from "@/components/Banding/Riwayat";
 import { getSanksi } from "@/actions/sanksi";
 import { addJawabanBanding } from "@/actions/banding";
 import ContentWrapper from "@/components/Layout/ContentWrapper";
-import { Row, Col, Card, CardBody, FormGroup, Button } from "reactstrap";
+import { Row, Col, Card, CardBody, FormGroup, Button, Modal, ModalHeader, ModalBody, ModalFooter } from "reactstrap";
 import { getPT } from "@/actions/PT";
 
 let Dropzone = null;
@@ -33,6 +33,7 @@ class JawabanBanding extends Component {
 	constructor(props) {
 		super(props);
 		this.state = {
+			modal: false,
 			selectedOption: null,
 			files: [],
 			sanksi: {},
@@ -51,6 +52,12 @@ class JawabanBanding extends Component {
 		this.setState({ pt, sanksi });
 	};
 
+	toggleModal = () => {
+		this.setState({
+			modal: !this.state.modal,
+		});
+	};
+
 	handleChangeSelect = (selectedOption) => {
 		this.setState({ selectedOption });
 	};
@@ -178,7 +185,7 @@ class JawabanBanding extends Component {
 												</FormGroup>
 												<FormGroup>
 													<div className="row-xl-10">
-														<Button color="primary" onClick={this.handelSimpan} type="submit">
+														<Button color="primary" onClick={sanksi.data && sanksi.data.length && sanksi.data[0].sanksi.banding.jawaban ? this.toggleModal : this.handelSimpan}>
 															Simpan
 														</Button>
 													</div>
@@ -195,6 +202,17 @@ class JawabanBanding extends Component {
 						<Col>{sanksi.data && sanksi.data.length && <Riwayat data={sanksi.data[0].sanksi.banding.jawaban} />}</Col>
 					</Row>
 				</div>
+				<Modal isOpen={this.state.modal} toggle={this.toggleModal}>
+					<ModalBody>Apakah anda yakin ingin mengubah jawaban sebelumnya?</ModalBody>
+					<ModalFooter>
+						<Button color="primary" onClick={this.handelSimpan}>
+							Ya
+						</Button>{" "}
+						<Button color="secondary" onClick={this.toggleModal}>
+							Tidak
+						</Button>
+					</ModalFooter>
+				</Modal>
 			</ContentWrapper>
 		);
 	}

pages/app/keberatan/detail.js

@@ -10,7 +10,7 @@ import Riwayat from "@/components/Keberatan/Riwayat";
 import { getSanksi } from "@/actions/sanksi";
 import { addJawabanKeberatan } from "@/actions/keberatan";
 import ContentWrapper from "@/components/Layout/ContentWrapper";
-import { Row, Col, Card, CardBody, FormGroup, Input, Button } from "reactstrap";
+import { Row, Col, Card, CardBody, FormGroup, Input, Button, Modal, ModalHeader, ModalBody, ModalFooter } from "reactstrap";
 import { getPT } from "@/actions/PT";
 
 let Dropzone = null;
@@ -33,6 +33,7 @@ class DetailKeberatan extends Component {
 	constructor(props) {
 		super(props);
 		this.state = {
+			modal: false,
 			selectedOption: null,
 			files: [],
 			keterangan: "",
@@ -52,6 +53,12 @@ class DetailKeberatan extends Component {
 		this.setState({ pt, sanksi });
 	};
 
+	toggleModal = () => {
+		this.setState({
+			modal: !this.state.modal,
+		});
+	};
+
 	handleChangeSelect = (selectedOption) => {
 		this.setState({ selectedOption });
 	};
@@ -97,14 +104,15 @@ class DetailKeberatan extends Component {
 			this.state.files.forEach((e) => {
 				formdata.append("files", e);
 			});
+			const added = await addJawabanKeberatan({ noSanksi, ptId }, formdata);
+			if (added) {
+				Router.push({
+					pathname: "/app/keberatan",
+				});
+			}
 		}
 
-		const added = await addJawabanKeberatan({ noSanksi, ptId }, formdata);
-		if (added) {
-			Router.push({
-				pathname: "/app/keberatan",
-			});
-		}
+		
 	};
 
 	render() {
@@ -192,7 +200,7 @@ class DetailKeberatan extends Component {
 												</FormGroup>
 												{/* <FormGroup>
 													<div className="row-xl-10"> */}
-												<Button color="primary" onClick={this.handelSimpan} type="submit">
+												<Button color="primary" onClick={sanksi.data && sanksi.data.length && sanksi.data[0].sanksi.keberatan.jawaban ? this.toggleModal : this.handelSimpan}>
 													Simpan
 												</Button>
 												{/* </div>
@@ -209,6 +217,17 @@ class DetailKeberatan extends Component {
 						<Col>{sanksi.data && sanksi.data.length && <Riwayat data={sanksi.data[0].sanksi.keberatan.jawaban} />}</Col>
 					</Row>
 				</div>
+				<Modal isOpen={this.state.modal} toggle={this.toggleModal}>
+					<ModalBody>Apakah anda yakin ingin mengubah jawaban sebelumnya?</ModalBody>
+					<ModalFooter>
+						<Button color="primary" onClick={this.handelSimpan}>
+							Ya
+						</Button>{" "}
+						<Button color="secondary" onClick={this.toggleModal}>
+							Tidak
+						</Button>
+					</ModalFooter>
+				</Modal>
 			</ContentWrapper>
 		);
 	}

pages/app/pencabutan-sanksi/detail.js

@@ -10,7 +10,7 @@ import Riwayat from "@/components/PencabutanSanksi/Riwayat";
 import { getSanksi } from "@/actions/sanksi";
 import { addJawabanCabutSanksi } from "@/actions/cabutSanksi";
 import ContentWrapper from "@/components/Layout/ContentWrapper";
-import { Row, Col, Card, CardBody, FormGroup, Button, Input } from "reactstrap";
+import { Row, Col, Card, CardBody, FormGroup, Button, Input, Modal, ModalHeader, ModalBody, ModalFooter } from "reactstrap";
 import { getPT } from "@/actions/PT";
 
 let Dropzone = null;
@@ -52,6 +52,12 @@ class JawabanPencabutanSanksi extends Component {
 		this.setState({ pt, sanksi });
 	};
 
+	toggleModal = () => {
+		this.setState({
+			modal: !this.state.modal,
+		});
+	};
+
 	handleChangeSelect = (selectedOption) => {
 		this.setState({ selectedOption });
 	};
@@ -101,14 +107,13 @@ class JawabanPencabutanSanksi extends Component {
 			this.state.files.forEach((e) => {
 				formdata.append("files", e);
 			});
-		}
-
-		const added = await addJawabanCabutSanksi({ noSanksi, ptId }, formdata);
-		// console.log(added);
-		if (added) {
-			Router.push({
-				pathname: "/app/pencabutan-sanksi",
-			});
+			const added = await addJawabanCabutSanksi({ noSanksi, ptId }, formdata);
+			// console.log(added);
+			if (added) {
+				Router.push({
+					pathname: "/app/pencabutan-sanksi",
+				});
+			}
 		}
 	};
 
@@ -196,7 +201,7 @@ class JawabanPencabutanSanksi extends Component {
 												</FormGroup>
 												<FormGroup>
 													<div className="row-xl-10">
-														<Button color="primary" onClick={this.handleSimpan} type="submit">
+														<Button color="primary" onClick={sanksi.data && sanksi.data.length && sanksi.data[0].sanksi.cabut_sanksi.jawaban ? this.toggleModal : this.handelSimpan}>
 															Simpan
 														</Button>
 													</div>
@@ -213,6 +218,17 @@ class JawabanPencabutanSanksi extends Component {
 						<Col>{sanksi.data && <Riwayat data={sanksi.data[0]} />}</Col>
 					</Row>
 				</div>
+				<Modal isOpen={this.state.modal} toggle={this.toggleModal}>
+					<ModalBody>Apakah anda yakin ingin mengubah jawaban sebelumnya?</ModalBody>
+					<ModalFooter>
+						<Button color="primary" onClick={this.handelSimpan}>
+							Ya
+						</Button>{" "}
+						<Button color="secondary" onClick={this.toggleModal}>
+							Tidak
+						</Button>
+					</ModalFooter>
+				</Modal>
 			</ContentWrapper>
 		);
 	}