Merge pull request #334 from bipproduction/amalia/11-nov-24

Amalia/11 nov 24
This commit is contained in:
Amalia
2024-11-11 15:03:42 +08:00
committed by GitHub
8 changed files with 18 additions and 22 deletions

View File

@@ -193,8 +193,8 @@ export async function POST(request: Request, context: { params: { id: string } }
idProject: id,
idDivision,
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),
},
select: {
id: true

View File

@@ -2,7 +2,6 @@ import { 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";
@@ -78,8 +77,6 @@ export async function DELETE(request: Request, context: { params: { id: string }
}
}
// EDIT STATUS DETAIL TASK
export async function PUT(request: Request, context: { params: { id: string } }) {
try {
@@ -218,8 +215,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),
},
});

View File

@@ -2,7 +2,6 @@ import { DIR, funUploadFile, prisma } from "@/module/_global";
import { funGetUserByCookies } from "@/module/auth";
import { createLogUser } from "@/module/user";
import _, { ceil } from "lodash";
import moment from "moment";
import { NextResponse } from "next/server";
@@ -145,8 +144,8 @@ export async function POST(request: Request) {
idDivision: idDivision,
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.divisionProjectTask.createMany({

View File

@@ -2,7 +2,7 @@ import { NextResponse } from "next/server";
export async function GET(request: Request) {
try {
return NextResponse.json({ success: true, version: "0.2.0", mode: "staging" }, { status: 200 });
return NextResponse.json({ success: true, version: "0.2.1", mode: "staging" }, { status: 200 });
} catch (error) {
console.error(error);
return NextResponse.json({ success: false, version: "Gagal mendapatkan version, coba lagi nanti (error: 500)", reason: (error as Error).message, }, { status: 500 });

View File

@@ -14,14 +14,14 @@ export interface IFormMemberTask {
export interface IFormDateTask {
dateStart: Date,
dateEnd: Date,
dateStart: string,
dateEnd: string,
title: string
}
export interface IFormAddDetailTask {
dateStart: Date,
dateEnd: Date,
dateStart: string,
dateEnd: string,
title: string
idDivision: string
}

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 { funCreateDetailTask } from "../lib/api_task";
import { useShallowEffect } from "@mantine/hooks";
export default function AddDetailTask() {
const [value, setValue] = useState<[Date | null, Date | null]>([null, null]);
@@ -59,8 +59,8 @@ export default function AddDetailTask() {
setLoadingModal(true)
const res = await funCreateDetailTask(param.detail, {
title,
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'),
idDivision: param.id
})

View File

@@ -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
})

View File

@@ -38,8 +38,8 @@ export default function EditDetailTask() {
setLoadingModal(true)
const res = await funEditDetailTask(param.detail, {
title: title,
dateStart: value[0],
dateEnd: value[1],
dateStart: moment(value[0]).format('YYYY-MM-DD'),
dateEnd: moment(value[1]).format('YYYY-MM-DD'),
})
if (res.success) {