rev: filter tahun

Deskripsi:
- tampilan modal filter
- tampilan filter disemua fitur yg ada filter nya
- pengaplikasian api

No Issues

app/(application)/discussion/index.tsx

@@ -121,8 +121,9 @@ export default function Discussion() {
             <InputSearch onChange={setSearch} />
             {
                (entityUser.role == "supadmin" || entityUser.role == "developer") &&
-               <View style={[Styles.mv05]}>
-                  <Text>Filter : {nameGroup}</Text>
+               <View style={[Styles.mv05, Styles.rowOnly]}>
+                  <Text>Filter :</Text>
+                  <LabelStatus size="small" category="secondary" text={nameGroup} style={[Styles.mh05]} />
                </View>
             }
          </View>

app/(application)/division/index.tsx

@@ -1,6 +1,7 @@
 import BorderBottomItem from "@/components/borderBottomItem";
 import ButtonTab from "@/components/buttonTab";
 import InputSearch from "@/components/inputSearch";
+import LabelStatus from "@/components/labelStatus";
 import PaperGridContent from "@/components/paperGridContent";
 import Skeleton from "@/components/skeleton";
 import SkeletonTwoItem from "@/components/skeletonTwoItem";
@@ -195,8 +196,9 @@ export default function ListDivision() {
                </Pressable>
             </View>
             {(entityUser.role == "supadmin" || entityUser.role == "developer") && (
-               <View style={[Styles.mv05]}>
-                  <Text>Filter : {nameGroup}</Text>
+               <View style={[Styles.mv05, Styles.rowOnly]}>
+                  <Text>Filter :</Text>
+                  <LabelStatus size="small" category="secondary" text={nameGroup} style={[Styles.mh05]} />
                </View>
             )}
          </View>

app/(application)/member/index.tsx

@@ -2,6 +2,7 @@ import BorderBottomItem from "@/components/borderBottomItem";
 import ButtonTab from "@/components/buttonTab";
 import ImageUser from "@/components/imageNew";
 import InputSearch from "@/components/inputSearch";
+import LabelStatus from "@/components/labelStatus";
 import SkeletonTwoItem from "@/components/skeletonTwoItem";
 import Text from "@/components/Text";
 import { ConstEnv } from "@/constants/ConstEnv";
@@ -124,8 +125,9 @@ export default function Index() {
             <InputSearch onChange={setSearch} />
             {
                (entityUser.role == "supadmin" || entityUser.role == "developer") &&
-               <View style={[Styles.mv05]}>
-                  <Text>Filter : {nameGroup}</Text>
+               <View style={[Styles.mv05, Styles.rowOnly]}>
+                  <Text>Filter :</Text>
+                  <LabelStatus size="small" category="secondary" text={nameGroup} style={[Styles.mh05]} />
                </View>
             }
          </View>

app/(application)/position/index.tsx

@@ -5,6 +5,7 @@ import ButtonTab from "@/components/buttonTab";
 import DrawerBottom from "@/components/drawerBottom";
 import { InputForm } from "@/components/inputForm";
 import InputSearch from "@/components/inputSearch";
+import LabelStatus from "@/components/labelStatus";
 import MenuItemRow from "@/components/menuItemRow";
 import SkeletonTwoItem from "@/components/skeletonTwoItem";
 import Text from "@/components/Text";
@@ -166,8 +167,9 @@ export default function Index() {
             <InputSearch onChange={setSearch} />
             {
                (entityUser.role == "supadmin" || entityUser.role == "developer") &&
-               <View style={[Styles.mv05]}>
-                  <Text>Filter : {nameGroup}</Text>
+               <View style={[Styles.mv05, Styles.rowOnly]}>
+                  <Text>Filter :</Text>
+                  <LabelStatus size="small" category="secondary" text={nameGroup} style={[Styles.mh05]} />
                </View>
             }
          </View>

app/(application)/project/index.tsx

@@ -32,16 +32,18 @@ type Props = {
 };
 
 export default function ListProject() {
-   const { status, group, cat } = useLocalSearchParams<{
+   const { status, group, cat, year } = useLocalSearchParams<{
       status?: string;
       group?: string;
       cat?: string;
+      year?: string;
    }>();
    const [statusFix, setStatusFix] = useState<'0' | '1' | '2' | '3'>('0')
    const { token, decryptToken } = useAuthSession();
    const entityUser = useSelector((state: any) => state.user)
    const [search, setSearch] = useState("")
    const [nameGroup, setNameGroup] = useState("")
+   const [isYear, setYear] = useState("")
    const [data, setData] = useState<Props[]>([])
    const [isList, setList] = useState(false)
    const update = useSelector((state: any) => state.projectUpdate)
@@ -63,11 +65,13 @@ export default function ListProject() {
             search: search,
             group: String(group),
             kategori: String(cat),
-            page: thisPage
+            page: thisPage,
+            year: String(year)
          });
 
          if (response.success) {
             setNameGroup(response.filter.name);
+            setYear(response.tahun)
             if (thisPage == 1) {
                setData(response.data);
             } else if (thisPage > 1 && response.data.length > 0) {
@@ -91,7 +95,7 @@ export default function ListProject() {
 
    useEffect(() => {
       handleLoad(true, 1);
-   }, [statusFix, search, group, cat]);
+   }, [statusFix, search, group, cat, year]);
 
    const loadMoreData = () => {
       if (waiting) return
@@ -194,17 +198,25 @@ export default function ListProject() {
             </View>
             <View style={[Styles.mv05]}>
                {
-                  entityUser.role != 'cosupadmin' && entityUser.role != 'admin' &&
-                  <Text>Filter :
+                  // entityUser.role != 'cosupadmin' && entityUser.role != 'admin' &&
+                  <View style={[Styles.rowOnly]}>
+                     <Text style={[Styles.mr05]}>Filter :</Text>
                      {
-                        (entityUser.role == "supadmin" || entityUser.role == "developer") && nameGroup
+                        (entityUser.role == "supadmin" || entityUser.role == "developer") &&
+                        <LabelStatus size="small" category="secondary" text={nameGroup} style={{ marginRight: 5 }} />
                      }
                      {
                         (entityUser.role == 'user' || entityUser.role == 'coadmin')
-                           ? (cat == 'null' || cat == 'undefined' || cat == undefined || cat == '' || cat == 'data-saya') ? 'Kegiatan Saya' : 'Semua Kegiatan'
+                           ? (cat == 'null' || cat == 'undefined' || cat == undefined || cat == '' || cat == 'data-saya') ? <LabelStatus size="small" category="secondary" text="Kegiatan Saya" style={{ marginRight: 5 }} /> : <LabelStatus size="small" category="secondary" text="Semua Kegiatan" style={{ marginRight: 5 }} />
                            : ''
                      }
-                  </Text>
+                     <LabelStatus size="small" category="secondary" text={isYear} style={{ marginRight: 5 }} />
+                     {/* {
+                        (entityUser.role == 'user' || entityUser.role == 'coadmin')
+                           ? (cat == 'null' || cat == 'undefined' || cat == undefined || cat == '' || cat == 'data-saya') ? <LabelStatus size="small" category="primary" text="Kegiatan Saya" /> : <LabelStatus size="small" category="primary" text="Semua Kegiatan" />
+                           : ''
+                     } */}
+                  </View>
                }
             </View>
          </View>

components/labelStatus.tsx

@@ -1,16 +1,23 @@
 import { ColorsStatus } from "@/constants/ColorsStatus";
 import Styles from "@/constants/Styles";
-import { View } from "react-native";
+import { View, StyleProp, ViewStyle } from "react-native";
 import Text from "./Text";
 
 type Props = {
    category: 'error' | 'success' | 'warning' | 'primary' | 'secondary'
    text: string
    size: 'small' | 'default'
+   style?: StyleProp<ViewStyle>
 }
-export default function LabelStatus({ category, text, size }: Props) {
+export default function LabelStatus({ category, text, size, style }: Props) {
    return (
-      <View style={[size == "small" ? Styles.labelStatusSmall : Styles.labelStatus, ColorsStatus[category], Styles.round10, Styles.contentItemCenter]}>
+      <View style={[
+         size == "small" ? Styles.labelStatusSmall : Styles.labelStatus,
+         ColorsStatus[category],
+         Styles.round10,
+         Styles.contentItemCenter,
+         style
+      ]}>
          <Text style={[size == "small" ? Styles.textSmallSemiBold : Styles.textMediumSemiBold, Styles.cWhite, { textAlign: 'center' }]}>{text}</Text>
       </View>
    )

components/modalFilter.tsx

@@ -1,25 +1,26 @@
 import Styles from "@/constants/Styles"
-import { apiGetGroup } from "@/lib/api"
+import { apiGetGroup, apiGetTahunProject } from "@/lib/api"
 import { setEntityFilterGroup } from "@/lib/filterSlice"
 import { useAuthSession } from "@/providers/AuthProvider"
-import { AntDesign } from "@expo/vector-icons"
 import { router } from "expo-router"
 import { useEffect, useState } from "react"
-import { Pressable, ScrollView, View } from "react-native"
-import Text from './Text';
+import { ScrollView, TouchableOpacity, View } from "react-native"
 import { useDispatch, useSelector } from "react-redux"
 import { ButtonForm } from "./buttonForm"
 import DrawerBottom from "./drawerBottom"
+import Text from './Text'
 
 
 type Props = {
    open: boolean,
    close: (value: boolean) => void
    page: 'position' | 'member' | 'discussion' | 'project' | 'division'
-   category?: 'filter-group' | 'filter-data'
+   category?: 'filter-group' | 'filter-data' | 'year-only',
+   valueGroup?: string,
+   valueYear?: string,
 }
 
-export default function ModalFilter({ open, close, page, category }: Props) {
+export default function ModalFilter({ open, close, page, category, valueGroup, valueYear }: Props) {
    const data = [
       {
          id: "data-saya",
@@ -34,58 +35,154 @@ export default function ModalFilter({ open, close, page, category }: Props) {
    const dispatch = useDispatch()
    const entities = useSelector((state: any) => state.filterGroup)
    const update = useSelector((state: any) => state.groupUpdate)
-   const [chooseGroup, setChooseGroup] = useState('')
+   const [chooseGroup, setChooseGroup] = useState(valueGroup || '')
+   const [chooseYear, setChooseYear] = useState(valueYear || '')
+   const [dataTahun, setDataTahun] = useState<{ id: string, name: string }[]>([])
 
    async function handleLoad() {
       const hasil = await decryptToken(String(token?.current))
       const response = await apiGetGroup({ active: 'true', user: hasil, search: '' })
       dispatch(setEntityFilterGroup(response.data))
+
+      if (page === 'project') {
+         const responseTahun = await apiGetTahunProject({ user: hasil })
+         setDataTahun(responseTahun.data)
+      }
+
    }
 
    useEffect(() => {
-         handleLoad()
+      handleLoad()
    }, [dispatch, update]);
 
 
 
 
    return (
-      <DrawerBottom animation="slide" isVisible={open} setVisible={close} title="Filter" height={75}>
+      <DrawerBottom animation="slide" isVisible={open} setVisible={close} title="Pilih Preferensi" height={75}>
          <View style={{ justifyContent: 'space-between', flex: 1 }}>
             <ScrollView>
-               <View>
-                  {
-                     category == "filter-data"
-                        ?
-                        data.map((item: any, index: any) => (
-                           <Pressable key={index} style={[Styles.itemSelectModal]} onPress={() => { setChooseGroup(item.id) }}>
-                              <Text style={[chooseGroup == item.id ? Styles.textDefaultSemiBold : Styles.textDefault]}>{item.name}</Text>
-                              {
-                                 chooseGroup == item.id && <AntDesign name="check" size={20} color={'black'}/>
-                              }
-                           </Pressable>
-                        ))
-                        :
-                        entities.map((item: any, index: any) => (
-                           <Pressable key={index} style={[Styles.itemSelectModal]} onPress={() => { setChooseGroup(item.id) }}>
-                              <Text style={[chooseGroup == item.id ? Styles.textDefaultSemiBold : Styles.textDefault]}>{item.name}</Text>
-                              {
-                                 chooseGroup == item.id && <AntDesign name="check" size={20} color={'black'}/>
-                              }
-                           </Pressable>
-                        ))
-                  }
-               </View>
+               {
+                  category != "year-only" &&
+                  <View>
+                     <Text style={[Styles.textDefaultSemiBold, Styles.mb05]}>{category == "filter-data" ? "Filter Data" : "Lembaga Desa"}</Text>
+                     <View style={[Styles.rowOnly, { flexWrap: 'wrap' }]}>
+                        {
+                           category == "filter-data"
+                              ?
+                              data.map((item: any, index: any) => (
+                                 <TouchableOpacity
+                                    key={index}
+                                    style={[
+                                       Styles.chip,
+                                       chooseGroup == item.id && Styles.chipSelected,
+                                    ]}
+                                    activeOpacity={0.8}
+                                    onPress={() => { setChooseGroup(item.id) }}
+                                 >
+                                    {/* {chooseGroup == item.id && (
+                                 <View style={Styles.checkIcon}>
+                                    <Ionicons name="checkmark" size={14} color="white" />
+                                 </View>
+                              )} */}
+
+                                    <Text
+                                       style={[
+                                          Styles.chipText,
+                                          chooseGroup == item.id && Styles.chipTextSelected,
+                                       ]}
+                                    >
+                                       {item.name}
+                                    </Text>
+                                 </TouchableOpacity>
+                                 // <Pressable key={index} style={[Styles.itemSelectModal]} onPress={() => { setChooseGroup(item.id) }}>
+                                 //    <Text style={[chooseGroup == item.id ? Styles.textDefaultSemiBold : Styles.textDefault]}>{item.name}</Text>
+                                 //    {
+                                 //       chooseGroup == item.id && <AntDesign name="check" size={20} color={'black'} />
+                                 //    }
+                                 // </Pressable>
+                              ))
+                              :
+                              entities.map((item: any, index: any) => (
+                                 <TouchableOpacity
+                                    key={index}
+                                    style={[
+                                       Styles.chip,
+                                       chooseGroup == item.id && Styles.chipSelected,
+                                    ]}
+                                    activeOpacity={0.8}
+                                    onPress={() => { setChooseGroup(item.id) }}
+                                 >
+                                    {/* {chooseGroup == item.id && (
+                                 <View style={Styles.checkIcon}>
+                                    <Ionicons name="checkmark" size={14} color="white" />
+                                 </View>
+                              )} */}
+
+                                    <Text
+                                       style={[
+                                          Styles.chipText,
+                                          chooseGroup == item.id && Styles.chipTextSelected,
+                                       ]}
+                                    >
+                                       {item.name}
+                                    </Text>
+                                 </TouchableOpacity>
+                                 // <Pressable key={index} style={[Styles.itemSelectModal]} onPress={() => { setChooseGroup(item.id) }}>
+                                 //    <Text style={[chooseGroup == item.id ? Styles.textDefaultSemiBold : Styles.textDefault]}>{item.name}</Text>
+                                 //    {
+                                 //       chooseGroup == item.id && <AntDesign name="check" size={20} color={'black'}/>
+                                 //    }
+                                 // </Pressable>
+                              ))
+                        }
+                     </View>
+                  </View>
+               }
+
+               {page == "project" && (
+                  <View>
+                     <Text style={[Styles.textDefaultSemiBold, Styles.mb05]}>Tahun</Text>
+                     <View style={[Styles.rowOnly, { flexWrap: 'wrap' }]}>
+                        {
+                           dataTahun.map((item: { id: string, name: string }, index: number) => (
+                              <TouchableOpacity
+                                 key={index}
+                                 style={[
+                                    Styles.chip,
+                                    chooseYear == item.id && Styles.chipSelected,
+                                 ]}
+                                 activeOpacity={0.8}
+                                 onPress={() => { setChooseYear(item.id) }}
+                              >
+                                 <Text
+                                    style={[
+                                       Styles.chipText,
+                                       chooseYear == item.id && Styles.chipTextSelected,
+                                    ]}
+                                 >
+                                    {item.name}
+                                 </Text>
+                              </TouchableOpacity>
+                           ))
+                        }
+                     </View>
+                  </View>
+               )}
             </ScrollView>
             <View>
                <ButtonForm text="Terapkan" onPress={() => {
                   close(false)
                   page == 'project' ?
-                     category == "filter-data"
+                     category == "year-only"
                         ?
-                        router.replace(`/${page}?status=0&cat=${chooseGroup}`)
+                        router.replace(`/${page}?status=0&year=${chooseYear}`)
                         :
-                        router.replace(`/${page}?status=0&group=${chooseGroup}`)
+                        category == "filter-data"
+                           ?
+                           router.replace(`/${page}?status=0&cat=${chooseGroup}&year=${chooseYear}`)
+                           :
+                           router.replace(`/${page}?status=0&group=${chooseGroup}&year=${chooseYear}`)
                      :
                      router.replace(`/${page}?active=true&group=${chooseGroup}`)
                }} />

components/project/headerProjectList.tsx

@@ -31,7 +31,7 @@ export default function HeaderRightProjectList() {
                   />
                }
                {
-                  (entityUser.role == "user" || entityUser.role == "coadmin" || entityUser.role == "supadmin" || entityUser.role == "developer") &&
+                  // (entityUser.role == "user" || entityUser.role == "coadmin" || entityUser.role == "supadmin" || entityUser.role == "developer") &&
                   <MenuItemRow
                      icon={<AntDesign name="filter" color="black" size={25} />}
                      title="Filter"
@@ -50,7 +50,7 @@ export default function HeaderRightProjectList() {
             close={() => { setFilter(false) }}
             open={isFilter}
             page="project"
-            category={entityUser.role == "supadmin" || entityUser.role == "developer" ? "filter-group" : "filter-data"}
+            category={entityUser.role == "admin" || entityUser.role == "cosupadmin" ? 'year-only' : entityUser.role == "supadmin" || entityUser.role == "developer" ? "filter-group" : "filter-data"}
          />
       </>
    )

constants/Styles.ts

@@ -651,6 +651,35 @@ const Styles = StyleSheet.create({
       width: 40,
       alignItems: 'center',
    },
+   chip: {
+      paddingVertical: 5,
+      paddingHorizontal: 15,
+      borderRadius: 5,
+      backgroundColor: "#F3F4F6",
+      borderWidth: 1,
+      borderColor: "transparent",
+      marginRight: 10,
+      marginBottom: 10,
+   },
+   chipSelected: {
+      backgroundColor: "#FFF5F2",
+      borderColor: "#FF5A3C",
+   },
+   chipText: {
+      fontSize: 16,
+      color: "#222",
+   },
+   chipTextSelected: {
+      color: "#FF5A3C",
+   },
+   checkIcon: {
+      position: "absolute",
+      top: -6,
+      left: -6,
+      backgroundColor: "#FF5A3C",
+      borderRadius: 10,
+      padding: 2,
+   },
 })
 
 export default Styles;

lib/api.ts

@@ -315,8 +315,13 @@ export const apiDeleteAnnouncement = async (data: { user: string }, id: string)
    return response.data
 };
 
-export const apiGetProject = async ({ user, status, search, group, kategori, page }: { user: string, status: string, search: string, group?: string, kategori?: string, page?: number }) => {
-   const response = await api.get(`mobile/project?user=${user}&status=${status}&group=${group}&search=${search}&cat=${kategori}&page=${page}`);
+export const apiGetTahunProject = async ({ user }: { user: string }) => {
+   const response = await api.get(`mobile/project/tahun?user=${user}`);
+   return response.data;
+};
+
+export const apiGetProject = async ({ user, status, search, group, kategori, page, year }: { user: string, status: string, search: string, group?: string, kategori?: string, page?: number, year?: string }) => {
+   const response = await api.get(`mobile/project?user=${user}&status=${status}&group=${group}&search=${search}&cat=${kategori}&page=${page}&year=${year}`);
    return response.data;
 };