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

Modification execution

This commit is contained in:
Brice Zele 2022-01-17 03:02:01 +01:00
parent 35c1884e17
commit 449a0f0584
8 changed files with 1566 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
App.js
View File

@ -91,6 +91,7 @@ import ValidateConsultationScreen from "./screens/wallet/user/ValidateConsultati
import ValidateConsultationDetailScreen from "./screens/wallet/user/ValidateConsultationDetailScreen"; import ValidateConsultationDetailScreen from "./screens/wallet/user/ValidateConsultationDetailScreen";
import ExecuterPrescriptionScreen from "./screens/wallet/agent/ExecuterPrescriptionScreen"; import ExecuterPrescriptionScreen from "./screens/wallet/agent/ExecuterPrescriptionScreen";
import ModifierFeuilleSoinScreen from "./screens/wallet/agent/ModifierFeuilleSoinScreen"; import ModifierFeuilleSoinScreen from "./screens/wallet/agent/ModifierFeuilleSoinScreen";
import ModifierExecutionPrescriptionScreen from "./screens/wallet/agent/ModifierExecutionPrescriptionScreen";
const instructions = Platform.select({ const instructions = Platform.select({
@ -259,6 +260,7 @@ const AppAgentStack = createDrawerNavigator({
creditrequest: HistoryRequester, creditrequest: HistoryRequester,
saisirFeuilleSoinScreen: SaisirFeuilleSoinScreen, saisirFeuilleSoinScreen: SaisirFeuilleSoinScreen,
executerPrescriptionScreen: ExecuterPrescriptionScreen, executerPrescriptionScreen: ExecuterPrescriptionScreen,
modifierExecutionPrescriptionScreen: ModifierExecutionPrescriptionScreen,
modifierFeuilleSoinScreen: ModifierFeuilleSoinScreen, modifierFeuilleSoinScreen: ModifierFeuilleSoinScreen,
addNetwork: AddNetwork, addNetwork: AddNetwork,
updateinformation: UpdateInformations, updateinformation: UpdateInformations,

1
route.json
View File

@ -71,4 +71,5 @@
"saisirFeuilleSoinScreen": "saisirFeuilleSoinScreen", "saisirFeuilleSoinScreen": "saisirFeuilleSoinScreen",
"executerPrescriptionScreen": "executerPrescriptionScreen", "executerPrescriptionScreen": "executerPrescriptionScreen",
"modifierFeuilleSoinScreen": "modifierFeuilleSoinScreen", "modifierFeuilleSoinScreen": "modifierFeuilleSoinScreen",
"modifierExecutionPrescriptionScreen": "modifierExecutionPrescriptionScreen",
} }

2
screens/optionMenu/OptionsMenu.js
View File

@ -273,7 +273,7 @@ export default class OptionsMenu extends Component {
|| item === 'adhererGroupNanoCredit' || item === 'myNanoCreditGroup' || item === 'askNanoCredit' || item === 'refundNanoCreditUser' || item === 'cautionNanoCreditAgent' || item === 'adhererGroupNanoCredit' || item === 'myNanoCreditGroup' || item === 'askNanoCredit' || item === 'refundNanoCreditUser' || item === 'cautionNanoCreditAgent'
|| item === 'epargnerArgentUser' || item === 'askNanoCredit' || item === 'casserEpargneUser' || item === 'envoieWalletToBankAgent' || item === 'reattachAccountUser' || item === 'insuranceSubscriptionScreen' || item === 'epargnerArgentUser' || item === 'askNanoCredit' || item === 'casserEpargneUser' || item === 'envoieWalletToBankAgent' || item === 'reattachAccountUser' || item === 'insuranceSubscriptionScreen'
|| item === 'addBeneficiaryScreen' || item === 'activateBuySubscriptionScreen' || item === 'saisirFeuilleSoinScreen' || item === 'validateConsultationScreen' || item === 'validateConsultationDetailScreen' || item === 'addBeneficiaryScreen' || item === 'activateBuySubscriptionScreen' || item === 'saisirFeuilleSoinScreen' || item === 'validateConsultationScreen' || item === 'validateConsultationDetailScreen'
|| item === 'executerPrescriptionScreen' || item === 'modifierFeuilleSoinScreen') { || item === 'executerPrescriptionScreen' || item === 'modifierFeuilleSoinScreen' || item === 'modifierExecutionPrescriptionScreen') {
return null return null
} else { } else {
const color = this.state.currentId === item.id ? theme.accent : "grey" const color = this.state.currentId === item.id ? theme.accent : "grey"

120
screens/wallet/agent/ExecuterPrescriptionScreen.js
View File

@ -648,67 +648,67 @@ const ExecuterPrescriptionScreen = ({
paddingVertical: 15, paddingVertical: 15,
alignItems: 'flex-start', alignItems: 'flex-start',
}}> }}>
<TouchableOpacity <TouchableOpacity
style={[ style={[
styles.contentActionModalBottom, styles.contentActionModalBottom,
{borderBottomColor: Color.borderColor, width: "100%"}, {borderBottomColor: Color.borderColor, width: "100%"},
]} ]}
key={item.id} key={item.id}
onPress={() => { onPress={() => {
if (item.state !== 'PAID') { if (item.state !== 'PAID') {
Alert.alert(I18n.t('ERROR_LABEL'), I18n.t('ASSURE_NON_EN_REGLE'), Alert.alert(I18n.t('ERROR_LABEL'), I18n.t('ASSURE_NON_EN_REGLE'),
[{ [{
text: I18n.t('OK'), onPress: () => { text: I18n.t('OK'), onPress: () => {
} }
}]); }]);
} else { } else {
setAssure(item); setAssure(item);
setBeneficiary(null); setBeneficiary(null);
setStatutPatient(1); setStatutPatient(1);
setModalListAssure(false); setModalListAssure(false);
setFieldValue( setFieldValue(
'lastname_patient', 'lastname_patient',
item.user.lastname, item.user.lastname,
); );
setFieldValue( setFieldValue(
'firstname_patient', 'firstname_patient',
item.user.firstname, item.user.firstname,
); );
//dispatch(fetchGetUserByNameOrNumberReset()); //dispatch(fetchGetUserByNameOrNumberReset());
fetchGetConsultation(item.user.id, 'TO_BILL', 'CONSULTATION'); fetchGetConsultation(item.user.id, 'TO_BILL', 'CONSULTATION');
} }
}}> }}>
<Text body2 semibold> <Text body2 semibold>
{`${item.user.firstname} ${item.user.lastname}`} {`${item.user.firstname} ${item.user.lastname}`}
</Text>
</TouchableOpacity>
{item.beneficiaries.map((beneficiary) => (
<TouchableOpacity style={styles.beneficiarySubSection}
onPress={() => {
setAssure(item);
setBeneficiary(beneficiary);
setStatutPatient(0);
setModalListAssure(false);
setFieldValue(
'lastname_patient',
beneficiary.lastname,
);
setFieldValue(
'firstname_patient',
beneficiary.firstname,
);
fetchGetConsultation(beneficiary.id, 'TO_BILL', 'CONSULTATION');
}}>
<View style={{width: 10}}/>
<View style={{paddingHorizontal: 10, alignItems: 'flex-start'}}>
<Text subhead semibold>
{`${beneficiary.firstname} ${beneficiary.lastname} (${I18n.t('AYANT_DROITS')})`}
</Text> </Text>
</View> </TouchableOpacity>
</TouchableOpacity> {item.beneficiaries.map((beneficiary) => (
))} <TouchableOpacity style={styles.beneficiarySubSection}
</View> onPress={() => {
setAssure(item);
setBeneficiary(beneficiary);
setStatutPatient(0);
setModalListAssure(false);
setFieldValue(
'lastname_patient',
beneficiary.lastname,
);
setFieldValue(
'firstname_patient',
beneficiary.firstname,
);
fetchGetConsultation(item.user.id, 'TO_BILL', 'CONSULTATION', `&beneficiary_id=${beneficiary.id}`);
}}>
<View style={{width: 10}}/>
<View style={{paddingHorizontal: 10, alignItems: 'flex-start'}}>
<Text subhead semibold>
{`${beneficiary.firstname} ${beneficiary.lastname} (${I18n.t('AYANT_DROITS')})`}
</Text>
</View>
</TouchableOpacity>
))}
</View>
) )
}}/> }}/>

1492
screens/wallet/agent/ModifierExecutionPrescriptionScreen.js Normal file
View File

File diff suppressed because it is too large Load Diff

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

@ -1988,7 +1988,7 @@ const ModifierFeuilleSoinScreen = ({
'firstname_patient', 'firstname_patient',
beneficiary.firstname, beneficiary.firstname,
); );
fetchGetConsultation(beneficiary.id, 'TO_BILL', 'CONSULTATION'); fetchGetConsultation(item.user.id, 'TO_BILL', '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'}}>

5
utils/UtilsFunction.js
View File

@ -629,6 +629,11 @@ export const optionNanoSanteAgentScreen = {
screen: route.modifierFeuilleSoinScreen, screen: route.modifierFeuilleSoinScreen,
icon: 'edit', icon: 'edit',
title: 'MODIFY_CONSULTATION', title: 'MODIFY_CONSULTATION',
},
{
screen: route.modifierExecutionPrescriptionScreen,
icon: 'edit',
title: 'MODIFY_EXECUTION',
} }
] ]
} }

5
utils/i18n/fr.json
View File

@ -691,5 +691,8 @@
"MODIFY_PRESTATION": "Modifier une prestation", "MODIFY_PRESTATION": "Modifier une prestation",
"LIST_PRESTATION": "Liste des prestations", "LIST_PRESTATION": "Liste des prestations",
"NO_CONSULTATION": "Aucune consultation", "NO_CONSULTATION": "Aucune consultation",
"LISTE_CONSULTATION": "Liste des consultations" "NO_EXECUTION": "Aucune exécution",
"LISTE_CONSULTATION": "Liste des consultations",
"LIST_EXECUTION": "Liste des exécutions",
"MODIFY_EXECUTION": "Modifier une exécution"
} }