Merge pull request #362 from bipproduction/join

Join

src/app/(application)/project/page.tsx

@@ -1,10 +1,14 @@
-import { ViewFilter } from '@/module/_global';
+import { ViewFilter, ViewFilterData } from '@/module/_global';
 import { TabProject } from '@/module/project';
 import React from 'react';
 
 function Page({ searchParams }: { searchParams: { page: string } }) {
   if (searchParams.page == 'filter')
     return <ViewFilter linkFilter='project' />
+
+  if (searchParams.page == 'filter-data')
+    return <ViewFilterData linkFilter='project' />
+
   return (
     <TabProject />
   );

src/app/api/division/route.ts

@@ -18,6 +18,7 @@ export async function GET(request: Request) {
       const roleUser = user.idUserRole
       const { searchParams } = new URL(request.url);
       const idGroup = searchParams.get("group");
+      const kategori = searchParams.get("cat");
       const name = searchParams.get('search');
       const page = searchParams.get('page');
       const active = searchParams.get("active");
@@ -30,6 +31,7 @@ export async function GET(request: Request) {
       }
 
 
+      // JIKA (ROLE BUKAN USER DAN COADMIN) ATAU SEMUA ROLE DG KATEGORI == SEMUA
       let kondisi: any = {
          isActive: active == 'false' ? false : true,
          idVillage: String(villaId),
@@ -40,7 +42,10 @@ export async function GET(request: Request) {
          }
       }
 
+
+      // JIKA ROLE = USER ATAU COADMIN DAN KATEGORI != SEMUA (DIVISI SAYA)
       if (roleUser != "supadmin" && roleUser != "cosupadmin" && roleUser != "admin") {
+         if (kategori != "semua") {
             kondisi = {
                isActive: active == 'false' ? false : true,
                idVillage: String(villaId),
@@ -57,6 +62,7 @@ export async function GET(request: Request) {
                }
             }
          }
+      }
 
       const totalData = await prisma.division.count({
          where: kondisi

src/app/api/project/[id]/member/route.ts

@@ -133,13 +133,13 @@ export async function GET(request: Request, context: { params: { id: string } })
         const member = await prisma.user.findMany({
             where: {
                 idGroup: String(groupId),
-                id: {
+                // id: {
-                    not: String(userId)
+                //     not: String(userId)
-                },
+                // },
-                OR: [
+                // OR: [
-                    { idUserRole: 'coadmin', },
+                //     { idUserRole: 'coadmin', },
-                    { idUserRole: 'user', }
+                //     { idUserRole: 'user', }
-                ],
+                // ],
                 isActive: true,
                 name: {
                     contains: (name == undefined || name == "null") ? "" : name,
@@ -149,6 +149,7 @@ export async function GET(request: Request, context: { params: { id: string } })
             },
             select: {
                 id: true,
+                idUserRole: true,
                 name: true,
                 email: true,
                 img: true,
@@ -172,7 +173,8 @@ export async function GET(request: Request, context: { params: { id: string } })
             idUser: v.id,
             name: v.name,
             email: v.email,
-            img: v.img
+            img: v.img,
+            idUserRole: v.idUserRole
         }))
 
         const dataFix = {

src/app/api/project/route.ts

@@ -20,6 +20,7 @@ export async function GET(request: Request) {
         const status = searchParams.get('status');
         const idGroup = searchParams.get("group");
         const page = searchParams.get('page');
+        const kategori = searchParams.get('cat');
         const dataSkip = Number(page) * 10 - 10;
         const villageId = user.idVillage
         const userId = user.id
@@ -41,6 +42,8 @@ export async function GET(request: Request) {
             return NextResponse.json({ success: false, message: "Gagal mendapatkan data kegiatan, data tidak ditemukan", }, { status: 404 });
         }
 
+
+        // JIKA (ROLE BUKAN USER DAN COADMIN) ATAU SEMUA ROLE DG KATEGORI == SEMUA
         let kondisi: any = {
             isActive: true,
             idVillage: String(villageId),
@@ -52,7 +55,10 @@ export async function GET(request: Request) {
             status: (status == "0" || status == "1" || status == "2" || status == "3") ? Number(status) : 0
         }
 
+
+        // JIKA ROLE = USER ATAU COADMIN DAN KATEGORI != SEMUA (KEGIATAN SAYA)
         if (roleUser != "supadmin" && roleUser != "cosupadmin" && roleUser != "admin") {
+            if (kategori != "semua") {
                 kondisi = {
                     isActive: true,
                     idVillage: String(villageId),
@@ -69,6 +75,7 @@ export async function GET(request: Request) {
                     }
                 }
             }
+        }
 
 
         const data = await prisma.project.findMany({

src/app/api/user/profile/route.ts

@@ -66,7 +66,7 @@ export async function PUT(request: Request) {
         const file = body.get("file") as File;
         const data = body.get("data");
 
-        const { name, email, phone, nik, gender } = JSON.parse(data as string)
+        const { name, email, phone, nik, gender, idPosition } = JSON.parse(data as string)
 
         const cekNIK = await prisma.user.count({
             where: {
@@ -108,7 +108,8 @@ export async function PUT(request: Request) {
                 email: email,
                 phone: "62" + phone,
                 nik: nik,
-                gender: gender
+                gender: gender,
+                idPosition: idPosition
             },
             select: {
                 img: true

src/app/api/version-app/route.ts

@@ -2,7 +2,7 @@ import { NextResponse } from "next/server";
 
 export async function GET(request: Request) {
    try {
-      return NextResponse.json({ success: true, version: "0.2.8", tahap: "beta" }, { status: 200 });
+      return NextResponse.json({ success: true, version: "0.2.9", tahap: "beta" }, { status: 200 });
    } catch (error) {
       console.error(error);
       return NextResponse.json({ success: false, version: "Gagal mendapatkan version, coba lagi nanti (error: 500)", reason: (error as Error).message, }, { status: 500 });

src/module/_global/index.ts

@@ -27,6 +27,7 @@ import SkeletonUser from "./components/skeleton_user";
 import SkeletonList from "./components/skeleton_list";
 import { funViewDir } from "./fun/view_dir";
 import { funSendWebPush } from "./fun/send_web_push";
+import ViewFilterData from "./view/view_filter_kategori_data";
 
 export { WARNA };
 export { LayoutLogin };
@@ -63,3 +64,4 @@ export { SkeletonList }
 export { keyWibu }
 export { funViewDir }
 export { funSendWebPush }
+export { ViewFilterData }

src/module/_global/view/view_filter_kategori_data.tsx

@@ -0,0 +1,84 @@
+'use client'
+import { useHookstate } from "@hookstate/core";
+import { Box, Button, Divider, Group, rem, Text } from "@mantine/core";
+import { useShallowEffect } from "@mantine/hooks";
+import { useRouter, useSearchParams } from "next/navigation";
+import { useState } from "react";
+import { FaCheck } from "react-icons/fa6";
+import { TEMA } from "../bin/val_global";
+import LayoutNavbarNew from "../layout/layout_navbar_new";
+
+export default function ViewFilterData({ linkFilter }: { linkFilter: string }) {
+   const [selectedFilter, setSelectedFilter] = useState<any>('');
+   const data = [
+      {
+         id: 1,
+         data: "data-saya",
+         name: "Kegiatan Saya",
+      },
+      {
+         id: 2,
+         data: "semua",
+         name: "Semua Kegiatan",
+      },
+   ]
+   const searchParams = useSearchParams()
+   const kategori = searchParams.get('cat')
+   const tema = useHookstate(TEMA)
+
+
+
+   useShallowEffect(() => {
+      if (kategori == "null" || kategori == "undefined" || kategori == '') {
+         setSelectedFilter("data-saya")
+      } else {
+         setSelectedFilter(kategori)
+      }
+   }, [kategori]);
+
+   const router = useRouter()
+
+   return (
+      <Box>
+         <LayoutNavbarNew back='' title='Filter' menu />
+         <Box p={20}>
+            {
+               data.map((filter) => (
+                  <Box key={filter.id}>
+                     <Group
+                        justify="space-between"
+                        align="center"
+                        mb={10}
+                        onClick={() => setSelectedFilter(filter.data)}
+                     >
+                        <Text fw={selectedFilter === filter.data ? 'bold' : 'normal'}>
+                           {filter.name}
+                        </Text>
+                        {selectedFilter === filter.data && <FaCheck size={25} />}
+                     </Group>
+                     <Divider my={"sm"} />
+                  </Box>
+               ))
+
+            }
+         </Box>
+         <Box pos={'fixed'} bottom={0} p={rem(20)} w={"100%"} style={{
+            maxWidth: rem(550),
+            zIndex: 999,
+            backgroundColor: `${tema.get().bgUtama}`,
+         }}>
+            <Button
+               fullWidth
+               radius={100}
+               size="lg"
+               color={tema.get().utama}
+               onClick={() => {
+                  router.push(`/${linkFilter}?cat=` + selectedFilter)
+               }}
+            >
+               Terapkan
+            </Button>
+         </Box>
+      </Box>
+   );
+}

src/module/division_new/ui/create_anggota_division.tsx

@@ -51,8 +51,9 @@ export default function CreateAnggotaDivision() {
       const user = await funGetUserByCookies();
 
       if (res.success) {
-        const dariUserLogin = res.data.filter((i: any) => i.id != user.id)
+        // const dariUserLogin = res.data.filter((i: any) => i.id != user.id)
-        const fixListUser = dariUserLogin.filter((i: any) => i.idUserRole == 'coadmin' || i.idUserRole == 'user')
+        // const fixListUser = dariUserLogin.filter((i: any) => i.idUserRole == 'coadmin' || i.idUserRole == 'user')
+        const fixListUser = res.data.filter((i: any) => i.idUserRole != 'supadmin')
         setDataMember(fixListUser)
       } else {
         toast.error(res.message)

src/module/division_new/ui/list_division.tsx

@@ -30,6 +30,7 @@ export default function ListDivision() {
   const [isRefresh, setRefresh] = useState(false)
   const notifLoadPage = useHookstate(globalNotifPage)
   const status = searchParams.get('active')
+  const kategori = searchParams.get('cat')
 
 
   const handleList = () => {
@@ -43,7 +44,7 @@ export default function ListDivision() {
       if (isPage == 1) {
         setData([])
       }
-      const response = await funGetAllDivision('?active=' + status + '&search=' + searchQuery + '&group=' + group + '&page=' + isPage)
+      const response = await funGetAllDivision('?active=' + status + '&search=' + searchQuery + '&group=' + group + '&page=' + isPage + '&cat=' + kategori);
       if (response.success) {
         setJumlah(response.total)
         setNameGroup(response.filter.name)
@@ -72,7 +73,7 @@ export default function ListDivision() {
   useShallowEffect(() => {
     setPage(1)
     fetchData(true)
-  }, [status, searchQuery])
+  }, [status, searchQuery, kategori])
 
 
 
@@ -156,7 +157,7 @@ export default function ListDivision() {
           </Grid.Col>
         </Grid>
         <Box pt={20}>
-          {roleLogin.get() == 'supadmin' && <Text>Filter by: {nameGroup}</Text>}
+          {roleLogin.get() == 'supadmin' && <Text>Filter : {nameGroup}</Text>}
           <Box bg={tema.get().bgTotalKegiatan} p={10} style={{ borderRadius: 10 }}>
             <Text fw={'bold'} c={tema.get().utama}>Total Divisi</Text>
             <Flex justify={'center'} align={'center'} h={'100%'}>

src/module/division_new/ui/navbar_create_users.tsx

@@ -1,22 +1,19 @@
 "use client"
-import { LayoutNavbarNew, SkeletonList, SkeletonSingle, TEMA } from '@/module/_global';
+import { LayoutNavbarNew, SkeletonList, TEMA } from '@/module/_global';
-import { useHookstate } from '@hookstate/core';
-import { ActionIcon, Avatar, Box, Button, Center, Divider, Flex, Grid, Indicator, Input, rem, SimpleGrid, Skeleton, Stack, Text, TextInput } from '@mantine/core';
-import { useMediaQuery, useShallowEffect } from '@mantine/hooks';
-import { useRouter } from 'next/navigation';
-import React, { useState } from 'react';
-import { HiChevronLeft, HiMagnifyingGlass } from 'react-icons/hi2';
 import { funGetAllmember, TypeUser } from '@/module/user';
-import { funGetUserByCookies } from '@/module/auth';
+import { useHookstate } from '@hookstate/core';
-import toast from 'react-hot-toast';
-import { globalMemberDivision } from '../lib/val_division';
-import { IoArrowBackOutline, IoClose } from 'react-icons/io5';
 import { Carousel } from '@mantine/carousel';
+import { ActionIcon, Avatar, Box, Button, Center, Divider, Flex, Grid, Indicator, rem, Stack, Text, TextInput } from '@mantine/core';
+import { useMediaQuery, useShallowEffect } from '@mantine/hooks';
+import { useState } from 'react';
+import toast from 'react-hot-toast';
 import { FaCheck } from 'react-icons/fa6';
+import { HiChevronLeft, HiMagnifyingGlass } from 'react-icons/hi2';
+import { IoArrowBackOutline, IoClose } from 'react-icons/io5';
+import { globalMemberDivision } from '../lib/val_division';
 
 
 export default function NavbarCreateUsers({ grup, onClose }: { grup?: string, onClose: (val: any) => void }) {
-  const router = useRouter()
   const member = useHookstate(globalMemberDivision)
   const [selectedFiles, setSelectedFiles] = useState<any>([]);
   const [dataMember, setDataMember] = useState<TypeUser>([])
@@ -37,10 +34,11 @@ export default function NavbarCreateUsers({ grup, onClose }: { grup?: string, on
   async function loadData(search: string) {
     setLoading(true)
     const res = await funGetAllmember('?active=true&group=' + grup + '&search=' + search);
-    const user = await funGetUserByCookies();
+    // const user = await funGetUserByCookies();
 
     if (res.success) {
-      setDataMember(res.data.filter((i: any) => i.id != user.id))
+      // setDataMember(res.data.filter((i: any) => i.id != user.id))
+      setDataMember(res.data.filter((i: any) => i.idUserRole != "supadmin"))
 
       // cek data member sebelumnya
       if (member.length > 0) {

src/module/division_new/ui/tab_list_division.tsx

@@ -4,7 +4,7 @@ import { useHookstate } from "@hookstate/core";
 import { Box, rem, Tabs } from "@mantine/core";
 import { useRouter, useSearchParams } from "next/navigation";
 import { IoMdCheckmarkCircleOutline } from "react-icons/io";
-import { IoCloseCircleOutline } from "react-icons/io5";
+import { IoCloseCircleOutline, IoFileTrayOutline, IoFileTrayStackedOutline } from "react-icons/io5";
 import ListDivision from "./list_division";
 
 export default function TabListDivision() {
@@ -13,6 +13,7 @@ export default function TabListDivision() {
    const searchParams = useSearchParams();
    const status = searchParams.get("active");
    const group = searchParams.get("group");
+   const kategori = searchParams.get("cat");
    const tema = useHookstate(TEMA)
    const roleLogin = useHookstate(globalRole)
 
@@ -22,11 +23,13 @@ export default function TabListDivision() {
             variant="pills"
             color={tema.get().bgFiturHome}
             radius="xl"
-            defaultValue={status == "false" ? "false" : "true"}
+            defaultValue={status == "false" || kategori == "semua" ? "false" : "true"}
          >
             {
-               roleLogin.get() != '' ?
+               roleLogin.get() != ''
-                  (roleLogin.get() != "user" && roleLogin.get() != "coadmin") &&
+                  ?
+                  (roleLogin.get() != "user" && roleLogin.get() != "coadmin")
+                     ?
                      <Tabs.List
                         bg={"white"}
                         style={{
@@ -56,6 +59,36 @@ export default function TabListDivision() {
                            Tidak Aktif
                         </Tabs.Tab>
                      </Tabs.List>
+                     :
+                     <Tabs.List
+                        bg={"white"}
+                        style={{
+                           border: `1px solid ${"#EDEDED"}`,
+                           padding: 5,
+                           borderRadius: 100,
+                        }}
+                     >
+                        <Tabs.Tab
+                           value="true"
+                           w={"45%"}
+                           leftSection={<IoFileTrayOutline style={iconStyle} />}
+                           onClick={() => {
+                              router.push("/division");
+                           }}
+                        >
+                           Divisi Saya
+                        </Tabs.Tab>
+                        <Tabs.Tab
+                           value="false"
+                           w={"53%"}
+                           leftSection={<IoFileTrayStackedOutline style={iconStyle} />}
+                           onClick={() => {
+                              router.push("/division?cat=semua");
+                           }}
+                        >
+                           Semua Divisi
+                        </Tabs.Tab>
+                     </Tabs.List>
                   : <></>
             }
             <ListDivision />

src/module/home/ui/view_search.tsx

@@ -139,7 +139,7 @@ export default function ViewSearch() {
                                             c={tema.get().utama}
                                             truncate="end"
                                           >
-                                            {_.startCase(v.name)}
+                                            {_.upperFirst(v.name)}
                                           </Text>
                                           <Text fw={"lighter"} fz={12} truncate="end">
                                             {v.group + " - " + v.position}

src/module/position/ui/list_position_active.tsx

@@ -78,7 +78,7 @@ export default function ListPositionActive() {
         placeholder="Pencarian"
         onChange={(e) => setSearchQuery(e.target.value)}
       />
-      {roleLogin.get() == 'supadmin' && <Text mt={10}>Filter by: {nameGroup}</Text>}
+      {roleLogin.get() == 'supadmin' && <Text mt={10}>Filter : {nameGroup}</Text>}
       {loading ? Array(6).fill(null).map((_, i) => (
         <Box key={i} mb={roleLogin.get() == 'supadmin' ? "20" : "0"} mt={roleLogin.get() == 'supadmin' ? "0" : "20"}>
           <Group

src/module/project/ui/add_member_detail_project.tsx

@@ -40,7 +40,8 @@ export default function AddMemberDetailProject() {
       setLoading(true)
       const response = await funGetAllMemberById('?search=' + searchQuery, param.id)
       if (response.success) {
-        setData(response.data.member)
+        // setData(response.data.member)
+        setData(response.data.member.filter((i: any) => i.idUserRole != 'supadmin'))
       } else {
         toast.error(response.message)
       }
@@ -243,7 +244,7 @@ export default function AddMemberDetailProject() {
               <Text c="dimmed" ta={"center"} fs={"italic"}>Tidak ada anggota</Text>
             </Stack>
             :
-            <Box mt={15} mb={100}>
+            <Box mt={100} mb={100}>
               {isData.map((v, i) => {
                 const isSelected = selectedFiles.some((i: any) => i?.idUser == v.idUser);
                 const found = isDataMember.some((i: any) => i.idUser == v.idUser)

src/module/project/ui/create_users_project.tsx

@@ -1,6 +1,5 @@
 "use client"
 import { LayoutNavbarNew, SkeletonList, TEMA } from '@/module/_global';
-import { funGetUserByCookies } from '@/module/auth';
 import { funGetAllmember, TypeUser } from '@/module/user';
 import { useHookstate } from '@hookstate/core';
 import { Carousel } from '@mantine/carousel';
@@ -36,9 +35,10 @@ export default function CreateUsersProject({ grup, onClose }: { grup?: string, o
     try {
       setLoading(true)
       const res = await funGetAllmember('?active=true&group=' + grup + '&search=' + search);
-      const user = await funGetUserByCookies();
+      // const user = await funGetUserByCookies();
       if (res.success) {
-        setDataMember(res.data.filter((i: any) => i.id != user.id && i.idUserRole != 'supadmin' && i.idUserRole != 'cosupadmin'))
+        // setDataMember(res.data.filter((i: any) => i.id != user.id && i.idUserRole != 'supadmin' && i.idUserRole != 'cosupadmin'))
+        setDataMember(res.data.filter((i: any) => i.idUserRole != 'supadmin'))
         // cek data member sebelumnya
         if (member.length > 0) {
           setSelectedFiles(JSON.parse(JSON.stringify(member.get())))

src/module/project/ui/list_project.tsx

@@ -20,6 +20,7 @@ export default function ListProject() {
   const searchParams = useSearchParams()
   const status = searchParams.get('status')
   const group = searchParams.get('group')
+  const kategori = searchParams.get('cat')
   const [searchQuery, setSearchQuery] = useState('')
   const roleLogin = useHookstate(globalRole)
   const [nameGroup, setNameGroup] = useState('')
@@ -43,7 +44,7 @@ export default function ListProject() {
       if (isPage == 1) {
         setData([])
       }
-      const response = await funGetAllProject('?status=' + status + '&search=' + searchQuery + '&group=' + group + '&page=' + isPage)
+      const response = await funGetAllProject('?status=' + status + '&search=' + searchQuery + '&group=' + group + '&page=' + isPage + '&cat=' + kategori);
       if (response.success) {
         setNameGroup(response.filter.name)
         setTotalData(response.total)
@@ -67,7 +68,7 @@ export default function ListProject() {
   useShallowEffect(() => {
     setPage(1)
     fetchData(true);
-  }, [status, searchQuery]);
+  }, [status, searchQuery, kategori]);
 
 
   useShallowEffect(() => {
@@ -152,7 +153,8 @@ export default function ListProject() {
         </Grid.Col>
       </Grid>
       <Box pt={20}>
-        {roleLogin.get() == 'supadmin' && <Text mb={5}>Filter by: {nameGroup}</Text>}
+        {roleLogin.get() == 'supadmin' && <Text mb={5}>Filter : {nameGroup}</Text>}
+        {(roleLogin.get() == 'user' || roleLogin.get() == 'coadmin') && <Text mb={5}>Filter : {(kategori == null || kategori == undefined || kategori == '') ? 'Kegiatan Saya' : 'Semua Kegiatan'}</Text>}
         <Box bg={tema.get().bgTotalKegiatan} p={10} style={{ borderRadius: 10 }}>
           <Text fw={'bold'} c={tema.get().utama}>Total Kegiatan</Text>
           <Flex justify={'center'} align={'center'} h={'100%'}>

src/module/project/ui/menu_drawer_project.tsx

@@ -1,8 +1,7 @@
-import { globalRole, TEMA, WARNA } from '@/module/_global';
+import { globalRole, TEMA } from '@/module/_global';
 import { useHookstate } from '@hookstate/core';
 import { Box, Flex, SimpleGrid, Stack, Text } from '@mantine/core';
 import { useSearchParams } from 'next/navigation';
-import React, { useState } from 'react';
 import { HiOutlineFilter } from 'react-icons/hi';
 import { IoAddCircle } from 'react-icons/io5';
 
@@ -10,14 +9,15 @@ export default function MenuDrawerProject() {
   const roleLogin = useHookstate(globalRole)
   const searchParams = useSearchParams()
   const group = searchParams.get('group')
+  const kategori = searchParams.get('cat')
   const tema = useHookstate(TEMA)
 
   return (
     <Box>
       <Stack pt={10}>
-        <SimpleGrid
+        <SimpleGrid cols={{ base: 2, sm: 2, lg: 3 }} >
-          cols={{ base: 2, sm: 2, lg: 3 }}
+          {
-        >
+            (roleLogin.get() != "user" && roleLogin.get() != "coadmin") &&
             <Flex onClick={() => window.location.href = "/project/create"} justify={'center'} align={'center'} direction={'column'} >
               <Box>
                 <IoAddCircle size={30} color={tema.get().utama} />
@@ -26,6 +26,8 @@ export default function MenuDrawerProject() {
                 <Text c={tema.get().utama}>Tambah Kegiatan</Text>
               </Box>
             </Flex>
+          }
+
           {
             roleLogin.get() == "supadmin" &&
             <Flex onClick={() => window.location.href = "/project?page=filter&group=" + group} justify={'center'} align={'center'} direction={'column'} >
@@ -37,6 +39,18 @@ export default function MenuDrawerProject() {
               </Box>
             </Flex>
           }
+
+          {
+            (roleLogin.get() == "user" || roleLogin.get() == "coadmin") &&
+            <Flex onClick={() => window.location.href = "/project?page=filter-data&cat=" + kategori} justify={'center'} align={'center'} direction={'column'} >
+              <Box>
+                <HiOutlineFilter size={30} color={tema.get().utama} />
+              </Box>
+              <Box>
+                <Text c={tema.get().utama}>Filter</Text>
+              </Box>
+            </Flex>
+          }
         </SimpleGrid>
       </Stack>
     </Box>

src/module/project/ui/tab_project.tsx

@@ -1,16 +1,16 @@
 "use client"
-import { globalRole, LayoutDrawer, LayoutNavbarNew, TEMA } from '@/module/_global';
+import { LayoutDrawer, LayoutNavbarNew, TEMA } from '@/module/_global';
+import { useHookstate } from '@hookstate/core';
 import { ActionIcon, Box, Button, Flex, rem } from '@mantine/core';
-import React, { useState } from 'react';
-import { HiMenu } from 'react-icons/hi';
-import { RiProgress3Line } from "react-icons/ri";
 import { useRouter, useSearchParams } from 'next/navigation';
-import { TbClockPause } from 'react-icons/tb';
+import { useState } from 'react';
+import { HiMenu } from 'react-icons/hi';
 import { IoIosCheckmarkCircleOutline } from 'react-icons/io';
 import { IoCloseCircleOutline } from 'react-icons/io5';
+import { RiProgress3Line } from "react-icons/ri";
+import { TbClockPause } from 'react-icons/tb';
 import ListProject from './list_project';
 import MenuDrawerProject from './menu_drawer_project';
-import { useHookstate } from '@hookstate/core';
 
 export default function TabProject() {
   const [openDrawer, setOpenDrawer] = useState(false)
@@ -18,8 +18,8 @@ export default function TabProject() {
   const searchParams = useSearchParams()
   const status = searchParams.get('status')
   const group = searchParams.get("group");
+  const kategori = searchParams.get("cat");
   const iconStyle = { width: rem(20), height: rem(20) };
-  const roleLogin = useHookstate(globalRole)
   const tema = useHookstate(TEMA)
 
   const dataStatus = [
@@ -48,11 +48,10 @@ export default function TabProject() {
   return (
     <Box>
       <LayoutNavbarNew back='/home' title='Kegiatan'
-        menu={(roleLogin.get() != "user" && roleLogin.get() != "coadmin") ?
+        menu={
           <ActionIcon variant="light" onClick={() => setOpenDrawer(true)} bg={tema.get().bgIcon} size="lg" radius="lg" aria-label="Settings">
             <HiMenu size={20} color='white' />
           </ActionIcon>
-          : <></>
         } />
 
       <Box p={20}>
@@ -76,7 +75,7 @@ export default function TabProject() {
                     : (status == null && item.id == "0") ? "white" : tema.get().utama
                 }
                 key={index}
-                onClick={() => { router.push("?status=" + item.id + "&group=" + group) }}
+                onClick={() => { router.push("?status=" + item.id + "&group=" + group+"&cat="+kategori) }}
                 defaultValue={(status == "1" || status == "2" || status == "3") ? status : "0"}
                 radius={"xl"}
                 bg={
@@ -92,7 +91,6 @@ export default function TabProject() {
           </Flex>
         </Box>
         <ListProject />
-
       </Box>
 
       <LayoutDrawer opened={openDrawer} title={'Menu'} onClose={() => setOpenDrawer(false)}>

src/module/user/member/ui/create_member.tsx

@@ -167,7 +167,7 @@ export default function CreateMember() {
       nilai = false
     }
 
-    if (listData.phone == "" || !(listData.phone.length >= 10 && listData.phone.length <= 15)) {
+    if (listData.phone == "" || !(listData.phone.length >= 9 && listData.phone.length <= 15)) {
       setTouched(touched => ({ ...touched, phone: true }))
       nilai = false
     }

src/module/user/member/ui/edit_member.tsx

@@ -30,6 +30,7 @@ export default function EditMember({ id }: { id: string }) {
    const [loading, setLoading] = useState(true)
    const roleLogin = useHookstate(globalRole)
    const tema = useHookstate(TEMA)
+   const [loadingPosition, setLoadingPosition] = useState(true)
    const [touched, setTouched] = useState({
       nik: false,
       name: false,
@@ -83,6 +84,7 @@ export default function EditMember({ id }: { id: string }) {
 
    async function getAllPosition(val: any) {
       try {
+         setLoadingPosition(true)
          const res = await funGetAllPosition(
             "?active=true" + "&group=" + `${val}`
          );
@@ -90,6 +92,8 @@ export default function EditMember({ id }: { id: string }) {
 
       } catch (error) {
          console.error(error)
+      } finally {
+         setLoadingPosition(false)
       }
    }
 
@@ -155,7 +159,7 @@ export default function EditMember({ id }: { id: string }) {
          }
       } else if (kategori == 'phone') {
          setData({ ...data, phone: val })
-         if (val == "" || !(val.length >= 10 && val.length <= 15)) {
+         if (val == "" || !(val.length >= 9 && val.length <= 15)) {
             setTouched({ ...touched, phone: true })
          } else {
             setTouched({ ...touched, phone: false })
@@ -233,19 +237,14 @@ export default function EditMember({ id }: { id: string }) {
                </Indicator>
             }
             {loading ?
-               <>
+               [...Array(6)].map((_, index) => (
-                  <Skeleton height={40} mt={20} radius={30} />
+                  <Skeleton key={index} height={40} mt={20} radius={30} />
-                  <Skeleton height={40} mt={10} radius={30} />
+               ))
-                  <Skeleton height={40} mt={10} radius={30} />
-                  <Skeleton height={40} mt={10} radius={30} />
-                  <Skeleton height={40} mt={10} radius={30} />
-                  <Skeleton height={40} mt={10} radius={30} />
-                  <Skeleton height={40} mt={10} radius={30} />
-               </>
                :
                <>
                   <Select
-                     placeholder="Pilih Jabatan" label="Jabatan" w={"100%"} size="md" required withAsterisk radius={30}
+                     placeholder={loadingPosition ? "Loading.. " : "Pilih Jabatan"}
+                     label="Jabatan" w={"100%"} size="md" required withAsterisk radius={30}
                      styles={{
                         input: {
                            color: tema.get().utama,

src/module/user/member/ui/tab_list_member.tsx

@@ -10,6 +10,7 @@ import { HiMagnifyingGlass } from "react-icons/hi2"
 import { useWibuRealtime } from "wibu-realtime"
 import { funGetAllmember } from "../lib/api_member"
 import { IListMember } from "../lib/type_member"
+import { funGetUserByCookies } from "@/module/auth"
 
 
 export default function TabListMember() {
@@ -32,16 +33,18 @@ export default function TabListMember() {
       project: "sdm"
    })
    const [isRefresh, setRefresh] = useState(false)
+   const [userLogin, setUserLogin] = useState<any>('')
 
 
    async function getAllUser(loading: boolean) {
       try {
-         if (loading)
+         setLoading(loading)
-            setLoading(true)
          const res = await funGetAllmember('?active=' + status + '&group=' + group + '&search=' + searchQuery + '&page=' + isPage)
+         const user = await funGetUserByCookies()
          if (res.success) {
             setNameGroup(res.filter.name)
             setIdGroup(res.filter.id)
+            setUserLogin(user.id)
             if (isPage == 1) {
                setDataMember(res.data)
             } else {
@@ -128,7 +131,7 @@ export default function TabListMember() {
                onChange={(e) => setSearchQuery(e.target.value)}
                my={20}
             />
-            {roleLogin.get() == 'supadmin' && <Text mt={10}>Filter by: {nameGroup}</Text>}
+            {roleLogin.get() == 'supadmin' && <Text mt={10}>Filter : {nameGroup}</Text>}
             {loading
                ?
                Array(6)
@@ -148,9 +151,7 @@ export default function TabListMember() {
                      dataMember.map((v, i) => {
                         return (
                            <Box my={10} key={i}>
-                              <Box onClick={() => {
+                              <Box onClick={() => { userLogin == v.id ? router.push(`/profile`) : router.push(`/member/${v.id}`) }}>
-                                 router.push(`/member/${v.id}`)
-                              }}>
                                  <Grid p={5} align="center">
                                     <Grid.Col
                                        span={{
@@ -174,7 +175,7 @@ export default function TabListMember() {
                                           xl: 11,
                                        }}
                                     >
-                                       <Text fw={'bold'} pl={isMobile2 ? 40 : 30} c={tema.get().utama} lineClamp={1}>{_.startCase(v.name)}</Text>
+                                       <Text fw={'bold'} pl={isMobile2 ? 40 : 30} c={tema.get().utama} lineClamp={1}>{_.upperFirst(v.name)}</Text>
                                        <Text fw={'lighter'} pl={isMobile2 ? 40 : 30} fz={12}>{v.group + ' - ' + v.position}</Text>
                                     </Grid.Col>
                                  </Grid>

src/module/user/profile/lib/type_profile.ts

@@ -18,5 +18,6 @@ export interface IEditDataProfile {
   phone: string;
   email: string;
   gender: string;
+  idPosition: string;
   img: string;
 }

src/module/user/profile/ui/edit_profile.tsx

@@ -12,10 +12,13 @@ import toast from "react-hot-toast";
 import { FaCamera } from "react-icons/fa6";
 import { funEditProfileByCookies, funGetProfileByCookies, } from "../lib/api_profile";
 import { IEditDataProfile, IProfileById } from "../lib/type_profile";
+import { IDataPositionMember } from "../../member/lib/type_member";
+import { funGetAllPosition } from "@/module/position/lib/api_position";
 
 export default function EditProfile() {
   const [isValModal, setValModal] = useState(false);
   const [isDataEdit, setDataEdit] = useState<IProfileById[]>([]);
+  const [listPosition, setListPosition] = useState<IDataPositionMember[]>([])
   const openRef = useRef<() => void>(null);
   const [img, setIMG] = useState<any | null>();
   const [imgForm, setImgForm] = useState<any>();
@@ -23,6 +26,7 @@ export default function EditProfile() {
   const [loading, setLoading] = useState(true);
   const tema = useHookstate(TEMA);
   const [loadingKonfirmasi, setLoadingKonfirmasi] = useState(false);
+  const [loadingPosition, setLoadingPosition] = useState(true)
 
   const [touched, setTouched] = useState({
     nik: false,
@@ -30,6 +34,7 @@ export default function EditProfile() {
     phone: false,
     email: false,
     gender: false,
+    idPosition: false
   });
 
   const [data, setData] = useState<IEditDataProfile>({
@@ -40,13 +45,30 @@ export default function EditProfile() {
     email: "",
     gender: "",
     img: "",
+    idPosition: ""
   });
 
+  async function getAllPosition(val: any) {
+    try {
+      setLoadingPosition(true)
+      const res = await funGetAllPosition(
+        "?active=true" + "&group=" + `${val}`
+      );
+      setListPosition(res.data);
+
+    } catch (error) {
+      console.error(error)
+    } finally {
+      setLoadingPosition(false)
+    }
+  }
+
   async function getAllProfile() {
     try {
       setLoading(true);
       const res = await funGetProfileByCookies();
       setData(res.data);
+      getAllPosition(res.data.idGroup);
       setIMG(`https://wibu-storage.wibudev.com/api/files/${res.data.img}`);
       setLoading(false);
     } catch (error) {
@@ -111,7 +133,7 @@ export default function EditProfile() {
       }
     } else if (kategori == 'phone') {
       setData({ ...data, phone: val })
-      if (val == "" || !(val.length >= 10 && val.length <= 15)) {
+      if (val == "" || !(val.length >= 9 && val.length <= 15)) {
         setTouched({ ...touched, phone: true })
       } else {
         setTouched({ ...touched, phone: false })
@@ -130,6 +152,13 @@ export default function EditProfile() {
       } else {
         setTouched({ ...touched, gender: false })
       }
+    } else if (kategori == 'idPosition') {
+      setData({ ...data, idPosition: val })
+      if (val == "" || String(val) == "null") {
+        setTouched({ ...touched, idPosition: true })
+      } else {
+        setTouched({ ...touched, idPosition: false })
+      }
     }
   }
 
@@ -181,16 +210,38 @@ export default function EditProfile() {
             />
           </Indicator>
         )}
-        {loading ? (
+        {loading ?
-          <>
+          [...Array(6)].map((_, index) => (
-            <Skeleton height={40} mt={20} radius={10} />
+            <Skeleton key={index} height={40} mt={20} radius={10} />
-            <Skeleton height={40} mt={20} radius={10} />
+          ))
-            <Skeleton height={40} mt={20} radius={10} />
+          : (
-            <Skeleton height={40} mt={20} radius={10} />
-            <Skeleton height={40} mt={20} radius={10} />
-          </>
-        ) : (
             <>
+              <Select
+                placeholder={loadingPosition ? "Loading.. " : "Pilih Jabatan"}
+                label="Jabatan" w={"100%"} size="md" required withAsterisk radius={10}
+                styles={{
+                  input: {
+                    color: tema.get().utama,
+                    borderRadius: tema.get().utama,
+                    borderColor: tema.get().utama,
+                  },
+                }}
+                data={
+                  listPosition
+                    ? listPosition.map((data) => ({
+                      value: data.id,
+                      label: data.name,
+                    }))
+                    : []
+                }
+                onChange={(val: any) => { onValidation('idPosition', val) }}
+                value={(data?.idPosition == "") ? null : data.idPosition}
+                error={
+                  touched.idPosition && (
+                    data.idPosition == "" || String(data.idPosition) == "null" ? "Jabatan Tidak Boleh Kosong" : null
+                  )
+                }
+              />
               <TextInput
                 size="md"
                 type="number"
@@ -288,7 +339,7 @@ export default function EditProfile() {
                 error={
                   touched.phone &&
                   (data.phone == "" ? "Nomor Telepon Tidak Boleh Kosong"
-                  : !(data.phone.length >= 10 && data.phone.length <= 15) ? "Nomor Telepon Tidak Valid" : null)
+                    : !(data.phone.length >= 9 && data.phone.length <= 15) ? "Nomor Telepon Tidak Valid" : null)
                 }
               />
               <Select