wibu/mobile-darmasaba
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'amalia/01-agustus-25' (#11) from amalia/01-agustus-25 into join

Browse Source 
Reviewed-on: bip/mobile-darmasaba#11
This commit is contained in:
amalia
2025-08-01 17:41:33 +08:00
parent d3c63fbcdd 589068703d
commit 2d72c365da
17 changed files with 163 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app.json
View File

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

2
app/(application)/banner/[id].tsx
View File

@@ -34,7 +34,7 @@ export default function EditBanner() {
const pickImageAsync = async () => {
let result = await ImagePicker.launchImageLibraryAsync({
mediaTypes: ["images"],
allowsEditing: true,
allowsEditing: false,
quality: 1,
aspect: [1535, 450],
});

2
app/(application)/banner/create.tsx
View File

@@ -33,7 +33,7 @@ export default function CreateBanner() {
const pickImageAsync = async () => {
let result = await ImagePicker.launchImageLibraryAsync({
mediaTypes: ["images"],
allowsEditing: true,
allowsEditing: false,
quality: 1,
aspect: [1535, 450],
});

4
app/(application)/discussion/create.tsx
View File

@@ -84,6 +84,9 @@ export default function CreateDiscussionGeneral() {
checkForm();
}, [error, dataForm]);
useEffect(() => {
dispatch(setMemberChoose([]))
}, [])
function handleBack() {
dispatch(setMemberChoose([]))
@@ -171,6 +174,7 @@ export default function CreateDiscussionGeneral() {
error={error.desc}
errorText="Diskusi tidak boleh kosong"
onChange={(val) => { validationForm("desc", val) }}
multiline
/>
<ButtonSelect
value="Pilih Anggota"

1
app/(application)/discussion/edit/[id].tsx
View File

@@ -135,6 +135,7 @@ export default function EditDiscussionGeneral() {
value={dataForm.desc}
errorText="Diskusi tidak boleh kosong"
onChange={(val) => validationForm("desc", val)}
multiline
/>
</View>
</ScrollView>

9
app/(application)/division/[id]/(fitur-division)/calendar/create.tsx
View File

@@ -10,6 +10,8 @@ import { stringToDateTime } from "@/lib/fun_stringToDate";
import { Stack, router, useLocalSearchParams } from "expo-router";
import { useState } from "react";
import {
KeyboardAvoidingView,
Platform,
SafeAreaView,
ScrollView,
View
@@ -141,8 +143,12 @@ export default function CalendarDivisionCreate() {
),
}}
/>
<KeyboardAvoidingView
behavior={Platform.OS === 'ios' ? 'padding' : undefined}
keyboardVerticalOffset={110}
>
<ScrollView>
<View style={[Styles.p15, Styles.mb100]}>
<View style={[Styles.p15]}>
<InputForm
label="Nama Acara"
type="default"
@@ -229,6 +235,7 @@ export default function CalendarDivisionCreate() {
/>
</View>
</ScrollView>
</KeyboardAvoidingView>
<ModalSelect
category={"type-event-repeat"}

12
app/(application)/division/[id]/(fitur-division)/document/index.tsx
View File

@@ -110,10 +110,6 @@ export default function DocumentDivision() {
}
}
useEffect(() => {
handleLoad(true);
}, [path]);
const handleCheckboxChange = (index: number) => {
setDariSelectAll(false);
if (selectedFiles.some((i: any) => i.id == data[index].id)) {
@@ -308,6 +304,10 @@ export default function DocumentDivision() {
setRefreshing(false)
};
useEffect(() => {
handleLoad(true);
}, [path]);
return (
<SafeAreaView>
<Stack.Screen
@@ -550,9 +550,7 @@ export default function DocumentDivision() {
title="Ganti Nama"
isVisible={isRename}
setVisible={() => { setRename(false) }}
onSubmit={() => {
handleRename();
}}
onSubmit={() => { handleRename() }}
disableSubmit={bodyRename.name == ""}
>
<View>

12
app/(application)/division/[id]/(fitur-division)/task/[detail]/add-file.tsx
View File

@@ -36,19 +36,21 @@ export default function TaskDivisionAddFile() {
const pickDocumentAsync = async () => {
let result = await DocumentPicker.getDocumentAsync({
type: ["*/*"],
multiple: false,
multiple: true,
});
if (!result.canceled) {
if (result.assets?.[0].uri) {
const check = await handleCheckFile(result.assets?.[0]);
for (let i = 0; i < result.assets?.length; i++) {
if (result.assets?.[i].uri) {
const check = await handleCheckFile(result.assets?.[i]);
if (check) {
setFileForm([...fileForm, result.assets?.[0]]);
setListFile([...listFile, result.assets?.[0].name]);
setFileForm((prev) => [...prev, result.assets?.[i]]);
setListFile((prev) => [...prev, result.assets?.[i].name]);
} else {
Toast.show({ type: 'small', text1: 'File sudah ada', })
}
}
}
}
};
function deleteFile(index: number) {

8
app/(application)/division/[id]/(fitur-division)/task/create.tsx
View File

@@ -52,11 +52,13 @@ export default function CreateTaskDivision() {
const pickDocumentAsync = async () => {
let result = await DocumentPicker.getDocumentAsync({
type: ["*/*"],
multiple: false
multiple: true
});
if (!result.canceled) {
if (result.assets[0].uri) {
setFileForm([...fileForm, result.assets[0]])
for (let i = 0; i < result.assets?.length; i++) {
if (result.assets[i].uri) {
setFileForm((prev) => [...prev, result.assets[i]])
}
}
}
};

2
app/(application)/edit-profile.tsx
View File

@@ -187,7 +187,7 @@ export default function EditProfile() {
const pickImageAsync = async () => {
let result = await ImagePicker.launchImageLibraryAsync({
mediaTypes: ["images"],
allowsEditing: true,
allowsEditing: false,
quality: 1,
aspect: [1, 1],
});

11
app/(application)/member/create.tsx
View File

@@ -36,6 +36,7 @@ export default function CreateMember() {
const [chooseGender, setChooseGender] = useState({ val: "", label: "" });
const [selectedImage, setSelectedImage] = useState<string | undefined>(undefined);
const entityUser = useSelector((state: any) => state.user);
const entities = useSelector((state: any) => state.entities)
const [isSelect, setSelect] = useState(false);
const [disableBtn, setDisableBtn] = useState(true)
const [valChoose, setValChoose] = useState("")
@@ -142,6 +143,12 @@ export default function CreateMember() {
checkForm()
}, [error, dataForm])
useEffect(() => {
if(entityUser.role !="supadmin" && entityUser.role != "developer"){
validationForm("group", entities.idGroup, entities.group)
}
}, [])
async function handleCreate() {
try {
@@ -162,7 +169,7 @@ export default function CreateMember() {
fd.append("file", "undefined")
}
const response = await apiCreateUser(fd)
const response = await apiCreateUser({data: fd})
if (response.success) {
Toast.show({ type: 'small', text1: 'Berhasil menambahkan data', })
dispatch(setUpdateMember(!update))
@@ -179,7 +186,7 @@ export default function CreateMember() {
const pickImageAsync = async () => {
let result = await ImagePicker.launchImageLibraryAsync({
mediaTypes: ["images"],
allowsEditing: true,
allowsEditing: false,
quality: 1,
aspect: [1, 1],
});

2
app/(application)/member/edit/[id].tsx
View File

@@ -212,7 +212,7 @@ export default function EditMember() {
const pickImageAsync = async () => {
let result = await ImagePicker.launchImageLibraryAsync({
mediaTypes: ["images"],
allowsEditing: true,
allowsEditing: false,
quality: 1,
aspect: [1, 1],
});

15
app/(application)/project/[id]/add-file.tsx
View File

@@ -30,16 +30,19 @@ export default function ProjectAddFile() {
const pickDocumentAsync = async () => {
let result = await DocumentPicker.getDocumentAsync({
type: ["*/*"],
multiple: false
multiple: true
});
if (!result.canceled) {
if (result.assets?.[0].uri) {
const check = await handleCheckFile(result.assets?.[0])
for (let i = 0; i < result.assets?.length; i++) {
if (result.assets?.[i].uri) {
const check = await handleCheckFile(result.assets?.[i])
if (check) {
setFileForm([...fileForm, result.assets?.[0]])
setListFile([...listFile, result.assets?.[0].name])
setFileForm((prev) => [...prev, result.assets?.[i]])
setListFile((prev) => [...prev, result.assets?.[i].name])
} else {
Toast.show({ type: 'small', text1: 'File sudah ada', })
Toast.show({ type: 'small', text1: 'File yg telah terupload tidak bisa diupload ulang', })
}
}
}
}

8
app/(application)/project/create.tsx
View File

@@ -146,11 +146,13 @@ export default function CreateProject() {
const pickDocumentAsync = async () => {
let result = await DocumentPicker.getDocumentAsync({
type: ["*/*"],
multiple: false
multiple: true
});
if (!result.canceled) {
if (result.assets[0].uri) {
setFileForm([...fileForm, result.assets[0]])
for (let i = 0; i < result.assets?.length; i++) {
if (result.assets[i].uri) {
setFileForm((prev) => [...prev, result.assets[i]])
}
}
}
};

2
components/document/headerDocument.tsx
View File

@@ -28,7 +28,7 @@ export default function HeaderRightDocument({ path }: { path: string }) {
async function handleCreateFolder() {
try {
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) {
Toast.show({ type: 'small', text1: 'Berhasil membuat folder baru', })
dispatch(setUpdateDokumen(!update))

6
components/inputDate.tsx
View File

@@ -27,7 +27,7 @@ type Props = {
export function InputDate({ label, value, placeholder, onChange, info, disable, error, errorText, required, mode, round, width, }: Props) {
const [modal, setModal] = useState(false);
const onChangeDate = ({ type }: { type: string }, selectedDate: any) => {
const onChangeDate = (type: string, selectedDate: any) => {
if (type === "set") {
if (mode == "date") {
onChange(dayjs(selectedDate).format("DD-MM-YYYY"))
@@ -60,10 +60,10 @@ export function InputDate({ label, value, placeholder, onChange, info, disable,
{
modal && (
<DateTimePicker
value={value ? stringToDate(value) : new Date()}
value={new Date()}
mode={mode}
display="default"
onChange={onChangeDate}
onChange={(event, date) => { onChangeDate(event.type, date) }}
onTouchCancel={() => setModal(false)}
/>
)

20
lib/api.ts
View File

@@ -2,8 +2,8 @@ import axios from 'axios';
const api = axios.create({
// baseURL: 'http://10.0.2.2:3000/api',
baseURL: 'https://stg-darmasaba.wibudev.com/api',
// baseURL: 'http://192.168.1.135:3000/api',
// baseURL: 'https://stg-darmasaba.wibudev.com/api',
baseURL: 'http://192.168.1.89:3000/api',
});
export const apiCheckPhoneLogin = async (body: { phone: string }) => {
@@ -150,7 +150,7 @@ export const apiGetUser = async ({ user, active, search, group, page }: { user:
};
export const apiCreateUser = async (data: FormData) => {
export const apiCreateUser = async ({data}: {data: FormData}) => {
const response = await api.post('/mobile/user', data, {
headers: {
'Content-Type': 'multipart/form-data',
@@ -219,7 +219,7 @@ export const apiEditDiscussionGeneral = async (data: { user: string, title: stri
};
export const apiCreateDiscussionGeneral = async ({ data }: { data: { idGroup: string, title: string, desc: string, user: string, member: [] } }) => {
const response = await api.post(`/mobile/discussion-general/`, data)
const response = await api.post(`/mobile/discussion-general`, data)
return response.data;
};
@@ -604,7 +604,7 @@ export const apiGetDocumentInformasi = async ({ user, item, cat }: { user: strin
};
export const apiDocumentRename = async (data: { name: string, user: string, id: string, path: string, idDivision: string, extension: string }) => {
const response = await api.put(`/mobile/document/`, data)
const response = await api.put(`/mobile/document`, data)
return response.data;
};
@@ -613,8 +613,8 @@ export const apiDocumentDelete = async (data: { user: string, data: any[] }) =>
return response.data
};
export const apiCreateFolderDocument = async (data: { name: string, path: string, idDivision: string, user: string }) => {
const response = await api.post(`/mobile/document/`, data)
export const apiCreateFolderDocument = async ({ data }: { data: { name: string, path: string, idDivision: string, user: string } }) => {
const response = await api.post(`/mobile/document`, data)
return response.data;
};
@@ -646,12 +646,12 @@ export const apiShareDocument = async (data: { dataDivision: any[], dataItem: an
};
export const apiRegisteredToken = async (data: { user: string, token: string }) => {
const response = await api.post(`/mobile/auth-token/`, data)
const response = await api.post(`/mobile/auth-token`, data)
return response.data;
};
export const apiUnregisteredToken = async (data: { user: string, token: string }) => {
const response = await api.put(`/mobile/auth-token/`, data)
const response = await api.put(`/mobile/auth-token`, data)
return response.data;
};
@@ -661,6 +661,6 @@ export const apiGetNotification = async ({ user, page }: { user: string, page?:
};
export const apiReadOneNotification = async (data: { user: string, id: string }) => {
const response = await api.put(`/mobile/home/notification/`, data)
const response = await api.put(`/mobile/home/notification`, data)
return response.data;
};