fix issue tanggal" sanksi

apabila tgl pengajuan keberatan/banding sudah di tutup maka langsung ke menu dokumen perbaikan
tanggal penetapan sanksi di ambil dari fromdate TMT

components/Layout/MenuPT.js

@@ -10,7 +10,7 @@ const MenuPT = [
 		translate: "sidebar.nav.PT_PEMANTAUAN",
 	},
 	{
-		name: "Sanksi",
+		name: "Proses Sanksi",
 		path: "/pt/sanksi",
 		icon: "icon-social-steam",
 		translate: "sidebar.nav.PT_PEMANTAUAN",

components/Main/DetailLaporan.js

@@ -112,7 +112,7 @@ function DetailLaporan({ data, noTitle = false, noStatus = false }) {
 					</Col>
 				</FormGroup>
 				<FormGroup row>
-					<Col md="4">Dibuat Pada:</Col>
+					<Col md="4">Tanggal Laporan:</Col>
 					<Col md="8">
 						<strong>{moment(data.createdAt).format("D MMMM YYYY")}</strong>
 					</Col>

components/Main/DetailSanksi.js

@@ -30,11 +30,29 @@ function DetailSanksi({ data, noTitle = false }) {
 					</Col>
 				</FormGroup>
 				<FormGroup row>
-					<Col md="4">Dibuat Pada:</Col>
+					<Col md="4">Tanggal Penetapan Sanksi:</Col>
 					<Col md="8">
-						<strong>{moment(data.createdAt).locale("id").format("D MMMM YYYY")}</strong>
+						<strong>{moment(data.masa_berlaku?.from_date).locale("id").format("D MMMM YYYY")}</strong>
 					</Col>
 				</FormGroup>
+				{
+					data.tanggal_akhir_keberatan &&
+					<FormGroup row>
+						<Col md="4">Tanggal Akhir keberatan:</Col>
+						<Col md="8">
+							<strong>{moment(data.tanggal_akhir_keberatan).locale("id").format("D MMMM YYYY")}</strong>
+						</Col>
+					</FormGroup>
+				}
+				{
+					data.jawaban?.keberatan?.tanggal_akhir_banding &&
+					<FormGroup row>
+						<Col md="4">Tanggal Akhir Banding:</Col>
+						<Col md="8">
+							<strong>{moment(data.jawaban?.keberatan?.tanggal_akhir_banding).locale("id").format("D MMMM YYYY")}</strong>
+						</Col>
+					</FormGroup>
+				}
 				<FormGroup row>
 					<Col md="4">Dokumen Sanksi:</Col>
 					<Col md="8">

components/PT/Sanksi/TableSanksi.js

@@ -61,100 +61,117 @@ function TableSanksi({ listData, to, linkName, toKeberatan, toJwbBanding, toJwbK
 										</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>
+									{new Date(data.tanggal_akhir_keberatan).getTime() + 86400000 > Date.now() ? (
+										<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>
+									) :
+										(
+											<td>
+												<Link href={{ pathname: toPerbaikan, query: { id: data._id } }}>
+													<Button className="btn-login" color  >
+														<span className="font-color-white">
+															{linkName}
+														</span>
+													</Button>
+												</Link>
+											</td>
+
+
+										)
+									}
+
 
 								</tr>
 							);

components/Sanksi/Ringkasan.js

@@ -20,16 +20,17 @@ export class Ringkasan extends Component {
 	}
 	// function Ringkasan({ dataLaporan, dataPelanggaran, dataUpload }) {
 	// 	return (
-		componentDidMount = async () => {
-			const { query, token } = this.props;
-			const { id } = query;
-			const getDataSave = await getAutoSave({ token, id, laporan: true });
-			const saveData = getDataSave.data?.penetapanSanksi;
-			this.setState(saveData)
-		}
+	componentDidMount = async () => {
+		const { query, token } = this.props;
+		const { id } = query;
+		const getDataSave = await getAutoSave({ token, id, laporan: true });
+		const saveData = getDataSave.data?.penetapanSanksi;
+		this.setState(saveData)
+	}
 
 	render() {
 		const { dataLaporan, dataPelanggaran, dataUpload } = this.props
+		console.log(this.props)
 		return (
 			<>
 				<Row>
@@ -69,9 +70,9 @@ export class Ringkasan extends Component {
 								</Col>
 							</FormGroup>
 							<FormGroup row>
-								<Col md="4">Dibuat Pada:</Col>
+								<Col md="4">Tanggal Laporan:</Col>
 								<Col md="8">
-									<strong>{moment(dataLaporan.createAt).format("D MMMM YYYY")}</strong>
+									<strong>{moment(dataLaporan.createdAt).format("D MMMM YYYY")}</strong>
 								</Col>
 							</FormGroup>
 						</form>
@@ -156,21 +157,22 @@ export class Ringkasan extends Component {
 									</Col>
 								</FormGroup>
 							) : (
-								<FormGroup row>
-									<Col md="4">Tanggal Penetapan Sanksi:</Col>
-									<Col md="8">
-										<strong>
-											{dataUpload && dataUpload.awalsanksi ? (
-												<p>
-													{moment(dataUpload.awalsanksi).locale("id").format("DD MMMM YYYY")}
-												</p>
-											) : (
-												""
-											)}
-										</strong>
-									</Col>
-								</FormGroup>
+								""
 							)}
+							<FormGroup row>
+								<Col md="4">Tanggal Penetapan Sanksi:</Col>
+								<Col md="8">
+									<strong>
+										{dataUpload && dataUpload.awalsanksi ? (
+											<p>
+												{moment(dataUpload.awalsanksi).locale("id").format("DD MMMM YYYY")}
+											</p>
+										) : (
+											""
+										)}
+									</strong>
+								</Col>
+							</FormGroup>
 							{dataUpload && !dataUpload.tmtCheck ? (
 								<FormGroup row>
 									<Col md="4">TMT :</Col>
@@ -242,19 +244,19 @@ export class Ringkasan extends Component {
 										</tbody>
 									</table>
 								</Scrollable> */}
-										<ReactToPrint
-											trigger={() => {
-												return <span>
-													<Button color className="btn-labeled-4 mt-0">
-														<h5 className="p-0 mt-2"><em className="fas fa-download mr-2" />Print dan Download</h5>
-													</Button>
-												</span>
-											}}
-											content={() => this.componentRef}
-										/>
-										<div style={{ display: "none" }}>
-											<ComponentToPrint ref={el => (this.componentRef = el)} query={this.props.query} dataPelanggaran={this.props.dataPelanggaran} dataSuratBA={this.props.dataSuratBA} />
-										</div>
+									<ReactToPrint
+										trigger={() => {
+											return <span>
+												<Button color className="btn-labeled-4 mt-0">
+													<h5 className="p-0 mt-2"><em className="fas fa-download mr-2" />Print dan Download</h5>
+												</Button>
+											</span>
+										}}
+										content={() => this.componentRef}
+									/>
+									<div style={{ display: "none" }}>
+										<ComponentToPrint ref={el => (this.componentRef = el)} query={this.props.query} dataPelanggaran={this.props.dataPelanggaran} dataSuratBA={this.props.dataSuratBA} />
+									</div>
 								</Col>
 							</FormGroup>
 							<FormGroup row>

pages/pt/jawaban-keberatan/detail.js

@@ -131,7 +131,7 @@ class JawabanKeberatan extends Component {
 																</p>
 															</>
 														) : (
-															<p>Pengajuan ditutup</p>
+															<p>Pengajuan Banding Sudah Ditutup</p>
 														))}
 
 

pages/pt/keberatan/detail.js

@@ -98,11 +98,11 @@ class Keberatan extends Component {
 										<Row>
 											<Col lg={12}>
 												<DetailSanksi data={sanksi.data} />
-												{new Date(sanksi.data.batas_waktu.keberatan).getTime() > Date.now() ? (
+												{new Date(sanksi.data.tanggal_akhir_keberatan).getTime() + 86400000 > Date.now() ? (
 													<>
 														<p>
 															Setelah membaca surat keputusan sanksi tersebut, jika Perguruan Tinggi bermaksud mengajukan permohonan keberatan maka dapat menekan tombol di bawah ini paling lambat{" "}
-															{moment(sanksi.data.batas_waktu.keberatan).locale("id").format("DD MMMM YYYY")}
+															{moment(sanksi.data.tanggal_akhir_keberatan).locale("id").format("DD MMMM YYYY")}
 														</p>
 														<p className=" lead">
 															<span className="btn-radius">

pages/pt/sanksi/detail.js

@@ -123,7 +123,7 @@ class Sanksi extends Component {
 														</p>
 													</>
 												) : (
-													<p>Pengajuan ditutup</p>
+													<p>Pengajuan Keberatan Sudah Ditutup</p>
 												)}
 											</Col>
 										</Row>