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

Merge pull request #213 from bipproduction/amalia/09-september-24

Browse Source 
Amalia/09 september 24
This commit is contained in:
Amalia
2024-09-09 17:36:53 +08:00
committed by GitHub
parent 465d39fb79 30dbc49653
commit 88e75db420
9 changed files with 101 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/app/api/calender/route.ts
View File

@@ -37,7 +37,7 @@ export async function GET(request: Request) {
isActive: true,
idDivision: idDivision,
dateStart: new Date(String(isDate)),
DivisionCalendar:{
DivisionCalendar: {
isActive: true
}
},
@@ -62,9 +62,17 @@ export async function GET(request: Request) {
}
}
},
orderBy: {
createdAt: 'desc'
}
orderBy: [
{
dateStart: 'asc'
},
{
timeStart: 'asc'
},
{
timeEnd: 'asc'
}
]
});
const allOmit = data.map((v: any) => ({

1
src/app/api/discussion/[id]/route.ts
View File

@@ -41,6 +41,7 @@ export async function GET(request: Request, context: { params: { id: string } })
desc: true,
status: true,
createdAt: true,
createdBy: true,
User: {
select: {
name: true,

5
src/app/api/division/[id]/detail/route.ts
View File

@@ -58,12 +58,15 @@ export async function GET(request: Request, context: { params: { id: string } })
}
})
const kalender = await prisma.divisionCalendar.count({
const kalender = await prisma.divisionCalendarReminder.count({
where: {
idDivision: String(id),
isActive: true,
dateStart: {
lte: new Date()
},
DivisionCalendar: {
isActive: true
}
}
})

42
src/app/api/home/route.ts
View File

@@ -242,7 +242,10 @@ export async function GET(request: Request) {
Group: {
isActive: true,
}
}
},
DivisionCalendar: {
isActive: true
},
}
} else {
kondisi = {
@@ -250,35 +253,50 @@ export async function GET(request: Request) {
dateStart: new Date(),
Division: {
idGroup: idGroup
}
},
DivisionCalendar: {
isActive: true
},
}
}
const data = await prisma.divisionCalendar.findMany({
const data = await prisma.divisionCalendarReminder.findMany({
skip: 0,
take: 5,
where: kondisi,
select: {
id: true,
idDivision: true,
title: true,
desc: true,
status: true,
idCalendar: true,
timeStart: true,
dateStart: true,
timeEnd: true,
dateEnd: true,
createdAt: true,
User: {
status: true,
DivisionCalendar: {
select: {
name: true
title: true,
desc: true,
User: {
select: {
name: true
}
}
}
}
},
orderBy: {
createdAt: 'desc'
}
orderBy: [
{
dateStart: 'asc'
},
{
timeStart: 'asc'
},
{
timeEnd: 'asc'
}
]
})
allData = data.map((v: any) => ({

31
src/module/discussion/lib/type_discussion.ts
View File

@@ -17,7 +17,7 @@ export interface IFormDiscussion {
export interface IStatusDiscussion {
status: number
}
export interface IDetailDiscussion {
id: string
@@ -29,25 +29,26 @@ export interface IDetailDiscussion {
username: string
user_img: string
totalComments: number
}
export interface IAllComents {
createdBy: string
}
export interface IAllComents {
id: string
comment: string
createdAt: string
User: User
img: string
User: User
img: string
username: string
}
export interface User {
name: string
}
export interface IDeleteDicussion {
id: string
}
export interface User {
name: string
}
export interface IDeleteDicussion {
id: string
}
export interface IEditDiscussion {
desc: string
}

36
src/module/discussion/ui/detail_discussion.tsx
View File

@@ -1,6 +1,6 @@
"use client"
import { ActionIcon, Avatar, Badge, Box, Center, Divider, Flex, Grid, Group, Input, rem, Skeleton, Spoiler, Text, TextInput } from "@mantine/core";
import { SkeletonDetailDiscussionComment, SkeletonDetailDiscussionMember, SkeletonSingle, WARNA } from "@/module/_global";
import { globalRole, LayoutDrawer, LayoutNavbarNew, SkeletonDetailDiscussionComment, SkeletonDetailDiscussionMember, SkeletonSingle, WARNA } from "@/module/_global";
import { GrChatOption } from "react-icons/gr";
import { LuSendHorizonal } from "react-icons/lu";
import NavbarDetailDiscussion from "@/module/discussion/ui/navbar_detail_discussion";
@@ -14,6 +14,10 @@ import { useParams, useRouter } from "next/navigation";
import toast from "react-hot-toast";
import { useHookstate } from "@hookstate/core";
import { globalRefreshDiscussion } from "../lib/val_discussion";
import { HiMenu } from "react-icons/hi";
import DrawerDetailDiscussion from "./drawer_detail_discussion";
import { funGetUserByCookies } from "@/module/auth";
import { funGetDivisionById } from "@/module/division_new";
export default function DetailDiscussion({ id, idDivision }: { id: string, idDivision: string }) {
const [isData, setData] = useState<IDetailDiscussion>()
@@ -22,13 +26,21 @@ export default function DetailDiscussion({ id, idDivision }: { id: string, idDiv
const [isLoad, setIsLoad] = useState(true)
const router = useRouter()
const refresh = useHookstate(globalRefreshDiscussion)
const roleLogin = useHookstate(globalRole)
const [isAdmin, setAdmin] = useState(false)
const [isCreator, setCreator] = useState(false)
const getData = async () => {
try {
setIsLoad(true)
const response = await funGetDiscussionById(id)
const res = await funGetDivisionById(param.id);
const login = await funGetUserByCookies()
const cek = res.data.member.some((i: any) => i.idUser == login.id && i.isAdmin == true)
setAdmin(cek)
setData(response.data)
setIsLoad(false)
setCreator(response.data.createdBy == login.id)
} catch (error) {
console.error(error)
} finally {
@@ -61,11 +73,27 @@ export default function DetailDiscussion({ id, idDivision }: { id: string, idDiv
}
}
const [openDrawer, setOpenDrawer] = useState(false)
return (
<Box>
<NavbarDetailDiscussion id={id} status={Number(isData?.status)} idDivision={idDivision} />
{/* <NavbarDetailDiscussion id={id} status={Number(isData?.status)} idDivision={idDivision} /> */}
<LayoutNavbarNew back={`/division/${param.id}/discussion/`} title="Diskusi "
menu={
((roleLogin.get() != 'user' && roleLogin.get() != 'coadmin') || isAdmin || isCreator) ?
<ActionIcon variant="light" onClick={() => setOpenDrawer(true)} bg={WARNA.bgIcon} size="lg" radius="lg" aria-label="Settings">
<HiMenu size={20} color='white' />
</ActionIcon>
: <></>
}
/>
<LayoutDrawer opened={openDrawer} title={'Menu'} onClose={() => setOpenDrawer(false)}>
<DrawerDetailDiscussion onSuccess={(val) => setOpenDrawer(false)} id={id} status={Number(isData?.status)} idDivision={idDivision} />
</LayoutDrawer>
<Box p={20}>
{isLoad ?
Array(1)
@@ -217,12 +245,12 @@ export default function DetailDiscussion({ id, idDivision }: { id: string, idDiv
<Box key={i} p={10} >
<Grid align="center">
<Grid.Col span={2}>
<Avatar alt="it's me" size="md" src={`/api/file/img?jenis=image&cat=user&file=${v.img}`} />
<Avatar alt="it's me" size="md" src={`/api/file/img?jenis=image&cat=user&file=${v.img}`} />
</Grid.Col>
<Grid.Col span={6}>
<Box>
<Text c={WARNA.biruTua} fw={"bold"} lineClamp={1} fz={15}>
{v.username}
{v.username}
</Text>
</Box>
</Grid.Col>

4
src/module/discussion/ui/form_create_discussion.tsx
View File

@@ -52,7 +52,6 @@ export default function FormCreateDiscussion({ id }: { id: string }) {
toast.success(response.message)
router.push(`/division/${param.id}/discussion/`)
setValModal(false)
router.back()
} else {
toast.error(response.message)
}
@@ -123,8 +122,7 @@ export default function FormCreateDiscussion({ id }: { id: string }) {
</Box>
<LayoutModal opened={isValModal} onClose={() => setValModal(false)}
description="Apakah Anda yakin ingin
menambah data?"
description="Apakah Anda yakin ingin menambah data?"
onYes={(val) => { createDiscussion(val) }} />
</Box>
)

4
src/module/discussion/ui/navbar_detail_discussion.tsx
View File

@@ -1,14 +1,16 @@
'use client'
import { LayoutDrawer, LayoutNavbarNew, WARNA } from "@/module/_global";
import { globalRole, LayoutDrawer, LayoutNavbarNew, WARNA } from "@/module/_global";
import { ActionIcon } from "@mantine/core";
import { useState } from "react";
import { HiMenu } from "react-icons/hi";
import DrawerDetailDiscussion from "./drawer_detail_discussion";
import { useParams } from "next/navigation";
import { useHookstate } from "@hookstate/core";
export default function NavbarDetailDiscussion({id, status, idDivision}: {id: string, status: number, idDivision:string}) {
const [openDrawer, setOpenDrawer] = useState(false)
const param = useParams<{ id: string }>()
const roleLogin = useHookstate(globalRole)
return (
<>
<LayoutNavbarNew back={`/division/${param.id}/discussion/`} title="Diskusi "

4
src/module/home/ui/list_event.tsx
View File

@@ -42,7 +42,7 @@ export default function ListEventHome() {
return (
<Box pt={10}>
<Text c={WARNA.biruTua} mb={10} fw={'bold'} fz={16}>Event Hari Ini</Text>
<Text c={WARNA.biruTua} mb={10} fw={'bold'} fz={16}>Acara Hari Ini</Text>
<Box bg={"white"} style={{
borderRadius: 10,
border: `1px solid ${"#D6D8F6"}`,
@@ -60,7 +60,7 @@ export default function ListEventHome() {
_.isEmpty(isData)
?
<Box style={{ display: 'flex', justifyContent: 'center', alignItems: 'center', height: '20vh' }}>
<Text c="dimmed" ta={"center"} fs={"italic"}>Tidak ada event</Text>
<Text c="dimmed" ta={"center"} fs={"italic"}>Tidak ada acara</Text>
</Box>
:
isData.map((event, index) => {