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

Merge pull request #13 from bipproduction/amalia/14-mar-25

Browse Source 
Amalia/14 mar 25
This commit is contained in:
Amalia
2025-03-14 11:17:51 +08:00
committed by GitHub
parent 0a0aefb5d2 f73bf8354d
commit a4278a969c
14 changed files with 257 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -135,7 +135,7 @@ export default function DetailDiscussionGeneral() {
</View>
</View>
</ScrollView>
<View style={[Styles.ph15, Styles.pv10, { position: 'absolute', bottom: 10 }]}>
<View style={[Styles.ph15, Styles.pv10, { position: 'absolute', bottom: 10, backgroundColor: '#f4f4f4' }]}>
<InputForm
type="default"
round
@@ -146,7 +146,7 @@ export default function DetailDiscussionGeneral() {
}
/>
</View>
</View>
</View >
</>
)
}

11
app/(application)/division/[id]/(fitur-division)/discussion/[detail]/edit.tsx
View File

@@ -1,6 +1,5 @@
import AlertKonfirmasi from "@/components/alertKonfirmasi";
import ButtonBackHeader from "@/components/buttonBackHeader";
import { ButtonForm } from "@/components/buttonForm";
import ButtonSaveHeader from "@/components/buttonSaveHeader";
import { InputForm } from "@/components/inputForm";
import Styles from "@/constants/Styles";
import { router, Stack } from "expo-router";
@@ -14,12 +13,16 @@ export default function DiscussionDivisionEdit() {
headerLeft: () => <ButtonBackHeader onPress={() => { router.back() }} />,
headerTitle: 'Edit Diskusi',
headerTitleAlign: 'center',
headerRight: () => <ButtonSaveHeader category="update" onPress={() => {
ToastAndroid.show('Berhasil mengubah data', ToastAndroid.SHORT)
router.back()
}} />
}}
/>
<ScrollView>
<View style={[Styles.p15]}>
<InputForm label="Diskusi" type="default" placeholder="Hal yang didiskusikan" required />
<ButtonForm
{/* <ButtonForm
text="SIMPAN"
onPress={() => {
AlertKonfirmasi({
@@ -30,7 +33,7 @@ export default function DiscussionDivisionEdit() {
router.back()
}
})
}} />
}} /> */}
</View>
</ScrollView>
</SafeAreaView>

205
app/(application)/division/[id]/(fitur-division)/discussion/[detail]/index.tsx
View File

@@ -3,7 +3,6 @@ import ButtonBackHeader from "@/components/buttonBackHeader";
import HeaderRightDiscussionDetail from "@/components/discussion/headerDiscussionDetail";
import { InputForm } from "@/components/inputForm";
import LabelStatus from "@/components/labelStatus";
import { ColorsStatus } from "@/constants/ColorsStatus";
import Styles from "@/constants/Styles";
import { Ionicons, MaterialIcons } from "@expo/vector-icons";
import { router, Stack, useLocalSearchParams } from "expo-router";
@@ -23,122 +22,120 @@ export default function DiscussionDetail() {
}}
/>
<View style={{ flex: 1 }}>
<View style={{ flex: 5 }}>
<ScrollView>
<View style={[Styles.p15, Styles.mb100]}>
<ScrollView>
<View style={[Styles.p15, Styles.mb100]}>
<BorderBottomItem
borderType="bottom"
icon={
<Image
source={require("../../../../../../../assets/images/user.jpeg")}
style={[Styles.userProfileSmall]}
/>
}
title="Amalia Dwi"
subtitle={
<LabelStatus category='success' text='BUKA' size="small" />
}
rightTopInfo="3 Jan 2025"
desc="Bagaimana dampak yg dirasakan akibat efisiensi?"
leftBottomInfo={
<View style={[Styles.rowItemsCenter]}>
<Ionicons name="chatbox-ellipses-outline" size={18} color="grey" style={Styles.mr05} />
<Text style={[Styles.textInformation, Styles.cGray, Styles.mb05]}>15 Komentar</Text>
</View>
}
/>
<View style={[Styles.p15]}>
<BorderBottomItem
borderType="bottom"
icon={
<Image
source={require("../../../../../../../assets/images/user.jpeg")}
style={[Styles.userProfileSmall]}
style={[Styles.userProfileExtraSmall]}
/>
}
title="Amalia Dwi"
subtitle={
<LabelStatus category='success' text='BUKA' size="small" />
}
rightTopInfo="3 Jan 2025"
desc="Bagaimana dampak yg dirasakan akibat efisiensi?"
leftBottomInfo={
<View style={[Styles.rowItemsCenter]}>
<Ionicons name="chatbox-ellipses-outline" size={18} color="grey" style={Styles.mr05} />
<Text style={[Styles.textInformation, Styles.cGray, Styles.mb05]}>15 Komentar</Text>
</View>
}
desc="sangat berdampak dari berbagai sisi"
/>
<BorderBottomItem
borderType="bottom"
icon={
<Image
source={require("../../../../../../../assets/images/user.jpeg")}
style={[Styles.userProfileExtraSmall]}
/>
}
title="Amalia Dwi"
rightTopInfo="3 Jan 2025"
desc="semua menjadi terbatas.."
/>
<BorderBottomItem
borderType="bottom"
icon={
<Image
source={require("../../../../../../../assets/images/user.jpeg")}
style={[Styles.userProfileExtraSmall]}
/>
}
title="Amalia Dwi"
rightTopInfo="3 Jan 2025"
desc="semua menjadi terbatas.."
/>
<BorderBottomItem
borderType="bottom"
icon={
<Image
source={require("../../../../../../../assets/images/user.jpeg")}
style={[Styles.userProfileExtraSmall]}
/>
}
title="Amalia Dwi"
rightTopInfo="3 Jan 2025"
desc="semua menjadi terbatas.."
/>
<BorderBottomItem
borderType="bottom"
icon={
<Image
source={require("../../../../../../../assets/images/user.jpeg")}
style={[Styles.userProfileExtraSmall]}
/>
}
title="Amalia Dwi"
rightTopInfo="3 Jan 2025"
desc="semua menjadi terbatas.."
/>
<BorderBottomItem
borderType="bottom"
icon={
<Image
source={require("../../../../../../../assets/images/user.jpeg")}
style={[Styles.userProfileExtraSmall]}
/>
}
title="Amalia Dwi"
rightTopInfo="3 Jan 2025"
desc="semua menjadi terbatas.."
/>
<View style={[Styles.p15]}>
<BorderBottomItem
borderType="bottom"
icon={
<Image
source={require("../../../../../../../assets/images/user.jpeg")}
style={[Styles.userProfileExtraSmall]}
/>
}
title="Amalia Dwi"
rightTopInfo="3 Jan 2025"
desc="sangat berdampak dari berbagai sisi"
/>
<BorderBottomItem
borderType="bottom"
icon={
<Image
source={require("../../../../../../../assets/images/user.jpeg")}
style={[Styles.userProfileExtraSmall]}
/>
}
title="Amalia Dwi"
rightTopInfo="3 Jan 2025"
desc="semua menjadi terbatas.."
/>
<BorderBottomItem
borderType="bottom"
icon={
<Image
source={require("../../../../../../../assets/images/user.jpeg")}
style={[Styles.userProfileExtraSmall]}
/>
}
title="Amalia Dwi"
rightTopInfo="3 Jan 2025"
desc="semua menjadi terbatas.."
/>
<BorderBottomItem
borderType="bottom"
icon={
<Image
source={require("../../../../../../../assets/images/user.jpeg")}
style={[Styles.userProfileExtraSmall]}
/>
}
title="Amalia Dwi"
rightTopInfo="3 Jan 2025"
desc="semua menjadi terbatas.."
/>
<BorderBottomItem
borderType="bottom"
icon={
<Image
source={require("../../../../../../../assets/images/user.jpeg")}
style={[Styles.userProfileExtraSmall]}
/>
}
title="Amalia Dwi"
rightTopInfo="3 Jan 2025"
desc="semua menjadi terbatas.."
/>
<BorderBottomItem
borderType="bottom"
icon={
<Image
source={require("../../../../../../../assets/images/user.jpeg")}
style={[Styles.userProfileExtraSmall]}
/>
}
title="Amalia Dwi"
rightTopInfo="3 Jan 2025"
desc="semua menjadi terbatas.."
/>
<BorderBottomItem
borderType="bottom"
icon={
<Image
source={require("../../../../../../../assets/images/user.jpeg")}
style={[Styles.userProfileExtraSmall]}
/>
}
title="Amalia Dwi"
rightTopInfo="3 Jan 2025"
desc="semua menjadi terbatas.."
/>
<BorderBottomItem
borderType="bottom"
icon={
<Image
source={require("../../../../../../../assets/images/user.jpeg")}
style={[Styles.userProfileExtraSmall]}
/>
}
title="Amalia Dwi"
rightTopInfo="3 Jan 2025"
desc="semua menjadi terbatas.."
/>
</View>
</View>
</ScrollView>
</View>
<View style={[Styles.p10, { flex: 0.5 }]}>
</View>
</ScrollView>
<View style={[Styles.ph15, { position: 'absolute', bottom: 0, backgroundColor: '#f4f4f4' }]}>
<InputForm
bg="white"
type="default"

29
app/(application)/division/[id]/(fitur-division)/discussion/create.tsx Normal file
View File

@@ -0,0 +1,29 @@
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"
export default function CreateDiscussionDivision() {
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('./')
}} />
}}
/>
<ScrollView>
<View style={[Styles.p15, Styles.mb100]}>
<InputForm label="Diskusi" type="default" placeholder="Hal yang didiskusikan" required />
</View>
</ScrollView>
</SafeAreaView>
)
}

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

@@ -1,7 +1,6 @@
import AlertKonfirmasi from "@/components/alertKonfirmasi";
import BorderBottomItem from "@/components/borderBottomItem";
import ButtonBackHeader from "@/components/buttonBackHeader";
import { ButtonForm } from "@/components/buttonForm";
import ButtonSaveHeader from "@/components/buttonSaveHeader";
import ButtonSelect from "@/components/buttonSelect";
import Styles from "@/constants/Styles";
import { MaterialCommunityIcons } from "@expo/vector-icons";
@@ -17,6 +16,10 @@ export default function TaskDivisionAddFile() {
headerLeft: () => <ButtonBackHeader onPress={() => { router.back() }} />,
headerTitle: 'Tambah File',
headerTitleAlign: 'center',
headerRight: () => <ButtonSaveHeader category="create" onPress={() => {
ToastAndroid.show('Berhasil menambah data', ToastAndroid.SHORT)
router.push('./')
}} />
}}
/>
<ScrollView>
@@ -39,7 +42,7 @@ export default function TaskDivisionAddFile() {
/>
</View>
</View>
<ButtonForm
{/* <ButtonForm
text="SIMPAN"
onPress={() => {
AlertKonfirmasi({
@@ -50,7 +53,7 @@ export default function TaskDivisionAddFile() {
router.push('./')
}
})
}} />
}} /> */}
</View>
</ScrollView>
</SafeAreaView>

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

@@ -1,12 +1,11 @@
import AlertKonfirmasi from "@/components/alertKonfirmasi";
import ButtonBackHeader from "@/components/buttonBackHeader";
import { ButtonForm } from "@/components/buttonForm";
import ButtonSaveHeader from "@/components/buttonSaveHeader";
import { InputForm } from "@/components/inputForm";
import Styles from "@/constants/Styles";
import dayjs from "dayjs";
import { router, Stack, useLocalSearchParams } from "expo-router";
import { useState } from "react";
import { SafeAreaView, ScrollView, View, ToastAndroid, Text } from "react-native";
import { SafeAreaView, ScrollView, Text, ToastAndroid, View } from "react-native";
import DateTimePicker, { DateType, getDefaultStyles } from "react-native-ui-datepicker";
export default function TaskDivisionAddTask() {
@@ -27,6 +26,10 @@ export default function TaskDivisionAddTask() {
headerLeft: () => <ButtonBackHeader onPress={() => { router.back() }} />,
headerTitle: 'Tambah Tugas',
headerTitleAlign: 'center',
headerRight: () => <ButtonSaveHeader category="create" onPress={() => {
ToastAndroid.show('Berhasil menambah data', ToastAndroid.SHORT)
router.push('./')
}} />
}}
/>
<ScrollView>
@@ -55,7 +58,7 @@ export default function TaskDivisionAddTask() {
</View>
</View>
<InputForm label="Judul Tugas" type="default" placeholder="Judul Tugas" required bg="white" />
<ButtonForm
{/* <ButtonForm
text="SIMPAN"
onPress={() => {
AlertKonfirmasi({
@@ -66,7 +69,7 @@ export default function TaskDivisionAddTask() {
router.push('./')
}
})
}} />
}} /> */}
</View>
</ScrollView>
</SafeAreaView>

13
app/(application)/division/[id]/(fitur-division)/task/[detail]/cancel.tsx
View File

@@ -1,12 +1,11 @@
import AlertKonfirmasi from "@/components/alertKonfirmasi"
import ButtonBackHeader from "@/components/buttonBackHeader"
import { ButtonForm } from "@/components/buttonForm"
import ButtonSaveHeader from "@/components/buttonSaveHeader"
import { InputForm } from "@/components/inputForm"
import Styles from "@/constants/Styles"
import { router, Stack, useLocalSearchParams } from "expo-router"
import { SafeAreaView, ScrollView, ToastAndroid, View } from "react-native"
export default function TaskDivisionCancel(){
export default function TaskDivisionCancel() {
const { id, detail } = useLocalSearchParams()
return (
<SafeAreaView>
@@ -15,12 +14,16 @@ export default function TaskDivisionCancel(){
headerLeft: () => <ButtonBackHeader onPress={() => { router.back() }} />,
headerTitle: 'Pembatalan Tugas',
headerTitleAlign: 'center',
headerRight: () => <ButtonSaveHeader category="cancel" onPress={() => {
ToastAndroid.show('Berhasil mengubah data', ToastAndroid.SHORT)
router.push('./')
}} />
}}
/>
<ScrollView>
<View style={[Styles.p15, Styles.mb100]}>
<InputForm label="Alasan Pembatalan" type="default" placeholder="Alasan Pembatalan" required bg="white" />
<ButtonForm
{/* <ButtonForm
text="SIMPAN"
onPress={() => {
AlertKonfirmasi({
@@ -31,7 +34,7 @@ export default function TaskDivisionCancel(){
router.push('./')
}
})
}} />
}} /> */}
</View>
</ScrollView>
</SafeAreaView>

11
app/(application)/division/[id]/(fitur-division)/task/[detail]/edit.tsx
View File

@@ -1,6 +1,5 @@
import AlertKonfirmasi from "@/components/alertKonfirmasi";
import ButtonBackHeader from "@/components/buttonBackHeader";
import { ButtonForm } from "@/components/buttonForm";
import ButtonSaveHeader from "@/components/buttonSaveHeader";
import { InputForm } from "@/components/inputForm";
import Styles from "@/constants/Styles";
import { router, Stack, useLocalSearchParams } from "expo-router";
@@ -15,12 +14,16 @@ export default function TaskDivisionEdit() {
headerLeft: () => <ButtonBackHeader onPress={() => { router.back() }} />,
headerTitle: 'Edit Judul Tugas',
headerTitleAlign: 'center',
headerRight: () => <ButtonSaveHeader category="update" onPress={() => {
ToastAndroid.show('Berhasil mengubah data', ToastAndroid.SHORT)
router.push('./')
}} />
}}
/>
<ScrollView>
<View style={[Styles.p15, Styles.mb100]}>
<InputForm label="Judul Kegiatan" type="default" placeholder="Judul Kegiatan" required bg="white" />
<ButtonForm
{/* <ButtonForm
text="SIMPAN"
onPress={() => {
AlertKonfirmasi({
@@ -31,7 +34,7 @@ export default function TaskDivisionEdit() {
router.push('./')
}
})
}} />
}} /> */}
</View>
</ScrollView>
</SafeAreaView>

4
app/(application)/division/[id]/(fitur-division)/task/[detail]/index.tsx
View File

@@ -17,7 +17,7 @@ export default function DetailTaskDivision() {
<Stack.Screen
options={{
headerLeft: () => <ButtonBackHeader onPress={() => { router.back() }} />,
headerTitle: 'Judul Tugas',
headerTitle: 'Judul Tugas Divisi',
headerTitleAlign: 'center',
headerRight: () => <HeaderRightTaskDetail id={detail} />,
}}
@@ -25,7 +25,7 @@ export default function DetailTaskDivision() {
<ScrollView>
<View style={[Styles.p15, Styles.mb100]}>
<SectionProgress text="Kemajuan Kegiatan 50%" />
<SectionTanggalTugas />
<SectionTanggalTugas category="task" />
<SectionFile />
<SectionMember />
</View>

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

@@ -1,6 +1,5 @@
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 Styles from "@/constants/Styles";
@@ -17,6 +16,10 @@ export default function CreateTaskDivision() {
headerLeft: () => <ButtonBackHeader onPress={() => { router.back() }} />,
headerTitle: `Tambah Tugas`,
headerTitleAlign: 'center',
headerRight: () => <ButtonSaveHeader category="create" onPress={() => {
ToastAndroid.show('Berhasil menambah data', ToastAndroid.SHORT)
router.push('../task?status=0')
}} />
}}
/>
<ScrollView>
@@ -25,7 +28,7 @@ export default function CreateTaskDivision() {
<ButtonSelect value="Tambah Tanggal & Tugas" />
<ButtonSelect value="Upload File" />
<ButtonSelect value="Tambah Anggota" />
<ButtonForm
{/* <ButtonForm
text="SIMPAN"
onPress={() => {
AlertKonfirmasi({
@@ -36,7 +39,7 @@ export default function CreateTaskDivision() {
router.push('../task?status=0')
}
})
}} />
}} /> */}
</View>
</ScrollView>
</SafeAreaView>

65
app/(application)/division/[id]/(fitur-division)/task/update/[id].tsx Normal file
View File

@@ -0,0 +1,65 @@
import ButtonBackHeader from "@/components/buttonBackHeader";
import ButtonSaveHeader from "@/components/buttonSaveHeader";
import { InputForm } from "@/components/inputForm";
import Styles from "@/constants/Styles";
import dayjs from "dayjs";
import { router, Stack, useLocalSearchParams } from "expo-router";
import { useState } from "react";
import { SafeAreaView, ScrollView, Text, ToastAndroid, View } from "react-native";
import DateTimePicker, { DateType, getDefaultStyles } from "react-native-ui-datepicker";
export default function UpdateProjectTaskDivision() {
const { id } = useLocalSearchParams()
const [range, setRange] = useState<{ startDate: DateType; endDate: DateType; }>({ startDate: undefined, endDate: undefined });
const defaultStyles = getDefaultStyles()
const from = range.startDate
? dayjs(range.startDate).format('MMM DD, YYYY')
: '';
const to = range.endDate ? dayjs(range.endDate).format('MMM DD, YYYY') : '';
return (
<SafeAreaView>
<Stack.Screen
options={{
headerLeft: () => <ButtonBackHeader onPress={() => { router.back() }} />,
headerTitle: 'Edit Tanggal dan Tugas Divisi',
headerTitleAlign: 'center',
headerRight: () => <ButtonSaveHeader category="update" onPress={() => {
ToastAndroid.show('Berhasil mengubah data', ToastAndroid.SHORT)
router.push('../4324')
}} />
}}
/>
<ScrollView>
<View style={[Styles.p15, Styles.mb100]}>
<View style={[Styles.wrapPaper, Styles.p10]}>
<DateTimePicker
mode="range"
startDate={range.startDate}
endDate={range.endDate}
onChange={(param) => setRange(param)}
styles={defaultStyles}
/>
</View>
<View style={[Styles.rowSpaceBetween, Styles.mv10]}>
<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>
<InputForm label="Judul Tugas" type="default" placeholder="Judul Tugas" required bg="white" />
</View>
</ScrollView>
</SafeAreaView>
)
}

8
app/(application)/project/[id]/index.tsx
View File

@@ -6,7 +6,7 @@ import SectionProgress from "@/components/sectionProgress";
import SectionTanggalTugas from "@/components/sectionTanggalTugas";
import Styles from "@/constants/Styles";
import { router, Stack, useLocalSearchParams } from "expo-router";
import { SafeAreaView, ScrollView, Text, View } from "react-native";
import { SafeAreaView, ScrollView, View } from "react-native";
export default function DetailProject() {
const { id } = useLocalSearchParams()
@@ -23,9 +23,9 @@ export default function DetailProject() {
<ScrollView>
<View style={[Styles.p15, Styles.mb100]}>
<SectionProgress text="Kemajuan Kegiatan 50%" />
<SectionTanggalTugas />
<SectionFile/>
<SectionMember/>
<SectionTanggalTugas category="project" />
<SectionFile />
<SectionMember />
</View>
</ScrollView>
</SafeAreaView>

2
components/discussion/headerDiscussionList.tsx
View File

@@ -20,7 +20,7 @@ export default function HeaderRightDiscussionList() {
title="Tambah Diskusi"
onPress={() => {
setVisible(false)
router.push('/discussion/create')
router.push('./discussion/create')
}}
/>
</View>

13
components/sectionTanggalTugas.tsx
View File

@@ -3,13 +3,17 @@ import { Ionicons, MaterialCommunityIcons } from "@expo/vector-icons";
import { router } from "expo-router";
import { useState } from "react";
import { Text, ToastAndroid, View } from "react-native";
import AlertKonfirmasi from "./alertKonfirmasi";
import DrawerBottom from "./drawerBottom";
import ItemSectionTanggalTugas from "./itemSectionTanggalTugas";
import MenuItemRow from "./menuItemRow";
import AlertKonfirmasi from "./alertKonfirmasi";
import ModalSelect from "./modalSelect";
export default function SectionTanggalTugas() {
type Props = {
category: 'project' | 'task'
}
export default function SectionTanggalTugas({ category }: Props) {
const [isModal, setModal] = useState(false)
const [isSelect, setSelect] = useState(false)
const [choose, setChoose] = useState({ val: '', label: '' })
@@ -39,7 +43,9 @@ export default function SectionTanggalTugas() {
title="Edit Tugas"
onPress={() => {
setModal(false)
router.push(`/project/update/124`)
category == 'project'
? router.push(`/project/update/124`)
: router.push(`./update/124`)
}}
/>
@@ -53,7 +59,6 @@ export default function SectionTanggalTugas() {
onPress: () => {
setModal(false)
ToastAndroid.show('Berhasil menghapus data', ToastAndroid.SHORT)
router.push('/project/243')
}
})