Skip to content

fix print message when claim rejected #130

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vaneck237 wants to merge 1 commit into
base: develop
Choose a base branch
from
+22 −11
Open

fix print message when claim rejected #130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions claimManagement/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,7 @@ android {
returnDefaultValues = true
}
}
namespace 'org.openimis.imisclaims'
}

apollo {
Expand Down
3 changes: 1 addition & 2 deletions claimManagement/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="org.openimis.imisclaims">
xmlns:tools="http://schemas.android.com/tools">

<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
Expand Down
5 changes: 3 additions & 2 deletions claimManagement/src/main/java/org/openimis/imisclaims/SynchronizeService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ protected void handleUploadClaims() {
if (postNewClaims == null) {
postNewClaims = new PostNewClaims();
}
List<PostNewClaims.Result> results = postNewClaims.execute(PendingClaim.fromJson(claims));
List<PostNewClaims.Result> results = postNewClaims.execute(this,PendingClaim.fromJson(claims));
JSONArray claimStatus = processClaimResponse(results);
broadcastSyncSuccess(claimStatus);
} catch (Exception e) {
Expand All @@ -142,10 +142,11 @@ protected 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;
Expand Down
7 changes: 5 additions & 2 deletions claimManagement/src/main/java/org/openimis/imisclaims/usecase/PostNewClaims.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
package org.openimis.imisclaims.usecase;

import android.content.Context;

import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.WorkerThread;

import org.json.JSONException;
import org.json.JSONObject;
import org.openimis.imisclaims.R;
import org.openimis.imisclaims.domain.entity.PendingClaim;
import org.openimis.imisclaims.network.exception.HttpException;
import org.openimis.imisclaims.network.request.PostNewClaimRequest;
Expand All @@ -29,7 +32,7 @@ public PostNewClaims(
}

@WorkerThread
public List<Result> execute(@NonNull List<PendingClaim> pendingClaims) throws Exception {
public List<Result> execute(@NonNull Context context, @NonNull List<PendingClaim> pendingClaims) throws Exception {
List<Result> results = new ArrayList<>();
for (PendingClaim pendingClaim : pendingClaims) {
try {
Expand All @@ -38,7 +41,7 @@ public List<Result> execute(@NonNull List<PendingClaim> pendingClaims) throws Ex
new Result(
/* claimCode = */ pendingClaim.getClaimCode(),
/* status = */ isAccepted ? Result.Status.SUCCESS : Result.Status.REJECTED,
/* message = */ null
/* message = */ isAccepted ? context.getResources().getString(R.string.ClaimAccepted) : context.getResources().getString(R.string.ClaimRejected)
)
);
} catch (HttpException e) {
Expand Down
10 changes: 5 additions & 5 deletions claimManagement/src/main/res/layout/activity_claim.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
android:layout_height="50dp"
android:ems="10"
android:fontFamily="sans-serif-light"
android:maxLength="8"></EditText>
android:maxLength="8"/>
</com.google.android.material.textfield.TextInputLayout>


Expand All @@ -52,7 +52,7 @@
android:layout_height="50dp"
android:ems="10"
android:fontFamily="sans-serif-light"
android:maxLength="8"></EditText>
android:maxLength="8"/>
</com.google.android.material.textfield.TextInputLayout>

<com.google.android.material.textfield.TextInputLayout
Expand Down Expand Up @@ -84,7 +84,7 @@
android:layout_height="50dp"
android:ems="10"
android:fontFamily="sans-serif-light"
android:maxLength="8"></EditText>
android:maxLength="8"/>
</com.google.android.material.textfield.TextInputLayout>

<LinearLayout
Expand All @@ -105,8 +105,8 @@
android:layout_weight="1"
android:ems="10"
android:fontFamily="sans-serif-light"
android:inputType="number"
android:maxLength="12"></EditText>
android:inputType="text"
android:maxLength="12"/>

</com.google.android.material.textfield.TextInputLayout>

Expand Down
2 changes: 2 additions & 0 deletions claimManagement/src/main/res/values-fr/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,4 +221,6 @@
<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>
<string name="ClaimAccepted">Prestation acceptée</string>
<string name="ClaimRejected">Prestation rejetée</string>
</resources>
2 changes: 2 additions & 0 deletions claimManagement/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,4 +256,6 @@
<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>
<string name="ClaimAccepted">Claim accepted</string>
<string name="ClaimRejected">Claim rejected</string>
</resources>
3 changes: 3 additions & 0 deletions gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
android.defaults.buildfeatures.buildconfig=true
android.enableJetifier=true
android.nonFinalResIds=false
android.nonTransitiveRClass=false
android.useAndroidX=true
Loading