From bca8f308b2bfdb4216b40a326b4212add075b139 Mon Sep 17 00:00:00 2001 From: Brice Zele Date: Tue, 25 Aug 2020 06:39:28 +0100 Subject: [PATCH] demand group OK --- screens/nano-credit/DemandGroupNanoCredit.js | 51 ++++++++++++++++--- .../DemandGroupNanoCreditDetail.js | 37 ++++++++++++-- screens/nano-credit/MyNanoCreditGroup.js | 2 +- utils/UtilsFunction.js | 2 +- utils/i18n/en.json | 1 + utils/i18n/fr.json | 1 + 6 files changed, 81 insertions(+), 13 deletions(-) diff --git a/screens/nano-credit/DemandGroupNanoCredit.js b/screens/nano-credit/DemandGroupNanoCredit.js index eebcb7d8..811fddd9 100644 --- a/screens/nano-credit/DemandGroupNanoCredit.js +++ b/screens/nano-credit/DemandGroupNanoCredit.js @@ -55,6 +55,7 @@ import { IlinkEmitter } from '../../utils/events'; import { Typography } from '../../config/typography'; import { ScrollView } from 'react-native-gesture-handler'; import { Color } from '../../config/Color'; +import { color } from 'react-native-reanimated'; class DemandValidationGroup extends React.Component { @@ -143,8 +144,29 @@ class DemandValidationGroup extends React.Component { _closeMenu = () => this.setState({ visibleMenu: false }); + getDemandTypeIcon = (type) => { + switch (type) { + case 'creation': return 'account-multiple-plus'; + case 'suppression': return 'account-multiple-minus'; + case 'adhesion': return 'account-multiple-check' + case 'nano_credit': return 'cash' + default: return 'account-multiple' + } + } + + getDemandTypeColor = (type) => { + switch (type) { + case 'creation': return 'green'; + case 'suppression': return 'red'; + case 'adhesion': return Color.primaryColor + case 'nano_credit': return Color.primaryColor + default: + return Color.primaryColor + } + } + renderDemandItem = (item) => { - let dateFormat = moment.tz(item.date_creation, 'Etc/GMT+0').format(); + let dateFormat = moment.tz(item.date_creation_demande, 'Etc/GMT+0').format(); dateFormat = moment(dateFormat).fromNow(); return ( @@ -152,8 +174,15 @@ class DemandValidationGroup extends React.Component { this.props.navigation.push(route.demandGroupNanoCreditDetail, { id: item.id }); - } - }> + }} + style={[styles.paymentItem]}> + + + + + + + {item.nom} @@ -189,7 +218,6 @@ class DemandValidationGroup extends React.Component { - ) @@ -399,8 +427,6 @@ const styles = StyleSheet.create({ fontWeight: 'bold' }, content: { - width: responsiveWidth(100), - borderBottomColor: '#FFFFFF', flex: 1, flexDirection: 'column', paddingTop: 10, @@ -440,4 +466,17 @@ const styles = StyleSheet.create({ marginBottom: 10, color: theme.accent, }, + paymentItem: { + flexDirection: "row", + alignItems: "center", + justifyContent: "space-between", + width: "100%", + borderBottomColor: '#EEE', + borderBottomWidth: 1 + }, + iconContent: { + width: 40, + marginRight: 5, + alignItems: "center" + } }); diff --git a/screens/nano-credit/DemandGroupNanoCreditDetail.js b/screens/nano-credit/DemandGroupNanoCreditDetail.js index a5d83e66..deadb68e 100644 --- a/screens/nano-credit/DemandGroupNanoCreditDetail.js +++ b/screens/nano-credit/DemandGroupNanoCreditDetail.js @@ -97,7 +97,7 @@ class DemandGroupNanoCreditDetail extends Component { displayToast = (message) => { Toast.show(message, { - duration: Toast.durations.SHORT, + duration: Toast.durations.LONG, position: Toast.positions.BOTTOM, backgroundColor: Color.primaryColor, shadow: true, @@ -298,14 +298,28 @@ class DemandGroupNanoCreditDetail extends Component { ) } + getDemandTypeIcon = (type) => { + switch (type) { + case 'creation': return 'account-multiple-plus'; + case 'suppression': return 'account-multiple-minus'; + case 'adhesion': return 'account-multiple-check' + case 'nano_credit': return 'cash' + default: return 'account-multiple' + } + } + + renderDetail = () => { const { resultGetUniqueDemand } = this.props; - let ago = moment.tz(resultGetUniqueDemand.response.date_creation, 'Etc/GMT+0').format(); - ago = moment(ago) + let ago = moment.tz(resultGetUniqueDemand.response.date_creation_groupe, 'Etc/GMT+0').format(); + let dateDemand = moment.tz(resultGetUniqueDemand.response.date_creation_demande, 'Etc/GMT+0').format(); + ago = moment(ago); + dateDemand = moment(dateDemand); + return ( {resultGetUniqueDemand.response.nom} + + + {`${I18n.t('TYPE_DEMAND')}: ${resultGetUniqueDemand.response.type}`} + {ago.fromNow()} + }}>{dateDemand.fromNow()} diff --git a/screens/nano-credit/MyNanoCreditGroup.js b/screens/nano-credit/MyNanoCreditGroup.js index 0ef2e0a0..1bfa6a22 100644 --- a/screens/nano-credit/MyNanoCreditGroup.js +++ b/screens/nano-credit/MyNanoCreditGroup.js @@ -110,7 +110,7 @@ class MyNanoCreditGroup extends Component { displayToast = (message) => { Toast.show(message, { - duration: Toast.durations.SHORT, + duration: Toast.durations.LONG, position: Toast.positions.BOTTOM, backgroundColor: Color.primaryColor, shadow: true, diff --git a/utils/UtilsFunction.js b/utils/UtilsFunction.js index 0afc3731..cb883d2d 100644 --- a/utils/UtilsFunction.js +++ b/utils/UtilsFunction.js @@ -29,7 +29,7 @@ export const isNormalInteger = (str) => { export const displayToast = (message) => { Toast.show(message, { - duration: Toast.durations.SHORT, + duration: Toast.durations.LONG, position: Toast.positions.BOTTOM, backgroundColor: Color.primaryColor, shadow: true, diff --git a/utils/i18n/en.json b/utils/i18n/en.json index 2ebfba1d..3af6cec6 100644 --- a/utils/i18n/en.json +++ b/utils/i18n/en.json @@ -108,6 +108,7 @@ "MANAGE_GROUP": "Manage group", "VALIDATION_DEMAND": "Validation request", "DELETE_DEMAND": "Deletion request", + "TYPE_DEMAND": "Demand type", "GROUP_INFOS": "Fill in the group information", "GROUP_CODE": "Group code", "NOM_GROUP": "Group name", diff --git a/utils/i18n/fr.json b/utils/i18n/fr.json index ce5b9803..2b4b4fd1 100644 --- a/utils/i18n/fr.json +++ b/utils/i18n/fr.json @@ -109,6 +109,7 @@ "MANAGE_GROUP": "Gérer le groupe", "VALIDATION_DEMAND": "Demandes de validation", "DELETE_DEMAND": "Demande de suppression", + "TYPE_DEMAND": "Type de demande", "GROUP_INFOS": "Renseigner les informations du groupe", "GROUP_CODE": "Code du groupe", "SUCCESS_CREATION_GROUP": "Informations sur la création",