wibu/sistem-desa-mandiri
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #198 from bipproduction/amalia/05-september-24

Browse Source 
upd: user
This commit is contained in:
Amalia
2024-09-05 11:27:51 +08:00
committed by GitHub
parent 9c6c3b6e92 0cc9f56ec8
commit 26d7ba7c46
3 changed files with 50 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/module/user/member/ui/edit_member.tsx
View File

@@ -1,5 +1,5 @@
'use client'
import { WARNA } from "@/module/_global";
import { globalRole, WARNA } from "@/module/_global";
import LayoutModal from "@/module/_global/layout/layout_modal";
import { funGetAllGroup, IDataGroup } from "@/module/group";
import { funGetAllPosition } from "@/module/position/lib/api_position";
@@ -14,6 +14,8 @@ import { funEditMember, funGetOneMember, funGetRoleUser } from "../lib/api_membe
import _ from "lodash";
import { Dropzone } from "@mantine/dropzone";
import { FaCamera } from "react-icons/fa6";
import { useHookstate } from "@hookstate/core";
import { valueRoleUser } from "../../lib/val_user";
export default function EditMember({ id }: { id: string }) {
@@ -26,6 +28,7 @@ export default function EditMember({ id }: { id: string }) {
const openRef = useRef<() => void>(null)
const [img, setIMG] = useState<any | null>()
const [loading, setLoading] = useState(true)
const roleLogin = useHookstate(globalRole)
const [touched, setTouched] = useState({
nik: false,
name: false,
@@ -91,8 +94,7 @@ export default function EditMember({ id }: { id: string }) {
async function getAllUserRole() {
try {
const res = await funGetRoleUser();
setListUserRole(res.data)
setListUserRole(valueRoleUser.filter((v) => v.login == roleLogin.get())[0]?.data);
} catch (error) {
console.error(error)
}
@@ -191,7 +193,7 @@ export default function EditMember({ id }: { id: string }) {
:
<>
<Select
{/* <Select
placeholder="Pilih Grup" label="Grup" w={"100%"} size="md" required withAsterisk radius={30}
styles={{
input: {
@@ -219,7 +221,7 @@ export default function EditMember({ id }: { id: string }) {
data.idGroup == "" ? "Grup Tidak Boleh Kosong" : null
)
}
/>
/> */}
<Select
placeholder="Pilih Jabatan" label="Jabatan" w={"100%"} size="md" required withAsterisk radius={30}
styles={{

7
src/module/user/member/ui/navbar_detail_member.tsx
View File

@@ -13,6 +13,7 @@ import { funGetOneMember } from "../lib/api_member";
import toast from "react-hot-toast";
import { IListMember, IMember } from "../lib/type_member";
import { useHookstate } from "@hookstate/core";
import { valueRoleUser } from "../../lib/val_user";
export default function NavbarDetailMember({ id }: IMember) {
@@ -21,6 +22,7 @@ export default function NavbarDetailMember({ id }: IMember) {
const [selectId, setSelectId] = useState<string>('');
const [active, setActive] = useState<boolean>(false)
const [loading, setLoading] = useState(true)
const [isEdit, setEdit] = useState(false)
const roleLogin = useHookstate(globalRole)
useShallowEffect(() => {
@@ -36,6 +38,7 @@ export default function NavbarDetailMember({ id }: IMember) {
setDataOne(respose.data)
setActive(respose.data?.isActive)
setSelectId(respose.data?.id)
setEdit(valueRoleUser.filter((v) => v.login == roleLogin.get())[0]?.data.some((i: any) => i.id == respose.data.idUserRole))
} else {
toast.error(respose.message)
}
@@ -57,7 +60,7 @@ export default function NavbarDetailMember({ id }: IMember) {
<Group justify="space-between">
<LayoutIconBack />
{
(roleLogin.get() != "user") &&
(roleLogin.get() != "user") && isEdit &&
<ActionIcon onClick={() => setOpen(true)} variant="light" bg={WARNA.bgIcon} size="lg" radius="lg" aria-label="Info">
<HiMenu size={20} color='white' />
</ActionIcon>
@@ -78,7 +81,7 @@ export default function NavbarDetailMember({ id }: IMember) {
</>
:
<>
<Text c={'white'} fw={'bold'} fz={25}>{dataOne?.name}</Text>
<Text c={'white'} fw={'bold'} fz={25} ta={"center"}>{dataOne?.name}</Text>
<Text c={'white'} fw={'lighter'} fz={15}>{dataOne?.group} - {dataOne?.position}</Text>
</>
}