Compare commits

...

31 Commits

Author SHA1 Message Date
7555ece0fa upd: push notification on background
Deskripsi:
- on klik pada background notification
- hide and show notificationn foreground

No Issues
2025-08-07 16:25:45 +08:00
9cb848ddd2 upd: image picker
Deskripsi:
- tambah icon kamera pada image picker > edit profile, tambah anggota dan edit anggota

No Issues
2025-08-07 11:34:54 +08:00
81aedb525f upd: tambah project
Deskripsi:
- mengganti metode tambah anggota pada fitur tambah project

No Issues
2025-08-07 10:47:04 +08:00
da89673271 upd: alert pick image
Deskripsi:
- menghilangkan alert pada picker image

No Issues
2025-08-06 17:24:10 +08:00
d052b7a0d4 upd: tampilan statys
Deskripsi:
- update label status
- menampilkan status pada detail member

No Issues
2025-08-06 17:18:34 +08:00
9370aac9a3 fix : file
Deskripsi:
- lihat atau share file
- view file ios pada home divisi > ga pake loading

No Issues
2025-08-06 17:09:46 +08:00
1298ec079a upd: tampilan pengumuman
Deskripsi:
- menambah tinggi text area
- mengurangi margin list divisi

No Issues
2025-08-06 16:50:31 +08:00
5db712d4b9 upd: notifikasi diskusi umum 2025-08-06 11:58:54 +08:00
1e2069ca42 fix: jarak keyboard
Deskripsi:
- otomatis jarak input dengan keyboard ios

No Issues
2025-08-05 17:24:49 +08:00
1d555bf950 upd: inputdate
Deskripsi:
- custom tampilan input datetime picker pada ios

No Issues
2025-08-05 16:40:37 +08:00
45d08e1df5 fix: kalender
Deskripsi:
- month kalender

No ISsues
2025-08-05 15:50:56 +08:00
7470e8a9c2 fix : group
Deskripsi:
- validasi tambah group
- validasi edit group
- load refresh modal

No Issues
2025-08-05 15:34:40 +08:00
308fda6920 fix : tampilan
Deskripsi:
- form input on ios

No ISsues
2025-08-05 15:10:44 +08:00
7ad846ff9c upd: akses user
Deskripsi:
- header list project > role user bisa akses filter

No Issues
2025-08-05 12:07:17 +08:00
92564373fe fix : input kalendar date
Deskripsi:
- tambah package intl

No Issues
2025-08-05 11:41:03 +08:00
6c84881186 upd: tampilan
deskripsi:
- warna icon

No Issues
2025-08-04 16:45:37 +08:00
2d24050b64 upd: api link 2025-08-04 14:10:28 +08:00
fafb52d87c upd: button save
Deskripsi:
- disable button saat udh submit

No Issues
2025-08-04 13:56:33 +08:00
b7c44109a1 upd: project dan task divisi
Deskripsi:
- menambahkan loading saat tambah file
- button submit disable saat loading]

No Issues
2025-08-04 11:48:06 +08:00
c54f4c9fda update: dokumen divisi
Deskripis:
- loading saat updload file
- upload multiple file

No Issues
2025-08-04 11:32:30 +08:00
2d72c365da Merge pull request 'amalia/01-agustus-25' (#11) from amalia/01-agustus-25 into join
Reviewed-on: bip/mobile-darmasaba#11
2025-08-01 17:41:33 +08:00
589068703d fix : ios
Deskripsi:
- tambah edit banner
- tambah edit anggota
- new folder dokumen divisi
- rename file folder dokumen divisi
- tambah kalendar divisi > tanggal dan time
- edit kalender divisi > tanggal dan time
- tambah diskusi umum
- multi file pada tambah file project
- multi file pada tambah file task divisi

No Issues
2025-08-01 17:39:58 +08:00
7c713cc6e0 fix : tampilan
Deskripsi:
- input time pada kalender divisi
- api dokumen divisi >> blm selesai

No Issues
2025-08-01 11:25:41 +08:00
d3c63fbcdd Merge pull request 'fix: ios' (#10) from amalia/31-jul-25 into join
Reviewed-on: bip/mobile-darmasaba#10
2025-07-31 17:47:02 +08:00
ea29785a34 Merge pull request 'fix : ios dan tampilan' (#9) from amalia/30-jul-25 into join
Reviewed-on: bip/mobile-darmasaba#9
2025-07-31 17:46:29 +08:00
e7ef09e9aa fix: ios
Deskripsi :
- load refresh pada project
- load refresh pada task divisi
- text pada modal salin atau pindah
- crash modal pada modal more dokumen divisi
- memberi loadin pada modal info dokumen divisi
- crash modal pada header dokumen divisi
- kyboard avoiding pada project
- keyboard avoiding pada tugas divisi
- image pada user yg diselect pada tambah anggota divisi

nb : qc blm selesai

No Issues
2025-07-31 15:10:51 +08:00
5898655fac fix : ios dan tampilan
Deskripsi:
- modal crash
- input keyboard over lap
- detail pengumuman text color
- Scroll view tinggi 100 persen
- image user

nb : blm selesai semua
2025-07-30 17:43:08 +08:00
4394219f2a Merge pull request 'amalia/29-jul-25' (#8) from amalia/29-jul-25 into join
Reviewed-on: bip/mobile-darmasaba#8
2025-07-29 17:37:00 +08:00
6d035e1f7f fix : ios
Deskripsi:
- title home align left
- nama file pada view banner
- modal crash pada group dan jabatan

No Issues
2025-07-29 17:34:21 +08:00
eb039c7528 ios: header home 2025-07-29 12:08:44 +08:00
42bf1589b4 upd: tampilan
Deskripsi:
- masang toast
- ganti tag Text

No Issues
2025-07-29 11:41:03 +08:00
119 changed files with 2457 additions and 1553 deletions

View File

@@ -42,6 +42,7 @@
} }
], ],
"expo-font", "expo-font",
"expo-image-picker",
"expo-web-browser", "expo-web-browser",
[ [
"@react-native-firebase/app", "@react-native-firebase/app",

View File

@@ -9,53 +9,73 @@ import HeaderRightProjectList from "@/components/project/headerProjectList";
import Text from "@/components/Text"; import Text from "@/components/Text";
import ToastCustom from "@/components/toastCustom"; import ToastCustom from "@/components/toastCustom";
import { Headers } from "@/constants/Headers"; import { Headers } from "@/constants/Headers";
import Styles from "@/constants/Styles";
import { apiReadOneNotification } from "@/lib/api"; import { apiReadOneNotification } from "@/lib/api";
import { pushToPage } from "@/lib/pushToPage"; import { pushToPage } from "@/lib/pushToPage";
import store from "@/lib/store"; import store from "@/lib/store";
import { useAuthSession } from "@/providers/AuthProvider"; import { useAuthSession } from "@/providers/AuthProvider";
import AsyncStorage from "@react-native-async-storage/async-storage";
import firebase from '@react-native-firebase/app'; import firebase from '@react-native-firebase/app';
import { Redirect, router, Stack } from "expo-router"; import { Redirect, router, Stack, usePathname } from "expo-router";
import { StatusBar } from 'expo-status-bar'; import { StatusBar } from 'expo-status-bar';
import { useEffect } from "react"; import { useEffect } from "react";
import { View } from "react-native";
import { Easing, Notifier } from 'react-native-notifier'; import { Easing, Notifier } from 'react-native-notifier';
import Toast from "react-native-toast-message";
import { Provider } from "react-redux"; import { Provider } from "react-redux";
export default function RootLayout() { export default function RootLayout() {
const { token, decryptToken, isLoading } = useAuthSession() const { token, decryptToken, isLoading } = useAuthSession()
const pathname = usePathname()
async function handleReadNotification(id: string, category: string, idContent: string) { async function handleReadNotification(id: string, category: string, idContent: string, title: string) {
try { try {
const hasil = await decryptToken(String(token?.current)) if (title != "Komentar Baru") {
const response = await apiReadOneNotification({ user: hasil, id: id }) const hasil = await decryptToken(String(token?.current))
const response = await apiReadOneNotification({ user: hasil, id: id })
}
pushToPage(category, idContent) pushToPage(category, idContent)
} catch (error) { } catch (error) {
console.error(error) console.error(error)
} }
} }
useEffect(() => {
const checkNavigation = async () => {
const navData = await AsyncStorage.getItem('navigateOnOpen');
if (navData) {
const { screen, content } = JSON.parse(navData);
await AsyncStorage.removeItem('navigateOnOpen'); // reset
pushToPage(screen, content)
}
};
checkNavigation();
}, []);
useEffect(() => { useEffect(() => {
const unsubscribe = firebase.app().messaging().onMessage(async remoteMessage => { const unsubscribe = firebase.app().messaging().onMessage(async remoteMessage => {
const id = remoteMessage?.data?.id; const id = remoteMessage?.data?.id;
const category = remoteMessage?.data?.category; const category = remoteMessage?.data?.category;
const content = remoteMessage?.data?.content; const content = remoteMessage?.data?.content;
const title = remoteMessage?.notification?.title;
if (remoteMessage.notification != undefined && remoteMessage.notification.title != undefined && remoteMessage.notification.body != undefined) { if (remoteMessage.notification != undefined && remoteMessage.notification.title != undefined && remoteMessage.notification.body != undefined) {
Notifier.showNotification({ if (category == 'discussion-general' && pathname == '/discussion/' + content) {
title: remoteMessage.notification?.title, return null
description: remoteMessage.notification?.body, } else if (pathname != `/${category}/${content}`) {
duration: 3000, Notifier.showNotification({
animationDuration: 300, title: title,
showEasing: Easing.ease, description: remoteMessage.notification?.body,
onPress: () => handleReadNotification(String(id), String(category), String(content)), duration: 3000,
hideOnPress: true, animationDuration: 300,
}); showEasing: Easing.ease,
onPress: () => handleReadNotification(String(id), String(category), String(content), String(title)),
hideOnPress: true,
});
}
} }
}); });
return unsubscribe; return unsubscribe;
}, []); }, [pathname]);
if (isLoading) { if (isLoading) {

View File

@@ -7,7 +7,7 @@ import { apiGetAnnouncementOne } from "@/lib/api";
import { useAuthSession } from "@/providers/AuthProvider"; import { useAuthSession } from "@/providers/AuthProvider";
import { Entypo, MaterialIcons } from "@expo/vector-icons"; import { Entypo, MaterialIcons } from "@expo/vector-icons";
import { router, Stack, useLocalSearchParams } from "expo-router"; import { router, Stack, useLocalSearchParams } from "expo-router";
import { useEffect, useState } from "react"; import React, { useEffect, useState } from "react";
import { Dimensions, SafeAreaView, ScrollView, View } from "react-native"; import { Dimensions, SafeAreaView, ScrollView, View } from "react-native";
import RenderHTML from 'react-native-render-html'; import RenderHTML from 'react-native-render-html';
import { useSelector } from "react-redux"; import { useSelector } from "react-redux";
@@ -51,6 +51,11 @@ export default function DetailAnnouncement() {
handleLoad(true) handleLoad(true)
}, []) }, [])
function hasHtmlTags(text: string) {
const htmlRegex = /<[a-z][\s\S]*>/i;
return htmlRegex.test(text);
};
return ( return (
<SafeAreaView> <SafeAreaView>
<Stack.Screen <Stack.Screen
@@ -84,10 +89,15 @@ export default function DetailAnnouncement() {
<Text style={[Styles.textDefaultSemiBold]}>{data?.title}</Text> <Text style={[Styles.textDefaultSemiBold]}>{data?.title}</Text>
</View> </View>
<View style={[Styles.mt10]}> <View style={[Styles.mt10]}>
<RenderHTML {
contentWidth={contentWidth} hasHtmlTags(data?.desc) ?
source={{ html: data?.desc }} <RenderHTML
/> contentWidth={contentWidth}
source={{ html: data?.desc }}
/>
:
<Text>{data?.desc}</Text>
}
</View> </View>
</> </>
} }

View File

@@ -3,6 +3,7 @@ import ButtonSaveHeader from "@/components/buttonSaveHeader";
import ButtonSelect from "@/components/buttonSelect"; import ButtonSelect from "@/components/buttonSelect";
import { InputForm } from "@/components/inputForm"; import { InputForm } from "@/components/inputForm";
import ModalSelectMultiple from "@/components/modalSelectMultiple"; import ModalSelectMultiple from "@/components/modalSelectMultiple";
import Text from "@/components/Text";
import Styles from "@/constants/Styles"; import Styles from "@/constants/Styles";
import { setUpdateAnnouncement } from "@/lib/announcementUpdate"; import { setUpdateAnnouncement } from "@/lib/announcementUpdate";
import { apiCreateAnnouncement } from "@/lib/api"; import { apiCreateAnnouncement } from "@/lib/api";
@@ -10,7 +11,8 @@ import { useAuthSession } from "@/providers/AuthProvider";
import { Entypo } from "@expo/vector-icons"; import { Entypo } from "@expo/vector-icons";
import { router, Stack } from "expo-router"; import { router, Stack } from "expo-router";
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
import { SafeAreaView, ScrollView, StyleSheet, Text, ToastAndroid, View } from "react-native"; import { SafeAreaView, ScrollView, StyleSheet, View } from "react-native";
import Toast from "react-native-toast-message";
import { useDispatch, useSelector } from "react-redux"; import { useDispatch, useSelector } from "react-redux";
export default function CreateAnnouncement() { export default function CreateAnnouncement() {
@@ -19,7 +21,8 @@ export default function CreateAnnouncement() {
const { token, decryptToken } = useAuthSession() const { token, decryptToken } = useAuthSession()
const [disableBtn, setDisableBtn] = useState(true); const [disableBtn, setDisableBtn] = useState(true);
const [modalDivisi, setModalDivisi] = useState(false); const [modalDivisi, setModalDivisi] = useState(false);
const [divisionMember, setDivisionMember] = useState<any>([]); const [divisionMember, setDivisionMember] = useState<any>([])
const [loading, setLoading] = useState(false)
const [dataForm, setDataForm] = useState({ const [dataForm, setDataForm] = useState({
title: "", title: "",
desc: "", desc: "",
@@ -64,17 +67,20 @@ export default function CreateAnnouncement() {
async function handleCreate() { async function handleCreate() {
try { try {
setLoading(true)
const hasil = await decryptToken(String(token?.current)) const hasil = await decryptToken(String(token?.current))
const response = await apiCreateAnnouncement({ const response = await apiCreateAnnouncement({
data: { ...dataForm, user: hasil, groups: divisionMember }, data: { ...dataForm, user: hasil, groups: divisionMember },
}); });
if (response.success) { if (response.success) {
dispatch(setUpdateAnnouncement(!update)) dispatch(setUpdateAnnouncement(!update))
ToastAndroid.show("Berhasil menambahkan data", ToastAndroid.SHORT); Toast.show({ type: 'small', text1: 'Berhasil menambahkan data', })
router.back(); router.back();
} }
} catch (error) { } catch (error) {
console.error(error); console.error(error);
} finally {
setLoading(false)
} }
} }
@@ -93,11 +99,11 @@ export default function CreateAnnouncement() {
headerTitleAlign: "center", headerTitleAlign: "center",
headerRight: () => ( headerRight: () => (
<ButtonSaveHeader <ButtonSaveHeader
disable={disableBtn} disable={disableBtn || loading ? true : false}
category="create" category="create"
onPress={() => { onPress={() => {
divisionMember.length == 0 divisionMember.length == 0
? ToastAndroid.show("Anda belum memilih divisi", ToastAndroid.SHORT) ? Toast.show({ type: 'small', text1: "Anda belum memilih divisi", })
: handleCreate(); : handleCreate();
}} }}
/> />
@@ -143,7 +149,7 @@ export default function CreateAnnouncement() {
<Text style={[Styles.textDefaultSemiBold]}>{item.name}</Text> <Text style={[Styles.textDefaultSemiBold]}>{item.name}</Text>
{ {
item.Division.map((division: any, i: any) => ( item.Division.map((division: any, i: any) => (
<View key={i} style={[Styles.rowItemsCenter, Styles.mv05]}> <View key={i} style={[Styles.rowItemsCenter]}>
<Entypo name="dot-single" size={24} color="black" /> <Entypo name="dot-single" size={24} color="black" />
<Text style={[Styles.textDefault]}>{division.name}</Text> <Text style={[Styles.textDefault]}>{division.name}</Text>
</View> </View>

View File

@@ -11,7 +11,8 @@ import { useAuthSession } from "@/providers/AuthProvider";
import { Entypo } from "@expo/vector-icons"; import { Entypo } from "@expo/vector-icons";
import { router, Stack, useLocalSearchParams } from "expo-router"; import { router, Stack, useLocalSearchParams } from "expo-router";
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
import { SafeAreaView, ScrollView, ToastAndroid, View } from "react-native"; import { SafeAreaView, ScrollView, View } from "react-native";
import Toast from "react-native-toast-message";
import { useDispatch, useSelector } from "react-redux"; import { useDispatch, useSelector } from "react-redux";
@@ -32,6 +33,7 @@ export default function EditAnnouncement() {
const [modalDivisi, setModalDivisi] = useState(false); const [modalDivisi, setModalDivisi] = useState(false);
const [disableBtn, setDisableBtn] = useState(true); const [disableBtn, setDisableBtn] = useState(true);
const [dataMember, setDataMember] = useState<any>([]); const [dataMember, setDataMember] = useState<any>([]);
const [loading, setLoading] = useState(false)
const [dataForm, setDataForm] = useState({ const [dataForm, setDataForm] = useState({
title: "", title: "",
desc: "", desc: "",
@@ -108,17 +110,20 @@ export default function EditAnnouncement() {
async function handleEdit() { async function handleEdit() {
try { try {
setLoading(true)
const hasil = await decryptToken(String(token?.current)) const hasil = await decryptToken(String(token?.current))
const response = await apiEditAnnouncement({ const response = await apiEditAnnouncement({
...dataForm, user: hasil, groups: dataMember, ...dataForm, user: hasil, groups: dataMember,
}, id); }, id);
if (response.success) { if (response.success) {
dispatch(setUpdateAnnouncement(!update)) dispatch(setUpdateAnnouncement(!update))
ToastAndroid.show("Berhasil mengubah data", ToastAndroid.SHORT); Toast.show({ type: 'small', text1: 'Berhasil mengubah data', })
router.back(); router.back();
} }
} catch (error) { } catch (error) {
console.error(error); console.error(error);
} finally {
setLoading(false)
} }
} }
@@ -137,11 +142,11 @@ export default function EditAnnouncement() {
headerTitleAlign: "center", headerTitleAlign: "center",
headerRight: () => ( headerRight: () => (
<ButtonSaveHeader <ButtonSaveHeader
disable={disableBtn} disable={disableBtn || loading ? true : false}
category="update" category="update"
onPress={() => { onPress={() => {
dataMember.length == 0 dataMember.length == 0
? ToastAndroid.show("Anda belum memilih divisi", ToastAndroid.SHORT) ? Toast.show({ type: 'small', text1: "Anda belum memilih divisi", })
: handleEdit(); : handleEdit();
}} }}
/> />
@@ -188,7 +193,7 @@ export default function EditAnnouncement() {
<Text style={[Styles.textDefaultSemiBold]}>{item.name}</Text> <Text style={[Styles.textDefaultSemiBold]}>{item.name}</Text>
{ {
item.Division.map((division: any, i: any) => ( item.Division.map((division: any, i: any) => (
<View key={i} style={[Styles.rowItemsCenter, Styles.mv05]}> <View key={i} style={[Styles.rowItemsCenter]}>
<Entypo name="dot-single" size={24} color="black" /> <Entypo name="dot-single" size={24} color="black" />
<Text style={[Styles.textDefault]}>{division.name}</Text> <Text style={[Styles.textDefault]}>{division.name}</Text>
</View> </View>

View File

@@ -1,6 +1,7 @@
import ButtonBackHeader from "@/components/buttonBackHeader"; import ButtonBackHeader from "@/components/buttonBackHeader";
import ButtonSaveHeader from "@/components/buttonSaveHeader"; import ButtonSaveHeader from "@/components/buttonSaveHeader";
import { InputForm } from "@/components/inputForm"; import { InputForm } from "@/components/inputForm";
import Text from "@/components/Text";
import Styles from "@/constants/Styles"; import Styles from "@/constants/Styles";
import { apiEditBanner, apiGetBanner, apiGetBannerOne } from "@/lib/api"; import { apiEditBanner, apiGetBanner, apiGetBannerOne } from "@/lib/api";
import { setEntities } from "@/lib/bannerSlice"; import { setEntities } from "@/lib/bannerSlice";
@@ -14,10 +15,9 @@ import {
Pressable, Pressable,
SafeAreaView, SafeAreaView,
ScrollView, ScrollView,
Text, View
ToastAndroid,
View,
} from "react-native"; } from "react-native";
import Toast from "react-native-toast-message";
import { useDispatch } from "react-redux"; import { useDispatch } from "react-redux";
export default function EditBanner() { export default function EditBanner() {
@@ -30,11 +30,12 @@ export default function EditBanner() {
const [title, setTitle] = useState(""); const [title, setTitle] = useState("");
const [error, setError] = useState(false); const [error, setError] = useState(false);
const [imgForm, setImgForm] = useState<any>(); const [imgForm, setImgForm] = useState<any>();
const [loading, setLoading] = useState(false)
const pickImageAsync = async () => { const pickImageAsync = async () => {
let result = await ImagePicker.launchImageLibraryAsync({ let result = await ImagePicker.launchImageLibraryAsync({
mediaTypes: ["images"], mediaTypes: ["images"],
allowsEditing: true, allowsEditing: false,
quality: 1, quality: 1,
aspect: [1535, 450], aspect: [1535, 450],
}); });
@@ -42,8 +43,6 @@ export default function EditBanner() {
if (!result.canceled) { if (!result.canceled) {
setSelectedImage(result.assets[0].uri); setSelectedImage(result.assets[0].uri);
setImgForm(result.assets[0]); setImgForm(result.assets[0]);
} else {
alert("Tidak ada gambar yang dipilih");
} }
}; };
@@ -71,6 +70,7 @@ export default function EditBanner() {
const handleUpdateEntity = async () => { const handleUpdateEntity = async () => {
try { try {
setLoading(true)
const hasil = await decryptToken(String(token?.current)); const hasil = await decryptToken(String(token?.current));
const fd = new FormData(); const fd = new FormData();
@@ -94,17 +94,19 @@ export default function EditBanner() {
const updatedEntity = await apiEditBanner(fd, id) const updatedEntity = await apiEditBanner(fd, id)
if (updatedEntity.success) { if (updatedEntity.success) {
ToastAndroid.show("Berhasil mengupdate data", ToastAndroid.SHORT); Toast.show({ type: 'small', text1: 'Berhasil mengupdate data', })
apiGetBanner({ user: hasil }).then((data) => apiGetBanner({ user: hasil }).then((data) =>
dispatch(setEntities(data.data)) dispatch(setEntities(data.data))
); );
router.back(); router.back();
} else { } else {
ToastAndroid.show('Gagal mengupdate data', ToastAndroid.SHORT); Toast.show({ type: 'small', text1: 'Gagal mengupdate data', })
} }
} catch (error) { } catch (error) {
console.error(error); console.error(error);
ToastAndroid.show('Gagal mengupdate data', ToastAndroid.SHORT); Toast.show({ type: 'small', text1: 'Gagal mengupdate data', })
} finally {
setLoading(false)
} }
}; };
@@ -122,7 +124,7 @@ export default function EditBanner() {
headerTitle: "Edit Banner", headerTitle: "Edit Banner",
headerTitleAlign: "center", headerTitleAlign: "center",
headerRight: () => <ButtonSaveHeader headerRight: () => <ButtonSaveHeader
disable={title == "" || error ? true : false} disable={title == "" || error || loading ? true : false}
onPress={() => { handleUpdateEntity() }} onPress={() => { handleUpdateEntity() }}
category="update" />, category="update" />,
}} }}

View File

@@ -1,6 +1,7 @@
import ButtonBackHeader from "@/components/buttonBackHeader"; import ButtonBackHeader from "@/components/buttonBackHeader";
import ButtonSaveHeader from "@/components/buttonSaveHeader"; import ButtonSaveHeader from "@/components/buttonSaveHeader";
import { InputForm } from "@/components/inputForm"; import { InputForm } from "@/components/inputForm";
import Text from "@/components/Text";
import Styles from "@/constants/Styles"; import Styles from "@/constants/Styles";
import { apiCreateBanner, apiGetBanner } from "@/lib/api"; import { apiCreateBanner, apiGetBanner } from "@/lib/api";
import { setEntities } from "@/lib/bannerSlice"; import { setEntities } from "@/lib/bannerSlice";
@@ -14,10 +15,9 @@ import {
Pressable, Pressable,
SafeAreaView, SafeAreaView,
ScrollView, ScrollView,
Text, View
ToastAndroid,
View,
} from "react-native"; } from "react-native";
import Toast from "react-native-toast-message";
import { useDispatch } from "react-redux"; import { useDispatch } from "react-redux";
export default function CreateBanner() { export default function CreateBanner() {
@@ -29,11 +29,12 @@ export default function CreateBanner() {
const [imgForm, setImgForm] = useState<any>(); const [imgForm, setImgForm] = useState<any>();
const [title, setTitle] = useState(""); const [title, setTitle] = useState("");
const [error, setError] = useState(false); const [error, setError] = useState(false);
const [loading, setLoading] = useState(false)
const pickImageAsync = async () => { const pickImageAsync = async () => {
let result = await ImagePicker.launchImageLibraryAsync({ let result = await ImagePicker.launchImageLibraryAsync({
mediaTypes: ["images"], mediaTypes: ["images"],
allowsEditing: true, allowsEditing: false,
quality: 1, quality: 1,
aspect: [1535, 450], aspect: [1535, 450],
}); });
@@ -41,8 +42,6 @@ export default function CreateBanner() {
if (result.assets?.[0].uri) { if (result.assets?.[0].uri) {
setSelectedImage(result.assets[0].uri); setSelectedImage(result.assets[0].uri);
setImgForm(result.assets[0]); setImgForm(result.assets[0]);
} else {
alert("Tidak ada gambar yang dipilih");
} }
} }
}; };
@@ -57,32 +56,40 @@ export default function CreateBanner() {
} }
const handleCreateEntity = async () => { const handleCreateEntity = async () => {
const hasil = await decryptToken(String(token?.current)); try {
const fd = new FormData(); setLoading(true)
const hasil = await decryptToken(String(token?.current));
const fd = new FormData();
fd.append("file", { fd.append("file", {
uri: imgForm.uri, uri: imgForm.uri,
type: imgForm.mimeType, type: imgForm.mimeType,
name: imgForm.fileName, name: imgForm.fileName,
} as any); } as any);
fd.append( fd.append(
"data", "data",
JSON.stringify({ JSON.stringify({
title, title,
user: hasil, user: hasil,
}) })
);
const createdEntity = await apiCreateBanner(fd);
if (createdEntity.success) {
ToastAndroid.show("Berhasil menambahkan data", ToastAndroid.SHORT);
apiGetBanner({ user: hasil }).then((data) =>
dispatch(setEntities(data.data))
); );
router.back();
} else { const createdEntity = await apiCreateBanner(fd);
ToastAndroid.show('Gagal menambahkan data', ToastAndroid.SHORT); if (createdEntity.success) {
Toast.show({ type: 'small', text1: 'Berhasil menambahkan data', })
apiGetBanner({ user: hasil }).then((data) =>
dispatch(setEntities(data.data))
);
router.back();
} else {
Toast.show({ type: 'small', text1: 'Gagal menambahkan data', })
}
} catch (error) {
console.error(error);
Toast.show({ type: 'small', text1: 'Gagal menambahkan data', })
} finally {
setLoading(false)
} }
}; };
@@ -101,7 +108,7 @@ export default function CreateBanner() {
headerTitleAlign: "center", headerTitleAlign: "center",
headerRight: () => ( headerRight: () => (
<ButtonSaveHeader <ButtonSaveHeader
disable={title == "" || selectedImage == undefined || error ? true : false} disable={title == "" || selectedImage == undefined || error || loading ? true : false}
category="create" category="create"
onPress={() => { onPress={() => {
handleCreateEntity(); handleCreateEntity();

View File

@@ -15,14 +15,15 @@ import { startActivityAsync } from 'expo-intent-launcher'
import { router, Stack } from "expo-router" import { router, Stack } from "expo-router"
import * as Sharing from 'expo-sharing' import * as Sharing from 'expo-sharing'
import { useState } from "react" import { useState } from "react"
import { Alert, Image, Platform, RefreshControl, SafeAreaView, ScrollView, ToastAndroid, View } from "react-native" import { Alert, Image, Platform, RefreshControl, SafeAreaView, ScrollView, View } from "react-native"
import * as mime from 'react-native-mime-types' import * as mime from 'react-native-mime-types'
import Toast from "react-native-toast-message"
import { useDispatch, useSelector } from "react-redux" import { useDispatch, useSelector } from "react-redux"
type Props = { type Props = {
id: string id: string
name: string title: string
extension: string extension: string
image: string image: string
} }
@@ -42,16 +43,16 @@ export default function BannerList() {
const hasil = await decryptToken(String(token?.current)); const hasil = await decryptToken(String(token?.current));
const deletedEntity = await apiDeleteBanner({ user: hasil }, dataId); const deletedEntity = await apiDeleteBanner({ user: hasil }, dataId);
if (deletedEntity.success) { if (deletedEntity.success) {
ToastAndroid.show("Berhasil menghapus data", ToastAndroid.SHORT); Toast.show({ type: 'small', text1: 'Berhasil menghapus data', })
apiGetBanner({ user: hasil }).then((data) => apiGetBanner({ user: hasil }).then((data) =>
dispatch(setEntities(data.data)) dispatch(setEntities(data.data))
); );
} else { } else {
ToastAndroid.show('Gagal menghapus data', ToastAndroid.SHORT); Toast.show({ type: 'small', text1: 'Gagal menghapus data', })
} }
} catch (error) { } catch (error) {
console.error(error) console.error(error)
ToastAndroid.show('Terjadi kesalahan', ToastAndroid.SHORT) Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
} finally { } finally {
setModal(false) setModal(false)
} }
@@ -71,7 +72,7 @@ export default function BannerList() {
setModal(false) setModal(false)
setLoadingOpen(true) setLoadingOpen(true)
let remoteUrl = 'https://wibu-storage.wibudev.com/api/files/' + selectFile?.image; let remoteUrl = 'https://wibu-storage.wibudev.com/api/files/' + selectFile?.image;
const fileName = selectFile?.name + '.' + selectFile?.extension; const fileName = selectFile?.title + '.' + selectFile?.extension;
let localPath = `${FileSystem.documentDirectory}/${fileName}`; let localPath = `${FileSystem.documentDirectory}/${fileName}`;
const mimeType = mime.lookup(fileName) const mimeType = mime.lookup(fileName)
@@ -80,7 +81,6 @@ export default function BannerList() {
try { try {
if (Platform.OS == 'android') { if (Platform.OS == 'android') {
// open with android intent
await startActivityAsync( await startActivityAsync(
'android.intent.action.VIEW', 'android.intent.action.VIEW',
{ {
@@ -89,9 +89,6 @@ export default function BannerList() {
type: mimeType as string, type: mimeType as string,
} }
); );
// or
// Sharing.shareAsync(localPath);
} else if (Platform.OS == 'ios') { } else if (Platform.OS == 'ios') {
Sharing.shareAsync(localPath); Sharing.shareAsync(localPath);
} }
@@ -115,13 +112,14 @@ export default function BannerList() {
}} }}
/> />
<ModalLoading isVisible={loadingOpen} setVisible={setLoadingOpen} /> <ModalLoading isVisible={loadingOpen} setVisible={setLoadingOpen} />
<ScrollView <ScrollView
refreshControl={ refreshControl={
<RefreshControl <RefreshControl
refreshing={refreshing} refreshing={refreshing}
onRefresh={handleRefresh} onRefresh={handleRefresh}
/> />
} }
style={[Styles.h100]}
> >
<View style={[Styles.p15, Styles.mb100]}> <View style={[Styles.p15, Styles.mb100]}>
{entities.map((index: any, key: number) => ( {entities.map((index: any, key: number) => (
@@ -145,7 +143,7 @@ export default function BannerList() {
</View> </View>
</ScrollView> </ScrollView>
<DrawerBottom animation="slide" isVisible={isModal} setVisible={setModal} title="Menu"> <DrawerBottom animation="slide" isVisible={isModal} setVisible={() => setModal(false)} title="Menu">
<View style={Styles.rowItemsCenter}> <View style={Styles.rowItemsCenter}>
<MenuItemRow <MenuItemRow
icon={<MaterialCommunityIcons name="pencil-outline" color="black" size={25} />} icon={<MaterialCommunityIcons name="pencil-outline" color="black" size={25} />}
@@ -157,7 +155,7 @@ export default function BannerList() {
/> />
<MenuItemRow <MenuItemRow
icon={<MaterialCommunityIcons name="file-eye" color="black" size={25} />} icon={<MaterialCommunityIcons name="file-eye" color="black" size={25} />}
title="Lihat File" title="Lihat / Share"
onPress={() => { openFile() }} onPress={() => { openFile() }}
/> />
<MenuItemRow <MenuItemRow

View File

@@ -6,6 +6,7 @@ import { InputForm } from "@/components/inputForm";
import LabelStatus from "@/components/labelStatus"; import LabelStatus from "@/components/labelStatus";
import Skeleton from "@/components/skeleton"; import Skeleton from "@/components/skeleton";
import SkeletonContent from "@/components/skeletonContent"; import SkeletonContent from "@/components/skeletonContent";
import Text from '@/components/Text';
import { ColorsStatus } from "@/constants/ColorsStatus"; import { ColorsStatus } from "@/constants/ColorsStatus";
import Styles from "@/constants/Styles"; import Styles from "@/constants/Styles";
import { apiGetDiscussionGeneralOne, apiSendDiscussionGeneralCommentar } from "@/lib/api"; import { apiGetDiscussionGeneralOne, apiSendDiscussionGeneralCommentar } from "@/lib/api";
@@ -14,9 +15,9 @@ import { Ionicons, MaterialIcons } from "@expo/vector-icons";
import { firebase } from '@react-native-firebase/database'; import { firebase } from '@react-native-firebase/database';
import { router, Stack, useLocalSearchParams } from "expo-router"; import { router, Stack, useLocalSearchParams } from "expo-router";
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
import { Pressable, ScrollView, View } from "react-native"; import { KeyboardAvoidingView, Platform, Pressable, ScrollView, View } from "react-native";
import Text from '@/components/Text';
import { useSelector } from "react-redux"; import { useSelector } from "react-redux";
import { useHeaderHeight } from '@react-navigation/elements';
type Props = { type Props = {
id: string id: string
@@ -49,6 +50,7 @@ export default function DetailDiscussionGeneral() {
const [loadingKomentar, setLoadingKomentar] = useState(true) const [loadingKomentar, setLoadingKomentar] = useState(true)
const arrSkeleton = Array.from({ length: 3 }, (_, index) => index) const arrSkeleton = Array.from({ length: 3 }, (_, index) => index)
const reference = firebase.app().database('https://mobile-darmasaba-default-rtdb.asia-southeast1.firebasedatabase.app').ref(`/discussion-general/${id}`); const reference = firebase.app().database('https://mobile-darmasaba-default-rtdb.asia-southeast1.firebasedatabase.app').ref(`/discussion-general/${id}`);
const headerHeight = useHeaderHeight();
useEffect(() => { useEffect(() => {
const onValueChange = reference.on('value', snapshot => { const onValueChange = reference.on('value', snapshot => {
@@ -195,30 +197,34 @@ export default function DetailDiscussionGeneral() {
</View> </View>
</View> </View>
</ScrollView> </ScrollView>
<View style={[ <KeyboardAvoidingView
Styles.contentItemCenter, behavior={Platform.OS === 'ios' ? 'padding' : undefined}
Styles.absolute0, keyboardVerticalOffset={headerHeight}
Styles.w100, >
{ backgroundColor: "#f4f4f4" }, <View style={[
]}> Styles.contentItemCenter,
<InputForm Styles.w100,
disable={(data?.status === 2 || !data?.isActive || (!memberDiscussion && (entityUser.role == "user" || entityUser.role == "coadmin")))} { backgroundColor: "#f4f4f4" },
type="default" ]}>
round <InputForm
placeholder="Kirim Komentar" disable={(data?.status === 2 || !data?.isActive || (!memberDiscussion && (entityUser.role == "user" || entityUser.role == "coadmin")))}
bg="white" type="default"
onChange={setKomentar} round
value={komentar} placeholder="Kirim Komentar"
itemRight={ bg="white"
<Pressable onPress={() => { onChange={setKomentar}
(komentar != '' && data?.status === 1 && data?.isActive && (memberDiscussion || (entityUser.role != "user" && entityUser.role != "coadmin"))) value={komentar}
&& handleKomentar() itemRight={
}}> <Pressable onPress={() => {
<MaterialIcons name="send" size={25} style={(komentar == '' || data?.status === 2 || !data?.isActive || (!memberDiscussion && (entityUser.role == "user" || entityUser.role == "coadmin"))) ? Styles.cGray : Styles.cDefault} /> (komentar != '' && data?.status === 1 && data?.isActive && (memberDiscussion || (entityUser.role != "user" && entityUser.role != "coadmin")))
</Pressable> && handleKomentar()
} }}>
/> <MaterialIcons name="send" size={25} style={(komentar == '' || data?.status === 2 || !data?.isActive || (!memberDiscussion && (entityUser.role == "user" || entityUser.role == "coadmin"))) ? Styles.cGray : Styles.cDefault} />
</View> </Pressable>
}
/>
</View>
</KeyboardAvoidingView>
</View > </View >
</> </>
) )

View File

@@ -11,7 +11,8 @@ import { useAuthSession } from "@/providers/AuthProvider";
import { AntDesign } from "@expo/vector-icons"; import { AntDesign } from "@expo/vector-icons";
import { router, Stack, useLocalSearchParams } from "expo-router"; import { router, Stack, useLocalSearchParams } from "expo-router";
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
import { Pressable, SafeAreaView, ScrollView, ToastAndroid, View } from "react-native"; import { Pressable, SafeAreaView, ScrollView, View } from "react-native";
import Toast from "react-native-toast-message";
import { useDispatch, useSelector } from "react-redux"; import { useDispatch, useSelector } from "react-redux";
type Props = { type Props = {
@@ -30,6 +31,7 @@ export default function AddMemberDiscussionDetail() {
const [idGroup, setIdGroup] = useState('') const [idGroup, setIdGroup] = useState('')
const [selectMember, setSelectMember] = useState<any[]>([]) const [selectMember, setSelectMember] = useState<any[]>([])
const [search, setSearch] = useState('') const [search, setSearch] = useState('')
const [loading, setLoading] = useState(false)
async function handleLoad() { async function handleLoad() {
try { try {
@@ -69,15 +71,21 @@ export default function AddMemberDiscussionDetail() {
async function handleAddMember() { async function handleAddMember() {
try { try {
setLoading(true)
const hasil = await decryptToken(String(token?.current)) const hasil = await decryptToken(String(token?.current))
const response = await apiAddMemberDiscussionGeneral({ id: id, data: { user: hasil, member: selectMember } }) const response = await apiAddMemberDiscussionGeneral({ id: id, data: { user: hasil, member: selectMember } })
if (response.success) { if (response.success) {
ToastAndroid.show('Berhasil menambahkan anggota', ToastAndroid.SHORT) Toast.show({ type: 'small', text1: 'Berhasil menambahkan anggota', })
dispatch(setUpdateDiscussionGeneralDetail(!update)) dispatch(setUpdateDiscussionGeneralDetail(!update))
router.back() router.back()
} else {
Toast.show({ type: 'small', text1: response.message, })
} }
} catch (error) { } catch (error) {
console.error(error) console.error(error)
Toast.show({ type: 'small', text1: 'Gagal menambahkan anggota', })
} finally {
setLoading(false)
} }
} }
@@ -92,7 +100,7 @@ export default function AddMemberDiscussionDetail() {
headerRight: () => ( headerRight: () => (
<ButtonSaveHeader <ButtonSaveHeader
category="update" category="update"
disable={selectMember.length > 0 ? false : true} disable={selectMember.length == 0 || loading ? true : false}
onPress={() => { onPress={() => {
handleAddMember() handleAddMember()
}} }}
@@ -113,7 +121,7 @@ export default function AddMemberDiscussionDetail() {
<ImageWithLabel <ImageWithLabel
key={index} key={index}
label={item.name} label={item.name}
src={item.img} src={`https://wibu-storage.wibudev.com/api/files/${item.img}`}
onClick={() => onChoose(item.idUser, item.name, item.img)} onClick={() => onChoose(item.idUser, item.name, item.img)}
/> />
)) ))
@@ -148,7 +156,7 @@ export default function AddMemberDiscussionDetail() {
</View> </View>
</View> </View>
{ {
selectMember.some((i: any) => i.idUser == item.id) && <AntDesign name="check" size={20} /> selectMember.some((i: any) => i.idUser == item.id) && <AntDesign name="check" size={20} color={'black'}/>
} }
</Pressable> </Pressable>
) )

View File

@@ -14,7 +14,8 @@ import { setMemberChoose } from "@/lib/memberChoose";
import { useAuthSession } from "@/providers/AuthProvider"; import { useAuthSession } from "@/providers/AuthProvider";
import { router, Stack } from "expo-router"; import { router, Stack } from "expo-router";
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
import { SafeAreaView, ScrollView, ToastAndroid, View } from "react-native"; import { SafeAreaView, ScrollView, View } from "react-native";
import Toast from "react-native-toast-message";
import { useDispatch, useSelector } from "react-redux"; import { useDispatch, useSelector } from "react-redux";
@@ -30,6 +31,7 @@ export default function CreateDiscussionGeneral() {
const [isSelect, setSelect] = useState(false); const [isSelect, setSelect] = useState(false);
const entitiesMember = useSelector((state: any) => state.memberChoose) const entitiesMember = useSelector((state: any) => state.memberChoose)
const update = useSelector((state: any) => state.discussionGeneralDetailUpdate) const update = useSelector((state: any) => state.discussionGeneralDetailUpdate)
const [loading, setLoading] = useState(false)
const [dataForm, setDataForm] = useState({ const [dataForm, setDataForm] = useState({
idGroup: "", idGroup: "",
title: "", title: "",
@@ -83,6 +85,9 @@ export default function CreateDiscussionGeneral() {
checkForm(); checkForm();
}, [error, dataForm]); }, [error, dataForm]);
useEffect(() => {
dispatch(setMemberChoose([]))
}, [])
function handleBack() { function handleBack() {
dispatch(setMemberChoose([])) dispatch(setMemberChoose([]))
@@ -91,6 +96,7 @@ export default function CreateDiscussionGeneral() {
async function handleCreate() { async function handleCreate() {
try { try {
setLoading(true)
const hasil = await decryptToken(String(token?.current)) const hasil = await decryptToken(String(token?.current))
const response = await apiCreateDiscussionGeneral({ const response = await apiCreateDiscussionGeneral({
data: { ...dataForm, user: hasil, member: entitiesMember }, data: { ...dataForm, user: hasil, member: entitiesMember },
@@ -98,11 +104,16 @@ export default function CreateDiscussionGeneral() {
if (response.success) { if (response.success) {
dispatch(setMemberChoose([])) dispatch(setMemberChoose([]))
dispatch(setUpdateDiscussionGeneralDetail(!update)) dispatch(setUpdateDiscussionGeneralDetail(!update))
ToastAndroid.show('Berhasil menambahkan data', ToastAndroid.SHORT) Toast.show({ type: 'small', text1: 'Berhasil menambahkan data', })
router.back() router.back()
} else {
Toast.show({ type: 'small', text1: response.message, })
} }
} catch (error) { } catch (error) {
console.error(error); console.error(error);
Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
} finally {
setLoading(false)
} }
} }
@@ -120,13 +131,10 @@ export default function CreateDiscussionGeneral() {
headerRight: () => ( headerRight: () => (
<ButtonSaveHeader <ButtonSaveHeader
category="create" category="create"
disable={disableBtn} disable={disableBtn || loading ? true : false}
onPress={() => { onPress={() => {
entitiesMember.length == 0 entitiesMember.length == 0
? ToastAndroid.show( ? Toast.show({ type: 'small', text1: 'Anda belum memilih anggota', })
"Anda belum memilih anggota",
ToastAndroid.SHORT
)
: handleCreate() : handleCreate()
}} }}
/> />
@@ -170,6 +178,7 @@ export default function CreateDiscussionGeneral() {
error={error.desc} error={error.desc}
errorText="Diskusi tidak boleh kosong" errorText="Diskusi tidak boleh kosong"
onChange={(val) => { validationForm("desc", val) }} onChange={(val) => { validationForm("desc", val) }}
multiline
/> />
<ButtonSelect <ButtonSelect
value="Pilih Anggota" value="Pilih Anggota"
@@ -179,12 +188,9 @@ export default function CreateDiscussionGeneral() {
setSelect(true); setSelect(true);
setValSelect("member"); setValSelect("member");
} else { } else {
ToastAndroid.show( Toast.show({ type: 'small', text1: 'Pilih Lembaga Desa terlebih dahulu', })
"Pilih Lembaga Desa terlebih dahulu",
ToastAndroid.SHORT
);
} }
}else{ } else {
validationForm('group', userLogin.idGroup, userLogin.group); validationForm('group', userLogin.idGroup, userLogin.group);
setValChoose(userLogin.idGroup) setValChoose(userLogin.idGroup)
setSelect(true); setSelect(true);

View File

@@ -7,7 +7,8 @@ import { setUpdateDiscussionGeneralDetail } from "@/lib/discussionGeneralDetail"
import { useAuthSession } from "@/providers/AuthProvider"; import { useAuthSession } from "@/providers/AuthProvider";
import { router, Stack, useLocalSearchParams } from "expo-router"; import { router, Stack, useLocalSearchParams } from "expo-router";
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
import { SafeAreaView, ScrollView, ToastAndroid, View } from "react-native"; import { SafeAreaView, ScrollView, View } from "react-native";
import Toast from "react-native-toast-message";
import { useDispatch, useSelector } from "react-redux"; import { useDispatch, useSelector } from "react-redux";
export default function EditDiscussionGeneral() { export default function EditDiscussionGeneral() {
@@ -15,6 +16,7 @@ export default function EditDiscussionGeneral() {
const { id } = useLocalSearchParams<{ id: string }>(); const { id } = useLocalSearchParams<{ id: string }>();
const [disableBtn, setDisableBtn] = useState(false) const [disableBtn, setDisableBtn] = useState(false)
const dispatch = useDispatch() const dispatch = useDispatch()
const [loading, setLoading] = useState(false)
const update = useSelector((state: any) => state.discussionGeneralDetailUpdate) const update = useSelector((state: any) => state.discussionGeneralDetailUpdate)
const [dataForm, setDataForm] = useState({ const [dataForm, setDataForm] = useState({
title: "", title: "",
@@ -79,15 +81,19 @@ export default function EditDiscussionGeneral() {
async function handleEdit() { async function handleEdit() {
try { try {
setLoading(true)
const hasil = await decryptToken(String(token?.current)); const hasil = await decryptToken(String(token?.current));
const response = await apiEditDiscussionGeneral({ user: hasil, title: dataForm.title, desc: dataForm.desc }, id); const response = await apiEditDiscussionGeneral({ user: hasil, title: dataForm.title, desc: dataForm.desc }, id);
if (response.success) { if (response.success) {
dispatch(setUpdateDiscussionGeneralDetail(!update)) dispatch(setUpdateDiscussionGeneralDetail(!update))
ToastAndroid.show("Berhasil mengubah data", ToastAndroid.SHORT); Toast.show({ type: 'small', text1: 'Berhasil mengubah data', })
router.back(); router.back();
} }
} catch (error) { } catch (error) {
console.error(error); console.error(error);
Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
} finally {
setLoading(false)
} }
} }
@@ -106,7 +112,7 @@ export default function EditDiscussionGeneral() {
headerTitleAlign: "center", headerTitleAlign: "center",
headerRight: () => ( headerRight: () => (
<ButtonSaveHeader <ButtonSaveHeader
disable={disableBtn} disable={disableBtn || loading ? true : false}
category="update" category="update"
onPress={() => { handleEdit() }} onPress={() => { handleEdit() }}
/> />
@@ -134,6 +140,7 @@ export default function EditDiscussionGeneral() {
value={dataForm.desc} value={dataForm.desc}
errorText="Diskusi tidak boleh kosong" errorText="Diskusi tidak boleh kosong"
onChange={(val) => validationForm("desc", val)} onChange={(val) => validationForm("desc", val)}
multiline
/> />
</View> </View>
</ScrollView> </ScrollView>

View File

@@ -3,6 +3,7 @@ import ButtonTab from "@/components/buttonTab";
import InputSearch from "@/components/inputSearch"; import InputSearch from "@/components/inputSearch";
import LabelStatus from "@/components/labelStatus"; import LabelStatus from "@/components/labelStatus";
import SkeletonContent from "@/components/skeletonContent"; import SkeletonContent from "@/components/skeletonContent";
import Text from "@/components/Text";
import { ColorsStatus } from "@/constants/ColorsStatus"; import { ColorsStatus } from "@/constants/ColorsStatus";
import Styles from "@/constants/Styles"; import Styles from "@/constants/Styles";
import { apiGetDiscussionGeneral } from "@/lib/api"; import { apiGetDiscussionGeneral } from "@/lib/api";
@@ -10,7 +11,7 @@ import { useAuthSession } from "@/providers/AuthProvider";
import { AntDesign, Feather, Ionicons, MaterialIcons } from "@expo/vector-icons"; import { AntDesign, Feather, Ionicons, MaterialIcons } from "@expo/vector-icons";
import { router, useLocalSearchParams } from "expo-router"; import { router, useLocalSearchParams } from "expo-router";
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
import { RefreshControl, Text, View, VirtualizedList } from "react-native"; import { RefreshControl, View, VirtualizedList } from "react-native";
import { useSelector } from "react-redux"; import { useSelector } from "react-redux";

View File

@@ -13,7 +13,8 @@ import { useAuthSession } from "@/providers/AuthProvider";
import { Feather, MaterialCommunityIcons } from "@expo/vector-icons"; import { Feather, MaterialCommunityIcons } from "@expo/vector-icons";
import { router, Stack, useLocalSearchParams } from "expo-router"; import { router, Stack, useLocalSearchParams } from "expo-router";
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
import { SafeAreaView, ScrollView, ToastAndroid, View } from "react-native"; import { SafeAreaView, ScrollView, View } from "react-native";
import Toast from "react-native-toast-message";
import { useSelector } from "react-redux"; import { useSelector } from "react-redux";
type Props = { type Props = {
@@ -59,7 +60,7 @@ export default function MemberDiscussionDetail() {
try { try {
const hasil = await decryptToken(String(token?.current)) const hasil = await decryptToken(String(token?.current))
await apiDeleteMemberDiscussionGeneral({ user: hasil, idUser: chooseUser.idUser }, id) await apiDeleteMemberDiscussionGeneral({ user: hasil, idUser: chooseUser.idUser }, id)
ToastAndroid.show("Berhasil mengeluarkan anggota dari diskusi", ToastAndroid.SHORT) Toast.show({ type: 'small', text1: 'Berhasil mengeluarkan anggota dari diskusi', })
handleLoad(false) handleLoad(false)
} catch (error) { } catch (error) {
console.error(error) console.error(error)

View File

@@ -3,6 +3,7 @@ import ButtonSaveHeader from "@/components/buttonSaveHeader";
import ImageUser from "@/components/imageNew"; import ImageUser from "@/components/imageNew";
import ImageWithLabel from "@/components/imageWithLabel"; import ImageWithLabel from "@/components/imageWithLabel";
import InputSearch from "@/components/inputSearch"; import InputSearch from "@/components/inputSearch";
import Text from "@/components/Text";
import Styles from "@/constants/Styles"; import Styles from "@/constants/Styles";
import { apiAddMemberCalendar, apiGetCalendarOne, apiGetDivisionMember } from "@/lib/api"; import { apiAddMemberCalendar, apiGetCalendarOne, apiGetDivisionMember } from "@/lib/api";
import { setUpdateCalendar } from "@/lib/calendarUpdate"; import { setUpdateCalendar } from "@/lib/calendarUpdate";
@@ -10,7 +11,8 @@ import { useAuthSession } from "@/providers/AuthProvider";
import { AntDesign } from "@expo/vector-icons"; import { AntDesign } from "@expo/vector-icons";
import { router, Stack, useLocalSearchParams } from "expo-router"; import { router, Stack, useLocalSearchParams } from "expo-router";
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
import { Pressable, SafeAreaView, ScrollView, Text, ToastAndroid, View } from "react-native"; import { Pressable, SafeAreaView, ScrollView, View } from "react-native";
import Toast from "react-native-toast-message";
import { useDispatch, useSelector } from "react-redux"; import { useDispatch, useSelector } from "react-redux";
type Props = { type Props = {
@@ -29,6 +31,7 @@ export default function AddMemberCalendarEvent() {
const [selectMember, setSelectMember] = useState<any[]>([]) const [selectMember, setSelectMember] = useState<any[]>([])
const [search, setSearch] = useState('') const [search, setSearch] = useState('')
const [idCalendar, setIdCalendar] = useState('') const [idCalendar, setIdCalendar] = useState('')
const [loading, setLoading] = useState(false)
async function handleLoadOldMember() { async function handleLoadOldMember() {
try { try {
@@ -76,18 +79,21 @@ export default function AddMemberCalendarEvent() {
async function handleAddMember() { async function handleAddMember() {
try { try {
setLoading(true)
const hasil = await decryptToken(String(token?.current)) const hasil = await decryptToken(String(token?.current))
const response = await apiAddMemberCalendar({ id: idCalendar, data: { user: hasil, member: selectMember } }) const response = await apiAddMemberCalendar({ id: idCalendar, data: { user: hasil, member: selectMember } })
if (response.success) { if (response.success) {
ToastAndroid.show('Berhasil menambahkan anggota', ToastAndroid.SHORT) Toast.show({ type: 'small', text1: 'Berhasil menambahkan anggota', })
dispatch(setUpdateCalendar({ ...update, member: !update.member })) dispatch(setUpdateCalendar({ ...update, member: !update.member }))
router.back() router.back()
} else { } else {
ToastAndroid.show(response.message, ToastAndroid.SHORT) Toast.show({ type: 'small', text1: response.message, })
} }
} catch (error) { } catch (error) {
console.error(error) console.error(error)
ToastAndroid.show('Terjadi kesalahan', ToastAndroid.SHORT) Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
} finally {
setLoading(false)
} }
} }
@@ -102,7 +108,7 @@ export default function AddMemberCalendarEvent() {
headerRight: () => ( headerRight: () => (
<ButtonSaveHeader <ButtonSaveHeader
category="update" category="update"
disable={selectMember.length > 0 ? false : true} disable={selectMember.length == 0 || loading ? true : false}
onPress={() => { onPress={() => {
handleAddMember() handleAddMember()
}} }}
@@ -157,7 +163,7 @@ export default function AddMemberCalendarEvent() {
</View> </View>
</View> </View>
{ {
selectMember.some((i: any) => i.idUser == item.id) && <AntDesign name="check" size={20} /> selectMember.some((i: any) => i.idUser == item.id) && <AntDesign name="check" size={20} color={'black'}/>
} }
</Pressable> </Pressable>
) )

View File

@@ -12,7 +12,8 @@ import { useAuthSession } from "@/providers/AuthProvider"
import { Stack, router, useLocalSearchParams } from "expo-router" import { Stack, router, useLocalSearchParams } from "expo-router"
import moment from "moment" import moment from "moment"
import { useEffect, useState } from "react" import { useEffect, useState } from "react"
import { SafeAreaView, ScrollView, ToastAndroid, View } from "react-native" import { SafeAreaView, ScrollView, View } from "react-native"
import Toast from "react-native-toast-message"
export default function EditEventCalendar() { export default function EditEventCalendar() {
const { token, decryptToken } = useAuthSession(); const { token, decryptToken } = useAuthSession();
@@ -20,6 +21,7 @@ export default function EditEventCalendar() {
const [isSelect, setSelect] = useState(false) const [isSelect, setSelect] = useState(false)
const { id, detail } = useLocalSearchParams<{ id: string, detail: string }>() const { id, detail } = useLocalSearchParams<{ id: string, detail: string }>()
const [idCalendar, setIdCalendar] = useState('') const [idCalendar, setIdCalendar] = useState('')
const [loading, setLoading] = useState(false)
const [error, setError] = useState({ const [error, setError] = useState({
title: false, title: false,
@@ -53,7 +55,7 @@ export default function EditEventCalendar() {
setChoose({ val: response.data.repeatEventTyper, label: valueTypeEventRepeat.find((item) => item.id == response.data.repeatEventTyper)?.name || "" }) setChoose({ val: response.data.repeatEventTyper, label: valueTypeEventRepeat.find((item) => item.id == response.data.repeatEventTyper)?.name || "" })
} catch (error) { } catch (error) {
console.error(error); console.error(error);
ToastAndroid.show('Gagal mendapatkan data', ToastAndroid.SHORT) Toast.show({ type: 'small', text1: 'Gagal mendapatkan data', })
} }
} }
@@ -139,17 +141,20 @@ export default function EditEventCalendar() {
async function handleUpdate() { async function handleUpdate() {
try { try {
setLoading(true)
const hasil = await decryptToken(String(token?.current)) const hasil = await decryptToken(String(token?.current))
const response = await apiUpdateCalendar({ data: { ...data, user: hasil }, id: idCalendar }) const response = await apiUpdateCalendar({ data: { ...data, user: hasil }, id: idCalendar })
if (response.success) { if (response.success) {
router.replace(`/division/${id}/calendar/`) router.replace(`/division/${id}/calendar/`)
ToastAndroid.show('Berhasil mengubah acara', ToastAndroid.SHORT) Toast.show({ type: 'small', text1: 'Berhasil mengubah acara', })
} else { } else {
ToastAndroid.show(response.message, ToastAndroid.SHORT) Toast.show({ type: 'small', text1: response.message, })
} }
} catch (error) { } catch (error) {
console.error(error) console.error(error)
ToastAndroid.show('Gagal mengubah acara', ToastAndroid.SHORT) Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
} finally {
setLoading(false)
} }
} }
@@ -163,7 +168,7 @@ export default function EditEventCalendar() {
headerTitleAlign: 'center', headerTitleAlign: 'center',
headerRight: () => headerRight: () =>
<ButtonSaveHeader <ButtonSaveHeader
disable={Object.values(error).some((val) => val == true) || data.title == "" || data.dateStart == "" || data.timeStart == "" || data.timeEnd == "" || data.repeatEventTyper == ""} disable={Object.values(error).some((val) => val == true) || data.title == "" || data.dateStart == "" || data.timeStart == "" || data.timeEnd == "" || data.repeatEventTyper == "" || loading}
category="update-calendar" category="update-calendar"
onPress={() => { onPress={() => {
handleUpdate() handleUpdate()

View File

@@ -6,6 +6,7 @@ import DrawerBottom from "@/components/drawerBottom"
import ImageUser from "@/components/imageNew" import ImageUser from "@/components/imageNew"
import MenuItemRow from "@/components/menuItemRow" import MenuItemRow from "@/components/menuItemRow"
import Skeleton from "@/components/skeleton" import Skeleton from "@/components/skeleton"
import Text from "@/components/Text"
import Styles from "@/constants/Styles" import Styles from "@/constants/Styles"
import { apiDeleteCalendarMember, apiGetCalendarOne, apiGetDivisionOneFeature } from "@/lib/api" import { apiDeleteCalendarMember, apiGetCalendarOne, apiGetDivisionOneFeature } from "@/lib/api"
import { setUpdateCalendar } from "@/lib/calendarUpdate" import { setUpdateCalendar } from "@/lib/calendarUpdate"
@@ -13,7 +14,8 @@ import { useAuthSession } from "@/providers/AuthProvider"
import { MaterialCommunityIcons } from "@expo/vector-icons" import { MaterialCommunityIcons } from "@expo/vector-icons"
import { router, Stack, useLocalSearchParams } from "expo-router" import { router, Stack, useLocalSearchParams } from "expo-router"
import { useEffect, useState } from "react" import { useEffect, useState } from "react"
import { SafeAreaView, ScrollView, Text, ToastAndroid, View } from "react-native" import { RefreshControl, SafeAreaView, ScrollView, View } from "react-native"
import Toast from "react-native-toast-message"
import { useDispatch, useSelector } from "react-redux" import { useDispatch, useSelector } from "react-redux"
type Props = { type Props = {
@@ -51,7 +53,7 @@ export default function DetailEventCalendar() {
const entityUser = useSelector((state: any) => state.user); const entityUser = useSelector((state: any) => state.user);
const [isMemberDivision, setIsMemberDivision] = useState(false); const [isMemberDivision, setIsMemberDivision] = useState(false);
const [loading, setLoading] = useState(true) const [loading, setLoading] = useState(true)
const arrSkeleton = Array.from({ length: 5 }) const [refreshing, setRefreshing] = useState(false)
async function handleCheckMember() { async function handleCheckMember() {
try { try {
@@ -68,9 +70,9 @@ export default function DetailEventCalendar() {
} }
} }
async function handleLoad() { async function handleLoad(loading:boolean) {
try { try {
setLoading(true) setLoading(loading)
const hasil = await decryptToken(String(token?.current)); const hasil = await decryptToken(String(token?.current));
const response = await apiGetCalendarOne({ const response = await apiGetCalendarOne({
user: hasil, user: hasil,
@@ -104,7 +106,7 @@ export default function DetailEventCalendar() {
} }
useEffect(() => { useEffect(() => {
handleLoad(); handleLoad(true);
handleCheckMember() handleCheckMember()
}, []); }, []);
@@ -122,18 +124,25 @@ export default function DetailEventCalendar() {
if (response.success) { if (response.success) {
dispatch(setUpdateCalendar({ ...update, member: !update.member })); dispatch(setUpdateCalendar({ ...update, member: !update.member }));
ToastAndroid.show(response.message, ToastAndroid.SHORT);
} else {
ToastAndroid.show(response.message, ToastAndroid.SHORT);
} }
Toast.show({ type: 'small', text1: response.message, })
} catch (error) { } catch (error) {
console.error(error); console.error(error);
ToastAndroid.show('Terjadi kesalahan', ToastAndroid.SHORT); Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
} finally { } finally {
setModalMember(false) setModalMember(false)
} }
} }
const handleRefresh = async () => {
setRefreshing(true)
handleLoad(false)
handleLoadMember()
await new Promise(resolve => setTimeout(resolve, 2000));
setRefreshing(false)
};
return ( return (
<SafeAreaView> <SafeAreaView>
<Stack.Screen <Stack.Screen
@@ -144,7 +153,15 @@ export default function DetailEventCalendar() {
headerRight: () => (entityUser.role == "user" || entityUser.role == "coadmin") && !isMemberDivision ? <></> : <HeaderRightCalendarDetail id={String(data?.idCalendar)} idReminder={String(detail)} /> headerRight: () => (entityUser.role == "user" || entityUser.role == "coadmin") && !isMemberDivision ? <></> : <HeaderRightCalendarDetail id={String(data?.idCalendar)} idReminder={String(detail)} />
}} }}
/> />
<ScrollView> <ScrollView
style={[Styles.h100]}
refreshControl={
<RefreshControl
refreshing={refreshing}
onRefresh={handleRefresh}
/>
}
>
<View style={[Styles.p15]}> <View style={[Styles.p15]}>
<View style={[Styles.wrapPaper, Styles.mb15]}> <View style={[Styles.wrapPaper, Styles.mb15]}>
<View style={Styles.rowItemsCenter}> <View style={Styles.rowItemsCenter}>

View File

@@ -3,6 +3,7 @@ import ButtonSaveHeader from "@/components/buttonSaveHeader";
import ImageUser from "@/components/imageNew"; import ImageUser from "@/components/imageNew";
import ImageWithLabel from "@/components/imageWithLabel"; import ImageWithLabel from "@/components/imageWithLabel";
import InputSearch from "@/components/inputSearch"; import InputSearch from "@/components/inputSearch";
import Text from "@/components/Text";
import Styles from "@/constants/Styles"; import Styles from "@/constants/Styles";
import { apiCreateCalendar, apiGetDivisionMember } from "@/lib/api"; import { apiCreateCalendar, apiGetDivisionMember } from "@/lib/api";
import { setFormCreateCalendar } from "@/lib/calendarCreate"; import { setFormCreateCalendar } from "@/lib/calendarCreate";
@@ -11,7 +12,8 @@ import { useAuthSession } from "@/providers/AuthProvider";
import { AntDesign } from "@expo/vector-icons"; import { AntDesign } from "@expo/vector-icons";
import { router, Stack, useLocalSearchParams } from "expo-router"; import { router, Stack, useLocalSearchParams } from "expo-router";
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
import { Pressable, SafeAreaView, ScrollView, Text, ToastAndroid, View } from "react-native"; import { Pressable, SafeAreaView, ScrollView, View } from "react-native";
import Toast from "react-native-toast-message";
import { useDispatch, useSelector } from "react-redux"; import { useDispatch, useSelector } from "react-redux";
type Props = { type Props = {
@@ -29,6 +31,7 @@ export default function CreateCalendarAddMember() {
const update = useSelector((state: any) => state.calendarCreate) const update = useSelector((state: any) => state.calendarCreate)
const dispatch = useDispatch() const dispatch = useDispatch()
const updateRefresh = useSelector((state: any) => state.calendarUpdate) const updateRefresh = useSelector((state: any) => state.calendarUpdate)
const [loading, setLoading] = useState(false)
@@ -56,10 +59,11 @@ export default function CreateCalendarAddMember() {
async function handleAddMember() { async function handleAddMember() {
try { try {
setLoading(true)
const hasil = await decryptToken(String(token?.current)) const hasil = await decryptToken(String(token?.current))
const response = await apiCreateCalendar({ data: { ...update, user: hasil, idDivision: id, member: selectMember } }) const response = await apiCreateCalendar({ data: { ...update, user: hasil, idDivision: id, member: selectMember } })
if (response.success) { if (response.success) {
ToastAndroid.show('Berhasil membuat acara', ToastAndroid.SHORT) Toast.show({ type: 'small', text1: 'Berhasil membuat acara', })
dispatch(setFormCreateCalendar({ dispatch(setFormCreateCalendar({
title: "", title: "",
desc: "", desc: "",
@@ -74,11 +78,13 @@ export default function CreateCalendarAddMember() {
dispatch(setUpdateCalendar({ ...updateRefresh, data: !updateRefresh.data })); dispatch(setUpdateCalendar({ ...updateRefresh, data: !updateRefresh.data }));
router.replace(`/division/${id}/calendar`) router.replace(`/division/${id}/calendar`)
} else { } else {
ToastAndroid.show(response.message, ToastAndroid.SHORT) Toast.show({ type: 'small', text1: response.message, })
} }
} catch (error) { } catch (error) {
console.error(error) console.error(error)
ToastAndroid.show('Gagal membuat acara', ToastAndroid.SHORT) Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
} finally {
setLoading(false)
} }
} }
@@ -92,7 +98,7 @@ export default function CreateCalendarAddMember() {
headerRight: () => ( headerRight: () => (
<ButtonSaveHeader <ButtonSaveHeader
category="create" category="create"
disable={selectMember.length > 0 ? false : true} disable={selectMember.length == 0 || loading ? true : false}
onPress={() => { handleAddMember() }} onPress={() => { handleAddMember() }}
/> />
) )
@@ -131,7 +137,7 @@ export default function CreateCalendarAddMember() {
<Pressable <Pressable
key={index} key={index}
style={[Styles.itemSelectModal]} style={[Styles.itemSelectModal]}
onPress={() => {onChoose(item.idUser, item.name, item.img) }} onPress={() => { onChoose(item.idUser, item.name, item.img) }}
> >
<View style={[Styles.rowItemsCenter, Styles.w70]}> <View style={[Styles.rowItemsCenter, Styles.w70]}>
<ImageUser src={`https://wibu-storage.wibudev.com/api/files/${item.img}`} border /> <ImageUser src={`https://wibu-storage.wibudev.com/api/files/${item.img}`} border />
@@ -140,7 +146,7 @@ export default function CreateCalendarAddMember() {
</View> </View>
</View> </View>
{ {
selectMember.some((i: any) => i.idUser == item.idUser) && <AntDesign name="check" size={20} /> selectMember.some((i: any) => i.idUser == item.idUser) && <AntDesign name="check" size={20} color={'black'}/>
} }
</Pressable> </Pressable>
) )

View File

@@ -10,11 +10,14 @@ import { stringToDateTime } from "@/lib/fun_stringToDate";
import { Stack, router, useLocalSearchParams } from "expo-router"; import { Stack, router, useLocalSearchParams } from "expo-router";
import { useState } from "react"; import { useState } from "react";
import { import {
KeyboardAvoidingView,
Platform,
SafeAreaView, SafeAreaView,
ScrollView, ScrollView,
View View
} from "react-native"; } from "react-native";
import { useDispatch, useSelector } from "react-redux"; import { useDispatch, useSelector } from "react-redux";
import { useHeaderHeight } from '@react-navigation/elements';
export default function CalendarDivisionCreate() { export default function CalendarDivisionCreate() {
const { id } = useLocalSearchParams<{ id: string }>() const { id } = useLocalSearchParams<{ id: string }>()
@@ -22,6 +25,7 @@ export default function CalendarDivisionCreate() {
const [isSelect, setSelect] = useState(false) const [isSelect, setSelect] = useState(false)
const update = useSelector((state: any) => state.calendarCreate) const update = useSelector((state: any) => state.calendarCreate)
const dispatch = useDispatch() const dispatch = useDispatch()
const headerHeight = useHeaderHeight();
const [error, setError] = useState({ const [error, setError] = useState({
title: false, title: false,
dateStart: false, dateStart: false,
@@ -141,94 +145,99 @@ export default function CalendarDivisionCreate() {
), ),
}} }}
/> />
<ScrollView> <KeyboardAvoidingView
<View style={[Styles.p15, Styles.mb100]}> behavior={Platform.OS === 'ios' ? 'padding' : undefined}
<InputForm keyboardVerticalOffset={headerHeight}
label="Nama Acara" >
type="default" <ScrollView>
placeholder="Nama Acara" <View style={[Styles.p15]}>
required <InputForm
bg="white" label="Nama Acara"
value={data.title} type="default"
onChange={(val) => validationForm("title", val)} placeholder="Nama Acara"
error={error.title} required
errorText="Nama acara tidak boleh kosong" bg="white"
/> value={data.title}
<InputDate onChange={(val) => validationForm("title", val)}
onChange={(val) => validationForm("dateStart", val)} error={error.title}
mode="date" errorText="Nama acara tidak boleh kosong"
value={data.dateStart} />
label="Tanggal Acara" <InputDate
required onChange={(val) => validationForm("dateStart", val)}
error={error.dateStart} mode="date"
errorText="Tanggal acara tidak boleh kosong" value={data.dateStart}
placeholder="Pilih Tanggal Acara" label="Tanggal Acara"
/> required
<View style={[Styles.rowSpaceBetween, Styles.mv10]}> error={error.dateStart}
<View style={[{ width: "48%" }]}> errorText="Tanggal acara tidak boleh kosong"
<InputDate placeholder="Pilih Tanggal Acara"
onChange={(val) => validationForm("timeStart", val)} />
mode="time" <View style={[Styles.rowSpaceBetween, Styles.mv10]}>
value={data.timeStart} <View style={[{ width: "48%" }]}>
label="Waktu Awal" <InputDate
required onChange={(val) => validationForm("timeStart", val)}
error={error.timeStart} mode="time"
errorText="Waktu awal tidak valid" value={data.timeStart}
placeholder="--:--" label="Waktu Awal"
/> required
</View> error={error.timeStart}
<View style={[{ width: "48%" }]}> errorText="Waktu awal tidak valid"
<InputDate placeholder="--:--"
onChange={(val) => validationForm("timeEnd", val)} />
mode="time" </View>
value={data.timeEnd} <View style={[{ width: "48%" }]}>
label="Waktu Akhir" <InputDate
required onChange={(val) => validationForm("timeEnd", val)}
error={error.timeEnd} mode="time"
errorText="Waktu akhir tidak valid" value={data.timeEnd}
placeholder="--:--" label="Waktu Akhir"
/> required
error={error.timeEnd}
errorText="Waktu akhir tidak valid"
placeholder="--:--"
/>
</View>
</View> </View>
<InputForm
label="Link Meet"
type="default"
placeholder="Link Meet"
bg="white"
value={data.linkMeet}
onChange={(val) => validationForm("linkMeet", val)}
/>
<SelectForm
bg="white"
label="Ulangi Acara"
placeholder="Ulangi Acara"
value={choose.label}
required
onPress={() => { setSelect(true) }}
/>
<InputForm
label="Jumlah Pengulangan"
type="numeric"
placeholder="Jumlah Pengulangan"
required
bg="white"
value={String(data.repeatValue)}
onChange={(val) => validationForm("repeatValue", val)}
error={error.repeatValue}
errorText="Jumlah pengulangan tidak valid"
disable={choose.val == "once"}
/>
<InputForm
label="Deskripsi"
type="default"
placeholder="Deskripsi"
bg="white"
value={data.desc}
onChange={(val) => validationForm("desc", val)}
multiline
/>
</View> </View>
<InputForm </ScrollView>
label="Link Meet" </KeyboardAvoidingView>
type="default"
placeholder="Link Meet"
bg="white"
value={data.linkMeet}
onChange={(val) => validationForm("linkMeet", val)}
/>
<SelectForm
bg="white"
label="Ulangi Acara"
placeholder="Ulangi Acara"
value={choose.label}
required
onPress={() => { setSelect(true) }}
/>
<InputForm
label="Jumlah Pengulangan"
type="numeric"
placeholder="Jumlah Pengulangan"
required
bg="white"
value={String(data.repeatValue)}
onChange={(val) => validationForm("repeatValue", val)}
error={error.repeatValue}
errorText="Jumlah pengulangan tidak valid"
disable={choose.val == "once"}
/>
<InputForm
label="Deskripsi"
type="default"
placeholder="Deskripsi"
bg="white"
value={data.desc}
onChange={(val) => validationForm("desc", val)}
multiline
/>
</View>
</ScrollView>
<ModalSelect <ModalSelect
category={"type-event-repeat"} category={"type-event-repeat"}

View File

@@ -1,12 +1,13 @@
import InputSearch from "@/components/inputSearch"; import InputSearch from "@/components/inputSearch";
import Skeleton from "@/components/skeleton"; import Skeleton from "@/components/skeleton";
import Text from "@/components/Text";
import { ColorsStatus } from "@/constants/ColorsStatus"; import { ColorsStatus } from "@/constants/ColorsStatus";
import Styles from "@/constants/Styles"; import Styles from "@/constants/Styles";
import { apiGetCalendarHistory } from "@/lib/api"; import { apiGetCalendarHistory } from "@/lib/api";
import { useAuthSession } from "@/providers/AuthProvider"; import { useAuthSession } from "@/providers/AuthProvider";
import { useLocalSearchParams } from "expo-router"; import { useLocalSearchParams } from "expo-router";
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
import { FlatList, Text, View, VirtualizedList } from "react-native"; import { FlatList, View, VirtualizedList } from "react-native";
type Props = { type Props = {
dateStart: Date dateStart: Date

View File

@@ -1,19 +1,20 @@
import 'intl';
import 'intl/locale-data/jsonp/id';
import ButtonBackHeader from "@/components/buttonBackHeader"; import ButtonBackHeader from "@/components/buttonBackHeader";
import HeaderRightCalendarList from "@/components/calendar/headerCalendarList"; import HeaderRightCalendarList from "@/components/calendar/headerCalendarList";
import ItemDateCalendar from "@/components/calendar/itemDateCalendar"; import ItemDateCalendar from "@/components/calendar/itemDateCalendar";
import EventItem from "@/components/eventItem"; import EventItem from "@/components/eventItem";
import Skeleton from "@/components/skeleton"; import Skeleton from "@/components/skeleton";
import Text from "@/components/Text";
import Styles from "@/constants/Styles"; import Styles from "@/constants/Styles";
import { apiGetCalendarByDateDivision, apiGetIndicatorCalendar } from "@/lib/api"; import { apiGetCalendarByDateDivision, apiGetIndicatorCalendar } from "@/lib/api";
import { useAuthSession } from "@/providers/AuthProvider"; import { useAuthSession } from "@/providers/AuthProvider";
import { Feather } from "@expo/vector-icons"; import { Feather } from "@expo/vector-icons";
import dayjs from "dayjs"; import dayjs from "dayjs";
import { router, Stack, useLocalSearchParams } from "expo-router"; import { router, Stack, useLocalSearchParams } from "expo-router";
import 'intl';
import 'intl/locale-data/jsonp/id';
import moment from "moment"; import moment from "moment";
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
import { Pressable, RefreshControl, SafeAreaView, ScrollView, Text, View } from "react-native"; import { Pressable, RefreshControl, SafeAreaView, ScrollView, View } from "react-native";
import Datepicker, { import Datepicker, {
CalendarComponents, CalendarComponents,
CalendarDay CalendarDay
@@ -77,7 +78,9 @@ export default function CalendarDivision() {
} catch (error) { } catch (error) {
console.error(error); console.error(error);
} finally { } finally {
setLoadingBtn(false) setTimeout(() => {
setLoadingBtn(false)
}, 500)
} }
} }
@@ -143,7 +146,9 @@ export default function CalendarDivision() {
refreshing={refreshing} refreshing={refreshing}
onRefresh={handleRefresh} onRefresh={handleRefresh}
/> />
}> }
style={[Styles.h100]}
>
<View style={[Styles.p15]}> <View style={[Styles.p15]}>
<View style={[Styles.wrapPaper, Styles.p10]}> <View style={[Styles.wrapPaper, Styles.p10]}>
<Datepicker <Datepicker
@@ -152,8 +157,16 @@ export default function CalendarDivision() {
date={selected} date={selected}
month={month} month={month}
onChange={({ date }) => setSelected(date)} onChange={({ date }) => setSelected(date)}
onMonthChange={(month) => setMonth(month)}
styles={{ styles={{
selected: Styles.selectedDate, selected: Styles.selectedDate,
month_label: Styles.cBlack,
month_selector_label: Styles.cBlack,
year_label: Styles.cBlack,
year_selector_label: Styles.cBlack,
day_label: Styles.cBlack,
time_label: Styles.cBlack,
weekday_label: Styles.cBlack,
}} }}
/> />
</View> </View>

View File

@@ -7,7 +7,8 @@ import { setUpdateDiscussion } from "@/lib/discussionUpdate";
import { useAuthSession } from "@/providers/AuthProvider"; import { useAuthSession } from "@/providers/AuthProvider";
import { router, Stack, useLocalSearchParams } from "expo-router"; import { router, Stack, useLocalSearchParams } from "expo-router";
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
import { SafeAreaView, ScrollView, ToastAndroid, View } from "react-native"; import { SafeAreaView, ScrollView, View } from "react-native";
import Toast from "react-native-toast-message";
import { useDispatch, useSelector } from "react-redux"; import { useDispatch, useSelector } from "react-redux";
export default function DiscussionDivisionEdit() { export default function DiscussionDivisionEdit() {
@@ -16,6 +17,7 @@ export default function DiscussionDivisionEdit() {
const [data, setData] = useState(""); const [data, setData] = useState("");
const update = useSelector((state: any) => state.discussionUpdate); const update = useSelector((state: any) => state.discussionUpdate);
const dispatch = useDispatch(); const dispatch = useDispatch();
const [loading, setLoading] = useState(false)
async function handleLoad() { async function handleLoad() {
try { try {
@@ -37,18 +39,24 @@ export default function DiscussionDivisionEdit() {
async function handleUpdate() { async function handleUpdate() {
try { try {
setLoading(true)
const hasil = await decryptToken(String(token?.current)); const hasil = await decryptToken(String(token?.current));
const response = await apiEditDiscussion({ const response = await apiEditDiscussion({
data: { user: hasil, desc: data }, data: { user: hasil, desc: data },
id: detail, id: detail,
}); });
if (response.success) { if (response.success) {
ToastAndroid.show("Berhasil mengubah data", ToastAndroid.SHORT); Toast.show({ type: 'small', text1: 'Berhasil mengubah data', })
dispatch(setUpdateDiscussion({ ...update, data: !update.data })); dispatch(setUpdateDiscussion({ ...update, data: !update.data }));
router.back(); router.back();
}else{
Toast.show({ type: 'small', text1: response.message, })
} }
} catch (error) { } catch (error) {
console.error(error); console.error(error);
Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
} finally {
setLoading(false)
} }
} }
@@ -67,7 +75,7 @@ export default function DiscussionDivisionEdit() {
headerTitleAlign: "center", headerTitleAlign: "center",
headerRight: () => ( headerRight: () => (
<ButtonSaveHeader <ButtonSaveHeader
disable={data == ""} disable={data == "" || loading}
category="update" category="update"
onPress={() => { onPress={() => {
handleUpdate(); handleUpdate();

View File

@@ -6,6 +6,7 @@ import { InputForm } from "@/components/inputForm";
import LabelStatus from "@/components/labelStatus"; import LabelStatus from "@/components/labelStatus";
import Skeleton from "@/components/skeleton"; import Skeleton from "@/components/skeleton";
import SkeletonContent from "@/components/skeletonContent"; import SkeletonContent from "@/components/skeletonContent";
import Text from "@/components/Text";
import Styles from "@/constants/Styles"; import Styles from "@/constants/Styles";
import { import {
apiGetDiscussionOne, apiGetDiscussionOne,
@@ -17,8 +18,9 @@ import { Ionicons, MaterialIcons } from "@expo/vector-icons";
import { firebase } from "@react-native-firebase/database"; import { firebase } from "@react-native-firebase/database";
import { router, Stack, useLocalSearchParams } from "expo-router"; import { router, Stack, useLocalSearchParams } from "expo-router";
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
import { Pressable, ScrollView, Text, View } from "react-native"; import { KeyboardAvoidingView, Platform, Pressable, RefreshControl, ScrollView, View } from "react-native";
import { useSelector } from "react-redux"; import { useSelector } from "react-redux";
import { useHeaderHeight } from '@react-navigation/elements';
type Props = { type Props = {
id: string; id: string;
@@ -57,6 +59,8 @@ export default function DiscussionDetail() {
const [loadingKomentar, setLoadingKomentar] = useState(true) const [loadingKomentar, setLoadingKomentar] = useState(true)
const arrSkeleton = Array.from({ length: 3 }) const arrSkeleton = Array.from({ length: 3 })
const reference = firebase.app().database('https://mobile-darmasaba-default-rtdb.asia-southeast1.firebasedatabase.app').ref(`/discussion-division/${detail}`); const reference = firebase.app().database('https://mobile-darmasaba-default-rtdb.asia-southeast1.firebasedatabase.app').ref(`/discussion-division/${detail}`);
const [refreshing, setRefreshing] = useState(false)
const headerHeight = useHeaderHeight();
useEffect(() => { useEffect(() => {
@@ -164,6 +168,15 @@ export default function DiscussionDetail() {
} }
} }
const handleRefresh = async () => {
setRefreshing(true)
handleLoad(false)
handleLoadComment(false)
await new Promise(resolve => setTimeout(resolve, 2000));
setRefreshing(false)
};
return ( return (
<> <>
<Stack.Screen <Stack.Screen
@@ -188,7 +201,14 @@ export default function DiscussionDetail() {
}} }}
/> />
<View style={{ flex: 1 }}> <View style={{ flex: 1 }}>
<ScrollView> <ScrollView
refreshControl={
<RefreshControl
refreshing={refreshing}
onRefresh={handleRefresh}
/>
}
>
<View style={[Styles.p15, Styles.mb100]}> <View style={[Styles.p15, Styles.mb100]}>
{ {
loading ? loading ?
@@ -226,9 +246,7 @@ export default function DiscussionDetail() {
color="grey" color="grey"
style={Styles.mr05} style={Styles.mr05}
/> />
<Text <Text style={[Styles.textInformation, Styles.cGray, Styles.mb05]} >
style={[Styles.textInformation, Styles.cGray, Styles.mb05]}
>
{dataComment.length} Komentar {dataComment.length} Komentar
</Text> </Text>
</View> </View>
@@ -265,63 +283,68 @@ export default function DiscussionDetail() {
</View> </View>
</View> </View>
</ScrollView> </ScrollView>
<View <KeyboardAvoidingView
style={[ behavior={Platform.OS === 'ios' ? 'padding' : undefined}
Styles.contentItemCenter, keyboardVerticalOffset={headerHeight}
Styles.absolute0,
Styles.w100,
{ backgroundColor: "#f4f4f4" },
]}
> >
<InputForm <View
disable={ style={[
data?.status == 2 || Styles.contentItemCenter,
data?.isActive == false || Styles.w100,
((entityUser.role == "user" || entityUser.role == "coadmin") && { backgroundColor: "#f4f4f4" },
!isMemberDivision) ]}
} >
bg="white" <InputForm
type="default" disable={
round data?.status == 2 ||
placeholder="Kirim Komentar" data?.isActive == false ||
onChange={setKomentar} ((entityUser.role == "user" || entityUser.role == "coadmin") &&
value={komentar} !isMemberDivision)
itemRight={ }
<Pressable bg="white"
onPress={() => { type="default"
komentar != "" && round
!loadingSend && placeholder="Kirim Komentar"
data?.status != 2 && onChange={setKomentar}
data?.isActive && value={komentar}
(((entityUser.role == "user" || itemRight={
entityUser.role == "coadmin") && <Pressable
isMemberDivision) || onPress={() => {
entityUser.role == "admin" || komentar != "" &&
entityUser.role == "supadmin" || !loadingSend &&
entityUser.role == "developer" || data?.status != 2 &&
entityUser.role == "cosupadmin") && data?.isActive &&
handleKomentar(); (((entityUser.role == "user" ||
}}
>
<MaterialIcons
name="send"
size={25}
style={
komentar == "" ||
loadingSend ||
data?.status == 2 ||
data?.isActive == false ||
((entityUser.role == "user" ||
entityUser.role == "coadmin") && entityUser.role == "coadmin") &&
!isMemberDivision) isMemberDivision) ||
? Styles.cGray entityUser.role == "admin" ||
: Styles.cDefault entityUser.role == "supadmin" ||
} entityUser.role == "developer" ||
/> entityUser.role == "cosupadmin") &&
</Pressable> handleKomentar();
} }}
/> >
</View> <MaterialIcons
name="send"
size={25}
style={
komentar == "" ||
loadingSend ||
data?.status == 2 ||
data?.isActive == false ||
((entityUser.role == "user" ||
entityUser.role == "coadmin") &&
!isMemberDivision)
? Styles.cGray
: Styles.cDefault
}
/>
</Pressable>
}
/>
</View>
</KeyboardAvoidingView>
</View> </View>
</> </>
); );

View File

@@ -7,7 +7,8 @@ import { setUpdateDiscussion } from "@/lib/discussionUpdate"
import { useAuthSession } from "@/providers/AuthProvider" import { useAuthSession } from "@/providers/AuthProvider"
import { router, Stack, useLocalSearchParams } from "expo-router" import { router, Stack, useLocalSearchParams } from "expo-router"
import { useState } from "react" import { useState } from "react"
import { SafeAreaView, ScrollView, ToastAndroid, View } from "react-native" import { SafeAreaView, ScrollView, View } from "react-native"
import Toast from "react-native-toast-message"
import { useDispatch, useSelector } from "react-redux" import { useDispatch, useSelector } from "react-redux"
export default function CreateDiscussionDivision() { export default function CreateDiscussionDivision() {
@@ -16,21 +17,25 @@ export default function CreateDiscussionDivision() {
const { token, decryptToken } = useAuthSession() const { token, decryptToken } = useAuthSession()
const update = useSelector((state: any) => state.discussionUpdate) const update = useSelector((state: any) => state.discussionUpdate)
const dispatch = useDispatch(); const dispatch = useDispatch();
const [loading, setLoading] = useState(false)
async function handleCreate() { async function handleCreate() {
try { try {
setLoading(true)
const hasil = await decryptToken(String(token?.current)) const hasil = await decryptToken(String(token?.current))
const response = await apiCreateDiscussion({ data: { user: hasil, desc, idDivision: id } }) const response = await apiCreateDiscussion({ data: { user: hasil, desc, idDivision: id } })
if (response.success) { if (response.success) {
ToastAndroid.show('Berhasil menambahkan data', ToastAndroid.SHORT) Toast.show({ type: 'small', text1: 'Berhasil menambahkan data', })
dispatch(setUpdateDiscussion({ ...update, data: !update.data })); dispatch(setUpdateDiscussion({ ...update, data: !update.data }));
router.back() router.back()
} else { } else {
ToastAndroid.show(response.message, ToastAndroid.SHORT) Toast.show({ type: 'small', text1: response.message, })
} }
} catch (error) { } catch (error) {
console.error(error) console.error(error)
ToastAndroid.show('Terjadi kesalahan', ToastAndroid.SHORT) Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
} finally {
setLoading(false)
} }
} }
@@ -42,7 +47,7 @@ export default function CreateDiscussionDivision() {
headerTitle: 'Tambah Diskusi', headerTitle: 'Tambah Diskusi',
headerTitleAlign: 'center', headerTitleAlign: 'center',
headerRight: () => <ButtonSaveHeader headerRight: () => <ButtonSaveHeader
disable={desc == ""} disable={desc == "" || loading}
category="create" category="create"
onPress={() => { onPress={() => {
handleCreate() handleCreate()

View File

@@ -4,13 +4,14 @@ import ImageUser from "@/components/imageNew";
import InputSearch from "@/components/inputSearch"; import InputSearch from "@/components/inputSearch";
import LabelStatus from "@/components/labelStatus"; import LabelStatus from "@/components/labelStatus";
import SkeletonContent from "@/components/skeletonContent"; import SkeletonContent from "@/components/skeletonContent";
import Text from "@/components/Text";
import Styles from "@/constants/Styles"; import Styles from "@/constants/Styles";
import { apiGetDiscussion } from "@/lib/api"; import { apiGetDiscussion } from "@/lib/api";
import { useAuthSession } from "@/providers/AuthProvider"; import { useAuthSession } from "@/providers/AuthProvider";
import { AntDesign, Feather, Ionicons } from "@expo/vector-icons"; import { AntDesign, Feather, Ionicons } from "@expo/vector-icons";
import { router, useLocalSearchParams } from "expo-router"; import { router, useLocalSearchParams } from "expo-router";
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
import { RefreshControl, Text, View, VirtualizedList } from "react-native"; import { RefreshControl, View, VirtualizedList } from "react-native";
import { useSelector } from "react-redux"; import { useSelector } from "react-redux";

View File

@@ -39,10 +39,10 @@ import {
RefreshControl, RefreshControl,
SafeAreaView, SafeAreaView,
ScrollView, ScrollView,
ToastAndroid, View
View,
} from "react-native"; } from "react-native";
import * as mime from 'react-native-mime-types'; import * as mime from 'react-native-mime-types';
import Toast from "react-native-toast-message";
import { useDispatch, useSelector } from "react-redux"; import { useDispatch, useSelector } from "react-redux";
type Props = { type Props = {
@@ -110,10 +110,6 @@ export default function DocumentDivision() {
} }
} }
useEffect(() => {
handleLoad(true);
}, [path, update]);
const handleCheckboxChange = (index: number) => { const handleCheckboxChange = (index: number) => {
setDariSelectAll(false); setDariSelectAll(false);
if (selectedFiles.some((i: any) => i.id == data[index].id)) { if (selectedFiles.some((i: any) => i.id == data[index].id)) {
@@ -207,15 +203,15 @@ export default function DocumentDivision() {
const hasil = await decryptToken(String(token?.current)); const hasil = await decryptToken(String(token?.current));
const response = await apiDocumentRename({ user: hasil, ...bodyRename }); const response = await apiDocumentRename({ user: hasil, ...bodyRename });
if (response.success) { if (response.success) {
ToastAndroid.show("Berhasil mengubah nama", ToastAndroid.SHORT); Toast.show({ type: 'small', text1: 'Berhasil mengubah nama', })
dispatch(setUpdateDokumen(!update)); dispatch(setUpdateDokumen(!update));
handleBatal(); handleBatal();
} else { } else {
ToastAndroid.show(response.message, ToastAndroid.SHORT); Toast.show({ type: 'small', text1: response.message, })
} }
} catch (error) { } catch (error) {
console.error(error); console.error(error);
ToastAndroid.show("Terjadi kesalahan", ToastAndroid.SHORT); Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
} finally { } finally {
setRename(false); setRename(false);
} }
@@ -229,20 +225,21 @@ export default function DocumentDivision() {
data: selectedFiles, data: selectedFiles,
}); });
if (response.success) { if (response.success) {
ToastAndroid.show("Berhasil menghapus", ToastAndroid.SHORT); Toast.show({ type: 'small', text1: 'Berhasil menghapus', })
dispatch(setUpdateDokumen(!update)); dispatch(setUpdateDokumen(!update));
handleBatal(); handleBatal();
} else { } else {
ToastAndroid.show(response.message, ToastAndroid.SHORT); Toast.show({ type: 'small', text1: response.message, })
} }
} catch (error) { } catch (error) {
console.error(error); console.error(error);
ToastAndroid.show("Terjadi kesalahan", ToastAndroid.SHORT); Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
} }
} }
useEffect(() => { useEffect(() => {
handleBatal(); handleBatal();
handleLoad(false)
}, [update]); }, [update]);
async function handleShare(selectedDivision: any[]) { async function handleShare(selectedDivision: any[]) {
@@ -254,15 +251,15 @@ export default function DocumentDivision() {
dataItem: selectedFiles, dataItem: selectedFiles,
}); });
if (response.success) { if (response.success) {
ToastAndroid.show("Berhasil membagikan item", ToastAndroid.SHORT); Toast.show({ type: 'small', text1: 'Berhasil membagikan item', })
dispatch(setUpdateDokumen(!update)); dispatch(setUpdateDokumen(!update));
handleBatal(); handleBatal();
} else { } else {
ToastAndroid.show(response.message, ToastAndroid.SHORT); Toast.show({ type: 'small', text1: response.message, })
} }
} catch (error) { } catch (error) {
console.error(error); console.error(error);
ToastAndroid.show("Terjadi kesalahan", ToastAndroid.SHORT); Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
} finally { } finally {
setShare(false); setShare(false);
} }
@@ -270,7 +267,7 @@ export default function DocumentDivision() {
const openFile = (item: Props) => { const openFile = (item: Props) => {
setLoadingOpen(true) if (Platform.OS == 'android') setLoadingOpen(true)
let remoteUrl = 'https://wibu-storage.wibudev.com/api/files/' + item.idStorage; let remoteUrl = 'https://wibu-storage.wibudev.com/api/files/' + item.idStorage;
const fileName = item.name + '.' + item.extension; const fileName = item.name + '.' + item.extension;
let localPath = `${FileSystem.documentDirectory}/${fileName}`; let localPath = `${FileSystem.documentDirectory}/${fileName}`;
@@ -278,9 +275,9 @@ export default function DocumentDivision() {
FileSystem.downloadAsync(remoteUrl, localPath).then(async ({ uri }) => { FileSystem.downloadAsync(remoteUrl, localPath).then(async ({ uri }) => {
const contentURL = await FileSystem.getContentUriAsync(uri); const contentURL = await FileSystem.getContentUriAsync(uri);
setLoadingOpen(false)
try { try {
if (Platform.OS == 'android') { if (Platform.OS == 'android') {
// open with android intent
await startActivityAsync( await startActivityAsync(
'android.intent.action.VIEW', 'android.intent.action.VIEW',
{ {
@@ -289,16 +286,13 @@ export default function DocumentDivision() {
type: mimeType as string, type: mimeType as string,
} }
); );
// or
// Sharing.shareAsync(localPath);
} else if (Platform.OS == 'ios') { } else if (Platform.OS == 'ios') {
Sharing.shareAsync(localPath); Sharing.shareAsync(localPath);
} }
} catch (error) { } catch (error) {
Alert.alert('INFO', 'Gagal membuka file, tidak ada aplikasi yang dapat membuka file ini'); Alert.alert('INFO', 'Gagal membuka file, tidak ada aplikasi yang dapat membuka file ini');
} finally { } finally {
setLoadingOpen(false) if (Platform.OS == 'android') setLoadingOpen(false)
} }
}); });
}; };
@@ -310,6 +304,10 @@ export default function DocumentDivision() {
setRefreshing(false) setRefreshing(false)
}; };
useEffect(() => {
handleLoad(true);
}, [path]);
return ( return (
<SafeAreaView> <SafeAreaView>
<Stack.Screen <Stack.Screen
@@ -351,7 +349,7 @@ export default function DocumentDivision() {
/> />
<ModalLoading isVisible={loadingOpen} setVisible={setLoadingOpen} /> <ModalLoading isVisible={loadingOpen} setVisible={setLoadingOpen} />
<ScrollView <ScrollView
style={{ height: "100%" }} style={[Styles.h100]}
refreshControl={ refreshControl={
<RefreshControl <RefreshControl
refreshing={refreshing} refreshing={refreshing}
@@ -375,7 +373,7 @@ export default function DocumentDivision() {
}} }}
> >
{item.id != "home" && ( {item.id != "home" && (
<AntDesign name="right" style={[Styles.mh05, Styles.mt02]} /> <AntDesign name="right" style={[Styles.mh05, Styles.mt02]} color="black" />
)} )}
<Text> {item.name} </Text> <Text> {item.name} </Text>
</Pressable> </Pressable>
@@ -538,13 +536,11 @@ export default function DocumentDivision() {
<DrawerBottom <DrawerBottom
animation="slide" animation="slide"
isVisible={modalMore} isVisible={modalMore}
setVisible={setModalMore} setVisible={() => { setModalMore(false) }}
title="" title=""
> >
<ModalMore <ModalMore
onClose={() => { onClose={() => { setModalMore(false); }}
setModalMore(false);
}}
data={selectedFiles} data={selectedFiles}
share={shareSelected} share={shareSelected}
/> />
@@ -553,10 +549,8 @@ export default function DocumentDivision() {
<ModalFloat <ModalFloat
title="Ganti Nama" title="Ganti Nama"
isVisible={isRename} isVisible={isRename}
setVisible={setRename} setVisible={() => { setRename(false) }}
onSubmit={() => { onSubmit={() => { handleRename() }}
handleRename();
}}
disableSubmit={bodyRename.name == ""} disableSubmit={bodyRename.name == ""}
> >
<View> <View>
@@ -576,7 +570,7 @@ export default function DocumentDivision() {
title="Bagikan" title="Bagikan"
category="share-division" category="share-division"
open={isShare} open={isShare}
close={setShare} close={() => { setShare(false) }}
onSelect={(value) => { onSelect={(value) => {
handleShare(value) handleShare(value)
}} }}

View File

@@ -4,6 +4,7 @@ import ButtonSaveHeader from "@/components/buttonSaveHeader";
import ButtonSelect from "@/components/buttonSelect"; import ButtonSelect from "@/components/buttonSelect";
import DrawerBottom from "@/components/drawerBottom"; import DrawerBottom from "@/components/drawerBottom";
import MenuItemRow from "@/components/menuItemRow"; import MenuItemRow from "@/components/menuItemRow";
import Text from "@/components/Text";
import Styles from "@/constants/Styles"; import Styles from "@/constants/Styles";
import { apiAddFileTask, apiCheckFileTask } from "@/lib/api"; import { apiAddFileTask, apiCheckFileTask } from "@/lib/api";
import { setUpdateTask } from "@/lib/taskUpdate"; import { setUpdateTask } from "@/lib/taskUpdate";
@@ -16,10 +17,9 @@ import {
ActivityIndicator, ActivityIndicator,
SafeAreaView, SafeAreaView,
ScrollView, ScrollView,
Text, View
ToastAndroid,
View,
} from "react-native"; } from "react-native";
import Toast from "react-native-toast-message";
import { useDispatch, useSelector } from "react-redux"; import { useDispatch, useSelector } from "react-redux";
export default function TaskDivisionAddFile() { export default function TaskDivisionAddFile() {
@@ -32,20 +32,23 @@ export default function TaskDivisionAddFile() {
const [loadingCheck, setLoadingCheck] = useState(false); const [loadingCheck, setLoadingCheck] = useState(false);
const dispatch = useDispatch(); const dispatch = useDispatch();
const update = useSelector((state: any) => state.taskUpdate); const update = useSelector((state: any) => state.taskUpdate);
const [loading, setLoading] = useState(false);
const pickDocumentAsync = async () => { const pickDocumentAsync = async () => {
let result = await DocumentPicker.getDocumentAsync({ let result = await DocumentPicker.getDocumentAsync({
type: ["*/*"], type: ["*/*"],
multiple: false, multiple: true,
}); });
if (!result.canceled) { if (!result.canceled) {
if (result.assets?.[0].uri) { for (let i = 0; i < result.assets?.length; i++) {
const check = await handleCheckFile(result.assets?.[0]); if (result.assets?.[i].uri) {
if (check) { const check = await handleCheckFile(result.assets?.[i]);
setFileForm([...fileForm, result.assets?.[0]]); if (check) {
setListFile([...listFile, result.assets?.[0].name]); setFileForm((prev) => [...prev, result.assets?.[i]]);
} else { setListFile((prev) => [...prev, result.assets?.[i].name]);
ToastAndroid.show("File sudah ada", ToastAndroid.SHORT); } else {
Toast.show({ type: 'small', text1: 'File sudah ada', })
}
} }
} }
} }
@@ -88,6 +91,7 @@ export default function TaskDivisionAddFile() {
async function handleAddFile() { async function handleAddFile() {
try { try {
setLoading(true)
const hasil = await decryptToken(String(token?.current)); const hasil = await decryptToken(String(token?.current));
const fd = new FormData(); const fd = new FormData();
@@ -108,15 +112,17 @@ export default function TaskDivisionAddFile() {
const response = await apiAddFileTask({ data: fd, id: detail }); const response = await apiAddFileTask({ data: fd, id: detail });
if (response.success) { if (response.success) {
ToastAndroid.show("Berhasil menambahkan file", ToastAndroid.SHORT); Toast.show({ type: 'small', text1: 'Berhasil menambahkan file', })
dispatch(setUpdateTask({ ...update, file: !update.file })); dispatch(setUpdateTask({ ...update, file: !update.file }));
router.back(); router.back();
} else { } else {
ToastAndroid.show(response.message, ToastAndroid.SHORT); Toast.show({ type: 'small', text1: response.message, })
} }
} catch (error) { } catch (error) {
console.error(error); console.error(error);
ToastAndroid.show("Terjadi kesalahan", ToastAndroid.SHORT); Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
} finally {
setLoading(false)
} }
} }
@@ -136,7 +142,7 @@ export default function TaskDivisionAddFile() {
headerRight: () => ( headerRight: () => (
<ButtonSaveHeader <ButtonSaveHeader
category="create" category="create"
disable={fileForm.length == 0 ? true : false} disable={fileForm.length == 0 || loading ? true : false}
onPress={() => { handleAddFile() }} onPress={() => { handleAddFile() }}
/> />
), ),
@@ -169,6 +175,9 @@ export default function TaskDivisionAddFile() {
{ {
loadingCheck && <ActivityIndicator size="small" /> loadingCheck && <ActivityIndicator size="small" />
} }
{
loading && <ActivityIndicator size="large" />
}
</View> </View>
</ScrollView> </ScrollView>
<DrawerBottom animation="slide" isVisible={isModal} setVisible={setModal} title="Menu"> <DrawerBottom animation="slide" isVisible={isModal} setVisible={setModal} title="Menu">

View File

@@ -3,6 +3,7 @@ import ButtonSaveHeader from "@/components/buttonSaveHeader";
import ImageUser from "@/components/imageNew"; import ImageUser from "@/components/imageNew";
import ImageWithLabel from "@/components/imageWithLabel"; import ImageWithLabel from "@/components/imageWithLabel";
import InputSearch from "@/components/inputSearch"; import InputSearch from "@/components/inputSearch";
import Text from "@/components/Text";
import Styles from "@/constants/Styles"; import Styles from "@/constants/Styles";
import { apiAddMemberTask, apiGetDivisionMember, apiGetTaskOne } from "@/lib/api"; import { apiAddMemberTask, apiGetDivisionMember, apiGetTaskOne } from "@/lib/api";
import { setUpdateTask } from "@/lib/taskUpdate"; import { setUpdateTask } from "@/lib/taskUpdate";
@@ -10,7 +11,8 @@ import { useAuthSession } from "@/providers/AuthProvider";
import { AntDesign } from "@expo/vector-icons"; import { AntDesign } from "@expo/vector-icons";
import { router, Stack, useLocalSearchParams } from "expo-router"; import { router, Stack, useLocalSearchParams } from "expo-router";
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
import { Pressable, SafeAreaView, ScrollView, Text, ToastAndroid, View } from "react-native"; import { Pressable, SafeAreaView, ScrollView, View } from "react-native";
import Toast from "react-native-toast-message";
import { useDispatch, useSelector } from "react-redux"; import { useDispatch, useSelector } from "react-redux";
type Props = { type Props = {
@@ -28,6 +30,7 @@ export default function AddMemberTask() {
const [data, setData] = useState<Props[]>([]) const [data, setData] = useState<Props[]>([])
const [selectMember, setSelectMember] = useState<any[]>([]) const [selectMember, setSelectMember] = useState<any[]>([])
const [search, setSearch] = useState('') const [search, setSearch] = useState('')
const [loading, setLoading] = useState(false)
async function handleLoadOldMember() { async function handleLoadOldMember() {
try { try {
@@ -70,18 +73,21 @@ export default function AddMemberTask() {
async function handleAddMember() { async function handleAddMember() {
try { try {
setLoading(true)
const hasil = await decryptToken(String(token?.current)) const hasil = await decryptToken(String(token?.current))
const response = await apiAddMemberTask({ id: detail, data: { user: hasil, member: selectMember, idDivision: id } }) const response = await apiAddMemberTask({ id: detail, data: { user: hasil, member: selectMember, idDivision: id } })
if (response.success) { if (response.success) {
ToastAndroid.show('Berhasil menambahkan anggota', ToastAndroid.SHORT) Toast.show({ type: 'small', text1: 'Berhasil menambahkan anggota', })
dispatch(setUpdateTask({ ...update, member: !update.member })) dispatch(setUpdateTask({ ...update, member: !update.member }))
router.back() router.back()
} else { } else {
ToastAndroid.show(response.message, ToastAndroid.SHORT) Toast.show({ type: 'small', text1: response.message, })
} }
} catch (error) { } catch (error) {
console.error(error) console.error(error)
ToastAndroid.show('Gagal menambahkan anggota', ToastAndroid.SHORT) Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
} finally {
setLoading(false)
} }
} }
@@ -96,7 +102,7 @@ export default function AddMemberTask() {
headerRight: () => ( headerRight: () => (
<ButtonSaveHeader <ButtonSaveHeader
category="update" category="update"
disable={selectMember.length > 0 ? false : true} disable={selectMember.length == 0 || loading ? true : false}
onPress={() => { onPress={() => {
handleAddMember() handleAddMember()
}} }}
@@ -152,7 +158,7 @@ export default function AddMemberTask() {
</View> </View>
</View> </View>
{ {
selectMember.some((i: any) => i.idUser == item.idUser) && <AntDesign name="check" size={20} /> selectMember.some((i: any) => i.idUser == item.idUser) && <AntDesign name="check" size={20} color={'black'}/>
} }
</Pressable> </Pressable>
) )

View File

@@ -1,22 +1,25 @@
import ButtonBackHeader from "@/components/buttonBackHeader"; import ButtonBackHeader from "@/components/buttonBackHeader";
import ButtonSaveHeader from "@/components/buttonSaveHeader"; import ButtonSaveHeader from "@/components/buttonSaveHeader";
import { InputForm } from "@/components/inputForm"; import { InputForm } from "@/components/inputForm";
import Text from "@/components/Text";
import Styles from "@/constants/Styles"; import Styles from "@/constants/Styles";
import { apiCreateTaskTugas } from "@/lib/api"; import { apiCreateTaskTugas } from "@/lib/api";
import { setUpdateTask } from "@/lib/taskUpdate"; import { setUpdateTask } from "@/lib/taskUpdate";
import { useAuthSession } from "@/providers/AuthProvider"; import { useAuthSession } from "@/providers/AuthProvider";
import dayjs from "dayjs"; import dayjs from "dayjs";
import { router, Stack, useLocalSearchParams } from "expo-router"; import { router, Stack, useLocalSearchParams } from "expo-router";
import 'intl';
import 'intl/locale-data/jsonp/id';
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
import { import {
SafeAreaView, KeyboardAvoidingView, Platform, SafeAreaView,
ScrollView, ScrollView,
Text, View
ToastAndroid,
View,
} from "react-native"; } from "react-native";
import Toast from "react-native-toast-message";
import DateTimePicker, { DateType } from "react-native-ui-datepicker"; import DateTimePicker, { DateType } from "react-native-ui-datepicker";
import { useDispatch, useSelector } from "react-redux"; import { useDispatch, useSelector } from "react-redux";
import { useHeaderHeight } from '@react-navigation/elements';
export default function TaskDivisionAddTask() { export default function TaskDivisionAddTask() {
const { token, decryptToken } = useAuthSession(); const { token, decryptToken } = useAuthSession();
@@ -24,6 +27,8 @@ export default function TaskDivisionAddTask() {
const update = useSelector((state: any) => state.taskUpdate); const update = useSelector((state: any) => state.taskUpdate);
const { id, detail } = useLocalSearchParams<{ id: string; detail: string }>(); const { id, detail } = useLocalSearchParams<{ id: string; detail: string }>();
const [disable, setDisable] = useState(true); const [disable, setDisable] = useState(true);
const [loading, setLoading] = useState(false)
const headerHeight = useHeaderHeight();
const [range, setRange] = useState<{ const [range, setRange] = useState<{
startDate: DateType; startDate: DateType;
endDate: DateType; endDate: DateType;
@@ -73,6 +78,7 @@ export default function TaskDivisionAddTask() {
async function handleCreate() { async function handleCreate() {
try { try {
setLoading(true)
const hasil = await decryptToken(String(token?.current)); const hasil = await decryptToken(String(token?.current));
const response = await apiCreateTaskTugas({ const response = await apiCreateTaskTugas({
data: { data: {
@@ -86,14 +92,16 @@ export default function TaskDivisionAddTask() {
}); });
if (response.success) { if (response.success) {
dispatch(setUpdateTask({ ...update, task: !update.task, progress: !update.progress })); dispatch(setUpdateTask({ ...update, task: !update.task, progress: !update.progress }));
ToastAndroid.show("Berhasil menambah data", ToastAndroid.SHORT); Toast.show({ type: 'small', text1: 'Berhasil menambah data', })
router.back(); router.back();
} else { } else {
ToastAndroid.show(response.message, ToastAndroid.SHORT); Toast.show({ type: 'small', text1: response.message, })
} }
} catch (error) { } catch (error) {
console.error(error); console.error(error);
ToastAndroid.show("Gagal menambah data", ToastAndroid.SHORT); Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
} finally {
setLoading(false)
} }
} }
@@ -113,7 +121,7 @@ export default function TaskDivisionAddTask() {
headerRight: () => ( headerRight: () => (
<ButtonSaveHeader <ButtonSaveHeader
category="create" category="create"
disable={disable} disable={disable || loading}
onPress={() => { onPress={() => {
handleCreate(); handleCreate();
}} }}
@@ -121,59 +129,72 @@ export default function TaskDivisionAddTask() {
), ),
}} }}
/> />
<ScrollView> <KeyboardAvoidingView
<View style={[Styles.p15, Styles.mb100]}> behavior={Platform.OS === 'ios' ? 'padding' : undefined}
<View style={[Styles.wrapPaper, Styles.p10]}> keyboardVerticalOffset={headerHeight}
<DateTimePicker >
mode="range" <ScrollView>
startDate={range.startDate} <View style={[Styles.p15, Styles.mb100]}>
endDate={range.endDate} <View style={[Styles.wrapPaper, Styles.p10]}>
onChange={(param) => setRange(param)} <DateTimePicker
styles={{ mode="range"
selected: Styles.selectedDate, startDate={range.startDate}
selected_label: Styles.cWhite, endDate={range.endDate}
range_fill: Styles.selectRangeDate, onChange={(param) => setRange(param)}
styles={{
selected: Styles.selectedDate,
selected_label: Styles.cWhite,
range_fill: Styles.selectRangeDate,
month_label: Styles.cBlack,
month_selector_label: Styles.cBlack,
year_label: Styles.cBlack,
year_selector_label: Styles.cBlack,
day_label: Styles.cBlack,
time_label: Styles.cBlack,
weekday_label: Styles.cBlack,
}}
/>
</View>
<View style={[Styles.mv10]}>
<View style={[Styles.rowSpaceBetween]}>
<View style={[{ width: "48%" }]}>
<Text style={[Styles.mb05]}>
Tanggal Mulai <Text style={Styles.cError}>*</Text>
</Text>
<View style={[Styles.wrapPaper, Styles.p10]}>
<Text style={{ textAlign: "center" }}>{from}</Text>
</View>
</View>
<View style={[{ width: "48%" }]}>
<Text style={[Styles.mb05]}>
Tanggal Berakhir <Text style={Styles.cError}>*</Text>
</Text>
<View style={[Styles.wrapPaper, Styles.p10]}>
<Text style={{ textAlign: "center" }}>{to}</Text>
</View>
</View>
</View>
{
(error.endDate || error.startDate) && <Text style={[Styles.textInformation, Styles.cError, Styles.mt05]}>Tanggal tidak boleh kosong</Text>
}
</View>
<InputForm
label="Judul Tugas"
type="default"
placeholder="Judul Tugas"
required
bg="white"
value={title}
error={error.title}
errorText="Judul tidak boleh kosong"
onChange={(e) => {
onValidation("title", e)
}} }}
/> />
</View> </View>
<View style={[Styles.mv10]}> </ScrollView>
<View style={[Styles.rowSpaceBetween]}> </KeyboardAvoidingView>
<View style={[{ width: "48%" }]}>
<Text style={[Styles.mb05]}>
Tanggal Mulai <Text style={Styles.cError}>*</Text>
</Text>
<View style={[Styles.wrapPaper, Styles.p10]}>
<Text style={{ textAlign: "center" }}>{from}</Text>
</View>
</View>
<View style={[{ width: "48%" }]}>
<Text style={[Styles.mb05]}>
Tanggal Berakhir <Text style={Styles.cError}>*</Text>
</Text>
<View style={[Styles.wrapPaper, Styles.p10]}>
<Text style={{ textAlign: "center" }}>{to}</Text>
</View>
</View>
</View>
{
(error.endDate || error.startDate) && <Text style={[Styles.textInformation, Styles.cError, Styles.mt05]}>Tanggal tidak boleh kosong</Text>
}
</View>
<InputForm
label="Judul Tugas"
type="default"
placeholder="Judul Tugas"
required
bg="white"
value={title}
error={error.title}
errorText="Judul tidak boleh kosong"
onChange={(e) => {
onValidation("title", e)
}}
/>
</View>
</ScrollView>
</SafeAreaView> </SafeAreaView>
); );
} }

View File

@@ -7,7 +7,8 @@ import { setUpdateTask } from "@/lib/taskUpdate";
import { useAuthSession } from "@/providers/AuthProvider"; import { useAuthSession } from "@/providers/AuthProvider";
import { router, Stack, useLocalSearchParams } from "expo-router"; import { router, Stack, useLocalSearchParams } from "expo-router";
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
import { SafeAreaView, ScrollView, ToastAndroid, View } from "react-native"; import { SafeAreaView, ScrollView, View } from "react-native";
import Toast from "react-native-toast-message";
import { useDispatch, useSelector } from "react-redux"; import { useDispatch, useSelector } from "react-redux";
export default function TaskDivisionCancel() { export default function TaskDivisionCancel() {
@@ -18,6 +19,7 @@ export default function TaskDivisionCancel() {
const [reason, setReason] = useState(""); const [reason, setReason] = useState("");
const [error, setError] = useState(false); const [error, setError] = useState(false);
const [disable, setDisable] = useState(false); const [disable, setDisable] = useState(false);
const [loading, setLoading] = useState(false)
function onValidation(val: string) { function onValidation(val: string) {
setReason(val); setReason(val);
@@ -42,6 +44,7 @@ export default function TaskDivisionCancel() {
async function handleCancel() { async function handleCancel() {
try { try {
setLoading(true)
const hasil = await decryptToken(String(token?.current)); const hasil = await decryptToken(String(token?.current));
const response = await apiCancelTask( const response = await apiCancelTask(
{ {
@@ -52,14 +55,16 @@ export default function TaskDivisionCancel() {
); );
if (response.success) { if (response.success) {
dispatch(setUpdateTask({ ...update, data: !update.data })); dispatch(setUpdateTask({ ...update, data: !update.data }));
ToastAndroid.show("Berhasil membatalkan kegiatan", ToastAndroid.SHORT); Toast.show({ type: 'small', text1: 'Berhasil membatalkan kegiatan', })
router.back(); router.back();
} else { } else {
ToastAndroid.show(response.message, ToastAndroid.SHORT); Toast.show({ type: 'small', text1: response.message, })
} }
} catch (error) { } catch (error) {
console.error(error); console.error(error);
ToastAndroid.show("Gagal membatalkan kegiatan", ToastAndroid.SHORT); Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
} finally {
setLoading(false)
} }
} }
@@ -78,7 +83,7 @@ export default function TaskDivisionCancel() {
headerTitleAlign: "center", headerTitleAlign: "center",
headerRight: () => ( headerRight: () => (
<ButtonSaveHeader <ButtonSaveHeader
disable={disable} disable={disable || loading}
category="cancel" category="cancel"
onPress={() => { onPress={() => {
handleCancel(); handleCancel();

View File

@@ -7,7 +7,8 @@ import { setUpdateTask } from "@/lib/taskUpdate";
import { useAuthSession } from "@/providers/AuthProvider"; import { useAuthSession } from "@/providers/AuthProvider";
import { router, Stack, useLocalSearchParams } from "expo-router"; import { router, Stack, useLocalSearchParams } from "expo-router";
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
import { SafeAreaView, ScrollView, ToastAndroid, View } from "react-native"; import { SafeAreaView, ScrollView, View } from "react-native";
import Toast from "react-native-toast-message";
import { useDispatch, useSelector } from "react-redux"; import { useDispatch, useSelector } from "react-redux";
export default function TaskDivisionEdit() { export default function TaskDivisionEdit() {
@@ -18,6 +19,7 @@ export default function TaskDivisionEdit() {
const [disable, setDisable] = useState(false); const [disable, setDisable] = useState(false);
const dispatch = useDispatch(); const dispatch = useDispatch();
const update = useSelector((state: any) => state.taskUpdate); const update = useSelector((state: any) => state.taskUpdate);
const [loading, setLoading] = useState(false)
async function handleLoad() { async function handleLoad() {
try { try {
@@ -41,7 +43,7 @@ export default function TaskDivisionEdit() {
setJudul(val); setJudul(val);
if (val == "" || val == "null") { if (val == "" || val == "null") {
setError(true); setError(true);
}else{ } else {
setError(false); setError(false);
} }
} }
@@ -60,6 +62,7 @@ export default function TaskDivisionEdit() {
async function handleUpdate() { async function handleUpdate() {
try { try {
setLoading(true)
const hasil = await decryptToken(String(token?.current)); const hasil = await decryptToken(String(token?.current));
const response = await apiEditTask( const response = await apiEditTask(
{ {
@@ -70,14 +73,16 @@ export default function TaskDivisionEdit() {
); );
if (response.success) { if (response.success) {
dispatch(setUpdateTask({ ...update, data: !update.data })); dispatch(setUpdateTask({ ...update, data: !update.data }));
ToastAndroid.show("Berhasil mengubah data", ToastAndroid.SHORT); Toast.show({ type: 'small', text1: 'Berhasil mengubah data', })
router.back(); router.back();
} else { } else {
ToastAndroid.show(response.message, ToastAndroid.SHORT); Toast.show({ type: 'small', text1: response.message, })
} }
} catch (error) { } catch (error) {
console.error(error); console.error(error);
ToastAndroid.show("Terjadi kesalahan", ToastAndroid.SHORT); Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
} finally {
setLoading(false)
} }
} }
@@ -97,7 +102,7 @@ export default function TaskDivisionEdit() {
headerRight: () => ( headerRight: () => (
<ButtonSaveHeader <ButtonSaveHeader
category="update" category="update"
disable={disable} disable={disable || loading}
onPress={() => { handleUpdate() }} onPress={() => { handleUpdate() }}
/> />
), ),

View File

@@ -10,7 +10,7 @@ import { apiGetTaskOne } from "@/lib/api";
import { useAuthSession } from "@/providers/AuthProvider"; import { useAuthSession } from "@/providers/AuthProvider";
import { router, Stack, useLocalSearchParams } from "expo-router"; import { router, Stack, useLocalSearchParams } from "expo-router";
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
import { SafeAreaView, ScrollView, View } from "react-native"; import { RefreshControl, SafeAreaView, ScrollView, View } from "react-native";
import { useSelector } from "react-redux"; import { useSelector } from "react-redux";
type Props = { type Props = {
@@ -29,6 +29,7 @@ export default function DetailTaskDivision() {
const [loading, setLoading] = useState(true) const [loading, setLoading] = useState(true)
const [progress, setProgress] = useState(0) const [progress, setProgress] = useState(0)
const update = useSelector((state: any) => state.taskUpdate) const update = useSelector((state: any) => state.taskUpdate)
const [refreshing, setRefreshing] = useState(false)
async function handleLoad(cat: 'data' | 'progress') { async function handleLoad(cat: 'data' | 'progress') {
@@ -56,6 +57,14 @@ export default function DetailTaskDivision() {
handleLoad('progress') handleLoad('progress')
}, [update.progress]) }, [update.progress])
const handleRefresh = async () => {
setRefreshing(true)
await handleLoad('data')
await handleLoad('progress')
await new Promise(resolve => setTimeout(resolve, 2000));
setRefreshing(false)
};
return ( return (
<SafeAreaView> <SafeAreaView>
<Stack.Screen <Stack.Screen
@@ -66,15 +75,22 @@ export default function DetailTaskDivision() {
headerRight: () => <HeaderRightTaskDetail id={detail} division={id} status={data?.status} />, headerRight: () => <HeaderRightTaskDetail id={detail} division={id} status={data?.status} />,
}} }}
/> />
<ScrollView> <ScrollView
refreshControl={
<RefreshControl
refreshing={refreshing}
onRefresh={handleRefresh}
/>
}
>
<View style={[Styles.p15, Styles.mb100]}> <View style={[Styles.p15, Styles.mb100]}>
{ {
data?.reason != null && data?.reason != "" && <SectionCancel text={data?.reason} /> data?.reason != null && data?.reason != "" && <SectionCancel text={data?.reason} />
} }
<SectionProgress text={`Kemajuan Kegiatan ${progress}%`} progress={progress} /> <SectionProgress text={`Kemajuan Kegiatan ${progress}%`} progress={progress} />
<SectionTanggalTugasTask /> <SectionTanggalTugasTask refreshing={refreshing}/>
<SectionFileTask /> <SectionFileTask refreshing={refreshing}/>
<SectionMemberTask /> <SectionMemberTask refreshing={refreshing}/>
</View> </View>
</ScrollView> </ScrollView>
</SafeAreaView> </SafeAreaView>

View File

@@ -8,6 +8,7 @@ import { InputForm } from "@/components/inputForm";
import MenuItemRow from "@/components/menuItemRow"; import MenuItemRow from "@/components/menuItemRow";
import ModalSelect from "@/components/modalSelect"; import ModalSelect from "@/components/modalSelect";
import SectionListAddTask from "@/components/project/sectionListAddTask"; import SectionListAddTask from "@/components/project/sectionListAddTask";
import Text from "@/components/Text";
import Styles from "@/constants/Styles"; import Styles from "@/constants/Styles";
import { apiCreateTask } from "@/lib/api"; import { apiCreateTask } from "@/lib/api";
import { setMemberChoose } from "@/lib/memberChoose"; import { setMemberChoose } from "@/lib/memberChoose";
@@ -18,7 +19,8 @@ import { Ionicons, MaterialCommunityIcons } from "@expo/vector-icons";
import * as DocumentPicker from "expo-document-picker"; import * as DocumentPicker from "expo-document-picker";
import { router, Stack, useLocalSearchParams } from "expo-router"; import { router, Stack, useLocalSearchParams } from "expo-router";
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
import { SafeAreaView, ScrollView, Text, ToastAndroid, View } from "react-native"; import { SafeAreaView, ScrollView, View } from "react-native";
import Toast from "react-native-toast-message";
import { useDispatch, useSelector } from "react-redux"; import { useDispatch, useSelector } from "react-redux";
@@ -36,6 +38,7 @@ export default function CreateTaskDivision() {
const [title, setTitle] = useState('') const [title, setTitle] = useState('')
const [error, setError] = useState(false); const [error, setError] = useState(false);
const [isModal, setModal] = useState(false) const [isModal, setModal] = useState(false)
const [loading, setLoading] = useState(false)
let hitung = 0; let hitung = 0;
useEffect(() => { useEffect(() => {
@@ -50,11 +53,13 @@ export default function CreateTaskDivision() {
const pickDocumentAsync = async () => { const pickDocumentAsync = async () => {
let result = await DocumentPicker.getDocumentAsync({ let result = await DocumentPicker.getDocumentAsync({
type: ["*/*"], type: ["*/*"],
multiple: false multiple: true
}); });
if (!result.canceled) { if (!result.canceled) {
if (result.assets[0].uri) { for (let i = 0; i < result.assets?.length; i++) {
setFileForm([...fileForm, result.assets[0]]) if (result.assets[i].uri) {
setFileForm((prev) => [...prev, result.assets[i]])
}
} }
} }
}; };
@@ -73,6 +78,7 @@ export default function CreateTaskDivision() {
async function handleCreate() { async function handleCreate() {
try { try {
setLoading(true)
const hasil = await decryptToken(String(token?.current)) const hasil = await decryptToken(String(token?.current))
const fd = new FormData() const fd = new FormData()
@@ -91,13 +97,16 @@ export default function CreateTaskDivision() {
const response = await apiCreateTask(fd) const response = await apiCreateTask(fd)
if (response.success) { if (response.success) {
dispatch(setUpdateTask({ ...update, data: !update.data })) dispatch(setUpdateTask({ ...update, data: !update.data }))
ToastAndroid.show('Berhasil menambahkan data', ToastAndroid.SHORT) Toast.show({ type: 'small', text1: 'Berhasil menambahkan data', })
handleBack() handleBack()
} else { } else {
ToastAndroid.show(response.message, ToastAndroid.SHORT) Toast.show({ type: 'small', text1: response.message, })
} }
} catch (error) { } catch (error) {
console.error(error) console.error(error)
Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
} finally {
setLoading(false)
} }
} }
@@ -117,7 +126,7 @@ export default function CreateTaskDivision() {
headerTitleAlign: "center", headerTitleAlign: "center",
headerRight: () => ( headerRight: () => (
<ButtonSaveHeader <ButtonSaveHeader
disable={title == "" || entitiesMember.length == 0 || taskCreate.length == 0} disable={title == "" || entitiesMember.length == 0 || taskCreate.length == 0 || loading}
category="create" category="create"
onPress={() => { handleCreate() }} onPress={() => { handleCreate() }}
/> />

View File

@@ -3,6 +3,7 @@ import ButtonSaveHeader from "@/components/buttonSaveHeader";
import ImageUser from "@/components/imageNew"; import ImageUser from "@/components/imageNew";
import ImageWithLabel from "@/components/imageWithLabel"; import ImageWithLabel from "@/components/imageWithLabel";
import InputSearch from "@/components/inputSearch"; import InputSearch from "@/components/inputSearch";
import Text from "@/components/Text";
import Styles from "@/constants/Styles"; import Styles from "@/constants/Styles";
import { apiGetDivisionMember } from "@/lib/api"; import { apiGetDivisionMember } from "@/lib/api";
import { setMemberChoose } from "@/lib/memberChoose"; import { setMemberChoose } from "@/lib/memberChoose";
@@ -10,7 +11,8 @@ import { useAuthSession } from "@/providers/AuthProvider";
import { AntDesign } from "@expo/vector-icons"; import { AntDesign } from "@expo/vector-icons";
import { router, Stack, useLocalSearchParams } from "expo-router"; import { router, Stack, useLocalSearchParams } from "expo-router";
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
import { Pressable, SafeAreaView, ScrollView, Text, ToastAndroid, View } from "react-native"; import { Pressable, SafeAreaView, ScrollView, View } from "react-native";
import Toast from "react-native-toast-message";
import { useDispatch, useSelector } from "react-redux"; import { useDispatch, useSelector } from "react-redux";
type Props = { type Props = {
@@ -23,7 +25,6 @@ export default function AddMemberCreateTask() {
const dispatch = useDispatch() const dispatch = useDispatch()
const { token, decryptToken } = useAuthSession() const { token, decryptToken } = useAuthSession()
const { id } = useLocalSearchParams<{ id: string, detail: string }>() const { id } = useLocalSearchParams<{ id: string, detail: string }>()
const [dataOld, setDataOld] = useState<Props[]>([])
const [data, setData] = useState<Props[]>([]) const [data, setData] = useState<Props[]>([])
const [selectMember, setSelectMember] = useState<any[]>([]) const [selectMember, setSelectMember] = useState<any[]>([])
const [search, setSearch] = useState('') const [search, setSearch] = useState('')
@@ -56,7 +57,7 @@ export default function AddMemberCreateTask() {
router.back() router.back()
} catch (error) { } catch (error) {
console.error(error) console.error(error)
ToastAndroid.show('Gagal menambahkan anggota', ToastAndroid.SHORT) Toast.show({ type: 'small', text1: 'Gagal menambahkan anggota', })
} }
} }
@@ -123,7 +124,7 @@ export default function AddMemberCreateTask() {
</View> </View>
</View> </View>
{ {
selectMember.some((i: any) => i.idUser == item.idUser) && <AntDesign name="check" size={20} /> selectMember.some((i: any) => i.idUser == item.idUser) && <AntDesign name="check" size={20} color={'black'}/>
} }
</Pressable> </Pressable>
) )

View File

@@ -1,23 +1,29 @@
import ButtonBackHeader from "@/components/buttonBackHeader"; import ButtonBackHeader from "@/components/buttonBackHeader";
import ButtonSaveHeader from "@/components/buttonSaveHeader"; import ButtonSaveHeader from "@/components/buttonSaveHeader";
import { InputForm } from "@/components/inputForm"; import { InputForm } from "@/components/inputForm";
import Text from "@/components/Text";
import Styles from "@/constants/Styles"; import Styles from "@/constants/Styles";
import { setTaskCreate } from "@/lib/taskCreate"; import { setTaskCreate } from "@/lib/taskCreate";
import dayjs from "dayjs"; import dayjs from "dayjs";
import { router, Stack } from "expo-router"; import { router, Stack } from "expo-router";
import 'intl';
import 'intl/locale-data/jsonp/id';
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
import { import {
KeyboardAvoidingView,
Platform,
SafeAreaView, SafeAreaView,
ScrollView, ScrollView,
Text,
View View
} from "react-native"; } from "react-native";
import DateTimePicker, { import DateTimePicker, {
DateType DateType
} from "react-native-ui-datepicker"; } from "react-native-ui-datepicker";
import { useDispatch, useSelector } from "react-redux"; import { useDispatch, useSelector } from "react-redux";
import { useHeaderHeight } from '@react-navigation/elements';
export default function CreateTaskAddTugas() { export default function CreateTaskAddTugas() {
const headerHeight = useHeaderHeight();
const dispatch = useDispatch() const dispatch = useDispatch()
const [disable, setDisable] = useState(true); const [disable, setDisable] = useState(true);
const [range, setRange] = useState<{ const [range, setRange] = useState<{
@@ -97,59 +103,71 @@ export default function CreateTaskAddTugas() {
), ),
}} }}
/> />
<ScrollView> <KeyboardAvoidingView
<View style={[Styles.p15, Styles.mb100]}> behavior={Platform.OS === 'ios' ? 'padding' : undefined}
<View style={[Styles.wrapPaper, Styles.p10]}> keyboardVerticalOffset={headerHeight}
<DateTimePicker >
mode="range" <ScrollView>
startDate={range.startDate} <View style={[Styles.p15, Styles.mb100]}>
endDate={range.endDate} <View style={[Styles.wrapPaper, Styles.p10]}>
onChange={(param) => setRange(param)} <DateTimePicker
styles={{ mode="range"
selected: Styles.selectedDate, startDate={range.startDate}
selected_label: Styles.cWhite, endDate={range.endDate}
range_fill: Styles.selectRangeDate, onChange={(param) => setRange(param)}
styles={{
selected: Styles.selectedDate,
selected_label: Styles.cWhite,
range_fill: Styles.selectRangeDate,
month_label: Styles.cBlack,
month_selector_label: Styles.cBlack,
year_label: Styles.cBlack,
year_selector_label: Styles.cBlack,
day_label: Styles.cBlack,
time_label: Styles.cBlack,
weekday_label: Styles.cBlack,
}}
/>
</View>
<View style={[Styles.mv10]}>
<View style={[Styles.rowSpaceBetween]}>
<View style={[{ width: "48%" }]}>
<Text style={[Styles.mb05]}>
Tanggal Mulai <Text style={Styles.cError}>*</Text>
</Text>
<View style={[Styles.wrapPaper, Styles.p10]}>
<Text style={{ textAlign: "center" }}>{from}</Text>
</View>
</View>
<View style={[{ width: "48%" }]}>
<Text style={[Styles.mb05]}>
Tanggal Berakhir <Text style={Styles.cError}>*</Text>
</Text>
<View style={[Styles.wrapPaper, Styles.p10]}>
<Text style={{ textAlign: "center" }}>{to}</Text>
</View>
</View>
</View>
{
(error.endDate || error.startDate) && <Text style={[Styles.textInformation, Styles.cError, Styles.mt05]}>Tanggal tidak boleh kosong</Text>
}
</View>
<InputForm
label="Judul Tugas"
type="default"
placeholder="Judul Tugas"
required
bg="white"
value={title}
error={error.title}
errorText="Judul tidak boleh kosong"
onChange={(e) => {
onValidation("title", e)
}} }}
/> />
</View> </View>
<View style={[Styles.mv10]}> </ScrollView>
<View style={[Styles.rowSpaceBetween]}> </KeyboardAvoidingView>
<View style={[{ width: "48%" }]}>
<Text style={[Styles.mb05]}>
Tanggal Mulai <Text style={Styles.cError}>*</Text>
</Text>
<View style={[Styles.wrapPaper, Styles.p10]}>
<Text style={{ textAlign: "center" }}>{from}</Text>
</View>
</View>
<View style={[{ width: "48%" }]}>
<Text style={[Styles.mb05]}>
Tanggal Berakhir <Text style={Styles.cError}>*</Text>
</Text>
<View style={[Styles.wrapPaper, Styles.p10]}>
<Text style={{ textAlign: "center" }}>{to}</Text>
</View>
</View>
</View>
{
(error.endDate || error.startDate) && <Text style={[Styles.textInformation, Styles.cError, Styles.mt05]}>Tanggal tidak boleh kosong</Text>
}
</View>
<InputForm
label="Judul Tugas"
type="default"
placeholder="Judul Tugas"
required
bg="white"
value={title}
error={error.title}
errorText="Judul tidak boleh kosong"
onChange={(e) => {
onValidation("title", e)
}}
/>
</View>
</ScrollView>
</SafeAreaView> </SafeAreaView>
); );
} }

View File

@@ -6,6 +6,7 @@ import PaperGridContent from "@/components/paperGridContent";
import ProgressBar from "@/components/progressBar"; import ProgressBar from "@/components/progressBar";
import Skeleton from "@/components/skeleton"; import Skeleton from "@/components/skeleton";
import SkeletonTwoItem from "@/components/skeletonTwoItem"; import SkeletonTwoItem from "@/components/skeletonTwoItem";
import Text from "@/components/Text";
import { ColorsStatus } from "@/constants/ColorsStatus"; import { ColorsStatus } from "@/constants/ColorsStatus";
import Styles from "@/constants/Styles"; import Styles from "@/constants/Styles";
import { apiGetTask } from "@/lib/api"; import { apiGetTask } from "@/lib/api";
@@ -17,7 +18,7 @@ import {
} from "@expo/vector-icons"; } from "@expo/vector-icons";
import { router, useLocalSearchParams } from "expo-router"; import { router, useLocalSearchParams } from "expo-router";
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
import { Pressable, RefreshControl, ScrollView, Text, View, VirtualizedList } from "react-native"; import { Pressable, RefreshControl, ScrollView, View, VirtualizedList } from "react-native";
import { useSelector } from "react-redux"; import { useSelector } from "react-redux";
type Props = { type Props = {
@@ -192,7 +193,7 @@ export default function ListTask() {
: :
data.length > 0 ? ( data.length > 0 ? (
isList ? ( isList ? (
<View> <View style={[Styles.h100]}>
<VirtualizedList <VirtualizedList
data={data} data={data}
getItemCount={() => data.length} getItemCount={() => data.length}
@@ -240,7 +241,7 @@ export default function ListTask() {
))} */} ))} */}
</View> </View>
) : ( ) : (
<View> <View style={[Styles.h100]}>
<VirtualizedList <VirtualizedList
data={data} data={data}
getItemCount={() => data.length} getItemCount={() => data.length}
@@ -257,7 +258,7 @@ export default function ListTask() {
> >
<ProgressBar category="list" value={item.progress} /> <ProgressBar category="list" value={item.progress} />
<View style={[Styles.rowSpaceBetween]}> <View style={[Styles.rowSpaceBetween]}>
<Text></Text> <Text> </Text>
<LabelStatus <LabelStatus
size="default" size="default"
category={ category={

View File

@@ -1,24 +1,30 @@
import ButtonBackHeader from "@/components/buttonBackHeader"; import ButtonBackHeader from "@/components/buttonBackHeader";
import ButtonSaveHeader from "@/components/buttonSaveHeader"; import ButtonSaveHeader from "@/components/buttonSaveHeader";
import { InputForm } from "@/components/inputForm"; import { InputForm } from "@/components/inputForm";
import Text from "@/components/Text";
import Styles from "@/constants/Styles"; import Styles from "@/constants/Styles";
import { apiEditTaskTugas, apiGetTaskTugas } from "@/lib/api"; import { apiEditTaskTugas, apiGetTaskTugas } from "@/lib/api";
import { setUpdateTask } from "@/lib/taskUpdate"; import { setUpdateTask } from "@/lib/taskUpdate";
import { useAuthSession } from "@/providers/AuthProvider"; import { useAuthSession } from "@/providers/AuthProvider";
import { useHeaderHeight } from '@react-navigation/elements';
import dayjs from "dayjs"; import dayjs from "dayjs";
import { router, Stack, useLocalSearchParams } from "expo-router"; import { router, Stack, useLocalSearchParams } from "expo-router";
import 'intl';
import 'intl/locale-data/jsonp/id';
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
import { import {
KeyboardAvoidingView,
Platform,
SafeAreaView, SafeAreaView,
ScrollView, ScrollView,
Text, View
ToastAndroid,
View,
} from "react-native"; } from "react-native";
import Toast from "react-native-toast-message";
import DateTimePicker, { DateType } from "react-native-ui-datepicker"; import DateTimePicker, { DateType } from "react-native-ui-datepicker";
import { useDispatch, useSelector } from "react-redux"; import { useDispatch, useSelector } from "react-redux";
export default function UpdateProjectTaskDivision() { export default function UpdateProjectTaskDivision() {
const headerHeight = useHeaderHeight();
const { detail } = useLocalSearchParams<{ detail: string }>(); const { detail } = useLocalSearchParams<{ detail: string }>();
const dispatch = useDispatch(); const dispatch = useDispatch();
const update = useSelector((state: any) => state.taskUpdate); const update = useSelector((state: any) => state.taskUpdate);
@@ -27,6 +33,7 @@ export default function UpdateProjectTaskDivision() {
startDate: DateType; startDate: DateType;
endDate: DateType; endDate: DateType;
}>({ startDate: undefined, endDate: undefined }); }>({ startDate: undefined, endDate: undefined });
const [loadingSubmit, setLoadingSubmit] = useState(false)
const [month, setMonth] = useState<any>(); const [month, setMonth] = useState<any>();
const [year, setYear] = useState<any>(); const [year, setYear] = useState<any>();
const [loading, setLoading] = useState(true); const [loading, setLoading] = useState(true);
@@ -39,9 +46,9 @@ export default function UpdateProjectTaskDivision() {
}); });
const from = range.startDate const from = range.startDate
? dayjs(range.startDate).format("MMM DD, YYYY") ? dayjs(range.startDate).format("DD-MM-YYYY")
: ""; : "";
const to = range.endDate ? dayjs(range.endDate).format("MMM DD, YYYY") : ""; const to = range.endDate ? dayjs(range.endDate).format("DD-MM-YYYY") : "";
async function handleLoad() { async function handleLoad() {
try { try {
@@ -71,18 +78,21 @@ export default function UpdateProjectTaskDivision() {
async function handleEdit() { async function handleEdit() {
try { try {
setLoadingSubmit(true)
const hasil = await decryptToken(String(token?.current)); const hasil = await decryptToken(String(token?.current));
const response = await apiEditTaskTugas({ data: { title, dateStart: dayjs(range.startDate).format("YYYY-MM-DD"), dateEnd: dayjs(range.endDate).format("YYYY-MM-DD"), user: hasil }, id: detail }); const response = await apiEditTaskTugas({ data: { title, dateStart: dayjs(range.startDate).format("YYYY-MM-DD"), dateEnd: dayjs(range.endDate).format("YYYY-MM-DD"), user: hasil }, id: detail });
if (response.success) { if (response.success) {
dispatch(setUpdateTask({ ...update, task: !update.task })) dispatch(setUpdateTask({ ...update, task: !update.task }))
ToastAndroid.show("Berhasil mengubah data", ToastAndroid.SHORT); Toast.show({ type: 'small', text1: 'Berhasil mengubah data', })
router.back(); router.back();
} else { } else {
ToastAndroid.show(response.message, ToastAndroid.SHORT); Toast.show({ type: 'small', text1: response.message, })
} }
} catch (error) { } catch (error) {
console.error(error); console.error(error);
ToastAndroid.show("Gagal mengubah data", ToastAndroid.SHORT); Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
} finally {
setLoadingSubmit(false)
} }
} }
@@ -132,7 +142,7 @@ export default function UpdateProjectTaskDivision() {
headerTitleAlign: "center", headerTitleAlign: "center",
headerRight: () => ( headerRight: () => (
<ButtonSaveHeader <ButtonSaveHeader
disable={disableBtn} disable={disableBtn || loadingSubmit}
category="update" category="update"
onPress={() => { onPress={() => {
handleEdit() handleEdit()
@@ -141,67 +151,78 @@ export default function UpdateProjectTaskDivision() {
), ),
}} }}
/> />
<ScrollView> <KeyboardAvoidingView
<View style={[Styles.p15, Styles.mb100]}> behavior={Platform.OS === 'ios' ? 'padding' : undefined}
<View style={[Styles.wrapPaper, Styles.p10]}> keyboardVerticalOffset={headerHeight}
{!loading && ( >
<DateTimePicker <ScrollView>
mode="range" <View style={[Styles.p15, Styles.mb100]}>
startDate={range.startDate} <View style={[Styles.wrapPaper, Styles.p10]}>
endDate={range.endDate} {!loading && (
onChange={(param) => setRange(param)} <DateTimePicker
month={month} mode="range"
year={year} startDate={range.startDate}
styles={{ endDate={range.endDate}
selected: Styles.selectedDate, onChange={(param) => setRange(param)}
selected_label: Styles.cWhite, month={month}
range_fill: Styles.selectRangeDate, year={year}
}} styles={{
/> selected: Styles.selectedDate,
)} selected_label: Styles.cWhite,
</View> range_fill: Styles.selectRangeDate,
<View style={[Styles.mv10]}> month_label: Styles.cBlack,
<View style={[Styles.rowSpaceBetween]}> month_selector_label: Styles.cBlack,
<View style={[{ width: "48%" }]}> year_label: Styles.cBlack,
<Text style={[Styles.mb05]}> year_selector_label: Styles.cBlack,
Tanggal Mulai <Text style={Styles.cError}>*</Text> day_label: Styles.cBlack,
</Text> time_label: Styles.cBlack,
<View style={[Styles.wrapPaper, Styles.p10]}> weekday_label: Styles.cBlack,
<Text style={{ textAlign: "center" }}>{from}</Text> }}
</View> />
</View> )}
<View style={[{ width: "48%" }]}>
<Text style={[Styles.mb05]}>
Tanggal Berakhir <Text style={Styles.cError}>*</Text>
</Text>
<View style={[Styles.wrapPaper, Styles.p10]}>
<Text style={{ textAlign: "center" }}>{to}</Text>
</View>
</View>
</View> </View>
{(error.endDate || error.startDate) && ( <View style={[Styles.mv10]}>
<Text <View style={[Styles.rowSpaceBetween]}>
style={[Styles.textInformation, Styles.cError, Styles.mt05]} <View style={[{ width: "48%" }]}>
> <Text style={[Styles.mb05]}>
Tanggal tidak boleh kosong Tanggal Mulai <Text style={Styles.cError}>*</Text>
</Text> </Text>
)} <View style={[Styles.wrapPaper, Styles.p10]}>
<Text style={{ textAlign: "center" }}>{from}</Text>
</View>
</View>
<View style={[{ width: "48%" }]}>
<Text style={[Styles.mb05]}>
Tanggal Berakhir <Text style={Styles.cError}>*</Text>
</Text>
<View style={[Styles.wrapPaper, Styles.p10]}>
<Text style={{ textAlign: "center" }}>{to}</Text>
</View>
</View>
</View>
{(error.endDate || error.startDate) && (
<Text style={[Styles.textInformation, Styles.cError, Styles.mt05]} >
Tanggal tidak boleh kosong
</Text>
)}
</View>
<InputForm
label="Judul Tugas"
type="default"
placeholder="Judul Tugas"
required
bg="white"
value={title}
error={error.title}
errorText="Judul tidak boleh kosong"
onChange={(e) => {
onValidation("title", e)
}}
/>
</View> </View>
<InputForm </ScrollView>
label="Judul Tugas" </KeyboardAvoidingView>
type="default"
placeholder="Judul Tugas"
required
bg="white"
value={title}
error={error.title}
errorText="Judul tidak boleh kosong"
onChange={(e) => {
onValidation("title", e)
}}
/>
</View>
</ScrollView>
</SafeAreaView> </SafeAreaView>
); );
} }

View File

@@ -3,6 +3,7 @@ import ButtonSaveHeader from "@/components/buttonSaveHeader";
import ImageUser from "@/components/imageNew"; import ImageUser from "@/components/imageNew";
import ImageWithLabel from "@/components/imageWithLabel"; import ImageWithLabel from "@/components/imageWithLabel";
import InputSearch from "@/components/inputSearch"; import InputSearch from "@/components/inputSearch";
import Text from "@/components/Text";
import Styles from "@/constants/Styles"; import Styles from "@/constants/Styles";
import { apiAddMemberDivision, apiGetDivisionOneDetail, apiGetUser } from "@/lib/api"; import { apiAddMemberDivision, apiGetDivisionOneDetail, apiGetUser } from "@/lib/api";
import { setUpdateDivision } from "@/lib/divisionUpdate"; import { setUpdateDivision } from "@/lib/divisionUpdate";
@@ -10,7 +11,8 @@ import { useAuthSession } from "@/providers/AuthProvider";
import { AntDesign } from "@expo/vector-icons"; import { AntDesign } from "@expo/vector-icons";
import { router, Stack, useLocalSearchParams } from "expo-router"; import { router, Stack, useLocalSearchParams } from "expo-router";
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
import { Pressable, SafeAreaView, ScrollView, Text, ToastAndroid, View } from "react-native"; import { Pressable, SafeAreaView, ScrollView, View } from "react-native";
import Toast from "react-native-toast-message";
import { useDispatch, useSelector } from "react-redux"; import { useDispatch, useSelector } from "react-redux";
type Props = { type Props = {
@@ -29,9 +31,11 @@ export default function AddMemberDivision() {
const [search, setSearch] = useState('') const [search, setSearch] = useState('')
const update = useSelector((state: any) => state.divisionUpdate) const update = useSelector((state: any) => state.divisionUpdate)
const dispatch = useDispatch() const dispatch = useDispatch()
const [loading, setLoading] = useState(false)
async function handleLoad() { async function handleLoad() {
try { try {
setLoading(true)
const hasil = await decryptToken(String(token?.current)) const hasil = await decryptToken(String(token?.current))
const response = await apiGetDivisionOneDetail({ user: hasil, id }) const response = await apiGetDivisionOneDetail({ user: hasil, id })
setDataOld(response.data.member) setDataOld(response.data.member)
@@ -70,18 +74,21 @@ export default function AddMemberDivision() {
async function handleAddMember() { async function handleAddMember() {
try { try {
setLoading(true)
const hasil = await decryptToken(String(token?.current)) const hasil = await decryptToken(String(token?.current))
const response = await apiAddMemberDivision({ id: id, data: { user: hasil, member: selectMember } }) const response = await apiAddMemberDivision({ id: id, data: { user: hasil, member: selectMember } })
if (response.success) { if (response.success) {
dispatch(setUpdateDivision(!update)) dispatch(setUpdateDivision(!update))
ToastAndroid.show('Berhasil menambahkan anggota', ToastAndroid.SHORT) Toast.show({ type: 'small', text1: 'Berhasil menambahkan anggota', })
router.replace(`/division/${id}/info`) router.replace(`/division/${id}/info`)
} else { } else {
ToastAndroid.show(response.message, ToastAndroid.SHORT) Toast.show({ type: 'small', text1: response.message, })
} }
} catch (error) { } catch (error) {
console.error(error) console.error(error)
ToastAndroid.show('Gagal menambahkan anggota', ToastAndroid.SHORT) Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
} finally {
setLoading(false)
} }
} }
@@ -96,7 +103,7 @@ export default function AddMemberDivision() {
headerRight: () => ( headerRight: () => (
<ButtonSaveHeader <ButtonSaveHeader
category="update" category="update"
disable={selectMember.length > 0 ? false : true} disable={selectMember.length == 0 || loading ? true : false}
onPress={() => { onPress={() => {
handleAddMember() handleAddMember()
}} }}
@@ -117,7 +124,7 @@ export default function AddMemberDivision() {
<ImageWithLabel <ImageWithLabel
key={index} key={index}
label={item.name} label={item.name}
src={item.img} src={`https://wibu-storage.wibudev.com/api/files/${item.img}`}
onClick={() => onChoose(item.idUser, item.name, item.img)} onClick={() => onChoose(item.idUser, item.name, item.img)}
/> />
)) ))
@@ -152,7 +159,7 @@ export default function AddMemberDivision() {
</View> </View>
</View> </View>
{ {
selectMember.some((i: any) => i.idUser == item.id) && <AntDesign name="check" size={20} /> selectMember.some((i: any) => i.idUser == item.id) && <AntDesign name="check" size={20} color={'black'}/>
} }
</Pressable> </Pressable>
) )

View File

@@ -7,7 +7,8 @@ import { setUpdateDivision } from "@/lib/divisionUpdate";
import { useAuthSession } from "@/providers/AuthProvider"; import { useAuthSession } from "@/providers/AuthProvider";
import { router, Stack, useLocalSearchParams } from "expo-router"; import { router, Stack, useLocalSearchParams } from "expo-router";
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
import { SafeAreaView, ScrollView, ToastAndroid, View } from "react-native"; import { SafeAreaView, ScrollView, View } from "react-native";
import Toast from "react-native-toast-message";
import { useDispatch, useSelector } from "react-redux"; import { useDispatch, useSelector } from "react-redux";
export default function EditDivision() { export default function EditDivision() {
@@ -15,6 +16,7 @@ export default function EditDivision() {
const update = useSelector((state: any) => state.divisionUpdate) const update = useSelector((state: any) => state.divisionUpdate)
const { token, decryptToken } = useAuthSession(); const { token, decryptToken } = useAuthSession();
const { id } = useLocalSearchParams<{ id: string }>(); const { id } = useLocalSearchParams<{ id: string }>();
const [loading, setLoading] = useState(false)
const [data, setData] = useState({ const [data, setData] = useState({
name: "", name: "",
desc: "", desc: "",
@@ -42,18 +44,21 @@ export default function EditDivision() {
async function handleEdit() { async function handleEdit() {
try { try {
setLoading(true)
const hasil = await decryptToken(String(token?.current)) const hasil = await decryptToken(String(token?.current))
const response = await apiEditDivision({ user: hasil, name: data.name, desc: data.desc }, id) const response = await apiEditDivision({ user: hasil, name: data.name, desc: data.desc }, id)
if (response.success) { if (response.success) {
dispatch(setUpdateDivision(!update)) dispatch(setUpdateDivision(!update))
ToastAndroid.show('Berhasil mengubah data', ToastAndroid.SHORT) Toast.show({ type: 'small', text1: 'Berhasil mengubah data', })
router.back() router.back()
} else { } else {
ToastAndroid.show(response.message, ToastAndroid.SHORT) Toast.show({ type: 'small', text1: response.message, })
} }
} catch (error) { } catch (error) {
console.error(error) console.error(error)
ToastAndroid.show('Terjadi kesalahan', ToastAndroid.SHORT) Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
} finally {
setLoading(false)
} }
} }
@@ -72,7 +77,7 @@ export default function EditDivision() {
headerTitleAlign: "center", headerTitleAlign: "center",
headerRight: () => ( headerRight: () => (
<ButtonSaveHeader <ButtonSaveHeader
disable={error.name} disable={error.name || loading ? true : false}
category="update" category="update"
onPress={() => { handleEdit() }} onPress={() => { handleEdit() }}
/> />

View File

@@ -14,7 +14,8 @@ import { useAuthSession } from "@/providers/AuthProvider"
import { Feather, MaterialCommunityIcons, MaterialIcons } from "@expo/vector-icons" import { Feather, MaterialCommunityIcons, MaterialIcons } from "@expo/vector-icons"
import { router, Stack, useLocalSearchParams } from "expo-router" import { router, Stack, useLocalSearchParams } from "expo-router"
import { useEffect, useState } from "react" import { useEffect, useState } from "react"
import { Pressable, SafeAreaView, ScrollView, Text, ToastAndroid, View } from "react-native" import { Pressable, SafeAreaView, ScrollView, Text, View } from "react-native"
import Toast from "react-native-toast-message"
import { useSelector } from "react-redux" import { useSelector } from "react-redux"
type PropsDetail = { type PropsDetail = {
@@ -66,13 +67,13 @@ export default function InformationDivision() {
const response = await apiDeleteMemberDivision({ user: hasil, id: dataMemberChoose.id }, id) const response = await apiDeleteMemberDivision({ user: hasil, id: dataMemberChoose.id }, id)
if (response.success) { if (response.success) {
setRefresh(!refresh) setRefresh(!refresh)
ToastAndroid.show('Berhasil mengeluarkan anggota', ToastAndroid.SHORT) Toast.show({ type: 'small', text1: 'Berhasil mengeluarkan anggota', })
} else { } else {
ToastAndroid.show(response.message, ToastAndroid.SHORT) Toast.show({ type: 'small', text1: response.message, })
} }
} catch (error) { } catch (error) {
console.error(error) console.error(error)
ToastAndroid.show('Terjadi kesalahan', ToastAndroid.SHORT) Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
} finally { } finally {
setModal(false) setModal(false)
} }
@@ -84,13 +85,13 @@ export default function InformationDivision() {
const response = await apiUpdateStatusAdminDivision({ user: hasil, id: dataMemberChoose.id, isAdmin: dataMemberChoose.isAdmin }, id) const response = await apiUpdateStatusAdminDivision({ user: hasil, id: dataMemberChoose.id, isAdmin: dataMemberChoose.isAdmin }, id)
if (response.success) { if (response.success) {
setRefresh(!refresh) setRefresh(!refresh)
ToastAndroid.show(dataMemberChoose.isAdmin ? 'Berhasil memberhentikan admin' : 'Berhasil menjadi admin', ToastAndroid.SHORT) Toast.show({ type: 'small', text1: dataMemberChoose.isAdmin ? 'Berhasil memberhentikan admin' : 'Berhasil menjadi admin', })
} else { } else {
ToastAndroid.show(response.message, ToastAndroid.SHORT) Toast.show({ type: 'small', text1: response.message, })
} }
} catch (error) { } catch (error) {
console.error(error) console.error(error)
ToastAndroid.show('Terjadi kesalahan', ToastAndroid.SHORT) Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
} finally { } finally {
setModal(false) setModal(false)
} }
@@ -133,11 +134,11 @@ export default function InformationDivision() {
headerRight: () => <HeaderRightDivisionInfo id={id} active={dataDetail?.isActive} />, headerRight: () => <HeaderRightDivisionInfo id={id} active={dataDetail?.isActive} />,
}} }}
/> />
<ScrollView> <ScrollView style={[Styles.h100]}>
<View style={[Styles.p15, Styles.mb100]}> <View style={[Styles.p15]}>
{ {
dataDetail?.isActive == false && ( dataDetail?.isActive == false && (
<SectionCancel title={'Divisi dinonaktifkan'} /> <SectionCancel title={'Divisi nonaktif'} />
) )
} }
<View style={[Styles.mb15]}> <View style={[Styles.mb15]}>

View File

@@ -10,7 +10,8 @@ import { useAuthSession } from "@/providers/AuthProvider"
import dayjs from "dayjs" import dayjs from "dayjs"
import { router, Stack, useLocalSearchParams } from "expo-router" import { router, Stack, useLocalSearchParams } from "expo-router"
import { useEffect, useState } from "react" import { useEffect, useState } from "react"
import { SafeAreaView, ScrollView, ToastAndroid, View } from "react-native" import { SafeAreaView, ScrollView, View } from "react-native"
import Toast from "react-native-toast-message"
export default function ReportDivision() { export default function ReportDivision() {
const { id } = useLocalSearchParams<{ id: string }>() const { id } = useLocalSearchParams<{ id: string }>()
@@ -31,7 +32,7 @@ export default function ReportDivision() {
dateEnd: false, dateEnd: false,
}); });
function validationForm( cat: "date" | "dateEnd", val: string) { function validationForm(cat: "date" | "dateEnd", val: string) {
if (cat == "date") { if (cat == "date") {
setData({ ...data, date: val, dateEnd: "" }); setData({ ...data, date: val, dateEnd: "" });
if (val == "" || val == "null") { if (val == "" || val == "null") {
@@ -89,7 +90,7 @@ export default function ReportDivision() {
}) })
setShowReport(true); setShowReport(true);
} else { } else {
ToastAndroid.show(response.message, ToastAndroid.SHORT); Toast.show({ type: 'small', text1: response.message, });
} }
} catch (error) { } catch (error) {
console.error(error); console.error(error);

View File

@@ -1,6 +1,7 @@
import ButtonBackHeader from "@/components/buttonBackHeader"; import ButtonBackHeader from "@/components/buttonBackHeader";
import ButtonSaveHeader from "@/components/buttonSaveHeader"; import ButtonSaveHeader from "@/components/buttonSaveHeader";
import ImageUser from "@/components/imageNew"; import ImageUser from "@/components/imageNew";
import Text from "@/components/Text";
import Styles from "@/constants/Styles"; import Styles from "@/constants/Styles";
import { apiCreateDivision } from "@/lib/api"; import { apiCreateDivision } from "@/lib/api";
import { setFormCreateDivision } from "@/lib/divisionCreate"; import { setFormCreateDivision } from "@/lib/divisionCreate";
@@ -9,7 +10,8 @@ import { useAuthSession } from "@/providers/AuthProvider";
import { AntDesign } from "@expo/vector-icons"; import { AntDesign } from "@expo/vector-icons";
import { router, Stack, useLocalSearchParams } from "expo-router"; import { router, Stack, useLocalSearchParams } from "expo-router";
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
import { Pressable, SafeAreaView, ScrollView, Text, ToastAndroid, View } from "react-native"; import { Pressable, SafeAreaView, ScrollView, View } from "react-native";
import Toast from "react-native-toast-message";
import { useDispatch, useSelector } from "react-redux"; import { useDispatch, useSelector } from "react-redux";
type Props = { type Props = {
@@ -27,6 +29,7 @@ export default function CreateDivisionAddAdmin() {
const update = useSelector((state: any) => state.divisionCreate) const update = useSelector((state: any) => state.divisionCreate)
const updateDivision = useSelector((state: any) => state.divisionUpdate) const updateDivision = useSelector((state: any) => state.divisionUpdate)
const dispatch = useDispatch() const dispatch = useDispatch()
const [loading, setLoading] = useState(false)
async function handleLoadMember() { async function handleLoadMember() {
setData(update.member) setData(update.member)
@@ -46,20 +49,23 @@ export default function CreateDivisionAddAdmin() {
async function handleAddMember() { async function handleAddMember() {
try { try {
setLoading(true)
dispatch(setFormCreateDivision({ ...update, admin: selectMember })) dispatch(setFormCreateDivision({ ...update, admin: selectMember }))
const hasil = await decryptToken(String(token?.current)) const hasil = await decryptToken(String(token?.current))
const response = await apiCreateDivision({ ...update, user: hasil }) const response = await apiCreateDivision({ ...update, user: hasil })
if (response.success) { if (response.success) {
ToastAndroid.show('Berhasil membuat divisi', ToastAndroid.SHORT) Toast.show({ type: 'small', text1: 'Berhasil membuat divisi', })
dispatch(setFormCreateDivision({ admin: [], member: [], data: { idGroup: '', name: '', desc: '' } })) dispatch(setFormCreateDivision({ admin: [], member: [], data: { idGroup: '', name: '', desc: '' } }))
dispatch(setUpdateDivision(!updateDivision)) dispatch(setUpdateDivision(!updateDivision))
router.replace(`/division/`) router.replace(`/division/`)
} else { } else {
ToastAndroid.show(response.message, ToastAndroid.SHORT) Toast.show({ type: 'small', text1: response.message, })
} }
} catch (error) { } catch (error) {
console.error(error) console.error(error)
ToastAndroid.show('Gagal membuat divisi', ToastAndroid.SHORT) Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
} finally {
setLoading(false)
} }
} }
@@ -74,7 +80,7 @@ export default function CreateDivisionAddAdmin() {
headerRight: () => ( headerRight: () => (
<ButtonSaveHeader <ButtonSaveHeader
category="create" category="create"
disable={selectMember.length > 0 ? false : true} disable={selectMember.length == 0 || loading ? true : false}
onPress={() => { onPress={() => {
handleAddMember() handleAddMember()
}} }}
@@ -106,7 +112,7 @@ export default function CreateDivisionAddAdmin() {
</View> </View>
</View> </View>
{ {
selectMember.some((i: any) => i == item.idUser) && <AntDesign name="check" size={20} /> selectMember.some((i: any) => i == item.idUser) && <AntDesign name="check" size={20} color={'black'}/>
} }
</Pressable> </Pressable>
) )

View File

@@ -3,15 +3,15 @@ import ButtonNextHeader from "@/components/buttonNextHeader";
import ImageUser from "@/components/imageNew"; import ImageUser from "@/components/imageNew";
import ImageWithLabel from "@/components/imageWithLabel"; import ImageWithLabel from "@/components/imageWithLabel";
import InputSearch from "@/components/inputSearch"; import InputSearch from "@/components/inputSearch";
import Text from "@/components/Text";
import Styles from "@/constants/Styles"; import Styles from "@/constants/Styles";
import { apiGetUser } from "@/lib/api"; import { apiGetUser } from "@/lib/api";
import { setFormCreateDivision } from "@/lib/divisionCreate"; import { setFormCreateDivision } from "@/lib/divisionCreate";
import { setUpdateDivision } from "@/lib/divisionUpdate";
import { useAuthSession } from "@/providers/AuthProvider"; import { useAuthSession } from "@/providers/AuthProvider";
import { AntDesign } from "@expo/vector-icons"; import { AntDesign } from "@expo/vector-icons";
import { router, Stack, useLocalSearchParams } from "expo-router"; import { router, Stack, useLocalSearchParams } from "expo-router";
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
import { Pressable, SafeAreaView, ScrollView, Text, View } from "react-native"; import { Pressable, SafeAreaView, ScrollView, View } from "react-native";
import { useDispatch, useSelector } from "react-redux"; import { useDispatch, useSelector } from "react-redux";
type Props = { type Props = {
@@ -121,7 +121,7 @@ export default function CreateDivisionAddMember() {
</View> </View>
</View> </View>
{ {
selectMember.some((i: any) => i.idUser == item.id) && <AntDesign name="check" size={20} /> selectMember.some((i: any) => i.idUser == item.id) && <AntDesign name="check" size={20} color={'black'}/>
} }
</Pressable> </Pressable>
) )

View File

@@ -4,6 +4,7 @@ import InputSearch from "@/components/inputSearch";
import PaperGridContent from "@/components/paperGridContent"; import PaperGridContent from "@/components/paperGridContent";
import Skeleton from "@/components/skeleton"; import Skeleton from "@/components/skeleton";
import SkeletonTwoItem from "@/components/skeletonTwoItem"; import SkeletonTwoItem from "@/components/skeletonTwoItem";
import Text from "@/components/Text";
import { ColorsStatus } from "@/constants/ColorsStatus"; import { ColorsStatus } from "@/constants/ColorsStatus";
import Styles from "@/constants/Styles"; import Styles from "@/constants/Styles";
import { apiGetDivision } from "@/lib/api"; import { apiGetDivision } from "@/lib/api";
@@ -18,7 +19,6 @@ import {
import { router, useLocalSearchParams } from "expo-router"; import { router, useLocalSearchParams } from "expo-router";
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
import { Pressable, RefreshControl, View, VirtualizedList } from "react-native"; import { Pressable, RefreshControl, View, VirtualizedList } from "react-native";
import Text from "@/components/Text";
import { useSelector } from "react-redux"; import { useSelector } from "react-redux";
type Props = { type Props = {
@@ -218,7 +218,7 @@ export default function ListDivision() {
</View> </View>
) : ( ) : (
isList ? ( isList ? (
<View style={[Styles.mb50]}> <View style={[Styles.h100]}>
<VirtualizedList <VirtualizedList
data={data} data={data}
style={[{ paddingBottom: 100 }]} style={[{ paddingBottom: 100 }]}
@@ -253,7 +253,7 @@ export default function ListDivision() {
/> />
</View> </View>
) : ( ) : (
<View> <View style={[Styles.h100]}>
<VirtualizedList <VirtualizedList
data={data} data={data}
style={[{ paddingBottom: 100 }]} style={[{ paddingBottom: 100 }]}

View File

@@ -12,7 +12,8 @@ import { useAuthSession } from "@/providers/AuthProvider";
import dayjs from "dayjs"; import dayjs from "dayjs";
import { router, Stack } from "expo-router"; import { router, Stack } from "expo-router";
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
import { SafeAreaView, ScrollView, ToastAndroid, View } from "react-native"; import { SafeAreaView, ScrollView, View } from "react-native";
import Toast from "react-native-toast-message";
export default function Report() { export default function Report() {
const { token, decryptToken } = useAuthSession(); const { token, decryptToken } = useAuthSession();
@@ -107,7 +108,7 @@ export default function Report() {
}) })
setShowReport(true); setShowReport(true);
} else { } else {
ToastAndroid.show(response.message, ToastAndroid.SHORT); Toast.show({ type: 'small', text1: response.message, })
} }
} catch (error) { } catch (error) {
console.error(error); console.error(error);

View File

@@ -3,10 +3,12 @@ import ButtonSaveHeader from "@/components/buttonSaveHeader";
import { InputForm } from "@/components/inputForm"; import { InputForm } from "@/components/inputForm";
import ModalSelect from "@/components/modalSelect"; import ModalSelect from "@/components/modalSelect";
import SelectForm from "@/components/selectForm"; import SelectForm from "@/components/selectForm";
import Text from "@/components/Text";
import Styles from "@/constants/Styles"; import Styles from "@/constants/Styles";
import { apiEditProfile, apiGetProfile } from "@/lib/api"; import { apiEditProfile, apiGetProfile } from "@/lib/api";
import { setEntities } from "@/lib/entitiesSlice"; import { setEntities } from "@/lib/entitiesSlice";
import { useAuthSession } from "@/providers/AuthProvider"; import { useAuthSession } from "@/providers/AuthProvider";
import { MaterialCommunityIcons } from "@expo/vector-icons";
import * as ImagePicker from "expo-image-picker"; import * as ImagePicker from "expo-image-picker";
import { router, Stack } from "expo-router"; import { router, Stack } from "expo-router";
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
@@ -15,10 +17,9 @@ import {
Pressable, Pressable,
SafeAreaView, SafeAreaView,
ScrollView, ScrollView,
Text, View
ToastAndroid,
View,
} from "react-native"; } from "react-native";
import Toast from "react-native-toast-message";
import { useDispatch, useSelector } from "react-redux"; import { useDispatch, useSelector } from "react-redux";
type Props = { type Props = {
@@ -46,7 +47,8 @@ export default function EditProfile() {
const [isSelect, setSelect] = useState(false); const [isSelect, setSelect] = useState(false);
const [disableBtn, setDisableBtn] = useState(false) const [disableBtn, setDisableBtn] = useState(false)
const [valChoose, setValChoose] = useState("") const [valChoose, setValChoose] = useState("")
const [imgForm, setImgForm] = useState<any>(); const [imgForm, setImgForm] = useState<any>()
const [loading, setLoading] = useState(false)
const [data, setData] = useState<Props>({ const [data, setData] = useState<Props>({
id: entities.id, id: entities.id,
name: entities.name, name: entities.name,
@@ -150,6 +152,7 @@ export default function EditProfile() {
async function handleEdit() { async function handleEdit() {
try { try {
setLoading(true)
const hasil = await decryptToken(String(token?.current)) const hasil = await decryptToken(String(token?.current))
const fd = new FormData() const fd = new FormData()
@@ -170,15 +173,17 @@ export default function EditProfile() {
const response = await apiEditProfile(fd) const response = await apiEditProfile(fd)
if (response.success) { if (response.success) {
ToastAndroid.show('Berhasil mengupdate data', ToastAndroid.SHORT) Toast.show({ type: 'small', text1: 'Berhasil mengupdate data', })
await handleLoad() await handleLoad()
router.back() router.back()
} else { } else {
ToastAndroid.show(response.message, ToastAndroid.SHORT) Toast.show({ type: 'small', text1: response.message, })
} }
} catch (error) { } catch (error) {
console.error(error) console.error(error)
ToastAndroid.show('Gagal mengupdate data', ToastAndroid.SHORT) Toast.show({ type: 'small', text1: 'Gagal mengupdate data', })
} finally {
setLoading(false)
} }
} }
@@ -187,7 +192,7 @@ export default function EditProfile() {
const pickImageAsync = async () => { const pickImageAsync = async () => {
let result = await ImagePicker.launchImageLibraryAsync({ let result = await ImagePicker.launchImageLibraryAsync({
mediaTypes: ["images"], mediaTypes: ["images"],
allowsEditing: true, allowsEditing: false,
quality: 1, quality: 1,
aspect: [1, 1], aspect: [1, 1],
}); });
@@ -197,7 +202,6 @@ export default function EditProfile() {
setSelectedImage(result.assets[0].uri); setSelectedImage(result.assets[0].uri);
setImgForm(result.assets[0]); setImgForm(result.assets[0]);
} else { } else {
alert("Tidak ada gambar yang dipilih");
setErrorImg(false) setErrorImg(false)
} }
}; };
@@ -217,7 +221,7 @@ export default function EditProfile() {
headerTitleAlign: "center", headerTitleAlign: "center",
headerRight: () => ( headerRight: () => (
<ButtonSaveHeader <ButtonSaveHeader
disable={disableBtn} disable={disableBtn || loading ? true : false}
category="update" category="update"
onPress={() => { onPress={() => {
handleEdit() handleEdit()
@@ -226,8 +230,8 @@ export default function EditProfile() {
), ),
}} }}
/> />
<ScrollView> <ScrollView style={[Styles.h100]}>
<View style={[Styles.p15, Styles.mb100]}> <View style={[Styles.p15]}>
<View style={{ justifyContent: "center", alignItems: "center" }}> <View style={{ justifyContent: "center", alignItems: "center" }}>
{ {
selectedImage != undefined ? ( selectedImage != undefined ? (
@@ -241,16 +245,20 @@ export default function EditProfile() {
style={[Styles.userProfileBig]} style={[Styles.userProfileBig]}
onError={() => { setErrorImg(true) }} onError={() => { setErrorImg(true) }}
/> />
<View style={[Styles.absoluteIconPicker]}>
<MaterialCommunityIcons name="image" color={'white'} size={15} />
</View>
</Pressable> </Pressable>
) : ( ) : (
<Pressable onPress={pickImageAsync}> <Pressable onPress={pickImageAsync}>
{ <Image
<Image source={errorImg ? require("../../assets/images/user.jpg") : { uri: `https://wibu-storage.wibudev.com/api/files/${data?.img}` }}
source={errorImg ? require("../../assets/images/user.jpg") : { uri: `https://wibu-storage.wibudev.com/api/files/${data?.img}` }} style={[Styles.userProfileBig]}
style={[Styles.userProfileBig]} onError={() => { setErrorImg(true) }}
onError={() => { setErrorImg(true) }} />
/> <View style={[Styles.absoluteIconPicker]}>
} <MaterialCommunityIcons name="image" color={'white'} size={15} />
</View>
</Pressable> </Pressable>
) )
} }

View File

@@ -7,6 +7,7 @@ import { InputForm } from "@/components/inputForm";
import InputSearch from "@/components/inputSearch"; import InputSearch from "@/components/inputSearch";
import MenuItemRow from "@/components/menuItemRow"; import MenuItemRow from "@/components/menuItemRow";
import SkeletonTwoItem from "@/components/skeletonTwoItem"; import SkeletonTwoItem from "@/components/skeletonTwoItem";
import Text from "@/components/Text";
import { ColorsStatus } from "@/constants/ColorsStatus"; import { ColorsStatus } from "@/constants/ColorsStatus";
import Styles from "@/constants/Styles"; import Styles from "@/constants/Styles";
import { apiDeleteGroup, apiEditGroup, apiGetGroup } from "@/lib/api"; import { apiDeleteGroup, apiEditGroup, apiGetGroup } from "@/lib/api";
@@ -14,7 +15,8 @@ import { setUpdateGroup } from "@/lib/groupSlice";
import { useAuthSession } from "@/providers/AuthProvider"; import { useAuthSession } from "@/providers/AuthProvider";
import { AntDesign, Feather, MaterialCommunityIcons } from "@expo/vector-icons"; import { AntDesign, Feather, MaterialCommunityIcons } from "@expo/vector-icons";
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
import { RefreshControl, SafeAreaView, ScrollView, Text, ToastAndroid, View } from "react-native"; import { RefreshControl, SafeAreaView, ScrollView, View } from "react-native";
import Toast from "react-native-toast-message";
import { useDispatch, useSelector } from "react-redux"; import { useDispatch, useSelector } from "react-redux";
type Props = { type Props = {
@@ -40,14 +42,9 @@ export default function Index() {
const dispatch = useDispatch() const dispatch = useDispatch()
const update = useSelector((state: any) => state.groupUpdate) const update = useSelector((state: any) => state.groupUpdate)
const [error, setError] = useState({
const [data11, setData1] = useState(Array.from({ length: 20 }, (_, i) => `Item ${i}`)); title: false,
});
const renderItem = ({ item }: { item: string }) => (
<View style={{ padding: 20, borderBottomWidth: 1, borderColor: '#ccc' }}>
<Text>{item}</Text>
</View>
);
async function handleEdit() { async function handleEdit() {
@@ -60,7 +57,7 @@ export default function Index() {
} finally { } finally {
setVisibleEdit(false) setVisibleEdit(false)
setModal(false) setModal(false)
ToastAndroid.show('Berhasil mengupdate data', ToastAndroid.SHORT) Toast.show({ type: 'small', text1: 'Berhasil mengupdate data', })
} }
} }
@@ -74,7 +71,7 @@ export default function Index() {
console.error(error) console.error(error)
} finally { } finally {
setModal(false) setModal(false)
ToastAndroid.show('Berhasil mengupdate data', ToastAndroid.SHORT) Toast.show({ type: 'small', text1: 'Berhasil mengupdate data', })
} }
} }
@@ -107,35 +104,47 @@ export default function Index() {
setRefreshing(false) setRefreshing(false)
}; };
function validationForm(val: any, cat: 'title') {
if (cat === 'title') {
setTitleChoose(val)
if (val == "" || val.length < 3) {
setError((prev) => ({ ...prev, title: true }))
} else {
setError((prev) => ({ ...prev, title: false }))
}
}
}
return ( return (
<SafeAreaView> <SafeAreaView>
<ScrollView <View style={[Styles.p15]}>
refreshControl={ <View style={[Styles.wrapBtnTab]}>
<RefreshControl <ButtonTab
refreshing={refreshing} active={status == "false" ? "false" : "true"}
onRefresh={handleRefresh} value="true"
/> onPress={() => { setStatus("true") }}
} label="Aktif"
> icon={<Feather name="check-circle" color={status == "true" ? 'white' : 'black'} size={20} />}
<View style={[Styles.p15]}> n={2} />
<View style={[Styles.wrapBtnTab]}> <ButtonTab
<ButtonTab active={status == "false" ? "false" : "true"}
active={status == "false" ? "false" : "true"} value="false"
value="true" onPress={() => { setStatus("false") }}
onPress={() => { setStatus("true") }} label="Tidak Aktif"
label="Aktif" icon={<AntDesign name="closecircleo" color={status == "false" ? 'white' : 'black'} size={20} />}
icon={<Feather name="check-circle" color={status == "true" ? 'white' : 'black'} size={20} />} n={2} />
n={2} /> </View>
<ButtonTab <InputSearch onChange={setSearch} />
active={status == "false" ? "false" : "true"} <ScrollView
value="false" refreshControl={
onPress={() => { setStatus("false") }} <RefreshControl
label="Tidak Aktif" refreshing={refreshing}
icon={<AntDesign name="closecircleo" color={status == "false" ? 'white' : 'black'} size={20} />} onRefresh={handleRefresh}
n={2} /> />
</View> }
<InputSearch onChange={setSearch} /> style={[Styles.h100]}
>
<View> <View>
{ {
@@ -171,10 +180,10 @@ export default function Index() {
<Text style={[Styles.textDefault, Styles.cGray, { textAlign: 'center' }]}>Tidak ada data</Text> <Text style={[Styles.textDefault, Styles.cGray, { textAlign: 'center' }]}>Tidak ada data</Text>
} }
</View> </View>
</View> </ScrollView>
</ScrollView> </View>
<DrawerBottom animation="slide" isVisible={isModal} setVisible={setModal} title={titleChoose}> <DrawerBottom animation="slide" isVisible={isModal} setVisible={() => setModal(false)} title={titleChoose}>
<View style={Styles.rowItemsCenter}> <View style={Styles.rowItemsCenter}>
<MenuItemRow <MenuItemRow
icon={<MaterialCommunityIcons name="toggle-switch-off-outline" color="black" size={25} />} icon={<MaterialCommunityIcons name="toggle-switch-off-outline" color="black" size={25} />}
@@ -193,19 +202,29 @@ export default function Index() {
title="Edit" title="Edit"
onPress={() => { onPress={() => {
setModal(false) setModal(false)
setVisibleEdit(true) setTimeout(() => {
setVisibleEdit(true)
}, 600);
}} }}
/> />
</View> </View>
</DrawerBottom> </DrawerBottom>
<DrawerBottom animation="none" height={30} isVisible={isVisibleEdit} setVisible={setVisibleEdit} title="Edit Lembaga Desa"> <DrawerBottom animation="none" keyboard height={30} isVisible={isVisibleEdit} setVisible={() => setVisibleEdit(false)} title="Edit Lembaga Desa">
<View style={{ flex: 1 }}> <View style={{ flex: 1 }}>
<View> <View>
<InputForm type="default" placeholder="Nama Lembaga Desa" required label="Lembaga Desa" value={titleChoose} onChange={setTitleChoose} /> <InputForm
type="default"
placeholder="Nama Lembaga Desa"
required
label="Lembaga Desa"
value={titleChoose}
error={error.title}
errorText="Lembaga Desa tidak boleh kosong & minimal 3 karakter"
onChange={(val) => { validationForm(val, 'title') }} />
</View> </View>
<View> <View>
<ButtonForm text="SIMPAN" onPress={() => { handleEdit() }} /> <ButtonForm text="SIMPAN" disabled={Object.values(error).some((v) => v == true) || titleChoose == ""} onPress={() => { handleEdit() }} />
</View> </View>
</View> </View>
</DrawerBottom> </DrawerBottom>

View File

@@ -7,19 +7,23 @@ import EventHome from "@/components/home/eventHome";
import FiturHome from "@/components/home/fiturHome"; import FiturHome from "@/components/home/fiturHome";
import { HeaderRightHome } from "@/components/home/headerRightHome"; import { HeaderRightHome } from "@/components/home/headerRightHome";
import ProjectHome from "@/components/home/projectHome"; import ProjectHome from "@/components/home/projectHome";
import Text from "@/components/Text";
import Styles from "@/constants/Styles"; import Styles from "@/constants/Styles";
import { apiGetProfile } from "@/lib/api"; import { apiGetProfile } from "@/lib/api";
import { setEntities } from "@/lib/entitiesSlice"; import { setEntities } from "@/lib/entitiesSlice";
import { useAuthSession } from "@/providers/AuthProvider"; import { useAuthSession } from "@/providers/AuthProvider";
import { Stack } from "expo-router"; import { Stack } from "expo-router";
import { useEffect } from "react"; import { useEffect } from "react";
import { SafeAreaView, ScrollView, View } from "react-native"; import { Platform, SafeAreaView, ScrollView, View } from "react-native";
import { useSafeAreaInsets } from "react-native-safe-area-context";
import { useDispatch, useSelector } from "react-redux"; import { useDispatch, useSelector } from "react-redux";
export default function Home() { export default function Home() {
const entities = useSelector((state: any) => state.entities) const entities = useSelector((state: any) => state.entities)
const dispatch = useDispatch() const dispatch = useDispatch()
const { token, decryptToken } = useAuthSession() const { token, decryptToken } = useAuthSession()
const insets = useSafeAreaInsets();
useEffect(() => { useEffect(() => {
handleUserLogin() handleUserLogin()
@@ -35,15 +39,18 @@ export default function Home() {
<Stack.Screen <Stack.Screen
options={{ options={{
title: 'Home', title: 'Home',
headerLeft: () => <></>,
headerTitle: entities.village, headerTitle: entities.village,
headerRight: () => <HeaderRightHome />, header: () => (
headerTitleAlign: 'left', <View style={[Styles.rowItemsCenter, Styles.ph20, Platform.OS === 'ios' ? Styles.pb07 : Styles.pb13, { backgroundColor: '#19345E', paddingTop: Platform.OS === 'ios' ? insets.top : 10 }]}>
<Text style={Styles.textHeaderHome}>{entities.village}</Text>
<HeaderRightHome />
</View>
),
}} }}
/> />
<ScrollView> <ScrollView>
<CaraouselHome /> <CaraouselHome />
<View style={[Styles.ph15]}> <View style={[Styles.ph15, Styles.mb100]}>
<FiturHome /> <FiturHome />
<ProjectHome /> <ProjectHome />
<DivisionHome /> <DivisionHome />

View File

@@ -1,14 +1,16 @@
import ButtonBackHeader from "@/components/buttonBackHeader"; import ButtonBackHeader from "@/components/buttonBackHeader";
import ImageUser from "@/components/imageNew"; import ImageUser from "@/components/imageNew";
import ItemDetailMember from "@/components/itemDetailMember"; import ItemDetailMember from "@/components/itemDetailMember";
import LabelStatus from "@/components/labelStatus";
import HeaderRightMemberDetail from "@/components/member/headerMemberDetail"; import HeaderRightMemberDetail from "@/components/member/headerMemberDetail";
import Skeleton from "@/components/skeleton"; import Skeleton from "@/components/skeleton";
import Text from "@/components/Text";
import { valueRoleUser } from "@/constants/RoleUser"; import { valueRoleUser } from "@/constants/RoleUser";
import Styles from "@/constants/Styles"; import Styles from "@/constants/Styles";
import { apiGetProfile } from "@/lib/api"; import { apiGetProfile } from "@/lib/api";
import { router, Stack, useLocalSearchParams } from "expo-router"; import { router, Stack, useLocalSearchParams } from "expo-router";
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
import { SafeAreaView, ScrollView, Text, View } from "react-native"; import { RefreshControl, SafeAreaView, ScrollView, View } from "react-native";
import { useSelector } from "react-redux"; import { useSelector } from "react-redux";
type Props = { type Props = {
@@ -33,10 +35,11 @@ export default function MemberDetail() {
const [isEdit, setEdit] = useState(true) const [isEdit, setEdit] = useState(true)
const arrSkeleton = Array.from({ length: 5 }, (_, index) => index) const arrSkeleton = Array.from({ length: 5 }, (_, index) => index)
const [loading, setLoading] = useState(true) const [loading, setLoading] = useState(true)
const [refreshing, setRefreshing] = useState(false)
async function handleLoad() { async function handleLoad(loading: boolean) {
try { try {
setLoading(true) setLoading(loading)
const response = await apiGetProfile({ id: id }) const response = await apiGetProfile({ id: id })
setData(response.data) setData(response.data)
setEdit(valueRoleUser.filter((v) => v.login == entityUser.role)[0]?.data.some((i: any) => i.id == response.data.idUserRole)) setEdit(valueRoleUser.filter((v) => v.login == entityUser.role)[0]?.data.some((i: any) => i.id == response.data.idUserRole))
@@ -49,9 +52,17 @@ export default function MemberDetail() {
useEffect(() => { useEffect(() => {
handleLoad() handleLoad(true)
}, []); }, []);
const handleRefresh = async () => {
setRefreshing(true)
handleLoad(false)
await new Promise(resolve => setTimeout(resolve, 2000));
setRefreshing(false)
};
return ( return (
<SafeAreaView> <SafeAreaView>
<Stack.Screen <Stack.Screen
@@ -63,48 +74,59 @@ export default function MemberDetail() {
headerShadowVisible: false headerShadowVisible: false
}} }}
/> />
<ScrollView> <ScrollView
<View style={{ flexDirection: 'column' }}> style={[Styles.h100]}
<View style={[Styles.wrapHeadViewMember]}> refreshControl={
{ <RefreshControl
loading ? refreshing={refreshing}
<> onRefresh={handleRefresh}
<Skeleton width={100} height={100} borderRadius={100} /> />
<Skeleton width={200} height={10} borderRadius={5} /> }
<Skeleton width={150} height={10} borderRadius={5} /> >
</> <View style={[Styles.wrapHeadViewMember,]}>
: {
<> loading ?
<ImageUser src={`https://wibu-storage.wibudev.com/api/files/${data?.img}`} size="lg" /> <>
<Text style={[Styles.textSubtitle, Styles.cWhite, Styles.mt10]}>{data?.name}</Text> <Skeleton width={100} height={100} borderRadius={100} />
<Text style={[Styles.textMediumNormal, Styles.cWhite]}>{data?.role}</Text> <Skeleton width={200} height={10} borderRadius={5} />
</> <Skeleton width={150} height={10} borderRadius={5} />
</>
:
<>
<ImageUser src={`https://wibu-storage.wibudev.com/api/files/${data?.img}`} size="lg" />
<Text style={[Styles.textSubtitle, Styles.cWhite, Styles.mt10]}>{data?.name}</Text>
<Text style={[Styles.textMediumNormal, Styles.cWhite]}>{data?.role}</Text>
</>
} }
</View>
<View style={[Styles.p15]}>
<View style={[Styles.rowSpaceBetween]}>
<Text style={[Styles.textDefaultSemiBold]}>Informasi</Text>
<LabelStatus
size="small"
category={data?.isActive ? 'success' : 'error'}
text={data?.isActive ? 'AKTIF' : 'TIDAK AKTIF'}
/>
</View> </View>
<View style={[Styles.p15]}> {
<View style={[Styles.rowSpaceBetween]}> loading ?
<Text style={[Styles.textDefaultSemiBold]}>Informasi</Text> arrSkeleton.map((item, index) => {
</View> return (
{ <Skeleton key={index} width={100} widthType="percent" height={25} borderRadius={5} />
loading ? )
arrSkeleton.map((item, index) => { })
return ( :
<Skeleton key={index} width={100} widthType="percent" height={25} borderRadius={5} /> <>
) <ItemDetailMember category="nik" value={data?.nik} />
}) <ItemDetailMember category="group" value={data?.group} />
: <ItemDetailMember category="position" value={data?.position} />
<> <ItemDetailMember category="phone" value={`+62${data?.phone}`} />
<ItemDetailMember category="nik" value={data?.nik} /> <ItemDetailMember category="email" value={data?.email} />
<ItemDetailMember category="group" value={data?.group} /> <ItemDetailMember category="gender" value={data?.gender == "F" ? "Perempuan" : "Laki-Laki"} />
<ItemDetailMember category="position" value={data?.position} /> </>
<ItemDetailMember category="phone" value={`+62${data?.phone}`} /> }
<ItemDetailMember category="email" value={data?.email} />
<ItemDetailMember category="gender" value={data?.gender == "F" ? "Perempuan" : "Laki-Laki"} />
</>
}
</View>
</View> </View>
</ScrollView> </ScrollView>
</SafeAreaView> </SafeAreaView>

View File

@@ -3,27 +3,31 @@ import ButtonSaveHeader from "@/components/buttonSaveHeader";
import { InputForm } from "@/components/inputForm"; import { InputForm } from "@/components/inputForm";
import ModalSelect from "@/components/modalSelect"; import ModalSelect from "@/components/modalSelect";
import SelectForm from "@/components/selectForm"; import SelectForm from "@/components/selectForm";
import Text from "@/components/Text";
import { ColorsStatus } from "@/constants/ColorsStatus"; import { ColorsStatus } from "@/constants/ColorsStatus";
import Styles from "@/constants/Styles"; import Styles from "@/constants/Styles";
import { apiCreateUser } from "@/lib/api"; import { apiCreateUser } from "@/lib/api";
import { setUpdateMember } from "@/lib/memberSlice"; import { setUpdateMember } from "@/lib/memberSlice";
import { useAuthSession } from "@/providers/AuthProvider"; import { useAuthSession } from "@/providers/AuthProvider";
import { MaterialCommunityIcons } from "@expo/vector-icons"; import { MaterialCommunityIcons } from "@expo/vector-icons";
import { useHeaderHeight } from '@react-navigation/elements';
import * as ImagePicker from "expo-image-picker"; import * as ImagePicker from "expo-image-picker";
import { router, Stack } from "expo-router"; import { router, Stack } from "expo-router";
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
import { import {
Image, Image,
KeyboardAvoidingView,
Platform,
Pressable, Pressable,
SafeAreaView, SafeAreaView,
ScrollView, ScrollView,
Text, View
ToastAndroid,
View,
} from "react-native"; } from "react-native";
import Toast from "react-native-toast-message";
import { useDispatch, useSelector } from "react-redux"; import { useDispatch, useSelector } from "react-redux";
export default function CreateMember() { export default function CreateMember() {
const headerHeight = useHeaderHeight();
const dispatch = useDispatch() const dispatch = useDispatch()
const update = useSelector((state: any) => state.memberUpdate) const update = useSelector((state: any) => state.memberUpdate)
const { token, decryptToken } = useAuthSession() const { token, decryptToken } = useAuthSession()
@@ -34,10 +38,12 @@ export default function CreateMember() {
const [chooseGender, setChooseGender] = useState({ val: "", label: "" }); const [chooseGender, setChooseGender] = useState({ val: "", label: "" });
const [selectedImage, setSelectedImage] = useState<string | undefined>(undefined); const [selectedImage, setSelectedImage] = useState<string | undefined>(undefined);
const entityUser = useSelector((state: any) => state.user); const entityUser = useSelector((state: any) => state.user);
const entities = useSelector((state: any) => state.entities)
const [isSelect, setSelect] = useState(false); const [isSelect, setSelect] = useState(false);
const [disableBtn, setDisableBtn] = useState(true) const [disableBtn, setDisableBtn] = useState(true)
const [valChoose, setValChoose] = useState("") const [valChoose, setValChoose] = useState("")
const [imgForm, setImgForm] = useState<any>() const [imgForm, setImgForm] = useState<any>()
const [loading, setLoading] = useState(false)
const [error, setError] = useState({ const [error, setError] = useState({
group: false, group: false,
position: false, position: false,
@@ -140,9 +146,16 @@ export default function CreateMember() {
checkForm() checkForm()
}, [error, dataForm]) }, [error, dataForm])
useEffect(() => {
if (entityUser.role != "supadmin" && entityUser.role != "developer") {
validationForm("group", entities.idGroup, entities.group)
}
}, [])
async function handleCreate() { async function handleCreate() {
try { try {
setLoading(true)
const hasil = await decryptToken(String(token?.current)) const hasil = await decryptToken(String(token?.current))
const fd = new FormData() const fd = new FormData()
@@ -160,16 +173,19 @@ export default function CreateMember() {
fd.append("file", "undefined") fd.append("file", "undefined")
} }
const response = await apiCreateUser(fd) const response = await apiCreateUser({ data: fd })
if (response.success) { if (response.success) {
ToastAndroid.show('Berhasil menambahkan data', ToastAndroid.SHORT) Toast.show({ type: 'small', text1: 'Berhasil menambahkan data', })
dispatch(setUpdateMember(!update)) dispatch(setUpdateMember(!update))
router.back() router.back()
} else { } else {
ToastAndroid.show(response.message, ToastAndroid.SHORT) Toast.show({ type: 'small', text1: response.message, })
} }
} catch (error) { } catch (error) {
console.error(error) console.error(error)
Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
} finally {
setLoading(false)
} }
} }
@@ -177,7 +193,7 @@ export default function CreateMember() {
const pickImageAsync = async () => { const pickImageAsync = async () => {
let result = await ImagePicker.launchImageLibraryAsync({ let result = await ImagePicker.launchImageLibraryAsync({
mediaTypes: ["images"], mediaTypes: ["images"],
allowsEditing: true, allowsEditing: false,
quality: 1, quality: 1,
aspect: [1, 1], aspect: [1, 1],
}); });
@@ -185,9 +201,6 @@ export default function CreateMember() {
if (!result.canceled) { if (!result.canceled) {
setSelectedImage(result.assets[0].uri); setSelectedImage(result.assets[0].uri);
setImgForm(result.assets[0]); setImgForm(result.assets[0]);
} else {
alert("Tidak ada gambar yang dipilih");
} }
}; };
@@ -206,139 +219,145 @@ export default function CreateMember() {
headerTitleAlign: "center", headerTitleAlign: "center",
headerRight: () => ( headerRight: () => (
<ButtonSaveHeader <ButtonSaveHeader
disable={disableBtn} disable={disableBtn || loading}
category="create" category="create"
onPress={() => { handleCreate() }} onPress={() => { handleCreate() }}
/> />
), ),
}} }}
/> />
<ScrollView> <KeyboardAvoidingView
<View style={[Styles.p15, Styles.mb100]}> style={[Styles.h100]}
<View style={{ justifyContent: "center", alignItems: "center" }}> behavior={Platform.OS === 'ios' ? 'padding' : undefined}
{selectedImage != undefined ? ( keyboardVerticalOffset={headerHeight}
<Pressable onPress={pickImageAsync}> >
<Image src={selectedImage} style={[Styles.userProfileBig]} /> <ScrollView>
</Pressable> <View style={[Styles.p15]}>
) : ( <View style={{ justifyContent: "center", alignItems: "center" }}>
<Pressable {selectedImage != undefined ? (
onPress={pickImageAsync} <Pressable onPress={pickImageAsync}>
style={[Styles.iconContent, ColorsStatus.gray]} <Image src={selectedImage} style={[Styles.userProfileBig]} />
> <View style={[Styles.absoluteIconPicker]}>
<MaterialCommunityIcons <MaterialCommunityIcons name="image" color={'white'} size={15} />
name="account-tie" </View>
size={100} </Pressable>
color={"gray"} ) : (
<Pressable onPress={pickImageAsync} style={[Styles.iconContent, ColorsStatus.gray]} >
<MaterialCommunityIcons name="account-tie" size={85} color={"gray"} />
<View style={[Styles.absoluteIconPicker]}>
<MaterialCommunityIcons name="image" color={'white'} size={15} />
</View>
</Pressable>
)}
</View>
{(entityUser.role == "supadmin" ||
entityUser.role == "developer") && (
<SelectForm
label="Lembaga Desa"
placeholder="Pilih Lembaga Desa"
value={chooseGroup.label}
required
onPress={() => {
setValChoose(chooseGroup.val);
setValSelect("group");
setSelect(true);
}}
error={error.group}
errorText="Lembaga Desa tidak boleh kosong"
/> />
</Pressable> )}
)} <SelectForm
label="Jabatan"
placeholder="Pilih Jabatan"
value={choosePosition.label}
required
onPress={() => {
setValChoose(choosePosition.val);
setValSelect("position");
setSelect(true);
}}
error={error.position}
errorText="Jabatan tidak boleh kosong"
/>
<SelectForm
label="User Role"
placeholder="Pilih Role"
value={chooseRole.label}
required
onPress={() => {
setValChoose(chooseRole.val);
setValSelect("role");
setSelect(true);
}}
error={error.role}
errorText="Role tidak boleh kosong"
/>
<InputForm
label="NIK"
type="numeric"
placeholder="NIK"
required
error={error.nik}
errorText="NIK Harus 16 Karakter"
onChange={val => {
validationForm("nik", val)
}}
/>
<InputForm
label="Nama"
type="default"
placeholder="Nama"
required
error={error.name}
errorText="Nama tidak boleh kosong"
onChange={val => {
validationForm("name", val)
}}
/>
<InputForm
label="Email"
type="default"
placeholder="Email"
required
error={error.email}
errorText="Email tidak valid"
onChange={val => {
validationForm("email", val)
}}
/>
<InputForm
label="Nomor Telepon"
type="numeric"
placeholder="8XX-XXX-XXX"
required
itemLeft={<Text>+62</Text>}
error={error.phone}
errorText="Nomor Telepon tidak valid"
onChange={val => {
validationForm("phone", val)
}}
/>
<SelectForm
label="Jenis Kelamin"
placeholder="Pilih Jenis Kelamin"
value={chooseGender.label}
required
onPress={() => {
setValChoose(chooseGender.val);
setValSelect("gender");
setSelect(true);
}}
error={error.gender}
errorText="Jenis Kelamin tidak boleh kosong"
/>
</View> </View>
{(entityUser.role == "supadmin" || </ScrollView>
entityUser.role == "developer") && ( </KeyboardAvoidingView>
<SelectForm
label="Lembaga Desa"
placeholder="Pilih Lembaga Desa"
value={chooseGroup.label}
required
onPress={() => {
setValChoose(chooseGroup.val);
setValSelect("group");
setSelect(true);
}}
error={error.group}
errorText="Lembaga Desa tidak boleh kosong"
/>
)}
<SelectForm
label="Jabatan"
placeholder="Pilih Jabatan"
value={choosePosition.label}
required
onPress={() => {
setValChoose(choosePosition.val);
setValSelect("position");
setSelect(true);
}}
error={error.position}
errorText="Jabatan tidak boleh kosong"
/>
<SelectForm
label="User Role"
placeholder="Pilih Role"
value={chooseRole.label}
required
onPress={() => {
setValChoose(chooseRole.val);
setValSelect("role");
setSelect(true);
}}
error={error.role}
errorText="Role tidak boleh kosong"
/>
<InputForm
label="NIK"
type="numeric"
placeholder="NIK"
required
error={error.nik}
errorText="NIK Harus 16 Karakter"
onChange={val => {
validationForm("nik", val)
}}
/>
<InputForm
label="Nama"
type="default"
placeholder="Nama"
required
error={error.name}
errorText="Nama tidak boleh kosong"
onChange={val => {
validationForm("name", val)
}}
/>
<InputForm
label="Email"
type="default"
placeholder="Email"
required
error={error.email}
errorText="Email tidak valid"
onChange={val => {
validationForm("email", val)
}}
/>
<InputForm
label="Nomor Telepon"
type="numeric"
placeholder="8XX-XXX-XXX"
required
itemLeft={<Text>+62</Text>}
error={error.phone}
errorText="Nomor Telepon tidak valid"
onChange={val => {
validationForm("phone", val)
}}
/>
<SelectForm
label="Jenis Kelamin"
placeholder="Pilih Jenis Kelamin"
value={chooseGender.label}
required
onPress={() => {
setValChoose(chooseGender.val);
setValSelect("gender");
setSelect(true);
}}
error={error.gender}
errorText="Jenis Kelamin tidak boleh kosong"
/>
</View>
</ScrollView>
<ModalSelect <ModalSelect
category={valSelect} category={valSelect}
close={setSelect} close={() => { setSelect(false) }}
onSelect={(value) => { onSelect={(value) => {
validationForm(valSelect, value.val, value.label); validationForm(valSelect, value.val, value.label);
}} }}

View File

@@ -3,22 +3,26 @@ import ButtonSaveHeader from "@/components/buttonSaveHeader";
import { InputForm } from "@/components/inputForm"; import { InputForm } from "@/components/inputForm";
import ModalSelect from "@/components/modalSelect"; import ModalSelect from "@/components/modalSelect";
import SelectForm from "@/components/selectForm"; import SelectForm from "@/components/selectForm";
import Text from "@/components/Text";
import Styles from "@/constants/Styles"; import Styles from "@/constants/Styles";
import { apiEditUser, apiGetProfile } from "@/lib/api"; import { apiEditUser, apiGetProfile } from "@/lib/api";
import { setUpdateMember } from "@/lib/memberSlice"; import { setUpdateMember } from "@/lib/memberSlice";
import { useAuthSession } from "@/providers/AuthProvider"; import { useAuthSession } from "@/providers/AuthProvider";
import { MaterialCommunityIcons } from "@expo/vector-icons";
import { useHeaderHeight } from '@react-navigation/elements';
import * as ImagePicker from "expo-image-picker"; import * as ImagePicker from "expo-image-picker";
import { router, Stack, useLocalSearchParams } from "expo-router"; import { router, Stack, useLocalSearchParams } from "expo-router";
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
import { import {
Image, Image,
KeyboardAvoidingView,
Platform,
Pressable, Pressable,
SafeAreaView, SafeAreaView,
ScrollView, ScrollView,
Text, View
ToastAndroid,
View,
} from "react-native"; } from "react-native";
import Toast from "react-native-toast-message";
import { useDispatch, useSelector } from "react-redux"; import { useDispatch, useSelector } from "react-redux";
type Props = { type Props = {
@@ -36,6 +40,7 @@ type Props = {
}; };
export default function EditMember() { export default function EditMember() {
const headerHeight = useHeaderHeight();
const dispatch = useDispatch() const dispatch = useDispatch()
const update = useSelector((state: any) => state.memberUpdate) const update = useSelector((state: any) => state.memberUpdate)
const { token, decryptToken } = useAuthSession() const { token, decryptToken } = useAuthSession()
@@ -50,6 +55,7 @@ export default function EditMember() {
const [disableBtn, setDisableBtn] = useState(false) const [disableBtn, setDisableBtn] = useState(false)
const [valChoose, setValChoose] = useState("") const [valChoose, setValChoose] = useState("")
const [imgForm, setImgForm] = useState<any>(); const [imgForm, setImgForm] = useState<any>();
const [loading, setLoading] = useState(false)
const [data, setData] = useState<Props>({ const [data, setData] = useState<Props>({
id: "", id: "",
name: "", name: "",
@@ -173,6 +179,7 @@ export default function EditMember() {
async function handleEdit() { async function handleEdit() {
try { try {
setLoading(true)
const hasil = await decryptToken(String(token?.current)) const hasil = await decryptToken(String(token?.current))
const fd = new FormData() const fd = new FormData()
@@ -193,15 +200,17 @@ export default function EditMember() {
const response = await apiEditUser(fd, id) const response = await apiEditUser(fd, id)
if (response.success) { if (response.success) {
ToastAndroid.show('Berhasil mengupdate data', ToastAndroid.SHORT) Toast.show({ type: 'small', text1: 'Berhasil mengupdate data', })
dispatch(setUpdateMember(!update)) dispatch(setUpdateMember(!update))
router.back() router.back()
} else { } else {
ToastAndroid.show(response.message, ToastAndroid.SHORT) Toast.show({ type: 'small', text1: response.message, })
} }
} catch (error) { } catch (error) {
console.error(error) console.error(error)
ToastAndroid.show('Gagal mengupdate data', ToastAndroid.SHORT) Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
} finally {
setLoading(false)
} }
} }
@@ -210,7 +219,7 @@ export default function EditMember() {
const pickImageAsync = async () => { const pickImageAsync = async () => {
let result = await ImagePicker.launchImageLibraryAsync({ let result = await ImagePicker.launchImageLibraryAsync({
mediaTypes: ["images"], mediaTypes: ["images"],
allowsEditing: true, allowsEditing: false,
quality: 1, quality: 1,
aspect: [1, 1], aspect: [1, 1],
}); });
@@ -220,7 +229,6 @@ export default function EditMember() {
setSelectedImage(result.assets[0].uri); setSelectedImage(result.assets[0].uri);
setImgForm(result.assets[0]); setImgForm(result.assets[0]);
} else { } else {
alert("Tidak ada gambar yang dipilih");
setErrorImg(false) setErrorImg(false)
} }
}; };
@@ -240,7 +248,7 @@ export default function EditMember() {
headerTitleAlign: "center", headerTitleAlign: "center",
headerRight: () => ( headerRight: () => (
<ButtonSaveHeader <ButtonSaveHeader
disable={disableBtn} disable={disableBtn || loading}
category="update" category="update"
onPress={() => { onPress={() => {
handleEdit() handleEdit()
@@ -249,131 +257,142 @@ export default function EditMember() {
), ),
}} }}
/> />
<ScrollView>
<View style={[Styles.p15, Styles.mb100]}> <KeyboardAvoidingView
<View style={{ justifyContent: "center", alignItems: "center" }}> style={[Styles.h100]}
{ behavior={Platform.OS === 'ios' ? 'padding' : undefined}
errorImg ? keyboardVerticalOffset={headerHeight}
<Pressable onPress={pickImageAsync}> >
{ <ScrollView>
<View style={[Styles.p15, Styles.mb100]}>
<View style={{ justifyContent: "center", alignItems: "center" }}>
{
errorImg ?
<Pressable onPress={pickImageAsync}>
<Image <Image
source={errorImg ? require("../../../../assets/images/user.jpg") : { uri: `https://wibu-storage.wibudev.com/api/files/${data?.img}` }} source={errorImg ? require("../../../../assets/images/user.jpg") : { uri: `https://wibu-storage.wibudev.com/api/files/${data?.img}` }}
style={[Styles.userProfileBig]} style={[Styles.userProfileBig]}
onError={() => { setErrorImg(true) }} onError={() => { setErrorImg(true) }}
/> />
} <View style={[Styles.absoluteIconPicker]}>
</Pressable> <MaterialCommunityIcons name="image" color={'white'} size={15} />
: </View>
selectedImage != undefined ? (
<Pressable onPress={pickImageAsync}>
<Image
src={
typeof selectedImage === "string"
? selectedImage
: selectedImage.uri
}
style={[Styles.userProfileBig]}
onError={() => { setErrorImg(true) }}
/>
</Pressable> </Pressable>
) : ( :
<Image selectedImage != undefined ? (
source={require("../../../../assets/images/user.jpg")} <Pressable onPress={pickImageAsync}>
style={[Styles.userProfileBig]} <Image
/> src={
) typeof selectedImage === "string"
} ? selectedImage
: selectedImage.uri
}
style={[Styles.userProfileBig]}
onError={() => { setErrorImg(true) }}
/>
<View style={[Styles.absoluteIconPicker]}>
<MaterialCommunityIcons name="image" color={'white'} size={15} />
</View>
</Pressable>
) : (
<Image
source={require("../../../../assets/images/user.jpg")}
style={[Styles.userProfileBig]}
/>
)
}
</View>
<SelectForm
label="Jabatan"
placeholder="Pilih Jabatan"
value={choosePosition.label}
required
onPress={() => {
setValChoose(choosePosition.val);
setValSelect("position");
setSelect(true);
}}
error={error.position}
errorText="Jabatan tidak boleh kosong"
/>
<SelectForm
label="User Role"
placeholder="Pilih Role"
value={chooseRole.label}
required
onPress={() => {
setValChoose(chooseRole.val);
setValSelect("role");
setSelect(true);
}}
error={error.role}
errorText="Role tidak boleh kosong"
/>
<InputForm
label="NIK"
type="numeric"
placeholder="NIK"
required
value={data?.nik}
error={error.nik}
errorText="NIK Harus 16 Karakter"
onChange={val => {
validationForm("nik", val)
}}
/>
<InputForm
label="Nama"
type="default"
placeholder="Nama"
required
value={data?.name}
error={error.name}
errorText="Nama tidak boleh kosong"
onChange={val => {
validationForm("name", val)
}}
/>
<InputForm
label="Email"
type="default"
placeholder="Email"
required
value={data?.email}
error={error.email}
errorText="Email tidak valid"
onChange={val => {
validationForm("email", val)
}}
/>
<InputForm
label="Nomor Telepon"
type="numeric"
placeholder="8XX-XXX-XXX"
required
itemLeft={<Text>+62</Text>}
value={data?.phone}
error={error.phone}
errorText="Nomor Telepon tidak valid"
onChange={val => {
validationForm("phone", val)
}}
/>
<SelectForm
label="Jenis Kelamin"
placeholder="Pilih Jenis Kelamin"
value={chooseGender.label}
required
onPress={() => {
setValChoose(chooseGender.val);
setValSelect("gender");
setSelect(true);
}}
error={error.gender}
errorText="Jenis Kelamin tidak boleh kosong"
/>
</View> </View>
<SelectForm </ScrollView>
label="Jabatan" </KeyboardAvoidingView>
placeholder="Pilih Jabatan"
value={choosePosition.label}
required
onPress={() => {
setValChoose(choosePosition.val);
setValSelect("position");
setSelect(true);
}}
error={error.position}
errorText="Jabatan tidak boleh kosong"
/>
<SelectForm
label="User Role"
placeholder="Pilih Role"
value={chooseRole.label}
required
onPress={() => {
setValChoose(chooseRole.val);
setValSelect("role");
setSelect(true);
}}
error={error.role}
errorText="Role tidak boleh kosong"
/>
<InputForm
label="NIK"
type="numeric"
placeholder="NIK"
required
value={data?.nik}
error={error.nik}
errorText="NIK Harus 16 Karakter"
onChange={val => {
validationForm("nik", val)
}}
/>
<InputForm
label="Nama"
type="default"
placeholder="Nama"
required
value={data?.name}
error={error.name}
errorText="Nama tidak boleh kosong"
onChange={val => {
validationForm("name", val)
}}
/>
<InputForm
label="Email"
type="default"
placeholder="Email"
required
value={data?.email}
error={error.email}
errorText="Email tidak valid"
onChange={val => {
validationForm("email", val)
}}
/>
<InputForm
label="Nomor Telepon"
type="numeric"
placeholder="8XX-XXX-XXX"
required
itemLeft={<Text>+62</Text>}
value={data?.phone}
error={error.phone}
errorText="Nomor Telepon tidak valid"
onChange={val => {
validationForm("phone", val)
}}
/>
<SelectForm
label="Jenis Kelamin"
placeholder="Pilih Jenis Kelamin"
value={chooseGender.label}
required
onPress={() => {
setValChoose(chooseGender.val);
setValSelect("gender");
setSelect(true);
}}
error={error.gender}
errorText="Jenis Kelamin tidak boleh kosong"
/>
</View>
</ScrollView>
<ModalSelect <ModalSelect
category={valSelect} category={valSelect}

View File

@@ -3,13 +3,14 @@ import ButtonTab from "@/components/buttonTab";
import ImageUser from "@/components/imageNew"; import ImageUser from "@/components/imageNew";
import InputSearch from "@/components/inputSearch"; import InputSearch from "@/components/inputSearch";
import SkeletonTwoItem from "@/components/skeletonTwoItem"; import SkeletonTwoItem from "@/components/skeletonTwoItem";
import Text from "@/components/Text";
import Styles from "@/constants/Styles"; import Styles from "@/constants/Styles";
import { apiGetUser } from "@/lib/api"; import { apiGetUser } from "@/lib/api";
import { useAuthSession } from "@/providers/AuthProvider"; import { useAuthSession } from "@/providers/AuthProvider";
import { AntDesign, Feather } from "@expo/vector-icons"; import { AntDesign, Feather } from "@expo/vector-icons";
import { router, useLocalSearchParams } from "expo-router"; import { router, useLocalSearchParams } from "expo-router";
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
import { RefreshControl, Text, View, VirtualizedList } from "react-native"; import { RefreshControl, View, VirtualizedList } from "react-native";
import { useSelector } from "react-redux"; import { useSelector } from "react-redux";
type Props = { type Props = {

View File

@@ -1,5 +1,6 @@
import BorderBottomItem from "@/components/borderBottomItem"; import BorderBottomItem from "@/components/borderBottomItem";
import SkeletonTwoItem from "@/components/skeletonTwoItem"; import SkeletonTwoItem from "@/components/skeletonTwoItem";
import Text from "@/components/Text";
import { ColorsStatus } from "@/constants/ColorsStatus"; import { ColorsStatus } from "@/constants/ColorsStatus";
import Styles from "@/constants/Styles"; import Styles from "@/constants/Styles";
import { apiGetNotification, apiReadOneNotification } from "@/lib/api"; import { apiGetNotification, apiReadOneNotification } from "@/lib/api";
@@ -8,7 +9,7 @@ import { pushToPage } from "@/lib/pushToPage";
import { useAuthSession } from "@/providers/AuthProvider"; import { useAuthSession } from "@/providers/AuthProvider";
import { Feather } from "@expo/vector-icons"; import { Feather } from "@expo/vector-icons";
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
import { SafeAreaView, Text, View, VirtualizedList } from "react-native"; import { SafeAreaView, View, VirtualizedList } from "react-native";
import { useDispatch, useSelector } from "react-redux"; import { useDispatch, useSelector } from "react-redux";
type Props = { type Props = {

View File

@@ -7,6 +7,7 @@ import { InputForm } from "@/components/inputForm";
import InputSearch from "@/components/inputSearch"; import InputSearch from "@/components/inputSearch";
import MenuItemRow from "@/components/menuItemRow"; import MenuItemRow from "@/components/menuItemRow";
import SkeletonTwoItem from "@/components/skeletonTwoItem"; import SkeletonTwoItem from "@/components/skeletonTwoItem";
import Text from "@/components/Text";
import { ColorsStatus } from "@/constants/ColorsStatus"; import { ColorsStatus } from "@/constants/ColorsStatus";
import Styles from "@/constants/Styles"; import Styles from "@/constants/Styles";
import { apiDeletePosition, apiEditPosition, apiGetPosition } from "@/lib/api"; import { apiDeletePosition, apiEditPosition, apiGetPosition } from "@/lib/api";
@@ -15,7 +16,8 @@ import { useAuthSession } from "@/providers/AuthProvider";
import { AntDesign, Feather, MaterialCommunityIcons } from "@expo/vector-icons"; import { AntDesign, Feather, MaterialCommunityIcons } from "@expo/vector-icons";
import { useLocalSearchParams } from "expo-router"; import { useLocalSearchParams } from "expo-router";
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
import { RefreshControl, SafeAreaView, ScrollView, Text, ToastAndroid, View } from "react-native"; import { RefreshControl, SafeAreaView, ScrollView, View } from "react-native";
import Toast from "react-native-toast-message";
import { useDispatch, useSelector } from "react-redux"; import { useDispatch, useSelector } from "react-redux";
type Props = { type Props = {
@@ -85,7 +87,7 @@ export default function Index() {
console.error(error) console.error(error)
} finally { } finally {
setModal(false) setModal(false)
ToastAndroid.show('Berhasil mengupdate data', ToastAndroid.SHORT) Toast.show({ type: 'small', text1: 'Berhasil mengupdate data', })
} }
} }
@@ -100,7 +102,7 @@ export default function Index() {
} finally { } finally {
setVisibleEdit(false) setVisibleEdit(false)
setModal(false) setModal(false)
ToastAndroid.show('Berhasil mengupdate data', ToastAndroid.SHORT) Toast.show({ type: 'small', text1: 'Berhasil mengupdate data', })
} }
} }
@@ -129,36 +131,38 @@ export default function Index() {
return ( return (
<SafeAreaView> <SafeAreaView>
<ScrollView refreshControl={ <View style={[Styles.p15]}>
<RefreshControl <View style={[Styles.wrapBtnTab]}>
refreshing={refreshing} <ButtonTab
onRefresh={handleRefresh} active={status == "false" ? "false" : "true"}
/> value="true"
}> onPress={() => { setStatus("true") }}
<View style={[Styles.p15]}> label="Aktif"
<View style={[Styles.wrapBtnTab]}> icon={<Feather name="check-circle" color={status == "true" ? 'white' : 'black'} size={20} />}
<ButtonTab n={2} />
active={status == "false" ? "false" : "true"} <ButtonTab
value="true" active={status == "false" ? "false" : "true"}
onPress={() => { setStatus("true") }} value="false"
label="Aktif" onPress={() => { setStatus("false") }}
icon={<Feather name="check-circle" color={status == "true" ? 'white' : 'black'} size={20} />} label="Tidak Aktif"
n={2} /> icon={<AntDesign name="closecircleo" color={status == "false" ? 'white' : 'black'} size={20} />}
<ButtonTab n={2} />
active={status == "false" ? "false" : "true"} </View>
value="false" <InputSearch onChange={setSearch} />
onPress={() => { setStatus("false") }} {
label="Tidak Aktif" (entityUser.role == "supadmin" || entityUser.role == "developer") &&
icon={<AntDesign name="closecircleo" color={status == "false" ? 'white' : 'black'} size={20} />} <View style={[Styles.mv05]}>
n={2} /> <Text>Filter : {nameGroup}</Text>
</View> </View>
<InputSearch onChange={setSearch} /> }
{ <ScrollView
(entityUser.role == "supadmin" || entityUser.role == "developer") && style={[Styles.h100]}
<View style={[Styles.mv05]}> refreshControl={
<Text>Filter : {nameGroup}</Text> <RefreshControl
</View> refreshing={refreshing}
} onRefresh={handleRefresh}
/>
}>
<View> <View>
{ {
loading ? loading ?
@@ -189,10 +193,10 @@ export default function Index() {
<Text style={[Styles.textDefault, Styles.cGray, { textAlign: 'center' }]}>Tidak ada data</Text> <Text style={[Styles.textDefault, Styles.cGray, { textAlign: 'center' }]}>Tidak ada data</Text>
} }
</View> </View>
</View> </ScrollView>
</ScrollView> </View>
<DrawerBottom animation="slide" isVisible={isModal} setVisible={setModal} title={chooseData.name}> <DrawerBottom animation="slide" isVisible={isModal} setVisible={() => setModal(false)} title={chooseData.name}>
<View style={Styles.rowItemsCenter}> <View style={Styles.rowItemsCenter}>
<MenuItemRow <MenuItemRow
icon={<MaterialCommunityIcons name="toggle-switch-off-outline" color="black" size={25} />} icon={<MaterialCommunityIcons name="toggle-switch-off-outline" color="black" size={25} />}
@@ -211,14 +215,16 @@ export default function Index() {
title="Edit" title="Edit"
onPress={() => { onPress={() => {
setModal(false) setModal(false)
setVisibleEdit(true) setTimeout(() => {
setVisibleEdit(true)
}, 600)
}} }}
/> />
</View> </View>
</DrawerBottom> </DrawerBottom>
<DrawerBottom animation="none" height={30} backdropPressable={false} isVisible={isVisibleEdit} setVisible={setVisibleEdit} title="Edit Jabatan"> <DrawerBottom animation="none" keyboard height={30} backdropPressable={false} isVisible={isVisibleEdit} setVisible={() => setVisibleEdit(false)} title="Edit Jabatan">
<View style={{ justifyContent: 'space-between', flex: 1 }}> <View style={{ justifyContent: 'space-between', flex: 1 }}>
<View> <View>
<InputForm <InputForm

View File

@@ -2,12 +2,13 @@ import AlertKonfirmasi from "@/components/alertKonfirmasi";
import ButtonBackHeader from "@/components/buttonBackHeader"; import ButtonBackHeader from "@/components/buttonBackHeader";
import { ButtonHeader } from "@/components/buttonHeader"; import { ButtonHeader } from "@/components/buttonHeader";
import ItemDetailMember from "@/components/itemDetailMember"; import ItemDetailMember from "@/components/itemDetailMember";
import Text from "@/components/Text";
import Styles from "@/constants/Styles"; import Styles from "@/constants/Styles";
import { useAuthSession } from "@/providers/AuthProvider"; import { useAuthSession } from "@/providers/AuthProvider";
import { AntDesign } from "@expo/vector-icons"; import { AntDesign } from "@expo/vector-icons";
import { router, Stack } from "expo-router"; import { router, Stack } from "expo-router";
import { useState } from "react"; import { useState } from "react";
import { Image, SafeAreaView, ScrollView, Text, View } from "react-native"; import { Image, SafeAreaView, ScrollView, View } from "react-native";
import { useSelector } from 'react-redux'; import { useSelector } from 'react-redux';
export default function Profile() { export default function Profile() {

View File

@@ -12,7 +12,8 @@ import { Ionicons, MaterialCommunityIcons } from "@expo/vector-icons"
import * as DocumentPicker from "expo-document-picker" import * as DocumentPicker from "expo-document-picker"
import { router, Stack, useLocalSearchParams } from "expo-router" import { router, Stack, useLocalSearchParams } from "expo-router"
import { useState } from "react" import { useState } from "react"
import { ActivityIndicator, SafeAreaView, ScrollView, Text, ToastAndroid, View } from "react-native" import { ActivityIndicator, SafeAreaView, ScrollView, Text, View } from "react-native"
import Toast from "react-native-toast-message"
import { useDispatch, useSelector } from "react-redux" import { useDispatch, useSelector } from "react-redux"
export default function ProjectAddFile() { export default function ProjectAddFile() {
@@ -25,20 +26,24 @@ export default function ProjectAddFile() {
const [loadingCheck, setLoadingCheck] = useState(false) const [loadingCheck, setLoadingCheck] = useState(false)
const dispatch = useDispatch() const dispatch = useDispatch()
const update = useSelector((state: any) => state.projectUpdate) const update = useSelector((state: any) => state.projectUpdate)
const [loading, setLoading] = useState(false)
const pickDocumentAsync = async () => { const pickDocumentAsync = async () => {
let result = await DocumentPicker.getDocumentAsync({ let result = await DocumentPicker.getDocumentAsync({
type: ["*/*"], type: ["*/*"],
multiple: false multiple: true
}); });
if (!result.canceled) { if (!result.canceled) {
if (result.assets?.[0].uri) { for (let i = 0; i < result.assets?.length; i++) {
const check = await handleCheckFile(result.assets?.[0]) if (result.assets?.[i].uri) {
if (check) { const check = await handleCheckFile(result.assets?.[i])
setFileForm([...fileForm, result.assets?.[0]]) if (check) {
setListFile([...listFile, result.assets?.[0].name]) setFileForm((prev) => [...prev, result.assets?.[i]])
} else { setListFile((prev) => [...prev, result.assets?.[i].name])
ToastAndroid.show('File sudah ada', ToastAndroid.SHORT) } else {
Toast.show({ type: 'small', text1: 'File yg telah terupload tidak bisa diupload ulang', })
}
} }
} }
} }
@@ -82,6 +87,7 @@ export default function ProjectAddFile() {
async function handleAddFile() { async function handleAddFile() {
try { try {
setLoading(true)
const hasil = await decryptToken(String(token?.current)) const hasil = await decryptToken(String(token?.current))
const fd = new FormData(); const fd = new FormData();
@@ -103,15 +109,17 @@ export default function ProjectAddFile() {
const response = await apiAddFileProject({ data: fd, id: id }) const response = await apiAddFileProject({ data: fd, id: id })
if (response.success) { if (response.success) {
ToastAndroid.show('Berhasil menambahkan file', ToastAndroid.SHORT) Toast.show({ type: 'small', text1: 'Berhasil menambahkan file', })
dispatch(setUpdateProject({ ...update, file: !update.file })) dispatch(setUpdateProject({ ...update, file: !update.file }))
router.back() router.back()
} else { } else {
ToastAndroid.show(response.message, ToastAndroid.SHORT) Toast.show({ type: 'small', text1: response.message, })
} }
} catch (error) { } catch (error) {
console.error(error); console.error(error);
ToastAndroid.show('Terjadi kesalahan', ToastAndroid.SHORT) Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
} finally {
setLoading(false)
} }
} }
@@ -126,7 +134,7 @@ export default function ProjectAddFile() {
headerTitle: 'Tambah File', headerTitle: 'Tambah File',
headerTitleAlign: 'center', headerTitleAlign: 'center',
headerRight: () => <ButtonSaveHeader headerRight: () => <ButtonSaveHeader
disable={fileForm.length == 0 ? true : false} disable={fileForm.length == 0 || loading ? true : false}
category="create" category="create"
onPress={() => { handleAddFile() }} /> onPress={() => { handleAddFile() }} />
}} }}
@@ -158,6 +166,9 @@ export default function ProjectAddFile() {
{ {
loadingCheck && <ActivityIndicator size="small" /> loadingCheck && <ActivityIndicator size="small" />
} }
{
loading && <ActivityIndicator size="large" />
}
</View> </View>
</ScrollView> </ScrollView>
<DrawerBottom animation="slide" isVisible={isModal} setVisible={setModal} title="Menu"> <DrawerBottom animation="slide" isVisible={isModal} setVisible={setModal} title="Menu">

View File

@@ -3,6 +3,7 @@ import ButtonSaveHeader from "@/components/buttonSaveHeader";
import ImageUser from "@/components/imageNew"; import ImageUser from "@/components/imageNew";
import ImageWithLabel from "@/components/imageWithLabel"; import ImageWithLabel from "@/components/imageWithLabel";
import InputSearch from "@/components/inputSearch"; import InputSearch from "@/components/inputSearch";
import Text from "@/components/Text";
import Styles from "@/constants/Styles"; import Styles from "@/constants/Styles";
import { apiAddMemberProject, apiGetProjectOne, apiGetUser } from "@/lib/api"; import { apiAddMemberProject, apiGetProjectOne, apiGetUser } from "@/lib/api";
import { setUpdateProject } from "@/lib/projectUpdate"; import { setUpdateProject } from "@/lib/projectUpdate";
@@ -10,7 +11,8 @@ import { useAuthSession } from "@/providers/AuthProvider";
import { AntDesign } from "@expo/vector-icons"; import { AntDesign } from "@expo/vector-icons";
import { router, Stack, useLocalSearchParams } from "expo-router"; import { router, Stack, useLocalSearchParams } from "expo-router";
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
import { Pressable, SafeAreaView, ScrollView, Text, ToastAndroid, View } from "react-native"; import { Pressable, SafeAreaView, ScrollView, View } from "react-native";
import Toast from "react-native-toast-message";
import { useDispatch, useSelector } from "react-redux"; import { useDispatch, useSelector } from "react-redux";
type Props = { type Props = {
@@ -29,6 +31,7 @@ export default function AddMemberProject() {
const [idGroup, setIdGroup] = useState('') const [idGroup, setIdGroup] = useState('')
const [selectMember, setSelectMember] = useState<any[]>([]) const [selectMember, setSelectMember] = useState<any[]>([])
const [search, setSearch] = useState('') const [search, setSearch] = useState('')
const [loading, setLoading] = useState(false)
async function handleLoad() { async function handleLoad() {
try { try {
@@ -41,6 +44,7 @@ export default function AddMemberProject() {
setData(responsemember.data.filter((i: any) => i.idUserRole != 'supadmin')) setData(responsemember.data.filter((i: any) => i.idUserRole != 'supadmin'))
} catch (error) { } catch (error) {
console.error(error) console.error(error)
Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
} }
} }
@@ -71,15 +75,19 @@ export default function AddMemberProject() {
async function handleAddMember() { async function handleAddMember() {
try { try {
setLoading(true)
const hasil = await decryptToken(String(token?.current)) const hasil = await decryptToken(String(token?.current))
const response = await apiAddMemberProject({ id: id, data: { user: hasil, member: selectMember } }) const response = await apiAddMemberProject({ id: id, data: { user: hasil, member: selectMember } })
if (response.success) { if (response.success) {
ToastAndroid.show('Berhasil menambahkan anggota', ToastAndroid.SHORT) Toast.show({ type: 'small', text1: 'Berhasil menambahkan anggota', })
dispatch(setUpdateProject({ ...update, member: !update.member })) dispatch(setUpdateProject({ ...update, member: !update.member }))
router.back() router.back()
} }
} catch (error) { } catch (error) {
console.error(error) console.error(error)
Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
} finally {
setLoading(false)
} }
} }
@@ -94,7 +102,7 @@ export default function AddMemberProject() {
headerRight: () => ( headerRight: () => (
<ButtonSaveHeader <ButtonSaveHeader
category="update" category="update"
disable={selectMember.length > 0 ? false : true} disable={selectMember.length == 0 || loading ? true : false}
onPress={() => { onPress={() => {
handleAddMember() handleAddMember()
}} }}
@@ -148,7 +156,7 @@ export default function AddMemberProject() {
</View> </View>
</View> </View>
{ {
selectMember.some((i: any) => i.idUser == item.id) && <AntDesign name="check" size={20} /> selectMember.some((i: any) => i.idUser == item.id) && <AntDesign name="check" size={20} color={'black'}/>
} }
</Pressable> </Pressable>
) )

View File

@@ -1,26 +1,32 @@
import ButtonBackHeader from "@/components/buttonBackHeader"; import ButtonBackHeader from "@/components/buttonBackHeader";
import ButtonSaveHeader from "@/components/buttonSaveHeader"; import ButtonSaveHeader from "@/components/buttonSaveHeader";
import { InputForm } from "@/components/inputForm"; import { InputForm } from "@/components/inputForm";
import Text from "@/components/Text";
import Styles from "@/constants/Styles"; import Styles from "@/constants/Styles";
import { apiCreateProjectTask } from "@/lib/api"; import { apiCreateProjectTask } from "@/lib/api";
import { setUpdateProject } from "@/lib/projectUpdate"; import { setUpdateProject } from "@/lib/projectUpdate";
import { useAuthSession } from "@/providers/AuthProvider"; import { useAuthSession } from "@/providers/AuthProvider";
import 'intl';
import 'intl/locale-data/jsonp/id';
import dayjs from "dayjs"; import dayjs from "dayjs";
import { router, Stack, useLocalSearchParams } from "expo-router"; import { router, Stack, useLocalSearchParams } from "expo-router";
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
import { import {
KeyboardAvoidingView,
Platform,
SafeAreaView, SafeAreaView,
ScrollView, ScrollView,
Text, View
ToastAndroid,
View,
} from "react-native"; } from "react-native";
import Toast from "react-native-toast-message";
import DateTimePicker, { import DateTimePicker, {
DateType DateType
} from "react-native-ui-datepicker"; } from "react-native-ui-datepicker";
import { useDispatch, useSelector } from "react-redux"; import { useDispatch, useSelector } from "react-redux";
import { useHeaderHeight } from '@react-navigation/elements';
export default function ProjectAddTask() { export default function ProjectAddTask() {
const headerHeight = useHeaderHeight();
const { token, decryptToken } = useAuthSession() const { token, decryptToken } = useAuthSession()
const dispatch = useDispatch() const dispatch = useDispatch()
const update = useSelector((state: any) => state.projectUpdate) const update = useSelector((state: any) => state.projectUpdate)
@@ -36,6 +42,7 @@ export default function ProjectAddTask() {
title: false, title: false,
}) })
const [title, setTitle] = useState(''); const [title, setTitle] = useState('');
const [loading, setLoading] = useState(false)
const from = range.startDate const from = range.startDate
? dayjs(range.startDate).format("DD-MM-YYYY") ? dayjs(range.startDate).format("DD-MM-YYYY")
@@ -67,15 +74,21 @@ export default function ProjectAddTask() {
async function handleCreate() { async function handleCreate() {
try { try {
setLoading(true)
const hasil = await decryptToken(String(token?.current)); const hasil = await decryptToken(String(token?.current));
const response = await apiCreateProjectTask({ data: { name: title, dateStart: dayjs(range.startDate).format("YYYY-MM-DD"), dateEnd: dayjs(range.endDate).format("YYYY-MM-DD"), user: hasil }, id }); const response = await apiCreateProjectTask({ data: { name: title, dateStart: dayjs(range.startDate).format("YYYY-MM-DD"), dateEnd: dayjs(range.endDate).format("YYYY-MM-DD"), user: hasil }, id });
if (response.success) { if (response.success) {
dispatch(setUpdateProject({ ...update, task: !update.task, progress: !update.progress })) dispatch(setUpdateProject({ ...update, task: !update.task, progress: !update.progress }))
ToastAndroid.show("Berhasil menambah data", ToastAndroid.SHORT); Toast.show({ type: 'small', text1: 'Berhasil menambah data', })
router.back(); router.back();
} else {
Toast.show({ type: 'small', text1: response.message, })
} }
} catch (error) { } catch (error) {
console.error(error); console.error(error);
Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
} finally {
setLoading(false)
} }
} }
@@ -94,66 +107,78 @@ export default function ProjectAddTask() {
headerTitleAlign: "center", headerTitleAlign: "center",
headerRight: () => ( headerRight: () => (
<ButtonSaveHeader <ButtonSaveHeader
disable={disable} disable={disable || loading}
category="create" category="create"
onPress={() => { handleCreate() }} onPress={() => { handleCreate() }}
/> />
), ),
}} }}
/> />
<ScrollView> <KeyboardAvoidingView
<View style={[Styles.p15, Styles.mb100]}> behavior={Platform.OS === 'ios' ? 'padding' : undefined}
<View style={[Styles.wrapPaper, Styles.p10]}> keyboardVerticalOffset={headerHeight}
<DateTimePicker >
mode="range" <ScrollView>
startDate={range.startDate} <View style={[Styles.p15, Styles.mb100]}>
endDate={range.endDate} <View style={[Styles.wrapPaper, Styles.p10]}>
onChange={(param) => setRange(param)} <DateTimePicker
styles={{ mode="range"
selected: Styles.selectedDate, startDate={range.startDate}
selected_label: Styles.cWhite, endDate={range.endDate}
range_fill: Styles.selectRangeDate, onChange={(param) => setRange(param)}
styles={{
selected: Styles.selectedDate,
selected_label: Styles.cWhite,
range_fill: Styles.selectRangeDate,
month_label: Styles.cBlack,
month_selector_label: Styles.cBlack,
year_label: Styles.cBlack,
year_selector_label: Styles.cBlack,
day_label: Styles.cBlack,
time_label: Styles.cBlack,
weekday_label: Styles.cBlack,
}}
/>
</View>
<View style={[Styles.mv10]}>
<View style={[Styles.rowSpaceBetween]}>
<View style={[{ width: "48%" }]}>
<Text style={[Styles.mb05]}>
Tanggal Mulai <Text style={Styles.cError}>*</Text>
</Text>
<View style={[Styles.wrapPaper, Styles.p10]}>
<Text style={{ textAlign: "center" }}>{from}</Text>
</View>
</View>
<View style={[{ width: "48%" }]}>
<Text style={[Styles.mb05]}>
Tanggal Berakhir <Text style={Styles.cError}>*</Text>
</Text>
<View style={[Styles.wrapPaper, Styles.p10]}>
<Text style={{ textAlign: "center" }}>{to}</Text>
</View>
</View>
</View>
{
(error.endDate || error.startDate) && <Text style={[Styles.textInformation, Styles.cError, Styles.mt05]}>Tanggal tidak boleh kosong</Text>
}
</View>
<InputForm
label="Judul Tugas"
type="default"
placeholder="Judul Tugas"
required
bg="white"
value={title}
error={error.title}
errorText="Judul tidak boleh kosong"
onChange={(e) => {
onValidation("title", e)
}} }}
/> />
</View> </View>
<View style={[Styles.mv10]}> </ScrollView>
<View style={[Styles.rowSpaceBetween]}> </KeyboardAvoidingView>
<View style={[{ width: "48%" }]}>
<Text style={[Styles.mb05]}>
Tanggal Mulai <Text style={Styles.cError}>*</Text>
</Text>
<View style={[Styles.wrapPaper, Styles.p10]}>
<Text style={{ textAlign: "center" }}>{from}</Text>
</View>
</View>
<View style={[{ width: "48%" }]}>
<Text style={[Styles.mb05]}>
Tanggal Berakhir <Text style={Styles.cError}>*</Text>
</Text>
<View style={[Styles.wrapPaper, Styles.p10]}>
<Text style={{ textAlign: "center" }}>{to}</Text>
</View>
</View>
</View>
{
(error.endDate || error.startDate) && <Text style={[Styles.textInformation, Styles.cError, Styles.mt05]}>Tanggal tidak boleh kosong</Text>
}
</View>
<InputForm
label="Judul Tugas"
type="default"
placeholder="Judul Tugas"
required
bg="white"
value={title}
error={error.title}
errorText="Judul tidak boleh kosong"
onChange={(e) => {
onValidation("title", e)
}}
/>
</View>
</ScrollView>
</SafeAreaView> </SafeAreaView>
); );
} }

View File

@@ -7,7 +7,8 @@ import { setUpdateProject } from "@/lib/projectUpdate";
import { useAuthSession } from "@/providers/AuthProvider"; import { useAuthSession } from "@/providers/AuthProvider";
import { router, Stack, useLocalSearchParams } from "expo-router"; import { router, Stack, useLocalSearchParams } from "expo-router";
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
import { SafeAreaView, ScrollView, ToastAndroid, View } from "react-native"; import { SafeAreaView, ScrollView, View } from "react-native";
import Toast from "react-native-toast-message";
import { useDispatch, useSelector } from "react-redux"; import { useDispatch, useSelector } from "react-redux";
export default function ProjectCancel() { export default function ProjectCancel() {
@@ -18,13 +19,14 @@ export default function ProjectCancel() {
const [reason, setReason] = useState(""); const [reason, setReason] = useState("");
const [error, setError] = useState(false); const [error, setError] = useState(false);
const [disable, setDisable] = useState(false); const [disable, setDisable] = useState(false);
const [loading, setLoading] = useState(false)
function onValidation(val: string) { function onValidation(val: string) {
setReason(val) setReason(val)
if (val == "" || val == "null") { if (val == "" || val == "null") {
setError(true) setError(true)
}else{ } else {
setError(false) setError(false)
} }
} }
@@ -43,6 +45,7 @@ export default function ProjectCancel() {
async function handleCancel() { async function handleCancel() {
try { try {
setLoading(true)
const hasil = await decryptToken(String(token?.current)); const hasil = await decryptToken(String(token?.current));
const response = await apiCancelProject({ const response = await apiCancelProject({
reason: reason, reason: reason,
@@ -50,11 +53,14 @@ export default function ProjectCancel() {
}, id); }, id);
if (response.success) { if (response.success) {
dispatch(setUpdateProject({ ...update, data: !update.data })) dispatch(setUpdateProject({ ...update, data: !update.data }))
ToastAndroid.show("Berhasil membatalkan kegiatan", ToastAndroid.SHORT); Toast.show({ type: 'small', text1: 'Berhasil membatalkan kegiatan', })
router.back(); router.back();
} }
} catch (error) { } catch (error) {
console.error(error); console.error(error);
Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
} finally {
setLoading(false)
} }
} }
@@ -73,7 +79,7 @@ export default function ProjectCancel() {
headerTitleAlign: "center", headerTitleAlign: "center",
headerRight: () => ( headerRight: () => (
<ButtonSaveHeader <ButtonSaveHeader
disable={disable} disable={disable || loading}
category="cancel" category="cancel"
onPress={() => { onPress={() => {
handleCancel(); handleCancel();

View File

@@ -7,7 +7,8 @@ import { setUpdateProject } from "@/lib/projectUpdate";
import { useAuthSession } from "@/providers/AuthProvider"; import { useAuthSession } from "@/providers/AuthProvider";
import { router, Stack, useLocalSearchParams } from "expo-router"; import { router, Stack, useLocalSearchParams } from "expo-router";
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
import { SafeAreaView, ScrollView, ToastAndroid, View } from "react-native"; import { SafeAreaView, ScrollView, View } from "react-native";
import Toast from "react-native-toast-message";
import { useDispatch, useSelector } from "react-redux"; import { useDispatch, useSelector } from "react-redux";
export default function EditProject() { export default function EditProject() {
@@ -18,6 +19,7 @@ export default function EditProject() {
const [judul, setJudul] = useState(""); const [judul, setJudul] = useState("");
const [error, setError] = useState(false); const [error, setError] = useState(false);
const [disable, setDisable] = useState(false); const [disable, setDisable] = useState(false);
const [loading, setLoading] = useState(false)
async function handleLoad() { async function handleLoad() {
try { try {
@@ -58,6 +60,7 @@ export default function EditProject() {
async function handleUpdate() { async function handleUpdate() {
try { try {
setLoading(true)
const hasil = await decryptToken(String(token?.current)); const hasil = await decryptToken(String(token?.current));
const response = await apiEditProject({ const response = await apiEditProject({
name: judul, name: judul,
@@ -65,11 +68,16 @@ export default function EditProject() {
}, id); }, id);
if (response.success) { if (response.success) {
dispatch(setUpdateProject({ ...update, data: !update.data })) dispatch(setUpdateProject({ ...update, data: !update.data }))
ToastAndroid.show("Berhasil mengubah data", ToastAndroid.SHORT); Toast.show({ type: 'small', text1: 'Berhasil mengubah data', })
router.back(); router.back();
} else {
Toast.show({ type: 'small', text1: response.message, })
} }
} catch (error) { } catch (error) {
console.error(error); console.error(error);
Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
} finally {
setLoading(false)
} }
} }
@@ -90,7 +98,7 @@ export default function EditProject() {
headerTitleAlign: "center", headerTitleAlign: "center",
headerRight: () => ( headerRight: () => (
<ButtonSaveHeader <ButtonSaveHeader
disable={disable} disable={disable || loading}
category="update" category="update"
onPress={() => { handleUpdate() }} onPress={() => { handleUpdate() }}
/> />

View File

@@ -10,7 +10,7 @@ import { apiGetProjectOne } from "@/lib/api";
import { useAuthSession } from "@/providers/AuthProvider"; import { useAuthSession } from "@/providers/AuthProvider";
import { router, Stack, useLocalSearchParams } from "expo-router"; import { router, Stack, useLocalSearchParams } from "expo-router";
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
import { SafeAreaView, ScrollView, View } from "react-native"; import { RefreshControl, SafeAreaView, ScrollView, View } from "react-native";
import { useSelector } from "react-redux"; import { useSelector } from "react-redux";
@@ -37,6 +37,7 @@ export default function DetailProject() {
const update = useSelector((state: any) => state.projectUpdate) const update = useSelector((state: any) => state.projectUpdate)
const [isMember, setIsMember] = useState(false) const [isMember, setIsMember] = useState(false)
const entityUser = useSelector((state: any) => state.user) const entityUser = useSelector((state: any) => state.user)
const [refreshing, setRefreshing] = useState(false)
async function handleLoad(cat: 'data' | 'progress') { async function handleLoad(cat: 'data' | 'progress') {
try { try {
@@ -79,6 +80,14 @@ export default function DetailProject() {
}, []) }, [])
const handleRefresh = async () => {
setRefreshing(true)
await handleLoad('data')
await handleLoad('progress')
await new Promise(resolve => setTimeout(resolve, 2000));
setRefreshing(false)
};
return ( return (
<SafeAreaView> <SafeAreaView>
<Stack.Screen <Stack.Screen
@@ -89,15 +98,22 @@ export default function DetailProject() {
headerRight: () => (entityUser.role == "user" || entityUser.role == "coadmin") && !isMember ? null : <HeaderRightProjectDetail id={id} status={data?.status} />, headerRight: () => (entityUser.role == "user" || entityUser.role == "coadmin") && !isMember ? null : <HeaderRightProjectDetail id={id} status={data?.status} />,
}} }}
/> />
<ScrollView> <ScrollView
refreshControl={
<RefreshControl
refreshing={refreshing}
onRefresh={handleRefresh}
/>
}
>
<View style={[Styles.p15, Styles.mb100]}> <View style={[Styles.p15, Styles.mb100]}>
{ {
data?.reason != null && data?.reason != "" && <SectionCancel text={data?.reason} /> data?.reason != null && data?.reason != "" && <SectionCancel text={data?.reason} />
} }
<SectionProgress text={`Kemajuan Kegiatan ${progress}%`} progress={progress} /> <SectionProgress text={`Kemajuan Kegiatan ${progress}%`} progress={progress} />
<SectionTanggalTugasProject status={data?.status} member={isMember} /> <SectionTanggalTugasProject status={data?.status} member={isMember} refreshing={refreshing}/>
<SectionFile status={data?.status} member={isMember} /> <SectionFile status={data?.status} member={isMember} refreshing={refreshing} />
<SectionMember status={data?.status} /> <SectionMember status={data?.status} refreshing={refreshing} />
</View> </View>
</ScrollView> </ScrollView>
</SafeAreaView> </SafeAreaView>

View File

@@ -9,8 +9,10 @@ import MenuItemRow from "@/components/menuItemRow";
import ModalSelect from "@/components/modalSelect"; import ModalSelect from "@/components/modalSelect";
import SectionListAddTask from "@/components/project/sectionListAddTask"; import SectionListAddTask from "@/components/project/sectionListAddTask";
import SelectForm from "@/components/selectForm"; import SelectForm from "@/components/selectForm";
import Text from "@/components/Text";
import Styles from "@/constants/Styles"; import Styles from "@/constants/Styles";
import { apiCreateProject } from "@/lib/api"; import { apiCreateProject } from "@/lib/api";
import { setGroupChoose } from "@/lib/groupChoose";
import { setMemberChoose } from "@/lib/memberChoose"; import { setMemberChoose } from "@/lib/memberChoose";
import { setUpdateProject } from "@/lib/projectUpdate"; import { setUpdateProject } from "@/lib/projectUpdate";
import { setTaskCreate } from "@/lib/taskCreate"; import { setTaskCreate } from "@/lib/taskCreate";
@@ -22,13 +24,13 @@ import { useEffect, useState } from "react";
import { import {
SafeAreaView, SafeAreaView,
ScrollView, ScrollView,
Text, View
ToastAndroid,
View,
} from "react-native"; } from "react-native";
import Toast from "react-native-toast-message";
import { useDispatch, useSelector } from "react-redux"; import { useDispatch, useSelector } from "react-redux";
export default function CreateProject() { export default function CreateProject() {
const [loading, setLoading] = useState(false)
const { token, decryptToken } = useAuthSession(); const { token, decryptToken } = useAuthSession();
const [chooseGroup, setChooseGroup] = useState({ val: "", label: "" }); const [chooseGroup, setChooseGroup] = useState({ val: "", label: "" });
const dispatch = useDispatch(); const dispatch = useDispatch();
@@ -39,7 +41,6 @@ export default function CreateProject() {
const taskCreate = useSelector((state: any) => state.taskCreate); const taskCreate = useSelector((state: any) => state.taskCreate);
const update = useSelector((state: any) => state.projectUpdate) const update = useSelector((state: any) => state.projectUpdate)
const entityUser = useSelector((state: any) => state.user); const entityUser = useSelector((state: any) => state.user);
const userLogin = useSelector((state: any) => state.entities)
const [fileForm, setFileForm] = useState<any[]>([]) const [fileForm, setFileForm] = useState<any[]>([])
const [indexDelFile, setIndexDelFile] = useState<number>(0) const [indexDelFile, setIndexDelFile] = useState<number>(0)
const [disableBtn, setDisableBtn] = useState(true) const [disableBtn, setDisableBtn] = useState(true)
@@ -55,10 +56,21 @@ export default function CreateProject() {
member: false, member: false,
}); });
const [hitung, setHitung] = useState(0) const [hitung, setHitung] = useState(0)
let hitungRefresh = 0;
useEffect(() => {
if (hitungRefresh == 0) {
dispatch(setGroupChoose(''));
dispatch(setTaskCreate([]));
dispatch(setMemberChoose([]));
}
hitungRefresh++;
}, []);
function validationForm(cat: string, val: any, label?: string) { function validationForm(cat: string, val: any, label?: string) {
if (cat == "group") { if (cat == "group") {
setChooseGroup({ val, label: String(label) }); setChooseGroup({ val, label: String(label) });
dispatch(setGroupChoose(val));
dispatch(setMemberChoose([])); dispatch(setMemberChoose([]));
setDataForm({ ...dataForm, idGroup: val }); setDataForm({ ...dataForm, idGroup: val });
if (val == "" || val == "null") { if (val == "" || val == "null") {
@@ -91,6 +103,7 @@ export default function CreateProject() {
} }
function handleBack() { function handleBack() {
dispatch(setGroupChoose(''));
dispatch(setTaskCreate([])); dispatch(setTaskCreate([]));
dispatch(setMemberChoose([])); dispatch(setMemberChoose([]));
router.back(); router.back();
@@ -102,6 +115,7 @@ export default function CreateProject() {
async function handleCreate() { async function handleCreate() {
try { try {
setLoading(true)
const hasil = await decryptToken(String(token?.current)) const hasil = await decryptToken(String(token?.current))
const fd = new FormData() const fd = new FormData()
@@ -120,13 +134,16 @@ export default function CreateProject() {
const response = await apiCreateProject(fd) const response = await apiCreateProject(fd)
if (response.success) { if (response.success) {
dispatch(setUpdateProject({ ...update, data: !update.data })) dispatch(setUpdateProject({ ...update, data: !update.data }))
ToastAndroid.show('Berhasil menambahkan data', ToastAndroid.SHORT) Toast.show({ type: 'small', text1: 'Berhasil menambahkan data', })
handleBack() handleBack()
} else { } else {
ToastAndroid.show(response.message, ToastAndroid.SHORT) Toast.show({ type: 'small', text1: response.message, })
} }
} catch (error) { } catch (error) {
console.error(error) console.error(error)
Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
} finally {
setLoading(false)
} }
} }
@@ -146,11 +163,13 @@ export default function CreateProject() {
const pickDocumentAsync = async () => { const pickDocumentAsync = async () => {
let result = await DocumentPicker.getDocumentAsync({ let result = await DocumentPicker.getDocumentAsync({
type: ["*/*"], type: ["*/*"],
multiple: false multiple: true
}); });
if (!result.canceled) { if (!result.canceled) {
if (result.assets[0].uri) { for (let i = 0; i < result.assets?.length; i++) {
setFileForm([...fileForm, result.assets[0]]) if (result.assets[i].uri) {
setFileForm((prev) => [...prev, result.assets[i]])
}
} }
} }
}; };
@@ -176,7 +195,7 @@ export default function CreateProject() {
headerTitleAlign: "center", headerTitleAlign: "center",
headerRight: () => ( headerRight: () => (
<ButtonSaveHeader <ButtonSaveHeader
disable={disableBtn} disable={disableBtn || loading}
category="create" category="create"
onPress={() => { onPress={() => {
handleCreate() handleCreate()
@@ -232,19 +251,18 @@ export default function CreateProject() {
onPress={() => { onPress={() => {
if (entityUser.role == "supadmin" || entityUser.role == "developer") { if (entityUser.role == "supadmin" || entityUser.role == "developer") {
if (chooseGroup.val != "") { if (chooseGroup.val != "") {
setSelect(true); // setSelect(true);
setValSelect("member"); // setValSelect("member");
router.push(`/project/create/member`);
} else { } else {
ToastAndroid.show( Toast.show({ type: 'small', text1: "Pilih Lembaga Desa terlebih dahulu", })
"Pilih Lembaga Desa terlebih dahulu",
ToastAndroid.SHORT
);
} }
} else { } else {
validationForm('group', userLogin.idGroup, userLogin.group); router.push(`/project/create/member`);
setValChoose(userLogin.idGroup) // validationForm('group', userLogin.idGroup, userLogin.group);
setSelect(true); // setValChoose(userLogin.idGroup)
setValSelect("member"); // setSelect(true);
// setValSelect("member");
} }
}} }}
error={error.member} error={error.member}

View File

@@ -0,0 +1,147 @@
import ButtonBackHeader from "@/components/buttonBackHeader";
import ButtonSaveHeader from "@/components/buttonSaveHeader";
import ImageUser from "@/components/imageNew";
import ImageWithLabel from "@/components/imageWithLabel";
import InputSearch from "@/components/inputSearch";
import Text from "@/components/Text";
import Styles from "@/constants/Styles";
import { apiGetUser } from "@/lib/api";
import { setMemberChoose } from "@/lib/memberChoose";
import { useAuthSession } from "@/providers/AuthProvider";
import { AntDesign } from "@expo/vector-icons";
import { router, Stack } from "expo-router";
import { useEffect, useState } from "react";
import { Pressable, SafeAreaView, ScrollView, View } from "react-native";
import Toast from "react-native-toast-message";
import { useDispatch, useSelector } from "react-redux";
type Props = {
idUser: string,
name: string,
img: string
}
export default function AddMemberCreateProject() {
const dispatch = useDispatch()
const { token, decryptToken } = useAuthSession()
const [data, setData] = useState<Props[]>([])
const [selectMember, setSelectMember] = useState<any[]>([])
const [search, setSearch] = useState('')
const entitiesMember = useSelector((state: any) => state.memberChoose)
const entitiesGroup = useSelector((state: any) => state.groupChoose)
const entityUser = useSelector((state: any) => state.user)
const userLogin = useSelector((state: any) => state.entities)
async function handleLoadMember() {
const hasil = await decryptToken(String(token?.current))
let groupFix = userLogin.idGroup
if (entityUser.role == 'supadmin' || entityUser.role == 'developer') {
groupFix = entitiesGroup
}
const responMemberDivision = await apiGetUser({ user: hasil, active: "true", search: search, group: groupFix })
setData(responMemberDivision.data.filter((i: any) => i.idUserRole != 'supadmin'))
if (entitiesMember.length > 0) {
setSelectMember(entitiesMember)
}
}
useEffect(() => {
handleLoadMember()
}, [search]);
function onChoose(val: string, label: string, img?: string) {
if (selectMember.some((i: any) => i.idUser == val)) {
setSelectMember(selectMember.filter((i: any) => i.idUser != val))
} else {
setSelectMember([...selectMember, { idUser: val, name: label, img }])
}
}
async function handleAddMember() {
try {
dispatch(setMemberChoose(selectMember))
router.back()
} catch (error) {
console.error(error)
Toast.show({ type: 'small', text1: 'Gagal menambahkan anggota', })
}
}
return (
<SafeAreaView>
<Stack.Screen
options={{
headerLeft: () => <ButtonBackHeader onPress={() => { router.back() }} />,
headerTitle: 'Pilih Anggota',
headerTitleAlign: 'center',
headerRight: () => (
<ButtonSaveHeader
category="create"
disable={selectMember.length > 0 ? false : true}
onPress={() => {
handleAddMember()
}}
/>
)
}}
/>
<View style={[Styles.p15]}>
<InputSearch onChange={(val) => setSearch(val)} value={search} />
{
selectMember.length > 0
?
<View>
<ScrollView horizontal style={[Styles.mb10, Styles.pv10]}>
{
selectMember.map((item: any, index: any) => (
<ImageWithLabel
key={index}
label={item.name}
src={`https://wibu-storage.wibudev.com/api/files/${item.img}`}
onClick={() => onChoose(item.idUser, item.name, item.img)}
/>
))
}
</ScrollView>
</View>
:
<Text style={[Styles.textDefault, Styles.cGray, Styles.pv05, { textAlign: 'center' }]}>Tidak ada member yang dipilih</Text>
}
<ScrollView>
{
data.length > 0 ?
data.map((item: any, index: any) => {
return (
<Pressable
key={index}
style={[Styles.itemSelectModal]}
onPress={() => {
onChoose(item.id, item.name, item.img)
}}
>
<View style={[Styles.rowItemsCenter]}>
<ImageUser src={`https://wibu-storage.wibudev.com/api/files/${item.img}`} border />
<View style={[Styles.ml10]}>
<Text style={[Styles.textDefault]}>{item.name}</Text>
</View>
</View>
{
selectMember.some((i: any) => i.idUser == item.id) && <AntDesign name="check" size={20} color={'black'} />
}
</Pressable>
)
}
)
:
<Text style={[Styles.textDefault, { textAlign: 'center' }]}>Tidak ada data</Text>
}
</ScrollView>
</View>
</SafeAreaView>
)
}

View File

@@ -1,23 +1,29 @@
import ButtonBackHeader from "@/components/buttonBackHeader"; import ButtonBackHeader from "@/components/buttonBackHeader";
import ButtonSaveHeader from "@/components/buttonSaveHeader"; import ButtonSaveHeader from "@/components/buttonSaveHeader";
import { InputForm } from "@/components/inputForm"; import { InputForm } from "@/components/inputForm";
import Text from "@/components/Text";
import Styles from "@/constants/Styles"; import Styles from "@/constants/Styles";
import { setTaskCreate } from "@/lib/taskCreate"; import { setTaskCreate } from "@/lib/taskCreate";
import dayjs from "dayjs"; import dayjs from "dayjs";
import { router, Stack } from "expo-router"; import { router, Stack } from "expo-router";
import 'intl';
import 'intl/locale-data/jsonp/id';
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
import { import {
KeyboardAvoidingView,
Platform,
SafeAreaView, SafeAreaView,
ScrollView, ScrollView,
Text,
View View
} from "react-native"; } from "react-native";
import DateTimePicker, { import DateTimePicker, {
DateType DateType
} from "react-native-ui-datepicker"; } from "react-native-ui-datepicker";
import { useDispatch, useSelector } from "react-redux"; import { useDispatch, useSelector } from "react-redux";
import { useHeaderHeight } from '@react-navigation/elements';
export default function CreateProjectAddTask() { export default function CreateProjectAddTask() {
const headerHeight = useHeaderHeight();
const dispatch = useDispatch() const dispatch = useDispatch()
const [disable, setDisable] = useState(true); const [disable, setDisable] = useState(true);
const [range, setRange] = useState<{ const [range, setRange] = useState<{
@@ -97,59 +103,71 @@ export default function CreateProjectAddTask() {
), ),
}} }}
/> />
<ScrollView> <KeyboardAvoidingView
<View style={[Styles.p15, Styles.mb100]}> behavior={Platform.OS === 'ios' ? 'padding' : undefined}
<View style={[Styles.wrapPaper, Styles.p10]}> keyboardVerticalOffset={headerHeight}
<DateTimePicker >
mode="range" <ScrollView>
startDate={range.startDate} <View style={[Styles.p15, Styles.mb100]}>
endDate={range.endDate} <View style={[Styles.wrapPaper, Styles.p10]}>
onChange={(param) => setRange(param)} <DateTimePicker
styles={{ mode="range"
selected: Styles.selectedDate, startDate={range.startDate}
selected_label: Styles.cWhite, endDate={range.endDate}
range_fill: Styles.selectRangeDate, onChange={(param) => setRange(param)}
styles={{
selected: Styles.selectedDate,
selected_label: Styles.cWhite,
range_fill: Styles.selectRangeDate,
month_label: Styles.cBlack,
month_selector_label: Styles.cBlack,
year_label: Styles.cBlack,
year_selector_label: Styles.cBlack,
day_label: Styles.cBlack,
time_label: Styles.cBlack,
weekday_label: Styles.cBlack,
}}
/>
</View>
<View style={[Styles.mv10]}>
<View style={[Styles.rowSpaceBetween]}>
<View style={[{ width: "48%" }]}>
<Text style={[Styles.mb05]}>
Tanggal Mulai <Text style={Styles.cError}>*</Text>
</Text>
<View style={[Styles.wrapPaper, Styles.p10]}>
<Text style={{ textAlign: "center" }}>{from}</Text>
</View>
</View>
<View style={[{ width: "48%" }]}>
<Text style={[Styles.mb05]}>
Tanggal Berakhir <Text style={Styles.cError}>*</Text>
</Text>
<View style={[Styles.wrapPaper, Styles.p10]}>
<Text style={{ textAlign: "center" }}>{to}</Text>
</View>
</View>
</View>
{
(error.endDate || error.startDate) && <Text style={[Styles.textInformation, Styles.cError, Styles.mt05]}>Tanggal tidak boleh kosong</Text>
}
</View>
<InputForm
label="Judul Tugas"
type="default"
placeholder="Judul Tugas"
required
bg="white"
value={title}
error={error.title}
errorText="Judul tidak boleh kosong"
onChange={(e) => {
onValidation("title", e)
}} }}
/> />
</View> </View>
<View style={[Styles.mv10]}> </ScrollView>
<View style={[Styles.rowSpaceBetween]}> </KeyboardAvoidingView>
<View style={[{ width: "48%" }]}>
<Text style={[Styles.mb05]}>
Tanggal Mulai <Text style={Styles.cError}>*</Text>
</Text>
<View style={[Styles.wrapPaper, Styles.p10]}>
<Text style={{ textAlign: "center" }}>{from}</Text>
</View>
</View>
<View style={[{ width: "48%" }]}>
<Text style={[Styles.mb05]}>
Tanggal Berakhir <Text style={Styles.cError}>*</Text>
</Text>
<View style={[Styles.wrapPaper, Styles.p10]}>
<Text style={{ textAlign: "center" }}>{to}</Text>
</View>
</View>
</View>
{
(error.endDate || error.startDate) && <Text style={[Styles.textInformation, Styles.cError, Styles.mt05]}>Tanggal tidak boleh kosong</Text>
}
</View>
<InputForm
label="Judul Tugas"
type="default"
placeholder="Judul Tugas"
required
bg="white"
value={title}
error={error.title}
errorText="Judul tidak boleh kosong"
onChange={(e) => {
onValidation("title", e)
}}
/>
</View>
</ScrollView>
</SafeAreaView> </SafeAreaView>
); );
} }

View File

@@ -6,6 +6,7 @@ import PaperGridContent from "@/components/paperGridContent";
import ProgressBar from "@/components/progressBar"; import ProgressBar from "@/components/progressBar";
import Skeleton from "@/components/skeleton"; import Skeleton from "@/components/skeleton";
import SkeletonTwoItem from "@/components/skeletonTwoItem"; import SkeletonTwoItem from "@/components/skeletonTwoItem";
import Text from "@/components/Text";
import { ColorsStatus } from "@/constants/ColorsStatus"; import { ColorsStatus } from "@/constants/ColorsStatus";
import Styles from "@/constants/Styles"; import Styles from "@/constants/Styles";
import { apiGetProject } from "@/lib/api"; import { apiGetProject } from "@/lib/api";
@@ -17,7 +18,7 @@ import {
} from "@expo/vector-icons"; } from "@expo/vector-icons";
import { router, useLocalSearchParams } from "expo-router"; import { router, useLocalSearchParams } from "expo-router";
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
import { Pressable, RefreshControl, ScrollView, Text, View, VirtualizedList } from "react-native"; import { Pressable, RefreshControl, ScrollView, View, VirtualizedList } from "react-native";
import { useSelector } from "react-redux"; import { useSelector } from "react-redux";
type Props = { type Props = {
@@ -219,7 +220,7 @@ export default function ListProject() {
data.length > 0 data.length > 0
? ?
isList ? ( isList ? (
<View> <View style={[Styles.h100]}>
<VirtualizedList <VirtualizedList
data={data} data={data}
getItemCount={() => data.length} getItemCount={() => data.length}
@@ -279,7 +280,7 @@ export default function ListProject() {
} */} } */}
</View> </View>
) : ( ) : (
<View> <View style={[Styles.h100]}>
<VirtualizedList <VirtualizedList
data={data} data={data}
getItemCount={() => data.length} getItemCount={() => data.length}

View File

@@ -1,18 +1,24 @@
import ButtonBackHeader from "@/components/buttonBackHeader"; import ButtonBackHeader from "@/components/buttonBackHeader";
import ButtonSaveHeader from "@/components/buttonSaveHeader"; import ButtonSaveHeader from "@/components/buttonSaveHeader";
import { InputForm } from "@/components/inputForm"; import { InputForm } from "@/components/inputForm";
import Text from "@/components/Text";
import Styles from "@/constants/Styles"; import Styles from "@/constants/Styles";
import { apiEditProjectTask, apiGetProjectTask } from "@/lib/api"; import { apiEditProjectTask, apiGetProjectTask } from "@/lib/api";
import { setUpdateProject } from "@/lib/projectUpdate"; import { setUpdateProject } from "@/lib/projectUpdate";
import { useAuthSession } from "@/providers/AuthProvider"; import { useAuthSession } from "@/providers/AuthProvider";
import { useHeaderHeight } from '@react-navigation/elements';
import dayjs from "dayjs"; import dayjs from "dayjs";
import { router, Stack, useLocalSearchParams } from "expo-router"; import { router, Stack, useLocalSearchParams } from "expo-router";
import 'intl';
import 'intl/locale-data/jsonp/id';
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
import { SafeAreaView, ScrollView, Text, ToastAndroid, View } from "react-native"; import { KeyboardAvoidingView, Platform, SafeAreaView, ScrollView, View } from "react-native";
import Toast from "react-native-toast-message";
import DateTimePicker, { DateType } from "react-native-ui-datepicker"; import DateTimePicker, { DateType } from "react-native-ui-datepicker";
import { useDispatch, useSelector } from "react-redux"; import { useDispatch, useSelector } from "react-redux";
export default function UpdateProjectTask() { export default function UpdateProjectTask() {
const headerHeight = useHeaderHeight();
const dispatch = useDispatch() const dispatch = useDispatch()
const update = useSelector((state: any) => state.projectUpdate) const update = useSelector((state: any) => state.projectUpdate)
const { token, decryptToken } = useAuthSession(); const { token, decryptToken } = useAuthSession();
@@ -22,6 +28,7 @@ export default function UpdateProjectTask() {
const [year, setYear] = useState<any>() const [year, setYear] = useState<any>()
const [loading, setLoading] = useState(true) const [loading, setLoading] = useState(true)
const [disableBtn, setDisableBtn] = useState(false) const [disableBtn, setDisableBtn] = useState(false)
const [loadingSubmit, setLoadingSubmit] = useState(false)
const [title, setTitle] = useState('') const [title, setTitle] = useState('')
const [error, setError] = useState({ const [error, setError] = useState({
@@ -63,15 +70,21 @@ export default function UpdateProjectTask() {
async function handleEdit() { async function handleEdit() {
try { try {
setLoadingSubmit(true)
const hasil = await decryptToken(String(token?.current)); const hasil = await decryptToken(String(token?.current));
const response = await apiEditProjectTask({ data: { title, dateStart: dayjs(range.startDate).format("YYYY-MM-DD"), dateEnd: dayjs(range.endDate).format("YYYY-MM-DD"), user: hasil }, id: detail }); const response = await apiEditProjectTask({ data: { title, dateStart: dayjs(range.startDate).format("YYYY-MM-DD"), dateEnd: dayjs(range.endDate).format("YYYY-MM-DD"), user: hasil }, id: detail });
if (response.success) { if (response.success) {
dispatch(setUpdateProject({ ...update, task: !update.task, progress: !update.progress })) dispatch(setUpdateProject({ ...update, task: !update.task, progress: !update.progress }))
ToastAndroid.show("Berhasil mengubah data", ToastAndroid.SHORT); Toast.show({ type: 'small', text1: 'Berhasil mengubah data', })
router.back(); router.back();
} else {
Toast.show({ type: 'small', text1: response.message, })
} }
} catch (error) { } catch (error) {
console.error(error); console.error(error);
Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
} finally {
setLoadingSubmit(false)
} }
} }
@@ -106,69 +119,80 @@ export default function UpdateProjectTask() {
headerTitle: 'Edit Tanggal dan Tugas', headerTitle: 'Edit Tanggal dan Tugas',
headerTitleAlign: 'center', headerTitleAlign: 'center',
headerRight: () => <ButtonSaveHeader headerRight: () => <ButtonSaveHeader
disable={disableBtn} disable={disableBtn || loadingSubmit}
category="update" category="update"
onPress={() => {handleEdit()}} onPress={() => { handleEdit() }}
/> />
}} }}
/> />
<ScrollView> <KeyboardAvoidingView
<View style={[Styles.p15, Styles.mb100]}> behavior={Platform.OS === 'ios' ? 'padding' : undefined}
<View style={[Styles.wrapPaper, Styles.p10]}> keyboardVerticalOffset={headerHeight}
{ >
!loading <ScrollView>
&& <View style={[Styles.p15, Styles.mb100]}>
<DateTimePicker <View style={[Styles.wrapPaper, Styles.p10]}>
mode="range" {
startDate={range.startDate} !loading
endDate={range.endDate} &&
onChange={(param) => setRange(param)} <DateTimePicker
// styles={defaultStyles} mode="range"
month={month} startDate={range.startDate}
year={year} endDate={range.endDate}
styles={{ onChange={(param) => setRange(param)}
selected: Styles.selectedDate, month={month}
selected_label: Styles.cWhite, year={year}
range_fill: Styles.selectRangeDate, styles={{
}} selected: Styles.selectedDate,
/> selected_label: Styles.cWhite,
} range_fill: Styles.selectRangeDate,
month_label: Styles.cBlack,
month_selector_label: Styles.cBlack,
year_label: Styles.cBlack,
year_selector_label: Styles.cBlack,
day_label: Styles.cBlack,
time_label: Styles.cBlack,
weekday_label: Styles.cBlack,
}}
/>
}
</View>
<View style={[Styles.mv10]}>
<View style={[Styles.rowSpaceBetween]}>
<View style={[{ width: '48%' }]}>
<Text style={[Styles.mb05]}>Tanggal Mulai <Text style={Styles.cError}>*</Text></Text>
<View style={[Styles.wrapPaper, Styles.p10]}>
<Text style={{ textAlign: 'center' }}>{from}</Text>
</View>
</View>
<View style={[{ width: '48%' }]}>
<Text style={[Styles.mb05]}>Tanggal Berakhir <Text style={Styles.cError}>*</Text></Text>
<View style={[Styles.wrapPaper, Styles.p10]}>
<Text style={{ textAlign: 'center' }}>{to}</Text>
</View>
</View>
</View> </View>
{ <View style={[Styles.mv10]}>
(error.endDate || error.startDate) && <Text style={[Styles.textInformation, Styles.cError, Styles.mt05]}>Tanggal tidak boleh kosong</Text> <View style={[Styles.rowSpaceBetween]}>
} <View style={[{ width: '48%' }]}>
<Text style={[Styles.mb05]}>Tanggal Mulai <Text style={Styles.cError}>*</Text></Text>
<View style={[Styles.wrapPaper, Styles.p10]}>
<Text style={{ textAlign: 'center' }}>{from}</Text>
</View>
</View>
<View style={[{ width: '48%' }]}>
<Text style={[Styles.mb05]}>Tanggal Berakhir <Text style={Styles.cError}>*</Text></Text>
<View style={[Styles.wrapPaper, Styles.p10]}>
<Text style={{ textAlign: 'center' }}>{to}</Text>
</View>
</View>
</View>
{
(error.endDate || error.startDate) && <Text style={[Styles.textInformation, Styles.cError, Styles.mt05]}>Tanggal tidak boleh kosong</Text>
}
</View>
<InputForm
label="Judul Tugas"
type="default"
placeholder="Judul Tugas"
required
bg="white"
value={title}
error={error.title}
errorText="Judul tidak boleh kosong"
onChange={(e) => {
onValidation("title", e)
}}
/>
</View> </View>
<InputForm </ScrollView>
label="Judul Tugas" </KeyboardAvoidingView>
type="default"
placeholder="Judul Tugas"
required
bg="white"
value={title}
error={error.title}
errorText="Judul tidak boleh kosong"
onChange={(e) => {
onValidation("title", e)
}}
/>
</View>
</ScrollView>
</SafeAreaView> </SafeAreaView>
) )
} }

View File

@@ -1,6 +1,7 @@
import BorderBottomItem from "@/components/borderBottomItem"; import BorderBottomItem from "@/components/borderBottomItem";
import ButtonBackHeader from "@/components/buttonBackHeader"; import ButtonBackHeader from "@/components/buttonBackHeader";
import InputSearch from "@/components/inputSearch"; import InputSearch from "@/components/inputSearch";
import Text from '@/components/Text';
import { ColorsStatus } from "@/constants/ColorsStatus"; import { ColorsStatus } from "@/constants/ColorsStatus";
import Styles from "@/constants/Styles"; import Styles from "@/constants/Styles";
import { apiGetSearch } from "@/lib/api"; import { apiGetSearch } from "@/lib/api";
@@ -8,8 +9,8 @@ import { useAuthSession } from "@/providers/AuthProvider";
import { AntDesign, MaterialIcons } from "@expo/vector-icons"; import { AntDesign, MaterialIcons } from "@expo/vector-icons";
import { router, Stack } from "expo-router"; import { router, Stack } from "expo-router";
import { useState } from "react"; import { useState } from "react";
import { FlatList, Image, SafeAreaView, ToastAndroid, View } from "react-native"; import { FlatList, Image, SafeAreaView, View } from "react-native";
import Text from '@/components/Text'; import Toast from "react-native-toast-message";
type PropsUser = { type PropsUser = {
id: string id: string
@@ -49,7 +50,7 @@ export default function Search() {
setDataDivisi(hasil.data.division) setDataDivisi(hasil.data.division)
setDataProject(hasil.data.project) setDataProject(hasil.data.project)
} else { } else {
return ToastAndroid.show(hasil.message, ToastAndroid.SHORT) return Toast.show({ type: 'small', text1: hasil.message, })
} }
} else { } else {
setDataUser([]) setDataUser([])
@@ -58,7 +59,7 @@ export default function Search() {
} }
} catch (error) { } catch (error) {
console.error(error) console.error(error)
return ToastAndroid.show('Gagal melakukan pencarian', ToastAndroid.SHORT) return Toast.show({ type: 'small', text1: 'Gagal melakukan pencarian', })
} }
} }

View File

@@ -4,9 +4,9 @@ import { Stack } from 'expo-router';
import * as SplashScreen from 'expo-splash-screen'; import * as SplashScreen from 'expo-splash-screen';
import { StatusBar } from 'expo-status-bar'; import { StatusBar } from 'expo-status-bar';
import { useEffect } from 'react'; import { useEffect } from 'react';
import 'react-native-reanimated';
import { NotifierWrapper } from 'react-native-notifier';
import { GestureHandlerRootView } from 'react-native-gesture-handler'; import { GestureHandlerRootView } from 'react-native-gesture-handler';
import { NotifierWrapper } from 'react-native-notifier';
import 'react-native-reanimated';
// Prevent the splash screen from auto-hiding before asset loading is complete. // Prevent the splash screen from auto-hiding before asset loading is complete.
SplashScreen.preventAutoHideAsync(); SplashScreen.preventAutoHideAsync();

View File

@@ -5,7 +5,8 @@ import { useAuthSession } from "@/providers/AuthProvider"
import { Ionicons, MaterialCommunityIcons } from "@expo/vector-icons" import { Ionicons, MaterialCommunityIcons } from "@expo/vector-icons"
import { router } from "expo-router" import { router } from "expo-router"
import { useState } from "react" import { useState } from "react"
import { ToastAndroid, View } from "react-native" import { View } from "react-native"
import Toast from "react-native-toast-message"
import { useDispatch, useSelector } from "react-redux" import { useDispatch, useSelector } from "react-redux"
import AlertKonfirmasi from "../alertKonfirmasi" import AlertKonfirmasi from "../alertKonfirmasi"
import ButtonMenuHeader from "../buttonMenuHeader" import ButtonMenuHeader from "../buttonMenuHeader"
@@ -29,7 +30,7 @@ export default function HeaderRightAnnouncementDetail({ id }: Props) {
if (response.success) { if (response.success) {
dispatch(setUpdateAnnouncement(!update)) dispatch(setUpdateAnnouncement(!update))
setVisible(false) setVisible(false)
ToastAndroid.show('Berhasil menghapus data', ToastAndroid.SHORT) Toast.show({ type: 'small', text1: 'Berhasil menghapus data', })
router.back() router.back()
} }
} catch (error) { } catch (error) {

View File

@@ -12,7 +12,7 @@ export default function HeaderRightBannerList() {
return ( return (
<> <>
<ButtonMenuHeader onPress={() => { setVisible(true) }} /> <ButtonMenuHeader onPress={() => { setVisible(true) }} />
<DrawerBottom animation="slide" isVisible={isVisible} setVisible={setVisible} title="Menu"> <DrawerBottom animation="slide" isVisible={isVisible} setVisible={() => setVisible(false)} title="Menu">
<View style={Styles.rowItemsCenter}> <View style={Styles.rowItemsCenter}>
<MenuItemRow <MenuItemRow
icon={<AntDesign name="pluscircle" color="black" size={25} />} icon={<AntDesign name="pluscircle" color="black" size={25} />}

View File

@@ -32,7 +32,7 @@ export default function BorderBottomItem({ title, subtitle, icon, desc, onPress,
{icon} {icon}
<View style={[Styles.rowSpaceBetween, width ? { width: lebar } : { width: '88%' }]}> <View style={[Styles.rowSpaceBetween, width ? { width: lebar } : { width: '88%' }]}>
<View style={[Styles.ml10, rightTopInfo ? { width: lebar } : { width: '90%' },]}> <View style={[Styles.ml10, rightTopInfo ? { width: lebar } : { width: '90%' },]}>
<Text style={[titleWeight == 'normal' ? Styles.textDefault : Styles.textDefaultSemiBold]} numberOfLines={1} ellipsizeMode='tail'>{title}</Text> <Text style={[titleWeight == 'normal' ? Styles.textDefault : Styles.textDefaultSemiBold, { color: textColorFix }]} numberOfLines={1} ellipsizeMode='tail'>{title}</Text>
{ {
subtitle && subtitle &&
typeof subtitle == "string" typeof subtitle == "string"

View File

@@ -17,7 +17,7 @@ export default function ButtonTab({ active, value, onPress, label, n, icon }: Pr
return ( return (
<TouchableOpacity style={[Styles.btnTab, (active == value) && ColorsStatus.orange, { width: n == 2 ? '50%' : 'auto' }]} onPress={() => { onPress() }}> <TouchableOpacity style={[Styles.btnTab, (active == value) && ColorsStatus.orange, { width: n == 2 ? '50%' : 'auto' }]} onPress={() => { onPress() }}>
{icon} {icon}
<Text style={[Styles.textMediumSemiBold, Styles.ml10, { color: active == value ? 'white' : 'black' }]}>{label}</Text> <Text numberOfLines={1} style={[Styles.textMediumSemiBold, Styles.ml10, { color: active == value ? 'white' : 'black' }]}>{label}</Text>
</TouchableOpacity> </TouchableOpacity>
) )
} }

View File

@@ -5,7 +5,8 @@ import { useAuthSession } from "@/providers/AuthProvider"
import { Ionicons, MaterialCommunityIcons, MaterialIcons } from "@expo/vector-icons" import { Ionicons, MaterialCommunityIcons, MaterialIcons } from "@expo/vector-icons"
import { router } from "expo-router" import { router } from "expo-router"
import { useState } from "react" import { useState } from "react"
import { ToastAndroid, View } from "react-native" import { View } from "react-native"
import Toast from "react-native-toast-message"
import { useDispatch, useSelector } from "react-redux" import { useDispatch, useSelector } from "react-redux"
import AlertKonfirmasi from "../alertKonfirmasi" import AlertKonfirmasi from "../alertKonfirmasi"
import ButtonMenuHeader from "../buttonMenuHeader" import ButtonMenuHeader from "../buttonMenuHeader"
@@ -29,14 +30,14 @@ export default function HeaderRightCalendarDetail({ id, idReminder }: Props) {
const response = await apiDeleteCalendar({ user: hasil }, String(id)); const response = await apiDeleteCalendar({ user: hasil }, String(id));
if (response.success) { if (response.success) {
dispatch(setUpdateCalendar({ ...update, data: !update.data })); dispatch(setUpdateCalendar({ ...update, data: !update.data }));
ToastAndroid.show(response.message, ToastAndroid.SHORT); Toast.show({ type: 'small', text1: response.message, })
router.back() router.back()
} else { } else {
ToastAndroid.show(response.message, ToastAndroid.SHORT); Toast.show({ type: 'small', text1: response.message, })
} }
} catch (error) { } catch (error) {
console.error(error); console.error(error);
ToastAndroid.show('Terjadi kesalahan', ToastAndroid.SHORT); Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
} finally { } finally {
setVisible(false) setVisible(false)
} }

View File

@@ -1,5 +1,6 @@
import Styles from "@/constants/Styles"; import Styles from "@/constants/Styles";
import { Text, View } from "react-native"; import { View } from "react-native";
import Text from "../Text";
type Props = { type Props = {
text: string; text: string;

View File

@@ -1,6 +1,7 @@
import { ColorsStatus } from "@/constants/ColorsStatus"; import { ColorsStatus } from "@/constants/ColorsStatus";
import Styles from "@/constants/Styles"; import Styles from "@/constants/Styles";
import { Text, View } from "react-native"; import { View } from "react-native";
import Text from "../Text";
type Props = { type Props = {
dateStart: Date dateStart: Date

View File

@@ -5,7 +5,8 @@ import { useAuthSession } from "@/providers/AuthProvider"
import { MaterialCommunityIcons, MaterialIcons } from "@expo/vector-icons" import { MaterialCommunityIcons, MaterialIcons } from "@expo/vector-icons"
import { router } from "expo-router" import { router } from "expo-router"
import { useState } from "react" import { useState } from "react"
import { ToastAndroid, View } from "react-native" import { View } from "react-native"
import Toast from "react-native-toast-message"
import { useDispatch, useSelector } from "react-redux" import { useDispatch, useSelector } from "react-redux"
import AlertKonfirmasi from "../alertKonfirmasi" import AlertKonfirmasi from "../alertKonfirmasi"
import ButtonMenuHeader from "../buttonMenuHeader" import ButtonMenuHeader from "../buttonMenuHeader"
@@ -29,15 +30,15 @@ export default function HeaderRightDiscussionDetail({ id, status, isActive }: Pr
const hasil = await decryptToken(String(token?.current)) const hasil = await decryptToken(String(token?.current))
const response = await apiOpenCloseDiscussion({ status: Number(status), user: hasil }, String(id)) const response = await apiOpenCloseDiscussion({ status: Number(status), user: hasil }, String(id))
if (response.success) { if (response.success) {
ToastAndroid.show('Berhasil mengubah data', ToastAndroid.SHORT) Toast.show({ type: 'small', text1: 'Berhasil mengubah data', })
dispatch(setUpdateDiscussion({ ...update, data: !update.data })) dispatch(setUpdateDiscussion({ ...update, data: !update.data }))
setVisible(false) setVisible(false)
} else { } else {
ToastAndroid.show(response.message, ToastAndroid.SHORT) Toast.show({ type: 'small', text1: response.message, })
} }
} catch (error) { } catch (error) {
console.error(error) console.error(error)
ToastAndroid.show('Terjadi kesalahan', ToastAndroid.SHORT) Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
} finally { } finally {
setVisible(false) setVisible(false)
} }
@@ -48,15 +49,15 @@ export default function HeaderRightDiscussionDetail({ id, status, isActive }: Pr
const hasil = await decryptToken(String(token?.current)) const hasil = await decryptToken(String(token?.current))
const response = await apiArchiveDiscussion({ user: hasil, active: !isActive }, String(id)) const response = await apiArchiveDiscussion({ user: hasil, active: !isActive }, String(id))
if (response.success) { if (response.success) {
ToastAndroid.show('Berhasil mengubah data', ToastAndroid.SHORT) Toast.show({ type: 'small', text1: 'Berhasil mengubah data', })
dispatch(setUpdateDiscussion({ ...update, data: !update.data })) dispatch(setUpdateDiscussion({ ...update, data: !update.data }))
setVisible(false) setVisible(false)
} else { } else {
ToastAndroid.show(response.message, ToastAndroid.SHORT) Toast.show({ type: 'small', text1: response.message, })
} }
} catch (error) { } catch (error) {
console.error(error) console.error(error)
ToastAndroid.show('Terjadi kesalahan', ToastAndroid.SHORT) Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
} finally { } finally {
setVisible(false) setVisible(false)
} }

View File

@@ -5,7 +5,8 @@ import { useAuthSession } from "@/providers/AuthProvider"
import { MaterialCommunityIcons, MaterialIcons } from "@expo/vector-icons" import { MaterialCommunityIcons, MaterialIcons } from "@expo/vector-icons"
import { router } from "expo-router" import { router } from "expo-router"
import { useState } from "react" import { useState } from "react"
import { ToastAndroid, View } from "react-native" import { View } from "react-native"
import Toast from "react-native-toast-message"
import { useDispatch, useSelector } from "react-redux" import { useDispatch, useSelector } from "react-redux"
import AlertKonfirmasi from "../alertKonfirmasi" import AlertKonfirmasi from "../alertKonfirmasi"
import ButtonMenuHeader from "../buttonMenuHeader" import ButtonMenuHeader from "../buttonMenuHeader"
@@ -30,7 +31,7 @@ export default function HeaderRightDiscussionGeneralDetail({ id, active, status
const hasil = await decryptToken(String(token?.current)) const hasil = await decryptToken(String(token?.current))
const response = await apiUpdateStatusDiscussionGeneral({ id: id, data: { status: status, user: hasil } }) const response = await apiUpdateStatusDiscussionGeneral({ id: id, data: { status: status, user: hasil } })
if (response.success) { if (response.success) {
ToastAndroid.show('Berhasil mengupdate data', ToastAndroid.SHORT) Toast.show({ type: 'small', text1: 'Berhasil mengupdate data', })
dispatch(setUpdateDiscussionGeneralDetail(!update)) dispatch(setUpdateDiscussionGeneralDetail(!update))
} }
setVisible(false) setVisible(false)
@@ -43,7 +44,7 @@ export default function HeaderRightDiscussionGeneralDetail({ id, active, status
try { try {
const hasil = await decryptToken(String(token?.current)) const hasil = await decryptToken(String(token?.current))
const response = await apiDeleteDiscussionGeneral({ active: !active, user: hasil }, id) const response = await apiDeleteDiscussionGeneral({ active: !active, user: hasil }, id)
ToastAndroid.show('Berhasil mengupdate data', ToastAndroid.SHORT) Toast.show({ type: 'small', text1: 'Berhasil mengupdate data', })
dispatch(setUpdateDiscussionGeneralDetail(!update)) dispatch(setUpdateDiscussionGeneralDetail(!update))
} catch (error) { } catch (error) {
console.error(error) console.error(error)

View File

@@ -34,7 +34,9 @@ export default function HeaderDiscussionGeneral() {
title="Filter" title="Filter"
onPress={() => { onPress={() => {
setVisible(false) setVisible(false)
setFilter(true) setTimeout(() => {
setFilter(true)
}, 600)
}} }}
/> />
} }

View File

@@ -51,7 +51,7 @@ export default function FileDivisionDetail() {
const openFile = (item: Props) => { const openFile = (item: Props) => {
setLoadingOpen(true) if (Platform.OS == 'android') setLoadingOpen(true)
let remoteUrl = 'https://wibu-storage.wibudev.com/api/files/' + item.idStorage; let remoteUrl = 'https://wibu-storage.wibudev.com/api/files/' + item.idStorage;
const fileName = item.name + '.' + item.extension; const fileName = item.name + '.' + item.extension;
let localPath = `${FileSystem.documentDirectory}/${fileName}`; let localPath = `${FileSystem.documentDirectory}/${fileName}`;
@@ -59,6 +59,7 @@ export default function FileDivisionDetail() {
FileSystem.downloadAsync(remoteUrl, localPath).then(async ({ uri }) => { FileSystem.downloadAsync(remoteUrl, localPath).then(async ({ uri }) => {
const contentURL = await FileSystem.getContentUriAsync(uri); const contentURL = await FileSystem.getContentUriAsync(uri);
setLoadingOpen(false)
try { try {
if (Platform.OS == 'android') { if (Platform.OS == 'android') {
// open with android intent // open with android intent
@@ -79,7 +80,7 @@ export default function FileDivisionDetail() {
} catch (error) { } catch (error) {
Alert.alert('INFO', 'Gagal membuka file, tidak ada aplikasi yang dapat membuka file ini'); Alert.alert('INFO', 'Gagal membuka file, tidak ada aplikasi yang dapat membuka file ini');
} finally { } finally {
setLoadingOpen(false) if (Platform.OS == 'android') setLoadingOpen(false)
} }
}); });
}; };

View File

@@ -5,7 +5,8 @@ import { useAuthSession } from "@/providers/AuthProvider"
import { MaterialCommunityIcons } from "@expo/vector-icons" import { MaterialCommunityIcons } from "@expo/vector-icons"
import { router } from "expo-router" import { router } from "expo-router"
import { useState } from "react" import { useState } from "react"
import { ToastAndroid, View } from "react-native" import { View } from "react-native"
import Toast from "react-native-toast-message"
import { useDispatch, useSelector } from "react-redux" import { useDispatch, useSelector } from "react-redux"
import AlertKonfirmasi from "../alertKonfirmasi" import AlertKonfirmasi from "../alertKonfirmasi"
import ButtonMenuHeader from "../buttonMenuHeader" import ButtonMenuHeader from "../buttonMenuHeader"
@@ -29,13 +30,13 @@ export default function HeaderRightDivisionInfo({ id, active }: Props) {
const response = await apiUpdateStatusDivision({ data: { user: hasil, isActive: Boolean(active) }, id: String(id) }) const response = await apiUpdateStatusDivision({ data: { user: hasil, isActive: Boolean(active) }, id: String(id) })
if (response.success) { if (response.success) {
dispatch(setUpdateDivision(!update)) dispatch(setUpdateDivision(!update))
ToastAndroid.show('Berhasil mengubah status', ToastAndroid.SHORT) Toast.show({ type: 'small', text1: 'Berhasil mengubah status', })
} else { } else {
ToastAndroid.show(response.message, ToastAndroid.SHORT) Toast.show({ type: 'small', text1: response.message, })
} }
} catch (error) { } catch (error) {
console.error(error) console.error(error)
ToastAndroid.show('Terjadi kesalahan', ToastAndroid.SHORT) Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
} finally { } finally {
setVisible(false) setVisible(false)
} }

View File

@@ -37,7 +37,9 @@ export default function HeaderRightDivisionList() {
title="Filter" title="Filter"
onPress={() => { onPress={() => {
setVisible(false) setVisible(false)
setFilter(true) setTimeout(() => {
setFilter(true)
}, 600);
}} }}
/> />
} }

View File

@@ -1,6 +1,7 @@
import Styles from "@/constants/Styles"; import Styles from "@/constants/Styles";
import { Dimensions, Text, View } from "react-native"; import { Dimensions, View } from "react-native";
import { BarChart } from "react-native-gifted-charts"; import { BarChart } from "react-native-gifted-charts";
import Text from "../Text";
export default function ReportChartDocument({ data }: { data: { label: string; value: number; }[] }) { export default function ReportChartDocument({ data }: { data: { label: string; value: number; }[] }) {
const maxValue = Math.max(...data.map(i => i.value)) const maxValue = Math.max(...data.map(i => i.value))

View File

@@ -1,6 +1,7 @@
import Styles from "@/constants/Styles"; import Styles from "@/constants/Styles";
import { Dimensions, Text, View } from "react-native"; import { Dimensions, View } from "react-native";
import { BarChart } from "react-native-gifted-charts"; import { BarChart } from "react-native-gifted-charts";
import Text from "../Text";
export default function ReportChartEvent({ data }: { data: { label: string; value: number; }[] }) { export default function ReportChartEvent({ data }: { data: { label: string; value: number; }[] }) {
const width = Dimensions.get("window").width; const width = Dimensions.get("window").width;

View File

@@ -1,6 +1,7 @@
import Styles from "@/constants/Styles"; import Styles from "@/constants/Styles";
import { Text, View } from "react-native"; import { View } from "react-native";
import { PieChart } from "react-native-gifted-charts"; import { PieChart } from "react-native-gifted-charts";
import Text from "../Text";
export default function ReportChartProgress({ data }: { data: { color: string; text: string; value: number; }[] }) { export default function ReportChartProgress({ data }: { data: { color: string; text: string; value: number; }[] }) {
const pieData = [ const pieData = [

View File

@@ -6,7 +6,8 @@ import { MaterialCommunityIcons, MaterialIcons } from "@expo/vector-icons";
import * as DocumentPicker from "expo-document-picker"; import * as DocumentPicker from "expo-document-picker";
import { useLocalSearchParams } from "expo-router"; import { useLocalSearchParams } from "expo-router";
import { useState } from "react"; import { useState } from "react";
import { ToastAndroid, View } from "react-native"; import { ActivityIndicator, View } from "react-native";
import Toast from "react-native-toast-message";
import { useDispatch, useSelector } from "react-redux"; import { useDispatch, useSelector } from "react-redux";
import ButtonMenuHeader from "../buttonMenuHeader"; import ButtonMenuHeader from "../buttonMenuHeader";
import DrawerBottom from "../drawerBottom"; import DrawerBottom from "../drawerBottom";
@@ -22,20 +23,21 @@ export default function HeaderRightDocument({ path }: { path: string }) {
const { token, decryptToken } = useAuthSession() const { token, decryptToken } = useAuthSession()
const dispatch = useDispatch() const dispatch = useDispatch()
const update = useSelector((state: any) => state.dokumenUpdate) const update = useSelector((state: any) => state.dokumenUpdate)
const [loading, setLoading] = useState(false)
async function handleCreateFolder() { async function handleCreateFolder() {
try { try {
const hasil = await decryptToken(String(token?.current)) const hasil = await decryptToken(String(token?.current))
const response = await apiCreateFolderDocument({ user: hasil, name, path, idDivision: id }) const response = await apiCreateFolderDocument({ data: { user: hasil, name, path, idDivision: id } })
if (response.success) { if (response.success) {
ToastAndroid.show("Berhasil membuat folder baru", ToastAndroid.SHORT) Toast.show({ type: 'small', text1: 'Berhasil membuat folder baru', })
dispatch(setUpdateDokumen(!update)) dispatch(setUpdateDokumen(!update))
} else { } else {
ToastAndroid.show(response.message, ToastAndroid.SHORT) Toast.show({ type: 'small', text1: response.message, })
} }
} catch (error) { } catch (error) {
console.error(error) console.error(error)
ToastAndroid.show("Terjadi kesalahan", ToastAndroid.SHORT) Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
} finally { } finally {
setNewFolder(false) setNewFolder(false)
} }
@@ -44,25 +46,31 @@ export default function HeaderRightDocument({ path }: { path: string }) {
const pickDocumentAsync = async () => { const pickDocumentAsync = async () => {
let result = await DocumentPicker.getDocumentAsync({ let result = await DocumentPicker.getDocumentAsync({
type: ["*/*"], type: ["*/*"],
multiple: false, multiple: true,
}); });
if (!result.canceled) { if (!result.canceled) {
if (result.assets?.[0].uri) { let file: any[] = []
handleUploadFile(result.assets?.[0]) for (let i = 0; i < result.assets?.length; i++) {
if (result.assets?.[i].uri) {
file.push(result.assets?.[i])
}
} }
handleUploadFile(file)
} }
}; };
async function handleUploadFile(file: any) { async function handleUploadFile(file: any[]) {
try { try {
setLoading(true)
const hasil = await decryptToken(String(token?.current)) const hasil = await decryptToken(String(token?.current))
const fd = new FormData() const fd = new FormData()
fd.append("file", { for (let i = 0; i < file.length; i++) {
uri: file.uri, fd.append(`file${i}`, {
type: "application/octet-stream", uri: file[i].uri,
name: file.name, type: "application/octet-stream",
} as any); name: file[i].name,
} as any);
}
fd.append( fd.append(
"data", "data",
JSON.stringify({ JSON.stringify({
@@ -70,20 +78,21 @@ export default function HeaderRightDocument({ path }: { path: string }) {
idDivision: id, idDivision: id,
user: hasil, user: hasil,
}) })
); )
const response = await apiUploadFileDocument({ data: fd }) const response = await apiUploadFileDocument({ data: fd })
if (response.success) { if (response.success) {
ToastAndroid.show("Berhasil mengunggah file", ToastAndroid.SHORT) Toast.show({ type: 'small', text1: 'Berhasil mengunggah file', })
dispatch(setUpdateDokumen(!update)) dispatch(setUpdateDokumen(!update))
} else { } else {
ToastAndroid.show(response.message, ToastAndroid.SHORT) Toast.show({ type: 'small', text1: response.message, })
} }
} catch (error) { } catch (error) {
console.error(error) console.error(error)
ToastAndroid.show("Terjadi kesalahan", ToastAndroid.SHORT) Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
} finally { } finally {
setVisible(false) setVisible(false)
setLoading(false)
} }
} }
@@ -98,40 +107,49 @@ export default function HeaderRightDocument({ path }: { path: string }) {
<DrawerBottom <DrawerBottom
animation="slide" animation="slide"
isVisible={isVisible} isVisible={isVisible}
setVisible={setVisible} setVisible={() => { setVisible(false) }}
title="Menu" title="Menu"
> >
<View style={Styles.rowItemsCenter}> <View style={Styles.rowItemsCenter}>
<MenuItemRow {
icon={ loading ?
<MaterialCommunityIcons <View style={[Styles.contentItemCenter, Styles.w100, Styles.h100]}>
name="folder-open" <ActivityIndicator size="large" />
color="black" </View>
size={25} :
/> <>
} <MenuItemRow
title="Tambah Dokumen" icon={
onPress={() => { <MaterialCommunityIcons
setVisible(false); name="folder-open"
setNewFolder(true); color="black"
}} size={25}
/> />
}
title="Tambah Folder"
onPress={() => {
setVisible(false);
setTimeout(() => {
setNewFolder(true);
}, 600);
}}
/>
<MenuItemRow <MenuItemRow
icon={<MaterialIcons name="upload-file" color="black" size={25} />} icon={<MaterialIcons name="upload-file" color="black" size={25} />}
title="Upload File" title="Upload File"
onPress={pickDocumentAsync} onPress={pickDocumentAsync}
/> />
</>
}
</View> </View>
</DrawerBottom> </DrawerBottom>
<ModalFloat <ModalFloat
title="Buat Folder Baru" title="Buat Folder Baru"
isVisible={newFolder} isVisible={newFolder}
setVisible={setNewFolder} setVisible={() => { setNewFolder(false) }}
disableSubmit={name == ""} disableSubmit={name == ""}
onSubmit={() => { onSubmit={() => { handleCreateFolder() }}
handleCreateFolder()
}}
> >
<View> <View>
<InputForm <InputForm
@@ -139,9 +157,7 @@ export default function HeaderRightDocument({ path }: { path: string }) {
placeholder="Nama Folder" placeholder="Nama Folder"
required required
label="Nama Folder" label="Nama Folder"
onChange={(value: string) => { onChange={(value: string) => { setName(value) }}
setName(value);
}}
/> />
</View> </View>
</ModalFloat> </ModalFloat>

View File

@@ -2,8 +2,9 @@ import { ColorsStatus } from "@/constants/ColorsStatus";
import Styles from "@/constants/Styles"; import Styles from "@/constants/Styles";
import { Ionicons, MaterialCommunityIcons } from "@expo/vector-icons"; import { Ionicons, MaterialCommunityIcons } from "@expo/vector-icons";
import { useState } from "react"; import { useState } from "react";
import { Pressable, ScrollView, Text, ToastAndroid, View } from "react-native"; import { Pressable, ScrollView, View } from "react-native";
import { useSharedValue } from "react-native-reanimated"; import { useSharedValue } from "react-native-reanimated";
import Toast from "react-native-toast-message";
import AlertKonfirmasi from "../alertKonfirmasi"; import AlertKonfirmasi from "../alertKonfirmasi";
import DrawerBottom from "../drawerBottom"; import DrawerBottom from "../drawerBottom";
import { InputForm } from "../inputForm"; import { InputForm } from "../inputForm";
@@ -13,6 +14,7 @@ import MenuItemRow from "../menuItemRow";
import ModalFloat from "../modalFloat"; import ModalFloat from "../modalFloat";
import ModalSelectMultiple from "../modalSelectMultiple"; import ModalSelectMultiple from "../modalSelectMultiple";
import ModalSalinMove from "./modalSalinMove"; import ModalSalinMove from "./modalSalinMove";
import Text from "../Text";
type Props = { type Props = {
@@ -60,7 +62,7 @@ export default function MenuBottomSelectDocument({ onDone }: Props) {
onPress: () => { onPress: () => {
onDone() onDone()
ToastAndroid.show('Berhasil menghapus data', ToastAndroid.SHORT) Toast.show({ type: 'small', text1: 'Berhasil menghapus data', })
} }
}) })
}} }}
@@ -94,7 +96,7 @@ export default function MenuBottomSelectDocument({ onDone }: Props) {
<ModalFloat title="Ganti Nama Dokumen" isVisible={isRename} setVisible={setRename} <ModalFloat title="Ganti Nama Dokumen" isVisible={isRename} setVisible={setRename}
onSubmit={() => { onSubmit={() => {
onDone() onDone()
ToastAndroid.show('Berhasil mengganti nama dokumen', ToastAndroid.SHORT) Toast.show({ type: 'small', text1: 'Berhasil mengganti nama dokumen', })
}}> }}>
<View> <View>
<InputForm type="default" placeholder="Nama File" required label="Nama File" /> <InputForm type="default" placeholder="Nama File" required label="Nama File" />
@@ -204,7 +206,7 @@ export default function MenuBottomSelectDocument({ onDone }: Props) {
<ModalSelectMultiple choose="dinas" title="Bagikan" category="share-division" open={isShare} close={setShare} <ModalSelectMultiple choose="dinas" title="Bagikan" category="share-division" open={isShare} close={setShare}
onSelect={() => { onSelect={() => {
ToastAndroid.show('Success', ToastAndroid.SHORT) Toast.show({ type: 'small', text1: 'Success', })
setShare(false) setShare(false)
}} }}
/> />

View File

@@ -3,10 +3,12 @@ import { apiGetDocumentInformasi } from "@/lib/api";
import { useAuthSession } from "@/providers/AuthProvider"; import { useAuthSession } from "@/providers/AuthProvider";
import { Ionicons, MaterialCommunityIcons } from "@expo/vector-icons"; import { Ionicons, MaterialCommunityIcons } from "@expo/vector-icons";
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
import { Pressable, ScrollView, Text, View } from "react-native"; import { ActivityIndicator, Pressable, ScrollView, View } from "react-native";
import { useSharedValue } from "react-native-reanimated"; import { useSharedValue } from "react-native-reanimated";
import ItemAccordion from "../itemAccordion"; import ItemAccordion from "../itemAccordion";
import ItemDetailMember from "../itemDetailMember"; import ItemDetailMember from "../itemDetailMember";
import ModalLoading from "../modalLoading";
import Text from "../Text";
type Props = { type Props = {
category: string, category: string,
@@ -28,9 +30,11 @@ export default function ModalInformasi({ data }: { data: any }) {
const [dataInformasi, setDataInformasi] = useState<Props>() const [dataInformasi, setDataInformasi] = useState<Props>()
const { token, decryptToken } = useAuthSession() const { token, decryptToken } = useAuthSession()
const [dataShare, setDataShare] = useState<PropsShare[]>([]) const [dataShare, setDataShare] = useState<PropsShare[]>([])
const [loading, setLoading] = useState(true)
async function handleInformasi() { async function handleInformasi() {
try { try {
setLoading(true)
const hasil = await decryptToken(String(token?.current)) const hasil = await decryptToken(String(token?.current))
const response = await apiGetDocumentInformasi({ user: hasil, item: data.id, cat: 'lainnya' }) const response = await apiGetDocumentInformasi({ user: hasil, item: data.id, cat: 'lainnya' })
setDataInformasi(response.data) setDataInformasi(response.data)
@@ -39,6 +43,8 @@ export default function ModalInformasi({ data }: { data: any }) {
setDataShare(responseShare.data) setDataShare(responseShare.data)
} catch (error) { } catch (error) {
console.error(error) console.error(error)
} finally {
setLoading(false)
} }
} }
@@ -58,39 +64,47 @@ export default function ModalInformasi({ data }: { data: any }) {
} }
</View> </View>
<View> {
<ItemDetailMember category="dokumen" value={dataInformasi?.category == 'FOLDER' ? dataInformasi?.name : `${dataInformasi?.name}.${dataInformasi?.extension}`} border /> loading ? (
<ItemDetailMember category="type" value={dataInformasi?.category} border /> <View>
<ItemDetailMember category="location" value={dataInformasi?.path} border /> <ActivityIndicator size="large" />
<ItemDetailMember category="owner" value={dataInformasi?.division} border />
<ItemDetailMember category="calendar" value={dataInformasi?.createdAt} border />
<Pressable style={[Styles.rowSpaceBetween, Styles.rowItemsCenter, Styles.wrapItemBorderBottom]} onPress={() => { open.value = !open.value; }}>
<View style={[Styles.rowItemsCenter]}>
<MaterialCommunityIcons name="share-variant-outline" size={22} color="black" style={[Styles.mr10]} />
<Text style={[Styles.textDefault]}>Telah dibagikan ke divisi</Text>
</View> </View>
<MaterialCommunityIcons name="chevron-down" size={22} color="black" /> ) : (
</Pressable> <View>
<ItemAccordion isExpanded={open} viewKey="Accordion" duration={500}> <ItemDetailMember category="dokumen" value={dataInformasi?.category == 'FOLDER' ? dataInformasi?.name : `${dataInformasi?.name}.${dataInformasi?.extension}`} border />
<ScrollView style={[Styles.w100, { height: 200 }]} > <ItemDetailMember category="type" value={dataInformasi?.category} border />
{ <ItemDetailMember category="location" value={dataInformasi?.path} border />
dataShare.length > 0 ? ( <ItemDetailMember category="owner" value={dataInformasi?.division} border />
dataShare.map((item, index) => ( <ItemDetailMember category="calendar" value={dataInformasi?.createdAt} border />
<View key={index} style={[Styles.rowOnly, Styles.ml10, Styles.mt02]}> <Pressable style={[Styles.rowSpaceBetween, Styles.rowItemsCenter, Styles.wrapItemBorderBottom]} onPress={() => { open.value = !open.value; }}>
<MaterialCommunityIcons name="account-group-outline" size={22} color="black" style={[Styles.mr10]} /> <View style={[Styles.rowItemsCenter]}>
<Text style={[Styles.textDefault]}>{item.name}</Text> <MaterialCommunityIcons name="share-variant-outline" size={22} color="black" style={[Styles.mr10]} />
</View> <Text style={[Styles.textDefault]}>Telah dibagikan ke divisi</Text>
)) </View>
) <MaterialCommunityIcons name="chevron-down" size={22} color="black" />
: ( </Pressable>
<View style={[Styles.ml10, Styles.mt02]}> <ItemAccordion isExpanded={open} viewKey="Accordion" duration={500}>
<Text style={[Styles.textDefault, Styles.cGray, { textAlign: 'center' }]}>Tidak ada data</Text> <ScrollView style={[Styles.w100, { height: 200 }]} >
</View> {
) dataShare.length > 0 ? (
} dataShare.map((item, index) => (
</ScrollView> <View key={index} style={[Styles.rowOnly, Styles.ml10, Styles.mt02]}>
</ItemAccordion> <MaterialCommunityIcons name="account-group-outline" size={22} color="black" style={[Styles.mr10]} />
</View> <Text style={[Styles.textDefault]}>{item.name}</Text>
</View>
))
)
: (
<View style={[Styles.ml10, Styles.mt02]}>
<Text style={[Styles.textDefault, Styles.cGray, { textAlign: 'center' }]}>Tidak ada data</Text>
</View>
)
}
</ScrollView>
</ItemAccordion>
</View>
)
}
</> </>
) )
} }

View File

@@ -5,7 +5,8 @@ import { useAuthSession } from "@/providers/AuthProvider";
import { MaterialCommunityIcons } from "@expo/vector-icons"; import { MaterialCommunityIcons } from "@expo/vector-icons";
import { useLocalSearchParams } from "expo-router"; import { useLocalSearchParams } from "expo-router";
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
import { ToastAndroid, View } from "react-native"; import { View } from "react-native";
import Toast from "react-native-toast-message";
import { useDispatch, useSelector } from "react-redux"; import { useDispatch, useSelector } from "react-redux";
import DrawerBottom from "../drawerBottom"; import DrawerBottom from "../drawerBottom";
import MenuItemRow from "../menuItemRow"; import MenuItemRow from "../menuItemRow";
@@ -63,14 +64,14 @@ export default function ModalMore({
path, path,
}); });
if (response.success) { if (response.success) {
ToastAndroid.show("Berhasil memindahkan file", ToastAndroid.SHORT); Toast.show({ type: 'small', text1: 'Berhasil memindahkan file', });
dispatch(setUpdateDokumen(!update)); dispatch(setUpdateDokumen(!update));
} else { } else {
ToastAndroid.show(response.message, ToastAndroid.SHORT); Toast.show({ type: 'small', text1: response.message, });
} }
} catch (error) { } catch (error) {
console.error(error); console.error(error);
ToastAndroid.show("Terjadi kesalahan", ToastAndroid.SHORT); Toast.show({ type: 'small', text1: 'Terjadi kesalahan', });
} finally { } finally {
setIsCut(false); setIsCut(false);
onClose(); onClose();
@@ -87,14 +88,14 @@ export default function ModalMore({
idDivision: id idDivision: id
}); });
if (response.success) { if (response.success) {
ToastAndroid.show("Berhasil menyalin file", ToastAndroid.SHORT); Toast.show({ type: 'small', text1: 'Berhasil menyalin file', });
dispatch(setUpdateDokumen(!update)); dispatch(setUpdateDokumen(!update));
} else { } else {
ToastAndroid.show(response.message, ToastAndroid.SHORT); Toast.show({ type: 'small', text1: response.message, });
} }
} catch (error) { } catch (error) {
console.error(error); console.error(error);
ToastAndroid.show("Terjadi kesalahan", ToastAndroid.SHORT); Toast.show({ type: 'small', text1: 'Terjadi kesalahan', });
} finally { } finally {
setIsCopy(false); setIsCopy(false);
onClose(); onClose();
@@ -154,7 +155,7 @@ export default function ModalMore({
<DrawerBottom <DrawerBottom
animation="slide" animation="slide"
isVisible={isInformasi} isVisible={isInformasi}
setVisible={setInformasi} setVisible={() => setInformasi(false)}
title="Informasi Dokumen" title="Informasi Dokumen"
height={80} height={80}
> >

View File

@@ -4,9 +4,10 @@ import { useAuthSession } from "@/providers/AuthProvider"
import { AntDesign, Ionicons } from "@expo/vector-icons" import { AntDesign, Ionicons } from "@expo/vector-icons"
import { useLocalSearchParams } from "expo-router" import { useLocalSearchParams } from "expo-router"
import { useEffect, useState } from "react" import { useEffect, useState } from "react"
import { Pressable, Text, View } from "react-native" import { Pressable, View } from "react-native"
import BorderBottomItem from "../borderBottomItem" import BorderBottomItem from "../borderBottomItem"
import DrawerBottom from "../drawerBottom" import DrawerBottom from "../drawerBottom"
import Text from "../Text"
type Props = { type Props = {
open: boolean open: boolean

View File

@@ -1,8 +1,8 @@
import Styles from "@/constants/Styles"; import Styles from "@/constants/Styles";
import { MaterialIcons } from "@expo/vector-icons"; import { MaterialIcons } from "@expo/vector-icons";
import { Pressable, View } from "react-native"; import { Dimensions, KeyboardAvoidingView, Platform, Pressable, View } from "react-native";
import Text from "./Text";
import Modal from 'react-native-modal'; import Modal from 'react-native-modal';
import Text from "./Text";
type Props = { type Props = {
isVisible: boolean isVisible: boolean
@@ -12,28 +12,15 @@ type Props = {
animation?: 'slide' | 'none' | 'fade' animation?: 'slide' | 'none' | 'fade'
height?: number height?: number
backdropPressable?: boolean backdropPressable?: boolean
keyboard?: boolean
} }
export default function DrawerBottom({ isVisible, setVisible, title, children, animation, height, backdropPressable = true }: Props) { export default function DrawerBottom({ isVisible, setVisible, title, children, animation, height, backdropPressable = true, keyboard = false }: Props) {
return ( const tinggiScreen = Dimensions.get("window").height;
// <Modal const tinggiInput = height != undefined ? height : 25
// animationType={animation} const tinggiFix = tinggiScreen * tinggiInput / 100;
// transparent={true} visible={isVisible}>
// <View style={[Styles.modalBgTransparant]}>
// <View style={[Styles.modalContent, height != undefined && { height: `${height}%` }]}>
// <View style={Styles.titleContainer}>
// <Text style={Styles.textDefault}>{title}</Text>
// <Pressable onPress={() => setVisible(false)}>
// <MaterialIcons name="close" color="black" size={22} />
// </Pressable>
// </View>
// <View style={Styles.contentContainer}>
// {children}
// </View>
// </View>
// </View>
// </Modal>
return (
<Modal <Modal
animationIn={"slideInUp"} animationIn={"slideInUp"}
animationOut={"slideOutDown"} animationOut={"slideOutDown"}
@@ -49,17 +36,37 @@ export default function DrawerBottom({ isVisible, setVisible, title, children, a
backdropTransitionOutTiming={500} backdropTransitionOutTiming={500}
useNativeDriverForBackdrop={true} useNativeDriverForBackdrop={true}
> >
<View style={[Styles.modalContentNew, height != undefined ? { height: `${height}%` } : { height: '25%' }]}> {
<View style={[Styles.titleContainerNew]}> keyboard ?
<Text style={Styles.textDefault}>{title}</Text> <KeyboardAvoidingView
<Pressable onPress={() => setVisible(false)}> behavior={Platform.OS === 'ios' ? 'padding' : undefined}
<MaterialIcons name="close" color="black" size={22} /> keyboardVerticalOffset={0}
</Pressable> >
</View> <View style={[Styles.modalContentNew, { height: tinggiFix }]}>
<View style={Styles.contentContainer}> <View style={[Styles.titleContainerNew]}>
{children} <Text style={Styles.textDefault}>{title}</Text>
</View> <Pressable onPress={() => setVisible(false)}>
</View> <MaterialIcons name="close" color="black" size={22} />
</Pressable>
</View>
<View style={Styles.contentContainer}>
{children}
</View>
</View>
</KeyboardAvoidingView>
:
<View style={[Styles.modalContentNew, { height: tinggiFix }]}>
<View style={[Styles.titleContainerNew]}>
<Text style={Styles.textDefault}>{title}</Text>
<Pressable onPress={() => setVisible(false)}>
<MaterialIcons name="close" color="black" size={22} />
</Pressable>
</View>
<View style={Styles.contentContainer}>
{children}
</View>
</View>
}
</Modal> </Modal>
) )
} }

View File

@@ -4,7 +4,8 @@ import { setUpdateGroup } from "@/lib/groupSlice"
import { useAuthSession } from "@/providers/AuthProvider" import { useAuthSession } from "@/providers/AuthProvider"
import { AntDesign } from "@expo/vector-icons" import { AntDesign } from "@expo/vector-icons"
import { useState } from "react" import { useState } from "react"
import { ToastAndroid, View } from "react-native" import { View } from "react-native"
import Toast from "react-native-toast-message"
import { useDispatch, useSelector } from "react-redux" import { useDispatch, useSelector } from "react-redux"
import { ButtonForm } from "../buttonForm" import { ButtonForm } from "../buttonForm"
import ButtonMenuHeader from "../buttonMenuHeader" import ButtonMenuHeader from "../buttonMenuHeader"
@@ -33,7 +34,7 @@ export default function HeaderRightGroupList() {
} finally { } finally {
setVisibleTambah(false) setVisibleTambah(false)
setVisible(false) setVisible(false)
ToastAndroid.show('Berhasil menambahkan data', ToastAndroid.SHORT) Toast.show({ type: 'small', text1: 'Berhasil menambahkan data', })
} }
} }
@@ -47,9 +48,9 @@ export default function HeaderRightGroupList() {
if (cat === 'title') { if (cat === 'title') {
setTitle(val) setTitle(val)
if (val == "" || val.length < 3) { if (val == "" || val.length < 3) {
setError({ ...error, title: true }) setError((prev) => ({ ...prev, title: true }))
} else { } else {
setError({ ...error, title: false }) setError((prev) => ({ ...prev, title: false }))
} }
} }
} }
@@ -58,7 +59,7 @@ export default function HeaderRightGroupList() {
return ( return (
<> <>
<ButtonMenuHeader onPress={() => { setVisible(true) }} /> <ButtonMenuHeader onPress={() => { setVisible(true) }} />
<DrawerBottom animation="slide" isVisible={isVisible} setVisible={setVisible} title="Menu"> <DrawerBottom animation="slide" isVisible={isVisible} setVisible={() => setVisible(false)} title="Menu">
<View style={Styles.rowItemsCenter}> <View style={Styles.rowItemsCenter}>
<MenuItemRow <MenuItemRow
icon={<AntDesign name="pluscircle" color="black" size={25} />} icon={<AntDesign name="pluscircle" color="black" size={25} />}
@@ -69,7 +70,7 @@ export default function HeaderRightGroupList() {
() => { () => {
setVisibleTambah(true) setVisibleTambah(true)
}, },
100, 600,
); );
}} }}
@@ -77,7 +78,7 @@ export default function HeaderRightGroupList() {
</View> </View>
</DrawerBottom> </DrawerBottom>
<DrawerBottom animation="none" height={30} isVisible={isVisibleTambah} setVisible={setVisibleTambah} title="Tambah Lembaga Desa"> <DrawerBottom animation="none" keyboard height={30} isVisible={isVisibleTambah} setVisible={() => setVisibleTambah(false)} title="Tambah Lembaga Desa">
<View style={{ flex: 1 }}> <View style={{ flex: 1 }}>
<View> <View>
<InputForm <InputForm
@@ -90,7 +91,7 @@ export default function HeaderRightGroupList() {
/> />
</View> </View>
<View> <View>
<ButtonForm text="SIMPAN" onPress={() => { onCheck() }} /> <ButtonForm text="SIMPAN" disabled={Object.values(error).some((v) => v == true) || title == ""} onPress={() => { onCheck() }} />
</View> </View>
</View> </View>
</DrawerBottom> </DrawerBottom>

View File

@@ -1,10 +1,11 @@
import { ColorsStatus } from "@/constants/ColorsStatus"; import { ColorsStatus } from "@/constants/ColorsStatus";
import Styles from "@/constants/Styles"; import Styles from "@/constants/Styles";
import { stringToDate } from "@/lib/fun_stringToDate";
import DateTimePicker from "@react-native-community/datetimepicker"; import DateTimePicker from "@react-native-community/datetimepicker";
import dayjs from "dayjs"; import dayjs from "dayjs";
import { useState } from "react"; import { useState } from "react";
import { Pressable, Text, View } from "react-native"; import { Platform, Pressable, View } from "react-native";
import Text from "./Text";
import ModalFloat from "./modalFloat";
type Props = { type Props = {
label?: string; label?: string;
@@ -26,7 +27,7 @@ type Props = {
export function InputDate({ label, value, placeholder, onChange, info, disable, error, errorText, required, mode, round, width, }: Props) { export function InputDate({ label, value, placeholder, onChange, info, disable, error, errorText, required, mode, round, width, }: Props) {
const [modal, setModal] = useState(false); const [modal, setModal] = useState(false);
const onChangeDate = ({ type }: { type: string }, selectedDate: any) => { const onChangeDate = (type: string, selectedDate: any) => {
if (type === "set") { if (type === "set") {
if (mode == "date") { if (mode == "date") {
onChange(dayjs(selectedDate).format("DD-MM-YYYY")) onChange(dayjs(selectedDate).format("DD-MM-YYYY"))
@@ -57,14 +58,34 @@ export function InputDate({ label, value, placeholder, onChange, info, disable,
{info != undefined && (<Text style={[Styles.textInformation, Styles.mt05, Styles.cGray]}>{info}</Text>)} {info != undefined && (<Text style={[Styles.textInformation, Styles.mt05, Styles.cGray]}>{info}</Text>)}
</View> </View>
{ {
modal && ( Platform.OS === 'ios' ? (
<DateTimePicker modal && (
value={value ? stringToDate(value) : new Date()} <ModalFloat
mode={mode} isVisible={modal}
display="default" setVisible={setModal}
onChange={onChangeDate} onSubmit={() => { }}
onTouchCancel={() => setModal(false)} buttonHide
/> disableSubmit
title={mode == "date" ? "Pilih Tanggal" : mode == "time" ? "Pilih Jam" : "Pilih Tanggal & Jam"}>
<DateTimePicker
value={new Date()}
mode={mode}
display="spinner"
onChange={(event, date) => { onChangeDate(event.type, date) }}
onTouchCancel={() => setModal(false)}
/>
</ModalFloat>
)
) : (
modal && (
<DateTimePicker
value={new Date()}
mode={mode}
display="inline"
onChange={(event, date) => { onChangeDate(event.type, date) }}
onTouchCancel={() => setModal(false)}
/>
)
) )
} }
</> </>

View File

@@ -1,5 +1,5 @@
import Styles from "@/constants/Styles"; import Styles from "@/constants/Styles";
import { Dimensions, TextInput, View } from "react-native"; import { Dimensions, Platform, TextInput, View } from "react-native";
import Text from "./Text"; import Text from "./Text";
type Props = { type Props = {
@@ -36,7 +36,14 @@ export function InputForm({ label, value, placeholder, onChange, info, disable,
</Text> </Text>
) )
} }
<View style={[Styles.inputRoundForm, itemRight != undefined ? Styles.inputRoundFormRight : Styles.inputRoundFormLeft, round && Styles.round30, { backgroundColor: bg && bg == 'white' ? 'white' : 'transparent' }, error && { borderColor: "red" }]}> <View style={[
Styles.inputRoundForm,
itemRight != undefined ? Styles.inputRoundFormRight : Styles.inputRoundFormLeft,
round && Styles.round30,
{ backgroundColor: bg && bg == 'white' ? 'white' : 'transparent' },
error && { borderColor: "red" },
Platform.OS == 'ios' && { paddingVertical: 10 },
]}>
{itemRight != undefined ? itemRight : itemLeft} {itemRight != undefined ? itemRight : itemLeft}
<TextInput <TextInput
editable={!disable} editable={!disable}
@@ -71,11 +78,11 @@ export function InputForm({ label, value, placeholder, onChange, info, disable,
placeholder={placeholder} placeholder={placeholder}
keyboardType={type} keyboardType={type}
editable={!disable} editable={!disable}
style={[Styles.inputRoundForm, error && { borderColor: "red" }, round && Styles.round30, { backgroundColor: bg && bg == 'white' ? 'white' : 'transparent' }, { color: 'black' }, multiline && { height: 100, textAlignVertical: 'top' }]} style={[Styles.inputRoundForm, error && { borderColor: "red" }, round && Styles.round30, { backgroundColor: bg && bg == 'white' ? 'white' : 'transparent' }, { color: 'black' }, multiline && { height: 150, textAlignVertical: 'top' }]}
onChangeText={onChange} onChangeText={onChange}
placeholderTextColor={'gray'} placeholderTextColor={'gray'}
multiline={multiline} multiline={multiline}
numberOfLines={multiline ? 4 : undefined} numberOfLines={multiline ? 5 : undefined}
/> />
{error && (<Text style={[Styles.textInformation, Styles.cError, Styles.mt05]}>{errorText}</Text>)} {error && (<Text style={[Styles.textInformation, Styles.cError, Styles.mt05]}>{errorText}</Text>)}
{info != undefined && (<Text style={[Styles.textInformation, Styles.mt05, Styles.cGray]}>{info}</Text>)} {info != undefined && (<Text style={[Styles.textInformation, Styles.mt05, Styles.cGray]}>{info}</Text>)}

View File

@@ -10,7 +10,7 @@ type Props = {
} }
export default function LabelStatus({ category, text, size }: Props) { export default function LabelStatus({ category, text, size }: Props) {
return ( return (
<View style={[size == "small" ? Styles.labelStatusSmall : Styles.labelStatus, ColorsStatus[category], Styles.round10]}> <View style={[size == "small" ? Styles.labelStatusSmall : Styles.labelStatus, ColorsStatus[category], Styles.round10, Styles.contentItemCenter]}>
<Text style={[size == "small" ? Styles.textSmallSemiBold : Styles.textMediumSemiBold, Styles.cWhite, { textAlign: 'center' }]}>{text}</Text> <Text style={[size == "small" ? Styles.textSmallSemiBold : Styles.textMediumSemiBold, Styles.cWhite, { textAlign: 'center' }]}>{text}</Text>
</View> </View>
) )

View File

@@ -1,16 +1,17 @@
import Styles from "@/constants/Styles" import Styles from "@/constants/Styles"
import { apiDeleteUser } from "@/lib/api" import { apiDeleteUser } from "@/lib/api"
import { setUpdateMember } from "@/lib/memberSlice"
import { useAuthSession } from "@/providers/AuthProvider" import { useAuthSession } from "@/providers/AuthProvider"
import { MaterialCommunityIcons } from "@expo/vector-icons" import { MaterialCommunityIcons } from "@expo/vector-icons"
import { router } from "expo-router" import { router } from "expo-router"
import { useState } from "react" import { useState } from "react"
import { ToastAndroid, View } from "react-native" import { View } from "react-native"
import Toast from "react-native-toast-message"
import { useDispatch, useSelector } from "react-redux"
import AlertKonfirmasi from "../alertKonfirmasi" import AlertKonfirmasi from "../alertKonfirmasi"
import ButtonMenuHeader from "../buttonMenuHeader" import ButtonMenuHeader from "../buttonMenuHeader"
import DrawerBottom from "../drawerBottom" import DrawerBottom from "../drawerBottom"
import MenuItemRow from "../menuItemRow" import MenuItemRow from "../menuItemRow"
import { useDispatch, useSelector } from "react-redux"
import { setUpdateMember } from "@/lib/memberSlice"
type Props = { type Props = {
active: any, active: any,
@@ -28,10 +29,10 @@ export default function HeaderRightMemberDetail({ active, id }: Props) {
const hasil = await decryptToken(String(token?.current)) const hasil = await decryptToken(String(token?.current))
const response = await apiDeleteUser({ user: hasil, isActive: active }, id) const response = await apiDeleteUser({ user: hasil, isActive: active }, id)
if (response.success) { if (response.success) {
ToastAndroid.show('Berhasil mengupdate data', ToastAndroid.SHORT) Toast.show({ type: 'small', text1: 'Berhasil mengupdate data', })
dispatch(setUpdateMember(!update)) dispatch(setUpdateMember(!update))
} else { } else {
ToastAndroid.show(response.message, ToastAndroid.SHORT) Toast.show({ type: 'small', text1: response.message, })
} }
} catch (error) { } catch (error) {
console.error(error) console.error(error)

View File

@@ -17,7 +17,7 @@ export default function HeaderMemberList() {
return ( return (
<> <>
<ButtonMenuHeader onPress={() => { setVisible(true) }} /> <ButtonMenuHeader onPress={() => { setVisible(true) }} />
<DrawerBottom animation="slide" isVisible={isVisible} setVisible={setVisible} title="Menu"> <DrawerBottom animation="slide" isVisible={isVisible} setVisible={() => setVisible(false)} title="Menu">
<View style={Styles.rowItemsCenter}> <View style={Styles.rowItemsCenter}>
<MenuItemRow <MenuItemRow
icon={<AntDesign name="pluscircle" color="black" size={25} />} icon={<AntDesign name="pluscircle" color="black" size={25} />}
@@ -34,7 +34,9 @@ export default function HeaderMemberList() {
title="Filter" title="Filter"
onPress={() => { onPress={() => {
setVisible(false) setVisible(false)
setFilter(true) setTimeout(() => {
setFilter(true)
}, 600)
}} }}
/> />
} }

View File

@@ -62,7 +62,7 @@ export default function ModalFilter({ open, close, page, category }: Props) {
<Pressable key={index} style={[Styles.itemSelectModal]} onPress={() => { setChooseGroup(item.id) }}> <Pressable key={index} style={[Styles.itemSelectModal]} onPress={() => { setChooseGroup(item.id) }}>
<Text style={[chooseGroup == item.id ? Styles.textDefaultSemiBold : Styles.textDefault]}>{item.name}</Text> <Text style={[chooseGroup == item.id ? Styles.textDefaultSemiBold : Styles.textDefault]}>{item.name}</Text>
{ {
chooseGroup == item.id && <AntDesign name="check" size={20} /> chooseGroup == item.id && <AntDesign name="check" size={20} color={'black'}/>
} }
</Pressable> </Pressable>
)) ))
@@ -71,7 +71,7 @@ export default function ModalFilter({ open, close, page, category }: Props) {
<Pressable key={index} style={[Styles.itemSelectModal]} onPress={() => { setChooseGroup(item.id) }}> <Pressable key={index} style={[Styles.itemSelectModal]} onPress={() => { setChooseGroup(item.id) }}>
<Text style={[chooseGroup == item.id ? Styles.textDefaultSemiBold : Styles.textDefault]}>{item.name}</Text> <Text style={[chooseGroup == item.id ? Styles.textDefaultSemiBold : Styles.textDefault]}>{item.name}</Text>
{ {
chooseGroup == item.id && <AntDesign name="check" size={20} /> chooseGroup == item.id && <AntDesign name="check" size={20} color={'black'}/>
} }
</Pressable> </Pressable>
)) ))

View File

@@ -1,7 +1,7 @@
import Styles from '@/constants/Styles'; import Styles from '@/constants/Styles';
import { Pressable, View } from 'react-native'; import { Pressable, View } from 'react-native';
import Text from './Text';
import Modal from 'react-native-modal'; import Modal from 'react-native-modal';
import Text from './Text';
type Props = { type Props = {
isVisible: boolean isVisible: boolean
@@ -10,9 +10,10 @@ type Props = {
children: React.ReactNode children: React.ReactNode
onSubmit: () => void onSubmit: () => void
disableSubmit?: boolean disableSubmit?: boolean
buttonHide?: boolean
} }
export default function ModalFloat({ isVisible, setVisible, title, children, onSubmit, disableSubmit }: Props) { export default function ModalFloat({ isVisible, setVisible, title, children, onSubmit, disableSubmit, buttonHide }: Props) {
return ( return (
<Modal <Modal
animationIn={"fadeIn"} animationIn={"fadeIn"}
@@ -28,14 +29,18 @@ export default function ModalFloat({ isVisible, setVisible, title, children, onS
<View style={[Styles.mb10]}> <View style={[Styles.mb10]}>
{children} {children}
</View> </View>
<View style={[Styles.rowItemsCenter, { justifyContent: 'flex-end' }]}> {
<Pressable style={[Styles.ph15, Styles.pv05, Styles.round10, Styles.mr10]} onPress={() => { setVisible(false) }}> !buttonHide && (
<Text style={[Styles.textDefault]}>Batal</Text> <View style={[Styles.rowItemsCenter, { justifyContent: 'flex-end' }]}>
</Pressable> <Pressable style={[Styles.ph15, Styles.pv05, Styles.round10, Styles.mr10]} onPress={() => { setVisible(false) }}>
<Pressable style={[Styles.ph15, Styles.pv05, Styles.round10]} onPress={onSubmit} disabled={disableSubmit}> <Text style={[Styles.textDefault]}>Batal</Text>
<Text style={[Styles.textDefault, disableSubmit && Styles.cGray]}>Simpan</Text> </Pressable>
</Pressable> <Pressable style={[Styles.ph15, Styles.pv05, Styles.round10]} onPress={onSubmit} disabled={disableSubmit}>
</View> <Text style={[Styles.textDefault, disableSubmit && Styles.cGray]}>Simpan</Text>
</Pressable>
</View>
)
}
</View> </View>
</Modal> </Modal>
) )

View File

@@ -9,13 +9,13 @@ import { useAuthSession } from "@/providers/AuthProvider"
import { AntDesign } from "@expo/vector-icons" import { AntDesign } from "@expo/vector-icons"
import { useEffect, useState } from "react" import { useEffect, useState } from "react"
import { Pressable, ScrollView, View } from "react-native" import { Pressable, ScrollView, View } from "react-native"
import Text from "./Text";
import { useDispatch, useSelector } from "react-redux" import { useDispatch, useSelector } from "react-redux"
import { ButtonForm } from "./buttonForm" import { ButtonForm } from "./buttonForm"
import DrawerBottom from "./drawerBottom" import DrawerBottom from "./drawerBottom"
import ImageUser from "./imageNew" import ImageUser from "./imageNew"
import ImageWithLabel from "./imageWithLabel" import ImageWithLabel from "./imageWithLabel"
import InputSearch from "./inputSearch" import InputSearch from "./inputSearch"
import Text from "./Text"
type Props = { type Props = {
open: boolean open: boolean
@@ -89,8 +89,7 @@ export default function ModalSelect({ open, close, title, category, idParent, on
useEffect(() => { useEffect(() => {
if (category == 'group') { if (category == 'group') {
if (entitiesGroup.length == 0) handleLoadGroup()
handleLoadGroup()
setData(entitiesGroup) setData(entitiesGroup)
} else if (category == 'position') { } else if (category == 'position') {
handleLoadPosition() handleLoadPosition()
@@ -126,7 +125,7 @@ export default function ModalSelect({ open, close, title, category, idParent, on
} }
return ( return (
<DrawerBottom animation="none" isVisible={open} setVisible={close} title={title} height={(category == 'gender' || category == 'status-task') ? 25 : category == 'member' ? 100 : 75}> <DrawerBottom animation="none" isVisible={open} setVisible={close} title={title} height={(category == 'gender' || category == 'status-task') ? 25 : category == 'member' ? 90 : 75}>
{ {
category == 'member' && category == 'member' &&
<> <>
@@ -174,9 +173,9 @@ export default function ModalSelect({ open, close, title, category, idParent, on
{ {
(category == 'member') (category == 'member')
? ?
selectMember.some((i: any) => i.idUser == item.id) && <AntDesign name="check" size={20} /> selectMember.some((i: any) => i.idUser == item.id) && <AntDesign name="check" size={20} color={'black'} />
: :
chooseValue.val == item.id && <AntDesign name="check" size={20} /> chooseValue.val == item.id && <AntDesign name="check" size={20} color={'black'} />
} }
</Pressable> </Pressable>
)) ))
@@ -192,7 +191,7 @@ export default function ModalSelect({ open, close, title, category, idParent, on
}}> }}>
<Text style={[chooseValue.val == item.val ? Styles.textDefaultSemiBold : Styles.textDefault]}>{item.label}</Text> <Text style={[chooseValue.val == item.val ? Styles.textDefaultSemiBold : Styles.textDefault]}>{item.label}</Text>
{ {
valChoose == item.val && <AntDesign name="check" size={20} /> valChoose == item.val && <AntDesign name="check" size={20} color={'black'} />
} }
</Pressable> </Pressable>
)) ))

View File

@@ -3,8 +3,9 @@ import { apiGetDivisionGroup, apiGetDocumentInformasi, apiGetListDivisionByIdDiv
import { useAuthSession } from "@/providers/AuthProvider" import { useAuthSession } from "@/providers/AuthProvider"
import { AntDesign } from "@expo/vector-icons" import { AntDesign } from "@expo/vector-icons"
import { useEffect, useState } from "react" import { useEffect, useState } from "react"
import { Pressable, ScrollView, ToastAndroid, View } from "react-native" import { Pressable, ScrollView, View } from "react-native"
import Text from "./Text"; import Toast from "react-native-toast-message"
import Text from "./Text"
import { ButtonForm } from "./buttonForm" import { ButtonForm } from "./buttonForm"
import DrawerBottom from "./drawerBottom" import DrawerBottom from "./drawerBottom"
@@ -104,7 +105,7 @@ export default function ModalSelectMultiple({ open, close, title, category, choo
delete newChecked[groupId]; delete newChecked[groupId];
} else { } else {
if (data.find((item: { id: string }) => item.id === groupId)?.Division?.length == 0) { if (data.find((item: { id: string }) => item.id === groupId)?.Division?.length == 0) {
return ToastAndroid.show('Tidak ada divisi', ToastAndroid.SHORT) return Toast.show({ type: 'small', text1: 'Tidak ada divisi', })
} }
newChecked[groupId] = data.find((item: { id: string }) => item.id === groupId)?.Division.map((item: { id: any }) => item.id) || []; newChecked[groupId] = data.find((item: { id: string }) => item.id === groupId)?.Division.map((item: { id: any }) => item.id) || [];
} }
@@ -160,7 +161,7 @@ export default function ModalSelectMultiple({ open, close, title, category, choo
<Text numberOfLines={1} style={[Styles.w80]}>{item.name}</Text> <Text numberOfLines={1} style={[Styles.w80]}>{item.name}</Text>
{ {
selectedDivision.some((i: any) => i.id == item.id) selectedDivision.some((i: any) => i.id == item.id)
? <AntDesign name="check" size={18} /> ? <AntDesign name="check" size={18} color={'black'}/>
: <></> : <></>
} }
</Pressable> </Pressable>
@@ -176,9 +177,9 @@ export default function ModalSelectMultiple({ open, close, title, category, choo
<Text style={[Styles.textMediumSemiBold]}>{item.name}</Text> <Text style={[Styles.textMediumSemiBold]}>{item.name}</Text>
{ {
checked[item.id] && checked[item.id]?.length === item.Division?.length checked[item.id] && checked[item.id]?.length === item.Division?.length
? <AntDesign name="check" size={20} /> ? <AntDesign name="check" size={20} color={'black'}/>
: (checked[item.id] && checked[item.id]?.length > 0 && checked[item.id]?.length < item.Division?.length) : (checked[item.id] && checked[item.id]?.length > 0 && checked[item.id]?.length < item.Division?.length)
? <AntDesign name="minus" size={20} /> ? <AntDesign name="minus" size={20} color={'black'}/>
: <></> : <></>
} }
</Pressable> </Pressable>
@@ -188,7 +189,7 @@ export default function ModalSelectMultiple({ open, close, title, category, choo
<Pressable key={v} style={[Styles.itemSelectModal]} onPress={() => { handleCheck(item.id, child.id) }}> <Pressable key={v} style={[Styles.itemSelectModal]} onPress={() => { handleCheck(item.id, child.id) }}>
<Text style={[Styles.ml10, Styles.textMediumNormal, Styles.w80]} numberOfLines={1} ellipsizeMode="tail" >{child.name}</Text> <Text style={[Styles.ml10, Styles.textMediumNormal, Styles.w80]} numberOfLines={1} ellipsizeMode="tail" >{child.name}</Text>
{ {
checked[item.id] && checked[item.id].includes(child.id) && <AntDesign name="check" size={20} /> checked[item.id] && checked[item.id].includes(child.id) && <AntDesign name="check" size={20} color={'black'}/>
} }
</Pressable> </Pressable>
) )

Some files were not shown because too many files have changed in this diff Show More