yazid138 há 3 anos atrás
pai
commit
6fbb85f660

+ 2 - 3
pages/app/pemeriksaan/index.js

@@ -5,6 +5,7 @@ import { getPelaporan } from "@/actions/pelaporan";
 import CaseProgress from "@/components/Main/CaseProgress";
 import TableLaporan from "@/components/Main/TableLaporan";
 import { connect } from "react-redux";
+import Loader from "@/components/Common/Loader";
 
 class Pemeriksaan extends Component {
 	constructor(props) {
@@ -31,9 +32,7 @@ class Pemeriksaan extends Component {
 					<Col lg="4">
 						<CaseProgress />
 					</Col>
-					<Col lg="8">
-						<TableLaporan noBy listData={pelaporan?.data} to="/app/pemeriksaan/new" linkName="Evaluasi" status />
-					</Col>
+					<Col lg="8">{pelaporan?.data ? <TableLaporan noBy listData={pelaporan.data} to="/app/pemeriksaan/new" linkName="Evaluasi" status /> : <Loader />}</Col>
 				</Row>
 			</ContentWrapper>
 		);

+ 30 - 21
pages/app/pemeriksaan/new.js

@@ -8,6 +8,7 @@ import TableRiwayat from "@/components/Pemeriksaan/TableRiwayat";
 import { getPelaporan } from "@/actions/pelaporan";
 import Link from "next/link";
 import { Row, Col, Card, CardBody, CardHeader, CardTitle } from "reactstrap";
+import Loader from "@/components/Common/Loader";
 
 class PemeriksaanNew extends Component {
 	constructor(props) {
@@ -43,29 +44,37 @@ class PemeriksaanNew extends Component {
 					</div>
 					<Row>
 						<Col xl="9">
-							<Card className="card-default">
-								<CardBody>
-									<Row>
-										<Col lg={12}>
-											{pelaporan.data && pelaporan.data.length && <DetailLaporan data={pelaporan.data[0]} />}
-											<InputEvaluasi query={query} />
-										</Col>
-									</Row>
-								</CardBody>
-							</Card>
-						</Col>
-						<Col xl="3">{pelaporan.data && pelaporan.data.length && <DetailPT data={pelaporan.data[0].pt} />}</Col>
-					</Row>
-					<Row>
-						<Col>
-							<Card className="card-default">
-								<CardHeader>
-									<CardTitle>Riwayat Evaluasi</CardTitle>
-								</CardHeader>
-								<CardBody>{pelaporan.data && pelaporan.data.length && <TableRiwayat data={pelaporan.data[0]} />}</CardBody>
-							</Card>
+							{pelaporan.data && pelaporan.data.length ? (
+								<Card className="card-default">
+									<CardBody>
+										<Row>
+											<Col lg={12}>
+												<DetailLaporan data={pelaporan.data[0]} />
+												<InputEvaluasi query={query} />
+											</Col>
+										</Row>
+									</CardBody>
+								</Card>
+							) : (
+								<Loader />
+							)}
 						</Col>
+						<Col xl="3">{pelaporan.data && pelaporan.data.length ? <DetailPT data={pelaporan.data[0].pt} /> : <Loader />}</Col>
 					</Row>
+					{pelaporan.data && pelaporan.data.length && (
+						<Row>
+							<Col>
+								<Card className="card-default">
+									<CardHeader>
+										<CardTitle>Riwayat Evaluasi</CardTitle>
+									</CardHeader>
+									<CardBody>
+										<TableRiwayat data={pelaporan.data[0]} />
+									</CardBody>
+								</Card>
+							</Col>
+						</Row>
+					)}
 				</div>
 			</ContentWrapper>
 		);

+ 2 - 3
pages/app/sanksi/index.js

@@ -5,6 +5,7 @@ import { getPelaporan } from "@/actions/pelaporan";
 import CaseProgress from "@/components/Main/CaseProgress";
 import TableLaporan from "@/components/Sanksi/TableLaporan";
 import { connect } from "react-redux";
+import Loader from "@/components/Common/Loader";
 
 class Sanksi extends Component {
 	constructor(props) {
@@ -31,9 +32,7 @@ class Sanksi extends Component {
 					<Col lg="4">
 						<CaseProgress />
 					</Col>
-					<Col lg="8">
-						<TableLaporan listData={pelaporan?.data} />
-					</Col>
+					<Col lg="8">{pelaporan?.data ? <TableLaporan listData={pelaporan.data} /> : <Loader />}</Col>
 				</Row>
 			</ContentWrapper>
 		);

+ 10 - 3
pages/app/sanksi/proses.js

@@ -14,6 +14,7 @@ import { getPelaporan } from "@/actions/pelaporan";
 import { createSanksi } from "@/actions/sanksi";
 import { getPelanggaranId } from "@/actions/pelanggaran";
 import { connect } from "react-redux";
+import Loader from "@/components/Common/Loader";
 
 const stepNavitemStyle = {
 	backgroundColor: "#fcfcfc",
@@ -161,7 +162,7 @@ class ProsesSanksi extends Component {
 										<TabPane tabId="1">
 											<div className="pt-3 mb-3">
 												<h2>Detail Laporan</h2>
-												{pelaporan?.data && <DetailLaporan noTitle data={pelaporan.data[0]} />}
+												{pelaporan?.data ? <DetailLaporan noTitle data={pelaporan.data[0]} /> : <Loader />}
 											</div>
 											<hr />
 											<div className="d-flex">
@@ -174,7 +175,13 @@ class ProsesSanksi extends Component {
 											<div className="pt-3 mb-3">
 												<h2>Hasil Evaluasi</h2>
 												<Card className="card-default">
-													<CardBody>{pelaporan?.data && <TableRiwayat data={pelaporan.data[0]} />}</CardBody>
+													{pelaporan?.data ? (
+														<CardBody>
+															<TableRiwayat data={pelaporan.data[0]} />
+														</CardBody>
+													) : (
+														<Loader />
+													)}
 												</Card>
 											</div>
 											<hr />
@@ -220,7 +227,7 @@ class ProsesSanksi extends Component {
 										<TabPane tabId="5">
 											<div className="pt-3 mb-3">
 												<h2>Ringkasan</h2>
-												{pelaporan?.data && <Ringkasan dataLaporan={pelaporan.data[0]} dataPelanggaran={dataPelanggaran.data} dataUpload={dataUpload} />}
+												{pelaporan?.data ? <Ringkasan dataLaporan={pelaporan.data[0]} dataPelanggaran={dataPelanggaran.data} dataUpload={dataUpload} /> : <Loader />}
 											</div>
 											<hr />
 											<div className="d-flex">