commirt

actions/docPerbaikan.js

@@ -16,11 +16,11 @@ export const addDocPerbaikan = async (token, id, data, _csrf) => {
 const logSuccessAddDocPerbaikan = async (token, id) => {
 	const getToken = await getCsrf();
 	const _csrf = getToken.token;
-	await createLog(token, { aktivitas: `Berhasil melakukan perbaikan dokumen, id: ${id}`, _csrf: _csrf });
+	await createLog(token, { aktivitas: `Berhasil melakukan perbaikan dokumen, id: ${id}`, menu: "Dokuemen Perbaikan", _csrf: _csrf });
 }
 
 const logErrorAddDocPerbaikan = async (token, id) => {
 	const getToken = await getCsrf();
 	const _csrf = getToken.token;
-	await createLog(token, { aktivitas: `Gagal melakukan perbaikan dokumen, id: ${id}`, _csrf: _csrf });
+	await createLog(token, { aktivitas: `Gagal melakukan perbaikan dokumen, id: ${id}`, menu: "Dokuemen Perbaikan", _csrf: _csrf });
 }

actions/log.js

@@ -3,7 +3,7 @@ import axios2 from "axios";
 
 export const getLog = async (token, laporan_id) => {
 	try {
-		let url = `/pemantauan/${laporan_id}`;
+		let url = `/pemantauan/${laporan_id}?all=true`;
 		const res = await axios.get(url, {
 			headers: {
 				Authorization: token,

actions/penjadwalan.js

@@ -15,6 +15,6 @@ export const updateJadwal = async (token, id, data, _csrf) => {
 const logSuccessUpdateJadwal = async (token, id) => {
 	const getToken = await getCsrf();
 	const _csrf = getToken.token;
-	await createLog(token, { aktivitas: `Berhasil menetapkan jadwal, id: ${id}`, _csrf: _csrf });
+	await createLog(token, { aktivitas: `Berhasil menetapkan jadwal, id: ${id}`, menu: "Penjadwalan", _csrf: _csrf });
 
 }

components/NaikSanksi/TableLaporan.js

@@ -60,19 +60,19 @@ function TableLaporan({ listData, to, linkName, status = false, noBy = false })
 											<td>
 												<h4>{data.no_sanksi}</h4>
 											</td>
-											<td className=" col-md-6">
+											<td className="col-md-6">
 												<div>
 													<h4 className="m-0">{data.laporan.pt.nama.length > 64 ? data.laporan.pt.nama.substring(0, 64) + "..." : data.laporan.pt.nama}</h4>
-													<p className="w-105">{data.laporan.keterangan.length > 100 ? data.laporan.keterangan.substring(0, 100) + "..." : data.laporan.keterangan}</p>
+													<p>{data.laporan.keterangan.length > 100 ? data.laporan.keterangan.substring(0, 100) + "..." : data.laporan.keterangan}</p>
 												</div>
 											</td>
 
-											<td className=" col-md-5">
+											<td className="col-md-5">
 												<div>
 													<h4>
 														Sanksi Administratif : {getLabelSanksi(data.sanksi, "level") === 3 ? "Berat" : getLabelSanksi(data.sanksi, "level") === 2 ? "Sedang" : "Ringan"}
 													</h4>
-													<p className="w-105">{data.keterangan}</p>
+													<p>{data.keterangan.length>100?data.keterangan.substring(0, 100) + "..." : data.keterangan}</p>
 												</div>
 											</td>
 											{!noBy && <td>{data.user.isPrivate ? "" : data.user.nama}</td>}

components/RekomendasiDelegasi/TableLaporan.js

@@ -6,6 +6,23 @@ import 'moment/min/locales';
 moment.locale('id');
 
 function TableLaporan({ listData, to, linkName, status = false, noBy = false }) {
+	const getLabelSanksi = (arrayOfObjects, property) => {
+		if (arrayOfObjects?.length === 0) {
+			return undefined; // Return undefined for empty arrays
+		}
+		// let data = null
+		let maxValue = arrayOfObjects[0][property];
+		for (let i = 1; i < arrayOfObjects.length; i++) {
+			if (arrayOfObjects[i][property] > maxValue) {
+				maxValue = arrayOfObjects[i][property];
+				// data = arrayOfObjects[i]
+			}
+			// else {
+			// 	data = arrayOfObjects[i]
+			// }
+		}
+		return maxValue;
+	}
 	return (
 		<div className="card b ">
 			<div className="card-body card-over">
@@ -50,7 +67,7 @@ function TableLaporan({ listData, to, linkName, status = false, noBy = false })
 												</div>
 											</td>
 
-											<td>
+											<td className=" col-md-6">
 												<div className="table-desc">
 													<div className="media align-items-center">
 														<div className="media-body d-flex">
@@ -64,9 +81,11 @@ function TableLaporan({ listData, to, linkName, status = false, noBy = false })
 											</td>
 
 											{status ? (
-												<td>
+												<td className=" col-md-5">
 													<h4 className="m-0">{data.laporan.role_data === "dikti" ? "Ditindaklanjuti DIKTI" : "Delegasi Ke LLDIKTI"}</h4>
-													{data.pelanggaran.map((e) => (<p className="w-105">Sanksi Administratif:  {e.label_sanksi}</p>))}
+													{/* {data.pelanggaran.map((e) => (<h2 className="w-105">Sanksi Administratif:  {e.label_sanksi}</h2>))} */}
+													Sanksi Administratif : {getLabelSanksi(data.sanksi, "level") === 3 ? "Berat" : getLabelSanksi(data.sanksi, "level") === 2 ? "Sedang" : "Ringan"}
+
 												</td>
 											) : (
 												""

components/Riwayat/TableLaporan.js

@@ -14,6 +14,7 @@ function TableLaporan({ listData, to, linkName, status = false, noBy = false })
                             <thead>
                                 <tr>
                                     <th>No.Laporan</th>
+                                    <th>Tanggal Laporan</th>
                                     <th>Deskripsi Laporan</th>
                                      <th>Status</th>
                                     {/* {!noBy && <th>Dibuat Oleh</th>} */}
@@ -36,13 +37,25 @@ function TableLaporan({ listData, to, linkName, status = false, noBy = false })
                                                 </div>
                                             </td>
 
-                                            <td>
+											<td>
+												{/* <td>{data.no_laporan}</td> */}
+												<div className="media align-items-center">
+													<div className="media-body">
+														<div>
+														<p  style={{ display: "none" }}>{data.createdAt}</p>
+															<h4>{moment(data.createdAt).format("DD-MM-YYYY")}</h4>
+														</div>
+													</div>
+												</div>
+											</td>
+                                            <td className=" col-md-6">
                                                 <div className="table-desc">
                                                     <div className="media align-items-center">
                                                         <div className="media-body d-flex">
                                                             <div>
                                                                 <h4 className="m-0">{data.pt.nama.length > 64 ? data.pt.nama.substring(0, 64) + "..." : data.pt.nama}</h4>
-                                                                <p className="w-105">{data.keterangan}</p>
+                                                                <p className="">{data.keterangan.length>100?data.keterangan.substring(0, 100) + "..." : data.keterangan}</p>
+
                                                             </div>
                                                         </div>
                                                     </div>

components/Riwayat/TableRiwayat.js

@@ -1,10 +1,13 @@
 import Datatable from "@/components/Tables/Datatable";
-import { Button } from "reactstrap";
 import Link from "next/link";
 import moment from "moment";
 import React, { Component } from "react";
 import { getLog2 } from "@/actions/log";
 import { connect } from "react-redux";
+import { Row, Col, Input, FormGroup, Label, Progress, Button } from "reactstrap";
+
+
+import Datetime from "react-datetime";
 
 class TableRiwayat extends Component {
     constructor(props) {
@@ -22,11 +25,32 @@ class TableRiwayat extends Component {
     render() {
         return (
             <div className="card b ">
-                <div style={{ height: 500 }} className="card-body card-over">
+
+                <div className="card-body card-over">
+                    <span className=" ml-2 float-left">
+                        <label className="col-form-label">Range Filter : </label>
+
+                        <span className=" mr-2 ml-4">
+                            <Datetime
+                                timeFormat={false}
+                                inputProps={{ className: "form-control" }}
+                                value={"Default"}
+                            />
+                        </span>
+                        <span>
+                            <Datetime
+                                timeFormat={false}
+                                inputProps={{ className: "form-control" }}
+                                value={"Default"}
+                            />
+                        </span>
+                        <Button color= "info" className=" mt-4">Filter</Button>
+
+                    </span>
                     {this.state.dataRiwayat && (
                         <Datatable options={{
-                            responsive: false, ordering: false, keys: false, lengthChange: false, searching: false, aLengthMenu: [500], paging: false, scrollX: true, scrollY: "370px",
-                            bordered: true
+                            responsive: false, ordering: false, keys: false, lengthChange: false, searching: true, aLengthMenu: [500], paging: true, scrollX: true, scrollY: "370px",
+                            bordered: true, "pageLength": 100
                         }}>
                             <table className="table w-100" data-order='[[3, "desc"]]'>
                                 <thead>
@@ -51,7 +75,7 @@ class TableRiwayat extends Component {
                                                     </div>
                                                 </div>
                                             </td>
-                                            <td style={{ minWidth: 130 }}>
+                                            <td >
                                                 <div className="media align-items-center">
                                                     <div className="media-body d-flex">
                                                         <div>
@@ -60,7 +84,7 @@ class TableRiwayat extends Component {
                                                     </div>
                                                 </div>
                                             </td>
-                                            <td style={{ minWidth: 120 }}>
+                                            <td>
                                                 <div className="media align-items-center">
                                                     <div className="media-body d-flex">
                                                         <div>
@@ -69,7 +93,7 @@ class TableRiwayat extends Component {
                                                     </div>
                                                 </div>
                                             </td>
-                                            <td style={{ minWidth: 150 }}>
+                                            <td >
                                                 <div className="media align-items-center">
                                                     <div className="media-body d-flex">
                                                         <div>

components/TurunSanksi/TableLaporan.js

@@ -69,7 +69,7 @@ function TableLaporan({ listData, to, linkName, status = false, noBy = false })
 											<td className=" col-md-6">
 												<div>
 													<h4 className="m-0">{data.laporan.pt.nama.length > 64 ? data.laporan.pt.nama.substring(0, 64) + "..." : data.laporan.pt.nama}</h4>
-													<p className="w-105">{data.laporan.keterangan.length > 100 ? data.laporan.keterangan.substring(0, 100) + "..." : data.laporan.keterangan}</p>
+													<p>{data.laporan.keterangan.length > 100 ? data.laporan.keterangan.substring(0, 100) + "..." : data.laporan.keterangan}</p>
 												</div>
 											</td>
 
@@ -78,7 +78,7 @@ function TableLaporan({ listData, to, linkName, status = false, noBy = false })
 													<h4>
 														Sanksi Administratif : {getLabelSanksi(data.sanksi, "level") === 3 ? "Berat" : getLabelSanksi(data.sanksi, "level") === 2 ? "Sedang" : "Ringan"}
 													</h4>
-													<p className="w-105">{data.keterangan}</p>
+													<p>{data.keterangan.length>100?data.keterangan.substring(0, 100) + "..." : data.keterangan}</p>
 												</div>
 											</td>
 											{!noBy && <td>{data.user.isPrivate ? "" : data.user.nama}</td>}