wibu/sistem-desa-mandiri
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rev: diskusi umum dan diskusi divisi

Browse Source 
Deskripsi:
- mengaplikasikan sistem arsip pada diskusi umum
- mengaplikasikan filter pada diskusi umum dg role supadmin
- mengaplikasikan hanya view pada role user dan co admin jika tidak termasuk anggota
- mengaplikasikan fitur mengaktifkan diskusi divisi pada arsip diskusi

No Issues
This commit is contained in:
amel
2025-01-14 17:32:09 +08:00
parent 3a22a50e57
commit 71c6f5c8a4
16 changed files with 240 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/module/discussion_general/index.ts
View File

@@ -5,6 +5,7 @@ import FormEditDiscussionGeneral from "./ui/edit_discussion_general";
import ListDiscussionGeneral from "./ui/list_discussion";
import MemberDiscussionGeneral from "./ui/member_discussion_general";
import NavbarDiscussionGeneral from "./ui/navbar_discussion";
import TabListDiscussionGeneral from "./ui/tab_list_discussion_general";
export { ListDiscussionGeneral }
export { NavbarDiscussionGeneral }
@@ -12,4 +13,5 @@ export { FormCreateDiscussionGeneral }
export { DetailDiscussionGeneral }
export { MemberDiscussionGeneral }
export { FormEditDiscussionGeneral }
export { AddMemberDiscussionGeneral }
export { AddMemberDiscussionGeneral }
export { TabListDiscussionGeneral }

4
src/module/discussion_general/ui/detail_discussion_general.tsx
View File

@@ -81,7 +81,7 @@ export default function DetailDiscussionGeneral() {
}
if (dataRealTime && dataRealTime.some((i: any) => i.category == 'discussion-general-delete' && i.id == param.id && i.user != isUser)) {
toast.error("Data telah di hapus, anda akan beralih ke halaman list diskusi umum")
toast.error("Data telah diarsipkan, anda akan beralih ke halaman list diskusi umum")
setTimeout(() => {
router.push(`/discussion`)
}, 1000)
@@ -313,7 +313,7 @@ export default function DetailDiscussionGeneral() {
</Box>
</Grid.Col>
<Grid.Col span={3}>
<Text c={"grey"} ta={"end"} fz={13}>{moment(v.createdAt).format('lll').replace('pukul', '')}</Text>
<Text c={"grey"} ta={"end"} fz={13}>{v.createdAt}</Text>
</Grid.Col>
</Grid>
<Box mt={10}>

6
src/module/discussion_general/ui/drawer_detail_discussion_general.tsx
View File

@@ -79,7 +79,7 @@ export default function DrawerDetailDiscussionGeneral({ onSuccess, id, status }:
}
} catch (error) {
console.error(error);
toast.error("Gagal hapus diskusi umum, coba lagi nanti");
toast.error("Gagal mengarsipkan diskusi umum, coba lagi nanti");
} finally {
setLoadingDelete(false)
setValModal(false)
@@ -145,7 +145,7 @@ export default function DrawerDetailDiscussionGeneral({ onSuccess, id, status }:
<BsTrash3 size={30} color={tema.get().utama} />
</Box>
<Box>
<Text c={tema.get().utama}>Hapus</Text>
<Text c={tema.get().utama}>Arsipkan</Text>
</Box>
</Flex>
</>
@@ -157,7 +157,7 @@ export default function DrawerDetailDiscussionGeneral({ onSuccess, id, status }:
</Stack>
<LayoutModal loading={loadingDelete} opened={isValModal} onClose={() => setValModal(false)}
description="Apakah Anda yakin ingin menghapus diskusi ini?"
description="Apakah Anda yakin ingin mengarsipkan diskusi ini?"
onYes={(val) => {
fetchDeleteDiscussion(val)
}} />

23
src/module/discussion_general/ui/drawer_discussion.tsx
View File

@@ -1,16 +1,22 @@
import { TEMA } from "@/module/_global";
import { globalRole, TEMA } from "@/module/_global";
import { useHookstate } from "@hookstate/core";
import { Box, Flex, SimpleGrid, Stack, Text } from "@mantine/core";
import { useRouter, useSearchParams } from "next/navigation";
import { HiOutlineFilter } from "react-icons/hi";
import { IoAddCircle } from "react-icons/io5";
export default function DrawerDiscussionGeneral() {
const tema = useHookstate(TEMA)
const roleLogin = useHookstate(globalRole)
const router = useRouter()
const searchParams = useSearchParams()
const group = searchParams.get('group')
return (
<Box>
<Stack pt={10}>
<SimpleGrid cols={{ base: 2, sm: 2, lg: 3 }} >
<Flex onClick={() => window.location.href = "/discussion/create"} justify={'center'} align={'center'} direction={'column'} >
<Flex onClick={() => router.push("/discussion/create")} justify={'center'} align={'center'} direction={'column'} >
<Box>
<IoAddCircle size={30} color={tema.get().utama} />
</Box>
@@ -18,6 +24,19 @@ export default function DrawerDiscussionGeneral() {
<Text c={tema.get().utama}>Tambah Diskusi</Text>
</Box>
</Flex>
{
roleLogin.get() == "supadmin" &&
<Flex onClick={() => {
router.push('/discussion?page=filter&group=' + group)
}} 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>

23
src/module/discussion_general/ui/list_discussion.tsx
View File

@@ -1,10 +1,10 @@
'use client'
import { currentScroll, globalNotifPage, keyWibu, ReloadButtonTop, TEMA } from "@/module/_global";
import { currentScroll, globalNotifPage, globalRole, keyWibu, ReloadButtonTop, TEMA } from "@/module/_global";
import { useHookstate } from "@hookstate/core";
import { ActionIcon, Badge, Box, Divider, Flex, Grid, Group, Skeleton, Spoiler, Text, TextInput } from "@mantine/core";
import { useShallowEffect } from "@mantine/hooks";
import _ from "lodash";
import { useRouter } from "next/navigation";
import { useRouter, useSearchParams } from "next/navigation";
import { useEffect, useState } from "react";
import toast from "react-hot-toast";
import { BiSolidCommentDetail } from "react-icons/bi";
@@ -20,7 +20,12 @@ export default function ListDiscussionGeneral() {
const [loading, setLoading] = useState(true)
const tema = useHookstate(TEMA)
const router = useRouter()
const { value: containerRef } = useHookstate(currentScroll);
const { value: containerRef } = useHookstate(currentScroll)
const searchParams = useSearchParams()
const status = searchParams.get('active')
const group = searchParams.get('group')
const roleLogin = useHookstate(globalRole)
const [nameGroup, setNameGroup] = useState('')
const [isPage, setPage] = useState(1)
const notifLoadPage = useHookstate(globalNotifPage)
const [isRefresh, setRefresh] = useState(false)
@@ -32,8 +37,9 @@ export default function ListDiscussionGeneral() {
const getData = async (loading: boolean) => {
try {
setLoading(loading)
const response = await funGetAllDiscussionGeneral('?search=' + searchQuery + '&page=' + isPage)
const response = await funGetAllDiscussionGeneral('?active=' + status + '&group=' + group + '&search=' + searchQuery + '&page=' + isPage)
if (response.success) {
setNameGroup(response.filter.name)
if (isPage == 1) {
setData(response.data)
} else {
@@ -56,7 +62,7 @@ export default function ListDiscussionGeneral() {
useShallowEffect(() => {
setPage(1)
getData(true)
}, [searchQuery])
}, [searchQuery, status])
useEffect(() => {
const handleScroll = async () => {
@@ -107,7 +113,7 @@ export default function ListDiscussionGeneral() {
return (
<Box p={20}>
<Box py={20}>
{
isRefresh &&
<ReloadButtonTop
@@ -131,6 +137,7 @@ export default function ListDiscussionGeneral() {
value={searchQuery}
onChange={(e) => setSearchQuery(e.target.value)}
/>
{roleLogin.get() == 'supadmin' && <Text>Filter : {nameGroup}</Text>}
{loading ?
Array(3)
.fill(null)
@@ -214,7 +221,9 @@ export default function ListDiscussionGeneral() {
<Text c={tema.get().utama} fw={"bold"} lineClamp={1}>
{v.title}
</Text>
<Badge color={v.status === 1 ? "green" : "red"} size="sm">{v.status === 1 ? "BUKA" : "TUTUP"}</Badge>
{
status != "false" && <Badge color={v.status === 1 ? "green" : "red"} size="sm">{v.status === 1 ? "BUKA" : "TUTUP"}</Badge>
}
</Box>
</Grid.Col>
<Grid.Col span={4}>

5
src/module/discussion_general/ui/navbar_discussion.tsx
View File

@@ -1,5 +1,5 @@
'use client'
import { LayoutDrawer, LayoutNavbarNew, TEMA } from "@/module/_global";
import { globalRole, LayoutDrawer, LayoutNavbarNew, TEMA } from "@/module/_global";
import { useHookstate } from "@hookstate/core";
import { ActionIcon } from "@mantine/core";
import { useState } from "react";
@@ -9,10 +9,13 @@ import DrawerDiscussionGeneral from "./drawer_discussion";
export default function NavbarDiscussionGeneral() {
const [openDrawer, setOpenDrawer] = useState(false)
const tema = useHookstate(TEMA)
const roleLogin = useHookstate(globalRole)
return (
<>
<LayoutNavbarNew back={`/home`} title="Diskusi Umum"
menu={
roleLogin.get() != 'user' && roleLogin.get() != 'coadmin' &&
<ActionIcon variant="light" onClick={() => setOpenDrawer(true)} bg={tema.get().bgIcon} size="lg" radius="lg" aria-label="Settings">
<HiMenu size={20} color='white' />
</ActionIcon>

68
src/module/discussion_general/ui/tab_list_discussion_general.tsx Normal file
View File

@@ -0,0 +1,68 @@
"use client";
import { globalRole, TEMA } from "@/module/_global";
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 ListDiscussionGeneral from "./list_discussion";
export default function TabListDiscussionGeneral() {
const iconStyle = { width: rem(20), height: rem(20) };
const router = useRouter();
const searchParams = useSearchParams();
const status = searchParams.get("active");
const group = searchParams.get("group");
const tema = useHookstate(TEMA)
const roleLogin = useHookstate(globalRole)
return (
<Box p={20}>
<Tabs
variant="pills"
color={tema.get().bgFiturHome}
radius="xl"
defaultValue={status == "false" ? "false" : "true"}
>
{
roleLogin.get() != ''
?
(roleLogin.get() != "user" && roleLogin.get() != "coadmin") ?
<Tabs.List
bg={"white"}
style={{
border: `1px solid ${"#EDEDED"}`,
padding: 5,
borderRadius: 100,
}}
>
<Tabs.Tab
value="true"
w={"45%"}
leftSection={<IoMdCheckmarkCircleOutline style={iconStyle} />}
onClick={() => {
router.push("?active=true&group=" + group);
}}
>
Aktif
</Tabs.Tab>
<Tabs.Tab
value="false"
w={"53%"}
leftSection={<IoCloseCircleOutline style={iconStyle} />}
onClick={() => {
router.push("?active=false&group=" + group);
}}
>
Arsip
</Tabs.Tab>
</Tabs.List>
:
<></>
: <></>
}
<ListDiscussionGeneral />
</Tabs>
</Box>
);
}