upd: calender

Deskripsi:
- repeat pengulangan
- install new package
- tambah field table
- ubah semua api mengikuti struktur tb baru

No Issues
This commit is contained in:
amel
2024-09-09 16:34:38 +08:00
parent 789fda0b02
commit 61e3431f9c
15 changed files with 330 additions and 155 deletions

View File

@@ -14,6 +14,11 @@ export const funGetOneCalender = async (path: string) => {
return await response.json().catch(() => null);
}
export const funGetOneCalenderByIdCalendar = async (path: string) => {
const response = await fetch(`/api/calender/${path}/member`);
return await response.json().catch(() => null);
}
export const funCreateCalender = async (data: IFormCreateCalender) => {
const response = await fetch("/api/calender", {
method: "POST",

View File

@@ -1,5 +1,6 @@
export interface IDataCalender {
id: string
idCalendar: string
title: string
desc: string
status: number
@@ -23,6 +24,7 @@ export interface IHistoryCalender {
export interface IDataDetailByIdCalender {
id: string
idCalendar: string
title: string
desc: string
timeStart: string
@@ -31,6 +33,7 @@ export interface IDataDetailByIdCalender {
createdAt: string
linkMeet: string
repeatEventTyper: string
repeatValue: string
}
export interface IDataDetailByIdMember {
id: string
@@ -49,6 +52,7 @@ export interface IFormCreateCalender {
linkMeet: string
repeatEventTyper: string
desc: string,
repeatValue: string,
member: IFormMemberCalender[]
}
@@ -73,6 +77,7 @@ export interface IEditCalender {
linkMeet?: string
repeatEventTyper?: string
desc?: string,
repeatValue?: string
// member?: IFormMemberCalender[]
}
@@ -93,6 +98,7 @@ export interface IDetailByIdCalender {
createdAt?: string
linkMeet?: string
repeatEventTyper?: string
repeatValue?: string
}
export interface IFormMemberCalenderNew {

View File

@@ -11,12 +11,13 @@ import { HiMagnifyingGlass } from 'react-icons/hi2';
import { IoArrowBackOutline, IoClose } from 'react-icons/io5';
import { Carousel } from '@mantine/carousel';
import { funAddMemberCalender, funGetOneCalender } from '../lib/api_calender';
import { IDataDetailByIdMember } from '../lib/type_calender';
import { IDataDetailByIdCalender, IDataDetailByIdMember } from '../lib/type_calender';
export default function CreateUserDetailCalender() {
const router = useRouter()
const param = useParams<{ id: string, detail: string }>()
const [selectedFiles, setSelectedFiles] = useState<any>([])
const [isDataCalender, setDataCalender] = useState<IDataDetailByIdCalender>()
const [isData, setData] = useState<IDataMemberDivision[]>([])
const [isDataAnggota, setDataAnggota] = useState<IDataDetailByIdMember[]>([])
const [selectAll, setSelectAll] = useState(false)
@@ -30,6 +31,7 @@ export default function CreateUserDetailCalender() {
const response = await funGetSearchMemberDivision("?search=", param.id)
const res = await funGetOneCalender(param.detail)
if (response.success) {
setDataCalender(res.data.calender)
setDataAnggota(res.data.member)
setData(response.data)
setLoading(false)
@@ -84,7 +86,7 @@ export default function CreateUserDetailCalender() {
return toast.error("Error! silahkan pilih anggota")
}
const res = await funAddMemberCalender(param.detail, selectedFiles)
const res = await funAddMemberCalender(String(isDataCalender?.idCalendar), selectedFiles)
if (res.success) {
toast.success(res.message)
router.push('./')

View File

@@ -54,7 +54,7 @@ export default function DetailEventDivision() {
async function onSubmit() {
try {
const res = await funDeleteMemberCalender(param.detail, { idUser: dataChoose.id });
const res = await funDeleteMemberCalender(String(isDataCalender?.idCalendar), { idUser: dataChoose.id });
if (res.success) {
toast.success(res.message)
setDataChoose({ id: '', name: '' })
@@ -141,11 +141,12 @@ export default function DetailEventDivision() {
xl: 11
}}>
<Text>
{isDataCalender?.repeatEventTyper.toString() === '1' ? 'Acara 1 Kali' :
isDataCalender?.repeatEventTyper.toString() === '2' ? 'Hari Kerja (senin - jumat)' :
isDataCalender?.repeatEventTyper.toString() === '3' ? 'Minggu' :
isDataCalender?.repeatEventTyper.toString() === '4' ? 'Bulanan' :
isDataCalender?.repeatEventTyper.toString() === '5' ? 'Tahunan' :
{isDataCalender?.repeatEventTyper.toString() === 'once' ? 'Acara 1 Kali' :
isDataCalender?.repeatEventTyper.toString() === 'daily' ? 'Setiap Hari' :
// isDataCalender?.repeatEventTyper.toString() === 'weekdays' ? 'Hari Kerja (senin - jumat)' :
isDataCalender?.repeatEventTyper.toString() === 'weekly' ? 'Mingguan' :
isDataCalender?.repeatEventTyper.toString() === 'monthly' ? 'Bulanan' :
isDataCalender?.repeatEventTyper.toString() === 'yearly' ? 'Tahunan' :
''}
</Text>
</Grid.Col>
@@ -345,7 +346,7 @@ export default function DetailEventDivision() {
setOpenModal(false)
}} />
<LayoutDrawer opened={openDrawer} title={'Menu'} onClose={() => setOpenDrawer(false)}>
<DrawerDetailEvent />
<DrawerDetailEvent idCalendar={String(isDataCalender?.idCalendar)} />
</LayoutDrawer>
</Box>
);

View File

@@ -5,13 +5,11 @@ import { Box, Flex, SimpleGrid, Stack, Text } from '@mantine/core';
import { useParams, useRouter } from 'next/navigation';
import React, { useState } from 'react';
import toast from 'react-hot-toast';
import { AiOutlineFileSearch } from 'react-icons/ai';
import { IoAddCircle } from 'react-icons/io5';
import { MdDelete, MdEdit } from 'react-icons/md';
import { funDeleteCalenderById } from '../lib/api_calender';
import { FaUsers } from 'react-icons/fa6';
export default function DrawerDetailEvent() {
export default function DrawerDetailEvent({ idCalendar }: { idCalendar: string }) {
const router = useRouter()
const [isModal, setModal] = useState(false)
const param = useParams<{ id: string, detail: string }>()
@@ -19,9 +17,7 @@ export default function DrawerDetailEvent() {
async function fetchDeleteCalender(val: boolean) {
try {
if (val) {
const response = await funDeleteCalenderById(
param.detail
)
const response = await funDeleteCalenderById(idCalendar)
if (response.success) {
toast.success(response.message)
setModal(false)
@@ -34,7 +30,7 @@ export default function DrawerDetailEvent() {
} catch (error) {
console.error(error);
setModal(false)
toast.error("Gagal hapus calender, coba lagi nanti");
toast.error("Gagal hapus acara, coba lagi nanti");
}
}
@@ -52,7 +48,7 @@ export default function DrawerDetailEvent() {
<Text ta={"center"} c={WARNA.biruTua}>Hapus Acara</Text>
</Box>
</Flex>
<Flex onClick={() => router.push(`/division/${param.id}/calender/update/${param.detail}`)} justify={'center'} align={'center'} direction={'column'} >
<Flex onClick={() => router.push(`/division/${param.id}/calender/update/${idCalendar}`)} justify={'center'} align={'center'} direction={'column'} >
<Box>
<MdEdit size={30} color={WARNA.biruTua} />
</Box>
@@ -71,7 +67,7 @@ export default function DrawerDetailEvent() {
</SimpleGrid>
</Stack>
<LayoutModal opened={isModal} onClose={() => setModal(false)}
description="Apakah Anda yakin ingin menghapus data?"
description="Apakah Anda yakin ingin menghapus data acara ini? Data ini akan mempengaruhi semua data yang terkait"
onYes={(val) => { fetchDeleteCalender(val) }} />
</Box>
);

View File

@@ -1,6 +1,6 @@
"use client"
import { LayoutNavbarNew, WARNA } from '@/module/_global';
import { Avatar, Box, Button, Divider, Flex, Grid, Group, Input, rem, Select, SimpleGrid, Stack, Text, Textarea, TextInput } from '@mantine/core';
import { Avatar, Box, Button, Divider, Flex, Grid, Group, Input, NumberInput, rem, Select, SimpleGrid, Stack, Text, Textarea, TextInput } from '@mantine/core';
import { DateInput, TimeInput } from '@mantine/dates';
import React, { useState } from 'react';
import { IoIosArrowDropright } from 'react-icons/io';
@@ -28,7 +28,8 @@ export default function NavbarCreateDivisionCalender() {
timeStart: false,
timeEnd: false,
repeatEventTyper: false,
desc: false
desc: false,
repeatValue: false
})
const [isData, setData] = useState({
idDivision: "",
@@ -39,6 +40,7 @@ export default function NavbarCreateDivisionCalender() {
linkMeet: "",
repeatEventTyper: "",
desc: "",
repeatValue: "1"
})
async function onSubmit(val: boolean) {
@@ -56,6 +58,7 @@ export default function NavbarCreateDivisionCalender() {
linkMeet: isData.linkMeet,
repeatEventTyper: isData.repeatEventTyper,
desc: isData.desc,
repeatValue: isData.repeatValue,
member: memberValue
})
@@ -80,10 +83,9 @@ export default function NavbarCreateDivisionCalender() {
if (openMember) return <CreateUserCalender onClose={() => setOpenMember(false)} />
return (
<Box>
<LayoutNavbarNew back={`/division/${param.id}/calender/`} title="tambah kalender" menu />
<LayoutNavbarNew back={`/division/${param.id}/calender/`} title="Tambah Acara" menu />
<Box p={20}>
<Stack pb={100}>
<TextInput
@@ -198,14 +200,15 @@ export default function NavbarCreateDivisionCalender() {
},
}}
size="md"
placeholder="Ulangi Event"
label="Ulangi Event"
placeholder="Ulangi Acara"
label="Ulangi Acara"
data={[
{ value: '1', label: 'Acara 1 Kali' },
{ value: '2', label: 'Hari Kerja (Sen - Jum)' },
{ value: '3', label: 'Mingguan' },
{ value: '4', label: 'Bulanan' },
{ value: '5', label: 'Tahunan' },
{ value: 'once', label: 'Acara 1 Kali' },
{ value: 'daily', label: 'Setiap Hari' },
// { value: 'weekdays', label: 'Hari Kerja (Sen - Jum)' },
{ value: 'weekly', label: 'Mingguan' },
{ value: 'monthly', label: 'Bulanan' },
{ value: 'yearly', label: 'Tahunan' },
]}
value={isData.repeatEventTyper}
onChange={(val: any) => {
@@ -216,7 +219,31 @@ export default function NavbarCreateDivisionCalender() {
onBlur={() => setTouched({ ...touched, repeatEventTyper: true })}
error={
touched.repeatEventTyper && (
isData.repeatEventTyper == "" ? "Ulangi Event Tidak Boleh Kosong" : null
isData.repeatEventTyper == "" ? "Ulangi Acara Tidak Boleh Kosong" : null
)
}
/>
<TextInput styles={{
input: {
border: `1px solid ${"#D6D8F6"}`,
borderRadius: 10,
},
}}
type='number'
required
label="Jumlah pengulangan"
size="md"
placeholder='Jumlah pengulangan'
value={isData.repeatValue}
onChange={(event) => {
setData({ ...isData, repeatValue: String(event.currentTarget.value) })
setTouched({ ...touched, repeatValue: false })
}}
onBlur={() => setTouched({ ...touched, repeatValue: true })}
error={
touched.repeatValue && (
isData.repeatValue == "" ? "Jumlah pengulangan tidak boleh kosong" : null ||
Number(isData.repeatValue) <= 0 ? "Jumlah pengulangan tidak boleh 0" : null
)
}
/>
@@ -286,7 +313,7 @@ export default function NavbarCreateDivisionCalender() {
</Grid.Col>
<Grid.Col span={3}>
<Text c={WARNA.biruTua} fw={"bold"} ta={'end'}>
Anggota
Anggota
</Text>
</Grid.Col>
</Grid>

View File

@@ -1,26 +1,21 @@
"use client"
import { LayoutNavbarNew, WARNA } from '@/module/_global';
import { Avatar, Box, Button, Divider, Flex, Grid, Group, Input, rem, Select, SimpleGrid, Skeleton, Stack, Text, Textarea, TextInput } from '@mantine/core';
import { Box, Button, Group, rem, Select, SimpleGrid, Skeleton, Stack, Text, Textarea, TextInput } from '@mantine/core';
import { DateInput, TimeInput } from '@mantine/dates';
import React, { useState } from 'react';
import { IoIosArrowDropright } from 'react-icons/io';
import { useParams, useRouter } from 'next/navigation';
import LayoutModal from '@/module/_global/layout/layout_modal';
import toast from 'react-hot-toast';
import { funEditCalenderById, funGetOneCalender } from '../lib/api_calender';
import { funEditCalenderById, funGetOneCalender, funGetOneCalenderByIdCalendar, } from '../lib/api_calender';
import { useShallowEffect } from '@mantine/hooks';
import { IDataDetailByIdCalender, IDataDetailByIdMember, IDetailByIdCalender, IEditMemberCalender, IFormMemberCalender } from '../lib/type_calender';
import { IDetailByIdCalender } from '../lib/type_calender';
import moment from 'moment';
import "moment/locale/id";
import { useHookstate } from '@hookstate/core';
import { globalCalender } from '../lib/val_calender';
import UpdateListUsers from './update_list_users';
export default function UpdateDivisionCalender() {
const [isModal, setModal] = useState(false)
const param = useParams<{ id: string, detail: string }>()
// const memberUser = useHookstate(globalCalender)
// const memberValue = memberUser.get() as IFormMemberCalender[]
const [isDataCalender, setDataCalender] = useState<IDetailByIdCalender>()
const [openMember, setOpenMember] = useState(false)
const [loading, setLoading] = useState(true)
@@ -30,17 +25,22 @@ export default function UpdateDivisionCalender() {
timeStart: false,
timeEnd: false,
repeatEventTyper: false,
desc: false
desc: false,
repeatValue: false
})
const fetchGetOne = async () => {
try {
setLoading(true)
const response = await funGetOneCalender(param.detail)
setDataCalender(response.data.calender)
// memberUser.set(response.data.member)
const response = await funGetOneCalenderByIdCalendar(param.detail)
if (response.success) {
setDataCalender(response.data)
} else {
toast.error(response.message)
}
} catch (error) {
console.error(error)
toast.error("Terjadi kesalahan! Silahkan coba kembali");
} finally {
setLoading(false)
}
@@ -63,7 +63,7 @@ export default function UpdateDivisionCalender() {
linkMeet: isDataCalender?.linkMeet,
repeatEventTyper: isDataCalender?.repeatEventTyper,
desc: isDataCalender?.desc,
// member: memberValue
repeatValue: isDataCalender?.repeatValue
})
if (response.success) {
@@ -88,7 +88,7 @@ export default function UpdateDivisionCalender() {
return (
<Box>
<LayoutNavbarNew back={`/division/${param.id}/calender/${param.detail}`} title="Edit acara" menu />
<LayoutNavbarNew back='' title="Edit acara" menu />
<Box p={20}>
<Stack>
{loading ?
@@ -229,7 +229,6 @@ export default function UpdateDivisionCalender() {
size="md"
placeholder="Link Meet"
label="Link Meet"
// value={isDataCalender?.linkMeet}
defaultValue={isDataCalender?.linkMeet}
onChange={
(event) => {
@@ -251,11 +250,12 @@ export default function UpdateDivisionCalender() {
placeholder="Ulangi Acara"
label="Ulangi Acara"
data={[
{ value: '1', label: 'Acara 1 Kali' },
{ value: '2', label: 'Hari Kerja (Sen - Jum)' },
{ value: '3', label: 'Mingguan' },
{ value: '4', label: 'Bulanan' },
{ value: '5', label: 'Tahunan' },
{ value: 'once', label: 'Acara 1 Kali' },
{ value: 'daily', label: 'Setiap Hari' },
// { value: 'weekdays', label: 'Hari Kerja (Sen - Jum)' },
{ value: 'weekly', label: 'Mingguan' },
{ value: 'monthly', label: 'Bulanan' },
{ value: 'yearly', label: 'Tahunan' },
]}
value={isDataCalender?.repeatEventTyper}
defaultValue={isDataCalender?.repeatEventTyper}
@@ -276,6 +276,30 @@ export default function UpdateDivisionCalender() {
}
required
/>
<TextInput styles={{
input: {
border: `1px solid ${"#D6D8F6"}`,
borderRadius: 10,
},
}}
type='number'
required
label="Jumlah pengulangan"
size="md"
placeholder='Jumlah pengulangan'
defaultValue={isDataCalender?.repeatValue}
onChange={(event) => {
setDataCalender({ ...isDataCalender, repeatValue: String(event.currentTarget.value) })
setTouched({ ...touched, repeatValue: false })
}}
onBlur={() => setTouched({ ...touched, repeatValue: true })}
error={
touched.repeatValue && (
isDataCalender?.repeatValue == "" ? "Jumlah pengulangan tidak boleh kosong" : null ||
Number(isDataCalender?.repeatValue) <= 0 ? "Jumlah pengulangan tidak boleh dibawah 1" : null
)
}
/>
<Textarea styles={{
input: {
border: `1px solid ${"#D6D8F6"}`,
@@ -283,7 +307,6 @@ export default function UpdateDivisionCalender() {
},
}}
size="md" placeholder='Deskripsi' label="Deskripsi"
// value={isDataCalender?.desc}
defaultValue={isDataCalender?.desc}
onChange={
(event) => {
@@ -294,64 +317,6 @@ export default function UpdateDivisionCalender() {
}
}
/>
{/* <Box mt={5} onClick={() => setOpenMember(true)}>
<Group
justify="space-between"
p={10}
style={{
border: `1px solid ${"#D6D8F6"}`,
borderRadius: 10,
}}
>
<Text>Tambah Anggota</Text>
<IoIosArrowDropright size={25} />
</Group>
</Box> */}
{/* <Box pt={30}>
<Group justify="space-between">
<Text c={WARNA.biruTua}>Anggota Terpilih</Text>
<Text c={WARNA.biruTua}>Total {memberUser.length} Anggota</Text>
</Group>
<Box pt={10} >
<Box mb={100}>
<Box
style={{
border: `1px solid ${"#C7D6E8"}`,
borderRadius: 10,
}}
px={20}
py={10}
>
{memberUser.length == 0 ?
<Box style={{ display: 'flex', justifyContent: 'center', alignItems: 'center', height: '10vh' }}>
<Text c="dimmed" ta={"center"} fs={"italic"}>Tidak ada Anggota</Text>
</Box>
:
memberUser.get().map((v: any, i: any) => {
return (
<Box key={i}>
<Grid align='center' mt={10}
>
<Grid.Col span={3}>
<Avatar src={`/api/file/img?jenis=image&cat=user&file=${v.img}`} alt="it's me" size="lg" />
</Grid.Col>
<Grid.Col span={9}>
<Text c={WARNA.biruTua} fw={"bold"} lineClamp={1}>
{v.name}
</Text>
</Grid.Col>
</Grid>
<Box mt={10}>
<Divider size={"xs"} />
</Box>
</Box>
);
})}
</Box>
</Box>
</Box>
</Box> */}
</>
}
</Stack>
@@ -377,7 +342,7 @@ export default function UpdateDivisionCalender() {
}
</Box>
<LayoutModal opened={isModal} onClose={() => setModal(false)}
description="Apakah Anda yakin ingin mengubah data?"
description="Apakah Anda yakin ingin mengubah data acara ini? Data ini akan mempengaruhi semua data yang terkait"
onYes={(val) => { onSubmit(val) }} />
</Box>
);