diff --git a/src/app/api/task/[id]/route.ts b/src/app/api/task/[id]/route.ts
index bcfa2f5..5ee8f47 100644
--- a/src/app/api/task/[id]/route.ts
+++ b/src/app/api/task/[id]/route.ts
@@ -2,8 +2,10 @@ import { prisma } from "@/module/_global";
import { funGetUserByCookies } from "@/module/auth";
import _ from "lodash";
import moment from "moment";
+import "moment/locale/id"
import { NextResponse } from "next/server";
+
// GET DETAIL TASK DIVISI / GET ONE
export async function GET(request: Request, context: { params: { id: string } }) {
try {
diff --git a/src/module/division_new/ui/create_anggota_division.tsx b/src/module/division_new/ui/create_anggota_division.tsx
index 62e9e9c..2c2b758 100644
--- a/src/module/division_new/ui/create_anggota_division.tsx
+++ b/src/module/division_new/ui/create_anggota_division.tsx
@@ -82,7 +82,7 @@ export default function CreateAnggotaDivision() {
return (
-
diff --git a/src/module/task/ui/add_member_detail_task.tsx b/src/module/task/ui/add_member_detail_task.tsx
index eab2ad7..acc2e32 100644
--- a/src/module/task/ui/add_member_detail_task.tsx
+++ b/src/module/task/ui/add_member_detail_task.tsx
@@ -9,6 +9,7 @@ import {
Checkbox,
Divider,
Flex,
+ Grid,
Group,
rem,
Stack,
@@ -148,32 +149,29 @@ export default function AddMemberDetailTask() {
const found = isDataMember.some((i: any) => i.idUser == v.idUser)
return (
(!found) ? handleFileClick(i) : null}>
-
-
+
+
-
-
- {v.name}
-
- {(found) ? "sudah menjadi anggota" : ""}
-
-
-
- {isSelected ? : ""}
-
-
-
+
+
+
+
+ {v.name}
+ {(found) ? "sudah menjadi anggota" : ""}
+
+ {isSelected ? : null}
+
+
+
+
+
+
);
})}
diff --git a/src/module/task/ui/create_users_project.tsx b/src/module/task/ui/create_users_project.tsx
index 6204031..5d66dd5 100644
--- a/src/module/task/ui/create_users_project.tsx
+++ b/src/module/task/ui/create_users_project.tsx
@@ -9,6 +9,7 @@ import {
Button,
Divider,
Flex,
+ Grid,
Group,
rem,
Skeleton,
@@ -111,7 +112,7 @@ export default function CreateUsersProject({ onClose }: { onClose: (val: any) =>
Pilih Semua Anggota
-
+
}
@@ -120,7 +121,7 @@ export default function CreateUsersProject({ onClose }: { onClose: (val: any) =>
.fill(null)
.map((_, i) => (
-
+
))
:
@@ -128,51 +129,50 @@ export default function CreateUsersProject({ onClose }: { onClose: (val: any) =>
const isSelected = selectedFiles.some((i: any) => i?.idUser == v.idUser);
return (
handleFileClick(i)}>
-
-
+
+
-
- {v.name}
-
-
-
- {isSelected ? : ""}
-
-
-
+
+
+
+
+ {v.name}
+
+ {isSelected ? : null}
+
+
+
+
+
+
);
})
}
-
-
-
+
+
+
);
}
diff --git a/src/module/task/ui/detail_list_anggota_task.tsx b/src/module/task/ui/detail_list_anggota_task.tsx
index e0f5cc8..f8eb770 100644
--- a/src/module/task/ui/detail_list_anggota_task.tsx
+++ b/src/module/task/ui/detail_list_anggota_task.tsx
@@ -1,6 +1,6 @@
'use client'
import { LayoutDrawer, SkeletonSingle, WARNA } from "@/module/_global";
-import { Box, Group, Flex, Avatar, Text, SimpleGrid, Stack } from "@mantine/core";
+import { Box, Group, Flex, Avatar, Text, SimpleGrid, Stack, Grid } from "@mantine/core";
import { useShallowEffect } from "@mantine/hooks";
import { useParams, useRouter } from "next/navigation";
import { useState } from "react";
@@ -91,31 +91,34 @@ export default function ListAnggotaDetailTask() {
isData.length === 0 ? Tidak ada anggota :
isData.map((v, i) => {
return (
- {
- setDataChoose({ id: v.idUser, name: v.name })
- setOpenDrawer(true)
- }}
- >
-
-
-
-
- {v.name}
+
+ {
+ setDataChoose({ id: v.idUser, name: v.name })
+ setOpenDrawer(true)
+ }}
+ >
+
+
+
+
+
+ {v.name}
+ {v.email}
+
+
+
+
+
+
+ Anggota
-
- {v.email}
-
-
-
-
- Anggota
-
-
+
+
+
);
})}
@@ -123,11 +126,11 @@ export default function ListAnggotaDetailTask() {
- setOpenDrawer(false)}>
+ {dataChoose.name}} onClose={() => setOpenDrawer(false)}>
{ router.push('/member/' + dataChoose.id) }} justify={'center'} align={'center'} direction={'column'} >
diff --git a/src/module/task/ui/detail_list_tugas_task.tsx b/src/module/task/ui/detail_list_tugas_task.tsx
index 4a5950c..ca9fd81 100644
--- a/src/module/task/ui/detail_list_tugas_task.tsx
+++ b/src/module/task/ui/detail_list_tugas_task.tsx
@@ -12,6 +12,7 @@ import { FaCheck, FaPencil, FaTrash } from "react-icons/fa6"
import LayoutModal from "@/module/_global/layout/layout_modal"
import { globalRefreshTask, valStatusDetailTask } from "../lib/val_task"
import { useHookstate } from "@hookstate/core"
+import "moment/locale/id"
export default function ListTugasDetailTask() {
const [openDrawer, setOpenDrawer] = useState(false)
@@ -108,27 +109,22 @@ export default function ListTugasDetailTask() {
isData.map((item, index) => {
return (
- {
- setIdData(item.id)
- setStatusData(item.status)
- setOpenDrawer(true)
- }}
- >
-
-
-
-
-
-
-
-
+ {
+ setIdData(item.id)
+ setStatusData(item.status)
+ setOpenDrawer(true)
+ }}>
+
+
+
+
@@ -140,43 +136,34 @@ export default function ListTugasDetailTask() {
-
+
Tanggal Mulai
{item.dateStart}
- Tanggal Berakhir
+ Tanggal Berakhir
{item.dateEnd}
-
-
- {isData.length >= 1
- ? "" :
-
- }
+
+
+
)
})
diff --git a/src/module/task/ui/list_division_task.tsx b/src/module/task/ui/list_division_task.tsx
index cafea5f..76130c1 100644
--- a/src/module/task/ui/list_division_task.tsx
+++ b/src/module/task/ui/list_division_task.tsx
@@ -80,43 +80,62 @@ export default function ListDivisionTask() {
- {loading ?
+ {loading ?
- :
-
- Total Kegiatan
-
- {isData.length}
-
-
- }
+ :
+
+ Total Kegiatan
+
+ {isData.length}
+
+
+ }
{isList ? (
{isData.map((v, i) => {
return (
- router.push(`task/${v.id}`)}>
-
-
-
-
-
-
- {v.title}
-
-
+
+
+ router.push(`task/${v.id}`)}>
+
+
+
+
+
+
+
+
+
+
+
+ {v.title}
+
+
+
+
+
);
@@ -124,52 +143,52 @@ export default function ListDivisionTask() {
) : (
- {loading ?
- Array(3)
+ {loading ?
+ Array(3)
.fill(null)
.map((_, i) => (
-
-
-
+
+
+
))
- :
- _.isEmpty(isData)
+ :
+ _.isEmpty(isData)
?
Tidak ada Tugas
:
- isData.map((v: any, i: any) => {
- return (
-
- router.push(`task/${v.id}`)}>
-
-
-
- {v.title}
-
+ isData.map((v: any, i: any) => {
+ return (
+
+ router.push(`task/${v.id}`)}>
+
+
+
+ {v.title}
+
+
+
+
+
+
+ {v.progress}%
+
+
+ {v.desc}
+
+
+
+
+
+ +{v.member - 1}
+
+
-
-
-
-
- {v.progress}%
-
-
- {v.desc}
-
-
-
-
-
- +{v.member - 1}
-
-
-
-
-
- );
- })
+
+
+ );
+ })
}
)}