upd: list kegiatan

Deskripsi:
- update api berdasarkan kategori data
- update tampilan untuk role user dan coadmin di kasih filter berdasarkan data
- tulisan filter by menjadi filter

No Issues

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

@@ -43,7 +43,7 @@ export async function GET(request: Request) {
       }
 
 
-      // JIKA ROLE = USER ATAU COADMIN DAN KATEGORI = MINE (DIVISI SAYA)
+      // JIKA ROLE = USER ATAU COADMIN DAN KATEGORI != SEMUA (DIVISI SAYA)
       if (roleUser != "supadmin" && roleUser != "cosupadmin" && roleUser != "admin") {
          if (kategori != "semua") {
             kondisi = {

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/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/list_division.tsx

@@ -157,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/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/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,6 +9,7 @@ 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 (
@@ -37,6 +37,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/tab_list_member.tsx

@@ -128,7 +128,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)