Merge pull request #73 from mngoe/feature-36775-hotfix

fix save invalid diagnosis

Author: mngoe

claimManagement/build.gradle

@@ -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 {

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

@@ -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();
@@ -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;
@@ -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) {

claimManagement/src/main/res/values-fr/strings.xml

@@ -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>

claimManagement/src/main/res/values/strings.xml

@@ -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>