fix: project kegiatan
Deskripsi: - fix format tgl di server soalnya di server -1 day, di tambah kegiatan, tambah task kegiatan, dan edit task kegiatan - hapus pilih semua pada bagian pilih anggota No Issues
This commit is contained in:
@@ -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) {
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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
|
||||
})
|
||||
}
|
||||
|
||||
@@ -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[]>([])
|
||||
|
||||
@@ -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'),
|
||||
|
||||
})
|
||||
|
||||
|
||||
@@ -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={{
|
||||
|
||||
Reference in New Issue
Block a user