Skip to content

fix save invalid diagnosis #73

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

Merged
mngoe merged 1 commit into from
Jun 11, 2026
Merged

fix save invalid diagnosis #73

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
2 changes: 1 addition & 1 deletion claimManagement/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ android {
minSdkVersion 26
targetSdkVersion 32
versionCode 4
versionName System.getenv("APP_VERSION") ?: "2.3.9"
versionName System.getenv("APP_VERSION") ?: "2.4.0"
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
}
buildTypes {
Expand Down
32 changes: 31 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 @@ -267,7 +267,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 @@ -832,6 +832,11 @@ private boolean isValidData() {
return false;
}

if(!isValidProgram()){
showValidationDialog(etProgram, getResources().getString(R.string.InvalidProgram));
return false;
}

if(etClaimPrefix.getText().length() == 0){
showValidationDialog(etClaimPrefix, getResources().getString(R.string.MissingChequeNumber));
return false;
Expand Down Expand Up @@ -875,6 +880,31 @@ private boolean isValidInsureeNumber() {
return escape.CheckCHFID(etInsureeNumber.getText().toString());
}

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()){
int diagnosisId = sqlHandler.getDiagnosisId(diagnosis.getText().toString());
if(diagnosisId == 0){
showValidationDialog(diagnosis, getResources().getString(R.string.invalidDisease));
return false;
}
}
}
return true;
}

private boolean isValidProgram(){
int programId = sqlHandler.getProgamId(etProgram.getText().toString());
return programId != 0;
}

protected void showValidationDialog(View view, String msg) {
runOnUiThread(() -> showDialog(msg, (dialog, which) -> {
if (view instanceof EditText) {
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 @@ -565,4 +565,6 @@
<string name="updateAvailable">Mise à jour disponible</string>
<string name="haveLastVersion">Vous avez la dernière version </string>
<string name="newVersion">Nouvelle version </string>
<string name="invalidDisease">Code de diagnostic invalide</string>
<string name="InvalidProgram">Le programme saisi est invalide</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 @@ -249,4 +249,6 @@
<string name="updateAvailable">Update available</string>
<string name="haveLastVersion">You have the last version </string>
<string name="newVersion">New version </string>
<string name="invalidDisease">Invalid disease code</string>
<string name="InvalidProgram">Invalid program</string>
</resources>
Loading