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

Correction de nombreux bugs

This commit is contained in:
Brice Zele 2022-03-02 07:20:17 +01:00
parent 1755385e39
commit 6a7588759c
7 changed files with 202 additions and 143 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

File diff suppressed because one or more lines are too long

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

@ -714,5 +714,7 @@
"INVOICE_ID": "ID facture", "INVOICE_ID": "ID facture",
"INVOICE": "Facture", "INVOICE": "Facture",
"HISTORY": "Historique", "HISTORY": "Historique",
"INFORMATION_MESSAGE": "Message d'information" "INFORMATION_MESSAGE": "Message d'information",
"MONTANT_ASSURANCE_CONSOMME": "Montant de l'assurance consommé",
"MONTANT_ASSURANCE_RESTANTE": "Montant de l'assurance restante"
} }

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

@ -291,6 +291,7 @@ const ExecuterPrescriptionScreen = ({
const [modalPrice, setModalPrice] = useState(false); const [modalPrice, setModalPrice] = useState(false);
const [modalListAssure, setModalListAssure] = useState(false); const [modalListAssure, setModalListAssure] = useState(false);
const [modalListMedicament, setModalListMedicament] = useState(false); const [modalListMedicament, setModalListMedicament] = useState(false);
const [tmpSheetId, setTmpSheetId] = useState(''+Date.now());
const [prestations, setPrestations] = useState([]); const [prestations, setPrestations] = useState([]);
@ -571,6 +572,7 @@ const ExecuterPrescriptionScreen = ({
quantity: consultation.exams.filter(exam => elementToSetPrice.id === exam.id)[0].quantity quantity: consultation.exams.filter(exam => elementToSetPrice.id === exam.id)[0].quantity
} }
], ],
tmp_sheet_id:tmpSheetId,
}); });
} else { } else {
setConsultation({ setConsultation({
@ -588,6 +590,7 @@ const ExecuterPrescriptionScreen = ({
care_condition: consultation._care_condition, care_condition: consultation._care_condition,
act_action: "INSERT", act_action: "INSERT",
act_type: "PRESCRIPTION", act_type: "PRESCRIPTION",
tmp_sheet_id:tmpSheetId,
prescriptions: [ prescriptions: [
{ {
unit_price: values.price, unit_price: values.price,
@ -767,7 +770,7 @@ const ExecuterPrescriptionScreen = ({
<TouchableOpacity <TouchableOpacity
style={[ style={[
styles.contentActionModalBottom, styles.contentActionModalBottom,
{borderBottomColor: Color.borderColor, width: "100%"}, {borderBottomColor: Color.borderColor, width: "100%",flexDirection: 'column',},
]} ]}
key={item.id} key={item.id}
onPress={() => { onPress={() => {
@ -797,6 +800,12 @@ const ExecuterPrescriptionScreen = ({
<Text body2 semibold> <Text body2 semibold>
{`${item.user.firstname !== null ? item.user.firstname : ''} ${item.user.lastname !== null ? item.user.lastname : ''}`} {`${item.user.firstname !== null ? item.user.firstname : ''} ${item.user.lastname !== null ? item.user.lastname : ''}`}
</Text> </Text>
<Text footnote>
{`${I18n.t('MONTANT_ASSURANCE_CONSOMME')}: ${item.insurance_consumed_amount}`}
</Text>
<Text footnote>
{`${I18n.t('MONTANT_ASSURANCE_RESTANTE')}: ${item.insurance_remaining_amount}`}
</Text>
</TouchableOpacity> </TouchableOpacity>
{item.beneficiaries.map((beneficiary) => ( {item.beneficiaries.map((beneficiary) => (
<TouchableOpacity style={styles.beneficiarySubSection} <TouchableOpacity style={styles.beneficiarySubSection}
@ -818,9 +827,15 @@ const ExecuterPrescriptionScreen = ({
}}> }}>
<View style={{width: 10}}/> <View style={{width: 10}}/>
<View style={{paddingHorizontal: 10, alignItems: 'flex-start'}}> <View style={{paddingHorizontal: 10, alignItems: 'flex-start'}}>
<Text subhead semibold> <Text subhead semibold textAlign="left">
{`${beneficiary.firstname !== null ? beneficiary.firstname : ''} ${beneficiary.lastname !== null ? beneficiary.lastname : ''} (${I18n.t('AYANT_DROITS')})`} {`${beneficiary.firstname !== null ? beneficiary.firstname : ''} ${beneficiary.lastname !== null ? beneficiary.lastname : ''} (${I18n.t('AYANT_DROITS')})`}
</Text> </Text>
<Text footnote>
{`${I18n.t('MONTANT_ASSURANCE_CONSOMME')}: ${beneficiary.insurance_consumed_amount}`}
</Text>
<Text footnote>
{`${I18n.t('MONTANT_ASSURANCE_RESTANTE')}: ${beneficiary.insurance_remaining_amount}`}
</Text>
</View> </View>
</TouchableOpacity> </TouchableOpacity>
))} ))}

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

@ -277,6 +277,7 @@ const ModifierExecutionPrescriptionScreen = ({
const [beneficiary, setBeneficiary] = useState(null); const [beneficiary, setBeneficiary] = useState(null);
const [medicament, setMedicament] = useState(null); const [medicament, setMedicament] = useState(null);
const [elementToSetPrice, setElementToSetPrice] = useState(null); const [elementToSetPrice, setElementToSetPrice] = useState(null);
const [tmpSheetId, setTmpSheetId] = useState(''+Date.now());
const wizard = useRef(); const wizard = useRef();
const [isFirstStep, setIsFirstStep] = useState(true); const [isFirstStep, setIsFirstStep] = useState(true);
@ -572,6 +573,7 @@ const ModifierExecutionPrescriptionScreen = ({
quantity: consultation.exams.filter(exam => elementToSetPrice.id === exam.id)[0].quantity quantity: consultation.exams.filter(exam => elementToSetPrice.id === exam.id)[0].quantity
} }
], ],
tmp_sheet_id:tmpSheetId,
}); });
} else { } else {
setConsultation({ setConsultation({
@ -596,6 +598,7 @@ const ModifierExecutionPrescriptionScreen = ({
quantity: consultation.prescriptions.filter(prescription => elementToSetPrice.id === prescription.id)[0].quantity quantity: consultation.prescriptions.filter(prescription => elementToSetPrice.id === prescription.id)[0].quantity
} }
], ],
tmp_sheet_id:tmpSheetId,
}); });
} }
}}> }}>
@ -768,7 +771,7 @@ const ModifierExecutionPrescriptionScreen = ({
<TouchableOpacity <TouchableOpacity
style={[ style={[
styles.contentActionModalBottom, styles.contentActionModalBottom,
{borderBottomColor: Color.borderColor, width: "100%"}, {borderBottomColor: Color.borderColor, width: "100%",flexDirection: 'column',},
]} ]}
key={item.id} key={item.id}
onPress={() => { onPress={() => {
@ -798,6 +801,12 @@ const ModifierExecutionPrescriptionScreen = ({
<Text body2 semibold> <Text body2 semibold>
{`${item.user.firstname !== null ? item.user.firstname : ''} ${item.user.lastname !== null ? item.user.lastname : ''}`} {`${item.user.firstname !== null ? item.user.firstname : ''} ${item.user.lastname !== null ? item.user.lastname : ''}`}
</Text> </Text>
<Text footnote>
{`${I18n.t('MONTANT_ASSURANCE_CONSOMME')}: ${item.insurance_consumed_amount}`}
</Text>
<Text footnote>
{`${I18n.t('MONTANT_ASSURANCE_RESTANTE')}: ${item.insurance_remaining_amount}`}
</Text>
</TouchableOpacity> </TouchableOpacity>
{item.beneficiaries.map((beneficiary) => ( {item.beneficiaries.map((beneficiary) => (
<TouchableOpacity style={styles.beneficiarySubSection} <TouchableOpacity style={styles.beneficiarySubSection}
@ -819,9 +828,15 @@ const ModifierExecutionPrescriptionScreen = ({
}}> }}>
<View style={{width: 10}}/> <View style={{width: 10}}/>
<View style={{paddingHorizontal: 10, alignItems: 'flex-start'}}> <View style={{paddingHorizontal: 10, alignItems: 'flex-start'}}>
<Text subhead semibold> <Text subhead semibold textAlign="left">
{`${beneficiary.firstname !== null ? beneficiary.firstname : ''} ${beneficiary.lastname !== null ? beneficiary.lastname : ''} (${I18n.t('AYANT_DROITS')})`} {`${beneficiary.firstname !== null ? beneficiary.firstname : ''} ${beneficiary.lastname !== null ? beneficiary.lastname : ''} (${I18n.t('AYANT_DROITS')})`}
</Text> </Text>
<Text footnote>
{`${I18n.t('MONTANT_ASSURANCE_CONSOMME')}: ${beneficiary.insurance_consumed_amount}`}
</Text>
<Text footnote>
{`${I18n.t('MONTANT_ASSURANCE_RESTANTE')}: ${beneficiary.insurance_remaining_amount}`}
</Text>
</View> </View>
</TouchableOpacity> </TouchableOpacity>
))} ))}

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

@ -294,6 +294,8 @@ const ModifierFeuilleSoinScreen = ({
const [isNumeroAssureSearch, setIsNumeroAssureSearch] = useState(false); const [isNumeroAssureSearch, setIsNumeroAssureSearch] = useState(false);
const [isPhoneAssureSearch, setIsPhoneAssureSearch] = useState(false); const [isPhoneAssureSearch, setIsPhoneAssureSearch] = useState(false);
const [tmpSheetId, setTmpSheetId] = useState(''+Date.now());
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);
const [dateDebutGrossesse, setDateDebutGrossesse] = useState(null); const [dateDebutGrossesse, setDateDebutGrossesse] = useState(null);
@ -745,10 +747,11 @@ const ModifierFeuilleSoinScreen = ({
fetchCheckInsuranceCoverageAmount({ fetchCheckInsuranceCoverageAmount({
insurance_id: assure.id, insurance_id: assure.id,
beneficiary_id: beneficiary !== null ? beneficiary.id : null, beneficiary_id: beneficiary !== null ? beneficiary.id : null,
care_condition: careConditon, care_condition: consultation._care_condition,
act_action: "UPDATE", act_action: "UPDATE",
act_type: "PERFORMANCE", act_type: "PERFORMANCE",
act_id: values.code_acte.id, act_id: values.code_acte.id,
tmp_sheet_id:tmpSheetId,
performances: [ performances: [
{ {
amount: values.amount_prestation, amount: values.amount_prestation,
@ -844,7 +847,7 @@ const ModifierFeuilleSoinScreen = ({
fetchGetAmountConsultation({ fetchGetAmountConsultation({
network_id: wallet.id_network, network_id: wallet.id_network,
amount: '' + value, amount: '' + value,
care_condition: careConditon care_condition: consultation._care_condition
}); });
}} }}
onBlur={handleBlur('amount_prestation')} onBlur={handleBlur('amount_prestation')}
@ -1033,7 +1036,7 @@ const ModifierFeuilleSoinScreen = ({
fetchGetAmountConsultation({ fetchGetAmountConsultation({
network_id: wallet.id_network, network_id: wallet.id_network,
amount: '' + text, amount: '' + text,
care_condition: careConditon care_condition: consultation._care_condition
}); });
}} }}
/> />
@ -2036,10 +2039,8 @@ const ModifierFeuilleSoinScreen = ({
<TouchableOpacity <TouchableOpacity
style={[ style={[
styles.contentActionModalBottom, styles.contentActionModalBottom,
{ {borderBottomColor: Color.borderColor, width: "100%",flexDirection: 'column',},
borderBottomColor: Color.borderColor,
width: "100%"
},
]} ]}
key={item.id} key={item.id}
onPress={() => { onPress={() => {
@ -2069,6 +2070,12 @@ const ModifierFeuilleSoinScreen = ({
<Text body2 semibold> <Text body2 semibold>
{`${item.user.firstname !== null ? item.user.firstname : ''} ${item.user.lastname !== null ? item.user.lastname : ''}`} {`${item.user.firstname !== null ? item.user.firstname : ''} ${item.user.lastname !== null ? item.user.lastname : ''}`}
</Text> </Text>
<Text footnote>
{`${I18n.t('MONTANT_ASSURANCE_CONSOMME')}: ${item.insurance_consumed_amount}`}
</Text>
<Text footnote>
{`${I18n.t('MONTANT_ASSURANCE_RESTANTE')}: ${item.insurance_remaining_amount}`}
</Text>
</TouchableOpacity> </TouchableOpacity>
{item.beneficiaries.map((beneficiary) => ( {item.beneficiaries.map((beneficiary) => (
<TouchableOpacity style={styles.beneficiarySubSection} <TouchableOpacity style={styles.beneficiarySubSection}
@ -2089,9 +2096,15 @@ const ModifierFeuilleSoinScreen = ({
}}> }}>
<View style={{width: 10}}/> <View style={{width: 10}}/>
<View style={{paddingHorizontal: 10, alignItems: 'flex-start'}}> <View style={{paddingHorizontal: 10, alignItems: 'flex-start'}}>
<Text subhead semibold> <Text subhead semibold textAlign="left">
{`${beneficiary.firstname !== null ? beneficiary.firstname : ''} ${beneficiary.lastname !== null ? beneficiary.lastname : ''} (${I18n.t('AYANT_DROITS')})`} {`${beneficiary.firstname !== null ? beneficiary.firstname : ''} ${beneficiary.lastname !== null ? beneficiary.lastname : ''} (${I18n.t('AYANT_DROITS')})`}
</Text> </Text>
<Text footnote>
{`${I18n.t('MONTANT_ASSURANCE_CONSOMME')}: ${beneficiary.insurance_consumed_amount}`}
</Text>
<Text footnote>
{`${I18n.t('MONTANT_ASSURANCE_RESTANTE')}: ${beneficiary.insurance_remaining_amount}`}
</Text>
</View> </View>
</TouchableOpacity> </TouchableOpacity>
))} ))}
@ -2481,8 +2494,7 @@ const ModifierFeuilleSoinScreen = ({
pregnancy_end_at: values.pregnancy_end_at, pregnancy_end_at: values.pregnancy_end_at,
performances: consultation.performances, performances: consultation.performances,
prescriptions: consultation.prescriptions, prescriptions: consultation.prescriptions,
exams: consultation.exams, exams: consultation.exams
tmp_sheet_id: Date.now()
}); });
}, },
}); });

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

@ -292,6 +292,7 @@ const SaisirFeuilleSoinScreen = ({
const [showDateDebutGrossessePicker, setShowDateDebutGrossessePicker] = useState(false); const [showDateDebutGrossessePicker, setShowDateDebutGrossessePicker] = useState(false);
const [showDateFinGrossessePicker, setShowDateFinGrossessePicker] = useState(false); const [showDateFinGrossessePicker, setShowDateFinGrossessePicker] = useState(false);
const [careConditon, setCareCondition] = useState(null); const [careConditon, setCareCondition] = useState(null);
const [tmpSheetId, setTmpSheetId] = useState(''+Date.now());
const [user, setUser] = useState(null); const [user, setUser] = useState(null);
const [assure, setAssure] = useState(null); const [assure, setAssure] = useState(null);
@ -799,6 +800,7 @@ const SaisirFeuilleSoinScreen = ({
care_condition: careConditon, care_condition: careConditon,
act_action: "INSERT", act_action: "INSERT",
act_type: "PERFORMANCE", act_type: "PERFORMANCE",
tmp_sheet_id:tmpSheetId,
performances: [ performances: [
{ {
amount: values.amount_prestation, amount: values.amount_prestation,
@ -1382,7 +1384,7 @@ const SaisirFeuilleSoinScreen = ({
<TouchableOpacity <TouchableOpacity
style={[ style={[
styles.contentActionModalBottom, styles.contentActionModalBottom,
{borderBottomColor: Color.borderColor, width: "100%"}, {borderBottomColor: Color.borderColor, width: "100%",flexDirection: 'column',},
]} ]}
key={item.id} key={item.id}
onPress={() => { onPress={() => {
@ -1413,6 +1415,12 @@ const SaisirFeuilleSoinScreen = ({
<Text body2 semibold> <Text body2 semibold>
{`${item.user.firstname !== null ? item.user.firstname : ''} ${item.user.lastname !== null ? item.user.lastname : ''}`} {`${item.user.firstname !== null ? item.user.firstname : ''} ${item.user.lastname !== null ? item.user.lastname : ''}`}
</Text> </Text>
<Text footnote>
{`${I18n.t('MONTANT_ASSURANCE_CONSOMME')}: ${item.insurance_consumed_amount}`}
</Text>
<Text footnote>
{`${I18n.t('MONTANT_ASSURANCE_RESTANTE')}: ${item.insurance_remaining_amount}`}
</Text>
</TouchableOpacity> </TouchableOpacity>
{item.beneficiaries.map((beneficiary) => ( {item.beneficiaries.map((beneficiary) => (
<TouchableOpacity style={styles.beneficiarySubSection} <TouchableOpacity style={styles.beneficiarySubSection}
@ -1435,9 +1443,15 @@ const SaisirFeuilleSoinScreen = ({
}}> }}>
<View style={{width: 10}}/> <View style={{width: 10}}/>
<View style={{paddingHorizontal: 10, alignItems: 'flex-start'}}> <View style={{paddingHorizontal: 10, alignItems: 'flex-start'}}>
<Text subhead semibold> <Text subhead semibold textAlign="left">
{`${beneficiary.firstname !== null ? beneficiary.firstname : ''} ${beneficiary.lastname !== null ? beneficiary.lastname : ''} (${I18n.t('AYANT_DROITS')})`} {`${beneficiary.firstname !== null ? beneficiary.firstname : ''} ${beneficiary.lastname !== null ? beneficiary.lastname : ''} (${I18n.t('AYANT_DROITS')})`}
</Text> </Text>
<Text footnote>
{`${I18n.t('MONTANT_ASSURANCE_CONSOMME')}: ${beneficiary.insurance_consumed_amount}`}
</Text>
<Text footnote>
{`${I18n.t('MONTANT_ASSURANCE_RESTANTE')}: ${beneficiary.insurance_remaining_amount}`}
</Text>
</View> </View>
</TouchableOpacity> </TouchableOpacity>
))} ))}
@ -1577,8 +1591,7 @@ const SaisirFeuilleSoinScreen = ({
pregnancy_end_at: values.pregnancy_end_at, pregnancy_end_at: values.pregnancy_end_at,
performances: prestations, performances: prestations,
prescriptions: prescriptions, prescriptions: prescriptions,
exams: examens, exams: examens
tmp_sheet_id: Date.now()
}) })
} }
}, },

4
utils/i18n/fr.json
View File

@ -714,5 +714,7 @@
"INVOICE_ID": "ID facture", "INVOICE_ID": "ID facture",
"INVOICE": "Facture", "INVOICE": "Facture",
"HISTORY": "Historique", "HISTORY": "Historique",
"INFORMATION_MESSAGE": "Message d'information" "INFORMATION_MESSAGE": "Message d'information",
"MONTANT_ASSURANCE_CONSOMME": "Montant de l'assurance consommé",
"MONTANT_ASSURANCE_RESTANTE": "Montant de l'assurance restante"
} }