Skip to content

fix min length for chfid & cheque number #77

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
Jul 4, 2026
Merged

fix min length for chfid & cheque number #77

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
51 changes: 50 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 @@ -10,7 +10,9 @@
import android.database.Cursor;
import android.inputmethodservice.Keyboard;
import android.os.Bundle;
import android.text.Editable;
import android.text.InputType;
import android.text.TextWatcher;
import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;
Expand Down Expand Up @@ -93,7 +95,7 @@ public static Intent newIntent(@NonNull Context context, @NonNull String claimUU
RadioButton rbEmergency, rbReferral, rbOther, rbPositive, rbNegative;
ImageButton btnScan;
LinearLayout llFagepFields;
TextInputLayout ettClaimPrefix, ettGuaranteeNo;
TextInputLayout ettClaimPrefix, ettGuaranteeNo, tilCHFID;

@Override
protected void onCreate(Bundle savedInstanceState) {
Expand Down Expand Up @@ -140,6 +142,7 @@ protected void onCreate(Bundle savedInstanceState) {
etVisitType = findViewById(R.id.etVisitType);
ettClaimPrefix = findViewById(R.id.ettClaimPrefix);
ettGuaranteeNo = findViewById(R.id.ettGuaranteeNo);
tilCHFID = findViewById(R.id.tilCHFID);

String[] visitTypes = getResources().getStringArray(R.array.visitType);
ArrayAdapter<String> visitTypeAdapter = new ArrayAdapter<>(this, android.R.layout.simple_dropdown_item_1line, visitTypes);
Expand Down Expand Up @@ -340,6 +343,45 @@ public void onItemClick(AdapterView<?> adapterView, View view, int position, lon
}
});
}

etInsureeNumber.addTextChangedListener(new TextWatcher() {
@Override
public void beforeTextChanged(CharSequence s, int start, int count, int after) {}

@Override
public void onTextChanged(CharSequence s, int start, int before, int count) {}

@Override
public void afterTextChanged(Editable s) {
int length = s != null ? s.length() : 0;
if (length > 0 && length < 12) {
tilCHFID.setError(getResources().getString(R.string.minChfIdRequired));
} else {
tilCHFID.setError(null);
}
}
});

etClaimPrefix.addTextChangedListener(new TextWatcher() {
@Override
public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) {}

@Override
public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) {}

@Override
public void afterTextChanged(Editable s) {
String program = etProgram.getText().toString();
if(program.equals("Cheque Santé") || program.equals("Chèque Santé")){
int length = s != null ? s.length() : 0;
if (length > 0 && length < 6) {
ettClaimPrefix.setError(getResources().getString(R.string.minChequeNumberRequired));
} else {
ettClaimPrefix.setError(null);
}
}
}
});
}

private boolean isIntentReadonly() {
Expand Down Expand Up @@ -776,6 +818,9 @@ private boolean isValidData() {
if (etInsureeNumber.getText().length() == 0) {
showValidationDialog(etInsureeNumber, getResources().getString(R.string.MissingCHFID));
return false;
} else if(etInsureeNumber.getText().length() < 12){
showValidationDialog(etInsureeNumber, getResources().getString(R.string.minChfIdRequired));
return false;
}

/*if (!etProgram.getText().toString().equals("VIH")) {
Expand Down Expand Up @@ -832,9 +877,13 @@ private boolean isValidData() {
return false;
}

String program = etProgram.getText().toString();
if(etClaimPrefix.getText().length() == 0){
showValidationDialog(etClaimPrefix, getResources().getString(R.string.MissingChequeNumber));
return false;
} else if((program.equals("Cheque Santé") || program.equals("Chèque Santé")) && etClaimPrefix.length() < 6){
showValidationDialog(etClaimPrefix, getResources().getString(R.string.minChequeNumberRequired));
return false;
}

if(etClaimCode.getText().length() > 7){
Expand Down
14 changes: 8 additions & 6 deletions claimManagement/src/main/res/layout/activity_claim.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,21 +75,22 @@
android:orientation="horizontal">

<com.google.android.material.textfield.TextInputLayout
android:layout_width="250dp"
android:id="@+id/tilCHFID"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/CHFID"
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox">
<EditText
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
app:errorEnabled="true">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/etCHFID"
android:layout_width="match_parent"
android:layout_height="55dp"
android:layout_weight="1"
android:ems="10"
android:fontFamily="sans-serif-light"
android:inputType="text"
android:maxLength="20">
android:maxLength="20"/>
<requestFocus/>
</EditText>
</com.google.android.material.textfield.TextInputLayout>

<ImageButton
Expand Down Expand Up @@ -195,7 +196,8 @@
android:layout_height="wrap_content"
android:layout_marginBottom="10dp"
android:hint="@string/Prefix"
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox">
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
app:errorEnabled="true">
<EditText
android:id="@+id/etClaimPrefix"
android:layout_width="match_parent"
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="minChfIdRequired">Le numéro d\'assuré doit contenir minimum 12 caractères</string>
<string name="minChequeNumberRequired">Le numéro de chèque doit contenir minimum 6 caractères</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="minChfIdRequired">The insuree number must contain at least 12 characters</string>
<string name="minChequeNumberRequired">The cheque number must contain at least 6 characters</string>
</resources>
Loading