pemantauan dari dikti tampil semua laporan

actions/log.js

@@ -3,7 +3,7 @@ import axios2 from "axios";
 
 export const getLog = async (token, laporan_id) => {
 	try {
-		let url = `/pemantauan/${laporan_id}`;
+		let url = `/pemantauan/${laporan_id}?all=true`;
 		const res = await axios.get(url, {
 			headers: {
 				Authorization: token,

actions/pelaporan.js

@@ -6,7 +6,7 @@ export const getPelaporan = async (token, query = {}) => {
 	try {
 		let url = "/laporan";
 		if (query != null) {
-			const { jadwal, evaluasi, pt_id, delegasi, aktif, sanksi } = query;
+			const { jadwal, evaluasi, pt_id, delegasi, aktif, sanksi, all } = query;
 			url += "?";
 			const parseURL = [];
 			if (jadwal) {
@@ -15,9 +15,14 @@ export const getPelaporan = async (token, query = {}) => {
 				parseURL.push(`evaluasi=true`);
 			} else if (sanksi) {
 				parseURL.push(`sanksi=true`);
-			} else if (delegasi) {
+			}
+			if (all) {
+				parseURL.push(`all=true`);
+			}
+			if (delegasi) {
 				parseURL.push(`delegasi=true`);
 			}
+
 			if (pt_id) {
 				parseURL.push(`pt_id=${pt_id}`);
 			}
@@ -40,9 +45,12 @@ export const getOneLaporan = async (token, id, query = {}) => {
 	try {
 		let url = `/laporan/${id}`;
 		if (query != null) {
-			const { aktif } = query;
+			const { aktif, all } = query;
 			url += "?";
 			const parseURL = [];
+			if (all) {
+				parseURL.push(`all=true`);
+			}
 			if (aktif === false) {
 				parseURL.push(`aktif=false`);
 			}

pages/app/pemantauan/timeline.js

@@ -12,8 +12,7 @@ import Loader from "@/components/Common/Loader";
 import DetailPT from "@/components/Main/DetailPT";
 import moment from "moment";
 import Datatable from "@/components/Tables/Datatable";
-<meta name="viewport" content="width=device-width, initial-scale=1.0"></meta>
-
+<meta name="viewport" content="width=device-width, initial-scale=1.0"></meta>;
 
 class Pemantauan extends Component {
 	constructor(props) {
@@ -26,26 +25,24 @@ class Pemantauan extends Component {
 		};
 	}
 
-
 	static async getInitialProps({ query }) {
 		return { query };
 	}
 
 	componentDidMount = async () => {
 		const { query, token } = this.props;
-		const ptId = query.ptId
-		const pelaporan = await getPelaporan(token, { pt_id: ptId });
+		const ptId = query.ptId;
+		const pelaporan = await getPelaporan(token, { pt_id: ptId, all: true });
 		const pt = await getOnePT(token, ptId);
 		this.setState({ pelaporan, pt });
-
 	};
 
 	handleLihatPemantaun = async (e, id_laporan) => {
 		const { token } = this.props;
-		const log = await getLog(token, id_laporan)
-		const detailLaporanPt = await getOneLaporan(token, id_laporan)
+		const log = await getLog(token, id_laporan);
+		const detailLaporanPt = await getOneLaporan(token, id_laporan, { all: true });
 		this.setState({ detailLaporanPt, log });
-	}
+	};
 
 	render() {
 		const { detailLaporanPt, log, pt, pelaporan } = this.state;
@@ -57,9 +54,7 @@ class Pemantauan extends Component {
 						<div className="ml-auto">
 							<Link href="/app/pemantauan">
 								<Button className="color-3e3a8e" color>
-									<span className="font-color-white">
-										&lt; Kembali
-									</span>
+									<span className="font-color-white">&lt; Kembali</span>
 								</Button>
 							</Link>
 						</div>
@@ -97,18 +92,15 @@ class Pemantauan extends Component {
 																	</div>
 																</td>
 
-																<td>{data.user.isPrivate ? "" : data.user.nama}</td>
+																<td>
+																	{data.user.isPrivate ? "" : data.user.nama} - {data.role_asal}
+																</td>
 
 																<td>
 																	<div>
-
 																		<Button color className="color-3e3a8e" onClick={(e) => this.handleLihatPemantaun(e, data._id)}>
-																			<span className="font-color-white">
-																				Detail
-																			</span>
-
+																			<span className="font-color-white">Detail</span>
 																		</Button>
-
 																	</div>
 																</td>
 															</tr>
@@ -117,9 +109,13 @@ class Pemantauan extends Component {
 												</tbody>
 											</table>
 										</Datatable>
-									) : pelaporan.data ? "Pelaporan tidak ada" : <Loader />}
-								</div >
-							</div >
+									) : pelaporan.data ? (
+										"Pelaporan tidak ada"
+									) : (
+										<Loader />
+									)}
+								</div>
+							</div>
 						</Col>
 						<Col xl={3}>{pt?.data ? <DetailPT data={pt.data} /> : <Loader />}</Col>
 					</Row>
@@ -129,9 +125,7 @@ class Pemantauan extends Component {
 								<Card className="card-default">
 									<CardBody>
 										<Row>
-											<Col lg={12}>
-												{<DetailLaporan data={detailLaporanPt.data} />}
-											</Col>
+											<Col lg={12}>{<DetailLaporan data={detailLaporanPt.data} />}</Col>
 										</Row>
 									</CardBody>
 								</Card>
@@ -148,11 +142,9 @@ class Pemantauan extends Component {
 						)}
 					</Row>
 				</div>
-
-
 			</ContentWrapper>
 		);
 	}
 }
 const mapStateToProps = (state) => ({ user: state.user, token: state.token });
-export default connect(mapStateToProps)(Pemantauan);
+export default connect(mapStateToProps)(Pemantauan);