adminnistrateur
/
ilink-world
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

correction bugs

This commit is contained in:
Brice Zele 2022-02-10 11:26:14 +01:00
parent e9f8c6bbcc
commit 7c73883e84
5 changed files with 52 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
android/app/src/main/assets/index.android.bundle
View File

File diff suppressed because one or more lines are too long

11
screens/wallet/WalletOptionSelect.js
View File

@ -52,8 +52,13 @@ import {store} from "../../redux/store";
import FontAwesome5 from "react-native-vector-icons/FontAwesome5"; import FontAwesome5 from "react-native-vector-icons/FontAwesome5";
import FontAwesome from "react-native-vector-icons/FontAwesome"; import FontAwesome from "react-native-vector-icons/FontAwesome";
import { import {
fetchGetAmountConsultationReset, fetchGetConsultationReset, fetchGetNetworkActsReset, fetchGetProviderClassReset, fetchGetAmountConsultationReset,
fetchGetSubscriptionListReset, fetchGetUserByIdQRCodeReset, fetchGetConsultationReset,
fetchGetDrugAppareilReset,
fetchGetNetworkActsReset,
fetchGetProviderClassReset,
fetchGetSubscriptionListReset,
fetchGetUserByIdQRCodeReset,
fetchGetUserByNameOrNumberReset fetchGetUserByNameOrNumberReset
} from "../../redux/insurance/insurance.actions"; } from "../../redux/insurance/insurance.actions";
@ -124,6 +129,7 @@ class WalletOptionSelect extends Component {
} }
this.props.fetchGetSubscriptionListReset(); this.props.fetchGetSubscriptionListReset();
this.props.fetchGetDrugAppareilReset();
this.props.fetchGetUserByNameOrNumberReset(); this.props.fetchGetUserByNameOrNumberReset();
this.props.fetchGetUserByIdQRCodeReset(); this.props.fetchGetUserByIdQRCodeReset();
this.props.fetchGetProviderClassReset(); this.props.fetchGetProviderClassReset();
@ -1272,6 +1278,7 @@ const mapDispatchToProps = dispatch => bindActionCreators({
getNanoCreditUserHistoryReset, getNanoCreditUserHistoryReset,
fetchGetSubscriptionListReset, fetchGetSubscriptionListReset,
fetchGetDrugAppareilReset,
fetchGetUserByNameOrNumberReset, fetchGetUserByNameOrNumberReset,
fetchGetUserByIdQRCodeReset, fetchGetUserByIdQRCodeReset,
fetchGetProviderClassReset, fetchGetProviderClassReset,

2
screens/wallet/agent/ModifierFeuilleSoinScreen.js
View File

@ -2025,7 +2025,7 @@ const ModifierFeuilleSoinScreen = ({
'firstname_patient', 'firstname_patient',
beneficiary.firstname, beneficiary.firstname,
); );
fetchGetConsultation(item.user.id, 'TO_BILL', 'CONSULTATION', `&beneficiary_id=${beneficiary.id}`); fetchGetConsultation(item.user.id, 'UNTREATED', 'CONSULTATION', `&beneficiary_id=${beneficiary.id}`);
}}> }}>
<View style={{width: 10}}/> <View style={{width: 10}}/>
<View style={{paddingHorizontal: 10, alignItems: 'flex-start'}}> <View style={{paddingHorizontal: 10, alignItems: 'flex-start'}}>

16
screens/wallet/user/HistoriqueNanoSanteUserScreen.js
View File

@ -405,6 +405,17 @@ const HistoriqueNanoSanteUserScreen = ({
: :
<ScrollView persistentScrollbar={true}> <ScrollView persistentScrollbar={true}>
<View style={[styles.blockView, {borderBottomColor: Color.borderColor}]}> <View style={[styles.blockView, {borderBottomColor: Color.borderColor}]}>
<View style={{flexDirection: 'row', marginTop: 10}}>
<View style={{flex: 1}}>
<Text style={[styles.body2]}>{I18n.t('NETWORK')}</Text>
</View>
<View style={{flex: 1, alignItems: 'flex-end'}}>
<Text
style={[Typography.caption1, Color.grayColor]}>{historyItemDetail.network.name}</Text>
</View>
</View>
<View style={{flexDirection: 'row', marginTop: 10}}> <View style={{flexDirection: 'row', marginTop: 10}}>
<View style={{flex: 1}}> <View style={{flex: 1}}>
<Text style={[styles.body2]}>{I18n.t('PATIENT')}</Text> <Text style={[styles.body2]}>{I18n.t('PATIENT')}</Text>
@ -664,6 +675,11 @@ const HistoriqueNanoSanteUserScreen = ({
item item
});*/ });*/
}}> }}>
<View style={{borderColor: Color.borderColor, flexDirection: "row",paddingBottom: 10, borderBottomWidth: 0.5}}>
<View style={{flex: 1, alignItems: 'flex-start'}}>
<Text caption1>{`${I18n.t('NETWORK')}: ${item.network.name}`}</Text>
</View>
</View>
<View style={[styles.contentTop, {borderColor: Color.borderColor}]}> <View style={[styles.contentTop, {borderColor: Color.borderColor}]}>
<View style={{flex: 1, alignItems: 'flex-start'}}> <View style={{flex: 1, alignItems: 'flex-start'}}>
<Text <Text

28
screens/wallet/user/ValidateConsultationScreen.js
View File

@ -67,7 +67,7 @@ const ValidateConsultationScreen = ({
readUser().then((user) => { readUser().then((user) => {
setUser(user); setUser(user);
console.log("User", user); console.log("User", user);
fetchGetConsultation(user.id, 'UNTREATED', ''); fetchGetConsultation(user.id, 'UNTREATED_ALL', '');
}); });
dispatch(fetchGetConsultationReset()); dispatch(fetchGetConsultationReset());
dispatch(fetchAcceptRejectConsultationReset()); dispatch(fetchAcceptRejectConsultationReset());
@ -105,8 +105,9 @@ const ValidateConsultationScreen = ({
{ {
text: I18n.t("OK"), onPress: () => { text: I18n.t("OK"), onPress: () => {
dispatch(fetchAcceptRejectConsultationReset()); dispatch(fetchAcceptRejectConsultationReset());
fetchGetConsultation(user.id);
setDisplayModalHistory(false); setDisplayModalHistory(false);
if (user !== null)
fetchGetConsultation(user.id, 'UNTREATED_ALL', '');
} }
} }
@ -114,7 +115,7 @@ const ValidateConsultationScreen = ({
{cancelable: false} {cancelable: false}
); );
if (user !== null) if (user !== null)
fetchGetConsultation(user.id, 'UNTREATED'); fetchGetConsultation(user.id, 'UNTREATED_ALL', '');
} }
if (acceptRefuseConsultation.error) { if (acceptRefuseConsultation.error) {
@ -125,6 +126,9 @@ const ValidateConsultationScreen = ({
{ {
text: I18n.t("OK"), onPress: () => { text: I18n.t("OK"), onPress: () => {
dispatch(fetchAcceptRejectConsultationReset()); dispatch(fetchAcceptRejectConsultationReset());
setDisplayModalHistory(false);
if (user !== null)
fetchGetConsultation(user.id, 'UNTREATED_ALL', '');
} }
} }
], ],
@ -136,9 +140,6 @@ const ValidateConsultationScreen = ({
Utils.getErrorMsg(acceptRefuseConsultation), Utils.getErrorMsg(acceptRefuseConsultation),
); );
dispatch(fetchAcceptRejectConsultationReset());*/ dispatch(fetchAcceptRejectConsultationReset());*/
setDisplayModalHistory(false);
if (user !== null)
fetchGetConsultation(user.id, 'UNTREATED');
} }
}, [acceptRefuseConsultation]); }, [acceptRefuseConsultation]);
@ -168,6 +169,15 @@ const ValidateConsultationScreen = ({
<ScrollView persistentScrollbar={true}> <ScrollView persistentScrollbar={true}>
<View style={[styles.blockView, {borderBottomColor: Color.borderColor}]}> <View style={[styles.blockView, {borderBottomColor: Color.borderColor}]}>
<View style={{flexDirection: 'row', marginTop: 10}}>
<View style={{flex: 1}}>
<Text style={[styles.body2]}>{I18n.t('NETWORK')}</Text>
</View>
<View style={{flex: 1, alignItems: 'flex-end'}}>
<Text
style={[Typography.caption1, Color.grayColor]}>{`${historyItemDetail.network.name}`}</Text>
</View>
</View>
<View style={{flexDirection: 'row', marginTop: 10}}> <View style={{flexDirection: 'row', marginTop: 10}}>
<View style={{flex: 1}}> <View style={{flex: 1}}>
<Text style={[styles.body2]}>{I18n.t('PATIENT')}</Text> <Text style={[styles.body2]}>{I18n.t('PATIENT')}</Text>
@ -320,6 +330,12 @@ const ValidateConsultationScreen = ({
item item
});*/ });*/
}}> }}>
<View style={{borderColor: Color.borderColor, flexDirection: "row",paddingBottom: 10, borderBottomWidth: 0.5}}>
<View style={{flex: 1, alignItems: 'flex-start'}}>
<Text caption1>{`${I18n.t('NETWORK')}: ${item.network.name}`}</Text>
</View>
</View>
<View style={[styles.contentTop, {borderColor: Color.borderColor}]}> <View style={[styles.contentTop, {borderColor: Color.borderColor}]}>
<View style={{flex: 1, alignItems: 'flex-start'}}> <View style={{flex: 1, alignItems: 'flex-start'}}>
<Text caption1>{`${I18n.t('PATIENT')}: ${item.patient_lastname} ${item.patient_firstname}`}</Text> <Text caption1>{`${I18n.t('PATIENT')}: ${item.patient_lastname} ${item.patient_firstname}`}</Text>