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
This commit is contained in:
@@ -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%'}>
|
||||
|
||||
Reference in New Issue
Block a user