diff --git a/src/app/(application)/division/[id]/(fitur-division)/task/create/page.tsx b/src/app/(application)/division/[id]/(fitur-division)/task/create/page.tsx
index 543ecc5..3cb4e90 100644
--- a/src/app/(application)/division/[id]/(fitur-division)/task/create/page.tsx
+++ b/src/app/(application)/division/[id]/(fitur-division)/task/create/page.tsx
@@ -1,10 +1,6 @@
-import { CreateTask, FileSave } from "@/module/task";
+import { CreateTask } from "@/module/task";
function Page({ searchParams }: { searchParams: any }) {
-
- // if (searchParams.page == "file-save")
- // return
-
return
}
diff --git a/src/app/api/task/[id]/route.ts b/src/app/api/task/[id]/route.ts
index 6dc4e93..f1b19b3 100644
--- a/src/app/api/task/[id]/route.ts
+++ b/src/app/api/task/[id]/route.ts
@@ -44,14 +44,23 @@ export async function GET(request: Request, context: { params: { id: string } })
}
})
- const semua = dataProgress.length
- const selesai = _.filter(dataProgress, { status: 1 }).length
- const progress = Math.ceil((selesai / semua) * 100)
+ if (dataProgress.length > 0) {
+ const semua = dataProgress.length
+ const selesai = _.filter(dataProgress, { status: 1 }).length
+ const progress = Math.ceil((selesai / semua) * 100)
- allData = {
- progress: progress,
- lastUpdate: moment(dataProgress[0].updatedAt).format("DD MMMM YYYY"),
+ allData = {
+ progress: progress,
+ lastUpdate: moment(dataProgress[0]?.updatedAt).format("DD MMMM YYYY"),
+ }
+ } else {
+ allData = {
+ progress: 0,
+ lastUpdate: '1 Januari 1999',
+ }
}
+
+
} else if (kategori == "task") {
const dataProgress = await prisma.divisionProjectTask.findMany({
where: {
diff --git a/src/app/api/task/route.ts b/src/app/api/task/route.ts
index a68b206..8209257 100644
--- a/src/app/api/task/route.ts
+++ b/src/app/api/task/route.ts
@@ -68,6 +68,9 @@ export async function GET(request: Request) {
idUser: true
}
}
+ },
+ orderBy: {
+ createdAt: "desc"
}
});
diff --git a/src/module/_global/layout/layout_modal.tsx b/src/module/_global/layout/layout_modal.tsx
index aa3858f..88b9cdb 100644
--- a/src/module/_global/layout/layout_modal.tsx
+++ b/src/module/_global/layout/layout_modal.tsx
@@ -30,6 +30,7 @@ export default function LayoutModal({ opened, onClose, description, onYes }: { o
>
@@ -39,6 +40,7 @@ export default function LayoutModal({ opened, onClose, description, onYes }: { o
>
diff --git a/src/module/task/ui/add_file_detail_task.tsx b/src/module/task/ui/add_file_detail_task.tsx
index ed858fe..389baa3 100644
--- a/src/module/task/ui/add_file_detail_task.tsx
+++ b/src/module/task/ui/add_file_detail_task.tsx
@@ -98,9 +98,9 @@ export default function AddFileDetailTask() {
}}
activateOnClick={false}
maxSize={3 * 1024 ** 2}
- accept={['text/csv', 'image/png', 'image/jpeg', 'image/heic', 'application/pdf']}
+ accept={['image/png', 'image/jpeg', 'image/heic', 'application/pdf']}
onReject={(files) => {
- return toast.error('File yang diizinkan: .csv, .png, .jpg, .heic, .pdf dengan ukuran maksimal 3 MB')
+ return toast.error('File yang diizinkan: .png, .jpg, .heic, .pdf dengan ukuran maksimal 3 MB')
}}
>
diff --git a/src/module/task/ui/create_task.tsx b/src/module/task/ui/create_task.tsx
index 2c6b186..2273b67 100644
--- a/src/module/task/ui/create_task.tsx
+++ b/src/module/task/ui/create_task.tsx
@@ -304,9 +304,9 @@ export default function CreateTask() {
}}
activateOnClick={false}
maxSize={3 * 1024 ** 2}
- accept={['text/csv', 'image/png', 'image/jpeg', 'image/heic', 'application/pdf']}
+ accept={['image/png', 'image/jpeg', 'image/heic', 'application/pdf']}
onReject={(files) => {
- return toast.error('File yang diizinkan: .csv, .png, .jpg, .heic, .pdf dengan ukuran maksimal 3 MB')
+ return toast.error('File yang diizinkan: .png, .jpg, .heic, .pdf dengan ukuran maksimal 3 MB')
}}
>
diff --git a/src/module/task/ui/detail_list_anggota_task.tsx b/src/module/task/ui/detail_list_anggota_task.tsx
index 1841852..71c1357 100644
--- a/src/module/task/ui/detail_list_anggota_task.tsx
+++ b/src/module/task/ui/detail_list_anggota_task.tsx
@@ -100,9 +100,8 @@ export default function ListAnggotaDetailTask() {
style={{
border: `1px solid ${"#C7D6E8"}`,
borderRadius: 10,
+ padding: 20
}}
- px={20}
- py={10}
>
{
loading ?
@@ -114,7 +113,7 @@ export default function ListAnggotaDetailTask() {
))
:
- isData.length === 0 ? Tidak ada anggota :
+ isData.length === 0 ? Tidak ada anggota :
isData.map((v, i) => {
return (
diff --git a/src/module/task/ui/detail_list_file_task.tsx b/src/module/task/ui/detail_list_file_task.tsx
index d8d4c9f..a8037d2 100644
--- a/src/module/task/ui/detail_list_file_task.tsx
+++ b/src/module/task/ui/detail_list_file_task.tsx
@@ -109,7 +109,7 @@ export default function ListFileDetailTask() {
))
:
- isData.length === 0 ? Tidak ada file :
+ isData.length === 0 ? Tidak ada file :
isData.map((item, index) => {
return (
{
loading ?
@@ -130,7 +129,7 @@ export default function ListTugasDetailTask() {
>
:
- isData.length === 0 ? Tidak ada tugas :
+ isData.length === 0 ? Tidak ada tugas :
isData.map((item, index) => {
return (