Version fe 2.3 ~ be 2.2

components/Extras/calendar.view.js

@@ -141,7 +141,9 @@ class Calendar extends Component {
 				success: "Success",
 				error: "Error",
 			}
+
 		);
+		Router.push("/app/penjadwalan");
 		const dataLaporan = await getPelaporan(token, { jadwal: true });
 		this.setState({ dataLaporan });
 		this.getDataEvent();
@@ -164,17 +166,22 @@ class Calendar extends Component {
 			if (value.status.value === this.getStatus()[1].value) {
 				data.change_role = "true";
 				update = await updateLaporan(token, id, data);
+				Router.push("/app/penjadwalan");
 			} else if (value.status.value === this.getStatus()[2].value) {
 				data.aktif = "false";
 				update = await updateLaporan(token, id, data);
+				Router.push("/app/penjadwalan");
 			}
 			if (!update) {
 				toast.update(toastid, { render: "Gagal simpan jadwal", type: "error", isLoading: false, autoClose: true, closeButton: true });
+
 			} else {
 				toast.update(toastid, { render: "Input jadwal berhasil", type: "success", isLoading: false, autoClose: true, closeButton: true });
 				Router.push("/app/penjadwalan");
 			}
+			Router.push("/app/penjadwalan");
 		}
+		Router.push("/app/penjadwalan");
 	};
 
 	render() {

components/Layout/Footer.js

@@ -7,7 +7,7 @@ class Footer extends Component {
         return (
             <footer className="footer-container">
                 <span>Sidali Dikti &copy; {year}</span>
-                <span className=' float-right'>Version 2.24 ~ 2.21</span>
+                <span className=' float-right'>Version 2.3 ~ 2.2</span>
             </footer>
         );
     }

components/PT/Sanksi/TableSanksi.js

@@ -10,7 +10,6 @@ function TableSanksi({ listData, to, linkName, toKeberatan, toJwbBanding, toJwbK
 					<thead>
 						<tr>
 							<th>Nomor Sanksi</th>
-							{/* <th>Created</th> */}
 							<th>Status</th>
 						</tr>
 					</thead>
@@ -30,24 +29,38 @@ function TableSanksi({ listData, to, linkName, toKeberatan, toJwbBanding, toJwbK
 										</div>
 									</td>
 									{/* <td>{moment(data.createdAt).format("DD MMMM YYYY")}</td> */}
-									<td>{data.is_pengajuan_keberatan === true || data.is_pengajuan_keberatan === false ? <div className="badge badge-green">{data.last_step}</div> : <div className="badge badge-red">Belum Diperiksa</div>}</td>
-									{/* <td>{data.pengajuan?.keberatan ?
-										<Link href={{ pathname: toKeberatan, query: { id: data._id } }}>
-											<Button className="btn-login" color >
-												<span className="font-color-white">
-													{linkName}
-												</span>
-											</Button>
-										</Link> :
-										<Link href={{ pathname: to, query: { id: data._id } }}>
-											<Button className="btn-login" color >
-												<span className="font-color-white">
-													{linkName}
-												</span>
-											</Button>
-										</Link>
-									}
-									</td> */}
+									<td>{data.is_pengajuan_keberatan === true || data.is_pengajuan_keberatan === false ?
+										<div>
+											<div className="badge badge-green">{data.last_step}</div>
+											{data.last_step === "Permohonan Keberatan" && (
+												<p className="w-105">Sanksi dalam proses pengajuan permohonan keberatan</p>
+											)}
+											{data.last_step === "Jawaban Atas Permohonan Keberatan" && (
+												<p className="w-105">PDDIKTI sudah memberikan jawaban atas permohonan keberatan</p>
+											)}
+											{data.last_step === "Permohonan Banding" && (
+												<p className="w-105">Sanksi dalam proses pengajuan permohonan banding</p>
+											)}
+											{data.last_step === "Jawaban Atas Permohonan Banding" && (
+												<p className="w-105">PDDIKTI sudah memberikan jawaban atas permohonan banding</p>
+											)}
+											{data.last_step === "Permohonan Pencabutan Sanksi" && (
+												<p className="w-105">Sanksi dalam proses permohonan pencabutan sanksi</p>
+											)}
+											{data.last_step === "Jawaban Atas Permohonan Pencabutan Sanksi" && (
+												<p className="w-105">PDDIKTI sudah memberikan jawaban atas permohonan pencabutan sanksi</p>
+											)}
+											{data.last_step === "Dokumen Perbaikan" && (
+												<p className="w-105">Proses perbaikan dokumen</p>
+											)}
+
+										</div>
+										:
+										<div>
+											<div className="badge badge-red">Belum Diperiksa</div>
+											<p className="w-105">Sanksi belum diperiksa</p>
+										</div>}
+									</td>
 									<td>
 										{data.last_step === "Permohonan Keberatan" && (
 

components/PT/TableSanksi.js

@@ -12,7 +12,7 @@ function TableSanksi({ listData, to, linkName }) {
 							<th>Nomor Surat Sanksi</th>
 							{/* <th>Keterangan Sanksi</th> */}
 							{/* <th>Created</th> */}
-							<th>Status</th>
+							<th>dd</th>
 						</tr>
 					</thead>
 					<tbody>

components/Pemeriksaan/InputEvaluasi.js

@@ -147,6 +147,7 @@ class InputEvaluasi extends Component {
 				success: "Success",
 				error: "Error",
 			});
+			Router.push("/app/pemeriksaan");
 		}
 		this.setState({ files: [] });
 		resetForm();

components/Sanksi/BeritaAcara.js

@@ -402,15 +402,6 @@ class BeritaAcara extends Component {
                                             </td>
                                             <td style={{ maxWidth: "80px" }}>
                                                 {`Sanksi Administratif berupa ${dataSuratBA?.sanksi || this.state.sanksi}` || ""}
-                                                {/* <ContentEditable
-                                                    html={`Sanksi Administratif berupa ${dataSuratBA?.sanksi||this.state.sanksi}` || ""}
-                                                    // html={descPelanggaran[e._id]?.rekomendasi || ""}
-
-                                                    disabled={false}
-                                                    // onChange={(evt) => {
-                                                    //     this.updateValueRekomendasi(evt, e._id), this.setDataSuratBA()
-                                                    // }}
-                                                /> */}
                                             </td>
                                         </tr>
                                     ))}

components/Sanksi/Ringkasan.js

@@ -69,7 +69,7 @@ export class Ringkasan extends Component {
 								</Col>
 							</FormGroup>
 							<FormGroup row>
-								<Col md="4">Tanggal Laporan:</Col>
+								<Col md="4">Tanggal Dibuat Laporan::</Col>
 								<Col md="8">
 									<strong>{moment(dataLaporan.createdAt).format("D MMMM YYYY")}</strong>
 								</Col>
@@ -298,7 +298,7 @@ export class Ringkasan extends Component {
 								</Col>
 							</FormGroup>
 							<FormGroup row>
-								<Col md="4">Akhir Permohonan Keberatan Sanksi :</Col>
+								<Col md="4">Tanggal Akhir Pengajuan Keberatan :</Col>
 								<Col md="8">
 									<strong>
 										{dataUpload && dataUpload.tglAkhirKeberatan ? (

components/Sanksi/TablePenetapanSanksi.js

@@ -130,6 +130,17 @@ export class TablePenetapanSanksi extends Component {
 					</Datatable>
 
 					}
+					{/* {this.props.user?.role.id === 2020 ? (
+						labelSanksi.length && labelSanksi.filter((e) => e.labelSanksi === "Ringan" || e.labelSanksi === "Sedang").length === labelSanksi.length ? (
+							<Button className="btn-login float-right" color onClick={this.ondelegasi} >
+								<span className="font-color-white">
+									Delegasi ke LLDIKTI
+								</span>
+							</Button>
+						) : ("")
+					) : ("")
+					} */}
+					<div className="float-right m-2 ">
 						{this.props.user?.role.id === 2020 ? (
 							labelSanksi.length && labelSanksi.filter((e) => e.labelSanksi === "Ringan" || e.labelSanksi === "Sedang").length === labelSanksi.length ? (
 								<Button className="btn-login float-right" color onClick={this.ondelegasi} >
@@ -141,6 +152,9 @@ export class TablePenetapanSanksi extends Component {
 						) : ("")
 						}
 
+					</div>
+		
+
 				</div>
 			</div>
 		);

components/Sanksi/UploadSurat.js

@@ -85,15 +85,6 @@ export class UploadSurat extends Component {
 		// this.setState(autosaveDataUpload)
 	}
 
-	uploadFiles = (e) => {
-		e.preventDefault();
-		e.stopPropagation();
-		this.setState({
-			stat: this.state.files.length ? "Dropzone ready to upload " + this.state.files.length + " file(s)" : "No files added.",
-		});
-		this.props.setUploadSuratSanksi(this.state);
-	};
-
 	clearFiles = (e) => {
 		e.preventDefault();
 		e.stopPropagation();

pages/app/index.js

@@ -120,7 +120,7 @@ class App extends Component {
               </Col>
             </Row>
           </Jumbotron>
-          <span>Version 2.24 ~ 2.21</span>
+          <span>Version 2.3 ~ 2.2</span>
         </ContentWrapper>
       </div>
     );

pages/app/sanksi/proses.js

@@ -172,7 +172,6 @@ class ProsesSanksi extends Component {
 
 	render() {
 		const { dataUpload, dataPelanggaran, pelaporan, dataSuratBA } = this.state
-		console.log(dataUpload)
 		return (
 			<ContentWrapper unwrap>
 				{/* <Header /> */}

pages/laporan/new/index.js

@@ -205,7 +205,7 @@ class App extends Component {
   };
 
   handleInputChange = (newValue) => {
-    const inputValue = newValue.replace(/\W/g, "");
+    const inputValue = newValue.replace();
     this.setState({ inputValue });
     return inputValue;
   };