commit

actions/pelaporan.js

@@ -6,13 +6,15 @@ export const getPelaporan = async (token, query = {}) => {
 	try {
 		let url = "/laporan";
 		if (query != null) {
-			const { jadwal, evaluasi, pt_id, delegasi, aktif } = query;
+			const { jadwal, evaluasi, pt_id, delegasi, aktif, sanksi } = query;
 			url += "?";
 			const parseURL = [];
 			if (jadwal) {
 				parseURL.push(`jadwal=true`);
 			} else if (evaluasi) {
 				parseURL.push(`evaluasi=true`);
+			} else if (sanksi) {
+				parseURL.push(`sanksi=true`);
 			} else if (delegasi) {
 				parseURL.push(`delegasi=true`);
 			}

components/Extras/calendar.view.js

@@ -256,7 +256,7 @@ class Calendar extends Component {
 															</FormGroup>
 														)}
 														<div className="btn-simpanjadwal">
-															<Button className="text-btn-penjadwalan-1 btn-colorpenjadwalan color-3e3a8e" color block disabled={laporan.data?.evaluasi.length}>
+															<Button className="text-btn-penjadwalan-1 btn-colorpenjadwalan color-3e3a8e" color block disabled={laporan.data?.sanksi}>
 																<h4 className="text-btn-penjadwalan-1 font-color-white">Simpan</h4>
 															</Button>
 														</div>

components/Layout/MenuLLDIKTI.js

@@ -9,12 +9,6 @@ const Menu = [
 		icon: "icon-speedometer",
 		translate: "sidebar.nav.PEMANTAUAN",
 	},
-	{
-		name: "Laporan Delegasi",
-		path: "/app/laporan-delegasi",
-		icon: "icon-notebook",
-		translate: "sidebar.nav.LAPORAN_DELEGASI",
-	},
 	{
 		name: "Pelaporan",
 		path: "/app/pelaporan",
@@ -65,12 +59,6 @@ const Menu = [
 		heading: "Analytics Report",
 		translate: "sidebar.heading.ANALYTICS_REPORT",
 	},
-	{
-		name: "Riwayat",
-		path: "/app/riwayat",
-		icon: "icon-film",
-		translate: "sidebar.nav.PEMANTAUAN_PERBAIKAN",
-	},
 	{
 		name: "Pelaporan Tuntas",
 		path: "/app/tuntas",

components/PelaporanTuntas/CaseProgress.js

@@ -14,12 +14,12 @@ function CaseProgress({ data, nextButton, prevButton, tahun, excel }) {
 			{
 				// "label": "Complete",
 				color: "#287DAD",
-				data: [["Selesai", data.evaluasi.hasEvaluasi]],
+				data: [["Selesai", data.aktif]],
 			},
 			{
 				// "label": "In Progress",
 				color: "#FD4233",
-				data: [["Ditutup", data.evaluasi.notHasEvaluasi]],
+				data: [["Ditutup", data.aktif]],
 			},
 		],
 

components/Penjadwalan/DetailLaporan.js

@@ -64,7 +64,7 @@ export class DetailLaporan extends Component {
 								<td>
 									<strong>Perguruan Tinggi</strong>
 								</td>
-								<td>Universitas Satyagama</td>
+								<td>{data.pt.nama}</td>
 							</tr>
 							<tr>
 								<td>
@@ -96,17 +96,17 @@ export class DetailLaporan extends Component {
 											<tbody>
 												{data.files
 													? data.files.map((e) => (
-															<tr>
-																<td>
-																	<em className="fa-lg far fa-file-code"></em>
-																</td>
-																<td>
-																	<a className="text-muted" href={`data:${e.type};base64, ${Buffer.from(e.data).toString("base64")}`} download={e.name}>
-																		{e.name}
-																	</a>
-																</td>
-															</tr>
-													  ))
+														<tr>
+															<td>
+																<em className="fa-lg far fa-file-code"></em>
+															</td>
+															<td>
+																<a className="text-muted" href={`data:${e.type};base64, ${Buffer.from(e.data).toString("base64")}`} download={e.name}>
+																	{e.name}
+																</a>
+															</td>
+														</tr>
+													))
 													: ""}
 											</tbody>
 										</table>

components/Sanksi/UploadSurat.js

@@ -171,6 +171,22 @@ export class UploadSurat extends Component {
 						</div>
 					</div>
 				</FormGroup>
+				{this.state.tmtCheck && (
+					<FormGroup row className="mt-3">
+						<label className="col-md-2 col-form-label">Tanggal Penetapan Sanksi</label>
+						<span className="col-sm-3 float-left">
+							<DatePicker
+								selected={this.state.awalsanksi}
+								onChange={(awalsanksi) => {
+									this.setState({ awalsanksi }, this.toRingkasan)
+								}}
+								dateFormat="dd/MM/yyyy"
+								maxDate={this.state.startDay}
+								placeholderText="Isi Tanggal"
+							/>
+						</span>
+					</FormGroup>
+				)}
 				{!this.state.tmtCheck && (
 					<FormGroup row className="mt-3">
 						<label className="col-md-2 col-form-label">Isi TMT</label>

pages/app/tuntas/index.js

@@ -23,8 +23,8 @@ class PelaporanTuntas extends Component {
 
     componentDidMount = async () => {
         const { token } = this.props;
-        const pelaporan = await getPelaporan(token, { aktif: false });
-        const graph = await getGraph(this.props.token, { evaluasi: true, listJadwal: true });
+        const pelaporan = await getPelaporan(token, { jadwal: true, aktif: false });
+        const graph = await getGraph(this.props.token, { evaluasi: true, listJadwal: true, aktif: false });
         this.setState({ pelaporan, graph });
     };