Skip to content

fix save invalid disease code #132

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
Open

fix save invalid disease code #132

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
23 changes: 22 additions & 1 deletion claimManagement/src/main/java/org/openimis/imisclaims/ClaimActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
import java.util.Calendar;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.UUID;

public class ClaimActivity extends ImisActivity {
Expand Down Expand Up @@ -236,7 +237,7 @@ public void onItemClick(AdapterView<?> adapterView, View view, int position, lon
btnPost.setOnClickListener(v -> {
progressDialog = ProgressDialog.show(this, "", getResources().getString(R.string.Processing));
runOnNewThread(
() -> isValidData() && saveClaim(),
() -> isValidData() && isValidDiagnosis() && saveClaim(),
() -> runOnUiThread(() -> {
ClearForm();
progressDialog.dismiss();
Expand Down Expand Up @@ -793,6 +794,26 @@ protected boolean isValidData() {
return true;
}

private boolean isValidDiagnosis(){
List<AutoCompleteTextView> diagnosisList = new ArrayList<>();
diagnosisList.add(etDiagnosis);
diagnosisList.add(etDiagnosis1);
diagnosisList.add(etDiagnosis2);
diagnosisList.add(etDiagnosis3);
diagnosisList.add(etDiagnosis4);

for(AutoCompleteTextView diagnosis : diagnosisList){
if(!diagnosis.getText().toString().isEmpty()){
String name = sqlHandler.getReferenceName(diagnosis.getText().toString());
if(name.equals(getResources().getString(R.string.Unknown))){
showValidationDialog(diagnosis, getResources().getString(R.string.invalidDisease));
return false;
}
}
}
return true;
}

protected boolean isValidInsureeNumber() {
Escape escape = new Escape();
return escape.CheckCHFID(etInsureeNumber.getText().toString());
Expand Down
1 change: 1 addition & 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,5 @@
<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="invalidDisease">Code de diagnostic invalide</string>
</resources>
1 change: 1 addition & 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,5 @@
<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="invalidDisease">Invalid disease code</string>
</resources>
Loading