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

Merge pull request 'amalia/20-agustus-25' (#15) from amalia/20-agustus-25 into join

Browse Source 
Reviewed-on: bip/sistem-desa-mandiri#15
This commit is contained in:
amaliadwiy
2025-08-20 17:22:18 +08:00
parent acfc574616 6147223b34
commit 19c99534c5
7 changed files with 141 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -162,7 +162,7 @@ export async function GET(request: Request, context: { params: { id: string } })
export async function POST(request: Request, context: { params: { id: string } }) {
try {
const { id } = context.params
const { name, dateStart, dateEnd, user } = await request.json()
const { name, dateStart, dateEnd, user, dataDetail } = await request.json()
const userMobile = await funGetUserById({ id: String(user) })
@@ -197,6 +197,21 @@ export async function POST(request: Request, context: { params: { id: string } }
}
})
if (dataDetail.length > 0) {
const dataDetailFix = dataDetail.map((v: any) => ({
...v,
idTask: dataCreate.id,
date: new Date(v.date),
timeStart: v.timeStart == null ? null : new Date(new Date('1970-01-01 ' + v.timeStart).getTime() - (new Date('1970-01-01 ' + v.timeStart).getTimezoneOffset() * 60000)).toISOString(),
timeEnd: v.timeEnd == null ? null : new Date(new Date('1970-01-01 ' + v.timeEnd).getTime() - (new Date('1970-01-01 ' + v.timeEnd).getTimezoneOffset() * 60000)).toISOString(),
}))
const dataDetailCreate = await prisma.projectTaskDetail.createMany({
data: dataDetailFix
})
}
// create log user
const log = await createLogUserMobile({ act: 'CREATE', desc: 'User membuat data tahapan kegiatan', table: 'projectTask', data: String(dataCreate.id), user: userMobile.id })

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

@@ -231,7 +231,7 @@ export async function GET(request: Request, context: { params: { id: string } })
export async function POST(request: Request, context: { params: { id: string } }) {
try {
const { id } = context.params;
const { title, dateStart, dateEnd, user } = (await request.json());
const { title, dateStart, dateEnd, user, dataDetail } = (await request.json());
const userMobile = await funGetUserById({ id: String(user) })
if (userMobile.id == "null" || userMobile.id == undefined || userMobile.id == "") {
@@ -264,6 +264,26 @@ export async function POST(request: Request, context: { params: { id: string } }
}
})
const dataDetailDelete = await prisma.projectTaskDetail.deleteMany({
where: {
idTask: id
}
})
if (dataDetail.length > 0) {
const dataDetailFix = dataDetail.map((v: any) => ({
...v,
idTask: id,
date: new Date(v.date),
timeStart: v.timeStart == null ? null : new Date(new Date('1970-01-01 ' + v.timeStart).getTime() - (new Date('1970-01-01 ' + v.timeStart).getTimezoneOffset() * 60000)).toISOString(),
timeEnd: v.timeEnd == null ? null : new Date(new Date('1970-01-01 ' + v.timeEnd).getTime() - (new Date('1970-01-01 ' + v.timeEnd).getTimezoneOffset() * 60000)).toISOString(),
}))
const dataDetailCreate = await prisma.projectTaskDetail.createMany({
data: dataDetailFix
})
}
// create log user
const log = await createLogUserMobile({ act: 'UPDATE', desc: 'User mengupdate tahapan kegiatan', table: 'projectTask', data: String(id), user: userMobile.id })

23
src/app/api/mobile/project/route.ts
View File

@@ -179,16 +179,33 @@ export async function POST(request: Request) {
if (task.length > 0) {
const dataProject = task.map((v: any) => ({
..._.omit(v, ["dateStart", "dateEnd", "name", "dateEndFix", "dateStartFix"]),
..._.omit(v, ["dateStart", "dateEnd", "name", "dateEndFix", "dateStartFix", "dataDetail"]),
idProject: data.id,
title: v.title,
dateStart: new Date(v.dateStartFix),
dateEnd: new Date(v.dateEndFix),
}))
let dataDetailFix = []
for (let i = 0; i < dataProject.length; i++) {
const insertTask = await prisma.projectTask.create({
data: dataProject[i],
select: {
id: true
}
})
const dataDetail = task[i].dataDetail.map((v: any) => ({
...v,
idTask: insertTask.id,
date: new Date(v.date),
timeStart: v.timeStart == null ? null : new Date(new Date('1970-01-01 ' + v.timeStart).getTime() - (new Date('1970-01-01 ' + v.timeStart).getTimezoneOffset() * 60000)).toISOString(),
timeEnd: v.timeEnd == null ? null : new Date(new Date('1970-01-01 ' + v.timeEnd).getTime() - (new Date('1970-01-01 ' + v.timeEnd).getTimezoneOffset() * 60000)).toISOString(),
}))
dataDetailFix.push(...dataDetail)
}
const insertTask = await prisma.projectTask.createMany({
data: dataProject
const insertDetail = await prisma.projectTaskDetail.createMany({
data: dataDetailFix
})
}

16
src/app/api/mobile/task/[id]/route.ts
View File

@@ -179,7 +179,7 @@ export async function GET(request: Request, context: { params: { id: string } })
export async function POST(request: Request, context: { params: { id: string } }) {
try {
const { id } = context.params;
const { title, dateStart, dateEnd, idDivision, user } = (await request.json());
const { title, dateStart, dateEnd, idDivision, user, dataDetail } = (await request.json());
const userMobile = await funGetUserById({ id: String(user) })
if (userMobile.id == "null" || userMobile.id == undefined || userMobile.id == "") {
@@ -215,6 +215,20 @@ export async function POST(request: Request, context: { params: { id: string } }
}
});
if (dataDetail.length > 0) {
const dataDetailFix = dataDetail.map((v: any) => ({
...v,
idTask: create.id,
date: new Date(v.date),
timeStart: v.timeStart == null ? null : new Date(new Date('1970-01-01 ' + v.timeStart).getTime() - (new Date('1970-01-01 ' + v.timeStart).getTimezoneOffset() * 60000)).toISOString(),
timeEnd: v.timeEnd == null ? null : new Date(new Date('1970-01-01 ' + v.timeEnd).getTime() - (new Date('1970-01-01 ' + v.timeEnd).getTimezoneOffset() * 60000)).toISOString(),
}))
const dataDetailCreate = await prisma.divisionProjectTaskDetail.createMany({
data: dataDetailFix
})
}
// const cek progress
const dataTask = await prisma.divisionProjectTask.findMany({
where: {

49
src/app/api/mobile/task/detail/[id]/route.ts
View File

@@ -2,6 +2,7 @@ import { prisma } from "@/module/_global";
import { funGetUserById } from "@/module/auth";
import { createLogUserMobile } from "@/module/user";
import _ from "lodash";
import moment from "moment";
import { NextResponse } from "next/server";
@@ -166,6 +167,7 @@ export async function GET(request: Request, context: { params: { id: string } })
const { id } = context.params;
const { searchParams } = new URL(request.url);
const user = searchParams.get("user");
const kategori = searchParams.get("cat");
const userMobile = await funGetUserById({ id: String(user) })
if (userMobile.id == "null" || userMobile.id == undefined || userMobile.id == "") {
@@ -183,7 +185,30 @@ export async function GET(request: Request, context: { params: { id: string } })
return NextResponse.json({ success: false, message: "Gagal mendapatkan detail tugas, data tidak ditemukan" }, { status: 200 });
}
return NextResponse.json({ success: true, message: "Berhasil mendapatkan detail tugas divisi", data }, { status: 200 });
let dataFix
if (kategori == "detailTask") {
const dataDetail = await prisma.divisionProjectTaskDetail.findMany({
where: {
idTask: String(id)
},
orderBy: {
date: "asc"
}
})
const dataDetailFix = dataDetail.map((data: any) => ({
...data,
date: moment(data?.date).format('DD-MM-YYYY'),
timeStart: data.timeStart == null ? "" : moment.utc(data.timeStart).format("HH:mm"),
timeEnd: data.timeEnd == null ? "" : moment.utc(data.timeEnd).format("HH:mm")
}))
dataFix = dataDetailFix
} else {
dataFix = data
}
return NextResponse.json({ success: true, message: "Berhasil mendapatkan detail tugas divisi", data: dataFix }, { status: 200 });
}
catch (error) {
@@ -198,7 +223,7 @@ export async function GET(request: Request, context: { params: { id: string } })
export async function POST(request: Request, context: { params: { id: string } }) {
try {
const { id } = context.params;
const { title, dateStart, dateEnd, user } = (await request.json());
const { title, dateStart, dateEnd, user, dataDetail } = (await request.json());
const userMobile = await funGetUserById({ id: String(user) })
if (userMobile.id == "null" || userMobile.id == undefined || userMobile.id == "") {
@@ -232,6 +257,26 @@ export async function POST(request: Request, context: { params: { id: string } }
},
});
const dataDetailDelete = await prisma.divisionProjectTaskDetail.deleteMany({
where: {
idTask: id
}
})
if (dataDetail.length > 0) {
const dataDetailFix = dataDetail.map((v: any) => ({
...v,
idTask: id,
date: new Date(v.date),
timeStart: v.timeStart == null ? null : new Date(new Date('1970-01-01 ' + v.timeStart).getTime() - (new Date('1970-01-01 ' + v.timeStart).getTimezoneOffset() * 60000)).toISOString(),
timeEnd: v.timeEnd == null ? null : new Date(new Date('1970-01-01 ' + v.timeEnd).getTime() - (new Date('1970-01-01 ' + v.timeEnd).getTimezoneOffset() * 60000)).toISOString(),
}))
const dataDetailCreate = await prisma.divisionProjectTaskDetail.createMany({
data: dataDetailFix
})
}
// create log user
const log = await createLogUserMobile({ act: 'UPDATE', desc: 'User mengupdate data detail task divisi', table: 'divisionProjectTask', data: id, user: userMobile.id })

25
src/app/api/mobile/task/route.ts
View File

@@ -142,7 +142,7 @@ export async function POST(request: Request) {
if (task.length > 0) {
const dataTask = task.map((v: any) => ({
..._.omit(v, ["dateStart", "dateEnd", "title", "dateStartFix", "dateEndFix"]),
..._.omit(v, ["dateStart", "dateEnd", "title", "dateStartFix", "dateEndFix", "dataDetail"]),
idDivision: idDivision,
idProject: data.id,
title: v.title,
@@ -150,9 +150,26 @@ export async function POST(request: Request) {
dateEnd: new Date(v.dateEndFix),
}))
let dataDetailFix = []
for (let i = 0; i < dataTask.length; i++) {
const insertTask = await prisma.divisionProjectTask.create({
data: dataTask[i],
select: {
id: true
}
})
const dataDetail = task[i].dataDetail.map((v: any) => ({
...v,
idTask: insertTask.id,
date: new Date(v.date),
timeStart: v.timeStart == null ? null : new Date(new Date('1970-01-01 ' + v.timeStart).getTime() - (new Date('1970-01-01 ' + v.timeStart).getTimezoneOffset() * 60000)).toISOString(),
timeEnd: v.timeEnd == null ? null : new Date(new Date('1970-01-01 ' + v.timeEnd).getTime() - (new Date('1970-01-01 ' + v.timeEnd).getTimezoneOffset() * 60000)).toISOString(),
}))
dataDetailFix.push(...dataDetail)
}
const insertTask = await prisma.divisionProjectTask.createMany({
data: dataTask
const insertDetail = await prisma.divisionProjectTaskDetail.createMany({
data: dataDetailFix
})
}
@@ -350,7 +367,7 @@ export async function POST(request: Request) {
token: tokenUnique,
title: "Tugas Baru",
body: "Anda memiliki tugas baru. Silahkan periksa detailnya.",
data: { id: data.id, category:'division/' + idDivision + '/task', content: data.id }
data: { id: data.id, category: 'division/' + idDivision + '/task', content: data.id }
})
// create log user

2
src/app/api/version-app/route.ts
View File

@@ -2,7 +2,7 @@ import { NextResponse } from "next/server";
export async function GET(request: Request) {
try {
return NextResponse.json({ success: true, version: "1.5.8", tahap: "beta", update: "-update notif komen diskusi" }, { status: 200 });
return NextResponse.json({ success: true, version: "1.7.0", tahap: "beta", update: "-api mobile; -tambah laporan pada project dan tugas divisi; -tambah upload link pada project dan tugas divisi; -tambah detail tanggal dan jam pada project dan tugas divisi" }, { 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 });