Skip to content

Commit 27b39d0

Browse files
committed
define min required length for cheque number field
1 parent 3907192 commit 27b39d0

4 files changed

Lines changed: 29 additions & 1 deletion

File tree

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

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -361,6 +361,27 @@ public void afterTextChanged(Editable s) {
361361
}
362362
}
363363
});
364+
365+
etClaimPrefix.addTextChangedListener(new TextWatcher() {
366+
@Override
367+
public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) {}
368+
369+
@Override
370+
public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) {}
371+
372+
@Override
373+
public void afterTextChanged(Editable s) {
374+
String program = etProgram.getText().toString();
375+
if(program.equals("Cheque Santé") || program.equals("Chèque Santé")){
376+
int length = s != null ? s.length() : 0;
377+
if (length > 0 && length < 6) {
378+
ettClaimPrefix.setError(getResources().getString(R.string.minChequeNumberRequired));
379+
} else {
380+
ettClaimPrefix.setError(null);
381+
}
382+
}
383+
}
384+
});
364385
}
365386

366387
private boolean isIntentReadonly() {
@@ -861,9 +882,13 @@ private boolean isValidData() {
861882
return false;
862883
}
863884

885+
String program = etProgram.getText().toString();
864886
if(etClaimPrefix.getText().length() == 0){
865887
showValidationDialog(etClaimPrefix, getResources().getString(R.string.MissingChequeNumber));
866888
return false;
889+
} else if((program.equals("Cheque Santé") || program.equals("Chèque Santé")) && etClaimPrefix.length() < 6){
890+
showValidationDialog(etClaimPrefix, getResources().getString(R.string.minChequeNumberRequired));
891+
return false;
867892
}
868893

869894
if(etClaimCode.getText().length() > 7){

claimManagement/src/main/res/layout/activity_claim.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,8 @@
194194
android:layout_height="wrap_content"
195195
android:layout_marginBottom="10dp"
196196
android:hint="@string/Prefix"
197-
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox">
197+
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
198+
app:errorEnabled="true">
198199
<EditText
199200
android:id="@+id/etClaimPrefix"
200201
android:layout_width="match_parent"

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -568,4 +568,5 @@
568568
<string name="invalidDisease">Code de diagnostic invalide</string>
569569
<string name="InvalidProgram">Le programme saisi est invalide</string>
570570
<string name="minChfIdRequired">Le numéro d\'assuré doit contenir minimum 12 caractères</string>
571+
<string name="minChequeNumberRequired">Le numéro de chèque doit contenir minimum 6 caractères</string>
571572
</resources>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -252,4 +252,5 @@
252252
<string name="invalidDisease">Invalid disease code</string>
253253
<string name="InvalidProgram">Invalid program</string>
254254
<string name="minChfIdRequired">The insuree number must contain at least 12 characters</string>
255+
<string name="minChequeNumberRequired">The cheque number must contain at least 6 characters</string>
255256
</resources>

0 commit comments

Comments
 (0)