commit bug

components/Extras/calendar.view.js

@@ -311,7 +311,7 @@ class Calendar extends Component {
 																				{({ field, form }) => (
 																					<Datetime
 																						timeFormat={false}
-																						locale="en-gb"
+																						locale="id"
 																						inputProps={{ className: "form-control" }}
 																						value={field.value}
 																						closeOnSelect={true}
@@ -331,7 +331,7 @@ class Calendar extends Component {
 																				{({ field, form }) => (
 																					<Datetime
 																						timeFormat={false}
-																						locale="en-gb"
+																						locale="id"
 																						inputProps={{ className: "form-control" }}
 																						value={field.value}
 																						closeOnSelect={true}

components/PT/Keberatan/ModalPermohonan.js

@@ -170,7 +170,7 @@ export class ModalPermohonan extends Component {
 						<Form className="form-horizontal">
 							<ModalBody>
 								<FormGroup>
-									<label>Dalam hal mengajukan permohonan banding maka wajib mengunggah surat permohonan banding & dokumen pendukungnya</label>
+									<label>Dalam hal mengajukan permohonan keberatan maka wajib mengunggah surat permohonan keberatan & dokumen pendukungnya</label>
 									<div>
 										<Field name="dokumen">
 											{({ field, form, meta }) => (

components/RekomendasiDelegasi/TableLaporan.js

@@ -15,6 +15,7 @@ function TableLaporan({ listData, to, linkName, status = false, noBy = false })
 							<thead>
 								<tr>
 									<th>No.Laporan</th>
+									<th>No.Sanksi</th>
 									<th>Deskripsi Laporan</th>
 									{status && <th>Status</th>}
 									{!noBy && <th>Dibuat Oleh</th>}
@@ -37,6 +38,16 @@ function TableLaporan({ listData, to, linkName, status = false, noBy = false })
 													</div>
 												</div>
 											</td>
+											<td>
+												{/* <td>{data.no_laporan}</td> */}
+												<div className="media align-items-center">
+													<div className="media-body d-flex">
+														<div>
+															<h4>{data.no_sanksi}</h4>
+														</div>
+													</div>
+												</div>
+											</td>
 
 											<td>
 												<div className="table-desc">

components/Riwayat/TableRiwayatt.js

@@ -47,7 +47,7 @@ class TableRiwayatt extends Component {
                                                 <div className="media align-items-center">
                                                     <div className="media-body d-flex">
                                                         <div>
-                                                            <p>{value.createdAt && (moment(value.createdAt).format("DD-MM-YYYY, hh:mm a"))}</p>
+                                                            <p>{value.createdAt && (moment(value.createdAt).format("DD-MM-YYYY, HH:mm"))}</p>
                                                         </div>
                                                     </div>
                                                 </div>

components/Sanksi/BeritaAcara_A.js

@@ -1,6 +1,6 @@
 import React, { useRef, Component } from 'react';
 import { useReactToPrint } from "react-to-print";
-import { Row, Col, Button } from "reactstrap";
+import { Row, Col, Button, Card, CardBody } from "reactstrap";
 import Head from 'next/head'
 import SignatureCanvas from 'react-signature-canvas'
 import ComponentToPrint from "./SuratBA";
@@ -17,6 +17,9 @@ class BeritaAcara extends Component {
     static getInitialProps = async ({ query }) => {
         return { query };
     };
+    content = () => {
+        <ComponentToPrint />
+    }
 
     render() {
         return (
@@ -38,6 +41,11 @@ class BeritaAcara extends Component {
                 {/* <div style={{ display: "none" }}> */}
                 <ComponentToPrint ref={el => (this.componentRef = el)} query={this.props.query} dataPelanggaran={this.props.dataPelanggaran} />
                 {/* </div> */}
+                {/* <Card>
+                    <CardBody>
+                        jajajaj
+                    </CardBody>
+                </Card> */}
             </div >
 
         );

pages/app/sanksi/proses.js

@@ -31,6 +31,7 @@ class ProsesSanksi extends Component {
 		this.state = {
 			activeStep: "1",
 			dataUpload: null,
+			dataSuratBA: null,
 			dataPelanggaran: {},
 			pelaporan: {},
 			listSanksi: [],
@@ -124,9 +125,13 @@ class ProsesSanksi extends Component {
 	setUploadSuratSanksi = (data) => {
 		this.setState({ dataUpload: data });
 	};
+	setDataSuratBA = (data) => {
+		this.setState({ dataSuratBA: data });
+	};
 
 	render() {
-		const { dataUpload, dataPelanggaran, pelaporan } = this.state;
+		const { dataUpload, dataPelanggaran, pelaporan, dataSuratBA } = this.state;
+		console.log(dataSuratBA)
 		return (
 			<ContentWrapper unwrap>
 				{/* <Header /> */}
@@ -268,7 +273,7 @@ class ProsesSanksi extends Component {
 										</TabPane>
 										<TabPane tabId="4">
 											<Card>
-												<BeritaAcara query={this.props.query} dataPelanggaran={dataPelanggaran.data} />
+												<BeritaAcara query={this.props.query} dataPelanggaran={dataPelanggaran.data} setDataSuratBA={this.setDataSuratBA} />
 											</Card>
 											<div className="d-flex">
 												<Button color className="btn-login color-3e3a8e" onClick={this.toggleStep("3")}>

pages/pt/jawaban-banding/detail.js

@@ -63,7 +63,7 @@ class JawabanBanding extends Component {
 											</Row>)
 											: (
 												<Col lg={12}>
-													<h3 className=" font-weight-bold">Menunggu Jawaban Permohonan Banding</h3>
+													<h3 className=" font-weight-bold">Menunggu Jawaban Atas Permohonan Banding</h3>
 													<div className=" tengah"><img className=" tengah" src="/static/img/Wait-Jawaban.png" alt="gambar" /></div>
 												</Col>
 											)}

pages/pt/jawaban-keberatan/detail.js

@@ -8,7 +8,7 @@ import DetailJawaban from "@/components/PT/JawabanKeberatan/DetailJawaban";
 import ModalPermohonan from "@/components/PT/JawabanKeberatan/ModalPermohonan";
 import Riwayat from "@/components/PT/JawabanKeberatan/Riwayat";
 import Link from "next/link";
-import { Row, Col, Card, CardBody, Button } from "reactstrap";
+import { Row, Col, Card, CardBody, Button, Modal, ModalBody, ModalFooter } from "reactstrap";
 import { connect } from "react-redux";
 import { withRouter } from "next/router";
 import Loader from "@/components/Common/Loader";
@@ -22,6 +22,7 @@ class JawabanKeberatan extends Component {
 			modal: false,
 			sanksi: {},
 			pt: null,
+			modalTidak: false,
 		};
 	}
 
@@ -43,11 +44,39 @@ class JawabanKeberatan extends Component {
 	toPerbaikan = () => {
 		Router.push("/pt/dokumen-perbaikan");
 	}
+	setModalTidak = (modalTidak) => {
+		this.setState({
+			modalTidak: !this.state.modalTidak
+		})
+	}
 
 	render() {
 		const { sanksi, pt } = this.state;
 		return (
 			<ContentWrapper unwrap>
+				<Modal isOpen={this.state.modalTidak} >
+					<ModalBody>Apakah anda ingin membatalkan permohonan banding atas pengenaan sanksi?</ModalBody>
+					<ModalFooter>
+
+						<Button color className="btn-login" onClick={async () => {
+							const toastid = toast.loading("Please wait...");
+							try {
+								const { token, query } = this.props;
+								await updatePT(token, query.id, { is_pengajuan_banding: false, is_pengajuan_keberatan: false })
+								toast.update(toastid, { render: "All is good", type: "success", isLoading: false, autoClose: true, closeButton: true });
+								Router.push("/pt/dokumen-perbaikan");
+							} catch (error) {
+								toast.update(toastid, { render: "All is not good", type: "error", isLoading: false, autoClose: true, closeButton: true });
+							}
+						}
+						}>
+							<span className="font-color-white">Ya</span>
+						</Button>
+						<Button color className="btn-v2" onClick={this.setModalTidak}>
+							Tidak
+						</Button>
+					</ModalFooter>
+				</Modal>
 				{sanksi.data && <ModalPermohonan toggleModal={this.toggleModal} modal={this.state.modal} query={this.props.router.query} data={sanksi.data} />}
 				{pt && <Header data={pt} />}
 				<div className="p-3">
@@ -83,7 +112,7 @@ class JawabanKeberatan extends Component {
 																		Setelah membaca surat keputusan sanksi tersebut, Apakah Perguruan Tinggi bermaksud mengajukan permohonan banding?
 																	</strong>
 																</p>
-																<p style={{ fontSize: '0.8vw' }}>
+																<p style={{ fontSize: '0.9vw' }}>
 																	Pengajuan dilakukan paling lambat tanggal {moment(sanksi.data.batas_waktu.banding).locale("id").format("DD MMMM YYYY")}
 																</p>
 																<p className="lead">
@@ -93,19 +122,8 @@ class JawabanKeberatan extends Component {
 																		</Button>
 																	</span>
 																	<span className="btn-radius">
-																		<Button disabled={sanksi.data.pengajuan.banding || false} color className="btn-labeled-3-notHover" onClick={async () => {
-
-																			const toastid = toast.loading("Please wait...");
-																			try {
-																				const { token, query } = this.props;
-																				await updatePT(token, query.id, { is_pengajuan_keberatan: false })
-																				toast.update(toastid, { render: "All is good", type: "success", isLoading: false, autoClose: true, closeButton: true });
-																				Router.push("/pt/dokumen-perbaikan");
-																			} catch (error) {
-																				toast.update(toastid, { render: "All is not good", type: "error", isLoading: false, autoClose: true, closeButton: true });
-																			}
-																		}
-																		}>
+																		<Button disabled={sanksi.data.pengajuan.banding || false} color className="btn-labeled-3-notHover" onClick={this.setModalTidak}
+																		>
 																			<h4 className=" mt-1 mb-md-2 text-center">Tidak</h4>
 																		</Button>
 																	</span>
@@ -118,7 +136,7 @@ class JawabanKeberatan extends Component {
 
 												</Col>) : (
 												<Col lg={12}>
-													<h3 className=" font-weight-bold">Menunggu Jawaban Permohonan Keberatan</h3>
+													<h3 className=" font-weight-bold">Menunggu Jawaban Atas Permohonan Keberatan</h3>
 													<div className=" tengah"><img className=" tengah" src="/static/img/Wait-Jawaban.png" alt="gambar" /></div>
 												</Col>
 											)}

pages/pt/keberatan/detail.js

@@ -102,7 +102,7 @@ class Keberatan extends Component {
 													<>
 														<p>
 															Setelah membaca surat keputusan sanksi tersebut, jika Perguruan Tinggi bermaksud mengajukan permohonan keberatan maka dapat menekan tombol di bawah ini paling lambat{" "}
-															{moment(sanksi.data.batas_waktu.keberatan).format("DD MMMM YYYY")}
+															{moment(sanksi.data.batas_waktu.keberatan).locale("id").format("DD MMMM YYYY")}
 														</p>
 														<p className=" lead">
 															<span className="btn-radius">

pages/pt/sanksi/detail.js

@@ -93,7 +93,7 @@ class Sanksi extends Component {
 																Setelah membaca surat keputusan sanksi tersebut, Apakah Perguruan Tinggi bermaksud mengajukan keberatan?
 															</strong>
 														</p>
-														<p style={{ fontSize: '0.8vw' }}>
+														<p style={{ fontSize: '0.9vw' }}>
 															Pengajuan dilakukan paling lambat tanggal {moment(sanksi.data.batas_waktu.keberatan).locale("id").format("DD MMMM YYYY")}
 														</p>
 														<p className="lead">