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

Merge pull request #200 from bipproduction/amalia/05-september-24

Browse Source 
upd: announcement
This commit is contained in:
Amalia
2024-09-05 13:45:50 +08:00
committed by GitHub
parent 44a1759d26 28eb4d72a2
commit bce4b4fc55
6 changed files with 109 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/app/api/announcement/[id]/route.ts
View File

@@ -1,5 +1,6 @@
import { prisma } from "@/module/_global";
import { funGetUserByCookies } from "@/module/auth";
import { createLogUser } from "@/module/user";
import _ from "lodash";
import { NextResponse } from "next/server";
@@ -30,7 +31,7 @@ export async function GET(request: Request, context: { params: { id: string } })
},
{ status: 404 }
);
}
}
const announcement = await prisma.announcement.findUnique({
where: {
@@ -126,6 +127,9 @@ export async function DELETE(request: Request, context: { params: { id: string }
},
});
// create log user
const log = await createLogUser({ act: 'DELETE', desc: 'User menghapus data pengumuman', table: 'announcement', data: id })
return NextResponse.json(
{
success: true,
@@ -206,11 +210,14 @@ export async function PUT(request: Request, context: { params: { id: string } })
data: memberDivision,
});
return NextResponse.json({ success: true, message: "Berhasil mengedit pengumuman" }, { status: 200 });
// create log user
const log = await createLogUser({ act: 'UPDATE', desc: 'User mengupdate data pengumuman', table: 'announcement', data: id })
return NextResponse.json({ success: true, message: "Berhasil mengupdate pengumuman" }, { status: 200 });
} catch (error) {
console.error(error);
return NextResponse.json({ success: false, message: "Gagal mengedit pengumuman, coba lagi nanti", reason: (error as Error).message, }, { status: 500 });
return NextResponse.json({ success: false, message: "Gagal mengeupdate pengumuman, coba lagi nanti", reason: (error as Error).message, }, { status: 500 });
}
}

67
src/app/api/announcement/route.ts
View File

@@ -1,10 +1,10 @@
import { Group } from '@mantine/core';
import { prisma } from "@/module/_global";
import { funGetUserByCookies } from "@/module/auth";
import _ from "lodash";
import moment from "moment";
import "moment/locale/id";
import { NextResponse } from "next/server";
import { createLogUser } from '@/module/user';
export const dynamic = 'force-dynamic'
@@ -19,17 +19,63 @@ export async function GET(request: Request) {
}
const villageId = user.idVillage
const roleUser = user.idUserRole
const groupId = user.idGroup
const { searchParams } = new URL(request.url);
const name = searchParams.get('search');
const announcements = await prisma.announcement.findMany({
where: {
idVillage: String(villageId),
isActive: true,
title: {
contains: (name == undefined || name == null) ? "" : name,
mode: "insensitive"
let kondisi: any = {
idVillage: String(villageId),
isActive: true,
title: {
contains: (name == undefined || name == null) ? "" : name,
mode: "insensitive"
}
}
if (roleUser != "supadmin") {
if (roleUser == "cosupadmin" || roleUser == "admin") {
kondisi = {
idVillage: String(villageId),
isActive: true,
title: {
contains: (name == undefined || name == null) ? "" : name,
mode: "insensitive"
},
AnnouncementMember: {
some: {
idGroup: String(groupId)
}
}
}
},
} else {
kondisi = {
idVillage: String(villageId),
isActive: true,
title: {
contains: (name == undefined || name == null) ? "" : name,
mode: "insensitive"
},
AnnouncementMember: {
some: {
idGroup: String(groupId),
Division: {
DivisionMember: {
some: {
idUser: String(user.id)
}
}
}
}
}
}
}
}
const announcements = await prisma.announcement.findMany({
where: kondisi,
select: {
id: true,
title: true,
@@ -98,6 +144,9 @@ export async function POST(request: Request) {
data: memberDivision,
});
// create log user
const log = await createLogUser({ act: 'CREATE', desc: 'User membuat data pengumuman baru', table: 'announcement', data: data.id })
return NextResponse.json({ success: true, message: "Berhasil membuat pengumuman" }, { status: 200 });
} catch (error) {

22
src/app/api/group/get-division/route.ts
View File

@@ -1,6 +1,5 @@
import { prisma } from "@/module/_global";
import { funGetUserByCookies } from "@/module/auth";
import { revalidatePath, revalidateTag } from "next/cache";
import { NextResponse } from "next/server";
export const dynamic = 'force-dynamic'
@@ -11,13 +10,24 @@ export async function GET(request: Request) {
if (user.id == undefined) {
return NextResponse.json({ success: false, message: "Anda harus login untuk mengakses ini" }, { status: 401 });
}
const role = user.idUserRole
const villaId = user.idVillage
const data = await prisma.group.findMany({
where: {
const group = user.idGroup
let kondisi: any = {
isActive: true,
idVillage: String(villaId)
}
if (role != "supadmin") {
kondisi = {
isActive: true,
idVillage: String(villaId)
},
idVillage: String(villaId),
id: String(group)
}
}
const data = await prisma.group.findMany({
where: kondisi,
select: {
id: true,
name: true,

13
src/module/announcement/ui/create_announcement.tsx
View File

@@ -11,6 +11,7 @@ import CreateUsersAnnouncement from "./create_users_announcement";
import { globalMemberAnnouncement } from "../lib/val_announcement";
import { funCreateAnnouncement } from "../lib/api_announcement";
import { GroupData, ICreateData, IGroupData } from "../lib/type_announcement";
import { useRouter } from "next/navigation";
@@ -19,6 +20,7 @@ export default function CreateAnnouncement() {
const memberGroup = useHookstate(globalMemberAnnouncement)
const memberValue = memberGroup.get() as GroupData[]
const [selectedFiles, setSelectedFiles] = useState<any>([])
const router = useRouter()
const [isChooseMember, setIsChooseMember] = useState(false)
@@ -42,12 +44,13 @@ export default function CreateAnnouncement() {
if (response.success) {
toast.success(response.message)
setisData({
...isData,
title: "",
desc: "",
})
// setisData({
// ...isData,
// title: "",
// desc: "",
// })
memberGroup.set([])
router.push('/announcement')
} else {
toast.error(response.message)
}

12
src/module/announcement/ui/navbar_announcement.tsx
View File

@@ -1,20 +1,24 @@
"use client"
import { LayoutDrawer, LayoutNavbarNew, WARNA } from '@/module/_global';
import { globalRole, LayoutDrawer, LayoutNavbarNew, WARNA } from '@/module/_global';
import { ActionIcon } from '@mantine/core';
import React, { useState } from 'react';
import { HiMenu } from "react-icons/hi";
import DrawerAnnouncement from './drawer_announcement';
import { useHookstate } from '@hookstate/core';
export default function NavbarAnnouncement() {
const [isOpen, setOpen] = useState(false)
const roleLogin = useHookstate(globalRole)
return (
<>
<LayoutNavbarNew back='/home' title='pengumuman'
menu={
<ActionIcon onClick={() => setOpen(true)} variant="light" bg={WARNA.bgIcon} size="lg" radius="lg" aria-label="Settings">
<HiMenu size={20} color='white' />
</ActionIcon>
(roleLogin.get() != "user" && roleLogin.get() != "coadmin") ?
<ActionIcon onClick={() => setOpen(true)} variant="light" bg={WARNA.bgIcon} size="lg" radius="lg" aria-label="Settings">
<HiMenu size={20} color='white' />
</ActionIcon>
: <></>
} />
<LayoutDrawer opened={isOpen} title={'Menu'} onClose={() => setOpen(false)}>
<DrawerAnnouncement />

13
src/module/announcement/ui/navbar_detail_announcement.tsx
View File

@@ -1,21 +1,26 @@
'use client'
import { LayoutDrawer, LayoutNavbarNew, WARNA } from "@/module/_global";
import { globalRole, LayoutDrawer, LayoutNavbarNew, WARNA } from "@/module/_global";
import { ActionIcon, Box } from "@mantine/core";
import { HiMenu } from "react-icons/hi";
import DrawerDetailAnnouncement from "./drawer_detail_announcement";
import { useState } from "react";
import { useRouter } from "next/navigation";
import { useHookstate } from "@hookstate/core";
export default function NavbarDetailAnnouncement() {
const [isOpenDrawer, setOpenDrawer] = useState(false)
const router = useRouter()
const roleLogin = useHookstate(globalRole)
return (
<Box>
<LayoutNavbarNew back="/announcement/" title="Pengumuman"
menu={
<ActionIcon onClick={() => setOpenDrawer(true)} variant="light" bg={WARNA.bgIcon} size="lg" radius="lg" aria-label="Settings">
<HiMenu size={20} color='white' />
</ActionIcon>}
(roleLogin.get() != "user" && roleLogin.get() != "coadmin") ?
<ActionIcon onClick={() => setOpenDrawer(true)} variant="light" bg={WARNA.bgIcon} size="lg" radius="lg" aria-label="Settings">
<HiMenu size={20} color='white' />
</ActionIcon>
: <></>
}
/>
<LayoutDrawer opened={isOpenDrawer} title={'Menu'} onClose={() => setOpenDrawer(false)}>
<DrawerDetailAnnouncement onDeleted={(val) => {