Merge pull request openimis#88 from openimis/feature/OP-2297

OP-2297 Claims App shows extra claims for every failed sumbit attempt

Author: delcroip

claimManagement/build.gradle

@@ -118,7 +118,7 @@ android {
         local {
             applicationIdSuffix ".local"
             resValue "string", "app_name_claims", "Claims Local"
-            buildConfigField "String", "API_BASE_URL", '"http://10.0.2.2:35787/"'
+            buildConfigField "String", "API_BASE_URL", '"http:/10.0.2.2:8000/"'
             dimension 'std'
         }
         cli {

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

@@ -564,9 +564,16 @@ public String getClaimUUIDForCode(@NonNull String claimCode) {
     @NonNull
     public JSONObject getClaimCounts() {
         JSONArray claimCounts = getQueryResultAsJsonArray(
-                "SELECT CASE WHEN cus.UploadStatus IS NULL OR cus.UploadStatus = ? THEN ? ELSE cus.UploadStatus END AS Status, count(*) AS Amount" +
-                        " FROM tblClaimDetails cd LEFT JOIN tblClaimUploadStatus cus on cd.ClaimUUID=cus.ClaimUUID" +
-                        " GROUP BY Status",
+                "WITH LatestStatus AS (\n" +
+                        "    SELECT ClaimUUID, UploadStatus, MAX(cus.UploadDate) from tblClaimUploadStatus cus GROUP BY cus.ClaimUUID\n" +
+                        ")\n" +
+                        "SELECT \n" +
+                        "    CASE WHEN ls.UploadStatus IS NULL OR ls.UploadStatus = ? THEN ? ELSE ls.UploadStatus END AS Status, \n" +
+                        "    count(*) AS Amount\n" +
+                        "FROM \n" +
+                        "    tblClaimDetails cd \n" +
+                        "    LEFT JOIN LatestStatus ls on cd.ClaimUUID=ls.ClaimUUID\n" +
+                        "GROUP BY Status;",
                 new String[]{CLAIM_UPLOAD_STATUS_ERROR, CLAIM_UPLOAD_STATUS_ENTERED}
         );