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

Merge pull request #323 from bipproduction/amalia/31-okt-24

Browse Source 
fix: project
This commit is contained in:
Amalia
2024-10-31 17:06:28 +08:00
committed by GitHub
parent ea6a69932f a6c1d0c264
commit 8f6e2307bb
11 changed files with 127 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/app/api/project/[id]/member/route.ts
View File

@@ -136,6 +136,10 @@ export async function GET(request: Request, context: { params: { id: string } })
id: {
not: String(userId)
},
OR: [
{ idUserRole: 'coadmin', },
{ idUserRole: 'user', }
],
isActive: true,
name: {
contains: (name == undefined || name == "null") ? "" : name,
@@ -147,14 +151,24 @@ export async function GET(request: Request, context: { params: { id: string } })
id: true,
name: true,
email: true,
img: true
img: true,
UserRole: {
select: {
name: true
}
}
},
orderBy: {
name: 'asc'
}
})
const fixMember = member.map((v: any) => ({
const omitData = member.map((v: any) => ({
..._.omit(v, ["UserRole"]),
userRole: v.UserRole.name
}))
const fixMember = omitData.map((v: any) => ({
idUser: v.id,
name: v.name,
email: v.email,

10
src/app/api/project/[id]/route.ts
View File

@@ -65,6 +65,7 @@ export async function GET(request: Request, context: { params: { id: string } })
status: true,
dateStart: true,
dateEnd: true,
createdAt: true
},
orderBy: {
createdAt: 'asc'
@@ -72,12 +73,13 @@ export async function GET(request: Request, context: { params: { id: string } })
})
const formatData = dataProgress.map((v: any) => ({
..._.omit(v, ["dateStart", "dateEnd"]),
..._.omit(v, ["dateStart", "dateEnd", "createdAt"]),
dateStart: moment(v.dateStart).format("DD-MM-YYYY"),
dateEnd: moment(v.dateEnd).format("DD-MM-YYYY"),
createdAt: moment(v.createdAt).format("DD-MM-YYYY HH:mm"),
}))
allData = formatData
const dataFix = _.orderBy(formatData, 'createdAt', 'asc')
allData = dataFix
} else if (kategori == "file") {
const dataFile = await prisma.projectFile.findMany({
@@ -86,7 +88,7 @@ export async function GET(request: Request, context: { params: { id: string } })
idProject: String(id)
},
orderBy: {
createdAt: 'desc'
createdAt: 'asc'
},
select: {
id: true,

2
src/module/project/lib/api_project.ts
View File

@@ -1,4 +1,4 @@
import { IFormAddDetailproject, IFormAddMemberProject, IFormDateProject, IFormProject } from "./type_project";
import { IFormAddDetailproject, IFormAddMemberProject, IFormDateProject } from "./type_project";
export const funGetAllProject = async (path?: string) => {

18
src/module/project/ui/add_file_detail_project.tsx
View File

@@ -2,7 +2,7 @@
import { keyWibu, LayoutDrawer, LayoutNavbarNew, TEMA } from "@/module/_global";
import LayoutModal from "@/module/_global/layout/layout_modal";
import { useHookstate } from "@hookstate/core";
import { Box, Button, Flex, Group, rem, SimpleGrid, Stack, Text, } from "@mantine/core";
import { Box, Button, Flex, Group, Loader, rem, SimpleGrid, Stack, Text, } from "@mantine/core";
import { Dropzone } from "@mantine/dropzone";
import _ from "lodash";
import { useParams, useRouter } from "next/navigation";
@@ -10,10 +10,10 @@ import { useRef, useState } from "react";
import toast from "react-hot-toast";
import { FaTrash } from "react-icons/fa6";
import { IoIosArrowDropright } from "react-icons/io";
import { useWibuRealtime } from "wibu-realtime";
import { funAddFileProject, funCekNamFileUploadProject } from "../lib/api_project";
import { IListFileTaskProject } from "../lib/type_project";
import ResultsFile from "./results_file";
import { useWibuRealtime } from "wibu-realtime";
export default function AddFileDetailProject() {
@@ -26,6 +26,7 @@ export default function AddFileDetailProject() {
const [indexDelFile, setIndexDelFile] = useState<number>(0)
const [openDrawerFile, setOpenDrawerFile] = useState(false)
const tema = useHookstate(TEMA)
const [loadingUpload, setLoadingUpload] = useState(false)
const openRef = useRef<() => void>(null)
const [dataRealTime, setDataRealtime] = useWibuRealtime({
WIBU_REALTIME_TOKEN: keyWibu,
@@ -41,6 +42,7 @@ export default function AddFileDetailProject() {
async function cekFileName(data: any) {
try {
setLoadingUpload(true)
const fd = new FormData();
fd.append(`file`, data);
const res = await funCekNamFileUploadProject(param.id, fd)
@@ -53,6 +55,8 @@ export default function AddFileDetailProject() {
} catch (error) {
console.error(error)
toast.error("Gagal menambahkan file, coba lagi nanti")
} finally {
setLoadingUpload(false)
}
}
@@ -92,8 +96,7 @@ export default function AddFileDetailProject() {
return (
<Box>
<LayoutNavbarNew back="" title={"Tambah File"} menu />
<Box p={20}>
<Box p={20} pb={100}>
<Stack>
<Dropzone
openRef={openRef}
@@ -147,6 +150,13 @@ export default function AddFileDetailProject() {
</Box>
</Box>
}
{
loadingUpload &&
<Group justify="center" py={20}>
<Loader color="gray" type="dots" />
</Group>
}
</Box>
<Box pos={'fixed'} bottom={0} p={rem(20)} w={"100%"} style={{
maxWidth: rem(550),

27
src/module/project/ui/add_member_detail_project.tsx
View File

@@ -3,7 +3,7 @@ import { keyWibu, LayoutNavbarNew, SkeletonList, TEMA } from '@/module/_global';
import LayoutModal from '@/module/_global/layout/layout_modal';
import { useHookstate } from '@hookstate/core';
import { Carousel } from '@mantine/carousel';
import { ActionIcon, Avatar, Box, Button, Center, Divider, Flex, Grid, Group, Indicator, rem, Skeleton, Stack, Text, TextInput } from '@mantine/core';
import { ActionIcon, Avatar, Box, Button, Center, Divider, Flex, Grid, Group, Indicator, rem, Stack, Text, TextInput } from '@mantine/core';
import { useMediaQuery, useShallowEffect } from '@mantine/hooks';
import { useParams, useRouter } from 'next/navigation';
import { useState } from 'react';
@@ -50,7 +50,6 @@ export default function AddMemberDetailProject() {
} else {
toast.error(res.message);
}
setLoading(false)
} catch (error) {
console.error(error)
toast.error("Gagal mendapatkan anggota, coba lagi nanti");
@@ -296,20 +295,16 @@ export default function AddMemberDetailProject() {
zIndex: 999,
backgroundColor: `${tema.get().bgUtama}`,
}}>
{loading ?
<Skeleton height={50} radius={30} />
:
<Button
c={"white"}
bg={tema.get().utama}
size="lg"
radius={30}
fullWidth
onClick={() => { onVerifikasi() }}
>
Simpan
</Button>
}
<Button
c={"white"}
bg={tema.get().utama}
size="lg"
radius={30}
fullWidth
onClick={() => { onVerifikasi() }}
>
Simpan
</Button>
</Box>
<LayoutModal loading={loadingModal} opened={openModal} onClose={() => setOpenModal(false)}

47
src/module/project/ui/cancel_project.tsx
View File

@@ -13,6 +13,7 @@ export default function CancelProject() {
const router = useRouter()
const [alasan, setAlasan] = useState("")
const [openModal, setOpenModal] = useState(false)
const [loadingModal, setLoadingModal] = useState(false)
const param = useParams<{ id: string }>()
const tema = useHookstate(TEMA)
const [touched, setTouched] = useState({
@@ -23,15 +24,38 @@ export default function CancelProject() {
project: "sdm"
})
function onVerification() {
if (alasan == "")
return toast.error("Error! harus memasukkan alasan pembatalan Kegiatan")
function onCheck() {
const cek = checkAll()
if (!cek)
return false
setOpenModal(true)
}
function checkAll() {
let nilai = true
if (alasan == "") {
setTouched(touched => ({ ...touched, reason: true }))
nilai = false
}
return nilai
}
function onValidation(kategori: string, val: string) {
if (kategori == 'reason') {
setAlasan(val)
if (val == "") {
setTouched({ ...touched, reason: true })
} else {
setTouched({ ...touched, reason: false })
}
}
}
async function onSubmit() {
try {
setLoadingModal(true)
const res = await funCancelProject(param.id, { reason: alasan })
if (res.success) {
setDataRealtime([{
@@ -39,13 +63,16 @@ export default function CancelProject() {
id: param.id,
}])
toast.success(res.message)
router.push("/project")
router.push("/project/" + param.id)
} else {
toast.error(res.message)
}
} catch (error) {
console.error(error)
toast.error("Gagal membatalkan Kegiatan, coba lagi nanti")
} finally {
setLoadingModal(false)
setOpenModal(false)
}
}
@@ -63,8 +90,7 @@ export default function CancelProject() {
value={alasan}
size="md" placeholder='Contoh : Kegiatan tidak sesuai' label="Alasan Pembatalan"
onChange={(event) => {
setAlasan(event.target.value)
setTouched({ ...touched, reason: false })
onValidation('reason', event.target.value)
}}
error={
touched.reason && (
@@ -86,20 +112,21 @@ export default function CancelProject() {
size="lg"
radius={30}
fullWidth
onClick={() => { onVerification() }}
onClick={() => { onCheck() }}
>
Simpan
</Button>
</Box>
<LayoutModal opened={openModal} onClose={() => setOpenModal(false)}
description="Apakah Anda yakin ingin membatalkan Kegiatan ini? Pembatalan Kegiatan bersifat permanen"
<LayoutModal loading={loadingModal} opened={openModal} onClose={() => setOpenModal(false)}
description="Apakah Anda yakin ingin membatalkan kegiatan ini? Pembatalan kegiatan bersifat permanen"
onYes={(val) => {
if (val) {
onSubmit()
} else {
setOpenModal(false)
}
setOpenModal(false)
}} />
</Box>
);

55
src/module/project/ui/create_users_project.tsx
View File

@@ -1,27 +1,24 @@
"use client"
import { LayoutNavbarNew, SkeletonList, SkeletonSingle, SkeletonUser, TEMA } from '@/module/_global';
import { useHookstate } from '@hookstate/core';
import { ActionIcon, Avatar, Box, Button, Center, Divider, Flex, Grid, Indicator, Input, rem, SimpleGrid, Skeleton, Stack, Text, TextInput } from '@mantine/core';
import { useMediaQuery, useShallowEffect } from '@mantine/hooks';
import { useRouter } from 'next/navigation';
import React, { useState } from 'react';
import { HiChevronLeft, HiMagnifyingGlass } from 'react-icons/hi2';
import { funGetAllmember, TypeUser } from '@/module/user';
import { LayoutNavbarNew, SkeletonList, TEMA } from '@/module/_global';
import { funGetUserByCookies } from '@/module/auth';
import toast from 'react-hot-toast';
import { globalMemberProject } from '../lib/val_project';
import { FaCheck } from 'react-icons/fa6';
import { IoArrowBackOutline, IoClose } from 'react-icons/io5';
import { funGetAllmember, TypeUser } from '@/module/user';
import { useHookstate } from '@hookstate/core';
import { Carousel } from '@mantine/carousel';
import { ActionIcon, Avatar, Box, Button, Center, Divider, Flex, Grid, Indicator, rem, Stack, Text, TextInput } from '@mantine/core';
import { useMediaQuery, useShallowEffect } from '@mantine/hooks';
import { useState } from 'react';
import toast from 'react-hot-toast';
import { FaCheck } from 'react-icons/fa6';
import { HiChevronLeft, HiMagnifyingGlass } from 'react-icons/hi2';
import { IoArrowBackOutline, IoClose } from 'react-icons/io5';
import { globalMemberProject } from '../lib/val_project';
export default function CreateUsersProject({ grup, onClose }: { grup?: string, onClose: (val: any) => void }) {
const router = useRouter()
const member = useHookstate(globalMemberProject)
const [selectedFiles, setSelectedFiles] = useState<any>([]);
const [dataMember, setDataMember] = useState<TypeUser>([])
const [loading, setLoading] = useState(true)
const [openTugas, setOpenTugas] = useState(false)
const [onClickSearch, setOnClickSearch] = useState(false)
const tema = useHookstate(TEMA)
const isMobile2 = useMediaQuery("(max-width: 438px)");
@@ -36,21 +33,25 @@ export default function CreateUsersProject({ grup, onClose }: { grup?: string, o
async function loadData(search: string) {
setLoading(true)
const res = await funGetAllmember('?active=true&group=' + grup + '&search=' + search);
const user = await funGetUserByCookies();
if (res.success) {
setDataMember(res.data.filter((i: any) => i.id != user.id))
// cek data member sebelumnya
if (member.length > 0) {
setSelectedFiles(JSON.parse(JSON.stringify(member.get())))
try {
setLoading(true)
const res = await funGetAllmember('?active=true&group=' + grup + '&search=' + search);
const user = await funGetUserByCookies();
if (res.success) {
setDataMember(res.data.filter((i: any) => i.id != user.id))
// cek data member sebelumnya
if (member.length > 0) {
setSelectedFiles(JSON.parse(JSON.stringify(member.get())))
}
} else {
toast.error("Gagal mendapatkan data, coba lagi nanti")
}
} else {
toast.error(res.message)
} catch (error) {
console.error(error)
toast.error("Gagal mendapatkan data, coba lagi nanti")
} finally {
setLoading(false)
}
setLoading(false)
}

11
src/module/project/ui/edit_detail_task_project.tsx
View File

@@ -1,5 +1,5 @@
"use client"
import { LayoutNavbarNew, TEMA } from '@/module/_global';
import { keyWibu, LayoutNavbarNew, TEMA } from '@/module/_global';
import LayoutModal from '@/module/_global/layout/layout_modal';
import { useHookstate } from '@hookstate/core';
import { Box, Button, Flex, Group, rem, SimpleGrid, Skeleton, Stack, Text, TextInput } from '@mantine/core';
@@ -9,6 +9,7 @@ import moment from 'moment';
import { useParams, useRouter } from 'next/navigation';
import { useState } from 'react';
import toast from 'react-hot-toast';
import { useWibuRealtime } from 'wibu-realtime';
import { funEditDetailProject, funGetDetailProject } from '../lib/api_project';
export default function EditDetailTaskProject() {
@@ -24,6 +25,10 @@ export default function EditDetailTaskProject() {
title: false,
date: false,
});
const [dataRealTime, setDataRealtime] = useWibuRealtime({
WIBU_REALTIME_TOKEN: keyWibu,
project: "sdm"
})
const router = useRouter()
async function onSubmit() {
@@ -43,6 +48,10 @@ export default function EditDetailTaskProject() {
})
if (res.success) {
setDataRealtime([{
category: "project-detail-task",
id: idProject,
}])
toast.success(res.message);
router.push('/project/' + idProject)
} else {

1
src/module/project/ui/list_project.tsx
View File

@@ -55,7 +55,6 @@ export default function ListProject() {
} else {
toast.error(response.message);
}
setLoading(false);
} catch (error) {
toast.error("Gagal mendapatkan kegiatan, coba lagi nanti");
console.error(error);

4
src/module/project/ui/navbar_detail_project.tsx
View File

@@ -17,6 +17,7 @@ export default function NavbarDetailProject() {
const router = useRouter()
const param = useParams<{ id: string }>()
const [name, setName] = useState('')
const [grup, setGrup] = useState("")
const [isOpen, setOpen] = useState(false)
const roleLogin = useHookstate(globalRole)
const tema = useHookstate(TEMA)
@@ -32,6 +33,7 @@ export default function NavbarDetailProject() {
if (res.success) {
setName(res.data.title);
setReason(res.data.reason);
setGrup(res.data.idGroup);
} else {
toast.error(res.message);
}
@@ -54,7 +56,7 @@ export default function NavbarDetailProject() {
return (
<>
<LayoutNavbarNew back="" title={name} menu={
<LayoutNavbarNew back={`/project?group=${grup}`} title={name} menu={
<ActionIcon
variant="light"
bg={tema.get().bgIcon}

2
src/module/project/ui/progress_detail_project.tsx
View File

@@ -110,7 +110,7 @@ export default function ProgressDetailProject() {
:
<Box
p={20}
bg={"#DCEED8"}
bg={tema.get().bgTotalKegiatan}
style={{
borderRadius: 10,
}}