diff --git a/src/app/api/project/[id]/member/route.ts b/src/app/api/project/[id]/member/route.ts
index c8bed6f..9d20104 100644
--- a/src/app/api/project/[id]/member/route.ts
+++ b/src/app/api/project/[id]/member/route.ts
@@ -1,5 +1,6 @@
import { prisma } from "@/module/_global";
import { funGetUserByCookies } from "@/module/auth";
+import { createLogUser } from "@/module/user";
import _ from "lodash";
import { NextResponse } from "next/server";
@@ -24,7 +25,7 @@ export async function POST(request: Request, context: { params: { id: string } }
if (data == 0) {
return NextResponse.json(
{
- success: false, message: "Gagal mendapatkan project, data tidak ditemukan",
+ success: false, message: "Gagal mendapatkan kegiatan, data tidak ditemukan",
},
{ status: 404 }
);
@@ -42,11 +43,13 @@ export async function POST(request: Request, context: { params: { id: string } }
})
}
- return NextResponse.json({ success: true, message: "Berhasil menambahkan anggota project" }, { status: 200 });
+ // create log user
+ const log = await createLogUser({ act: 'CREATE', desc: 'User menambah anggota kegiatan', table: 'project', data: String(id) })
+ return NextResponse.json({ success: true, message: "Berhasil menambahkan anggota kegiatan" }, { status: 200 });
} catch (error) {
console.error(error);
- return NextResponse.json({ success: false, message: "Gagal menambah anggota project, coba lagi nanti", reason: (error as Error).message, }, { status: 500 });
+ return NextResponse.json({ success: false, message: "Gagal menambah anggota kegiatan, coba lagi nanti", reason: (error as Error).message, }, { status: 500 });
}
}
@@ -85,11 +88,14 @@ export async function DELETE(request: Request, context: { params: { id: string }
}
})
- return NextResponse.json({ success: true, message: "Berhasil mengeluarkan anggota project" }, { status: 200 });
+ // create log user
+ const log = await createLogUser({ act: 'DELETE', desc: 'User mengeluarkan anggota kegiatan', table: 'project', data: String(id) })
+
+ return NextResponse.json({ success: true, message: "Berhasil mengeluarkan anggota kegiatan" }, { status: 200 });
} catch (error) {
console.error(error);
- return NextResponse.json({ success: false, message: "Gagal mengeluarkan anggota project, coba lagi nanti", reason: (error as Error).message, }, { status: 500 });
+ return NextResponse.json({ success: false, message: "Gagal mengeluarkan anggota kegiatan, coba lagi nanti", reason: (error as Error).message, }, { status: 500 });
}
}
diff --git a/src/app/api/project/[id]/route.ts b/src/app/api/project/[id]/route.ts
index ffbc5f8..5ba9c8d 100644
--- a/src/app/api/project/[id]/route.ts
+++ b/src/app/api/project/[id]/route.ts
@@ -1,5 +1,6 @@
import { prisma } from "@/module/_global";
import { funGetUserByCookies } from "@/module/auth";
+import { createLogUser } from "@/module/user";
import _ from "lodash";
import moment from "moment";
import { NextResponse } from "next/server";
@@ -159,7 +160,7 @@ export async function POST(request: Request, context: { params: { id: string } }
if (data == 0) {
return NextResponse.json(
{
- success: false, message: "Gagal mendapatkan project, data tidak ditemukan",
+ success: false, message: "Gagal mendapatkan kegiatan, data tidak ditemukan",
},
{ status: 404 }
);
@@ -171,14 +172,20 @@ export async function POST(request: Request, context: { params: { id: string } }
idProject: id,
dateStart: new Date(moment(dateStart).format('YYYY-MM-DD')),
dateEnd: new Date(moment(dateEnd).format('YYYY-MM-DD')),
+ },
+ select: {
+ id: true
}
})
- return NextResponse.json({ success: true, message: "Detail project berhasil ditambahkan", data: dataCreate, }, { status: 200 });
+ // create log user
+ const log = await createLogUser({ act: 'CREATE', desc: 'User membuat data tahapan kegiatan', table: 'projectTask', data: String(dataCreate.id) })
+
+ return NextResponse.json({ success: true, message: "Detail tahapan kegiatan berhasil ditambahkan", data: dataCreate, }, { status: 200 });
} catch (error) {
console.error(error);
- return NextResponse.json({ success: false, message: "Gagal tambah detail project, coba lagi nanti", reason: (error as Error).message, }, { status: 500 });
+ return NextResponse.json({ success: false, message: "Gagal tambah tahapan kegiatan, coba lagi nanti", reason: (error as Error).message, }, { status: 500 });
}
}
@@ -218,11 +225,13 @@ export async function DELETE(request: Request, context: { params: { id: string }
}
})
- return NextResponse.json({ success: true, message: "Project berhasil dibatalkan" }, { status: 200 });
+ // create log user
+ const log = await createLogUser({ act: 'UPDATE', desc: 'User membatalkan data kegiatan', table: 'project', data: String(id) })
+ return NextResponse.json({ success: true, message: "Kegiatan berhasil dibatalkan" }, { status: 200 });
} catch (error) {
console.error(error);
- return NextResponse.json({ success: false, message: "Gagal membatalkan project, coba lagi nanti", reason: (error as Error).message, }, { status: 500 });
+ return NextResponse.json({ success: false, message: "Gagal membatalkan kegiatan, coba lagi nanti", reason: (error as Error).message, }, { status: 500 });
}
}
@@ -246,7 +255,7 @@ export async function PUT(request: Request, context: { params: { id: string } })
if (data == 0) {
return NextResponse.json(
{
- success: false, message: "Gagal mendapatkan project, data tidak ditemukan",
+ success: false, message: "Gagal mendapatkan kegiatan, data tidak ditemukan",
},
{ status: 404 }
);
@@ -261,10 +270,13 @@ export async function PUT(request: Request, context: { params: { id: string } })
}
})
- return NextResponse.json({ success: true, message: "Project berhasil diubah" }, { status: 200 });
+ // create log user
+ const log = await createLogUser({ act: 'UPDATE', desc: 'User mengupdate data kegiatan', table: 'project', data: String(id) })
+
+ return NextResponse.json({ success: true, message: "Kegiatan berhasil diupdate" }, { status: 200 });
} catch (error) {
console.error(error);
- return NextResponse.json({ success: false, message: "Gagal mengubah project, coba lagi nanti", reason: (error as Error).message, }, { status: 500 });
+ return NextResponse.json({ success: false, message: "Gagal mengupdate kegiatan, coba lagi nanti", reason: (error as Error).message, }, { status: 500 });
}
}
\ No newline at end of file
diff --git a/src/app/api/project/detail/[id]/route.ts b/src/app/api/project/detail/[id]/route.ts
index 5a16292..52f7b22 100644
--- a/src/app/api/project/detail/[id]/route.ts
+++ b/src/app/api/project/detail/[id]/route.ts
@@ -1,5 +1,6 @@
import { prisma } from "@/module/_global";
import { funGetUserByCookies } from "@/module/auth";
+import { createLogUser } from "@/module/user";
import moment from "moment";
import { NextResponse } from "next/server";
@@ -24,7 +25,7 @@ export async function DELETE(request: Request, context: { params: { id: string }
return NextResponse.json(
{
success: false,
- message: "Hapus project gagal, data tidak ditemukan",
+ message: "Hapus tahapan kegiatan gagal, data tidak ditemukan",
},
{ status: 404 }
);
@@ -67,18 +68,21 @@ export async function DELETE(request: Request, context: { params: { id: string }
}
})
+ // create log user
+ const log = await createLogUser({ act: 'DELETE', desc: 'User menghapus tahapan kegiatan', table: 'projectTask', data: String(id) })
+
return NextResponse.json(
{
success: true,
- message: "Project berhasil dihapus",
+ message: "Tahapan kegiatan berhasil dihapus",
data,
},
{ status: 200 }
);
} catch (error) {
- console.log(error);
- return NextResponse.json({ success: false, message: "Gagal menghapus project, coba lagi nanti", reason: (error as Error).message, }, { status: 500 });
+ console.error(error);
+ return NextResponse.json({ success: false, message: "Gagal menghapus tahapan kegiatan, coba lagi nanti", reason: (error as Error).message, }, { status: 500 });
}
}
@@ -103,7 +107,7 @@ export async function PUT(request: Request, context: { params: { id: string } })
if (data == 0) {
return NextResponse.json(
{
- success: false, message: "Gagal mendapatkan project, data tidak ditemukan",
+ success: false, message: "Gagal mendapatkan kegiatan, data tidak ditemukan",
},
{ status: 404 }
);
@@ -148,12 +152,14 @@ export async function PUT(request: Request, context: { params: { id: string } })
}
})
+ // create log user
+ const log = await createLogUser({ act: 'UPDATE', desc: 'User mengupdate status tahapan kegiatan', table: 'projectTask', data: String(id) })
- return NextResponse.json({ success: true, message: "Status detail Project berhasil diupdate", data }, { status: 200 });
+ return NextResponse.json({ success: true, message: "Status tahapan kegiatan berhasil diupdate", data }, { status: 200 });
} catch (error) {
console.error(error);
- return NextResponse.json({ success: false, message: "Gagal membatalkan project, coba lagi nanti", reason: (error as Error).message, }, { status: 500 });
+ return NextResponse.json({ success: false, message: "Gagal mengupdate status tahapan kegiatan, coba lagi nanti", reason: (error as Error).message, }, { status: 500 });
}
}
@@ -202,6 +208,21 @@ export async function POST(request: Request, context: { params: { id: string } }
const { id } = context.params;
const { name, dateStart, dateEnd } = (await request.json());
+ const dataTask = await prisma.projectTask.count({
+ where: {
+ id
+ }
+ })
+
+ if (dataTask == 0) {
+ return NextResponse.json(
+ {
+ success: false, message: "Gagal mendapatkan kegiatan, data tidak ditemukan",
+ },
+ { status: 404 }
+ );
+ }
+
const data = await prisma.projectTask.update({
where: {
id
@@ -213,10 +234,13 @@ export async function POST(request: Request, context: { params: { id: string } }
}
})
- return NextResponse.json({ success: true, message: "Detail project berhasil diupdate", data }, { status: 200 });
+ // create log user
+ const log = await createLogUser({ act: 'UPDATE', desc: 'User mengupdate tahapan kegiatan', table: 'projectTask', data: String(id) })
+
+ return NextResponse.json({ success: true, message: "Detail tahapan kegiatan berhasil diupdate", data }, { status: 200 });
} catch (error) {
console.error(error);
- return NextResponse.json({ success: false, message: "Gagal membatalkan project, coba lagi nanti", reason: (error as Error).message, }, { status: 500 });
+ return NextResponse.json({ success: false, message: "Gagal mengupdate detail tahapan kegiatan, coba lagi nanti", reason: (error as Error).message, }, { status: 500 });
}
}
\ No newline at end of file
diff --git a/src/app/api/project/file/[id]/route.ts b/src/app/api/project/file/[id]/route.ts
index 7726c46..5f390d7 100644
--- a/src/app/api/project/file/[id]/route.ts
+++ b/src/app/api/project/file/[id]/route.ts
@@ -4,6 +4,7 @@ import { NextResponse } from "next/server";
import fs from "fs";
import path from "path";
import _ from "lodash";
+import { createLogUser } from "@/module/user";
// HAPUS FILE PROJECT BUKAN PAKE ISACTIVE
export async function DELETE(request: Request, context: { params: { id: string } }) {
@@ -44,6 +45,9 @@ export async function DELETE(request: Request, context: { params: { id: string }
},
});
+ // create log user
+ const log = await createLogUser({ act: 'DELETE', desc: 'User menghapus file kegiatan', table: 'project', data: String(dataRelasi?.idProject) })
+
return NextResponse.json(
{
@@ -55,7 +59,7 @@ export async function DELETE(request: Request, context: { params: { id: string }
);
} catch (error) {
- console.log(error);
+ console.error(error);
return NextResponse.json({ success: false, message: "Gagal menghapus file, coba lagi nanti", reason: (error as Error).message, }, { status: 500 });
}
}
@@ -118,7 +122,7 @@ export async function PUT(request: Request, context: { params: { id: string } })
}
} catch (error) {
- console.log(error);
+ console.error(error);
return NextResponse.json({ success: false, message: "Upload file gagal, coba lagi nanti", reason: (error as Error).message, }, { status: 500 });
}
}
@@ -191,11 +195,12 @@ export async function POST(request: Request, context: { params: { id: string } }
}
}
-
+ // create log user
+ const log = await createLogUser({ act: 'CREATE', desc: 'User menambah file kegiatan', table: 'project', data: String(id) })
return NextResponse.json({ success: true, message: "Berhasil mengupload file kegiatan" }, { status: 200 });
} catch (error) {
- console.log(error);
+ console.error(error);
return NextResponse.json({ success: false, message: "Gagal mengupload file, coba lagi nanti", reason: (error as Error).message, }, { status: 500 });
}
}
\ No newline at end of file
diff --git a/src/module/_global/layout/layout_navbar_new.tsx b/src/module/_global/layout/layout_navbar_new.tsx
index c451fe4..15e33fa 100644
--- a/src/module/_global/layout/layout_navbar_new.tsx
+++ b/src/module/_global/layout/layout_navbar_new.tsx
@@ -5,7 +5,7 @@ import { WARNA } from '../fun/WARNA';
import LayoutIconBack from './layout_icon_back';
import _ from 'lodash';
-export const LayoutNavbarNew = ({ back, title, menu }: { back?: string, title: string, menu: React.ReactNode }) => {
+export const LayoutNavbarNew = ({ back, state, title, menu }: { back?: string, title: string, menu: React.ReactNode, state?: React.ReactNode }) => {
return (
-
- {
- back!=undefined && ()
- }
-
+ {
+ state != undefined &&
+
+ {state}
+
+ }
+ {
+ back != undefined &&
+
+
+
+ }
{_.startCase(title)}
diff --git a/src/module/project/ui/add_detail_task_project.tsx b/src/module/project/ui/add_detail_task_project.tsx
index a799ddf..c801e3d 100644
--- a/src/module/project/ui/add_detail_task_project.tsx
+++ b/src/module/project/ui/add_detail_task_project.tsx
@@ -45,7 +45,7 @@ export default function AddDetailTaskProject() {
toast.error(res.message)
}
} catch (error) {
- console.log(error)
+ console.error(error)
toast.error("Gagal menambahkan tugas, coba lagi nanti")
}
}
diff --git a/src/module/project/ui/add_file_detail_project.tsx b/src/module/project/ui/add_file_detail_project.tsx
index b40e6fe..9c1df98 100644
--- a/src/module/project/ui/add_file_detail_project.tsx
+++ b/src/module/project/ui/add_file_detail_project.tsx
@@ -52,7 +52,7 @@ export default function AddFileDetailProject() {
toast.error(res.message)
}
} catch (error) {
- console.log(error)
+ console.error(error)
toast.error("Gagal menambahkan file, coba lagi nanti")
}
}
@@ -75,7 +75,7 @@ export default function AddFileDetailProject() {
toast.error(response.message)
}
} catch (error) {
- console.log(error)
+ console.error(error)
toast.error("Gagal menambahkan file, coba lagi nanti");
}
}
diff --git a/src/module/project/ui/add_member_detail_project.tsx b/src/module/project/ui/add_member_detail_project.tsx
index 28762ff..415cedd 100644
--- a/src/module/project/ui/add_member_detail_project.tsx
+++ b/src/module/project/ui/add_member_detail_project.tsx
@@ -38,7 +38,7 @@ export default function AddMemberDetailProject() {
}
setLoading(false)
} catch (error) {
- console.log(error)
+ console.error(error)
toast.error("Gagal mendapatkan anggota, coba lagi nanti");
} finally {
setLoading(false)
@@ -97,7 +97,7 @@ export default function AddMemberDetailProject() {
toast.error(res.message)
}
} catch (error) {
- console.log(error)
+ console.error(error)
toast.error("Gagal menambahkan anggota, coba lagi nanti");
}
}
diff --git a/src/module/project/ui/cancel_project.tsx b/src/module/project/ui/cancel_project.tsx
index 4845eab..8881a8a 100644
--- a/src/module/project/ui/cancel_project.tsx
+++ b/src/module/project/ui/cancel_project.tsx
@@ -33,7 +33,7 @@ export default function CancelProject() {
toast.error(res.message)
}
} catch (error) {
- console.log(error)
+ console.error(error)
toast.error("Gagal membatalkan Kegiatan, coba lagi nanti")
}
}
diff --git a/src/module/project/ui/create_project.tsx b/src/module/project/ui/create_project.tsx
index e519fb8..db38434 100644
--- a/src/module/project/ui/create_project.tsx
+++ b/src/module/project/ui/create_project.tsx
@@ -1,5 +1,5 @@
"use client";
-import { LayoutDrawer, LayoutNavbarNew, WARNA } from "@/module/_global";
+import { globalRole, LayoutDrawer, LayoutNavbarNew, WARNA } from "@/module/_global";
import { Avatar, Box, Button, Center, Divider, Flex, Grid, Group, rem, Select, SimpleGrid, Stack, Text, TextInput } from "@mantine/core";
import { useRouter, useSearchParams } from "next/navigation";
import React, { useRef, useState } from "react";
@@ -29,7 +29,6 @@ export default function CreateProject() {
const [openDrawerTask, setOpenDrawerTask] = useState(false)
const [isModal, setModal] = useState(false)
const [dataGroup, setDataGroup] = useState([]);
- const [roleUser, setRoleUser] = useState("")
const [isChooseAnggota, setChooseAnggota] = useState(false)
const member = useHookstate(globalMemberProject)
const memberValue = member.get() as IFormMemberProject[]
@@ -40,6 +39,8 @@ export default function CreateProject() {
const [listFile, setListFile] = useState([])
const [indexDelFile, setIndexDelFile] = useState(0)
const [indexDelTask, setIndexDelTask] = useState(0)
+ const roleLogin = useHookstate(globalRole)
+
const [body, setBody] = useState({
idGroup: "",
title: "",
@@ -69,12 +70,15 @@ export default function CreateProject() {
toast.error(loadGroup.message);
}
- const loadUser = await funGetUserByCookies();
- setRoleUser(loadUser.idUserRole)
+ if (roleLogin.get() != "supadmin") {
+ const loadUser = await funGetUserByCookies();
+ setBody({ ...body, idGroup: loadUser.idGroup })
+ }
+
}
function onToChooseAnggota() {
- if (roleUser == "supadmin" && body.idGroup == "")
+ if (roleLogin.get() == "supadmin" && body.idGroup == "")
return toast.error("Error! grup harus diisi")
setChooseAnggota(true)
}
@@ -116,7 +120,7 @@ export default function CreateProject() {
toast.error(response.message)
}
} catch (error) {
- console.log(error)
+ console.error(error)
toast.error("Gagal menambahkan kegiatan, coba lagi nanti");
}
}
@@ -137,7 +141,7 @@ export default function CreateProject() {
{
- (roleUser == "supadmin") && (
+ (roleLogin.get() == "supadmin") && (
-
-
- }
-
-
-
-
+ }
+
+
+
+
+
+ {
+ if (!files || _.isEmpty(files))
+ return toast.error('Tidak ada file yang dipilih')
+ setFileForm([...fileForm, files[0]])
+ setListFile([...listFile, { name: files[0].name, extension: files[0].type.split("/")[1] }])
+ }}
+ activateOnClick={false}
+ maxSize={3 * 1024 ** 2}
+ accept={['text/csv', 'image/png', 'image/jpeg', 'image/heic', 'application/pdf']}
+ onReject={(files) => {
+ return toast.error('File yang diizinkan: .csv, .png, .jpg, .heic, .pdf dengan ukuran maksimal 3 MB')
+ }}
+ >
- {/* Drawer pilih file */}
- setOpenDrawer(false)}
- title={"Pilih File"}
- >
-
- {
- if (!files || _.isEmpty(files))
- return toast.error('Tidak ada file yang dipilih')
- setFileForm([...fileForm, files[0]])
- setListFile([...listFile, { name: files[0].name, extension: files[0].type.split("/")[1] }])
- }}
- activateOnClick={false}
- maxSize={3 * 1024 ** 2}
- accept={['text/csv', 'image/png', 'image/jpeg', 'image/heic', 'application/pdf']}
- onReject={(files) => {
- return toast.error('File yang diizinkan: .csv, .png, .jpg, .heic, .pdf dengan ukuran maksimal 3 MB')
- }}
- >
- openRef.current?.()}>
-
-
-
-
-
-
- Pilih file
-
- diperangkat
+
+ {/* Drawer pilih file */}
+ {/* setOpenDrawer(false)}
+ title={"Pilih File"}
+ >
+
+ {
+ if (!files || _.isEmpty(files))
+ return toast.error('Tidak ada file yang dipilih')
+ setFileForm([...fileForm, files[0]])
+ setListFile([...listFile, { name: files[0].name, extension: files[0].type.split("/")[1] }])
+ }}
+ activateOnClick={false}
+ maxSize={3 * 1024 ** 2}
+ accept={['text/csv', 'image/png', 'image/jpeg', 'image/heic', 'application/pdf']}
+ onReject={(files) => {
+ return toast.error('File yang diizinkan: .csv, .png, .jpg, .heic, .pdf dengan ukuran maksimal 3 MB')
+ }}
+ >
+ openRef.current?.()}>
+
+
+
+
-
- {/* router.push("/project/create?page=file-save")}>
+
+ Pilih file
+
+ diperangkat
+
+
+ router.push("/project/create?page=file-save")}>
sudah ada
- */}
-
-
+
+
+ */}
- {/* Drawer hapus file */}
- setOpenDrawerFile(false)}
- title={""}
- >
-
-
- deleteFile(indexDelFile)}>
-
-
-
-
- Hapus File
-
-
-
-
-
+ {/* Drawer hapus file */}
+ setOpenDrawerFile(false)}
+ title={""}
+ >
+
+
+ deleteFile(indexDelFile)}>
+
+
+
+
+ Hapus File
+
+
+
+
+
- {/* Drawer hapus tugas */}
- setOpenDrawerTask(false)}
- title={""}
- >
-
-
- deleteTask(indexDelTask)}>
-
-
-
-
- Hapus Tugas
-
-
-
-
-
+ {/* Drawer hapus tugas */}
+ setOpenDrawerTask(false)}
+ title={""}
+ >
+
+
+ deleteTask(indexDelTask)}>
+
+
+
+
+ Hapus Tugas
+
+
+
+
+
- setModal(false)}
- description="Apakah Anda yakin ingin menambahkan data?"
- onYes={(val) => {
- if (val) {
- onSubmit()
- }
- setModal(false)
- }} />
-
- );
+ setModal(false)}
+ description="Apakah Anda yakin ingin menambahkan data?"
+ onYes={(val) => {
+ if (val) {
+ onSubmit()
+ }
+ setModal(false)
+ }} />
+
+ );
}
diff --git a/src/module/project/ui/create_users_project.tsx b/src/module/project/ui/create_users_project.tsx
index 1b113f6..b4b2e29 100644
--- a/src/module/project/ui/create_users_project.tsx
+++ b/src/module/project/ui/create_users_project.tsx
@@ -1,11 +1,11 @@
"use client"
import { LayoutNavbarNew, WARNA } from '@/module/_global';
import { useHookstate } from '@hookstate/core';
-import { Avatar, Box, Button, Center, Input, rem, SimpleGrid, Skeleton, Stack, Text, TextInput } from '@mantine/core';
+import { ActionIcon, Avatar, Box, Button, Center, Input, rem, SimpleGrid, Skeleton, Stack, Text, TextInput } from '@mantine/core';
import { useShallowEffect } from '@mantine/hooks';
import { useRouter } from 'next/navigation';
import React, { useState } from 'react';
-import { HiMagnifyingGlass } from 'react-icons/hi2';
+import { HiChevronLeft, HiMagnifyingGlass } from 'react-icons/hi2';
import { funGetAllmember, TypeUser } from '@/module/user';
import { funGetUserByCookies } from '@/module/auth';
import toast from 'react-hot-toast';
@@ -62,7 +62,13 @@ export default function CreateUsersProject({ grup, onClose }: { grup?: string, o
return (
-
+
+ { onClose(true) }} bg={WARNA.bgIcon} size="lg" radius="lg" aria-label="Settings">
+
+
+
+ } title="Pilih Anggota" menu />
-
-
-
+
+
+
);
}
diff --git a/src/module/project/ui/edit_task_project.tsx b/src/module/project/ui/edit_task_project.tsx
index 828d520..43038e1 100644
--- a/src/module/project/ui/edit_task_project.tsx
+++ b/src/module/project/ui/edit_task_project.tsx
@@ -35,7 +35,7 @@ export default function EditTaskProject() {
toast.error(res.message)
}
} catch (error) {
- console.log(error)
+ console.error(error)
toast.error("Gagal mengedit Kegiatan, coba lagi nanti")
}
}
diff --git a/src/module/project/ui/list_anggota_detail_project.tsx b/src/module/project/ui/list_anggota_detail_project.tsx
index 964015c..8d7bfa0 100644
--- a/src/module/project/ui/list_anggota_detail_project.tsx
+++ b/src/module/project/ui/list_anggota_detail_project.tsx
@@ -1,5 +1,5 @@
'use client'
-import { LayoutDrawer, SkeletonSingle, WARNA } from '@/module/_global';
+import { globalRole, LayoutDrawer, SkeletonSingle, WARNA } from '@/module/_global';
import { Avatar, Box, Flex, Grid, Group, SimpleGrid, Stack, Text } from '@mantine/core';
import React, { useState } from 'react';
import { funDeleteMemberProject, funGetOneProjectById } from '../lib/api_project';
@@ -10,6 +10,7 @@ import { IDataMemberProject } from '../lib/type_project';
import { FaUser } from 'react-icons/fa6';
import { IoIosCloseCircle } from 'react-icons/io';
import LayoutModal from '@/module/_global/layout/layout_modal';
+import { useHookstate } from '@hookstate/core';
export default function ListAnggotaDetailProject() {
@@ -20,6 +21,7 @@ export default function ListAnggotaDetailProject() {
const [isOpenModal, setOpenModal] = useState(false)
const [dataChoose, setDataChoose] = useState({ id: '', name: '' })
const router = useRouter()
+ const roleLogin = useHookstate(globalRole)
async function getOneData() {
try {
@@ -93,7 +95,7 @@ export default function ListAnggotaDetailProject() {
{
setDataChoose({ id: v.idUser, name: v.name })
- setOpenDrawer(true)
+ setOpenDrawer(true)
}}
>
@@ -138,14 +140,17 @@ export default function ListAnggotaDetailProject() {
- { setOpenModal(true) }} justify={'center'} align={'center'} direction={'column'} >
-
-
-
-
- Keluarkan anggota
-
-
+ {
+ (roleLogin.get() != "user" && roleLogin.get() != "coadmin") &&
+ { setOpenModal(true) }} justify={'center'} align={'center'} direction={'column'} >
+
+
+
+
+ Keluarkan anggota
+
+
+ }
diff --git a/src/module/project/ui/list_project.tsx b/src/module/project/ui/list_project.tsx
index 0c706d6..2fca14c 100644
--- a/src/module/project/ui/list_project.tsx
+++ b/src/module/project/ui/list_project.tsx
@@ -183,7 +183,11 @@ export default function ListProject() {
- +{v.member - 1}
+
+ {
+ v.member > 0 ? '+' + (v.member - 1) : "0"
+ }
+
diff --git a/src/module/project/ui/navbar_detail_project.tsx b/src/module/project/ui/navbar_detail_project.tsx
index 6c5b2c5..3ff93ad 100644
--- a/src/module/project/ui/navbar_detail_project.tsx
+++ b/src/module/project/ui/navbar_detail_project.tsx
@@ -1,5 +1,5 @@
'use client'
-import { LayoutDrawer, LayoutNavbarNew, WARNA } from '@/module/_global';
+import { globalRole, LayoutDrawer, LayoutNavbarNew, WARNA } from '@/module/_global';
import { ActionIcon, Box, Flex, SimpleGrid, Stack, Text } from '@mantine/core';
import { useParams, useRouter } from 'next/navigation';
import React, { useState } from 'react';
@@ -10,12 +10,14 @@ import { IoAddCircle } from 'react-icons/io5';
import { MdCancel } from 'react-icons/md';
import { funGetOneProjectById } from '../lib/api_project';
import { useShallowEffect } from '@mantine/hooks';
+import { useHookstate } from '@hookstate/core';
export default function NavbarDetailProject() {
const router = useRouter()
const param = useParams<{ id: string }>()
const [name, setName] = useState('')
const [isOpen, setOpen] = useState(false)
+ const roleLogin = useHookstate(globalRole)
async function getOneData() {
try {
@@ -73,22 +75,6 @@ export default function NavbarDetailProject() {
- {
- router.push(param.id + '/add-member')
- }}
- >
-
-
-
-
- Tambah anggota
-
-
-
- { router.push(param.id + '/edit') }}
- >
-
-
-
-
- Edit
-
-
+ {
+ (roleLogin.get() != "user" && roleLogin.get() != "coadmin") &&
+ <>
+ {
+ router.push(param.id + '/add-member')
+ }}
+ >
+
+
+
+
+ Tambah anggota
+
+
- { router.push(param.id + '/cancel') }}
- >
-
-
-
-
- Batal
-
-
+ { router.push(param.id + '/edit') }}
+ >
+
+
+
+
+ Edit
+
+
+
+ { router.push(param.id + '/cancel') }}
+ >
+
+
+
+
+ Batal
+
+
+ >
+ }