yazid138 пре 3 година
родитељ
комит
85c1e5ce17

+ 6 - 4
actions/notifikasi.js

@@ -1,8 +1,10 @@
 import { get, post } from "@/config/request";
+import axios from "axios";
+const url = "http://localhost:1880";
 
 export const notifLaporanBaru = async (data) => {
 	try {
-		const response = await post("/notifikasi/laporan-baru", data);
+		const response = await axios.post(url + "/notifikasi/laporan-baru", data);
 		return response.data;
 	} catch (error) {
 		if (error.response.data) return error.response.data;
@@ -13,7 +15,7 @@ export const notifLaporanBaru = async (data) => {
 
 export const notifKeberatan = async (data) => {
 	try {
-		const response = await post("/notifikasi/keberatan", data);
+		const response = await axios.post(url + "/notifikasi/keberatan", data);
 		return response.data;
 	} catch (error) {
 		if (error.response.data) return error.response.data;
@@ -24,7 +26,7 @@ export const notifKeberatan = async (data) => {
 
 export const notifBanding = async (data) => {
 	try {
-		const response = await post("/notifikasi/banding", data);
+		const response = await axios.post(url + "/notifikasi/banding", data);
 		return response.data;
 	} catch (error) {
 		if (error.response.data) return error.response.data;
@@ -35,7 +37,7 @@ export const notifBanding = async (data) => {
 
 export const notifDocPerbaikan = async (data) => {
 	try {
-		const response = await post("/notifikasi/doc-perbaikan", data);
+		const response = await axios.post(url + "/notifikasi/doc-perbaikan", data);
 		return response.data;
 	} catch (error) {
 		if (error.response.data) return error.response.data;

+ 2 - 1
components/Banding/Riwayat.js

@@ -1,6 +1,7 @@
 import Datatable from "@/components/Tables/Datatable";
 import moment from "moment";
 import { Card, CardHeader, CardBody, CardTitle } from "reactstrap";
+import { API_URL } from "@/env";
 
 function Riwayat({ data }) {
 	return (
@@ -27,7 +28,7 @@ function Riwayat({ data }) {
 										{data.files.map((e) => (
 											<>
 												<em className="fa-lg far fa-file-code"></em>
-												<a className="text-muted" href={`data:${e.type};base64, ${Buffer.from(e.data).toString("base64")}`} download={e.name}>
+												<a className="text-muted" href={API_URL + e.path} target="_blank" download={e.name}>
 													{e.name}
 												</a>
 											</>

+ 2 - 1
components/DocPerbaikan/Riwayat.js

@@ -1,6 +1,7 @@
 import Datatable from "@/components/Tables/Datatable";
 import moment from "moment";
 import { Card, CardHeader, CardBody, CardTitle } from "reactstrap";
+import { API_URL } from "@/env";
 
 function Riwayat({ data }) {
 	console.log(data);
@@ -29,7 +30,7 @@ function Riwayat({ data }) {
 												{value.files.map((e) => (
 													<>
 														<em className="fa-lg far fa-file-code"></em>
-														<a className="text-muted" href={`data:${e.type};base64, ${Buffer.from(e.data).toString("base64")}`} download={e.name}>
+														<a className="text-muted" href={API_URL + e.path} target="_blank" download={e.name}>
 															{e.name}
 														</a>
 													</>

+ 2 - 0
components/Extras/calendar.view.js

@@ -16,6 +16,7 @@ import Select from "react-select";
 import moment from "moment";
 import { connect } from "react-redux";
 import Loader from "@/components/Common/Loader";
+import Router from "next/router";
 
 const status = [
 	{ value: "Ditindaklanjuti DIKTI", label: "Ditindaklanjuti DIKTI", className: "State-ACT" },
@@ -156,6 +157,7 @@ class Calendar extends Component {
 			await changeRoleData({ number, ptId }, { role_data: roleId === 2021 ? "dikti" : "lldikti" });
 			const statusData = roleId === 2021 ? status : statusLLDIKTI;
 			await addStatus({ number, ptId }, { status: statusData[0].value });
+			Router.push("/app/penjadwalan");
 			return;
 		}
 		if (selectedOption.value === this.getStatus()[2].value) {

+ 2 - 1
components/Keberatan/Riwayat.js

@@ -1,6 +1,7 @@
 import Datatable from "@/components/Tables/Datatable";
 import moment from "moment";
 import { Card, CardHeader, CardBody, CardTitle } from "reactstrap";
+import { API_URL } from "@/env";
 
 function Riwayat({ data }) {
 	return (
@@ -29,7 +30,7 @@ function Riwayat({ data }) {
 										{data.files.map((e) => (
 											<>
 												<em className="fa-lg far fa-file-code"></em>
-												<a className="text-muted" href={`data:${e.type};base64, ${Buffer.from(e.data).toString("base64")}`} download={e.name}>
+												<a className="text-muted" href={API_URL + e.path} target="_blank" download={e.name}>
 													{e.name}
 												</a>
 											</>

+ 3 - 2
components/Main/DetailLaporan.js

@@ -4,6 +4,7 @@ import moment from "moment";
 import { Col, FormGroup } from "reactstrap";
 import { useSelector } from "react-redux";
 import { getPT } from "@/actions/PT";
+import { API_URL } from "@/env";
 
 function DetailLaporan({ data, noTitle = false, noStatus = false }) {
 	const user = useSelector((state) => state.user);
@@ -43,7 +44,7 @@ function DetailLaporan({ data, noTitle = false, noStatus = false }) {
 							<FormGroup row>
 								<Col md="4">Foto Kartu Identitas:</Col>
 								<Col md="8">
-									<img src={`data:${data.user_id.files[0].type};base64, ${Buffer.from(data.user_id.files[0].data).toString("base64")}`} height={200} alt="Foto Identitas" />
+									<img src={API_URL + data.user_id.files[0].path} height={200} alt="Foto Identitas" />
 								</Col>
 							</FormGroup>
 						</>
@@ -112,7 +113,7 @@ function DetailLaporan({ data, noTitle = false, noStatus = false }) {
 												<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}>
+												<a className="text-muted" href={API_URL + e.path} target="_blank" download={e.name}>
 													{e.name}
 												</a>
 											</td>

+ 2 - 1
components/Main/DetailSanksi.js

@@ -1,6 +1,7 @@
 import Scrollable from "@/components/Common/Scrollable";
 import moment from "moment";
 import { Col, FormGroup, Table } from "reactstrap";
+import { API_URL } from "@/env";
 
 function DetailSanksi({ data, noTitle = false }) {
 	return (
@@ -46,7 +47,7 @@ function DetailSanksi({ data, noTitle = false }) {
 												<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}>
+												<a className="text-muted" href={API_URL + e.path} target="_blank" download={e.name}>
 													{e.name}
 												</a>
 											</td>

+ 2 - 1
components/Main/PermohonanPT.js

@@ -1,5 +1,6 @@
 import Scrollable from "@/components/Common/Scrollable";
 import { Col, FormGroup } from "reactstrap";
+import { API_URL } from "@/env";
 
 function PermohonanPT({ data, title = null }) {
 	return (
@@ -18,7 +19,7 @@ function PermohonanPT({ data, title = null }) {
 												<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}>
+												<a className="text-muted" href={API_URL + e.path} target="_blank" download={e.name}>
 													{e.name}
 												</a>
 											</td>

+ 6 - 3
components/Main/Timeline.js

@@ -1,4 +1,5 @@
 import moment from "moment";
+import { API_URL } from "@/env";
 
 function Timeline({ data, noFile = false }) {
 	const date = data && [...new Set(data.map((e) => moment(e.createdAt).format("DD MMMM YYYY")))];
@@ -30,14 +31,14 @@ function Timeline({ data, noFile = false }) {
 														<p className="text-muted">{moment(data.createdAt).format("hh:mm")}</p>
 													</p>
 												</div>
-												{!noFile && data.data.files && (
+												{!noFile && data.files.length ? (
 													<>
 														<p className="text-muted my-2">Dokumen</p>
-														{data.data.files.map((e) => (
+														{data.files.map((e) => (
 															<div className="media bb p-2">
 																<div className="media-body">
 																	<p className="m-0">
-																		<a href={`data:${e.type};base64, ${Buffer.from(e.data).toString("base64")}`} download={e.name}>
+																		<a href={API_URL + e.path} target="_blank" download={e.name}>
 																			<strong>{e.name}</strong>
 																		</a>
 																	</p>
@@ -45,6 +46,8 @@ function Timeline({ data, noFile = false }) {
 															</div>
 														))}
 													</>
+												) : (
+													""
 												)}
 											</div>
 										</div>

+ 2 - 1
components/PT/CabutSanksi/Riwayat.js

@@ -1,6 +1,7 @@
 import Datatable from "@/components/Tables/Datatable";
 import moment from "moment";
 import { Card, CardHeader, CardBody, CardTitle } from "reactstrap";
+import { API_URL } from "@/env";
 
 function Riwayat({ data }) {
 	const { cabut_sanksi } = data.sanksi;
@@ -27,7 +28,7 @@ function Riwayat({ data }) {
 										{cabut_sanksi.files.map((e) => (
 											<>
 												<em className="fa-lg far fa-file-code"></em>
-												<a className="text-muted" href={`data:${e.type};base64, ${Buffer.from(e.data).toString("base64")}`} download={e.name}>
+												<a className="text-muted" href={API_URL + e.path} target="_blank" download={e.name}>
 													{e.name}
 												</a>
 											</>

+ 2 - 1
components/PT/DocPerbaikan/Riwayat.js

@@ -1,6 +1,7 @@
 import Datatable from "@/components/Tables/Datatable";
 import moment from "moment";
 import { Card, CardHeader, CardBody, CardTitle } from "reactstrap";
+import { API_URL } from "@/env";
 
 function Riwayat({ data }) {
 	return (
@@ -28,7 +29,7 @@ function Riwayat({ data }) {
 												{value.files.map((e) => (
 													<>
 														<em className="fa-lg far fa-file-code"></em>
-														<a className="text-muted" href={`data:${e.type};base64, ${Buffer.from(e.data).toString("base64")}`} download={e.name}>
+														<a className="text-muted" href={API_URL + e.path} target="_blank" download={e.name}>
 															{e.name}
 														</a>
 													</>

+ 2 - 1
components/PT/JawabanBanding/DetailJawaban.js

@@ -1,6 +1,7 @@
 import { FormGroup, Button } from "reactstrap";
 import Scrollable from "@/components/Common/Scrollable";
 import Link from "next/link";
+import { API_URL } from "@/env";
 
 function DetailJawaban({ data }) {
 	const { jawaban } = data.sanksi.banding;
@@ -26,7 +27,7 @@ function DetailJawaban({ data }) {
 												<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}>
+												<a className="text-muted" href={API_URL + e.path} target="_blank" download={e.name}>
 													{e.name}
 												</a>
 											</td>

+ 2 - 1
components/PT/JawabanKeberatan/DetailJawaban.js

@@ -1,5 +1,6 @@
 import { FormGroup } from "reactstrap";
 import Scrollable from "@/components/Common/Scrollable";
+import { API_URL } from "@/env";
 
 function DetailJawaban({ data }) {
 	const { jawaban } = data.sanksi.keberatan;
@@ -31,7 +32,7 @@ function DetailJawaban({ data }) {
 												<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}>
+												<a className="text-muted" href={API_URL + e.path} target="_blank" download={e.name}>
 													{e.name}
 												</a>
 											</td>

+ 2 - 1
components/PT/JawabanKeberatan/Riwayat.js

@@ -1,6 +1,7 @@
 import Datatable from "@/components/Tables/Datatable";
 import moment from "moment";
 import { Card, CardHeader, CardBody, CardTitle } from "reactstrap";
+import { API_URL } from "@/env";
 
 function Riwayat({ data }) {
 	const { banding } = data.sanksi;
@@ -26,7 +27,7 @@ function Riwayat({ data }) {
 										{banding.files.map((e) => (
 											<>
 												<em className="fa-lg far fa-file-code"></em>
-												<a className="text-muted" href={`data:${e.type};base64, ${Buffer.from(e.data).toString("base64")}`} download={e.name}>
+												<a className="text-muted" href={API_URL + e.path} target="_blank" download={e.name}>
 													{e.name}
 												</a>
 											</>

+ 2 - 1
components/PT/Keberatan/Riwayat.js

@@ -1,6 +1,7 @@
 import Datatable from "@/components/Tables/Datatable";
 import moment from "moment";
 import { Card, CardHeader, CardBody, CardTitle } from "reactstrap";
+import { API_URL } from "@/env";
 
 function Riwayat({ data }) {
 	const keberatan = data.sanksi.keberatan;
@@ -26,7 +27,7 @@ function Riwayat({ data }) {
 										{keberatan.files.map((e) => (
 											<>
 												<em className="fa-lg far fa-file-code"></em>
-												<a className="text-muted" href={`data:${e.type};base64, ${Buffer.from(e.data).toString("base64")}`} download={e.name}>
+												<a className="text-muted" href={API_URL + e.path} target="_blank" download={e.name}>
 													{e.name}
 												</a>
 											</>

+ 3 - 2
components/PT/Timeline.js

@@ -1,4 +1,5 @@
 import moment from "moment";
+import { API_URL } from "@/env";
 
 function Timeline({ data, dataPelaporan }) {
 	const jadwal = dataPelaporan;
@@ -34,11 +35,11 @@ function Timeline({ data, dataPelaporan }) {
 												{data.data.files ? (
 													<>
 														<p className="text-muted my-2">Dokumen</p>
-														{data.data.files.map((e) => (
+														{data.files.map((e) => (
 															<div className="media bb p-2">
 																<div className="media-body">
 																	<p className="m-0">
-																		<a href={`data:${e.type};base64, ${Buffer.from(e.data).toString("base64")}`} download={e.name}>
+																		<a href={API_URL + e.path} target="_blank" download={e.name}>
 																			<strong>{e.name}</strong>
 																		</a>
 																	</p>

+ 3 - 1
components/Pemeriksaan/TableRiwayat.js

@@ -1,6 +1,8 @@
 import Datatable from "@/components/Tables/Datatable";
+import { API_URL } from "@/env";
 
 function TableRiwayat({ data }) {
+	console.log(data);
 	return (
 		<Datatable options={{ responsive: true }}>
 			<table className="table table-striped my-4 w-100">
@@ -22,7 +24,7 @@ function TableRiwayat({ data }) {
 								{e.files.map((e, index) => (
 									<>
 										<em className="fa-lg far fa-file-code"></em>
-										<a className="text-muted" href={`data:${e.type};base64, ${Buffer.from(e.data).toString("base64")}`} download={e.name}>
+										<a className="text-muted" href={API_URL + e.path} target="_blank" download={e.name}>
 											{e.name}
 										</a>
 										<br />

+ 2 - 1
components/PencabutanSanksi/Riwayat.js

@@ -1,6 +1,7 @@
 import Datatable from "@/components/Tables/Datatable";
 import moment from "moment";
 import { Card, CardHeader, CardBody, CardTitle } from "reactstrap";
+import { API_URL } from "@/env";
 
 function Riwayat({ data }) {
 	const { jawaban } = data.sanksi.cabut_sanksi;
@@ -30,7 +31,7 @@ function Riwayat({ data }) {
 										{jawaban.files.map((e) => (
 											<>
 												<em className="fa-lg far fa-file-code"></em>
-												<a className="text-muted" href={`data:${e.type};base64, ${Buffer.from(e.data).toString("base64")}`} download={e.name}>
+												<a className="text-muted" href={API_URL + e.path} target="_blank" download={e.name}>
 													{e.name}
 												</a>
 											</>

+ 2 - 1
components/Public/DetailLaporan.js

@@ -1,6 +1,7 @@
 import Scrollable from "@/components/Common/Scrollable";
 import moment from "moment";
 import { Col, FormGroup } from "reactstrap";
+import { API_URL } from "@/env";
 
 function DetailLaporan({ data }) {
 	return (
@@ -67,7 +68,7 @@ function DetailLaporan({ data }) {
 												<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}>
+												<a className="text-muted" href={API_URL + e.path} target="_blank" download={e.name}>
 													{e.name}
 												</a>
 											</td>

+ 1 - 1
pages/app/index.js

@@ -40,7 +40,7 @@ class App extends Component {
 			<div>
 				<Navbar color="info" expand="md" dark>
 					<NavbarBrand href="/">
-						<img className="img-fluid" src="/static/img/logo-single.png" alt="App Logo" /> Sidali Dikti
+						<img className="img-fluid" src="/static/img/logo-single.png" alt="App Logo" /> Sidali
 					</NavbarBrand>
 					<NavbarToggler onClick={this.toggleCollapse} />
 					<Collapse isOpen={this.state.isOpen} navbar>

+ 2 - 2
pages/app/pt/jawaban-pencabutan-sanksi/detail.js

@@ -9,7 +9,7 @@ import Scrollable from "@/components/Common/Scrollable";
 import { Row, Col, Card, CardBody, FormGroup, Button } from "reactstrap";
 import { connect } from "react-redux";
 import Loader from "@/components/Common/Loader";
-
+import { API_URL } from "@/env";
 class DetailJawabanPencabutanSanksi extends Component {
 	constructor(props) {
 		super(props);
@@ -80,7 +80,7 @@ class DetailJawabanPencabutanSanksi extends Component {
 																						<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}>
+																						<a className="text-muted" href={API_URL + e.path} target="_blank" download={e.name}>
 																							{e.name}
 																						</a>
 																					</td>

+ 1 - 1
pages/laporan/new/index.js

@@ -156,7 +156,7 @@ class App extends Component {
 			<div>
 				<Navbar color="info" expand="md" dark>
 					<NavbarBrand href="/">
-						<img className="img-fluid" src="/static/img/logo-single.png" alt="App Logo" /> Sidali Dikti
+						<img className="img-fluid" src="/static/img/logo-single.png" alt="App Logo" /> Sidali
 					</NavbarBrand>
 					<NavbarToggler onClick={this.toggleCollapse} />
 					<Collapse isOpen={this.state.isOpen} navbar>

+ 1 - 1
pages/pemantauan.js

@@ -58,7 +58,7 @@ class App extends Component {
 			<div>
 				<Navbar color="info" expand="md" dark>
 					<NavbarBrand href="/">
-						<img className="img-fluid" src="/static/img/logo-single.png" alt="App Logo" /> Sidali Dikti
+						<img className="img-fluid" src="/static/img/logo-single.png" alt="App Logo" /> Sidali
 					</NavbarBrand>
 					<NavbarToggler onClick={this.toggleCollapse} />
 					<Collapse isOpen={this.state.isOpen} navbar>