yazid138 3 years ago
parent
commit
93d617de1b

+ 5 - 1
actions/sanksi.js

@@ -15,7 +15,7 @@ export const getSanksi = async (query = {}) => {
 	try {
 		let url = "http://localhost:5000/sanksi";
 		if (query != null) {
-			const { ptId, noSanksi, keberatan, jawaban, banding, active, cabutSanksi, docPerbaikan } = query;
+			const { ptId, noSanksi, keberatan, jawaban, banding, active, cabutSanksi, docPerbaikan, role, orgId } = query;
 			url += "?";
 			const parseURL = [];
 			if (noSanksi) parseURL.push(`noSanksi=${noSanksi}`);
@@ -25,6 +25,10 @@ export const getSanksi = async (query = {}) => {
 			if (cabutSanksi) parseURL.push(`cabutSanksi=true`);
 			if (docPerbaikan) parseURL.push(`docPerbaikan=true`);
 			if (jawaban) parseURL.push(`jawaban=true`);
+			if (role) {
+				parseURL.push(`role=${role}`);
+				if (role === "lldikti" && orgId) parseURL.push(`orgId=${orgId}`);
+			}
 			parseURL.push(`active=${active || "true"}`);
 			url += parseURL.join("&");
 		}

+ 7 - 2
pages/app/keberatan/index.js

@@ -4,6 +4,7 @@ import { Row, Col } from "reactstrap";
 import CaseProgress from "@/components/Main/CaseProgress";
 import TableSanksi from "@/components/Keberatan/TableSanksi";
 import { getSanksi } from "@/actions/sanksi";
+import { connect } from "react-redux";
 
 class Keberatan extends Component {
 	constructor(props) {
@@ -14,7 +15,10 @@ class Keberatan extends Component {
 	}
 
 	componentDidMount = async () => {
-		const sanksi = await getSanksi({ keberatan: true });
+		const { organisasi, peran } = this.props.user.peran[0];
+		const query = { role: peran.id === 2021 ? "lldikti" : "dikti", keberatan: true };
+		if (peran.id === 2021) query.orgId = organisasi.id;
+		const sanksi = await getSanksi(query);
 		this.setState({ sanksi });
 	};
 
@@ -36,4 +40,5 @@ class Keberatan extends Component {
 	}
 }
 
-export default Keberatan;
+const mapStateToProps = (state) => ({ user: state.user });
+export default connect(mapStateToProps)(Keberatan);

+ 7 - 2
pages/app/pemantauan-perbaikan/index.js

@@ -4,6 +4,7 @@ import { Row, Col } from "reactstrap";
 import CaseProgress from "@/components/Main/CaseProgress";
 import TableSanksi from "@/components/Main/TableSanksi";
 import { getSanksi } from "@/actions/sanksi";
+import { connect } from "react-redux";
 
 class PemantauanPerbaikan extends Component {
 	constructor(props) {
@@ -14,7 +15,10 @@ class PemantauanPerbaikan extends Component {
 	}
 
 	componentDidMount = async () => {
-		const sanksi = await getSanksi({ docPerbaikan: true });
+		const { organisasi, peran } = this.props.user.peran[0];
+		const query = { role: peran.id === 2021 ? "lldikti" : "dikti", docPerbaikan: true };
+		if (peran.id === 2021) query.orgId = organisasi.id;
+		const sanksi = await getSanksi(query);
 		this.setState({ sanksi });
 	};
 
@@ -36,4 +40,5 @@ class PemantauanPerbaikan extends Component {
 	}
 }
 
-export default PemantauanPerbaikan;
+const mapStateToProps = (state) => ({ user: state.user });
+export default connect(mapStateToProps)(PemantauanPerbaikan);

+ 7 - 2
pages/app/pencabutan-sanksi/index.js

@@ -4,6 +4,7 @@ import { Row, Col } from "reactstrap";
 import CaseProgress from "@/components/Main/CaseProgress";
 import TableSanksi from "@/components/PencabutanSanksi/TableSanksi";
 import { getSanksi } from "@/actions/sanksi";
+import { connect } from "react-redux";
 
 class PencabutanSanksi extends Component {
 	constructor(props) {
@@ -14,7 +15,10 @@ class PencabutanSanksi extends Component {
 	}
 
 	componentDidMount = async () => {
-		const sanksi = await getSanksi({ cabutSanksi: true });
+		const { organisasi, peran } = this.props.user.peran[0];
+		const query = { role: peran.id === 2021 ? "lldikti" : "dikti", cabutSanksi: true };
+		if (peran.id === 2021) query.orgId = organisasi.id;
+		const sanksi = await getSanksi(query);
 		this.setState({ sanksi });
 	};
 
@@ -36,4 +40,5 @@ class PencabutanSanksi extends Component {
 	}
 }
 
-export default PencabutanSanksi;
+const mapStateToProps = (state) => ({ user: state.user });
+export default connect(mapStateToProps)(PencabutanSanksi);