Merge branch 'develop' into feature-33539

Author: vaneck237

.gitignore

@@ -86,4 +86,5 @@ fastlane/readme.md
 
 .DS_Store
 *.properties
-./gradle
+./gradle
+*.DS_Store

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

claimManagement/src/main/java/org/openimis/imisclaims/MainActivity.java

@@ -557,8 +557,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(() -> DownLoadDiagnosesServicesItems(claimAdminCode));

claimManagement/src/main/java/org/openimis/imisclaims/SynchronizeActivity.java

@@ -253,6 +253,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))){
@@ -261,6 +262,7 @@ public void CheckUpdate(){
                             if(!releaseName.equals(currentVersion)){
                                 lastVersion = releaseName;
                                 updateAvailable = true;
+                                notes = releaseObj.getString("body");
                             }
                         }
                     }
@@ -269,12 +271,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();

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>
@@ -215,4 +215,8 @@
   <string name="newVersion">Nouvelle version </string>
   <string name="claimUpdate">Mise à jour Claims</string>
   <string name="getVersion">Téléchargement version </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>

claimManagement/src/main/res/values/strings.xml

@@ -251,4 +251,7 @@
     <string name="newVersion">New version </string>
     <string name="claimUpdate">Update Claims</string>
     <string name="getVersion">Downloading version </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>