Merge branch 'master' of https://source.sidali.sixsenz.net/andifebri/PTB-fe

# Conflicts:
#	pages/app/tuntas/index.js

actions/pelaporan.js

@@ -19,8 +19,8 @@ export const getPelaporan = async (token, query = {}) => {
 			if (pt_id) {
 				parseURL.push(`pt_id=${pt_id}`);
 			}
-			if (aktif) {
-				parseURL.push(`aktif=${aktif}`);
+			if (aktif === false) {
+				parseURL.push(`aktif=false`);
 			}
 
 			url += parseURL.join("&");
@@ -41,8 +41,8 @@ export const getOneLaporan = async (token, id, query = {}) => {
 			const { aktif } = query;
 			url += "?";
 			const parseURL = [];
-			if (aktif) {
-				parseURL.push(`aktif=${aktif}`);
+			if (aktif === false) {
+				parseURL.push(`aktif=false`);
 			}
 			url += parseURL.join("&");
 		}

actions/sanksi.js

@@ -19,7 +19,7 @@ export const getSanksi = async (token, query = {}) => {
 			if (cabutSanksi) parseURL.push(`cabutSanksi=true`);
 			if (perbaikan) parseURL.push(`perbaikan=true`);
 			if (jawaban) parseURL.push(`jawaban=true`);
-			if (aktif) parseURL.push(`aktif=${aktif}`);
+			if (aktif === false) parseURL.push(`aktif=false`);
 			url += parseURL.join("&");
 		}
 
@@ -39,7 +39,7 @@ export const getOneSanksi = async (token, id, query = {}) => {
 			url += "?";
 			const parseURL = [];
 			if (banding) parseURL.push(`banding=true`);
-			if (aktif) parseURL.push(`aktif=${aktif}`);
+			if (aktif === false) parseURL.push(`aktif=false`);
 			url += parseURL.join("&");
 		}
 		const res = await axiosAPI.get(url, { headers: { Authorization: token } });

pages/app/tuntas/index.js

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