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

Merge pull request #331 from bipproduction/amalia/07-nov-24

Browse Source 
Amalia/07 nov 24
This commit is contained in:
Amalia
2024-11-07 17:24:40 +08:00
committed by GitHub
parent 23a49a1385 aac649b01f
commit 80f5abeaca
22 changed files with 77 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/(application)/layout.tsx
View File

@@ -10,7 +10,7 @@ export default async function Layout({ children }: { children: React.ReactNode }
const user = await funGetUserByCookies()
return (
<>
<WrapLayout role={user.idUserRole} theme={user.theme} user={user.id}>
<WrapLayout role={user.idUserRole} theme={user.theme} user={user.id} village={user.idVillage}>
{children}
</WrapLayout>
</>

1
src/app/(application)/project/update/[id]/page.tsx
View File

@@ -1,5 +1,4 @@
import { EditDetailTaskProject } from "@/module/project";
import React from "react";
function Page() {

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

@@ -173,8 +173,8 @@ export async function POST(request: Request, context: { params: { id: string } }
data: {
title: name,
idProject: id,
dateStart: new Date(moment(dateStart).format('YYYY-MM-DD')),
dateEnd: new Date(moment(dateEnd).format('YYYY-MM-DD')),
dateStart: new Date(dateStart),
dateEnd: new Date(dateEnd),
},
select: {
id: true

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

@@ -1,7 +1,6 @@
import { prisma } from "@/module/_global";
import { funGetUserByCookies } from "@/module/auth";
import { createLogUser } from "@/module/user";
import moment from "moment";
import { NextResponse } from "next/server";
@@ -231,8 +230,8 @@ export async function POST(request: Request, context: { params: { id: string } }
},
data: {
title,
dateStart: new Date(moment(dateStart).format('YYYY-MM-DD')),
dateEnd: new Date(moment(dateEnd).format('YYYY-MM-DD')),
dateStart: new Date(dateStart),
dateEnd: new Date(dateEnd),
}
})

5
src/app/api/project/route.ts
View File

@@ -2,7 +2,6 @@ import { DIR, funUploadFile, prisma } from "@/module/_global";
import { funGetUserByCookies } from "@/module/auth";
import { createLogUser } from "@/module/user";
import _ from "lodash";
import moment from "moment";
import { NextResponse } from "next/server";
@@ -157,8 +156,8 @@ export async function POST(request: Request) {
..._.omit(v, ["dateStart", "dateEnd", "name"]),
idProject: data.id,
title: v.title,
dateStart: new Date(moment(v.dateStart).format('YYYY-MM-DD')),
dateEnd: new Date(moment(v.dateEnd).format('YYYY-MM-DD')),
dateStart: new Date(v.dateStart),
dateEnd: new Date(v.dateEnd),
}))
const insertTask = await prisma.projectTask.createMany({

2
src/app/api/theme/[id]/route.ts
View File

@@ -170,7 +170,7 @@ export async function POST(request: Request, context: { params: { id: string } }
// create log user
const log = await createLogUser({ act: 'DELETE', desc: 'User mengganti tema', table: 'colorTheme', data: id })
return NextResponse.json({ success: true, message: "Tema berhasil diganti", data: dataTheme }, { status: 200 });
return NextResponse.json({ success: true, message: "Tema berhasil diganti", data: { village: user.idVillage, user: user.id }, theme: dataTheme }, { status: 200 });
} catch (error) {
console.error(error);

13
src/module/_global/components/wrap_layout.tsx
View File

@@ -1,15 +1,14 @@
'use client'
import { globalParamJumlahNotif } from "@/module/home";
import { useHookstate } from "@hookstate/core";
import { globalNotifPage, globalRole, keyWibu, TEMA } from "../bin/val_global";
import { useShallowEffect } from "@mantine/hooks";
import { usePathname, useRouter } from "next/navigation";
import { useEffect, useState } from "react";
import { useWibuRealtime } from "wibu-realtime";
import { globalNotifPage, globalRole, keyWibu, TEMA } from "../bin/val_global";
import NotificationCustome from "./notification_custome";
import { usePathname, useRouter } from "next/navigation";
import { globalParamJumlahNotif } from "@/module/home";
import ReloadButtonTop from "./reload_button_top";
export default function WrapLayout({ children, role, theme, user }: { children: React.ReactNode, role: any, theme: any, user: any }) {
export default function WrapLayout({ children, role, theme, user, village }: { children: React.ReactNode, role: any, theme: any, user: any, village: any }) {
const router = useRouter()
const roleLogin = useHookstate(globalRole)
const tema = useHookstate(TEMA)
@@ -44,6 +43,10 @@ export default function WrapLayout({ children, role, theme, user }: { children:
}, 4000);
}
}
if (data && data.some((v: any) => v.category == "applied-theme" && v.user != user && v.village == village)) {
tema.set(data[0]?.theme)
}
}, [data])

19
src/module/color_palette/ui/drawer_palet_edit_end_default.tsx
View File

@@ -1,4 +1,4 @@
import { TEMA } from '@/module/_global';
import { keyWibu, TEMA } from '@/module/_global';
import LayoutModal from '@/module/_global/layout/layout_modal';
import { useHookstate } from '@hookstate/core';
import { Box, Flex, SimpleGrid, Text } from '@mantine/core';
@@ -9,6 +9,7 @@ import { FaPencil, FaTrash } from 'react-icons/fa6';
import { IoColorPalette } from 'react-icons/io5';
import { funChangeTheme, funDeleteTheme } from '../lib/api_theme';
import { globalRefreshTheme } from '../lib/val_theme';
import { useWibuRealtime } from 'wibu-realtime';
export default function DrawerPaletEditEndDefault({ id, idVillage, isUse }: { id: string, idVillage: string, isUse: boolean }) {
const router = useRouter()
@@ -18,13 +19,23 @@ export default function DrawerPaletEditEndDefault({ id, idVillage, isUse }: { id
const refresh = useHookstate(globalRefreshTheme)
const [loadingApply, setLoadingApply] = useState(false)
const [loadingDelete, setLoadingDelete] = useState(false)
const [dataRealTime, setDataRealtime] = useWibuRealtime({
WIBU_REALTIME_TOKEN: keyWibu,
project: "sdm"
})
async function onChangeTheme() {
try {
setLoadingApply(true)
const res = await funChangeTheme(id)
if (res.success) {
tema.set(res.data)
setDataRealtime([{
category: "applied-theme",
village: res.data.village,
user: res.data.user,
theme: res.theme
}])
tema.set(res.theme)
refresh.set(!refresh.get())
} else {
toast.error(res.message);
@@ -101,7 +112,7 @@ export default function DrawerPaletEditEndDefault({ id, idVillage, isUse }: { id
onYes={(val) => {
if (val) {
onChangeTheme()
}else{
} else {
setModal(false)
}
}} />
@@ -112,7 +123,7 @@ export default function DrawerPaletEditEndDefault({ id, idVillage, isUse }: { id
onYes={(val) => {
if (val) {
onDelete()
}else{
} else {
setModalDel(false)
}
}} />

17
src/module/color_palette/ui/list_color_palette.tsx
View File

@@ -1,21 +1,19 @@
"use client"
import { LayoutDrawer, LayoutNavbarNew, TEMA } from '@/module/_global';
import { ActionIcon, Box, Checkbox, Flex, Group, Skeleton, Text } from '@mantine/core';
import { useRouter } from 'next/navigation';
import React, { useState } from 'react';
import { useHookstate } from '@hookstate/core';
import { ActionIcon, Box, Flex, Group, Skeleton, Text } from '@mantine/core';
import { useShallowEffect } from '@mantine/hooks';
import { useState } from 'react';
import toast from 'react-hot-toast';
import { FaCircleCheck } from 'react-icons/fa6';
import { HiMenu } from 'react-icons/hi';
import DrawerCreatePalette from './drawer_create_palette';
import DrawerPaletEditEndDefault from './drawer_palet_edit_end_default';
import { useHookstate } from '@hookstate/core';
import { funGetAllTheme } from '../lib/api_theme';
import { IDataTheme } from '../lib/type_theme';
import toast from 'react-hot-toast';
import { useShallowEffect } from '@mantine/hooks';
import { globalRefreshTheme } from '../lib/val_theme';
import DrawerCreatePalette from './drawer_create_palette';
import DrawerPaletEditEndDefault from './drawer_palet_edit_end_default';
export default function ListColorPalette() {
const router = useRouter()
const [isOpen, setOpen] = useState(false)
const [isOpenTambahan, setOpenTambahan] = useState(false)
const tema = useHookstate(TEMA)
@@ -36,7 +34,6 @@ export default function ListColorPalette() {
} else {
toast.error(res.message)
}
setLoading(false)
} catch (error) {
console.error(error)
toast.error("Gagal mendapatkan data tema, coba lagi nanti")

11
src/module/division_new/ui/list_division.tsx
View File

@@ -63,15 +63,18 @@ export default function ListDivision() {
}
};
useShallowEffect(() => {
fetchData(false)
}, [isPage])
useShallowEffect(() => {
setPage(1)
fetchData(true)
}, [status, searchQuery])
useShallowEffect(() => {
fetchData(false)
}, [isPage])
useEffect(() => {
const handleScroll = async () => {
@@ -157,7 +160,7 @@ export default function ListDivision() {
<Box bg={tema.get().bgTotalKegiatan} p={10} style={{ borderRadius: 10 }}>
<Text fw={'bold'} c={tema.get().utama}>Total Divisi</Text>
<Flex justify={'center'} align={'center'} h={'100%'}>
<Text fz={40} fw={'bold'} c={tema.get().utama}>{jumlah}</Text>
<Text fz={40} fw={'bold'} c={tema.get().utama}>{loading ? 0 : jumlah}</Text>
</Flex>
</Box>
</Box>

2
src/module/home/ui/list_project.tsx
View File

@@ -46,7 +46,7 @@ export default function ListProjects() {
return (
<>
<Box pt={10}>
<Text c={tema.get().utama} mb={10} fw={'bold'} fz={16}>Kegiatan Terbaru</Text>
<Text c={tema.get().utama} mb={10} fw={'bold'} fz={16}>Kegiatan Terupdate</Text>
{loading ?
<Box pb={20}>
<Skeleton width={"100%"} height={200} radius={"md"} />

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

@@ -1,4 +1,4 @@
import { IFormAddDetailproject, IFormAddMemberProject, IFormDateProject } from "./type_project";
import { IFormAddDetailproject, IFormAddMemberProject, IFormDateProject, NewIFormDateProject } from "./type_project";
export const funGetAllProject = async (path?: string) => {
@@ -54,7 +54,7 @@ export const funGetDetailProject = async (path: string) => {
return await response.json().catch(() => null);
}
export const funEditDetailProject = async (path: string, data: IFormDateProject) => {
export const funEditDetailProject = async (path: string, data: NewIFormDateProject) => {
const response = await fetch(`/api/project/detail/${path}`, {
method: "POST",
headers: {

10
src/module/project/lib/type_project.ts
View File

@@ -45,6 +45,12 @@ export interface IFormDateProject {
title: string,
}
export interface NewIFormDateProject{
dateStart: string,
dateEnd: string,
title: string,
}
export interface IFormMemberProject {
idUser: string,
name: string,
@@ -53,8 +59,8 @@ export interface IFormMemberProject {
export interface IFormAddDetailproject {
dateStart: Date,
dateEnd: Date,
dateStart: string,
dateEnd: string,
name: string
}

6
src/module/project/ui/add_detail_task_project.tsx
View File

@@ -4,13 +4,13 @@ import LayoutModal from '@/module/_global/layout/layout_modal';
import { useHookstate } from '@hookstate/core';
import { Box, Button, Flex, Group, rem, SimpleGrid, Stack, Text, TextInput } from '@mantine/core';
import { DatePicker } from '@mantine/dates';
import { useShallowEffect } from '@mantine/hooks';
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 { funCreateDetailProject } from '../lib/api_project';
import { useShallowEffect } from '@mantine/hooks';
export default function AddDetailTaskProject() {
const [value, setValue] = useState<[Date | null, Date | null]>([null, null]);
@@ -35,8 +35,8 @@ export default function AddDetailTaskProject() {
setLoadingModal(true)
const res = await funCreateDetailProject(param.id, {
name,
dateStart: (value[0] != null) ? value[0] : new Date,
dateEnd: (value[1] != null) ? value[1] : new Date,
dateStart: (value[0] != null) ? moment(value[0]).format('YYYY-MM-DD') : moment(new Date).format('YYYY-MM-DD'),
dateEnd: (value[1] != null) ? moment(value[1]).format('YYYY-MM-DD') : moment(new Date).format('YYYY-MM-DD'),
})
if (res.success) {

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

@@ -223,12 +223,12 @@ export default function AddMemberDetailProject() {
</Box>
<Box p={20}>
<Group justify="space-between" mt={100} onClick={handleSelectAll}>
{/* <Group justify="space-between" mt={100} onClick={handleSelectAll}>
<Text c={tema.get().utama} fw={"bold"}>
Pilih Semua Anggota
</Text>
{selectAll ? <FaCheck style={{ marginRight: 10 }} /> : ""}
</Group>
</Group> */}
{loading ?
Array(8)
.fill(null)

10
src/module/project/ui/create_date_end_task.tsx
View File

@@ -3,15 +3,15 @@ import { LayoutNavbarNew, TEMA } from "@/module/_global";
import { useHookstate } from "@hookstate/core";
import { ActionIcon, Box, Button, Flex, Group, rem, SimpleGrid, Stack, Text, TextInput } from "@mantine/core";
import { DatePicker } from "@mantine/dates";
import { useShallowEffect } from "@mantine/hooks";
import moment from "moment";
import { useState } from "react";
import toast from "react-hot-toast";
import { HiChevronLeft } from "react-icons/hi2";
import { IFormDateProject } from "../lib/type_project";
import { useShallowEffect } from "@mantine/hooks";
import { NewIFormDateProject } from "../lib/type_project";
export default function ViewDateEndTask({ onClose, onSet }: { onClose: (val: boolean) => void, onSet: (val: IFormDateProject) => void }) {
export default function ViewDateEndTask({ onClose, onSet }: { onClose: (val: boolean) => void, onSet: (val: NewIFormDateProject) => void }) {
const [value, setValue] = useState<[Date | null, Date | null]>([null, null]);
const [title, setTitle] = useState("")
const tema = useHookstate(TEMA)
@@ -29,8 +29,8 @@ export default function ViewDateEndTask({ onClose, onSet }: { onClose: (val: boo
return toast.error("Error! harus memasukkan judul tugas")
onSet({
dateStart: value[0],
dateEnd: value[1],
dateStart: moment(value[0]).format('YYYY-MM-DD'),
dateEnd: moment(value[1]).format('YYYY-MM-DD'),
title: title
})
}

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

@@ -15,7 +15,7 @@ import { FaTrash } from "react-icons/fa6";
import { IoIosArrowDropright } from "react-icons/io";
import { useWibuRealtime } from "wibu-realtime";
import { funCreateProject } from "../lib/api_project";
import { IFormDateProject, IFormMemberProject, IListFileTaskProject } from "../lib/type_project";
import { IFormMemberProject, IListFileTaskProject, NewIFormDateProject } from "../lib/type_project";
import { globalMemberProject } from "../lib/val_project";
import ViewDateEndTask from "./create_date_end_task";
import CreateUsersProject from "./create_users_project";
@@ -32,7 +32,7 @@ export default function CreateProject() {
const member = useHookstate(globalMemberProject)
const memberValue = member.get() as IFormMemberProject[]
const [openTugas, setOpenTugas] = useState(false)
const [dataTask, setDataTask] = useState<IFormDateProject[]>([])
const [dataTask, setDataTask] = useState<NewIFormDateProject[]>([])
const openRef = useRef<() => void>(null)
const [fileForm, setFileForm] = useState<any[]>([])
const [listFile, setListFile] = useState<IListFileTaskProject[]>([])

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

@@ -38,7 +38,7 @@ export default function CreateUsersProject({ grup, onClose }: { grup?: string, o
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))
setDataMember(res.data.filter((i: any) => i.id != user.id && i.idUserRole != 'supadmin' && i.idUserRole != 'cosupadmin'))
// cek data member sebelumnya
if (member.length > 0) {
setSelectedFiles(JSON.parse(JSON.stringify(member.get())))

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

@@ -42,8 +42,8 @@ export default function EditDetailTaskProject() {
setLoadingModal(true)
const res = await funEditDetailProject(param.id, {
title: name,
dateStart: value[0],
dateEnd: value[1],
dateStart: moment(value[0]).format('YYYY-MM-DD'),
dateEnd: moment(value[1]).format('YYYY-MM-DD'),
})

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

@@ -156,7 +156,7 @@ export default function ListProject() {
<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%'}>
<Text fz={40} fw={'bold'} c={tema.get().utama}>{totalData}</Text>
<Text fz={40} fw={'bold'} c={tema.get().utama}>{loading ? 0 : totalData}</Text>
</Flex>
</Box>
{isList ? (

9
src/module/project/ui/results_date-and_task.tsx
View File

@@ -1,10 +1,9 @@
import { Box, Center, Grid, Group, SimpleGrid, Spoiler, Text } from '@mantine/core';
import React from 'react';
import { AiOutlineFileSync } from "react-icons/ai";
import { IFormDateProject } from '../lib/type_project';
import { Box, Center, Grid, Group, SimpleGrid, Text } from '@mantine/core';
import moment from 'moment';
import { AiOutlineFileSync } from "react-icons/ai";
import { NewIFormDateProject } from '../lib/type_project';
export default function ResultsDateAndTask(data: IFormDateProject) {
export default function ResultsDateAndTask(data: NewIFormDateProject) {
return (
<Box pt={5}>
<Box bg={"white"} style={{

2
src/module/user/member/ui/list_member.tsx
View File

@@ -42,7 +42,7 @@ export default function ListMember() {
Aktif
</Tabs.Tab>
<Tabs.Tab
value="tidak-aktif"
value="false"
w={"53%"}
leftSection={<IoCloseCircleOutline style={iconStyle} />}
onClick={() => {