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

Reviewed-on: bip/mobile-darmasaba#11

app.json

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

app/(application)/banner/[id].tsx

@@ -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],
       });

app/(application)/banner/create.tsx

@@ -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],
       });

app/(application)/discussion/create.tsx

@@ -84,6 +84,9 @@ export default function CreateDiscussionGeneral() {
       checkForm();
    }, [error, dataForm]);
 
+   useEffect(() => {
+      dispatch(setMemberChoose([]))
+   }, [])
 
    function handleBack() {
       dispatch(setMemberChoose([]))
@@ -101,7 +104,7 @@ export default function CreateDiscussionGeneral() {
             dispatch(setUpdateDiscussionGeneralDetail(!update))
             Toast.show({ type: 'small', text1: 'Berhasil menambahkan data', })
             router.back()
-         }else{
+         } else {
             Toast.show({ type: 'small', text1: response.message, })
          }
       } catch (error) {
@@ -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"

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

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

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

@@ -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,94 +143,99 @@ export default function CalendarDivisionCreate() {
                ),
             }}
          />
-         <ScrollView>
+         <KeyboardAvoidingView
-            <View style={[Styles.p15, Styles.mb100]}>
+            behavior={Platform.OS === 'ios' ? 'padding' : undefined}
-               <InputForm
+            keyboardVerticalOffset={110}
-                  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>
+                  <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>
-               <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
             category={"type-event-repeat"}

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

@@ -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={() => {
+            onSubmit={() => { handleRename() }}
-               handleRename();
-            }}
             disableSubmit={bodyRename.name == ""}
          >
             <View>

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

@@ -36,16 +36,18 @@ 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) {
+         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]);
-               Toast.show({ type: 'small', text1: 'File sudah ada', })
+               } else {
+                  Toast.show({ type: 'small', text1: 'File sudah ada', })
+               }
             }
          }
       }

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

@@ -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) {
+         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]])
+            }
          }
       }
    };

app/(application)/edit-profile.tsx

@@ -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],
       });

app/(application)/member/create.tsx

@@ -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],
       });

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

@@ -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],
       });

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

@@ -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) {
+         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])
-               Toast.show({ type: 'small', text1: 'File sudah ada', })
+               } else {
+                  Toast.show({ type: 'small', text1: 'File yg telah terupload tidak bisa diupload ulang', })
+               }
             }
          }
       }

app/(application)/project/create.tsx

@@ -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) {
+         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]])
+            }
          }
       }
    };

components/document/headerDocument.tsx

@@ -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))

components/inputDate.tsx

@@ -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)}
                />
             )

lib/api.ts

@@ -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: 'https://stg-darmasaba.wibudev.com/api',
-   // baseURL: 'http://192.168.1.135:3000/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 }) => {
+export const apiCreateFolderDocument = async ({ data }: { data: { name: string, path: string, idDivision: string, user: string } }) => {
-   const response = await api.post(`/mobile/document/`, data)
+   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;
 };