upd: calendar division

Deskripsi:
- search riwayat
- akses role pada fitur kalender divisi

NO Issues
This commit is contained in:
amel
2025-05-26 10:54:16 +08:00
parent ee87cab5b8
commit 84f4aab36e
4 changed files with 71 additions and 17 deletions

View File

@@ -6,7 +6,7 @@ import DrawerBottom from "@/components/drawerBottom"
import ImageUser from "@/components/imageNew" import ImageUser from "@/components/imageNew"
import MenuItemRow from "@/components/menuItemRow" import MenuItemRow from "@/components/menuItemRow"
import Styles from "@/constants/Styles" import Styles from "@/constants/Styles"
import { apiDeleteCalendarMember, apiGetCalendarOne } from "@/lib/api" import { apiDeleteCalendarMember, apiGetCalendarOne, apiGetDivisionOneFeature } from "@/lib/api"
import { setUpdateCalendar } from "@/lib/calendarUpdate" import { setUpdateCalendar } from "@/lib/calendarUpdate"
import { useAuthSession } from "@/providers/AuthProvider" import { useAuthSession } from "@/providers/AuthProvider"
import { MaterialCommunityIcons } from "@expo/vector-icons" import { MaterialCommunityIcons } from "@expo/vector-icons"
@@ -47,6 +47,23 @@ export default function DetailEventCalendar() {
const [isModalMember, setModalMember] = useState(false) const [isModalMember, setModalMember] = useState(false)
const update = useSelector((state: any) => state.calendarUpdate) const update = useSelector((state: any) => state.calendarUpdate)
const dispatch = useDispatch() const dispatch = useDispatch()
const entityUser = useSelector((state: any) => state.user);
const [isMemberDivision, setIsMemberDivision] = useState(false);
async function handleCheckMember() {
try {
const hasil = await decryptToken(String(token?.current));
const response = await apiGetDivisionOneFeature({
id,
user: hasil,
cat: "check-member",
});
setIsMemberDivision(response.data);
} catch (error) {
console.error(error);
}
}
async function handleLoad() { async function handleLoad() {
try { try {
@@ -78,6 +95,7 @@ export default function DetailEventCalendar() {
useEffect(() => { useEffect(() => {
handleLoad(); handleLoad();
handleCheckMember()
}, []); }, []);
useEffect(() => { useEffect(() => {
@@ -113,7 +131,7 @@ export default function DetailEventCalendar() {
headerLeft: () => <ButtonBackHeader onPress={() => { router.back() }} />, headerLeft: () => <ButtonBackHeader onPress={() => { router.back() }} />,
headerTitle: 'Detail Acara', headerTitle: 'Detail Acara',
headerTitleAlign: 'center', headerTitleAlign: 'center',
headerRight: () => <HeaderRightCalendarDetail id={String(data?.idCalendar)} /> headerRight: () => (entityUser.role == "user" || entityUser.role == "coadmin") && !isMemberDivision ? <></> : <HeaderRightCalendarDetail id={String(data?.idCalendar)} />
}} }}
/> />
<ScrollView> <ScrollView>
@@ -170,8 +188,12 @@ export default function DetailEventCalendar() {
title={item.name} title={item.name}
subtitle={item.email} subtitle={item.email}
onPress={() => { onPress={() => {
setMemberChoose({ id: item.idUser, name: item.name }) if ((entityUser.role == "user" || entityUser.role == "coadmin") && !isMemberDivision) {
setModalMember(true) null
} else {
setMemberChoose({ id: item.idUser, name: item.name })
setModalMember(true)
}
}} }}
/> />
)) ))

View File

@@ -22,7 +22,7 @@ export default function CalendarHistory() {
async function handleLoad() { async function handleLoad() {
try { try {
const hasil = await decryptToken(String(token?.current)); const hasil = await decryptToken(String(token?.current));
const response = await apiGetCalendarHistory({ user: hasil, search: '', division: id }); const response = await apiGetCalendarHistory({ user: hasil, search: search, division: id });
setData(response.data); setData(response.data);
} catch (error) { } catch (error) {
console.error(error); console.error(error);

View File

@@ -1,29 +1,61 @@
import Styles from "@/constants/Styles" import Styles from "@/constants/Styles"
import { apiGetDivisionOneFeature } from "@/lib/api"
import { useAuthSession } from "@/providers/AuthProvider"
import { AntDesign, MaterialCommunityIcons } from "@expo/vector-icons" import { AntDesign, MaterialCommunityIcons } from "@expo/vector-icons"
import { router } from "expo-router" import { router, useLocalSearchParams } from "expo-router"
import { useState } from "react" import { useEffect, useState } from "react"
import { View } from "react-native" import { View } from "react-native"
import { useSelector } from "react-redux"
import ButtonMenuHeader from "../buttonMenuHeader" import ButtonMenuHeader from "../buttonMenuHeader"
import DrawerBottom from "../drawerBottom" import DrawerBottom from "../drawerBottom"
import MenuItemRow from "../menuItemRow" import MenuItemRow from "../menuItemRow"
export default function HeaderRightCalendarList() { export default function HeaderRightCalendarList() {
const [isVisible, setVisible] = useState(false) const [isVisible, setVisible] = useState(false)
const { token, decryptToken } = useAuthSession()
const { id } = useLocalSearchParams<{ id: string }>();
const entityUser = useSelector((state: any) => state.user);
const [isMemberDivision, setIsMemberDivision] = useState(false);
async function handleCheckMember() {
try {
const hasil = await decryptToken(String(token?.current));
const response = await apiGetDivisionOneFeature({
id,
user: hasil,
cat: "check-member",
});
setIsMemberDivision(response.data);
} catch (error) {
console.error(error);
}
}
useEffect(() => {
handleCheckMember()
}, [])
return ( return (
<> <>
<ButtonMenuHeader onPress={() => { setVisible(true) }} /> <ButtonMenuHeader onPress={() => { setVisible(true) }} />
<DrawerBottom animation="slide" isVisible={isVisible} setVisible={setVisible} title="Menu"> <DrawerBottom animation="slide" isVisible={isVisible} setVisible={setVisible} title="Menu">
<View style={Styles.rowItemsCenter}> <View style={Styles.rowItemsCenter}>
<MenuItemRow {
icon={<AntDesign name="pluscircle" color="black" size={25} />} (entityUser.role == "user" || entityUser.role == "coadmin") && !isMemberDivision ? (
title="Tambah Acara" <></>
onPress={() => { ) : (
setVisible(false) <MenuItemRow
router.push('./calendar/create') icon={<AntDesign name="pluscircle" color="black" size={25} />}
}} title="Tambah Acara"
/> onPress={() => {
setVisible(false)
router.push('./calendar/create')
}}
/>
)
}
<MenuItemRow <MenuItemRow
icon={<MaterialCommunityIcons name="history" color="black" size={25} />} icon={<MaterialCommunityIcons name="history" color="black" size={25} />}
title="Riwayat" title="Riwayat"

View File

@@ -37,7 +37,7 @@ export default function ItemHistoryEvent({ data }: { data: Props }) {
)) ))
) : ( ) : (
<View style={[Styles.p15]}> <View style={[Styles.p15]}>
<Text style={[Styles.textDefault]}>Tidak ada data</Text> <Text style={[Styles.textDefault, Styles.cGray, { textAlign: 'center' }]}>Tidak ada data</Text>
</View> </View>
) )
} }