Modification execution
This commit is contained in:
parent
35c1884e17
commit
449a0f0584
2
App.js
2
App.js
|
|
@ -91,6 +91,7 @@ import ValidateConsultationScreen from "./screens/wallet/user/ValidateConsultati
|
|||
import ValidateConsultationDetailScreen from "./screens/wallet/user/ValidateConsultationDetailScreen";
|
||||
import ExecuterPrescriptionScreen from "./screens/wallet/agent/ExecuterPrescriptionScreen";
|
||||
import ModifierFeuilleSoinScreen from "./screens/wallet/agent/ModifierFeuilleSoinScreen";
|
||||
import ModifierExecutionPrescriptionScreen from "./screens/wallet/agent/ModifierExecutionPrescriptionScreen";
|
||||
|
||||
|
||||
const instructions = Platform.select({
|
||||
|
|
@ -259,6 +260,7 @@ const AppAgentStack = createDrawerNavigator({
|
|||
creditrequest: HistoryRequester,
|
||||
saisirFeuilleSoinScreen: SaisirFeuilleSoinScreen,
|
||||
executerPrescriptionScreen: ExecuterPrescriptionScreen,
|
||||
modifierExecutionPrescriptionScreen: ModifierExecutionPrescriptionScreen,
|
||||
modifierFeuilleSoinScreen: ModifierFeuilleSoinScreen,
|
||||
addNetwork: AddNetwork,
|
||||
updateinformation: UpdateInformations,
|
||||
|
|
|
|||
|
|
@ -71,4 +71,5 @@
|
|||
"saisirFeuilleSoinScreen": "saisirFeuilleSoinScreen",
|
||||
"executerPrescriptionScreen": "executerPrescriptionScreen",
|
||||
"modifierFeuilleSoinScreen": "modifierFeuilleSoinScreen",
|
||||
"modifierExecutionPrescriptionScreen": "modifierExecutionPrescriptionScreen",
|
||||
}
|
||||
|
|
|
|||
|
|
@ -273,7 +273,7 @@ export default class OptionsMenu extends Component {
|
|||
|| item === 'adhererGroupNanoCredit' || item === 'myNanoCreditGroup' || item === 'askNanoCredit' || item === 'refundNanoCreditUser' || item === 'cautionNanoCreditAgent'
|
||||
|| item === 'epargnerArgentUser' || item === 'askNanoCredit' || item === 'casserEpargneUser' || item === 'envoieWalletToBankAgent' || item === 'reattachAccountUser' || item === 'insuranceSubscriptionScreen'
|
||||
|| item === 'addBeneficiaryScreen' || item === 'activateBuySubscriptionScreen' || item === 'saisirFeuilleSoinScreen' || item === 'validateConsultationScreen' || item === 'validateConsultationDetailScreen'
|
||||
|| item === 'executerPrescriptionScreen' || item === 'modifierFeuilleSoinScreen') {
|
||||
|| item === 'executerPrescriptionScreen' || item === 'modifierFeuilleSoinScreen' || item === 'modifierExecutionPrescriptionScreen') {
|
||||
return null
|
||||
} else {
|
||||
const color = this.state.currentId === item.id ? theme.accent : "grey"
|
||||
|
|
|
|||
|
|
@ -648,67 +648,67 @@ const ExecuterPrescriptionScreen = ({
|
|||
paddingVertical: 15,
|
||||
alignItems: 'flex-start',
|
||||
}}>
|
||||
<TouchableOpacity
|
||||
style={[
|
||||
styles.contentActionModalBottom,
|
||||
{borderBottomColor: Color.borderColor, width: "100%"},
|
||||
]}
|
||||
key={item.id}
|
||||
onPress={() => {
|
||||
if (item.state !== 'PAID') {
|
||||
Alert.alert(I18n.t('ERROR_LABEL'), I18n.t('ASSURE_NON_EN_REGLE'),
|
||||
[{
|
||||
text: I18n.t('OK'), onPress: () => {
|
||||
}
|
||||
}]);
|
||||
} else {
|
||||
setAssure(item);
|
||||
setBeneficiary(null);
|
||||
setStatutPatient(1);
|
||||
setModalListAssure(false);
|
||||
setFieldValue(
|
||||
'lastname_patient',
|
||||
item.user.lastname,
|
||||
);
|
||||
setFieldValue(
|
||||
'firstname_patient',
|
||||
item.user.firstname,
|
||||
);
|
||||
//dispatch(fetchGetUserByNameOrNumberReset());
|
||||
fetchGetConsultation(item.user.id, 'TO_BILL', 'CONSULTATION');
|
||||
}
|
||||
}}>
|
||||
<Text body2 semibold>
|
||||
{`${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')})`}
|
||||
<TouchableOpacity
|
||||
style={[
|
||||
styles.contentActionModalBottom,
|
||||
{borderBottomColor: Color.borderColor, width: "100%"},
|
||||
]}
|
||||
key={item.id}
|
||||
onPress={() => {
|
||||
if (item.state !== 'PAID') {
|
||||
Alert.alert(I18n.t('ERROR_LABEL'), I18n.t('ASSURE_NON_EN_REGLE'),
|
||||
[{
|
||||
text: I18n.t('OK'), onPress: () => {
|
||||
}
|
||||
}]);
|
||||
} else {
|
||||
setAssure(item);
|
||||
setBeneficiary(null);
|
||||
setStatutPatient(1);
|
||||
setModalListAssure(false);
|
||||
setFieldValue(
|
||||
'lastname_patient',
|
||||
item.user.lastname,
|
||||
);
|
||||
setFieldValue(
|
||||
'firstname_patient',
|
||||
item.user.firstname,
|
||||
);
|
||||
//dispatch(fetchGetUserByNameOrNumberReset());
|
||||
fetchGetConsultation(item.user.id, 'TO_BILL', 'CONSULTATION');
|
||||
}
|
||||
}}>
|
||||
<Text body2 semibold>
|
||||
{`${item.user.firstname} ${item.user.lastname}`}
|
||||
</Text>
|
||||
</View>
|
||||
</TouchableOpacity>
|
||||
))}
|
||||
</View>
|
||||
</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(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>
|
||||
)
|
||||
}}/>
|
||||
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -1988,7 +1988,7 @@ const ModifierFeuilleSoinScreen = ({
|
|||
'firstname_patient',
|
||||
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={{paddingHorizontal: 10, alignItems: 'flex-start'}}>
|
||||
|
|
|
|||
|
|
@ -629,6 +629,11 @@ export const optionNanoSanteAgentScreen = {
|
|||
screen: route.modifierFeuilleSoinScreen,
|
||||
icon: 'edit',
|
||||
title: 'MODIFY_CONSULTATION',
|
||||
},
|
||||
{
|
||||
screen: route.modifierExecutionPrescriptionScreen,
|
||||
icon: 'edit',
|
||||
title: 'MODIFY_EXECUTION',
|
||||
}
|
||||
]
|
||||
}
|
||||
|
|
|
|||
|
|
@ -691,5 +691,8 @@
|
|||
"MODIFY_PRESTATION": "Modifier une prestation",
|
||||
"LIST_PRESTATION": "Liste des prestations",
|
||||
"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"
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue