andi 1 ay önce
ebeveyn
işleme
73eb374685

+ 4 - 29
pages/app/naik-sanksi/detail.js

@@ -10,8 +10,6 @@ import { connect } from "react-redux";
 import TableRiwayat from "@/components/NaikSanksi/TableRiwayat"
 import InputTanggal from "../../../components/NaikSanksi/InputTanggal";
 import { getPelanggaran, getPelanggaranSanksi } from "@/actions/pelanggaran";
-import { getAllCatatan } from "../../../actions/catatan";
-import TableRiwayatCatatan from "../../../components/Main/TableRiwayatCatatan";
 
 
 
@@ -36,15 +34,14 @@ class Detail extends Component {
 		const { query, token } = this.props;
 		const idSanksi = query.id;
 		const sanksi = await getOneSanksi(token, idSanksi, { all: true });
-		const Catatan = await getAllCatatan(token, idSanksi, "Naik Sanksi")
 		const { data: listSanksi } = await getPelanggaranSanksi(token)
 		const pt = sanksi.data.laporan.pt;
-		this.setState({ sanksi, pt, listSanksi, Catatan });
+		this.setState({ sanksi, pt, listSanksi });
 
 	};
 
 	render() {
-		const { files, sanksi, pt, listSanksi,Catatan } = this.state;
+		const { files, sanksi, pt, listSanksi } = this.state;
 		const { query, token } = this.props;
 		return (
 			<ContentWrapper unwrap>
@@ -69,39 +66,17 @@ class Detail extends Component {
 
 							<Col xl="9">
 								<DetailSanksi data={sanksi.data} role={this.props.user.role.id} />
-							
-							
-							</Col>
-							<Col lg="3">{pt ? <DetailPT data={pt} /> : <Loader />}</Col>
-						</Row>
-					)}
-						{sanksi.data && (
-						<Row>
-							<Col>
 								<InputTanggal query={query} token={token} data={sanksi.data} listSanksi={this.state.listSanksi} />
-							</Col>
-						</Row>
-					)}
-						{sanksi.data && (
-						<Row>
-							<Col>
 								<Card className="card-default">
 									<CardHeader>
 										<CardTitle>Riwayat</CardTitle>
 									</CardHeader>
 									<CardBody>
-										<TableRiwayat data={sanksi.data.riwayat_sanksi} perbaikan={sanksi.data.perbaikan} role={this.props.user.role.id} />
+										<TableRiwayat data={sanksi.data.riwayat_sanksi} perbaikan={sanksi.data.perbaikan} role={this.props.user.role.id}  />
 									</CardBody>
 								</Card>
 							</Col>
-						</Row>
-
-					)}
-									{Catatan?.data && (
-						<Row>
-							<Col>
-								<TableRiwayatCatatan query={this.props.query} role={this.props.user.role.id} newFilePage="/app/naik-sanksi/new_catatan" editFilePage="/app/naik-sanksi/edit_catatan" readOnly="/app/naik-sanksi/readOnly_catatan" listData={Catatan.data} />
-							</Col>
+							<Col lg="3">{pt ? <DetailPT data={pt} /> : <Loader />}</Col>
 						</Row>
 					)}
 				</div>

+ 2 - 14
pages/app/pencabutan-sanksi/detail.js

@@ -20,9 +20,6 @@ import * as Yup from "yup";
 import { getCsrf } from "../../../actions/security";
 import Swal from "sweetalert2";
 import RiwayatPerbaikan from "../../../components/PencabutanSanksi/RiwayatPerbaikan";
-import { getAllCatatan } from "../../../actions/catatan";
-import TableRiwayatCatatan from "../../../components/Main/TableRiwayatCatatan";
-
 
 const checkIfFilesAreTooBig = (files) => {
 	let valid = true;
@@ -87,11 +84,9 @@ class JawabanPencabutanSanksi extends Component {
 
 	componentDidMount = async () => {
 		const { query, token } = this.props;
-		const idSanksi = query.id;
 		const sanksi = await getOneSanksi(token, query.id);
-		const Catatan = await getAllCatatan(token, idSanksi,"Pencabutan Sanksi")
 		const pt = sanksi.data?.laporan?.pt;
-		this.setState({ sanksi, pt,Catatan });
+		this.setState({ sanksi, pt });
 	};
 
 	toggleModal = () => {
@@ -177,7 +172,7 @@ class JawabanPencabutanSanksi extends Component {
 	};
 
 	render() {
-		const { files, selectedOption, sanksi, pt,Catatan } = this.state;
+		const { files, selectedOption, sanksi, pt } = this.state;
 
 		const removeFile = file => () => {
 			const newFiles = [...files]
@@ -414,13 +409,6 @@ class JawabanPencabutanSanksi extends Component {
 								<Riwayat data={sanksi.data.riwayat_jawaban_cabut_sanksi} role={this.props.user.role.id} />
 							</Col>
 						</Row>
-					)}
-						{Catatan?.data && (
-						<Row>
-							<Col>
-								<TableRiwayatCatatan query={this.props.query} role={this.props.user.role.id} newFilePage="/app/pencabutan-sanksi/new_catatan" editFilePage="/app/pencabutan-sanksi/edit_catatan" readOnly="/app/pencabutan-sanksi/readOnly_catatan" listData={Catatan.data} />
-							</Col>
-						</Row>
 					)}
 					{sanksi.data && (
 						<Row>

+ 6 - 18
pages/app/perpanjangan-sanksi/detail.js

@@ -9,9 +9,6 @@ import Loader from "@/components/Common/Loader";
 import { connect } from "react-redux";
 import InputTanggal from "../../../components/PerpanjanganSanksi/InputTanggal";
 import Riwayat from "@/components/PerpanjanganSanksi/Riwayat";
-import TableRiwayatCatatan from "../../../components/Main/TableRiwayatCatatan.js";
-import Newfile from "./newfile.js";
-import { getAllCatatan } from "../../../actions/catatan";
 
 
 
@@ -34,16 +31,14 @@ class Detail extends Component {
 		const { query, token } = this.props;
 		const idSanksi = query.id;
 		const sanksi = await getOneSanksi(token, idSanksi, { all: true });
-		const Catatan = await getAllCatatan(token, idSanksi,"Perpanjangan Sanksi")
 		const pt = sanksi.data.laporan.pt;
-		this.setState({ sanksi, pt, Catatan });
-		console.log(Catatan)
+		this.setState({ sanksi, pt });
 
 	};
 
 
 	render() {
-		const { files, sanksi, pt, Catatan } = this.state;
+		const { files, sanksi, pt } = this.state;
 		const { query, token } = this.props;
 		return (
 			<ContentWrapper unwrap>
@@ -72,27 +67,20 @@ class Detail extends Component {
 							<Col lg="3">{pt ? <DetailPT data={pt} /> : <Loader />}</Col>
 						</Row>
 					)}
-					{sanksi.data && (
-						<Row>
-							<Col>
-								<InputTanggal query={query} token={token} data={sanksi.data} />
-							</Col>
-						</Row>
-					)}
-					{Catatan?.data && (
+							{sanksi.data && (
 						<Row>
 							<Col>
-								<TableRiwayatCatatan query={this.props.query} role={this.props.user.role.id} newFilePage="/app/perpanjangan-sanksi/new_catatan" editFilePage="/app/perpanjangan-sanksi/edit_catatan" readOnly="/app/perpanjangan-sanksi/readOnly_catatan" listData={Catatan.data} />
+							<InputTanggal query={query} token={token} data={sanksi.data} />
 							</Col>
 						</Row>
-					)}
+						)}
 					{sanksi.data && (
 						<Row>
 							<Col>
 								<Riwayat data={sanksi.data?.riwayat_perpanjangan_sanksi} role={this.props.user.role.id} />
 							</Col>
 						</Row>
-					)}
+						)}
 				</div>
 			</ContentWrapper>
 		);

+ 1 - 1
pages/app/perpanjangan-sanksi/edit_catatan.js

@@ -23,7 +23,7 @@ import { ENV } from '../../../env.js';
 import CopyToClipboard from "react-copy-to-clipboard";
 import ReactToPrint from "react-to-print";
 import ComponentToPrint from "../../../components/Main/presensi_print.js";
-import htmlToPdfmake from "html-to-pdfmake"
+// import htmlToPdfmake from "html-to-pdfmake"
 // import htmlToDraft from 'html-to-draftjs';
 import SummerNote from "../../../components/Extras/summernote";
 import Datetime from "react-datetime";

+ 0 - 476
pages/app/perpanjangan-sanksi/readOnly_catatan.js

@@ -1,476 +0,0 @@
-import React, { Component } from "react";
-import Router from "next/router";
-import { connect } from "react-redux";
-import ContentWrapper from "@/components/Layout/ContentWrapper";
-import { Row, Col, Card, CardHeader, CardBody, Button, FormGroup, Popover, PopoverHeader } from "reactstrap";
-// import { Editor } from 'react-draft-wysiwyg';
-import 'react-draft-wysiwyg/dist/react-draft-wysiwyg.css';
-import { EditorState, ContentState, convertFromHTML, convertToRaw, convertFromRaw } from 'draft-js';
-// import 'draft-js/dist/Draft.css';
-import dynamic from 'next/dynamic';
-const Editor = dynamic(
-    () => import('react-draft-wysiwyg').then(mod => mod.Editor),
-    { ssr: false })
-import draftToHtml from 'draftjs-to-html';
-import pdfMake from "pdfmake/build/pdfmake";
-import StateToPdfMake from "draft-js-export-pdfmake";
-import pdfFonts from "pdfmake/build/vfs_fonts";
-import { toast } from "react-toastify";
-import { addCatatan, getOneCatatan, updateCatatan } from "../../../actions/catatan";
-import { getCsrf } from "../../../actions/security";
-pdfMake.vfs = pdfFonts.pdfMake.vfs;
-import { ENV } from '../../../env.js';
-import CopyToClipboard from "react-copy-to-clipboard";
-import ReactToPrint from "react-to-print";
-import ComponentToPrint from "../../../components/Main/presensi_print.js";
-import htmlToPdfmake from "html-to-pdfmake"
-// import htmlToDraft from 'html-to-draftjs';
-import SummerNote from "../../../components/Extras/summernote";
-import Datetime from "react-datetime";
-
-import ContentEditable from 'react-contenteditable'
-import { getOneSanksi } from "@/actions/sanksi";
-import router from "next/router";
-
-
-
-class EditFile extends Component {
-    constructor(props) {
-        super(props);
-        this.state = {
-            tanggal: "",
-            setTanggal: false,
-            isEditTanggal: false,
-            isEditTempat: false,
-            simpulan: " &nbsp;",
-            rekomendasi: " &nbsp;",
-            isi: [
-                {
-                    Aspek_Perbaikan: "",
-                    Laporan_Perbaikan: "",
-                    Hasil_Verifikasi: "",
-                },
-            ],
-        };
-    }
-
-    static getInitialProps = async ({ query }) => {
-        return { query };
-
-    };
-
-
-    componentDidMount = async () => {
-        const { token, query } = this.props;
-        const { id } = query;
-        const getCatatan = await getOneCatatan(token, id)
-        // const sanksi = await getOneSanksi(token, idSanksi, { all: true });
-        const pt = getCatatan.data?.isi.pt;
-        const catatan = getCatatan.data
-        const judul = getCatatan.data.judul
-        const tempat = catatan.isi.tempat
-        const setTanggal = catatan.isi.setTanggal
-        const isi = catatan.isi.isi
-        const tanggal = catatan.isi.tanggal
-        const isEditTanggal = catatan.isi.isEditTanggal
-        const isEditTempat = catatan.isi.isEditTempat
-        const simpulan = catatan.isi.simpulan
-        const rekomendasi = catatan.isi.rekomendasi
-
-        this.setState({ isi, catatan, judul, pt, tanggal, tempat, isEditTanggal, isEditTempat, simpulan, rekomendasi, setTanggal });
-    }
-
-
-    handelSimpan = async (data) => {
-        if (this.props?.user?.role.id === 2071) {
-            Swal.fire({
-                icon: 'error',
-                title: 'Oops...',
-                html: 'Maaf anda tidak memiliki akses untuk menyelesaikan<p> proses ini.</p>',
-                confirmButtonColor: "#3e3a8e",
-                confirmButtonText: 'Oke'
-            })
-        } else {
-            const getToken = await getCsrf();
-            const _csrf = getToken.token;
-            const { token, query } = this.props;
-            const { id } = query;
-            // const isi = ("editorState", draftToHtml(convertToRaw(this.state.editorState.getCurrentContent())))
-            const toastid = toast.loading("Please wait...");
-            const added = await updateCatatan(token, this.state.catatan.sanksi_id, {
-                "judul": this.state.judul,
-                "isi": this.state,
-                "catatan_id": id,
-                "menu": "Perpanjangan Sanksi"
-            }, _csrf);
-            if (!added) {
-                toast.update(toastid, { render: "Error", type: "error", isLoading: false, autoClose: true, closeButton: true });
-            } else {
-                toast.update(toastid, { render: "Success", type: "success", isLoading: false, autoClose: true, closeButton: true });
-                Router.push(`/app/perpanjangan-sanksi/detail?id=${this.state.catatan.sanksi_id}`);
-            }
-        }
-
-    };
-
-    setHandleJudul = (e) => {
-        this.setState({ judul: e.target.value });
-    };
-    CloseCopiedd = () => {
-
-        setTimeout(() => {
-            this.setState({
-                copiedd: !this.state.copiedd
-            });
-        }, 1000);
-    }
-
-    Copiedd = () => this.setState({
-        copiedd: !this.state.copiedd
-    })
-    isEditTanggal = () => {
-        // this.state.isEditTanggal = !this.state.isEditTanggal
-        this.setState({
-            isEditTanggal: !this.state.isEditTanggal,
-        })
-    }
-
-    isEditTempat = () => {
-        this.setState({
-            isEditTempat: !this.state.isEditTempat,
-        })
-    }
-    handleAspek = (evt, id, field) => {
-        const newValue = evt.target.value || evt.target.innerHTML;
-
-        this.setState(prevState => ({
-            isi: prevState.isi.map((item, index) =>
-                index === id
-                    ? { ...item, [field]: newValue }
-                    : item
-            )
-        }));
-
-    };
-    addRow = () => {
-        this.setState(prevState => ({
-            isi: [
-                ...prevState.isi,
-                {
-                    Aspek_Perbaikan: "",
-                    Laporan_Perbaikan: "",
-                    Hasil_Verifikasi: ""
-                }
-            ]
-        }));
-    };
-    setDataCatatan = (data) => {
-        this.setState({ dataCatatan: data });
-    }
-
-    render() {
-        const { catatan, pt, isEditTanggal, tanggal } = this.state;
-        return (
-            <ContentWrapper>
-                <Row>
-                    <Col lg={12}>
-                        <Card body className="card-default">
-                            <FormGroup row>
-                                <label className="col-md-1  col-form-label">Judul Catatan</label>
-                                <div className="col-md-8">
-
-                                    <input type="text" name="article-title" placeholder="Judul Catatan" className="mb-3 form-control form-control-lg" value={this.state.judul} disabled={true} />
-                                </div>
-                                <div className="col-md-3">
-                                    {/* <span className=" d-inline-flex">
-                                        <Button className="btn-login mr-2" color onClick={this.handleGeneratePDF}>
-                                            <span className="font-color-white">
-                                                Print Notulensi
-                                            </span>
-                                        </Button>
-                                    </span> */}
-                                    <span className=" d-inline-flex">
-                                        <ReactToPrint
-                                            trigger={() => {
-                                                return <span className="btn-radius">
-                                                    <Button color className="ml-0 btn-v1-outline-purple">Print Dokumen
-                                                    </Button>
-                                                </span>
-                                            }}
-                                            content={() => this.componentRef}
-                                        />
-                                    </span>
-                                </div>
-                            </FormGroup>
-                            <div style={{ display: "none" }}>
-                                <ComponentToPrint ref={el => (this.componentRef = el)} query={this.props.query} />
-                            </div>
-                            <div className='page  py-5 m-0 mb-3'>
-                                <div className='BA-Header'>
-                                    <img className='BA-logo' src="/static/img/logo-single-1-login.png" alt="logo" />
-                                    <h4 >LAPORAN HASIL VERIFIKASI DAN VALIDASI DOKUMEN USUL PENCABUTAN SANKSI ADMINISTRATIF</h4>
-                                    {pt && (<h4 className='text-uppercase' >{pt.nama}</h4>)}
-                                </div>
-                                <div className='BA-body px-5 pt-3 '>
-                                    <p>
-                                        Pada hari ini
-                                        <span style={{ textIndent: "0rem" }}>
-                                            {isEditTanggal &&
-                                                <span style={{ textIndent: "0rem" }}>
-                                                    <Datetime
-                                                        timeFormat={false}
-                                                        inputProps={{ className: "form-control" }}
-                                                        value={tanggal ? new Date(tanggal) : tanggal || "Isi Tanggal"}
-                                                        onChange={(tanggal) => {
-                                                            this.setState({ tanggal, setTanggal: true })
-                                                        }}
-                                                        closeOnSelect={true}
-
-                                                    />
-
-                                                </span>
-                                            }
-                                        </span>
-                                        {this.state?.setTanggal === true ?
-                                            <span > {moment(tanggal || this.state?.tanggal).locale("id").format("dddd")}, tanggal&nbsp;{moment(tanggal || this.state?.tanggal).format("D")}&nbsp;bulan&nbsp;{moment(tanggal || this.state?.tanggal).locale("id").format("MMMM")} tahun &nbsp;{moment(tanggal || this.state?.tanggal).format("YYYY")},</span> :
-                                            <span ><strong>&nbsp;[Mohon Diisi] &nbsp;</strong></span>
-                                        }
-                                        &nbsp;bertempat di
-                                        {this.state.isEditTempat &&
-                                            <span>
-                                                <input type='text'
-                                                    defaultValue={""}
-                                                    ref="inputTempat"
-                                                    onChange={() => {
-                                                        this.setState({ tempat: this.refs.inputTempat.value })
-                                                    }}
-                                                />
-
-                                            </span>
-                                        }
-                                        {this.state?.tempat ?
-                                            <span className='hhh'>
-                                                &nbsp;{this.state?.tempat}
-                                            </span>
-                                            :
-                                            <span ><strong>&nbsp;[Mohon Diisi] &nbsp;</strong></span>
-                                        }
-
-                                        ,
-                                        telah dilakukan rapat Verifikasi dan Validasi Dokumen Usul Pencabutan Sanksi Administratif {pt && (<span>{pt.nama}</span>)}, yang dihadiri oleh:
-                                        <ol>
-                                            {catatan?.daftar_kehadiran_peserta?.map((value) =>
-                                                <li>
-                                                    {value.nama}
-                                                    {/* <button className="bg-transparent button-transparent border-0 fas fa-trash text-danger float-right"
-                                            onClick={() => {
-                                                this.setState({
-                                                    selectedPeserta: value._id
-                                                })
-                                                this.setModalRemovePeserta()
-                                            }} /> */}
-                                                </li>)}
-                                        </ol>
-                                    </p>
-                                    <div className='table-a my-4 pl-5 pr-5' >
-                                        <table className=' ml-auto mr-auto'>
-                                            <thead >
-                                                <tr>
-                                                    <th >NO</th>
-                                                    <th>ASPEK PERBAIKAN</th>
-                                                    <th >LAPORAN PERBAIKAN</th>
-                                                    <th >HASIL VERIFIKASI DAN VALIDASI</th>
-                                                </tr>
-                                            </thead>
-                                            <tbody>
-                                                {this.state.isi?.map((isi, index) => (
-                                                    <tr key={index}>
-                                                        <td>{index + 1}</td>
-
-                                                        <td style={{ width: "30%" }}>
-                                                            <ContentEditable
-                                                                html={isi.Aspek_Perbaikan}
-                                                                onChange={(evt) => { this.handleAspek(evt, index, "Aspek_Perbaikan") }}
-                                                                disabled={true}
-
-                                                            />
-                                                        </td>
-
-                                                        <td style={{ width: "30%" }}>
-                                                            <ContentEditable
-                                                                html={isi.Laporan_Perbaikan}
-                                                                onChange={(evt) => { this.handleAspek(evt, index, "Laporan_Perbaikan") }}
-                                                                disabled={true}
-
-
-                                                            />
-                                                        </td>
-
-                                                        <td style={{ width: "40%" }}>
-                                                            <ContentEditable
-                                                                html={isi.Hasil_Verifikasi}
-                                                                onChange={(evt) => { this.handleAspek(evt, index, "Hasil_Verifikasi") }}
-                                                                disabled={true}
-
-
-                                                            />
-                                                        </td>
-                                                    </tr>
-                                                ))}
-                                            </tbody>
-                                        </table>
-                                    </div>
-                                    <div className='table-b my-4 pl-4 pr-5' >
-                                        <tr>
-                                            <td style={{ width: "8%" }}>Simpulan&nbsp;:</td>
-                                            <td >
-                                                <ContentEditable
-                                                    html={this.state.simpulan}
-                                                    disabled={true}
-                                                    onChange={(e) => {
-                                                        this.setState({ simpulan: e.target.value });
-                                                    }}
-                                                    tagName="text"
-
-                                                />
-                                            </td>
-                                        </tr>
-                                    </div>
-                                    <div className='table-b my-4 pl-4 pr-5' >
-                                        <tr>
-                                            <td style={{ width: "8%" }}>Rekomendasi&nbsp;:</td>
-                                            <td >
-                                                <ContentEditable
-                                                    html={this.state.rekomendasi}
-                                                    disabled={true}
-                                                    onChange={(e) => {
-                                                        this.setState({ rekomendasi: e.target.value });
-                                                    }}
-                                                    tagName="text"
-
-                                                />
-                                            </td>
-                                        </tr>
-                                    </div>
-
-                                    <Row>
-                                        <Col xl={{ size: 8, offset: 2 }}>
-                                            <div className="mt-5"  >
-                                                <div className='header-ttd signature-border pt-1 pb-1'>
-                                                    <text className='header-ttd font-weight-bold '>PESERTA RAPAT</text>
-                                                </div>
-                                                <div id="ttd">
-                                                    {catatan
-                                                        ? catatan.daftar_kehadiran_peserta?.map((value) => (
-                                                            <div className='ttd-div'>
-                                                                <div className='sign-ttd'>
-                                                                    <img
-                                                                        className='sign-ttd'
-                                                                        src={value.ttd.path} />
-                                                                </div>
-                                                                <div className='sign-nama'>
-                                                                    <text>
-                                                                        {value.nama}
-                                                                    </text>
-                                                                </div>
-                                                            </div>
-                                                        )) : ""}
-                                                </div>
-                                            </div>
-                                        </Col>
-                                    </Row>
-                                </div>
-                            </div>
-
-
-
-                            <Row>
-                                <Col>
-                                    {ENV === "local" &&
-                                        <CopyToClipboard
-                                            text={`http://localhost:3000/signature/letter/${catatan?._id}`}
-                                            options={{ asHtml: true }}
-                                        >
-                                            <div>
-                                                <span className="btn-radius">
-                                                    <Button color id="Popover1" className="ml-0  mb-2 btn-v1-outline-purple" onClick={() => {
-                                                        this.CloseCopiedd()
-                                                    }} ><span><em className="fas fa-project-diagram float-left mt-1 mr-1" />&nbsp;Link Dokumen Berita Acara</span>
-
-                                                        {/* <h5 className="p-0 mt-3 float-right"> <em className="fas fa-project-diagram float-left mt-1" /> &nbsp;Link Dokumen Berita Acara</h5> */}
-                                                    </Button>
-                                                </span>
-                                                <Popover placement="bottom" isOpen={this.state.copiedd} target="Popover1" toggle={this.Copiedd}>
-                                                    <PopoverHeader>Link Berhasil Disalin</PopoverHeader>
-                                                </Popover>
-                                            </div>
-
-                                        </CopyToClipboard>
-                                    }
-                                    {ENV === "production" &&
-                                        <CopyToClipboard
-                                            text={`https://sidali.kemdikbud.go.id/signature/letter/${catatan?._id}`}
-                                            options={{ asHtml: true }}
-                                        >
-                                            <div>
-                                                <span className="btn-radius">
-                                                    <Button color id="Popover1" className="ml-0 mt-2 mb-2 btn-v1-outline-purple" onClick={() => {
-                                                        this.CloseCopiedd()
-                                                    }} ><span><em className="fas fa-project-diagram float-left mt-1 mr-1" />&nbsp;Link Dokumen Berita Acara</span>
-
-                                                        {/* <h5 className="p-0 mt-3 float-right"> <em className="fas fa-project-diagram float-left mt-1" /> &nbsp;Link Dokumen Berita Acara</h5> */}
-                                                    </Button>
-                                                </span>
-                                                <Popover placement="bottom" isOpen={this.state.copiedd} target="Popover1" toggle={this.Copiedd}>
-                                                    <PopoverHeader>Link Berhasil Disalin</PopoverHeader>
-                                                </Popover>
-                                            </div>
-
-                                        </CopyToClipboard>
-                                    }
-                                    {ENV === "development" &&
-                                        <CopyToClipboard
-                                            text={`https://dev.sidali.kemdikbud.go.id/signature/letter/${catatan?._id}`}
-                                            options={{ asHtml: true }}
-                                        >
-                                            <div>
-                                                <span className="btn-radius">
-                                                    <Button color id="Popover1" className="ml-0 mt-2 mb-2 btn-v1-outline-purple" onClick={() => {
-                                                        this.CloseCopiedd()
-                                                    }} ><span><em className="fas fa-project-diagram float-left mt-1 mr-1" />&nbsp;Link Dokumen Berita Acara</span>
-
-                                                        {/* <h5 className="p-0 mt-3 float-right"> <em className="fas fa-project-diagram float-left mt-1" /> &nbsp;Link Dokumen Berita Acara</h5> */}
-                                                    </Button>
-                                                </span>
-                                                <Popover placement="bottom" isOpen={this.state.copiedd} target="Popover1" toggle={this.Copiedd}>
-                                                    <PopoverHeader>Link Berhasil Disalin</PopoverHeader>
-                                                </Popover>
-                                            </div>
-
-                                        </CopyToClipboard>
-                                    }
-
-                                </Col>
-                                <Col>
-                                    <div>
-                                        <Button color className="btn-login float-right" onClick={() => {
-                                            Router.push(`/app/perpanjangan-sanksi/detail?id=${this.state.catatan.sanksi_id}`);
-                                        }} >
-                                            <span className="font-color-white">
-                                                Kembali                                            </span>
-                                        </Button>
-                                    </div>
-
-                                </Col>
-                            </Row>
-
-                        </Card>
-                    </Col>
-
-                </Row>
-            </ContentWrapper>
-        );
-    }
-}
-const mapStateToProps = (state) => ({ user: state.user, token: state.token });
-export default connect(mapStateToProps)(EditFile);

+ 2 - 9
pages/app/riwayat/index.js

@@ -5,8 +5,6 @@ import { connect } from "react-redux";
 import TableRiwayat from "@/components/Riwayat/TableRiwayat";
 import ChartData from "@/components/Riwayat/ChartData";
 import { getLog2 } from "@/actions/log";
-import ChartLineDisk from "../../../components/Riwayat/ChartLineDisk";
-import ChartDonutDisk from "../../../components/Riwayat/ChartDonutDisk";
 
 
 
@@ -24,7 +22,7 @@ class Riwayat extends Component {
 
         const data = await getLog2(this.props.token)
         const dataRiwayat = data.data
-        this.setState({ dataRiwayat })
+        this.setState({ dataRiwayat })  
     }
     setDateFilter = (data) => {
         this.setState({ dataFilter: data })
@@ -35,6 +33,7 @@ class Riwayat extends Component {
             const date1 = moment(this.state.dataFilter.fromDate).format("YYYY-MM-DD")
             const date2 = moment(this.state.dataFilter.toDate).format("YYYY-MM-DD")
             const data = await getLog2(this.props.token, { fromDate: date1, toDate: date2 })
+            // const dataRiwayat = data.data
 
             this.setState({ dataRiwayat });
         }
@@ -48,12 +47,6 @@ class Riwayat extends Component {
                     <span className="font-color-white">Riwayat</span>
                 </div>
                 <Row>
-                    <Col lg="8">
-                        <ChartLineDisk />
-                    </Col>
-                    <Col lg="4">
-                        <ChartDonutDisk />
-                    </Col>
                     <ChartData />
                     <Col lg="12">
                         <TableRiwayat />

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

@@ -457,7 +457,6 @@ class ProsesSanksi extends Component {
 
 	render() {
 		const { dataUpload, dataPelanggaran, pelaporan, dataSuratBA, thisclose, daftarPeserta } = this.state
-		console.log(dataUpload)
 		return (
 			<ContentWrapper unwrap>
 				{/* <Header /> */}
@@ -470,7 +469,7 @@ class ProsesSanksi extends Component {
 									<span className="font-color-white">&lt; Kembali</span>
 								</Button>
 							</Link>
-						</div>6
+						</div>
 					</div>
 					<Card className="card-default">
 						<CardBody>

+ 5 - 28
pages/app/turun-sanksi/detail.js

@@ -10,8 +10,6 @@ import { connect } from "react-redux";
 import TableRiwayat from "@/components/TurunSanksi/TableRiwayat"
 import InputTanggal from "../../../components/TurunSanksi/InputTanggal";
 import { getPelanggaran, getPelanggaranSanksi } from "@/actions/pelanggaran";
-import { getAllCatatan } from "../../../actions/catatan";
-import TableRiwayatCatatan from "../../../components/Main/TableRiwayatCatatan";
 
 
 
@@ -36,15 +34,14 @@ class Detail extends Component {
 		const idSanksi = query.id;
 		const sanksi = await getOneSanksi(token, idSanksi, { all: true });
 		const { data: listSanksi } = await getPelanggaranSanksi(token, { down: true })
-		const Catatan = await getAllCatatan(token, idSanksi, "Turun Sanksi")
 		const pt = sanksi.data.laporan.pt;
-		this.setState({ sanksi, pt, listSanksi, Catatan });
+		this.setState({ sanksi, pt, listSanksi });
 
 	};
 
 
 	render() {
-		const { files, sanksi, pt, listSanksi, Catatan } = this.state;
+		const { files, sanksi, pt, listSanksi } = this.state;
 		const { query, token } = this.props;
 		return (
 			<ContentWrapper unwrap>
@@ -68,38 +65,18 @@ class Detail extends Component {
 						<Row>
 
 							<Col xl="9">
-								<DetailSanksi data={sanksi.data} role={this.props.user.role.id} />
-							</Col>
-							<Col lg="3">{pt ? <DetailPT data={pt} /> : <Loader />}</Col>
-						</Row>
-					)}
-					{sanksi.data && (
-						<Row>
-							<Col>
+								<DetailSanksi data={sanksi.data} role={this.props.user.role.id}/>
 								<InputTanggal query={query} token={token} data={sanksi.data} listSanksi={this.state.listSanksi} />
-							</Col>
-						</Row>
-					)}
-					{sanksi.data && (
-						<Row>
-							<Col>
 								<Card className="card-default">
 									<CardHeader>
 										<CardTitle>Riwayat</CardTitle>
 									</CardHeader>
 									<CardBody>
-										<TableRiwayat data={sanksi.data.riwayat_sanksi} perbaikan={sanksi.data.perbaikan} role={this.props.user.role.id} />
+										<TableRiwayat data={sanksi.data.riwayat_sanksi} perbaikan={sanksi.data.perbaikan}role={this.props.user.role.id} />
 									</CardBody>
 								</Card>
 							</Col>
-						</Row>
-
-					)}
-					{Catatan?.data && (
-						<Row>
-							<Col>
-								<TableRiwayatCatatan query={this.props.query} role={this.props.user.role.id} newFilePage="/app/turun-sanksi/new_catatan" editFilePage="/app/turun-sanksi/edit_catatan" readOnly="/app/turun-sanksi/readOnly_catatan" listData={Catatan.data} />
-							</Col>
+							<Col lg="3">{pt ? <DetailPT data={pt} /> : <Loader />}</Col>
 						</Row>
 					)}
 				</div>