Commit 67627291 by tungnq

IMPORTANT: Cho FAB chia ra làm 2 màn hình để FAB bám vào màn hình giao diện

parent 9052caa2
...@@ -58,7 +58,7 @@ export const SUBBTN_WIDTH = FAB_WIDTH; ...@@ -58,7 +58,7 @@ export const SUBBTN_WIDTH = FAB_WIDTH;
export const SUBBTN_HEIGHT = SUBBTN_WIDTH; export const SUBBTN_HEIGHT = SUBBTN_WIDTH;
// Bán kính bo tròn (nút con hình tròn) // Bán kính bo tròn (nút con hình tròn)
export const SUBBTN_BORDER_RADIUS = SUBBTN_WIDTH / 2; export const SUBBTN_BORDER_RADIUS = 10;
// Màu nền mặc định của nút con // Màu nền mặc định của nút con
export const SUBBTN_BACKGROUND_COLOR = '#2F6BFF'; export const SUBBTN_BACKGROUND_COLOR = '#2F6BFF';
......
...@@ -88,6 +88,14 @@ const styles = StyleSheet.create({ ...@@ -88,6 +88,14 @@ const styles = StyleSheet.create({
marginTop: 10, // Khoảng cách giữa các SubButton4 marginTop: 10, // Khoảng cách giữa các SubButton4
flexDirection: 'row', flexDirection: 'row',
alignItems: 'center', alignItems: 'center',
shadowColor: '#000',
shadowOffset: {
width: 0,
height: 2,
},
shadowOpacity: 0.25,
shadowRadius: 3.84,
elevation: 5,
}, },
label: { label: {
marginRight:3, marginRight:3,
......
...@@ -62,7 +62,7 @@ const styles = StyleSheet.create({ ...@@ -62,7 +62,7 @@ const styles = StyleSheet.create({
borderRadius:100, borderRadius:100,
padding:10, padding:10,
alignSelf:'flex-start', alignSelf:'flex-start',
backgroundColor:R.colors.brown, backgroundColor:R.colors.orange,
marginHorizontal:5 marginHorizontal:5
}, },
containerBtn:{ containerBtn:{
......
import React, {useEffect} from 'react'; import React, {useEffect} from 'react';
import {Text, View, TouchableOpacity, StyleSheet, Image, ScrollView, FlatList, Alert} from 'react-native'; import {
Text,
View,
TouchableOpacity,
StyleSheet,
Image,
ScrollView,
FlatList,
Alert,
} from 'react-native';
import R from '../../../assets/R'; import R from '../../../assets/R';
import styles from './style'; import styles from './style';
import Header from '../../../components/Header/Header'; import Header from '../../../components/Header/Header';
...@@ -9,123 +18,190 @@ import SubButton from '../../../components/FAB/sub_button'; ...@@ -9,123 +18,190 @@ import SubButton from '../../../components/FAB/sub_button';
const DetailIncomingDocumentView = props => { const DetailIncomingDocumentView = props => {
const {icomingDocument} = props; const {icomingDocument} = props;
console.log(props); console.log(props);
const getColor = (status) => { const getColor = status => {
switch (status) { switch (status) {
case 'Hạn chế': case 'Hạn chế':
return R.colors.brown; return R.colors.brown;
case 'Công khai': case 'Công khai':
return R.colors.blue; return R.colors.blue;
} }
} };
const renderItem = ({item}) => { const renderItem = ({item}) => {
console.log(item); console.log(item);
return ( return (
<View style={{marginVertical: 7.5}}> <View style={{marginVertical: 7.5}}>
<View style={{flexDirection: 'row', marginBottom:5}}> <View style={{flexDirection: 'row', marginBottom: 5}}>
<Text style={styles.text}>{item.author} - </Text> <Text style={styles.text}>{item.author} - </Text>
<Text style={styles.text}>{item.code}{" "}</Text> <Text style={styles.text}>{item.code} </Text>
<Text style={styles.text}>{item.time}{" "}</Text> <Text style={styles.text}>{item.time} </Text>
<Text style={styles.text}>{item.date}</Text> <Text style={styles.text}>{item.date}</Text>
</View> </View>
<View style={styles.containerContent}> <View style={styles.containerContent}>
<Text style={styles.text_2}>{item.content}</Text> <Text style={styles.text_2}>{item.content}</Text>
</View> </View>
</View> </View>
) );
} };
return ( return (
<View style={styles.container}> <View style={styles.container}>
<Header title={'Văn bản 2038475'} isBack/> <Header title={'Văn bản 2038475'} isBack />
<View style={{flex: 1}}>
<ScrollView showsVerticalScrollIndicator={false}> <ScrollView showsVerticalScrollIndicator={false}>
<View style={styles.body}> <View style={styles.body}>
<Text style = {styles.textSubTitle}>{icomingDocument.title}</Text> <Text style={styles.textSubTitle}>{icomingDocument.title}</Text>
<View style={{marginTop:5}}></View> <View style={{marginTop: 5}}></View>
<View style={{flexDirection: 'row', justifyContent: 'space-between', alignItems: 'center',marginBottom:5}}> <View
style={{
flexDirection: 'row',
justifyContent: 'space-between',
alignItems: 'center',
marginBottom: 5,
}}>
<Text style={styles.text_1}> <Text style={styles.text_1}>
Văn bn hin có {icomingDocument.total_head_of_work} công vic liên {'\n'}quan Văn bn hin có {icomingDocument.total_head_of_work} công vic
liên {'\n'}quan
</Text> </Text>
<Text style={styles.text}> <Text style={styles.text}>
Chế độ: Chế độ:
<Text style={{ <Text
fontWeight:'600', style={{
fontFamily:R.fonts.fontMedium, fontWeight: '600',
fontSize:R.fontsize.fontSizeContent, fontFamily: R.fonts.fontMedium,
color: getColor(icomingDocument.status)}}>{icomingDocument.status}</Text> fontSize: R.fontsize.fontSizeContent,
color: getColor(icomingDocument.status),
}}>
{icomingDocument.status}
</Text>
</Text> </Text>
</View> </View>
<View style={{flexDirection: 'row', justifyContent: 'space-between',marginBottom:5}}> <View
<Text style={styles.text}>S ký hiu: style={{
<Text style={styles.text_2}>{icomingDocument.symbol_number}</Text> flexDirection: 'row',
justifyContent: 'space-between',
marginBottom: 5,
}}>
<Text style={styles.text}>
S ký hiu:
<Text style={styles.text_2}>
{icomingDocument.symbol_number}
</Text>
</Text>
<Text style={styles.text}>
S vào s:
<Text style={styles.text_2}>
{icomingDocument.number_entry_book}
</Text> </Text>
<Text style={styles.text}>S vào s:
<Text style={styles.text_2}>{icomingDocument.number_entry_book}</Text>
</Text> </Text>
</View> </View>
<View style={{flexDirection: 'row', justifyContent: 'space-between',marginBottom:5}}> <View
<Text style={styles.text}>Ngày đến: style={{
flexDirection: 'row',
justifyContent: 'space-between',
marginBottom: 5,
}}>
<Text style={styles.text}>
Ngày đến:
<Text style={styles.text_2}>{icomingDocument.term}</Text> <Text style={styles.text_2}>{icomingDocument.term}</Text>
</Text> </Text>
<Text style={styles.text}>Ngày văn bn: <Text style={styles.text}>
<Text style={styles.text_2}>{icomingDocument.term_display}</Text> Ngày văn bn:
<Text style={styles.text_2}>
{icomingDocument.term_display}
</Text>
</Text> </Text>
</View> </View>
<Text style={[styles.text , {marginBottom:5}]}>Loi văn bn: <Text style={[styles.text, {marginBottom: 5}]}>
Loi văn bn:
<Text style={styles.text_2}>{icomingDocument.document_type}</Text> <Text style={styles.text_2}>{icomingDocument.document_type}</Text>
</Text> </Text>
<Text style={[styles.text , {marginBottom:5}]}>Lĩnh vc văn bn: <Text style={[styles.text, {marginBottom: 5}]}>
Lĩnh vc văn bn:
<Text style={styles.text_2}>{icomingDocument.field}</Text> <Text style={styles.text_2}>{icomingDocument.field}</Text>
</Text> </Text>
<View style={{flexDirection: 'row', justifyContent: 'space-between',marginBottom:5}}> <View
<Text style={styles.text}>Người ký: style={{
flexDirection: 'row',
justifyContent: 'space-between',
marginBottom: 5,
}}>
<Text style={styles.text}>
Người ký:
<Text style={styles.text_2}>{icomingDocument.signer_name}</Text> <Text style={styles.text_2}>{icomingDocument.signer_name}</Text>
</Text> </Text>
<Text style={styles.text}>Đối tác gi: <Text style={styles.text}>
<Text style={styles.text_2}>{icomingDocument.sender_partner}</Text> Đối tác gi:
<Text style={styles.text_2}>
{icomingDocument.sender_partner}
</Text>
</Text> </Text>
</View> </View>
<TextMulti title="Ghi chú" /> <TextMulti title="Ghi chú" />
<View style={{marginTop:5}}></View> <View style={{marginTop: 5}}></View>
<Text style={[styles.text, {marginBottom:3}]}>Ni dung</Text> <Text style={[styles.text, {marginBottom: 3}]}>Ni dung</Text>
<View style={[styles.containerContent , {marginBottom:5}]}> <View style={[styles.containerContent, {marginBottom: 5}]}>
<Text style={styles.text_2}>{icomingDocument.content}</Text> <Text style={styles.text_2}>{icomingDocument.content}</Text>
</View> </View>
<Text style={[styles.text,{marginBottom:5}]}> <Text style={[styles.text, {marginBottom: 5}]}>
Ý kiến ca BGH: Ý kiến ca BGH:
<Text style={styles.text_2}>{icomingDocument.opinion_bgh}</Text> <Text style={styles.text_2}>{icomingDocument.opinion_bgh}</Text>
</Text> </Text>
<View style={{flexDirection:'row',flexWrap:'wrap',alignItems:'center', marginBottom:5}}> <View
style={{
flexDirection: 'row',
flexWrap: 'wrap',
alignItems: 'center',
marginBottom: 5,
}}>
<Text style={styles.text}>Phòng ban nhn :</Text> <Text style={styles.text}>Phòng ban nhn :</Text>
{icomingDocument.received_departments.map((item, index) => { {icomingDocument.received_departments.map((item, index) => {
return ( return (
<View style={styles.card}> <View style={styles.card}>
<Text style={{color:R.colors.white}} key={index}>{item.name}</Text> <Text style={{color: R.colors.white}} key={index}>
{item.name}
</Text>
</View> </View>
) );
})} })}
</View> </View>
<View style={{flexDirection:'row',flexWrap:'wrap',alignItems:'center', marginBottom:5}}> <View
style={{
flexDirection: 'row',
flexWrap: 'wrap',
alignItems: 'center',
marginBottom: 5,
}}>
<Text style={styles.text}>Nhóm nhn :</Text> <Text style={styles.text}>Nhóm nhn :</Text>
{icomingDocument.received_group.map((item, index) => { {icomingDocument.received_group.map((item, index) => {
return ( return (
<View style={[styles.card , {backgroundColor:R.colors.blue}]}> <View style={[styles.card, {backgroundColor: R.colors.blue}]}>
<Text style={{color:R.colors.white}} key={index}>{item.name}</Text> <Text style={{color: R.colors.white}} key={index}>
{item.name}
</Text>
</View> </View>
) );
})} })}
</View> </View>
<View style={{flexDirection:'row',flexWrap:'wrap',alignItems:'center', marginBottom:5}}> <View
style={{
flexDirection: 'row',
flexWrap: 'wrap',
alignItems: 'center',
marginBottom: 5,
}}>
<Text style={styles.text}>Người nhn :</Text> <Text style={styles.text}>Người nhn :</Text>
{icomingDocument.receiver.map((item, index) => { {icomingDocument.receiver.map((item, index) => {
return ( return (
<View style={[styles.card , {backgroundColor:R.colors.blue}]}> <View style={[styles.card, {backgroundColor: R.colors.blue}]}>
<Text style={{color:R.colors.white}} key={index}>{item.name}</Text> <Text style={{color: R.colors.white}} key={index}>
{item.name}
</Text>
</View> </View>
) );
})} })}
</View> </View>
<Text style={[styles.text, {color:R.colors.blue}]}> <Text style={[styles.text, {color: R.colors.blue}]}>
Tài liu đính kèm Tài liu đính kèm
</Text> </Text>
...@@ -133,10 +209,15 @@ const DetailIncomingDocumentView = props => { ...@@ -133,10 +209,15 @@ const DetailIncomingDocumentView = props => {
<Text style={styles.textBtn}> <Text style={styles.textBtn}>
Quyết định thông báo đào to - QD347583 Quyết định thông báo đào to - QD347583
</Text> </Text>
<Image source={R.images.icDownload} style={{width: 20, height: 20}} resizeMode="contain" tintColor={R.colors.blue}/> <Image
source={R.images.icDownload}
style={{width: 20, height: 20}}
resizeMode="contain"
tintColor={R.colors.blue}
/>
</TouchableOpacity> </TouchableOpacity>
<Text style={[styles.text, {color:R.colors.blue}]}> <Text style={[styles.text, {color: R.colors.blue}]}>
Bút phê văn bn Bút phê văn bn
</Text> </Text>
...@@ -145,14 +226,26 @@ const DetailIncomingDocumentView = props => { ...@@ -145,14 +226,26 @@ const DetailIncomingDocumentView = props => {
renderItem={renderItem} renderItem={renderItem}
keyExtractor={(item, index) => index.toString()} keyExtractor={(item, index) => index.toString()}
/> />
</View>
</ScrollView>
<View style={{marginHorizontal: 15}}>
<FAB> <FAB>
<SubButton onPress={() => Alert.alert('Pressed 1!')} label="Thêm bút phê" images={R.images.icEdit} backgroundColor={R.colors.orange}/> <SubButton
<SubButton onPress={() => Alert.alert('Pressed 2!')} label="Tạo công việc" images={R.images.icMenuEdit} backgroundColor={R.colors.blue}/> onPress={() => Alert.alert('Pressed 1!')}
label="Thêm bút phê"
images={R.images.icEdit}
backgroundColor={R.colors.orange}
/>
<SubButton
onPress={() => Alert.alert('Pressed 2!')}
label="Tạo công việc"
images={R.images.icMenuEdit}
backgroundColor={R.colors.blue}
/>
</FAB> </FAB>
</View> </View>
</ScrollView> </View>
</View> </View>
); );
}; };
......
...@@ -86,7 +86,7 @@ const IncomingDocumentView = props => { ...@@ -86,7 +86,7 @@ const IncomingDocumentView = props => {
<Button <Button
title="Công việc" title="Công việc"
onPress={() => {}} onPress={() => {}}
backgroundColor={R.colors.brown} backgroundColor={R.colors.orange}
textColor={R.colors.white} textColor={R.colors.white}
height={25} height={25}
borderRadius={15} borderRadius={15}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment