Merge branch 'develop' into OP-2533

vaneck237 · web-flow · commit 4c2b8400ad2e · 2025-10-30T10:25:58.000+01:00
diff --git a/.gitignore b/.gitignore
@@ -80,4 +80,6 @@ fastlane/readme.md
 
 # Custom product flavours
 *custom-flavours.gradle
-.DS_Store
+.DS_Store
+
+*.DS_Store
diff --git a/claimManagement/build.gradle b/claimManagement/build.gradle
@@ -27,7 +27,7 @@ android {
         minSdkVersion 26
         targetSdkVersion 32
         versionCode 4
-        versionName "2.0.5"
+        versionName "2.0.6"
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
     }
     buildTypes {
diff --git a/claimManagement/src/main/java/org/openimis/imisclaims/ClaimActivity.java b/claimManagement/src/main/java/org/openimis/imisclaims/ClaimActivity.java
@@ -7,6 +7,7 @@
 import android.content.ContentValues;
 import android.content.Context;
 import android.content.Intent;
+import android.database.Cursor;
 import android.os.Bundle;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -362,13 +363,23 @@ public boolean onOptionsItemSelected(MenuItem item) {
     private void addItem() {
         Intent addItemsIntent = new Intent(ClaimActivity.this, AddItems.class);
         addItemsIntent.putExtra(EXTRA_READONLY, isIntentReadonly());
-        ClaimActivity.this.startActivity(addItemsIntent);
+        Cursor c = sqlHandler.getMapping("I");
+        if( c != null &&  c.getCount() == 0){
+            showDialog(getResources().getString(R.string.NoItemsPricelist));
+        }else {
+            ClaimActivity.this.startActivity(addItemsIntent);
+        }
     }
 
     private  void addService() {
         Intent addServicesIntent = new Intent(this, AddServices.class);
         addServicesIntent.putExtra(EXTRA_READONLY, isIntentReadonly());
-        ClaimActivity.this.startActivity(addServicesIntent);
+        Cursor c = sqlHandler.getMapping("S");
+        if(c != null && c.getCount() == 0){
+            showDialog(getResources().getString(R.string.NoServicesPricelist));
+        }else {
+            ClaimActivity.this.startActivity(addServicesIntent);
+        }
     }
 
     @Override
diff --git a/claimManagement/src/main/java/org/openimis/imisclaims/MainActivity.java b/claimManagement/src/main/java/org/openimis/imisclaims/MainActivity.java
@@ -18,6 +18,7 @@
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
+import android.view.WindowManager;
 import android.widget.EditText;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
@@ -461,6 +462,7 @@ public boolean checkDataBase() {
     }
 
     public boolean getControls() {
+        getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
         if (global.isNetworkAvailable()) {
             String progress_message = getResources().getString(R.string.getControls);
             progressDialog = ProgressDialog.show(this, getResources().getString(R.string.initializing), progress_message);
@@ -546,8 +548,9 @@ public void validateClaimAdminCode(final String claimAdminCode) {
                     AdminName.setText(global.getOfficeName());
                 }
                 Cursor c = sqlHandler.getMapping("I");
-                if (c != null) {
-                    if (c.getCount() == 0) {
+                Cursor c1 = sqlHandler.getMapping("S");
+                if (c != null && c1 != null) {
+                    if (c.getCount() == 0 && c1.getCount() == 0) {
                         try {
                             progressDialog.dismiss();
                             doLoggedIn(() -> CheckHealthFacility(claimAdminCode, HealthFacilityName));
diff --git a/claimManagement/src/main/java/org/openimis/imisclaims/SynchronizeActivity.java b/claimManagement/src/main/java/org/openimis/imisclaims/SynchronizeActivity.java
@@ -13,6 +13,7 @@
 import android.os.Environment;
 import android.view.MenuItem;
 import android.view.View;
+import android.view.WindowManager;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 import android.widget.Toast;
@@ -210,6 +211,7 @@ public void onBackPressed() {
     }
 
     public void uploadClaims() {
+        getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
         pd = ProgressDialog.show(this, "", getResources().getString(R.string.Processing));
         SynchronizeService.uploadClaims(this);
     }
@@ -248,6 +250,7 @@ public void CheckUpdate(){
                     JSONArray jsonarray = new JSONArray(response.toString());
                     String lastVersion = "";
                     String tag_name = "";
+                    String notes = "";
                     for (int i = 0; i < jsonarray.length(); i++){
                         JSONObject releaseObj = jsonarray.getJSONObject(i);
                         if(releaseObj.getString("tag_name").equals(getResources().getString(R.string.release_tag))){
@@ -256,6 +259,7 @@ public void CheckUpdate(){
                             if(!releaseName.equals(currentVersion)){
                                 lastVersion = releaseName;
                                 updateAvailable = true;
+                                notes = releaseObj.getString("body");
                             }
                         }
                     }
@@ -264,12 +268,17 @@ public void CheckUpdate(){
                     boolean finalUpdateAvailable = updateAvailable;
                     String finalLastVersion = lastVersion;
                     String finalTagName = tag_name;
+                    String finalNotes = notes;
                     runOnUiThread(() -> {
                         pd.dismiss();
                         if (finalUpdateAvailable) {
                             new AlertDialog.Builder(this)
                                     .setTitle(getResources().getString(R.string.updateAvailable))
-                                    .setMessage(getResources().getString(R.string.newVersion) + " " + finalLastVersion )
+                                    .setMessage(
+                                            getResources().getString(R.string.newVersion) + " " + finalLastVersion + "\n \n"
+                                                    +  getResources().getString(R.string.News) + "\n"
+                                                    + "\n" + finalNotes
+                                    )
                                     .setPositiveButton(getResources().getString(R.string.download), (dialog, which) -> downloadUpdate(finalLastVersion, finalTagName))
                                     .setNegativeButton(getResources().getString(R.string.cancel), null)
                                     .show();
diff --git a/claimManagement/src/main/res/layout/activity_main.xml b/claimManagement/src/main/res/layout/activity_main.xml
@@ -6,7 +6,8 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:fitsSystemWindows="true"
-    tools:openDrawer="start">
+    tools:openDrawer="start"
+    android:keepScreenOn="false">
 
     <include
         layout="@layout/app_bar_main"
diff --git a/claimManagement/src/main/res/layout/activity_synchronize.xml b/claimManagement/src/main/res/layout/activity_synchronize.xml
@@ -5,7 +5,8 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context="org.openimis.imisclaims.SynchronizeActivity"
-    android:layout_margin="30dp">
+    android:layout_margin="30dp"
+    android:keepScreenOn="false">
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
diff --git a/claimManagement/src/main/res/values-fr/strings.xml b/claimManagement/src/main/res/values-fr/strings.xml
@@ -160,7 +160,7 @@
   <string name="reports">Rapports</string>
   <string name="map_items">Lier des prod. méd.</string>
   <string name="map_services">Lier des soins</string>
-  <string name="quit">Arrêter de fumer</string>
+  <string name="quit">Quitter</string>
   <string name="about">À propos de</string>
   <string name="home">Accueil</string>
   <string name="Enter_Credentials">Veuillez entrer votre nom d\'utilisateur et votre mot de passe</string>
@@ -217,4 +217,8 @@
   <string name="getVersion">Téléchargement version </string>
   <string name="InvalidHealthFacility">Formation sanitaire de l\'administrateur invalide</string>
   <string name="checkHfValidity">Vérification de la formation sanitaire</string>
+  <string name="NoServicesPricelist">La formation sanitaire n\'a pas de liste de prix pour les services </string>
+  <string name="NoItemsPricelist">La formation sanitaire n\'a pas de liste de prix pour les produits </string>
+  <string name="entered">Entrée</string>
+  <string name="News">Nouveautés:</string>
 </resources>
diff --git a/claimManagement/src/main/res/values/strings.xml b/claimManagement/src/main/res/values/strings.xml
@@ -253,4 +253,7 @@
     <string name="getVersion">Downloading version </string>
     <string name="InvalidHealthFacility">Invalid healthfacility for this claim admin</string>
     <string name="checkHfValidity">Check healthFacility validity</string>
+    <string name="NoServicesPricelist">This healthfacility don\'t have services pricelist</string>
+    <string name="NoItemsPricelist">This healthfacility don\'t have items pricelist</string>
+    <string name="News">New changes:</string>
 </resources>

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ android {`
`27`	`27`	`minSdkVersion 26`
`28`	`28`	`targetSdkVersion 32`
`29`	`29`	`versionCode 4`
`30`		`- versionName "2.0.5"`
	`30`	`+ versionName "2.0.6"`
`31`	`31`	`testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'`
`32`	`32`	`}`
`33`	`33`	`buildTypes {`