finish feature/OPENIMIS-75_fetch_status_from_mutation_logs

Check mutation's status in mutation logs
openimis · Sep 23, 2024 · 9f078b5 · 9f078b5
2 parents 65622cc + 32f6ddf
commit 9f078b5
Show file tree

Hide file tree

Showing 45 changed files with 2,812 additions and 1,459 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -124,7 +124,7 @@ android {
         }
         local {
             applicationId "org.openimis.imispolicies.local"
-            buildConfigField "String", "API_BASE_URL", '"https://gambiatest.bluesquare.org/"'
+            buildConfigField "String", "API_BASE_URL", '"http://10.0.2.2:35787/"'
             buildConfigField "boolean", "SHOW_PAYMENT_MENU", 'true'
             resValue "string", "app_name_policies", "Policies Local"
             dimension = 'std'

diff --git a/app/src/localeBepha/res/values-fr-rCM/strings.xml b/app/src/localeBepha/res/values-fr-rCM/strings.xml
@@ -176,6 +176,7 @@
     <string name="MissingReceiptNo">Veuillez entrer le numéro de reçu.</string>
     <string name="MissingProductCode">Veuillez entrer le code du Paquet de bénéfice</string>
     <string name="MissingAmount">Veuillez entrer le montant</string>
+    <string name="MissingPayType">Veuillez sélectionner un type de paiement</string>
     <string name="InvalidReceiptNo">Ce numéro de reçu est déjà utilisé.</string>
     <string name="NoFiles">Aucun fichier trouvé.</string>
     <string name="Of">De</string>
@@ -477,4 +478,8 @@
     <string name="CurrentResourceLanguage">Current resource language: %1$s</string>
     <string name="SystemLanguageNotSupported">Current system language is not supported. The app will use the default language.</string>
     <string name="SupportedLanguages">Supported languages:\n%1$s</string>
+    <string name="pay_type_select_one">Selectionnez un mode de paiement</string>
+    <string name="pay_type_cash">Cash</string>
+    <string name="pay_type_mobile_phone">Téléphone portable</string>
+    <string name="pay_type_bank_transfer">Virement banquaire</string>
 </resources>
diff --git a/app/src/localeMv/res/values-fr/strings.xml b/app/src/localeMv/res/values-fr/strings.xml
@@ -176,6 +176,7 @@
     <string name="MissingReceiptNo">Veuillez entrer le numéro de reçu.</string>
     <string name="MissingProductCode">Veuillez entrer le code du Paquet de bénéfice</string>
     <string name="MissingAmount">Veuillez entrer le montant</string>
+    <string name="MissingPayType">Veuillez sélectionner un type de paiement</string>
     <string name="InvalidReceiptNo">Ce numéro de reçu est déjà utilisé.</string>
     <string name="NoFiles">Aucun fichier trouvé.</string>
     <string name="Of">De</string>
@@ -477,4 +478,8 @@
     <string name="CurrentResourceLanguage">Current resource language: %1$s</string>
     <string name="SystemLanguageNotSupported">Current system language is not supported. The app will use the default language.</string>
     <string name="SupportedLanguages">Supported languages:\n%1$s</string>
+    <string name="pay_type_select_one">Selectionnez un mode de paiement</string>
+    <string name="pay_type_cash">Cash</string>
+    <string name="pay_type_mobile_phone">Téléphone portable</string>
+    <string name="pay_type_bank_transfer">Virement banquaire</string>
 </resources>
diff --git a/app/src/localeTchad/res/values-fr/strings.xml b/app/src/localeTchad/res/values-fr/strings.xml
@@ -176,6 +176,7 @@
     <string name="MissingReceiptNo">Veuillez entrer le numéro de reçu.</string>
     <string name="MissingProductCode">Veuillez entrer le code du produit</string>
     <string name="MissingAmount">Veuillez entrer le montant</string>
+    <string name="MissingPayType">Veuillez sélectionner un type de paiement</string>
     <string name="InvalidReceiptNo">Ce numéro de reçu est déjà utilisé.</string>
     <string name="NoFiles">Aucun fichier trouvé.</string>
     <string name="Of">De</string>
@@ -478,4 +479,8 @@
     <string name="SystemLanguageNotSupported">Current system language is not supported. The app will use the default language.</string>
     <string name="SupportedLanguages">Supported languages:\n%1$s</string>
     <string name="DataDownloadedFailed">Data download failed</string>
+    <string name="pay_type_select_one">Selectionnez un mode de paiement</string>
+    <string name="pay_type_cash">Cash</string>
+    <string name="pay_type_mobile_phone">Téléphone portable</string>
+    <string name="pay_type_bank_transfer">Virement banquaire</string>
 </resources>
diff --git a/app/src/main/assets/JS/exact.js b/app/src/main/assets/JS/exact.js
@@ -102,7 +102,7 @@ $(document).ready(function(){
         var $mandatory = $('[required]');
         var passed = true;
         $mandatory.each(function(){
-            if($(this).val() == "" || $(this).val() == 0 || $(this).val() == null){//|| $(this).val() == 0
+            if ($(this).val() == "" || $(this).val() == 0 || $(this).val() == null) {//|| $(this).val() == 0
                 // if(sessionStorage.getItem("FamilyData") == null){
                 //     passed = false;
                 // }

diff --git a/app/src/main/graphql/org.openimis.imispolicies/CheckMutation.graphql b/app/src/main/graphql/org.openimis.imispolicies/CheckMutation.graphql
@@ -0,0 +1,10 @@
+query CheckMutation($clientMutationId: String) {
+    mutationLogs(clientMutationId:$clientMutationId, orderBy:["-requestDateTime"]) {
+        edges {
+            node {
+                status
+                error
+            }
+        }
+    }
+}
diff --git a/app/src/main/graphql/org.openimis.imispolicies/CreateFamily.graphql b/app/src/main/graphql/org.openimis.imispolicies/CreateFamily.graphql
diff --git a/app/src/main/graphql/org.openimis.imispolicies/CreateInsuree.graphql b/app/src/main/graphql/org.openimis.imispolicies/CreateInsuree.graphql
diff --git a/app/src/main/graphql/org.openimis.imispolicies/CreatePolicy.graphql b/app/src/main/graphql/org.openimis.imispolicies/CreatePolicy.graphql
diff --git a/app/src/main/graphql/org.openimis.imispolicies/CreatePremium.graphql b/app/src/main/graphql/org.openimis.imispolicies/CreatePremium.graphql
diff --git a/app/src/main/graphql/org.openimis.imispolicies/MobileEnrolment.graphql b/app/src/main/graphql/org.openimis.imispolicies/MobileEnrolment.graphql
@@ -0,0 +1,5 @@
+mutation MobileEnrolment($input: MobileEnrollmentMutationInput!) {
+    mobileEnrollment(input: $input) {
+        clientMutationId
+    }
+}
diff --git a/app/src/main/graphql/org.openimis.imispolicies/RenewPolicy.graphql b/app/src/main/graphql/org.openimis.imispolicies/RenewPolicy.graphql
@@ -1,5 +1,5 @@
-mutation RenewPolicy($input: RenewPolicyMutationInput!) {
-    renewPolicy(input: $input) {
+mutation RenewPolicy($input: MobilePolicyRenewalAndPremiumInput!) {
+    mobilePolicyRenewalAndPremium(input: $input) {
         clientMutationId
         internalId
     }

diff --git a/app/src/main/graphql/org.openimis.imispolicies/UpdateFamily.graphql b/app/src/main/graphql/org.openimis.imispolicies/UpdateFamily.graphql
diff --git a/app/src/main/graphql/org.openimis.imispolicies/UpdateInsuree.graphql b/app/src/main/graphql/org.openimis.imispolicies/UpdateInsuree.graphql
diff --git a/app/src/main/graphql/org.openimis.imispolicies/schema.graphqls b/app/src/main/graphql/org.openimis.imispolicies/schema.graphqls
diff --git a/app/src/main/java/org/openimis/imispolicies/Acquire.java b/app/src/main/java/org/openimis/imispolicies/Acquire.java
@@ -223,7 +223,8 @@ public void afterTextChanged(Editable text) {
 
         btnScan.setOnClickListener(v -> {
             try {
-                Intent intent = new Intent("com.google.zxing.client.android.SCAN");
+                Intent intent = new Intent(this, com.google.zxing.client.android.CaptureActivity.class);
+                intent.setAction("com.google.zxing.client.android.SCAN");
                 intent.putExtra("SCAN_MODE", "QR_CODE_MODE");
                 startActivityForResult(intent, SCAN_QR_REQUEST_CODE);
             } catch (ActivityNotFoundException e) {