From 67cfe8fa3e6723fb28b9f0004d86a561c68ddf58 Mon Sep 17 00:00:00 2001 From: Brice Zele Date: Wed, 4 May 2022 01:36:54 +0100 Subject: [PATCH] before pull --- .../app/src/main/res/raw/utils_i18n_fr.json | 44 +++++-------------- package.json | 2 +- redux/actions/WalletActions.js | 2 +- redux/insurance/insurance.actions.js | 1 - redux/insurance/insurance.reducer.js | 31 +++++++++++++ redux/insurance/insurance.selector.js | 2 +- redux/types/WalletType.js | 17 +++++++ screens/wallet/WalletDetail.js | 12 ++--- .../agent/HistoriqueNanoSanteAgentScreen.js | 4 +- .../wallet/agent/ModifierFeuilleSoinScreen.js | 3 +- webservice/IlinkConstants.js | 13 ++---- 11 files changed, 75 insertions(+), 56 deletions(-) diff --git a/android/app/src/main/res/raw/utils_i18n_fr.json b/android/app/src/main/res/raw/utils_i18n_fr.json index 78d80334..07978948 100644 --- a/android/app/src/main/res/raw/utils_i18n_fr.json +++ b/android/app/src/main/res/raw/utils_i18n_fr.json @@ -37,7 +37,7 @@ "AMOUNT_LABEL": "Montant", "AMOUNT_LABEL_DESCRIPTION": "Veuillez saisir le montant", "DESTINATAIRE": "Destinataire", - "ERROR_LABEL": "Message d'information", + "ERROR_LABEL": "Erreur", "NO_BANK_AVAILABLE": "Aucune banque disponible", "BANK_LIST": "Liste des banques", "NO_OPERATOR_AVAILABLE": "Aucun opérateur disponible", @@ -336,7 +336,7 @@ "english": "Anglais" }, "ERROR_FILTER": "Erreur survenue lors du filtre", - "ERROR_LABLE": "Information", + "ERROR_LABLE": "Erreur", "ERROR_TRANSFER_COMMISSION": "Erreur de transfert des commissions", "TRANSFER_COMMISSION_IMPOSSIBLE": "Transfert des commissions impossible", "ERROR_FILTER_TEXT": "Probleme rencontré lors du filtrage.", @@ -571,7 +571,7 @@ "RENEW_INSSURANCE": "Renouveler son assurance ", "MANAGE_ASSURANCE": "Gérer son assurance", "MANAGE_HEALTH": "Gérer ses soins", - "DEMAND_AUTORIZATION_HEALTH": "Demande de prise en charge", + "DEMAND_AUTORIZATION_HEALTH": "Demande autorisation soin", "HISTORIC_HEALTH": "Historique", "VALID_HEALTH": "Valider un soin ", "ACTIVATE_INSSURANCE": "Activer son assurance", @@ -601,7 +601,7 @@ "BENEFICIARY_SUCCESSFULLY_ADDED": "L'ayant droit a été correctement ajouté", "NUMBER_OF_MONTHS": "Nbre de mois", "MINIMUM_AMOUNT": "Montant min.", - "AMOUNT_PER_MONTH": "Type d'assurance", + "AMOUNT_PER_MONTH": "Montant par durée de couverture", "DETAIL": "Détail", "PRIME_AMOUNT": "Montant de la prime", "AYANT_DROIT": "Ayant(s) droit(s)", @@ -628,7 +628,7 @@ "LONGUE": "Longue", "ACCIDENT": "Accident", "GROSSESSE": "Grossesse", - "ADD_PRESTATION": "Ajouter une consultation", + "ADD_PRESTATION": "Ajouter une prestation", "ADD_PRESCRIPTION": "Ajouter une prescription", "VISITE_DOMICILE": "Visite domicile ", "CODE_ACTE": "Code acte ", @@ -653,7 +653,7 @@ "CLASSE_PRESTATAIRE": "Classe de prestataire", "FRAIS_DEPLACEMENT": "Frais de déplacement", "AJOUTER_MEDICAMENT": "Ajouter médicament/appareil", - "AJOUTER_EXAMEN": "Ajouter autre acte ou examen", + "AJOUTER_EXAMEN": "Ajouter examen", "NAME": "Nom", "POSOLOGIE": "Posologie", "QUANTITE": "Quantité", @@ -666,7 +666,7 @@ "PRESCRIPTIONS_SUCCESSFULLY_ADD": "Prescription ajouté avec succès", "PRESCRIPTIONS_SUCCESSFULLY_MODIFY": "Prescription modifié avec succès", "YOU_MUST_ADD_AT_LEAST_ONE_PRESTATION": "Vous devez ajouter au moins une prestation", - "NO_DRUG_MATCH_YOU_SEARCH": "Aucun médicament ne correspond à votre recherche, voulez-vous en ajouter ?", + "NO_DRUG_MATCH_YOU_SEARCH": "Aucun médicament ne correspond à votre rechercher, voulez-vous en ajouter ?", "COMPRESSED": "Comprimé", "SYRUP": "Sirop", "SOLUTION": "Solution", @@ -689,8 +689,8 @@ "MODIFIER_EXAMEN": "Modifier examen", "EXAMENS_SUCCESSFULLY_MODIFY": "Examen modifié avec succès", "PRESTATION_SUCCESSFULLY_MODIFY": "Prestation modifié avec succès", - "MODIFY_PRESTATION": "Modifier une consultation", - "LIST_PRESTATION": "Liste des consultations", + "MODIFY_PRESTATION": "Modifier une prestation", + "LIST_PRESTATION": "Liste des prestations", "NO_CONSULTATION": "Aucune consultation", "NO_EXECUTION": "Aucune exécution", "LISTE_CONSULTATION": "Liste des consultations", @@ -717,29 +717,5 @@ "INFORMATION_MESSAGE": "Message d'information", "MONTANT_ASSURANCE_CONSOMME": "Montant de l'assurance consommé", "MONTANT_ASSURANCE_RESTANTE": "Montant de l'assurance restante", - "NO_BENEFICIARY": "Aucun ayant droit", - "PRIME_PRINCIPAL": "Prime principal", - "IDENTIFIANT": "ID", - "FACT": "Fact.", - "MNT": "Mnt.", - "ECH": "Ech.", - "PER": "Per.", - "ASSURE_SUSPENDU": "Cet assuré est suspendu", - "ASSURE_PRINCIPAL_SUSPENDU": "L'assuré principal est suspendu", - "CONSULTATION": "Consultation", - "ACTE_EXAMEN": "Acte et examen", - "AMOUNT_FREE": "Montant libre", - "DESCRIPTION": "Description", - "EXECUTION": "Execution", - "UNIT_QUANTITE": "Qté unitaire", - "NO_USAGER_CORRESPONDING_TO_SEARCH": "Aucun usager ne correspond à votre recherche", - "USAGER_SEARCH": "Recherche d'un usager", - "BY_NAME": "Par nom", - "BY_QR_CODE": "Par QR Code", - "SCAN": "Scanner", - "BRING_YOUR_CAMERA_CLOSER_TO_SCAN_QR_CODE": "Approchez votre caméra du QR Code afin de le scanner", - "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" + "NO_BENEFICIARY": "Aucun ayant droit" } diff --git a/package.json b/package.json index 792763c7..aeda2913 100755 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "start": "node node_modules/react-native/local-cli/cli.js start", "test": "jest", "postinstall": "node ./fix-android/android-release-fix.js", - "release-build": "react-native bundle --platform android --dev false --entry-file index.js --bundle-output ./android/app/src/main/assets/index.android.bundle --assets-dest ./android/app/build/intermediates/res/merged/release/ && rm -rf ./android/app/src/main/res/drawable-* && rm -rf ./android/app/src/main/res/raw/* && cd ./android && ./gradlew assembleRelease -x bundleReleaseJsAndAssets && cd .. && adb install ./android/app/build/outputs/apk/release/app-release.apk", + "release-build": "react-native bundle --platform android --dev false --entry-file index.js --bundle-output ./android/app/src/main/assets/index.android.bundle --assets-dest ./android/app/build/intermediates/res/merged/release/ && rm -rf ./android/app/src/main/res/drawable-* && rm -rf ./android/app/src/main/res/raw/* && cd ./android && ./gradlew assembleRelease && cd .. && adb install ./android/app/build/outputs/apk/release/app-release.apk", "debug-build": "react-native bundle --platform android --dev false --entry-file index.js --bundle-output ./android/app/src/main/assets/index.android.bundle --assets-dest ./android/app/src/main/res/ ; cd ./android ; sudo ./gradlew clean ; sudo ./gradlew assembleDebug && cd .. && sudo adb install ./android/app/build/outputs/apk/debug/app-debug.apk", "start-emulator": "emulator -avd Nexus_5X_API_29 -dns-server 8.8.8.8", "start-emulator-pixel": "emulator -avd Pixel_2_API_29 -dns-server 8.8.8.8", diff --git a/redux/actions/WalletActions.js b/redux/actions/WalletActions.js index e04a543b..44df6db4 100755 --- a/redux/actions/WalletActions.js +++ b/redux/actions/WalletActions.js @@ -340,4 +340,4 @@ export const fetchPasswordValidationSuccess = (res) => ({ export const fetchPasswordValidationError = (error) => ({ type: PASSWORD_VALIDATION_ERROR, result: error -}); +}); \ No newline at end of file diff --git a/redux/insurance/insurance.actions.js b/redux/insurance/insurance.actions.js index 52420b01..e97caaac 100644 --- a/redux/insurance/insurance.actions.js +++ b/redux/insurance/insurance.actions.js @@ -791,4 +791,3 @@ export const fetchGetExclusion = (network_id) => { onError: fetchGetExclusionError, }); }; - diff --git a/redux/insurance/insurance.reducer.js b/redux/insurance/insurance.reducer.js index 6ba4e8c0..dbfccb18 100644 --- a/redux/insurance/insurance.reducer.js +++ b/redux/insurance/insurance.reducer.js @@ -799,3 +799,34 @@ export const getExclusionReducer = (state = INITIAL_STATE, action: InsuranceActi } }; + +export const getExclusionReducer = (state = INITIAL_STATE, action: InsuranceActions) => { + console.log("ACTION", action); + switch (action.type) { + case InsuranceActions.GET_EXCLUSION_PENDING: + return { + ...state, + loading: true + } + case InsuranceActions.GET_EXCLUSION_SUCCESS: + return { + loading: false, + result: action.payload.response, + error: null + } + case InsuranceActions.GET_EXCLUSION_ERROR: + return { + ...state, + loading: false, + result: null, + error: action.payload + } + + case InsuranceActions.GET_EXCLUSION_RESET: + return INITIAL_STATE; + + default: + return state + + } +}; diff --git a/redux/insurance/insurance.selector.js b/redux/insurance/insurance.selector.js index f9c66f3e..e801a714 100644 --- a/redux/insurance/insurance.selector.js +++ b/redux/insurance/insurance.selector.js @@ -146,4 +146,4 @@ export const selectCheckInsuranceCoverageAmount = createSelector( export const selectGetExclusion = createSelector( [selectGetExclusionReducer], (getExclusion) => getExclusion -); +); \ No newline at end of file diff --git a/redux/types/WalletType.js b/redux/types/WalletType.js index 8632e3c3..8c524c2e 100755 --- a/redux/types/WalletType.js +++ b/redux/types/WalletType.js @@ -59,6 +59,23 @@ export const PAY_BILL_ERROR = 'PAY_BILL_ERROR'; export const PAY_BILL_RESET = 'PAY_BILL_RESET'; +export const SEARCH_USER_PENDING = 'SEARCH_USER_PENDING'; +export const SEARCH_USER_SUCCESS = 'SEARCH_USER_SUCCESS'; +export const SEARCH_USER_ERROR = 'SEARCH_USER_ERROR'; +export const SEARCH_USER_RESET = 'SEARCH_USER_RESET'; + +export const GET_QR_CODE_DETAIL_PENDING = 'GET_QR_CODE_DETAIL_PENDING'; +export const GET_QR_CODE_DETAIL_SUCCESS = 'GET_QR_CODE_DETAIL_SUCCESS'; +export const GET_QR_CODE_DETAIL_ERROR = 'GET_QR_CODE_DETAIL_ERROR'; +export const GET_QR_CODE_DETAIL_RESET = 'GET_QR_CODE_DETAIL_RESET'; + +export const PASSWORD_VALIDATION_PENDING = 'PASSWORD_VALIDATION_PENDING'; +export const PASSWORD_VALIDATION_SUCCESS = 'PASSWORD_VALIDATION_SUCCESS'; +export const PASSWORD_VALIDATION_ERROR = 'PASSWORD_VALIDATION_ERROR'; +export const PASSWORD_VALIDATION_RESET = 'PASSWORD_VALIDATION_RESET'; + + + export const SEARCH_USER_PENDING = 'SEARCH_USER_PENDING'; export const SEARCH_USER_SUCCESS = 'SEARCH_USER_SUCCESS'; export const SEARCH_USER_ERROR = 'SEARCH_USER_ERROR'; diff --git a/screens/wallet/WalletDetail.js b/screens/wallet/WalletDetail.js index 610816a4..4a9ecf6d 100755 --- a/screens/wallet/WalletDetail.js +++ b/screens/wallet/WalletDetail.js @@ -1623,7 +1623,7 @@ class WalletDetail extends Component { {(wallet.type === "ilink-world" || wallet.type === "ilink" || wallet.type === "visa") && - + { @@ -1652,7 +1652,7 @@ class WalletDetail extends Component { size={30} style={styles.imageBanner}/> - + - - - + + + - + {historyItemDetail.insurer_amount} + style={[Typography.caption1, Color.grayColor]}>{historyItemDetail.insured_amount} @@ -427,7 +427,7 @@ const HistoriqueNanoSanteAgentScreen = ({ {historyItemDetail.insured_amount} + style={[Typography.caption1, Color.grayColor]}>{historyItemDetail.insurer_amount} diff --git a/screens/wallet/agent/ModifierFeuilleSoinScreen.js b/screens/wallet/agent/ModifierFeuilleSoinScreen.js index 1a83907a..a2799987 100644 --- a/screens/wallet/agent/ModifierFeuilleSoinScreen.js +++ b/screens/wallet/agent/ModifierFeuilleSoinScreen.js @@ -1661,7 +1661,7 @@ const ModifierFeuilleSoinScreen = ({ ( + {console.log("Errors", errors)}