Преглед на файлове

Merge branch 'release/0.1.0'

yazid138 преди 3 години
родител
ревизия
781232e399
променени са 4 файла, в които са добавени 33 реда и са изтрити 15 реда
  1. 1 2
      components/Layout/Menu.js
  2. 29 11
      components/Layout/MenuPT.js
  3. 1 1
      components/Main/Timeline.js
  4. 2 1
      pages/laporan/new/index.js

+ 1 - 2
components/Layout/Menu.js

@@ -8,7 +8,6 @@ const Menu = [
 		path: "/app/pemantauan",
 		icon: "icon-notebook",
 		translate: "sidebar.nav.PEMANTAUAN",
-		label: { value: 3, color: "success" },
 	},
 	{
 		name: "Pelaporan",
@@ -51,7 +50,7 @@ const Menu = [
 		translate: "sidebar.nav.BANDING",
 	},
 	{
-		name: "Permohonan Pencabutan Sanksi",
+		name: "Pencabutan Sanksi",
 		path: "/app/pencabutan-sanksi",
 		icon: "icon-notebook",
 		translate: "sidebar.nav.PENCABUTAN_SANKSI",

+ 29 - 11
components/Layout/MenuPT.js

@@ -19,36 +19,54 @@ const MenuPT = [
 				path: "/app/pt/keberatan",
 			},
 			{
-				name: "b. Jawaban atas permohonan keberatan",
+				name: "b. Jawaban keberatan",
 				path: "/app/pt/jawaban-keberatan",
 			},
 			{
-				name: "c. Jawaban atas permohonan banding",
+				name: "c. Jawaban banding",
 				path: "/app/pt/jawaban-banding",
 			},
 		],
 	},
+	{
+		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",
-		translate: "sidebar.nav.PENCABUTAN_SANKSI",
+		translate: "sidebar.nav.PENGAJUAN_KEBERATAN",
 		submenu: [
 			{
-				name: "Permohonan",
+				name: "a. Permohonan",
 				path: "/app/pt/pencabutan-sanksi",
 			},
 			{
-				name: "Jawaban",
+				name: "b. Jawaban",
 				path: "/app/pt/jawaban-pencabutan-sanksi",
 			},
+			// {
+			// 	name: "c. Jawaban banding",
+			// 	path: "/app/pt/jawaban-banding",
+			// },
 		],
 	},
-	{
-		name: "Dokumen Perbaikan",
-		path: "/app/pt/dokumen-perbaikan",
-		icon: "icon-notebook",
-		translate: "sidebar.nav.PT_DOKUMEN_PERBAIKAN",
-	},
+
 ];
 
 export default MenuPT;
+``;

+ 1 - 1
components/Main/Timeline.js

@@ -35,7 +35,7 @@ function Timeline({ data, noFile = false }) {
 															<p className="text-muted">{moment(data.createdAt).format("hh:mm")}</p>
 														</p>
 													</div>
-													{(!noFile || data.for_public) && data.data.files && (
+													{!noFile && data.data.files && (
 														<>
 															<p className="text-muted my-2">Dokumen</p>
 															{data.data.files.map((e) => (

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

@@ -1,4 +1,5 @@
 import React, { Component } from "react";
+import Router from "next/router";
 import BasePage from "@/components/Layout/BasePage";
 import { getPT } from "@/actions/PT";
 import { getPelanggaran } from "@/actions/pelanggaran";
@@ -43,7 +44,6 @@ class App extends Component {
 		this.state = {
 			isOpen: false,
 			inputValue: "",
-			stat: "Waiting to add files..",
 			pelaporanNumber: Math.floor(Date.now() * Math.random()),
 			nama: "",
 			alamat: "",
@@ -101,6 +101,7 @@ class App extends Component {
 		const { nama } = this.state;
 		const user_id = await this.createUser();
 		await this.createLaporan(user_id, nama);
+		Router.push("/laporan/new");
 		// validasi
 		// if (nama === '')  msgError.push({nama: 'Wajib diisi'})
 	};