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

recherche assure corrige

This commit is contained in:
Brice Zele 2022-01-20 04:51:20 +01:00
parent 449a0f0584
commit d133d51b9f
8 changed files with 572 additions and 469 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

File diff suppressed because one or more lines are too long

1
android/app/src/main/res/raw/route.json
View File

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

7
android/app/src/main/res/raw/utils_i18n_fr.json
View File

@ -689,5 +689,10 @@
"EXAMENS_SUCCESSFULLY_MODIFY": "Examen modifié avec succès", "EXAMENS_SUCCESSFULLY_MODIFY": "Examen modifié avec succès",
"PRESTATION_SUCCESSFULLY_MODIFY": "Prestation modifié avec succès", "PRESTATION_SUCCESSFULLY_MODIFY": "Prestation modifié avec succès",
"MODIFY_PRESTATION": "Modifier une prestation", "MODIFY_PRESTATION": "Modifier une prestation",
"LIST_PRESTATION": "Liste des prestation" "LIST_PRESTATION": "Liste des prestations",
"NO_CONSULTATION": "Aucune consultation",
"NO_EXECUTION": "Aucune exécution",
"LISTE_CONSULTATION": "Liste des consultations",
"LIST_EXECUTION": "Liste des exécutions",
"MODIFY_EXECUTION": "Modifier une exécution"
} }

2
redux/insurance/insurance.actions.js
View File

@ -281,7 +281,7 @@ export const fetchGetUserByNameOrNumberError = (error: any) => ({
export const fetchGetUserByNameOrNumber = (network_id, id) => { export const fetchGetUserByNameOrNumber = (network_id, id) => {
return ApiAction({ return ApiAction({
url: `${getUserByNameOrNumberUrl}?network_id=${network_id}&${id}`, url: `${getUserByNameOrNumberUrl}?network_id=${network_id}${id}`,
method: 'GET', method: 'GET',
onLoading: fetchGetUserByNameOrNumberPending, onLoading: fetchGetUserByNameOrNumberPending,
onSuccess: fetchGetUserByNameOrNumberSuccess, onSuccess: fetchGetUserByNameOrNumberSuccess,

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

@ -262,7 +262,8 @@ const ExecuterPrescriptionScreen = ({
const [wallet] = useState(store.getState().walletDetailReducer.result.response); const [wallet] = useState(store.getState().walletDetailReducer.result.response);
console.log("Wallet", wallet); console.log("Wallet", wallet);
const [isNumeroAssureSearch, setIsNumeroAssureSearch] = useState(true); const [isNumeroAssureSearch, setIsNumeroAssureSearch] = useState(false);
const [isPhoneAssureSearch, setIsPhoneAssureSearch] = useState(false);
const [user, setUser] = useState(null); const [user, setUser] = useState(null);
const [assure, setAssure] = useState(null); const [assure, setAssure] = useState(null);
@ -1044,25 +1045,26 @@ const ExecuterPrescriptionScreen = ({
const onNext = () => { const onNext = () => {
console.log("currentStep", currentStep); console.log("currentStep", currentStep);
console.log("values", values);
switch (currentStep) { switch (currentStep) {
case 0: case 0:
console.log("values", values);
if (values.numero_assure !== '') { if (values.numero_assure !== '') {
if (getUserByNameOrNumber.result === null) { dispatch(fetchGetUserByNameOrNumberReset());
if (isNumeroAssureSearch) if (isNumeroAssureSearch)
fetchGetUserByNameOrNumber(wallet.id_network, `&insured_id=${values.numero_assure}`);
else if (isPhoneAssureSearch)
fetchGetUserByNameOrNumber(wallet.id_network, `&phone=${values.numero_assure}`); fetchGetUserByNameOrNumber(wallet.id_network, `&phone=${values.numero_assure}`);
else else
fetchGetUserByNameOrNumber(wallet.id_network, `&name=${values.numero_assure}`) fetchGetUserByNameOrNumber(wallet.id_network, `&name=${values.numero_assure}`)
console.log("errors", errors); console.log("errors", errors);
} }
}
return false; return false;
break; break;
default: default:
return true; return true;
} }
}; };;
const renderBtnExamen = () => ( const renderBtnExamen = () => (
@ -1133,8 +1135,9 @@ const ExecuterPrescriptionScreen = ({
<View> <View>
<TextInput <TextInput
style={{marginTop: 10}} style={{marginTop: 10}}
placeholder={isNumeroAssureSearch ? I18n.t('NUMERO_ASSURE') : I18n.t('NOM_ASSURE')} placeholder={isNumeroAssureSearch ? I18n.t('NUMERO_ASSURE') : isPhoneAssureSearch ? I18n.t('PHONE_NUMBER') : I18n.t('NOM_ASSURE')}
value={values.numero_assure} value={values.numero_assure}
keyboardType={isPhoneAssureSearch ? 'numeric' : 'default'}
onChangeText={handleChange('numero_assure')} onChangeText={handleChange('numero_assure')}
onBlur={handleBlur('numero_assure')} onBlur={handleBlur('numero_assure')}
success={touched.numero_assure && !errors.numero_assure} success={touched.numero_assure && !errors.numero_assure}
@ -1143,7 +1146,7 @@ const ExecuterPrescriptionScreen = ({
icon={ icon={
<FontAwesome <FontAwesome
style={{zIndex: 10}} style={{zIndex: 10}}
name={isNumeroAssureSearch ? 'lock' : 'user'} name={isNumeroAssureSearch ? 'lock' : isPhoneAssureSearch ? 'phone' : 'user'}
size={20} size={20}
/> />
} }
@ -1152,17 +1155,38 @@ const ExecuterPrescriptionScreen = ({
flexDirection: 'row', flexDirection: 'row',
position: 'absolute', position: 'absolute',
top: 22, top: 22,
right: 10, right: 50,
justifyContent: 'space-between', justifyContent: 'space-between',
width: 50 width: 50
}}> }}>
<Icon <Icon
style={{paddingRight: 5}} style={{paddingRight: 5}}
name={isNumeroAssureSearch ? 'user' : 'lock'} name='lock'
size={20} size={20}
color={Color.primaryColor} color={Color.primaryColor}
onPress={() => { onPress={() => {
setIsNumeroAssureSearch(!isNumeroAssureSearch); setIsNumeroAssureSearch(true);
setIsPhoneAssureSearch(false);
}}
/>
<Icon
style={{paddingRight: 5}}
name='phone'
size={20}
color={Color.primaryColor}
onPress={() => {
setIsNumeroAssureSearch(false);
setIsPhoneAssureSearch(true);
}}
/>
<Icon
style={{paddingRight: 5}}
name='user'
size={20}
color={Color.primaryColor}
onPress={() => {
setIsNumeroAssureSearch(false);
setIsPhoneAssureSearch(false);
}} }}
/> />
<Icon <Icon

50
screens/wallet/agent/ModifierExecutionPrescriptionScreen.js
View File

@ -267,7 +267,8 @@ const ModifierExecutionPrescriptionScreen = ({
const [wallet] = useState(store.getState().walletDetailReducer.result.response); const [wallet] = useState(store.getState().walletDetailReducer.result.response);
console.log("Wallet", wallet); console.log("Wallet", wallet);
const [isNumeroAssureSearch, setIsNumeroAssureSearch] = useState(true); const [isNumeroAssureSearch, setIsNumeroAssureSearch] = useState(false);
const [isPhoneAssureSearch, setIsPhoneAssureSearch] = useState(false);
const [user, setUser] = useState(null); const [user, setUser] = useState(null);
const [assure, setAssure] = useState(null); const [assure, setAssure] = useState(null);
@ -680,7 +681,7 @@ const ModifierExecutionPrescriptionScreen = ({
item.user.firstname, item.user.firstname,
); );
//dispatch(fetchGetUserByNameOrNumberReset()); //dispatch(fetchGetUserByNameOrNumberReset());
fetchGetConsultation(item.user.id, 'UNTREATED', 'EXECUTION'); fetchGetConsultation(item.user.id, 'UNTREATED', 'EXECUTION', `&network_agent_id=${wallet.network_agent_id}`);
} }
}}> }}>
<Text body2 semibold> <Text body2 semibold>
@ -702,7 +703,7 @@ const ModifierExecutionPrescriptionScreen = ({
'firstname_patient', 'firstname_patient',
beneficiary.firstname, beneficiary.firstname,
); );
fetchGetConsultation(item.user.id, 'TO_BILL', 'CONSULTATION', `&beneficiary_id=${beneficiary.id}`); fetchGetConsultation(item.user.id, 'UNTREATED', 'EXECUTION', `&beneficiary_id=${beneficiary.id}&network_agent_id=${wallet.network_agent_id}`);
}}> }}>
<View style={{width: 10}}/> <View style={{width: 10}}/>
@ -1050,18 +1051,19 @@ const ModifierExecutionPrescriptionScreen = ({
const onNext = () => { const onNext = () => {
console.log("currentStep", currentStep); console.log("currentStep", currentStep);
console.log("values", values);
switch (currentStep) { switch (currentStep) {
case 0: case 0:
console.log("values", values);
if (values.numero_assure !== '') { if (values.numero_assure !== '') {
if (getUserByNameOrNumber.result === null) { dispatch(fetchGetUserByNameOrNumberReset());
if (isNumeroAssureSearch) if (isNumeroAssureSearch)
fetchGetUserByNameOrNumber(wallet.id_network, `&insured_id=${values.numero_assure}`);
else if (isPhoneAssureSearch)
fetchGetUserByNameOrNumber(wallet.id_network, `&phone=${values.numero_assure}`); fetchGetUserByNameOrNumber(wallet.id_network, `&phone=${values.numero_assure}`);
else else
fetchGetUserByNameOrNumber(wallet.id_network, `&name=${values.numero_assure}`) fetchGetUserByNameOrNumber(wallet.id_network, `&name=${values.numero_assure}`)
console.log("errors", errors); console.log("errors", errors);
} }
}
return false; return false;
break; break;
@ -1139,8 +1141,9 @@ const ModifierExecutionPrescriptionScreen = ({
<View> <View>
<TextInput <TextInput
style={{marginTop: 10}} style={{marginTop: 10}}
placeholder={isNumeroAssureSearch ? I18n.t('NUMERO_ASSURE') : I18n.t('NOM_ASSURE')} placeholder={isNumeroAssureSearch ? I18n.t('NUMERO_ASSURE') : isPhoneAssureSearch ? I18n.t('PHONE_NUMBER') : I18n.t('NOM_ASSURE')}
value={values.numero_assure} value={values.numero_assure}
keyboardType={isPhoneAssureSearch ? 'numeric' : 'default'}
onChangeText={handleChange('numero_assure')} onChangeText={handleChange('numero_assure')}
onBlur={handleBlur('numero_assure')} onBlur={handleBlur('numero_assure')}
success={touched.numero_assure && !errors.numero_assure} success={touched.numero_assure && !errors.numero_assure}
@ -1149,7 +1152,7 @@ const ModifierExecutionPrescriptionScreen = ({
icon={ icon={
<FontAwesome <FontAwesome
style={{zIndex: 10}} style={{zIndex: 10}}
name={isNumeroAssureSearch ? 'lock' : 'user'} name={isNumeroAssureSearch ? 'lock' : isPhoneAssureSearch ? 'phone' : 'user'}
size={20} size={20}
/> />
} }
@ -1158,17 +1161,38 @@ const ModifierExecutionPrescriptionScreen = ({
flexDirection: 'row', flexDirection: 'row',
position: 'absolute', position: 'absolute',
top: 22, top: 22,
right: 10, right: 50,
justifyContent: 'space-between', justifyContent: 'space-between',
width: 50 width: 50
}}> }}>
<Icon <Icon
style={{paddingRight: 5}} style={{paddingRight: 5}}
name={isNumeroAssureSearch ? 'user' : 'lock'} name='lock'
size={20} size={20}
color={Color.primaryColor} color={Color.primaryColor}
onPress={() => { onPress={() => {
setIsNumeroAssureSearch(!isNumeroAssureSearch); setIsNumeroAssureSearch(true);
setIsPhoneAssureSearch(false);
}}
/>
<Icon
style={{paddingRight: 5}}
name='phone'
size={20}
color={Color.primaryColor}
onPress={() => {
setIsNumeroAssureSearch(false);
setIsPhoneAssureSearch(true);
}}
/>
<Icon
style={{paddingRight: 5}}
name='user'
size={20}
color={Color.primaryColor}
onPress={() => {
setIsNumeroAssureSearch(false);
setIsPhoneAssureSearch(false);
}} }}
/> />
<Icon <Icon
@ -1325,11 +1349,11 @@ const ModifierExecutionPrescriptionScreen = ({
}}> }}>
{consultation !== null ? {consultation !== null ?
!consultation.prescriptions.filter(exam => exam.checked).length > 0 ? !consultation.prescriptions.length > 0 ?
renderBtnExamen() : <View/> : null} renderBtnExamen() : <View/> : null}
{consultation !== null ? {consultation !== null ?
!consultation.exams.filter(exam => exam.checked).length > 0 ? !consultation.exams.length > 0 ?
renderBtnMedicament() : <View/> : null} renderBtnMedicament() : <View/> : null}
</View> </View>

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

@ -288,7 +288,8 @@ const ModifierFeuilleSoinScreen = ({
const [wallet] = useState(store.getState().walletDetailReducer.result.response); const [wallet] = useState(store.getState().walletDetailReducer.result.response);
console.log("Wallet", wallet); console.log("Wallet", wallet);
const [isNumeroAssureSearch, setIsNumeroAssureSearch] = useState(true); const [isNumeroAssureSearch, setIsNumeroAssureSearch] = useState(false);
const [isPhoneAssureSearch, setIsPhoneAssureSearch] = useState(false);
const [datePrestation, setDatePrestation] = useState('' + moment(new Date()).format('YYYY-MM-DD HH:mm')); const [datePrestation, setDatePrestation] = useState('' + moment(new Date()).format('YYYY-MM-DD HH:mm'));
const [showDatePrestation, setShowDatePrestation] = useState(false); const [showDatePrestation, setShowDatePrestation] = useState(false);
@ -2379,18 +2380,19 @@ const ModifierFeuilleSoinScreen = ({
const onNext = () => { const onNext = () => {
console.log("currentStep", currentStep); console.log("currentStep", currentStep);
console.log("values", values);
switch (currentStep) { switch (currentStep) {
case 0: case 0:
console.log("values", values);
if (values.numero_assure !== '') { if (values.numero_assure !== '') {
if (getUserByNameOrNumber.result === null) { dispatch(fetchGetUserByNameOrNumberReset());
if (isNumeroAssureSearch) if (isNumeroAssureSearch)
fetchGetUserByNameOrNumber(wallet.id_network, `&insured_id=${values.numero_assure}`);
else if (isPhoneAssureSearch)
fetchGetUserByNameOrNumber(wallet.id_network, `&phone=${values.numero_assure}`); fetchGetUserByNameOrNumber(wallet.id_network, `&phone=${values.numero_assure}`);
else else
fetchGetUserByNameOrNumber(wallet.id_network, `&name=${values.numero_assure}`) fetchGetUserByNameOrNumber(wallet.id_network, `&name=${values.numero_assure}`)
console.log("errors", errors); console.log("errors", errors);
} }
}
return false; return false;
break; break;
@ -2407,8 +2409,9 @@ const ModifierFeuilleSoinScreen = ({
<View> <View>
<TextInput <TextInput
style={{marginTop: 10}} style={{marginTop: 10}}
placeholder={isNumeroAssureSearch ? I18n.t('NUMERO_ASSURE') : I18n.t('NOM_ASSURE')} placeholder={isNumeroAssureSearch ? I18n.t('NUMERO_ASSURE') : isPhoneAssureSearch ? I18n.t('PHONE_NUMBER') : I18n.t('NOM_ASSURE')}
value={values.numero_assure} value={values.numero_assure}
keyboardType={isPhoneAssureSearch ? 'numeric' : 'default'}
onChangeText={handleChange('numero_assure')} onChangeText={handleChange('numero_assure')}
onBlur={handleBlur('numero_assure')} onBlur={handleBlur('numero_assure')}
success={touched.numero_assure && !errors.numero_assure} success={touched.numero_assure && !errors.numero_assure}
@ -2417,7 +2420,7 @@ const ModifierFeuilleSoinScreen = ({
icon={ icon={
<FontAwesome <FontAwesome
style={{zIndex: 10}} style={{zIndex: 10}}
name={isNumeroAssureSearch ? 'lock' : 'user'} name={isNumeroAssureSearch ? 'lock' : isPhoneAssureSearch ? 'phone' : 'user'}
size={20} size={20}
/> />
} }
@ -2426,17 +2429,38 @@ const ModifierFeuilleSoinScreen = ({
flexDirection: 'row', flexDirection: 'row',
position: 'absolute', position: 'absolute',
top: 22, top: 22,
right: 10, right: 50,
justifyContent: 'space-between', justifyContent: 'space-between',
width: 50 width: 50
}}> }}>
<Icon <Icon
style={{paddingRight: 5}} style={{paddingRight: 5}}
name={isNumeroAssureSearch ? 'user' : 'lock'} name='lock'
size={20} size={20}
color={Color.primaryColor} color={Color.primaryColor}
onPress={() => { onPress={() => {
setIsNumeroAssureSearch(!isNumeroAssureSearch); setIsNumeroAssureSearch(true);
setIsPhoneAssureSearch(false);
}}
/>
<Icon
style={{paddingRight: 5}}
name='phone'
size={20}
color={Color.primaryColor}
onPress={() => {
setIsNumeroAssureSearch(false);
setIsPhoneAssureSearch(true);
}}
/>
<Icon
style={{paddingRight: 5}}
name='user'
size={20}
color={Color.primaryColor}
onPress={() => {
setIsNumeroAssureSearch(false);
setIsPhoneAssureSearch(false);
}} }}
/> />
<Icon <Icon

44
screens/wallet/agent/SaisirFeuilleSoinScreen.js
View File

@ -281,7 +281,8 @@ const SaisirFeuilleSoinScreen = ({
const [wallet] = useState(store.getState().walletDetailReducer.result.response); const [wallet] = useState(store.getState().walletDetailReducer.result.response);
const [isNumeroAssureSearch, setIsNumeroAssureSearch] = useState(true); const [isNumeroAssureSearch, setIsNumeroAssureSearch] = useState(false);
const [isPhoneAssureSearch, setIsPhoneAssureSearch] = useState(false);
const [dateDebutGrossesse, setDateDebutGrossesse] = useState(null); const [dateDebutGrossesse, setDateDebutGrossesse] = useState(null);
const [dateFinGrossesse, setDateFinGrossesse] = useState(null); const [dateFinGrossesse, setDateFinGrossesse] = useState(null);
@ -397,7 +398,7 @@ const SaisirFeuilleSoinScreen = ({
I18n.t('EMPTY_LIST'), I18n.t('EMPTY_LIST'),
I18n.t('NO_ASSURE_MATCH_SEARCH'), I18n.t('NO_ASSURE_MATCH_SEARCH'),
); );
//dispatch(fetchGetUserByNameOrNumberReset()); dispatch(fetchGetUserByNameOrNumberReset());
} }
} }
@ -1413,18 +1414,19 @@ const SaisirFeuilleSoinScreen = ({
const onNext = () => { const onNext = () => {
console.log("currentStep", currentStep); console.log("currentStep", currentStep);
console.log("values", values);
switch (currentStep) { switch (currentStep) {
case 0: case 0:
console.log("values", values);
if (values.numero_assure !== '') { if (values.numero_assure !== '') {
if (getUserByNameOrNumber.result === null) { dispatch(fetchGetUserByNameOrNumberReset());
if (isNumeroAssureSearch) if (isNumeroAssureSearch)
fetchGetUserByNameOrNumber(wallet.id_network, `&insured_id=${values.numero_assure}`);
else if (isPhoneAssureSearch)
fetchGetUserByNameOrNumber(wallet.id_network, `&phone=${values.numero_assure}`); fetchGetUserByNameOrNumber(wallet.id_network, `&phone=${values.numero_assure}`);
else else
fetchGetUserByNameOrNumber(wallet.id_network, `&name=${values.numero_assure}`) fetchGetUserByNameOrNumber(wallet.id_network, `&name=${values.numero_assure}`)
console.log("errors", errors); console.log("errors", errors);
} }
}
return false; return false;
break; break;
@ -1440,8 +1442,9 @@ const SaisirFeuilleSoinScreen = ({
<View> <View>
<TextInput <TextInput
style={{marginTop: 10}} style={{marginTop: 10}}
placeholder={isNumeroAssureSearch ? I18n.t('NUMERO_ASSURE') : I18n.t('NOM_ASSURE')} placeholder={isNumeroAssureSearch ? I18n.t('NUMERO_ASSURE') : isPhoneAssureSearch ? I18n.t('PHONE_NUMBER') : I18n.t('NOM_ASSURE')}
value={values.numero_assure} value={values.numero_assure}
keyboardType={isPhoneAssureSearch ? 'numeric' : 'default'}
onChangeText={handleChange('numero_assure')} onChangeText={handleChange('numero_assure')}
onBlur={handleBlur('numero_assure')} onBlur={handleBlur('numero_assure')}
success={touched.numero_assure && !errors.numero_assure} success={touched.numero_assure && !errors.numero_assure}
@ -1450,7 +1453,7 @@ const SaisirFeuilleSoinScreen = ({
icon={ icon={
<FontAwesome <FontAwesome
style={{zIndex: 10}} style={{zIndex: 10}}
name={isNumeroAssureSearch ? 'lock' : 'user'} name={isNumeroAssureSearch ? 'lock' : isPhoneAssureSearch ? 'phone' : 'user'}
size={20} size={20}
/> />
} }
@ -1459,17 +1462,38 @@ const SaisirFeuilleSoinScreen = ({
flexDirection: 'row', flexDirection: 'row',
position: 'absolute', position: 'absolute',
top: 22, top: 22,
right: 10, right: 50,
justifyContent: 'space-between', justifyContent: 'space-between',
width: 50 width: 50
}}> }}>
<Icon <Icon
style={{paddingRight: 5}} style={{paddingRight: 5}}
name={isNumeroAssureSearch ? 'user' : 'lock'} name='lock'
size={20} size={20}
color={Color.primaryColor} color={Color.primaryColor}
onPress={() => { onPress={() => {
setIsNumeroAssureSearch(!isNumeroAssureSearch); setIsNumeroAssureSearch(true);
setIsPhoneAssureSearch(false);
}}
/>
<Icon
style={{paddingRight: 5}}
name='phone'
size={20}
color={Color.primaryColor}
onPress={() => {
setIsNumeroAssureSearch(false);
setIsPhoneAssureSearch(true);
}}
/>
<Icon
style={{paddingRight: 5}}
name='user'
size={20}
color={Color.primaryColor}
onPress={() => {
setIsNumeroAssureSearch(false);
setIsPhoneAssureSearch(false);
}} }}
/> />
<Icon <Icon