commit deh

components/Main/Timeline.js

@@ -1,7 +1,9 @@
 import moment from "moment";
+import { useSelector } from "react-redux";
 
 function Timeline({ data, noFile = false, noJadwal = false }) {
 	const date = data && [...new Set(data.map((e) => moment(e.createdAt).format("DD MMMM YYYY")))];
+	const user = useSelector((state) => state.user);
 	return (
 		<ul className="timeline-alt">
 			{date.map((value) => (
@@ -43,15 +45,23 @@ function Timeline({ data, noFile = false, noJadwal = false }) {
 														<p className="text-muted m-0">{moment(data.createdAt).format("hh:mm")}</p>
 													</p>
 												</div>
-												{!noJadwal && data.jadwal && (
+												{!data.user.isPublic && user?.role.id !== 2022 && data.jawaban && (
+													<>
+														<p className="text-muted my-2">Jawaban</p>
+														<div className="p-2">
+															<b>{data.jawaban}</b>
+														</div>
+													</>
+												)}
+												{!data.user.isPublic && data.jadwal && (
 													<>
 														<p className="text-muted my-2">Jadwal Pemeriksaan</p>
-														<p>
+														<div className="p-2">
 															Tanggal {moment(data.jadwal.dari_tanggal).format("DD MMMM YYYY")} - {moment(data.jadwal.sampai_tanggal).format("DD MMMM YYYY")}
-														</p>
+														</div>
 													</>
 												)}
-												{!noFile && data.dokumen.length ? (
+												{!data.user.isPublic && data.dokumen?.length ? (
 													<>
 														<p className="text-muted my-2">Dokumen</p>
 														{data.dokumen.map((e) => (

components/PT/JawabanBanding/DetailJawaban.js

@@ -1,9 +1,8 @@
 import { FormGroup, Button } from "reactstrap";
 import Scrollable from "@/components/Common/Scrollable";
 import Link from "next/link";
-import { API_URL } from "@/env";
 
-function DetailJawaban({ data }) {
+function DetailJawaban({ data, sanksiId }) {
 	return (
 		<>
 			<p className="lead bb">Jawaban Permohonan Banding</p>
@@ -46,7 +45,7 @@ function DetailJawaban({ data }) {
 				<Link
 					href={{
 						pathname: "/pt/dokumen-perbaikan/detail",
-						query: { id: data._id },
+						query: { id: sanksiId },
 					}}
 				>
 					<Button color="primary">Perbaiki Dokumen</Button>

components/PT/JawabanBanding/TableSanksiJawaban.js

@@ -26,7 +26,7 @@ function TableSanksi({ listData, to, linkName }) {
 											<div className="media-body d-flex">
 												<div>
 													<h4 className="m-0">{data.laporan.pt.nama}</h4>
-													<p>{data.keterangan.length > 70 ? dataketerangan.substring(0, 70) + "..." : data.keterangan}</p>
+													<p>{data.keterangan.length > 70 ? data.keterangan.substring(0, 70) + "..." : data.keterangan}</p>
 												</div>
 											</div>
 										</div>

components/PT/TableSanksi.js

@@ -25,7 +25,7 @@ function TableSanksi({ listData, to, linkName }) {
 											<div className="media-body d-flex">
 												<div>
 													<h4 className="m-0">{data.laporan.pt.nama}</h4>
-													<p>{data.keterangan.length > 70 ? data.sanksi.description.substring(0, 70) + "..." : data.keterangan}</p>
+													<p>{data.keterangan.length > 70 ? data.keterangan.substring(0, 70) + "..." : data.keterangan}</p>
 												</div>
 											</div>
 										</div>

pages/pt/jawaban-banding/detail.js

@@ -51,7 +51,7 @@ class JawabanBanding extends Component {
 										<Row>
 											<Col lg={12}>
 												<DetailSanksi data={sanksi.data} />
-												<DetailJawaban data={sanksi.data.jawaban.banding} />
+												<DetailJawaban data={sanksi.data.jawaban.banding} sanksiId={sanksi.data._id} />
 											</Col>
 										</Row>
 									</CardBody>