Merge pull request #319 from bipproduction/join

Join

src/app/api/version-app/route.ts

@@ -2,7 +2,7 @@ import { NextResponse } from "next/server";
 
 export async function GET(request: Request) {
    try {
-      return NextResponse.json({ success: true, version: "0.1.7", mode: "staging" }, { status: 200 });
+      return NextResponse.json({ success: true, version: "0.1.8", mode: "staging" }, { 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 });

src/module/_global/components/skeleton_detail_list_tugas_task.tsx

@@ -1,10 +1,6 @@
-import { useHookstate } from '@hookstate/core';
 import { Box, Center, Grid, Group, SimpleGrid, Skeleton } from '@mantine/core';
-import React from 'react';
-import { TEMA } from '../bin/val_global';
 
 export default function SkeletonDetailListTugasTask() {
-  const tema = useHookstate(TEMA)
   return (
     <Box>
       <Skeleton width={30} height={30} radius={"md"} />
@@ -17,7 +13,7 @@ export default function SkeletonDetailListTugasTask() {
           <Box
             style={{
               borderRadius: 10,
-              border: `1px solid ${tema.get().bgTotalKegiatan}`,
+              border: `1px solid ${"#D6D8F6"}`,
               padding: 10,
             }}
           >
@@ -36,7 +32,7 @@ export default function SkeletonDetailListTugasTask() {
                   h={45}
                   style={{
                     borderRadius: 10,
-                    border: `1px solid ${tema.get().bgTotalKegiatan}`,
+                    border: `1px solid ${"#D6D8F6"}`,
                   }}
                 >
                   <Skeleton ml={5} width={"80%"} height={20} radius={"md"} />
@@ -50,7 +46,7 @@ export default function SkeletonDetailListTugasTask() {
                   h={45}
                   style={{
                     borderRadius: 10,
-                    border: `1px solid ${tema.get().bgTotalKegiatan}`,
+                    border: `1px solid ${"#D6D8F6"}`,
                   }}
                 >
                   <Skeleton ml={5} width={"80%"} height={20} radius={"md"} />

src/module/position/ui/drawer_list_position.tsx

@@ -169,7 +169,7 @@ export default function DrawerListPosition({ onCreated }: { onCreated: (val: boo
                      }
                      size="md"
                      radius={10}
-                     mb={5}
+                     mb={15}
                      withAsterisk
                      onChange={(e: any) => { onValidation('idGroup', e) }}
                      styles={{
@@ -195,7 +195,7 @@ export default function DrawerListPosition({ onCreated }: { onCreated: (val: boo
                         borderColor: tema.get().utama,
                      },
                   }}
-                  my={15}
+                  mb={15}
                   size="md"
                   onChange={(e) => { onValidation('name', e.target.value) }}
                   radius={10}

src/module/position/ui/list_position_active.tsx

@@ -28,6 +28,7 @@ export default function ListPositionActive() {
   const refresh = useHookstate(globalRefreshPosition)
   const roleLogin = useHookstate(globalRole)
   const [nameGroup, setNameGroup] = useState('')
+  const [idGroup, setIdGroup] = useState('')
   const tema = useHookstate(TEMA)
   const [dataRealTime, setDataRealtime] = useWibuRealtime({
     WIBU_REALTIME_TOKEN: keyWibu,
@@ -40,6 +41,7 @@ export default function ListPositionActive() {
       const res = await funGetAllPosition('?active=' + status + '&group=' + group + '&search=' + searchQuery)
       setDataPosition(res.data);
       setNameGroup(res.filter.name)
+      setIdGroup(res.filter.id)
       setLoading(false)
     } catch (error) {
       toast.error("Gagal mendapatkan position, coba lagi nanti");
@@ -54,7 +56,7 @@ export default function ListPositionActive() {
   }, [status, group, searchQuery, refresh.get()])
 
   useShallowEffect(() => {
-    if (dataRealTime && dataRealTime.some((i: any) => i.category == 'data-position' && i.group == group)) {
+    if (dataRealTime && dataRealTime.some((i: any) => i.category == 'data-position' && i.group == idGroup)) {
       getAllPosition(false)
     }
   }, [dataRealTime])

src/module/task/ui/detail_list_tugas_task.tsx

@@ -157,7 +157,7 @@ export default function ListTugasDetailTask() {
                      </Box>
                   </>
                   :
-                  isData.length === 0 ? <Text c={"dimmed"} ta={"center"} fs={"italic"}>Tidak ada tugas</Text> :
+                  isData.length === 0 ? <Text c={"dimmed"} ta={"center"} fs={"italic"} py={20}>Tidak ada tugas</Text> :
                      isData.map((item, index) => {
                         return (
                            <Box key={index}>