Merge pull request 'amalia/12-agustus-25' (#22 ) from amalia/12-agustus-25 into join

Reviewed-on: bip/mobile-darmasaba#22
fix : tampilan
2025-08-12 17:42:40 +08:00 · 2025-08-12 14:53:28 +08:00 · 2025-08-12 13:46:08 +08:00 · 2025-08-12 13:43:19 +08:00 · 2025-08-12 11:43:53 +08:00 · 2025-08-11 17:33:44 +08:00
15 changed files with 161 additions and 140 deletions
--- a/app/(application)/discussion/[id].tsx
+++ b/app/(application)/discussion/[id].tsx
@@ -146,7 +146,6 @@ export default function DetailDiscussionGeneral() {
                        :
                        <BorderBottomItem
                           descEllipsize={false}
-                           width={55}
                           borderType="bottom"
                           icon={
                              <View style={[Styles.iconContent, ColorsStatus.lightGreen]}>
@@ -183,7 +182,6 @@ export default function DetailDiscussionGeneral() {
                              return (
                                 <BorderBottomItem
                                    key={i}
-                                    width={55}
                                    borderType="bottom"
                                    icon={
                                       <ImageUser src={`https://wibu-storage.wibudev.com/api/files/${item.img}`} size="xs" />
--- a/app/(application)/division/[id]/(fitur-division)/discussion/[detail]/index.tsx
+++ b/app/(application)/division/[id]/(fitur-division)/discussion/[detail]/index.tsx
@@ -217,7 +217,6 @@ export default function DiscussionDetail() {
                        :
                        <BorderBottomItem
                           descEllipsize={false}
-                           width={55}
                           borderType="bottom"
                           icon={
                              <ImageUser
@@ -265,7 +264,6 @@ export default function DiscussionDetail() {
                           dataComment.map((item, index) => (
                              <BorderBottomItem
                                 key={index}
-                                 width={55}
                                 borderType="bottom"
                                 icon={
                                    <ImageUser
--- a/app/(application)/division/[id]/(fitur-division)/discussion/index.tsx
+++ b/app/(application)/division/[id]/(fitur-division)/discussion/index.tsx
@@ -138,7 +138,6 @@ export default function DiscussionDivision() {
                           return (
                              <BorderBottomItem
                                 key={index}
-                                 width={55}
                                 onPress={() => { router.push(`./discussion/${item.id}`) }}
                                 borderType="bottom"
                                 icon={
@@ -174,7 +173,6 @@ export default function DiscussionDivision() {
                     // data.map((item, index) => (
                     //    <BorderBottomItem
                     //       key={index}
-                     //       width={55}
                     //       onPress={() => { router.push(`./discussion/${item.id}`) }}
                     //       borderType="bottom"
                     //       icon={
--- a/app/(application)/division/[id]/info.tsx
+++ b/app/(application)/division/[id]/info.tsx
@@ -184,7 +184,6 @@ export default function InformationDivision() {
                           dataMember.map((item, index) => {
                              return (
                                 <BorderBottomItem
-                                    width={55}
                                    key={index}
                                    borderType="bottom"
                                    onPress={() => { dataDetail?.isActive && handleChooseMember(item) }}
--- a/app/(application)/group/index.tsx
+++ b/app/(application)/group/index.tsx
@@ -15,7 +15,7 @@ import { setUpdateGroup } from "@/lib/groupSlice";
 import { useAuthSession } from "@/providers/AuthProvider";
 import { AntDesign, Feather, MaterialCommunityIcons } from "@expo/vector-icons";
 import { useEffect, useState } from "react";
-import { RefreshControl, SafeAreaView, ScrollView, View } from "react-native";
+import { RefreshControl, View, VirtualizedList } from "react-native";
 import Toast from "react-native-toast-message";
 import { useDispatch, useSelector } from "react-redux";

@@ -116,9 +116,17 @@ export default function Index() {
   }


+   const getItem = (_data: unknown, index: number): Props => ({
+      id: data[index].id,
+      name: data[index].name,
+      isActive: data[index].isActive,
+   });
+
+
+
   return (
-      <SafeAreaView>
-         <View style={[Styles.p15]}>
+      <View style={[Styles.p15, { flex: 1 }]}>
+         <View>
            <View style={[Styles.wrapBtnTab]}>
               <ButtonTab
                  active={status == "false" ? "false" : "true"}
@@ -136,51 +144,53 @@ export default function Index() {
                  n={2} />
            </View>
            <InputSearch onChange={setSearch} />
-            <ScrollView
-               refreshControl={
-                  <RefreshControl
-                     refreshing={refreshing}
-                     onRefresh={handleRefresh}
-                  />
-               }
-               style={[Styles.h100]}
-            >
-               <View>
-                  {
-
-                     loading ?
-                        arrSkeleton.map((item, index) => {
+         </View>
+         <View style={{ flex: 2 }}>
+            {
+               loading ?
+                  arrSkeleton.map((item, index) => {
+                     return (
+                        <SkeletonTwoItem key={index} />
+                     )
+                  })
+                  :
+                  data.length > 0 ?
+                     <VirtualizedList
+                        data={data}
+                        getItemCount={() => data.length}
+                        getItem={getItem}
+                        renderItem={({ item, index }: { item: Props, index: number }) => {
                           return (
-                              <SkeletonTwoItem key={index} />
+                              <BorderBottomItem
+                                 key={index}
+                                 onPress={() => {
+                                    setIdChoose(item.id)
+                                    setActiveChoose(item.isActive)
+                                    setTitleChoose(item.name)
+                                    setModal(true)
+                                 }}
+                                 borderType="all"
+                                 icon={
+                                    <View style={[Styles.iconContent, ColorsStatus.lightGreen]}>
+                                       <MaterialCommunityIcons name="office-building-outline" size={25} color={'#384288'} />
+                                    </View>
+                                 }
+                                 title={item.name}
+                              />
                           )
-                        })
-                        :
-                        data.length > 0 ?
-                           data.map((item, index) => {
-                              return (
-                                 <BorderBottomItem
-                                    key={index}
-                                    onPress={() => {
-                                       setIdChoose(item.id)
-                                       setActiveChoose(item.isActive)
-                                       setTitleChoose(item.name)
-                                       setModal(true)
-                                    }}
-                                    borderType="all"
-                                    icon={
-                                       <View style={[Styles.iconContent, ColorsStatus.lightGreen]}>
-                                          <MaterialCommunityIcons name="office-building-outline" size={25} color={'#384288'} />
-                                       </View>
-                                    }
-                                    title={item.name}
-                                 />
-                              )
-                           })
-                           :
-                           <Text style={[Styles.textDefault, Styles.cGray, { textAlign: 'center' }]}>Tidak ada data</Text>
-                  }
-               </View>
-            </ScrollView>
+                        }}
+                        keyExtractor={(item, index) => String(index)}
+                        showsVerticalScrollIndicator={false}
+                        refreshControl={
+                           <RefreshControl
+                              refreshing={refreshing}
+                              onRefresh={handleRefresh}
+                           />
+                        }
+                     />
+                     :
+                     <Text style={[Styles.textDefault, Styles.cGray, { textAlign: 'center' }]}>Tidak ada data</Text>
+            }
         </View>

         <DrawerBottom animation="slide" isVisible={isModal} setVisible={() => setModal(false)} title={titleChoose}>
@@ -228,8 +238,7 @@ export default function Index() {
               </View>
            </View>
         </DrawerBottom>
+      </View >

-
-      </SafeAreaView>
   )
 }
--- a/app/(application)/notification.tsx
+++ b/app/(application)/notification.tsx
@@ -136,7 +136,6 @@ export default function Notification() {
                           return (
                              <BorderBottomItem
                                 borderType="bottom"
-                                 width={55}
                                 icon={
                                    <View style={[Styles.iconContent, item.isRead ? ColorsStatus.secondary : ColorsStatus.primary]}>
                                       <Feather name="bell" size={25} color="white" />
--- a/app/(application)/position/index.tsx
+++ b/app/(application)/position/index.tsx
@@ -16,7 +16,7 @@ import { useAuthSession } from "@/providers/AuthProvider";
 import { AntDesign, Feather, MaterialCommunityIcons } from "@expo/vector-icons";
 import { useLocalSearchParams } from "expo-router";
 import { useEffect, useState } from "react";
-import { RefreshControl, SafeAreaView, ScrollView, View } from "react-native";
+import { RefreshControl, View, VirtualizedList } from "react-native";
 import Toast from "react-native-toast-message";
 import { useDispatch, useSelector } from "react-redux";

@@ -129,9 +129,18 @@ export default function Index() {
      setRefreshing(false)
   };

+
+   const getItem = (_data: unknown, index: number): Props => ({
+      id: data[index].id,
+      name: data[index].name,
+      idGroup: data[index].idGroup,
+      group: data[index].group,
+      isActive: data[index].isActive,
+   });
+
   return (
-      <SafeAreaView>
-         <View style={[Styles.p15]}>
+      <View style={[Styles.p15, { flex: 1 }]}>
+         <View>
            <View style={[Styles.wrapBtnTab]}>
               <ButtonTab
                  active={status == "false" ? "false" : "true"}
@@ -155,47 +164,50 @@ export default function Index() {
                  <Text>Filter : {nameGroup}</Text>
               </View>
            }
-            <ScrollView
-               style={[Styles.h100]}
-               refreshControl={
-                  <RefreshControl
-                     refreshing={refreshing}
-                     onRefresh={handleRefresh}
-                  />
-               }>
-               <View>
-                  {
-                     loading ?
-                        arrSkeleton.map((item, index) => {
-                           return (
-                              <SkeletonTwoItem key={index} />
-                           )
-                        })
-                        :
-                        data.length > 0 ?
-                           data.map((item, index) => {
-                              return (
-                                 <BorderBottomItem
-                                    key={index}
-                                    onPress={() => { handleChooseData(item.id, item.name, item.isActive, item.idGroup) }}
-                                    borderType="all"
-                                    icon={
-                                       <View style={[Styles.iconContent, ColorsStatus.lightGreen]}>
-                                          <MaterialCommunityIcons name="account-tie" size={25} color={'#384288'} />
-                                       </View>
-                                    }
-                                    title={item.name}
-                                    subtitle={item.group}
-                                 />
-                              )
-                           })
-                           :
-                           <Text style={[Styles.textDefault, Styles.cGray, { textAlign: 'center' }]}>Tidak ada data</Text>
-                  }
-               </View>
-            </ScrollView>
         </View>
-
+         <View style={[{ flex: 2 }]}>
+            {
+               loading ?
+                  arrSkeleton.map((item, index) => {
+                     return (
+                        <SkeletonTwoItem key={index} />
+                     )
+                  })
+                  :
+                  data.length > 0 ?
+                     <VirtualizedList
+                        data={data}
+                        getItemCount={() => data.length}
+                        getItem={getItem}
+                        renderItem={({ item, index }: { item: Props, index: number }) => {
+                           return (
+                              <BorderBottomItem
+                                 key={index}
+                                 onPress={() => { handleChooseData(item.id, item.name, item.isActive, item.idGroup) }}
+                                 borderType="all"
+                                 icon={
+                                    <View style={[Styles.iconContent, ColorsStatus.lightGreen]}>
+                                       <MaterialCommunityIcons name="account-tie" size={25} color={'#384288'} />
+                                    </View>
+                                 }
+                                 title={item.name}
+                                 subtitle={item.group}
+                              />
+                           )
+                        }}
+                        keyExtractor={(item, index) => String(index)}
+                        showsVerticalScrollIndicator={false}
+                        refreshControl={
+                           <RefreshControl
+                              refreshing={refreshing}
+                              onRefresh={handleRefresh}
+                           />
+                        }
+                     />
+                     :
+                     <Text style={[Styles.textDefault, Styles.cGray, { textAlign: 'center' }]}>Tidak ada data</Text>
+            }
+         </View>
         <DrawerBottom animation="slide" isVisible={isModal} setVisible={() => setModal(false)} title={chooseData.name}>
            <View style={Styles.rowItemsCenter}>
               <MenuItemRow
@@ -243,7 +255,6 @@ export default function Index() {
               </View>
            </View>
         </DrawerBottom>
-
-      </SafeAreaView>
+      </View>
   )
 }
--- a/app/(application)/project/[id]/edit.tsx
+++ b/app/(application)/project/[id]/edit.tsx
@@ -43,6 +43,8 @@ export default function EditProject() {
      setJudul(val)
      if (val == "" || val == "null") {
         setError(true)
+      }else{
+         setError(false)
      }
   }

--- a/components/auth/viewLogin.tsx
+++ b/components/auth/viewLogin.tsx
@@ -44,7 +44,7 @@ export default function ViewLogin({ onValidate }: Props) {
   return (
      <SafeAreaView>
         <ToastCustom />
-         <View style={Styles.p20}>
+         <View style={[Styles.p20, Styles.h100]}>
            <View style={{ alignItems: "center", marginVertical: 50 }}>
               <Image
                  source={require("../../assets/images/splash-icon.png")}
--- a/components/auth/viewVerification.tsx
+++ b/components/auth/viewVerification.tsx
@@ -35,7 +35,7 @@ export default function ViewVerification({ phone, otp }: Props) {
      if (value === otpFix.toString()) {
         login()
      } else {
-         return Toast.show({ type: 'error', text1: 'Kode OTP tidak sesuai' });
+         return Toast.show({ type: 'small', text1: 'Kode OTP tidak sesuai' });
      }
   }

--- a/components/borderBottomItem.tsx
+++ b/components/borderBottomItem.tsx
@@ -31,7 +31,7 @@ export default function BorderBottomItem({ title, subtitle, icon, desc, onPress,
         <View style={[Styles.rowItemsCenter]}>
            {icon}
            <View style={[Styles.rowSpaceBetween, width ? { width: lebar } : { width: '88%' }]}>
-               <View style={[Styles.ml10, rightTopInfo ? { width: lebar } : { width: '90%' },]}>
+               <View style={[Styles.ml10, rightTopInfo ? { width: '70%' } : { width: '90%' }]}>
                  <Text style={[titleWeight == 'normal' ? Styles.textDefault : Styles.textDefaultSemiBold, { color: textColorFix }]} numberOfLines={1} ellipsizeMode='tail'>{title}</Text>
                  {
                     subtitle &&
--- a/components/division/taskDivisionDetail.tsx
+++ b/components/division/taskDivisionDetail.tsx
@@ -2,12 +2,12 @@ import Styles from "@/constants/Styles";
 import { apiGetDivisionOneFeature } from "@/lib/api";
 import { useAuthSession } from "@/providers/AuthProvider";
 import { Feather } from "@expo/vector-icons";
-import { useLocalSearchParams } from "expo-router";
+import { router, useLocalSearchParams } from "expo-router";
 import React, { useEffect, useState } from "react";
-import { Dimensions, View } from "react-native";
-import Text from "../Text";
-import Carousel, { ICarouselInstance } from "react-native-reanimated-carousel";
+import { Dimensions, Pressable, View } from "react-native";
+import { ICarouselInstance } from "react-native-reanimated-carousel";
 import Skeleton from "../skeleton";
+import Text from "../Text";

 type Props = {
   id: string
@@ -46,34 +46,42 @@ export default function TaskDivisionDetail() {
   return (
      <View>
         <Text style={[Styles.textDefaultSemiBold, Styles.mb05]}>Tugas Hari Ini</Text>
-
         {
            loading ?
               <Skeleton width={100} widthType="percent" height={60} borderRadius={10} />
               :
               data.length > 0 ?
-                  <Carousel
-                     ref={ref}
-                     style={{ width: "100%" }}
-                     width={width * 0.8}
-                     height={100}
-                     data={data}
-                     loop={true}
-                     autoPlay={false}
-                     autoPlayReverse={false}
-                     pagingEnabled={true}
-                     snapEnabled={true}
-                     vertical={false}
-                     renderItem={({ index }) => (
-                        <View style={[Styles.wrapPaper, { width: '95%' }]}>
-                           <Text style={[Styles.textDefaultSemiBold]} numberOfLines={1} ellipsizeMode="tail">{data[index].title} - {data[index].projectTitle}</Text>
-                           <View style={[Styles.rowItemsCenter, Styles.mt10]}>
-                              <Feather name="clock" size={18} color="grey" style={Styles.mr05} />
-                              <Text style={[Styles.textInformation]} numberOfLines={1} ellipsizeMode="tail">{data[index].dateStart} - {data[index].dateEnd}</Text>
-                           </View>
+                  data.map((item, index) => (
+                     <Pressable key={index} style={[Styles.wrapPaper]} onPress={() => { router.push(`/division/${id}/task/${item.idProject}`) }}>
+                        <Text style={[Styles.textDefaultSemiBold]} numberOfLines={1} ellipsizeMode="tail">{item.title} - {item.projectTitle}</Text>
+                        <View style={[Styles.rowItemsCenter, Styles.mt10]}>
+                           <Feather name="clock" size={18} color="grey" style={Styles.mr05} />
+                           <Text style={[Styles.textInformation]} numberOfLines={1} ellipsizeMode="tail">{item.dateStart} - {item.dateEnd}</Text>
                        </View>
-                     )}
-                  />
+                     </Pressable>
+                  ))
+                  // <Carousel
+                  //    ref={ref}
+                  //    style={{ width: "100%" }}
+                  //    width={width * 0.8}
+                  //    height={100}
+                  //    data={data}
+                  //    loop={true}
+                  //    autoPlay={false}
+                  //    autoPlayReverse={false}
+                  //    pagingEnabled={true}
+                  //    snapEnabled={true}
+                  //    vertical={false}
+                  //    renderItem={({ index }) => (
+                  //       <View style={[Styles.wrapPaper, { width: '95%' }]}>
+                  //          <Text style={[Styles.textDefaultSemiBold]} numberOfLines={1} ellipsizeMode="tail">{data[index].title} - {data[index].projectTitle}</Text>
+                  //          <View style={[Styles.rowItemsCenter, Styles.mt10]}>
+                  //             <Feather name="clock" size={18} color="grey" style={Styles.mr05} />
+                  //             <Text style={[Styles.textInformation]} numberOfLines={1} ellipsizeMode="tail">{data[index].dateStart} - {data[index].dateEnd}</Text>
+                  //          </View>
+                  //       </View>
+                  //    )}
+                  // />
                  :
                  <Text style={[Styles.textDefault, Styles.cGray, { textAlign: 'center' }]}>Tidak ada tugas</Text>
         }
--- a/components/modalLoading.tsx
+++ b/components/modalLoading.tsx
@@ -13,7 +13,9 @@ export default function ModalLoading({ isVisible, setVisible }: Props) {
         animationOut={"slideOutDown"}
         isVisible={isVisible}
         hideModalContentWhileAnimating={true}
-         onBackdropPress={() => { setVisible(false) }}
+         onBackdropPress={() => {
+            // setVisible(false) 
+         }}
      >
         <ActivityIndicator size="large" />
      </Modal>
--- a/ios/mobiledarmasaba.xcodeproj/project.pbxproj
+++ b/ios/mobiledarmasaba.xcodeproj/project.pbxproj
--- a/lib/api.ts
+++ b/lib/api.ts
@@ -3,7 +3,7 @@ import axios from 'axios';
 const api = axios.create({
   // baseURL: 'http://10.0.2.2:3000/api',
   // baseURL: 'https://stg-darmasaba.wibudev.com/api',
-   baseURL: 'http://192.168.1.89:3000/api',
+   baseURL: 'http://192.168.1.110:3000/api',
 });

 export const apiCheckPhoneLogin = async (body: { phone: string }) => {
Author	SHA1	Message	Date
amalia	acc464bfc8	Merge pull request 'amalia/12-agustus-25' (#22 ) from amalia/12-agustus-25 into join Reviewed-on: bip/mobile-darmasaba#22	2025-08-12 17:42:40 +08:00
amal	edbeb30ebe	fix : tampilan Deskripsi: - border bottom komponen width No Issues	2025-08-12 14:53:28 +08:00
amal	57a4e2fce6	fix : function Deskripsi: - function validation edit judul projectt No Issues	2025-08-12 13:46:08 +08:00
amal	fd1d20bb32	upd: task divisi detail Deskripsi: - mengganti caraousel pada list task hari ini pada detail divisi No Issues	2025-08-12 13:43:19 +08:00
amal	e8e5af7126	upd: ios dan komponen modal Deskripsi: - update ios - komponen modal loading on click backdrop No Issues	2025-08-12 11:43:53 +08:00
amalia	1089afb6aa	Merge pull request 'amalia/11-agustus-25' (#21 ) from amalia/11-agustus-25 into join Reviewed-on: bip/mobile-darmasaba#21	2025-08-11 17:33:44 +08:00
amaliadwiy	0f5a56c612	upd: login Deskripsi: - tinggi view - toast error kode verification No Issues	2025-08-11 17:08:55 +08:00
amaliadwiy	f929791075	fix: list data Deskripsi: - perbaikan list data pada jabatan dan group menggunakan virtualized No Issues	2025-08-11 10:43:50 +08:00
amalia	a49d25500a	Merge pull request 'fix: pengumuman' (#20 ) from amalia/08-agustus-25 into join Reviewed-on: bip/mobile-darmasaba#20	2025-08-08 17:37:54 +08:00
amalia	5ad055f543	Merge pull request 'amalia/08-agustus-25' (#19 ) from amalia/08-agustus-25 into join Reviewed-on: bip/mobile-darmasaba#19	2025-08-08 12:18:33 +08:00
amalia	b490b93c00	Merge pull request 'upd: clear warning' (#18 ) from amalia/08-agustus-25 into join Reviewed-on: bip/mobile-darmasaba#18	2025-08-08 11:27:27 +08:00
amalia	3efd44ce70	Merge pull request 'upd: push notification on background' (#17 ) from amalia/07-agustus-25 into join Reviewed-on: bip/mobile-darmasaba#17	2025-08-07 17:43:02 +08:00
amalia	0c8297f785	Merge pull request 'amalia/07-agustus-25' (#16 ) from amalia/07-agustus-25 into join Reviewed-on: bip/mobile-darmasaba#16	2025-08-07 14:09:10 +08:00
amalia	24c07efb97	Merge pull request 'amalia/06-agustus-25' (#15 ) from amalia/06-agustus-25 into join Reviewed-on: bip/mobile-darmasaba#15	2025-08-06 17:34:43 +08:00
amalia	323d31250b	Merge pull request 'upd: notifikasi diskusi umum' (#14 ) from amalia/06-agustus-25 into join Reviewed-on: bip/mobile-darmasaba#14	2025-08-06 12:00:02 +08:00
amalia	c119d3e775	Merge pull request 'amalia/05-agustus-25' (#13 ) from amalia/05-agustus-25 into join Reviewed-on: bip/mobile-darmasaba#13	2025-08-05 17:39:56 +08:00
amalia	9a5765f0d0	Merge pull request 'amalia/04-agustus-25' (#12 ) from amalia/04-agustus-25 into join Reviewed-on: bip/mobile-darmasaba#12	2025-08-04 17:45:44 +08:00