From 2adb1bfd07f868c86010b905ddffdc5bd4bf7ca3 Mon Sep 17 00:00:00 2001 From: amal Date: Thu, 10 Jul 2025 11:56:02 +0800 Subject: [PATCH] upd: pembatasan user role pada kegiatan --- app/(application)/project/create.tsx | 55 +++++++++++++++--------- components/project/headerProjectList.tsx | 19 ++++---- 2 files changed, 46 insertions(+), 28 deletions(-) diff --git a/app/(application)/project/create.tsx b/app/(application)/project/create.tsx index cca7657..6ffc74f 100644 --- a/app/(application)/project/create.tsx +++ b/app/(application)/project/create.tsx @@ -38,6 +38,8 @@ export default function CreateProject() { const entitiesMember = useSelector((state: any) => state.memberChoose); const taskCreate = useSelector((state: any) => state.taskCreate); const update = useSelector((state: any) => state.projectUpdate) + const entityUser = useSelector((state: any) => state.user); + const userLogin = useSelector((state: any) => state.entities) const [fileForm, setFileForm] = useState([]) const [indexDelFile, setIndexDelFile] = useState(0) const [disableBtn, setDisableBtn] = useState(true) @@ -114,7 +116,7 @@ export default function CreateProject() { fd.append("data", JSON.stringify( { user: hasil, task: taskCreate, member: entitiesMember, ...dataForm } )) - + const response = await apiCreateProject(fd) if (response.success) { dispatch(setUpdateProject({ ...update, data: !update.data })) @@ -185,19 +187,25 @@ export default function CreateProject() { /> - { - setValChoose(chooseGroup.val); - setValSelect("group"); - setSelect(true); - }} - error={error.group} - errorText="Lembaga Desa tidak boleh kosong" - /> + { + (entityUser.role == "supadmin" || entityUser.role == "developer") + && + ( + { + setValChoose(chooseGroup.val); + setValSelect("group"); + setSelect(true); + }} + error={error.group} + errorText="Lembaga Desa tidak boleh kosong" + /> + ) + } { - if (chooseGroup.val != "") { + if (entityUser.role == "supadmin" || entityUser.role == "developer") { + if (chooseGroup.val != "") { + setSelect(true); + setValSelect("member"); + } else { + ToastAndroid.show( + "Pilih Lembaga Desa terlebih dahulu", + ToastAndroid.SHORT + ); + } + } else { + validationForm('group', userLogin.idGroup, userLogin.group); + setValChoose(userLogin.idGroup) setSelect(true); setValSelect("member"); - } else { - ToastAndroid.show( - "Pilih Lembaga Desa terlebih dahulu", - ToastAndroid.SHORT - ); } }} error={error.member} diff --git a/components/project/headerProjectList.tsx b/components/project/headerProjectList.tsx index 44e016e..43e9465 100644 --- a/components/project/headerProjectList.tsx +++ b/components/project/headerProjectList.tsx @@ -30,14 +30,17 @@ export default function HeaderRightProjectList() { }} /> } - } - title="Filter" - onPress={() => { - setVisible(false) - setFilter(true) - }} - /> + { + (entityUser.role == 'supadmin' || entityUser.role == 'developer') && + } + title="Filter" + onPress={() => { + setVisible(false) + setFilter(true) + }} + /> + }