andi 2 年 前
コミット
8a4c8dc72e

+ 1 - 1
components/Layout/Footer.js

@@ -7,7 +7,7 @@ class Footer extends Component {
         return (
             <footer className="footer-container">
                 <span>Sidali Dikti &copy; {year}</span>
-                <span className=' float-right'>Version 2.2 ~ 1.96</span>
+                <span className=' float-right'>Version 2.13 ~ 2.12</span>
             </footer>
         );
     }

+ 11 - 0
components/NaikSanksi/TableLaporan.js

@@ -15,6 +15,7 @@ function TableLaporan({ listData, to, linkName, status = false, noBy = false })
 							<thead>
 								<tr>
 									<th>No.Laporan</th>
+									<th>No.Sanksi</th>
 									<th>Deskripsi Laporan</th>
 									{<th>TMT Berlaku</th>}
 									{/* {!noBy && <th>Dibuat Oleh</th>} */}
@@ -37,6 +38,16 @@ function TableLaporan({ listData, to, linkName, status = false, noBy = false })
 													</div>
 												</div>
 											</td>
+											<td>
+												{/* <td>{data.no_laporan}</td> */}
+												<div className="media align-items-center">
+													<div className="media-body d-flex">
+														<div>
+															<h4>{data.no_sanksi}</h4>
+														</div>
+													</div>
+												</div>
+											</td>
 
 											<td>
 												<div className="table-desc">

+ 96 - 3
components/PT/Sanksi/TableSanksi.js

@@ -2,7 +2,7 @@ import moment from "moment";
 import { Button, Table } from "reactstrap";
 import Link from "next/link";
 
-function TableSanksi({ listData, to, linkName, toKeberatan }) {
+function TableSanksi({ listData, to, linkName, toKeberatan, toJwbBanding, toJwbKeberatan, toPerbaikan, toJwbBanding2, toCabutSanksi, toJwbCabutSanksi }) {
 	return (
 		<div className="card b">
 			<div className="card-body card-over">
@@ -44,7 +44,7 @@ function TableSanksi({ listData, to, linkName, toKeberatan }) {
 									</td>
 									{/* <td>{moment(data.createdAt).format("DD MMMM YYYY")}</td> */}
 									<td>{data.is_pengajuan_keberatan === true || data.is_pengajuan_keberatan === false ? <div className="badge badge-green">{data.last_step}</div> : <div className="badge badge-red">Belum Diperiksa</div>}</td>
-									<td>{data.pengajuan?.keberatan ?
+									{/* <td>{data.pengajuan?.keberatan ?
 										<Link href={{ pathname: toKeberatan, query: { id: data._id } }}>
 											<Button className="btn-login" color >
 												<span className="font-color-white">
@@ -59,10 +59,103 @@ function TableSanksi({ listData, to, linkName, toKeberatan }) {
 												</span>
 											</Button>
 										</Link>
-
 									}
+									</td> */}
+									<td>
+										{data.last_step === "Permohonan Keberatan" && (
+
+											<Link href={{ pathname: toKeberatan, query: { id: data._id } }}>
+												<Button className="btn-login" color >
+													<span className="font-color-white">
+														{linkName}
+													</span>
+												</Button>
+											</Link>
+
+										)}
+										{data.last_step === "Jawaban Atas Permohonan Keberatan" && (
+
+											<Link href={{ pathname: toJwbKeberatan, query: { id: data._id } }}>
+												<Button className="btn-login" color >
+													<span className="font-color-white">
+														{linkName}
+													</span>
+												</Button>
+											</Link>
+
+										)}
+										{data.last_step === "Jawaban Atas Permohonan Banding" && (
+
+											<Link href={{ pathname: toJwbBanding, query: { id: data._id } }}>
+												<Button className="btn-login" color >
+													<span className="font-color-white">
+														{linkName}
+													</span>
+												</Button>
+											</Link>
+
+										)}
+										{data.last_step === "Permohonan Banding" && (
+
+											<Link href={{ pathname: toJwbBanding2, query: { id: data._id } }}>
+												<Button className="btn-login" color >
+													<span className="font-color-white">
+														{linkName}
+													</span>
+												</Button>
+											</Link>
+
+										)}
+										{data.last_step === "Permohonan Pencabutan Sanksi" && (
 
+											<Link href={{ pathname: toCabutSanksi, query: { id: data._id } }}>
+												<Button className="btn-login" color >
+													<span className="font-color-white">
+														{linkName}
+													</span>
+												</Button>
+											</Link>
+
+										)}
+										{data.last_step === "Jawaban Atas Permohonan Pencabutan Sanksi" && (
+
+											<Link href={{ pathname: toJwbCabutSanksi, query: { id: data._id } }}>
+												<Button className="btn-login" color >
+													<span className="font-color-white">
+														{linkName}
+													</span>
+												</Button>
+											</Link>
+
+										)}
+
+
+										{data.last_step === "Dokumen Perbaikan" && (
+
+											<Link href={{ pathname: toPerbaikan, query: { id: data._id } }}>
+												<Button className="btn-login" color >
+													<span className="font-color-white">
+														{linkName}
+													</span>
+												</Button>
+											</Link>
+
+										)}
+										{data.last_step ? (
+
+											""
+
+										) : (
+											<Link href={{ pathname: to, query: { id: data._id } }}>
+												<Button className="btn-login" color >
+													<span className="font-color-white">
+														{linkName}
+													</span>
+												</Button>
+											</Link>
+										)}
 									</td>
+
 								</tr>
 							);
 						})}

+ 11 - 0
components/PerpanjanganSanksi/TableLaporan.js

@@ -15,6 +15,7 @@ function TableLaporan({ listData, to, linkName, status = false, noBy = false })
 							<thead>
 								<tr>
 									<th>No.Laporan</th>
+									<th>No.Sanksi</th>
 									<th>Deskripsi Laporan</th>
 									{<th>TMT Berlaku</th>}
 									<th>Aksi</th>
@@ -35,6 +36,16 @@ function TableLaporan({ listData, to, linkName, status = false, noBy = false })
 													</div>
 												</div>
 											</td>
+											<td>
+												{/* <td>{data.no_laporan}</td> */}
+												<div className="media align-items-center">
+													<div className="media-body d-flex">
+														<div>
+															<h4>{data.no_sanksi}</h4>
+														</div>
+													</div>
+												</div>
+											</td>
 
 											<td>
 												<div className="table-desc">

+ 11 - 0
components/TurunSanksi/TableLaporan.js

@@ -15,6 +15,7 @@ function TableLaporan({ listData, to, linkName, status = false, noBy = false })
 							<thead>
 								<tr>
 									<th>No.Laporan</th>
+									<th>No.Sanksi</th>
 									<th>Deskripsi Laporan</th>
 									{<th>TMT Berlaku</th>}
 									{/* {!noBy && <th>Dibuat Oleh</th>} */}
@@ -37,6 +38,16 @@ function TableLaporan({ listData, to, linkName, status = false, noBy = false })
 													</div>
 												</div>
 											</td>
+											<td>
+												{/* <td>{data.no_laporan}</td> */}
+												<div className="media align-items-center">
+													<div className="media-body d-flex">
+														<div>
+															<h4>{data.no_sanksi}</h4>
+														</div>
+													</div>
+												</div>
+											</td>
 
 											<td>
 												<div className="table-desc">

+ 1 - 1
pages/app/index.js

@@ -112,7 +112,7 @@ class App extends Component {
               </Col>
             </Row>
           </Jumbotron>
-          <span>Version 2.2 ~ 1.96</span>
+          <span>Version 2.13 ~ 2.12</span>
         </ContentWrapper>
       </div>
     );

+ 2 - 1
pages/app/keberatan/detail.js

@@ -457,7 +457,8 @@ class DetailKeberatan extends Component {
 																</div>
 															</FormGroup>
 															<FormGroup>
-																<label className="row-form-label">Akhir Permohonan Banding :</label>
+																<label className="row-form-label">Akhir Permohonan Banding : </label>
+																<p>Note : 21 hari kerja</p>
 																<div className="row-md-10">
 																	<Field name="tanggal_akhir_banding">
 																		{({ field, form }) => (

+ 1 - 1
pages/pt/sanksi/index.js

@@ -28,7 +28,7 @@ class Sanksi extends Component {
 						Sanksi
 					</span></div>
 				<Row>
-					<Col lg={12}>{sanksi.data?.length ? <TableSanksi listData={sanksi.data} to="/pt/sanksi/detail" toKeberatan="/pt/keberatan/detail" linkName="Detail" /> : sanksi.data ? "Tidak ada Sanksi" : <Loader />}</Col>
+					<Col lg={12}>{sanksi.data?.length ? <TableSanksi listData={sanksi.data} to="/pt/sanksi/detail" toKeberatan="/pt/keberatan/detail" toPerbaikan="/pt/dokumen-perbaikan/detail" toJwbKeberatan="/pt/jawaban-keberatan/detail" toJwbBanding="/pt/jawaban-banding/detail" toJwbBanding2="/pt/jawaban-banding/detail" toCabutSanksi="/pt/pencabutan-sanksi/detail" toJwbCabutSanksi="/pt/jawaban-pencabutan-sanksi/detail" linkName="Detail" /> : sanksi.data ? "Tidak ada Sanksi" : <Loader />}</Col>
 				</Row>
 			</ContentWrapper>
 		);