From f54b1cb25bcd04fe7916c81dcbb75b5f8deb56b2 Mon Sep 17 00:00:00 2001 From: amel Date: Tue, 28 Jan 2025 12:42:27 +0800 Subject: [PATCH 1/3] upd: button unduh dokumen divisi --- .../document/ui/navbar_document_division.tsx | 37 ++++++++++--------- 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/src/module/document/ui/navbar_document_division.tsx b/src/module/document/ui/navbar_document_division.tsx index c464d9d..1cbdeac 100644 --- a/src/module/document/ui/navbar_document_division.tsx +++ b/src/module/document/ui/navbar_document_division.tsx @@ -345,24 +345,25 @@ export default function NavbarDocumentDivision() { > - { - if (selectedFiles.length > 0 && copyAllowed) { - onDownload("selected"); - } - }} - > - 0 && copyAllowed - ? "white" - : "#656060" - } - /> + + { + if (selectedFiles.length > 0 && copyAllowed) { + onDownload("selected"); + } + }} + > + 0 && copyAllowed + ? "white" + : "#656060" + } + /> + Date: Tue, 28 Jan 2025 14:17:03 +0800 Subject: [PATCH 2/3] rev: jumlah total file pada detail divisi --- src/app/api/division/[id]/detail/route.ts | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/app/api/division/[id]/detail/route.ts b/src/app/api/division/[id]/detail/route.ts index b018447..61434c5 100644 --- a/src/app/api/division/[id]/detail/route.ts +++ b/src/app/api/division/[id]/detail/route.ts @@ -50,6 +50,17 @@ export async function GET(request: Request, context: { params: { id: string } }) } }) + const dokumenShare = await prisma.divisionDocumentShare.count({ + where: { + idDivision: String(id), + isActive: true, + DivisionDocumentFolderFile: { + isActive: true, + category: "FILE" + } + } + }) + const diskusi = await prisma.divisionDisscussion.count({ where: { idDivision: String(id), @@ -74,7 +85,7 @@ export async function GET(request: Request, context: { params: { id: string } }) allData = { tugas: tugas, - dokumen: dokumen, + dokumen: dokumen + dokumenShare, diskusi: diskusi, kalender: kalender } From ec79379e7841fbe8aaf82d0eb5bf9bc772cb5c5f Mon Sep 17 00:00:00 2001 From: amel Date: Tue, 28 Jan 2025 14:38:02 +0800 Subject: [PATCH 3/3] revisi: dokumen divisi Deskripsi: - update on click pada flex selected file - file share boleh di unduh No Issues --- .../document/ui/navbar_document_division.tsx | 92 +++++++++---------- 1 file changed, 41 insertions(+), 51 deletions(-) diff --git a/src/module/document/ui/navbar_document_division.tsx b/src/module/document/ui/navbar_document_division.tsx index 1cbdeac..701f082 100644 --- a/src/module/document/ui/navbar_document_division.tsx +++ b/src/module/document/ui/navbar_document_division.tsx @@ -106,7 +106,7 @@ export default function NavbarDocumentDivision() { } const cek = selectedFiles.some((i: any) => i?.category == "FOLDER"); - if (cek || shareSelected || selectedFiles.length > 1) { + if (cek || selectedFiles.length > 1) { setCopyAllowed(false); } else { setCopyAllowed(true); @@ -345,16 +345,14 @@ export default function NavbarDocumentDivision() { > - - { - if (selectedFiles.length > 0 && copyAllowed) { - onDownload("selected"); - } - }} - > + { + if (selectedFiles.length > 0 && copyAllowed) { + onDownload("selected"); + } + }} + > + - - 0 && !shareSelected - ? () => setIsDelete(true) - : undefined - } - > + 0 && !shareSelected + ? () => setIsDelete(true) + : undefined + } + > + - - onChooseRename() - : undefined - } - > + onChooseRename() + : undefined + } + > + - - 0 && !shareSelected - ? () => setShare(true) - : undefined - } - > + 0 && !shareSelected + ? () => setShare(true) + : undefined + } + > + - - 0 && !shareSelected) - ? () => setMore(true) - : undefined - } - > + 0 && !shareSelected) + ? () => setMore(true) + : undefined + } + > +