Merge branch 'release/0.1.1'

components/Layout/MenuPT.js

@@ -28,24 +28,6 @@ const MenuPT = [
 			},
 		],
 	},
-	{
-		name: "Dokumen Perbaikan",
-		path: "/app/pt/dokumen-perbaikan",
-		icon: "icon-notebook",
-		translate: "sidebar.nav.PT_DOKUMEN_PERBAIKAN",
-	},
-	// {
-	// 	name: "Pencabutan Sanksi",
-	// 	path: "/app/pt/pencabutan-sanksi",
-	// 	icon: "icon-notebook",
-	// 	translate: "sidebar.nav.PT_PENCABUTAN_SANKSI",
-	// },
-	// {
-	// 	name: "Jawaban Pencabutan Sanksi",
-	// 	path: "/app/pt/jawaban-pencabutan-sanksi",
-	// 	icon: "icon-notebook",
-	// 	translate: "sidebar.nav.PT_JAWABAN_PENCABUTAN_SANKSI",
-	// },
 	{
 		name: "Pencabutan Sanksi",
 		icon: "icon-notebook",
@@ -65,8 +47,12 @@ const MenuPT = [
 			// },
 		],
 	},
-
+	{
+		name: "Dokumen Perbaikan",
+		path: "/app/pt/dokumen-perbaikan",
+		icon: "icon-notebook",
+		translate: "sidebar.nav.PT_DOKUMEN_PERBAIKAN",
+	},
 ];
 
 export default MenuPT;
-``;

pages/app/pt/dokumen-perbaikan/detail.js

@@ -78,13 +78,15 @@ class DetailPerbaikanDoc extends Component {
 		e.preventDefault();
 		const { keterangan } = this.state;
 		const { noSanksi } = this.props.query;
+		const { user } = this.props;
+		const org_id = user.peran[0].organisasi.id;
 		const formdata = new FormData();
 		formdata.append("description", keterangan);
 		if (this.state.files.length > 0) {
 			this.state.files.forEach((e) => {
 				formdata.append("files", e);
 			});
-			const added = await addDocPerbaikan({ noSanksi, ptId: "0BCE4DB7-B207-445D-8D03-0C54B7688252" }, formdata);
+			const added = await addDocPerbaikan({ noSanksi, ptId: org_id }, formdata);
 			if (added) {
 				Router.push({
 					pathname: "/app/pt/dokumen-perbaikan",

pages/app/pt/pencabutan-sanksi/detail.js

@@ -77,12 +77,14 @@ class DetailPencabutanSanksi extends Component {
 	handleKirim = async (e) => {
 		e.preventDefault();
 		const { noSanksi } = this.props.query;
+		const { user } = this.props;
+		const org_id = user.peran[0].organisasi.id;
 		const formdata = new FormData();
 		if (this.state.files.length > 0) {
 			this.state.files.forEach((e) => {
 				formdata.append("files", e);
 			});
-			const added = await addCabutSanksi({ noSanksi, ptId: "0BCE4DB7-B207-445D-8D03-0C54B7688252" }, formdata);
+			const added = await addCabutSanksi({ noSanksi, ptId: org_id }, formdata);
 			if (added) {
 				Router.push({
 					pathname: "/app/pt/pencabutan-sanksi",

pages/app/pt/pencabutan-sanksi/index.js

@@ -3,28 +3,35 @@ import ContentWrapper from "@/components/Layout/ContentWrapper";
 import { Row, Col } from "reactstrap";
 import { getSanksi } from "@/actions/sanksi";
 import TableSanksi from "@/components/PT/TableSanksi";
+import { connect } from "react-redux";
 
 class PencabutanSanksi extends Component {
 	constructor(props) {
 		super(props);
+		this.state = {
+			sanksi: {},
+		};
 	}
 
-	static getInitialProps = async () => {
-		const sanksi = await getSanksi({ ptId: "0BCE4DB7-B207-445D-8D03-0C54B7688252" });
-		return { sanksi };
+	componentDidMount = async () => {
+		const { user } = this.props;
+		const org_id = user.peran[0].organisasi.id;
+		const sanksi = await getSanksi({ ptId: org_id });
+		this.setState({ sanksi });
 	};
 
 	render() {
-		const { sanksi } = this.props;
+		const { sanksi } = this.state;
 		return (
 			<ContentWrapper>
 				<div className="content-heading">Permohonan Pencabutan Sanksi</div>
 				<Row>
-					<Col lg={12}>{sanksi.data.length > 0 ? <TableSanksi listData={sanksi.data} to="/app/pt/pencabutan-sanksi/detail" linkName="Detail" /> : ""}</Col>
+					<Col lg={12}>{sanksi.data && sanksi.data.length ? <TableSanksi listData={sanksi.data} to="/app/pt/pencabutan-sanksi/detail" linkName="Detail" /> : ""}</Col>
 				</Row>
 			</ContentWrapper>
 		);
 	}
 }
 
-export default PencabutanSanksi;
+const mapStateToProps = (state) => ({ user: state.user });
+export default connect(mapStateToProps)(PencabutanSanksi);