Skip to content

Commit 2157db8

Browse files
committed
fix save invalid disease code
1 parent e530891 commit 2157db8

3 files changed

Lines changed: 24 additions & 1 deletion

File tree

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

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@
4444
import java.util.Calendar;
4545
import java.util.Date;
4646
import java.util.HashMap;
47+
import java.util.List;
4748
import java.util.UUID;
4849

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

797+
private boolean isValidDiagnosis(){
798+
List<AutoCompleteTextView> diagnosisList = new ArrayList<>();
799+
diagnosisList.add(etDiagnosis);
800+
diagnosisList.add(etDiagnosis1);
801+
diagnosisList.add(etDiagnosis2);
802+
diagnosisList.add(etDiagnosis3);
803+
diagnosisList.add(etDiagnosis4);
804+
805+
for(AutoCompleteTextView diagnosis : diagnosisList){
806+
if(!diagnosis.getText().toString().isEmpty()){
807+
String name = sqlHandler.getReferenceName(diagnosis.getText().toString());
808+
if(name.equals(getResources().getString(R.string.Unknown))){
809+
showValidationDialog(diagnosis, getResources().getString(R.string.invalidDisease));
810+
return false;
811+
}
812+
}
813+
}
814+
return true;
815+
}
816+
796817
protected boolean isValidInsureeNumber() {
797818
Escape escape = new Escape();
798819
return escape.CheckCHFID(etInsureeNumber.getText().toString());

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -221,4 +221,5 @@
221221
<string name="NoItemsPricelist">La formation sanitaire n\'a pas de liste de prix pour les produits </string>
222222
<string name="entered">Entrée</string>
223223
<string name="News">Nouveautés:</string>
224+
<string name="invalidDisease">Code de diagnostic invalide</string>
224225
</resources>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -256,4 +256,5 @@
256256
<string name="NoServicesPricelist">This healthfacility don\'t have services pricelist</string>
257257
<string name="NoItemsPricelist">This healthfacility don\'t have items pricelist</string>
258258
<string name="News">New changes:</string>
259+
<string name="invalidDisease">Invalid disease code</string>
259260
</resources>

0 commit comments

Comments
 (0)