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

Historique corrigé

This commit is contained in:
Brice Zele 2022-04-26 10:37:18 +01:00
parent 08c803faa0
commit 3a5d608d37
10 changed files with 44 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
screens/wallet/WalletOptionSelect.js
View File

@ -1,6 +1,8 @@
import React, {Component} from 'react';
import {
ActivityIndicator, Alert, FlatList,
ActivityIndicator,
Alert,
FlatList,
Platform,
ProgressBarAndroid,
ScrollView,
@ -12,6 +14,7 @@ import {
} from 'react-native';
import {connectActionSheet} from '@expo/react-native-action-sheet'
import Icon from 'react-native-vector-icons/MaterialCommunityIcons';
import MaterialCommunityIcons from 'react-native-vector-icons/MaterialCommunityIcons';
import I18n from 'react-native-i18n';
import isEqual from 'lodash/isEqual';
import isNil from 'lodash/isNil';
@ -35,7 +38,8 @@ import {
cutString,
cutStringWithoutDot,
displayToast,
displayTransactionType, nanoCreditHistoryLabel, nanoSanteHistoryLabel,
displayTransactionType,
nanoSanteHistoryLabel,
transactionHistoryIlinkLabel
} from '../../utils/UtilsFunction';
import chunk from 'lodash/chunk';
@ -50,9 +54,7 @@ import {getWalletTransactionHistoryUser} from "../../webservice/WalletTransactio
import {getUserIdentificationAction} from "../../webservice/IdentificationApi";
import {store} from "../../redux/store";
import FontAwesome5 from "react-native-vector-icons/FontAwesome5";
import FontAwesome from "react-native-vector-icons/FontAwesome";
import {
fetchGetAmountConsultationReset, fetchGetConsultation,
fetchGetConsultationReset,
fetchGetDrugAppareilReset,
fetchGetNetworkActsReset,
@ -65,13 +67,11 @@ import {
facturerSoinAction,
facturerSoinReset,
getInvoiceHistoryAction,
getInvoiceHistoryReset, getSoinHistoryAction
getInvoiceHistoryReset,
getSoinHistoryAction
} from "../../webservice/NanoCreditApi";
import {facturerSoinReducer} from "../../redux/insurance/insurance.reducer";
import SpinnerOverlay from "../../components/SpinnerOverlayComponent";
import AccordionComponent from "../../components/AccordionComponent";
import MaterialCommunityIcons from "react-native-vector-icons/MaterialCommunityIcons";
import {pdfViewerUrl} from "../../webservice/IlinkConstants";
const route = require('./../../route.json');
let slugify = require('slugify');
@ -1252,9 +1252,9 @@ class WalletOptionSelect extends Component {
title={I18n.t('FEUILLE_SOIN')}
description={`${I18n.t('ID')}: ${history_care.health_care_sheet_id}\
${I18n.t('AMOUNT')}: ${history_care.amount}\
${I18n.t('MONTANT_ASSURANCE')}: ${history_care.insuredAmount}\
${I18n.t('MONTANT_ASSURE')}: ${history_care.insurerAmount}\
${I18n.t('PATIENT')}: ${history_care.patient_firstname} ${history_care.patient_lastname}\
${I18n.t('MONTANT_ASSURANCE')}: ${history_care.insurerAmount}\
${I18n.t('MONTANT_ASSURE')}: ${history_care.insuredAmount}\
${I18n.t('PATIENT')}: ${history_care.patient_firstname !== null ? history_care.patient_firstname : ''} ${history_care.patient_lastname !== null ? history_care.patient_lastname : ''}\
${I18n.t('PRATICIEN')}: ${history_care.practitioner_firstname} ${history_care.practitioner_lastname}\
`}
open

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

@ -1099,7 +1099,7 @@ const ExecuterPrescriptionScreen = ({
</View>
<View style={{flex: 1, alignItems: 'flex-end'}}>
<Text
style={[Typography.caption1, Color.grayColor]}>{`${historyItemDetail.patient_lastname} ${historyItemDetail.patient_firstname}`}</Text>
style={[Typography.caption1, Color.grayColor]}>{`${historyItemDetail.patient_lastname !== null ? historyItemDetail.patient_lastname : ''} ${historyItemDetail.patient_firstname !== null ? historyItemDetail.patient_firstname : ''}`}</Text>
</View>
</View>
<View style={{flexDirection: 'row', marginTop: 10}}>

8
screens/wallet/agent/HistoriqueNanoSanteAgentScreen.js
View File

@ -234,7 +234,7 @@ const HistoriqueNanoSanteAgentScreen = ({
</View>
<View style={{flex: 1, alignItems: 'flex-end'}}>
<Text
style={[Typography.caption1, Color.grayColor]}>{`${historyItemDetail.patient_lastname} ${historyItemDetail.patient_firstname}`}</Text>
style={[Typography.caption1, Color.grayColor]}>{`${historyItemDetail.patient_lastname !== null ? historyItemDetail.patient_lastname : null} ${historyItemDetail.patient_firstname !== null ? historyItemDetail.patient_firstname : ''}`}</Text>
</View>
</View>
<View style={{flexDirection: 'row', marginTop: 10}}>
@ -446,9 +446,9 @@ const HistoriqueNanoSanteAgentScreen = ({
title={I18n.t('FEUILLE_SOIN')}
description={`${I18n.t('ID')}: ${history_care.health_care_sheet_id}\
${I18n.t('AMOUNT')}: ${history_care.amount}\
${I18n.t('MONTANT_ASSURANCE')}: ${history_care.insuredAmount}\
${I18n.t('MONTANT_ASSURANCE')}: ${history_care.insurerAmount}\
${I18n.t('MONTANT_ASSURE')}: ${history_care.insuredAmount}\
${I18n.t('PATIENT')}: ${history_care.patient_firstname !== null ? history_care.patient_firstname : '' } ${history_care.patient_lastname}\n
${I18n.t('PATIENT')}: ${history_care.patient_firstname !== null ? history_care.patient_firstname : '' } ${history_care.patient_lastname !== null ? history_care.patient_lastname : ''}\n
${I18n.t('PRATICIEN')}: ${history_care.practitioner_firstname !== null ? history_care.practitioner_firstname : ''} ${history_care.practitioner_lastname}\
`}
open
@ -506,7 +506,7 @@ const HistoriqueNanoSanteAgentScreen = ({
<Text
caption1>{`${I18n.t('NETWORK')}: ${item.network.name}`}</Text>
<Text footnote light numberOfLines={1}>
{`${I18n.t('AYANT_DROIT')}: ${item.patient_firstname} ${item.patient_lastname}\ (${item.patient_situation.toLowerCase()})`}
{`${I18n.t('BENEFICIARY')}: ${item.patient_firstname !== null ? item.patient_firstname : ''} ${item.patient_lastname !== null ? item.patient_lastname : ''}\ (${item.patient_situation.toLowerCase()})`}
</Text>
</View>

22
screens/wallet/agent/HistoriqueNanoSanteSuperHyperScreen.js
View File

@ -7,7 +7,8 @@
*/
import React, {useEffect, useState} from 'react';
import {
ActivityIndicator, Alert,
ActivityIndicator,
Alert,
Dimensions,
FlatList,
Platform,
@ -25,16 +26,18 @@ import {ScreenComponent} from "../../../components/ScreenComponent";
import {
fetchAcceptRejectConsultation,
fetchAcceptRejectConsultationReset,
fetchActivePaySubscription, fetchDemaneAutorisationSoinReset,
fetchActivePaySubscription,
fetchGetConsultation,
fetchGetConsultationReset, fetchGetDemandeAutorisationSoin, fetchGetInvoiceHistory,
fetchGetConsultationReset,
fetchGetDemandeAutorisationSoin,
fetchGetInvoiceHistory,
fetchGetSubscription
} from "../../../redux/insurance/insurance.actions";
import DropdownAlert from "react-native-dropdownalert";
import {createStructuredSelector} from "reselect";
import {
selectAcceptRefuseConsultation,
selectActivatePaySubscription, selectDemandeAutorisationSoin,
selectActivatePaySubscription,
selectGetConsultation,
selectSubscriptionList
} from "../../../redux/insurance/insurance.selector";
@ -49,7 +52,6 @@ import FontAwesome5 from "react-native-vector-icons/FontAwesome5";
import MaterialCommunityIcons from "react-native-vector-icons/MaterialCommunityIcons";
import {store} from "../../../redux/store";
import AccordionComponent from "../../../components/AccordionComponent";
import {pdfViewerUrl} from "../../../webservice/IlinkConstants";
let moment = require('moment-timezone');
@ -233,7 +235,7 @@ const HistoriqueNanoSanteSuperHyperScreen = ({
</View>
<View style={{flex: 1, alignItems: 'flex-end'}}>
<Text
style={[Typography.caption1, Color.grayColor]}>{`${historyItemDetail.patient_lastname} ${historyItemDetail.patient_firstname}`}</Text>
style={[Typography.caption1, Color.grayColor]}>{`${historyItemDetail.patient_lastname !== null ? historyItemDetail.patient_lastname : ''} ${historyItemDetail.patient_firstname !== null ? historyItemDetail.patient_firstname : ''}`}</Text>
</View>
</View>
<View style={{flexDirection: 'row', marginTop: 10}}>
@ -445,9 +447,9 @@ const HistoriqueNanoSanteSuperHyperScreen = ({
title={I18n.t('FEUILLE_SOIN')}
description={`${I18n.t('ID')}: ${history_care.health_care_sheet_id}\
${I18n.t('AMOUNT')}: ${history_care.amount}\
${I18n.t('MONTANT_ASSURANCE')}: ${history_care.insuredAmount}\
${I18n.t('MONTANT_ASSURE')}: ${history_care.insurerAmount}\
${I18n.t('PATIENT')}: ${history_care.patient_firstname} ${history_care.patient_lastname}\
${I18n.t('MONTANT_ASSURANCE')}: ${history_care.insurerAmount}\
${I18n.t('MONTANT_ASSURE')}: ${history_care.insuredAmount}\
${I18n.t('PATIENT')}: ${history_care.patient_firstname !== null ? history_care.patient_firstname : ''} ${history_care.patient_lastname !== null ? history_care.patient_lastname : ''}\
${I18n.t('PRATICIEN')}: ${history_care.practitioner_firstname} ${history_care.practitioner_lastname}\
`}
open
@ -505,7 +507,7 @@ const HistoriqueNanoSanteSuperHyperScreen = ({
<Text
caption1>{`${I18n.t('NETWORK')}: ${item.network.name}`}</Text>
<Text footnote light numberOfLines={1}>
{`${I18n.t('AYANT_DROIT')}: ${item.patient_firstname} ${item.patient_lastname}\ (${item.patient_situation.toLowerCase()})`}
{`${I18n.t('AYANT_DROIT')}: ${item.patient_firstname !== null ? item.patient_firstname : ''} ${item.patient_lastname !== null ? item.patient_lastname: ''}\ (${item.patient_situation.toLowerCase()})`}
</Text>
</View>

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

@ -1093,7 +1093,7 @@ const ModifierExecutionPrescriptionScreen = ({
</View>
<View style={{flex: 1, alignItems: 'flex-end'}}>
<Text
style={[Typography.caption1, Color.grayColor]}>{`${historyItemDetail.patient_lastname} ${historyItemDetail.patient_firstname}`}</Text>
style={[Typography.caption1, Color.grayColor]}>{`${historyItemDetail.patient_lastname !== null ? historyItemDetail.patient_lastname : ''} ${historyItemDetail.patient_firstname !== null ? historyItemDetail.patient_firstname : ''}`}</Text>
</View>
</View>
<View style={{flexDirection: 'row', marginTop: 10}}>

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

@ -2354,7 +2354,7 @@ const ModifierFeuilleSoinScreen = ({
</View>
<View style={{flex: 1, alignItems: 'flex-end'}}>
<Text
style={[Typography.caption1, Color.grayColor]}>{`${historyItemDetail.patient_lastname} ${historyItemDetail.patient_firstname}`}</Text>
style={[Typography.caption1, Color.grayColor]}>{`${historyItemDetail.patient_lastname !== null ? historyItemDetail.patient_lastname : ''} ${historyItemDetail.patient_firstname !== null ? historyItemDetail.patient_firstname : ''}`}</Text>
</View>
</View>
<View style={{flexDirection: 'row', marginTop: 10}}>

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

@ -7,7 +7,8 @@
*/
import React, {useEffect, useState} from 'react';
import {
ActivityIndicator, Alert,
ActivityIndicator,
Alert,
Dimensions,
FlatList,
Platform,
@ -25,16 +26,17 @@ import {ScreenComponent} from "../../../components/ScreenComponent";
import {
fetchAcceptRejectConsultation,
fetchAcceptRejectConsultationReset,
fetchActivePaySubscription, fetchDemaneAutorisationSoinReset,
fetchActivePaySubscription,
fetchGetConsultation,
fetchGetConsultationReset, fetchGetDemandeAutorisationSoin,
fetchGetConsultationReset,
fetchGetDemandeAutorisationSoin,
fetchGetSubscription
} from "../../../redux/insurance/insurance.actions";
import DropdownAlert from "react-native-dropdownalert";
import {createStructuredSelector} from "reselect";
import {
selectAcceptRefuseConsultation,
selectActivatePaySubscription, selectDemandeAutorisationSoin,
selectActivatePaySubscription,
selectGetConsultation,
selectSubscriptionList
} from "../../../redux/insurance/insurance.selector";
@ -422,7 +424,7 @@ const HistoriqueNanoSanteUserScreen = ({
</View>
<View style={{flex: 1, alignItems: 'flex-end'}}>
<Text
style={[Typography.caption1, Color.grayColor]}>{`${historyItemDetail.patient_lastname} ${historyItemDetail.patient_firstname}`}</Text>
style={[Typography.caption1, Color.grayColor]}>{`${historyItemDetail.patient_lastname !== null ? historyItemDetail.patient_lastname : ''} ${historyItemDetail.patient_firstname !== null ? historyItemDetail.patient_firstname : ''}`}</Text>
</View>
</View>
<View style={{flexDirection: 'row', marginTop: 10}}>
@ -683,7 +685,7 @@ const HistoriqueNanoSanteUserScreen = ({
<View style={[styles.contentTop, {borderColor: Color.borderColor}]}>
<View style={{flex: 1, alignItems: 'flex-start'}}>
<Text
caption1>{`${I18n.t('PATIENT')}: ${item.patient_lastname} ${item.patient_firstname}`}</Text>
caption1>{`${I18n.t('PATIENT')}: ${item.patient_lastname ? item.patient_lastname : ''} ${item.patient_firstname !== null ? item.patient_firstname : ''}`}</Text>
<Text footnote light numberOfLines={1}>
{`${I18n.t('SITUATION')}: ${item.patient_situation.toLowerCase()}`}
</Text>

4
screens/wallet/user/ValidateConsultationDetailScreen.js
View File

@ -23,7 +23,7 @@ import {
fetchAcceptRejectConsultation,
fetchAcceptRejectConsultationReset,
fetchActivePaySubscription,
fetchGetConsultation, fetchStopSubscriptionReset
fetchGetConsultation
} from "../../../redux/insurance/insurance.actions";
import * as Utils from "../../../utils/UtilsFunction";
import {uppercaseFirstLetter} from "../../../utils/UtilsFunction";
@ -100,7 +100,7 @@ const ValidateConsultationDetailScreen = ({navigation, fetchAcceptRejectConsulta
{I18n.t('PATIENT')}
</Text>
<Text body2>
{`${consultation.patient_lastname} ${consultation.patient_firstname}`}
{`${consultation.patient_lastname !== null ? consultation.patient_lastname : ''} ${consultation.patient_firstname !== null ? consultation.patient_firstname : ''}`}
</Text>
<Text body2>{consultation.patient_situation.toLowerCase()}</Text>
</View>

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

@ -184,7 +184,7 @@ const ValidateConsultationScreen = ({
</View>
<View style={{flex: 1, alignItems: 'flex-end'}}>
<Text
style={[Typography.caption1, Color.grayColor]}>{`${historyItemDetail.patient_lastname} ${historyItemDetail.patient_firstname}`}</Text>
style={[Typography.caption1, Color.grayColor]}>{`${historyItemDetail.patient_lastname !== null ? historyItemDetail.patient_lastname : ''} ${historyItemDetail.patient_firstname !== null ? historyItemDetail.patient_firstname : ''}`}</Text>
</View>
</View>
<View style={{flexDirection: 'row', marginTop: 10}}>
@ -338,7 +338,7 @@ const ValidateConsultationScreen = ({
<View style={[styles.contentTop, {borderColor: Color.borderColor}]}>
<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 !== null ? item.patient_lastname : ''} ${item.patient_firstname !== null ? item.patient_firstname : ''}`}</Text>
<Text footnote light numberOfLines={1}>
{`${I18n.t('SITUATION')}: ${item.patient_situation.toLowerCase()}`}
</Text>

3
utils/i18n/fr.json
View File

@ -741,5 +741,6 @@
"QUANTITY_CANNOT_BE_SUPERIOR": "La quantité ne doit pas être supérieure à",
"EXCLUSION": "Exclusion",
"VALIDATION_EFFECTUE": "Validation effectué",
"USER_SUCCESSFULLY_VALIDATED": "Utilisateur validé avec succès"
"USER_SUCCESSFULLY_VALIDATED": "Utilisateur validé avec succès",
"BENEFICIARY": "Bénéficiaire"
}