fix upload claim with fhir

Author: vaneck237

.DS_Store

@@ -465,7 +465,6 @@ public JSONArray getAllPendingClaims() {
             for (int i = 0; i < claims.length(); i++) {
                 JSONObject claim = claims.getJSONObject(i);
                 String ClaimUUID = (String) claim.remove("ClaimUUID");
-                Log.e("hf code", claim.getString("HFCode"));
 
                 JSONObject resultClaim = new JSONObject();
                 resultClaim.put("details", claim);

claimManagement/.DS_Store

@@ -244,7 +244,7 @@ public void CheckUpdate(){
                     reader.close();
                     connection.disconnect();
 
-                    //get lastest version
+                    //get latest version
                     JSONArray jsonarray = new JSONArray(response.toString());
                     String lastVersion = "";
                     String tag_name = "";

claimManagement/src/.DS_Store

@@ -131,10 +131,11 @@ private JSONArray processClaimResponse(List<PostNewClaims.Result> results) {
             } else {
                 if (claimResponseCode == PostNewClaims.Result.Status.REJECTED) {
                     sqlHandler.insertClaimUploadStatus(claimUUID, date, SQLHandler.CLAIM_UPLOAD_STATUS_REJECTED, null);
+                    jsonResults.put(String.format(claimResponseLine, claimCode, getResources().getString(R.string.ClaimRejected)));
                 } else {
                     sqlHandler.insertClaimUploadStatus(claimUUID, date, SQLHandler.CLAIM_UPLOAD_STATUS_ERROR, result.getMessage());
+                    jsonResults.put(String.format(claimResponseLine, claimCode, result.getMessage()));
                 }
-                jsonResults.put(String.format(claimResponseLine, claimCode, result.getMessage()));
             }
         }
         return jsonResults;

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

@@ -8,6 +8,8 @@
 import org.openimis.imisclaims.Global;
 import org.openimis.imisclaims.network.okhttp.AuthorizationInterceptor;
 
+import java.util.concurrent.TimeUnit;
+
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.TrustManager;
 import javax.net.ssl.X509TrustManager;
@@ -29,6 +31,8 @@ public static OkHttpClient getDefaultOkHttpClient() {
             synchronized (OkHttpUtils.class) {
                 if (client == null) {
                     OkHttpClient.Builder builder = new OkHttpClient.Builder();
+                    builder.readTimeout(2000, TimeUnit.SECONDS)
+                            .writeTimeout(2000, TimeUnit.SECONDS);
                     HttpLoggingInterceptor interceptor = new HttpLoggingInterceptor();
                     interceptor.setLevel(BuildConfig.DEBUG ? HttpLoggingInterceptor.Level.BODY : HttpLoggingInterceptor.Level.BASIC);
                     builder.addInterceptor(interceptor);

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

@@ -189,7 +189,6 @@
                     android:background="@drawable/corner"
                     android:fontFamily="sans-serif-light"
                     android:hint="@string/Diagnosis1"
-                    android:maxLength="6"
                     />
 
                 <AutoCompleteTextView
@@ -201,8 +200,7 @@
                     android:ems="10"
                     android:background="@drawable/corner"
                     android:fontFamily="sans-serif-light"
-                    android:hint="@string/Diagnosis2"
-                    android:maxLength="6" />
+                    android:hint="@string/Diagnosis2" />
             </LinearLayout>
 
             <LinearLayout
@@ -221,8 +219,7 @@
                     android:background="@drawable/corner"
                     android:paddingLeft="5dp"
                     android:layout_marginRight="5dp"
-                    android:hint="@string/Diagnosis3"
-                    android:maxLength="6" />
+                    android:hint="@string/Diagnosis3" />
 
                 <AutoCompleteTextView
                     android:id="@+id/etDiagnosis4"
@@ -233,8 +230,7 @@
                     android:fontFamily="sans-serif-light"
                     android:background="@drawable/corner"
                     android:paddingLeft="5dp"
-                    android:hint="@string/Diagnosis4"
-                    android:maxLength="6" />
+                    android:hint="@string/Diagnosis4" />
 
 
             </LinearLayout>

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

@@ -214,5 +214,6 @@
   <string name="haveLastVersion">Vous avez la dernière version </string>
   <string name="newVersion">Nouvelle version </string>
   <string name="claimUpdate">Mise à jour Claims</string>
-  <string name="getVersion">Téléchargement version </string>
+  <string name="getVersion">Téléchargement version</string>
+  <string name="ClaimRejected">Prestation rejetée</string>
 </resources>

claimManagement/src/main/java/org/openimis/imisclaims/network/util/OkHttpUtils.java

@@ -251,4 +251,5 @@
     <string name="newVersion">New version </string>
     <string name="claimUpdate">Update Claims</string>
     <string name="getVersion">Downloading version </string>
+    <string name="ClaimRejected">Claim rejected</string>
 </resources>