Merge branch 'join' into lukman/15-juli-2024

src/app/(application)/(detail-division)/task/create/page.tsx

@@ -0,0 +1,15 @@
+import { ViewCreateTaskDivision } from "@/module/division_new";
+import { ViewDateEndTask, CreateUsersProject, ViewFileSave } from "@/module/project";
+
+function Page({ searchParams }: { searchParams: any }) {
+   if (searchParams.page == "task")
+      return <ViewDateEndTask kategori="task"/>;
+   if (searchParams.page == "create-users")
+      return <CreateUsersProject kategori="task"/>
+   if (searchParams.page == "file-save")
+      return <ViewFileSave kategori="task"/>
+
+   return <ViewCreateTaskDivision searchParams={searchParams} />
+}
+
+export default Page

src/app/(application)/(detail-division)/task/update/[id]/page.tsx

@@ -2,13 +2,13 @@ import { ViewUpdateProgressDivisionTask } from "@/module/division_new"
 import { DetailCreateUserProject, DetailDateEndTask, FileUploadProgres } from "@/module/project";
 
 function Page({ searchParams }: { searchParams: any }) {
-   if (searchParams.page == "upload-progres") return <FileUploadProgres />;
+   if (searchParams.page == "upload-progres") return <FileUploadProgres kategori="task" />;
    if (searchParams.page == "detail-create-user")
-      return <DetailCreateUserProject />;
-   if (searchParams.page == "detail-date-task") return <DetailDateEndTask />;
-   
+      return <DetailCreateUserProject kategori="task" />;
+   if (searchParams.page == "detail-date-task") return <DetailDateEndTask kategori="task" />;
+
    return (
-      <ViewUpdateProgressDivisionTask searchParams={searchParams}/>
+      <ViewUpdateProgressDivisionTask searchParams={searchParams} />
    )
 }
 

src/app/(application)/project/create/page.tsx

@@ -3,11 +3,11 @@ import React from "react";
 
 function Page({ searchParams }: { searchParams: any }) {
   if (searchParams.page == "task")
-    return <ViewDateEndTask />;
+    return <ViewDateEndTask kategori="project" />;
   if (searchParams.page == "create-users")
-    return <CreateUsersProject />
+    return <CreateUsersProject kategori="project" />
   if (searchParams.page == "file-save")
-    return <ViewFileSave />
+    return <ViewFileSave kategori="project" />
 
   return <ViewCreateProject searchParams={searchParams} />;
 }

src/app/(application)/project/update/[id]/page.tsx

@@ -8,10 +8,10 @@ import {
 import React from "react";
 
 function Page({ searchParams }: { searchParams: any }) {
-  if (searchParams.page == "upload-progres") return <FileUploadProgres />;
+  if (searchParams.page == "upload-progres") return <FileUploadProgres kategori="project" />;
   if (searchParams.page == "detail-create-user")
-    return <DetailCreateUserProject />;
-  if (searchParams.page == "detail-date-task") return <DetailDateEndTask />;
+    return <DetailCreateUserProject kategori="project" />;
+  if (searchParams.page == "detail-date-task") return <DetailDateEndTask kategori="project" />;
 
   return <ViewUpdateProgres searchParams={searchParams} />;
 }