upd: diskusi umum

Deskripsi:
- detail anggota diskusi umum
- edit diskusi umum
- mengeluarkan anggota
- mengubah status diskusi umum
- mengarsipkan diskusi umum
- on proses tambah diskusi umum

No Issues
This commit is contained in:
amel
2025-05-06 17:39:09 +08:00
parent 1644bec261
commit 957812fb49
17 changed files with 590 additions and 157 deletions

View File

@@ -40,6 +40,7 @@ export default function DetailDiscussionGeneral() {
const [dataKomentar, setDataKomentar] = useState<PropsKomentar[]>([])
const [memberDiscussion, setMemberDiscussion] = useState(false)
const [komentar, setKomentar] = useState('')
const update = useSelector((state: any) => state.discussionGeneralDetailUpdate)
async function handleLoad(cat: 'detail' | 'komentar' | 'cek-anggota') {
@@ -61,7 +62,8 @@ export default function DetailDiscussionGeneral() {
useEffect(() => {
handleLoad('detail')
handleLoad('komentar')
}, []);
handleLoad('cek-anggota')
}, [update]);
async function handleKomentar() {
try {

View File

@@ -1,51 +1,156 @@
import AlertKonfirmasi from "@/components/alertKonfirmasi";
import ButtonBackHeader from "@/components/buttonBackHeader";
import { ButtonForm } from "@/components/buttonForm";
import ButtonSaveHeader from "@/components/buttonSaveHeader";
import ButtonSelect from "@/components/buttonSelect";
import { InputForm } from "@/components/inputForm";
import ModalSelect from "@/components/modalSelect";
import SelectForm from "@/components/selectForm";
import Styles from "@/constants/Styles";
import { router, Stack } from "expo-router";
import { useState } from "react";
import { useEffect, useState } from "react";
import { SafeAreaView, ScrollView, ToastAndroid, View } from "react-native";
type Props = {
idUser: string;
name: string;
img: string;
};
export default function CreateDiscussionGeneral() {
const [chooseGroup, setChooseGroup] = useState({ val: '', label: '' })
const [chooseGroup, setChooseGroup] = useState({ val: "", label: "" });
const [valChoose, setValChoose] = useState("")
const [valSelect, setValSelect] = useState<"group" | "member">("group");
const [member, setMember] = useState<Props[]>([]);
const [disableBtn, setDisableBtn] = useState(true);
const [isSelect, setSelect] = useState(false);
const [dataForm, setDataForm] = useState({
idGroup: "",
title: "",
desc: "",
});
const [error, setError] = useState({
group: false,
title: false,
desc: false,
});
function validationForm(cat: string, val: any, label?: string) {
if (cat == "group") {
setChooseGroup({ val, label: String(label) });
setMember([]);
setDataForm({ ...dataForm, idGroup: val });
if (val == "" || val == "null") {
setError({ ...error, group: true });
} else {
setError({ ...error, group: false });
}
} else if (cat == "title") {
setDataForm({ ...dataForm, title: val });
if (val == "" || val == "null") {
setError({ ...error, title: true });
} else {
setError({ ...error, title: false });
}
} else if (cat == "desc") {
setDataForm({ ...dataForm, desc: val });
if (val == "" || val == "null") {
setError({ ...error, desc: true });
} else {
setError({ ...error, desc: false });
}
}
}
function checkForm() {
if (
Object.values(error).some((v) => v == true) ||
Object.values(dataForm).some((v) => v == "")
) {
setDisableBtn(true);
} else {
setDisableBtn(false);
}
}
useEffect(() => {
checkForm();
}, [error, dataForm]);
return (
<SafeAreaView>
<Stack.Screen
options={{
headerLeft: () => <ButtonBackHeader onPress={() => { router.back() }} />,
headerTitle: 'Tambah Diskusi',
headerTitleAlign: 'center',
headerRight: () => <ButtonSaveHeader category="create" onPress={() => {
ToastAndroid.show('Berhasil menambahkan data', ToastAndroid.SHORT)
router.push('/discussion?active=true')
}} />
headerLeft: () => (
<ButtonBackHeader
onPress={() => {
router.back();
}}
/>
),
headerTitle: "Tambah Diskusi",
headerTitleAlign: "center",
headerRight: () => (
<ButtonSaveHeader
category="create"
disable={disableBtn}
onPress={() => {
ToastAndroid.show(
"Berhasil menambahkan data",
ToastAndroid.SHORT
);
router.push("/discussion?active=true");
}}
/>
),
}}
/>
<ScrollView>
<View style={[Styles.p15, Styles.mb100]}>
<SelectForm label="Lembaga Desa" placeholder="Pilih Lembaga Desa" value={chooseGroup.label} required onPress={() => { }} />
<InputForm label="Nama" type="default" placeholder="Nama" required />
<InputForm label="Diskusi" type="default" placeholder="Hal yang didiskusikan" required />
<ButtonSelect value="Pilih Anggota" />
{/* <ButtonForm
text="SIMPAN"
<SelectForm
label="Lembaga Desa"
placeholder="Pilih Lembaga Desa"
value={chooseGroup.label}
required
onPress={() => {
AlertKonfirmasi({
title: 'Konfirmasi',
desc: 'Apakah anda yakin ingin menambahkan data?',
onPress: () => {
ToastAndroid.show('Berhasil menambahkan data', ToastAndroid.SHORT)
router.push('/discussion?active=true')
}
})
}} /> */}
setValChoose(chooseGroup.val);
setValSelect("group");
setSelect(true);
}}
/>
<InputForm label="Nama" type="default" placeholder="Nama" required />
<InputForm
label="Diskusi"
type="default"
placeholder="Hal yang didiskusikan"
required
/>
<ButtonSelect
value="Pilih Anggota"
onPress={() => {
if (chooseGroup.val != "") {
setSelect(true);
setValSelect("member");
} else {
ToastAndroid.show(
"Pilih Lembaga Desa terlebih dahulu",
ToastAndroid.SHORT
);
}
}}
/>
</View>
</ScrollView>
<ModalSelect
category={valSelect}
close={setSelect}
onSelect={(value) => {
validationForm(valSelect, value.val, value.label);
}}
title={valSelect == "group" ? "Lembaga Desa" : "Pilih Anggota"}
open={isSelect}
idParent={valSelect == "member" ? chooseGroup.val : ""}
valChoose={valChoose}
/>
</SafeAreaView>
)
}
);
}

View File

@@ -1,42 +1,142 @@
import ButtonBackHeader from "@/components/buttonBackHeader"
import ButtonSaveHeader from "@/components/buttonSaveHeader"
import { InputForm } from "@/components/inputForm"
import Styles from "@/constants/Styles"
import { router, Stack } from "expo-router"
import { SafeAreaView, ScrollView, ToastAndroid, View } from "react-native"
import ButtonBackHeader from "@/components/buttonBackHeader";
import ButtonSaveHeader from "@/components/buttonSaveHeader";
import { InputForm } from "@/components/inputForm";
import Styles from "@/constants/Styles";
import { apiEditDiscussionGeneral, apiGetDiscussionGeneralOne } from "@/lib/api";
import { setUpdateDiscussionGeneralDetail } from "@/lib/discussionGeneralDetail";
import { useAuthSession } from "@/providers/AuthProvider";
import { router, Stack, useLocalSearchParams } from "expo-router";
import { useEffect, useState } from "react";
import { SafeAreaView, ScrollView, ToastAndroid, View } from "react-native";
import { useDispatch, useSelector } from "react-redux";
export default function EditDiscussionGeneral() {
const { token, decryptToken } = useAuthSession();
const { id } = useLocalSearchParams<{ id: string }>();
const [disableBtn, setDisableBtn] = useState(false)
const dispatch = useDispatch()
const update = useSelector((state: any) => state.discussionGeneralDetailUpdate)
const [dataForm, setDataForm] = useState({
title: "",
desc: "",
});
const [error, setError] = useState({
title: false,
desc: false,
})
async function handleLoad() {
try {
const hasil = await decryptToken(String(token?.current));
const response = await apiGetDiscussionGeneralOne({
id: id,
user: hasil,
cat: "detail",
});
if (response.success) {
setDataForm(response.data);
}
} catch (error) {
console.error(error);
}
}
useEffect(() => {
handleLoad();
}, []);
function validationForm(cat: string, val: any) {
if (cat == "title") {
setDataForm({ ...dataForm, title: val });
if (val == "" || val == "null") {
setError({ ...error, title: true });
} else {
setError({ ...error, title: false });
}
} else if (cat == "desc") {
setDataForm({ ...dataForm, desc: val });
if (val == "" || val == "null") {
setError({ ...error, desc: true });
} else {
setError({ ...error, desc: false });
}
}
}
function checkForm() {
if (Object.values(error).some((v) => v == true) == true || Object.values(dataForm).some((v) => v == "") == true) {
setDisableBtn(true)
} else {
setDisableBtn(false)
}
}
useEffect(() => {
checkForm()
}, [error, dataForm])
async function handleEdit() {
try {
const hasil = await decryptToken(String(token?.current));
const response = await apiEditDiscussionGeneral({ user: hasil, title: dataForm.title, desc: dataForm.desc }, id);
if (response.success) {
dispatch(setUpdateDiscussionGeneralDetail(!update))
ToastAndroid.show("Berhasil mengubah data", ToastAndroid.SHORT);
router.back();
}
} catch (error) {
console.error(error);
}
}
return (
<SafeAreaView>
<Stack.Screen
options={{
headerLeft: () => <ButtonBackHeader onPress={() => { router.back() }} />,
headerTitle: 'Edit Diskusi',
headerTitleAlign: 'center',
headerRight: () => <ButtonSaveHeader category="update" onPress={() => {
ToastAndroid.show('Berhasil mengubah data', ToastAndroid.SHORT)
router.back()
}} />
headerLeft: () => (
<ButtonBackHeader
onPress={() => {
router.back();
}}
/>
),
headerTitle: "Edit Diskusi",
headerTitleAlign: "center",
headerRight: () => (
<ButtonSaveHeader
disable={disableBtn}
category="update"
onPress={() => { handleEdit() }}
/>
),
}}
/>
<ScrollView>
<View style={[Styles.p15]}>
<InputForm label="Judul" type="default" placeholder="Judul" required />
<InputForm label="Diskusi" type="default" placeholder="Hal yang didiskusikan" required />
{/* <ButtonForm
text="SIMPAN"
onPress={() => {
AlertKonfirmasi({
title: 'Konfirmasi',
desc: 'Apakah anda yakin ingin mengubah data?',
onPress: () => {
ToastAndroid.show('Berhasil mengubah data', ToastAndroid.SHORT)
router.back()
}
})
}} /> */}
<InputForm
label="Judul"
type="default"
placeholder="Judul"
required
error={error.title}
value={dataForm.title}
errorText="Judul tidak boleh kosong"
onChange={(val) => validationForm("title", val)}
/>
<InputForm
label="Diskusi"
type="default"
placeholder="Hal yang didiskusikan"
required
error={error.desc}
value={dataForm.desc}
errorText="Diskusi tidak boleh kosong"
onChange={(val) => validationForm("desc", val)}
/>
</View>
</ScrollView>
</SafeAreaView>
)
}
);
}

View File

@@ -1,13 +1,62 @@
import AlertKonfirmasi from "@/components/alertKonfirmasi";
import BorderBottomItem from "@/components/borderBottomItem";
import ButtonBackHeader from "@/components/buttonBackHeader";
import DrawerBottom from "@/components/drawerBottom";
import ImageUser from "@/components/imageNew";
import MenuItemRow from "@/components/menuItemRow";
import { ColorsStatus } from "@/constants/ColorsStatus";
import Styles from "@/constants/Styles";
import { Feather } from "@expo/vector-icons";
import { apiDeleteMemberDiscussionGeneral, apiGetDiscussionGeneralOne } from "@/lib/api";
import { useAuthSession } from "@/providers/AuthProvider";
import { Feather, MaterialCommunityIcons } from "@expo/vector-icons";
import { router, Stack, useLocalSearchParams } from "expo-router";
import { Image, SafeAreaView, ScrollView, Text, View } from "react-native";
import { useEffect, useState } from "react";
import { SafeAreaView, ScrollView, Text, ToastAndroid, View } from "react-native";
import { useSelector } from "react-redux";
type Props = {
idUser: string,
name: string,
img: string
}
export default function MemberDiscussionDetail() {
const { id } = useLocalSearchParams()
const { token, decryptToken } = useAuthSession()
const entityUser = useSelector((state: any) => state.user)
const { id } = useLocalSearchParams<{ id: string }>()
const [data, setData] = useState<Props[]>([])
const [isModal, setModal] = useState(false)
const [chooseUser, setChooseUser] = useState({ idUser: '', name: '', img: '' })
async function handleLoad() {
try {
const hasil = await decryptToken(String(token?.current))
const response = await apiGetDiscussionGeneralOne({ id: id, user: hasil, cat: 'anggota' })
setData(response.data)
} catch (error) {
console.error(error)
}
}
useEffect(() => {
handleLoad()
}, []);
async function handleDeleteUser() {
try {
const hasil = await decryptToken(String(token?.current))
await apiDeleteMemberDiscussionGeneral({ user: hasil, idUser: chooseUser.idUser }, id)
ToastAndroid.show("Berhasil mengelluarkan anggota dari diskusi", ToastAndroid.SHORT)
handleLoad()
} catch (error) {
console.error(error)
} finally {
setModal(false)
}
}
return (
<SafeAreaView>
<Stack.Screen
@@ -19,72 +68,69 @@ export default function MemberDiscussionDetail() {
/>
<ScrollView>
<View style={[Styles.p15]}>
<Text style={[Styles.textDefault, Styles.mv05]}>5 Anggota</Text>
<View style={[Styles.wrapPaper]}>
<BorderBottomItem
borderType="none"
icon={
<View style={[Styles.iconContent, ColorsStatus.gray]}>
<Feather name="user-plus" size={25} color={'#384288'} />
</View>
}
title="Tambah Anggota"
/>
<BorderBottomItem
borderType="bottom"
icon={
<Image
source={require("../../../../assets/images/user.jpeg")}
style={[Styles.userProfileSmall]}
/>
}
title="Amalia Dwi"
/>
<BorderBottomItem
borderType="bottom"
icon={
<Image
source={require("../../../../assets/images/user.jpeg")}
style={[Styles.userProfileSmall]}
/>
}
title="Amalia Dwi"
/>
<BorderBottomItem
borderType="bottom"
icon={
<Image
source={require("../../../../assets/images/user.jpeg")}
style={[Styles.userProfileSmall]}
/>
}
title="Amalia Dwi"
/>
<BorderBottomItem
borderType="bottom"
icon={
<Image
source={require("../../../../assets/images/user.jpeg")}
style={[Styles.userProfileSmall]}
/>
}
title="Amalia Dwi"
/>
<BorderBottomItem
borderType="bottom"
icon={
<Image
source={require("../../../../assets/images/user.jpeg")}
style={[Styles.userProfileSmall]}
/>
}
title="Amalia Dwi"
/>
<Text style={[Styles.textDefault, Styles.mv05]}>{data.length} Anggota</Text>
<View style={[Styles.wrapPaper, Styles.mb100]}>
{
entityUser.role != "user" && entityUser.role != "coadmin" &&
<BorderBottomItem
borderType="none"
icon={
<View style={[Styles.iconContent, ColorsStatus.gray]}>
<Feather name="user-plus" size={25} color={'#384288'} />
</View>
}
title="Tambah Anggota"
/>
}
{
data.map((item, index) => {
return (
<BorderBottomItem
key={index}
borderType="bottom"
icon={
<ImageUser src={`https://wibu-storage.wibudev.com/api/files/${item.img}`} size="sm" />
}
title={item.name}
onPress={() => {
setChooseUser(item)
setModal(true)
}}
/>
)
})
}
</View>
</View>
</ScrollView>
<DrawerBottom animation="slide" isVisible={isModal} setVisible={setModal} title={chooseUser.name}>
<View style={Styles.rowItemsCenter}>
<MenuItemRow
icon={<MaterialCommunityIcons name="account-eye" color="black" size={25} />}
title="Lihat Profil"
onPress={() => {
setModal(false)
router.push(`/member/${chooseUser.idUser}`)
}}
/>
<MenuItemRow
icon={<MaterialCommunityIcons name="account-remove" color="black" size={25} />}
title="Keluarkan"
onPress={() => {
AlertKonfirmasi({
title: 'Konfirmasi',
desc: 'Apakah Anda yakin ingin mengeluarkan anggota?',
onPress: () => {
handleDeleteUser()
}
})
}}
/>
</View>
</DrawerBottom>
</SafeAreaView>
)
}

View File

@@ -104,21 +104,21 @@ export default function ListTask() {
<View>
<PaperGridContent onPress={() => { router.push('./task/321') }} content="page" title="Pembangunan Jembatan" headerColor="primary">
<ProgressBar />
<ProgressBar value={0}/>
<View style={[Styles.rowSpaceBetween]}>
<Text style={[Styles.textDefault, Styles.cGray]}>13 Februari 2025</Text>
<LabelStatus size="default" category="primary" text="SEGERA" />
</View>
</PaperGridContent>
<PaperGridContent content="page" title="Pembangunan Jembatan" headerColor="primary">
<ProgressBar />
<ProgressBar value={0}/>
<View style={[Styles.rowSpaceBetween]}>
<Text style={[Styles.textDefault, Styles.cGray]}>13 Februari 2025</Text>
<LabelStatus size="default" category="primary" text="SEGERA" />
</View>
</PaperGridContent>
<PaperGridContent content="page" title="Pembangunan Jembatan" headerColor="primary">
<ProgressBar />
<ProgressBar value={0}/>
<View style={[Styles.rowSpaceBetween]}>
<Text style={[Styles.textDefault, Styles.cGray]}>13 Februari 2025</Text>
<LabelStatus size="default" category="primary" text="SEGERA" />

View File

@@ -25,7 +25,7 @@ import { useDispatch, useSelector } from "react-redux";
export default function CreateMember() {
const dispatch = useDispatch()
const update = useSelector((state: any) => state.positionUpdate)
const update = useSelector((state: any) => state.memberUpdate)
const { token, decryptToken } = useAuthSession()
const [valSelect, setValSelect] = useState<"group" | "position" | "role" | "gender">("group");
const [chooseGroup, setChooseGroup] = useState({ val: "", label: "" });
@@ -36,6 +36,7 @@ export default function CreateMember() {
const entityUser = useSelector((state: any) => state.user);
const [isSelect, setSelect] = useState(false);
const [disableBtn, setDisableBtn] = useState(true)
const [valChoose, setValChoose] = useState("")
const [error, setError] = useState({
group: false,
position: false,
@@ -224,6 +225,7 @@ export default function CreateMember() {
value={chooseGroup.label}
required
onPress={() => {
setValChoose(chooseGroup.val);
setValSelect("group");
setSelect(true);
}}
@@ -237,6 +239,7 @@ export default function CreateMember() {
value={choosePosition.label}
required
onPress={() => {
setValChoose(choosePosition.val);
setValSelect("position");
setSelect(true);
}}
@@ -249,6 +252,7 @@ export default function CreateMember() {
value={chooseRole.label}
required
onPress={() => {
setValChoose(chooseRole.val);
setValSelect("role");
setSelect(true);
}}
@@ -306,6 +310,7 @@ export default function CreateMember() {
value={chooseGender.label}
required
onPress={() => {
setValChoose(chooseGender.val);
setValSelect("gender");
setSelect(true);
}}
@@ -332,6 +337,7 @@ export default function CreateMember() {
}
open={isSelect}
idParent={valSelect == "position" ? chooseGroup.val : ""}
valChoose={valChoose}
/>
</SafeAreaView>
);

View File

@@ -5,6 +5,7 @@ import ModalSelect from "@/components/modalSelect";
import SelectForm from "@/components/selectForm";
import Styles from "@/constants/Styles";
import { apiEditUser, apiGetProfile } from "@/lib/api";
import { setUpdateMember } from "@/lib/memberSlice";
import { useAuthSession } from "@/providers/AuthProvider";
import * as ImagePicker from "expo-image-picker";
import { router, Stack, useLocalSearchParams } from "expo-router";
@@ -18,6 +19,7 @@ import {
ToastAndroid,
View,
} from "react-native";
import { useDispatch, useSelector } from "react-redux";
type Props = {
id: string;
@@ -34,6 +36,8 @@ type Props = {
};
export default function EditMember() {
const dispatch = useDispatch()
const update = useSelector((state: any) => state.memberUpdate)
const { token, decryptToken } = useAuthSession()
const { id } = useLocalSearchParams<{ id: string }>();
const [errorImg, setErrorImg] = useState(false)
@@ -154,7 +158,7 @@ export default function EditMember() {
}
function checkForm() {
if (Object.values(error).some((v) => v == true) == true || Object.values(data).some((v) => v == "") == true) {
if (Object.values(error).some((v) => v == true) || Object.values(data).some((v) => v == "")) {
setDisableBtn(true)
} else {
setDisableBtn(false)
@@ -175,6 +179,7 @@ export default function EditMember() {
const response = await apiEditUser(fd, id)
if (response.success) {
ToastAndroid.show('Berhasil mengupdate data', ToastAndroid.SHORT)
dispatch(setUpdateMember(!update))
router.replace(`/member/${id}`);
} else {
ToastAndroid.show(response.message, ToastAndroid.SHORT)

View File

@@ -107,21 +107,21 @@ export default function ListProject() {
<View>
<PaperGridContent onPress={() => { router.push('/project/234') }} content="page" title="Pembangunan Jembatan" headerColor="primary">
<ProgressBar />
<ProgressBar value={0} />
<View style={[Styles.rowSpaceBetween]}>
<Text style={[Styles.textDefault, Styles.cGray]}>13 Februari 2025</Text>
<LabelStatus size="default" category="primary" text="SEGERA" />
</View>
</PaperGridContent>
<PaperGridContent content="page" title="Pembangunan Jembatan" headerColor="primary">
<ProgressBar />
<ProgressBar value={0} />
<View style={[Styles.rowSpaceBetween]}>
<Text style={[Styles.textDefault, Styles.cGray]}>13 Februari 2025</Text>
<LabelStatus size="default" category="primary" text="SEGERA" />
</View>
</PaperGridContent>
<PaperGridContent content="page" title="Pembangunan Jembatan" headerColor="primary">
<ProgressBar />
<ProgressBar value={0} />
<View style={[Styles.rowSpaceBetween]}>
<Text style={[Styles.textDefault, Styles.cGray]}>13 Februari 2025</Text>
<LabelStatus size="default" category="primary" text="SEGERA" />