Browse Source

3. revisi di menu bypass:
- By pass : data dari cabut sanksi langsung ke menu pencabutan sanksi tanpa melalui PT mengajukan permohonan sanksi DONE
- By pass : setelah di lakukan cabut sanksi, data pindah ke menu pencabutan sanksi DONE
- By pass : data tidak terlihat di menu by pass setelah di lakukan aksi cabut sanksi DONE

andi 2 năm trước cách đây
mục cha
commit
63eff5d922

+ 3 - 1
actions/sanksi.js

@@ -1,5 +1,6 @@
 import axiosAPI from "../config/axios";
 import axios from "../config/axios";
+import { bypassCabutSanksi } from "./cabutSanksi";
 import { createLog } from "./log";
 
 export const createSanksi = async (token, id, data) => {
@@ -12,7 +13,7 @@ export const getSanksi = async (token, query = {}) => {
 	try {
 		let url = "/sanksi";
 		if (query != {}) {
-			const { keberatan, jawaban, banding, cabutSanksi, perbaikan, aktif, delegasi, turunSanksi, naikSanksi, pengajuan_keberatan, is_pengajuan_keberatan, is_pengajuan_banding } = query;
+			const { keberatan, jawaban, bypassCabutSanksi, banding, cabutSanksi, perbaikan, aktif, delegasi, turunSanksi, naikSanksi, pengajuan_keberatan, is_pengajuan_keberatan, is_pengajuan_banding } = query;
 			url += "?";
 			const parseURL = [];
 			if (keberatan) parseURL.push(`keberatan=true`);
@@ -24,6 +25,7 @@ export const getSanksi = async (token, query = {}) => {
 			if (turunSanksi) parseURL.push(`turunSanksi=true`);
 			if (naikSanksi) parseURL.push(`naikSanksi=true`);
 			if (aktif === false) parseURL.push(`aktif=false`);
+			if (bypassCabutSanksi) parseURL.push(`bypassCabutSanksi=true`)
 			if (is_pengajuan_keberatan) parseURL.push(`pengajuan_keberatan=true`);
 			url += parseURL.join("&");
 		}

+ 1 - 1
components/Bypass/TableBypass.js

@@ -18,7 +18,7 @@ function TableBypass({ listData, to, linkName }) {
             success: "Success",
             error: "Error",
         });
-        Router.push("/app/bypass");
+        Router.push("/app/pencabutan-sanksi");
         // await bypassCabutSanksi(token, id)
     }
     return (

+ 1 - 1
pages/app/bypass/index.js

@@ -15,7 +15,7 @@ class Bypass extends Component {
 
     componentDidMount = async () => {
         const { token } = this.props;
-        const sanksi = await getSanksi(token);
+        const sanksi = await getSanksi(token, { bypassCabutSanksi: true });
         this.setState({ sanksi });
     };
 

+ 4 - 1
pages/app/pencabutan-sanksi/detail.js

@@ -186,7 +186,10 @@ class JawabanPencabutanSanksi extends Component {
 										<Row>
 											<Col lg={12}>
 												<DetailSanksi data={sanksi.data} />
-												<PermohonanPT data={sanksi.data.pengajuan.cabut_sanksi} />
+												{sanksi.data?.pengajuan?.cabut_sanksi &&
+													< PermohonanPT data={sanksi.data?.pengajuan?.cabut_sanksi} />
+												}
+
 												<p className="lead bb">Jawaban</p>
 												<Formik
 													initialValues={{

+ 1 - 1
pages/app/sanksi/proses.js

@@ -100,7 +100,7 @@ class ProsesSanksi extends Component {
 				pathname: "/app/sanksi",
 			});
 		} catch (error) {
-			toast.update(toastid, { render: "All is not good", type: "error", isLoading: false, autoClose: true, closeButton: true });
+			toast.update(toastid, { render: (error.request.message), type: "error", isLoading: false, autoClose: true, closeButton: true });
 		}
 	};