Skip to content

Commit 3907192

Browse files
committed
define min required field for chfid
1 parent 98642b0 commit 3907192

4 files changed

Lines changed: 33 additions & 8 deletions

File tree

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

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,9 @@
1010
import android.database.Cursor;
1111
import android.inputmethodservice.Keyboard;
1212
import android.os.Bundle;
13+
import android.text.Editable;
1314
import android.text.InputType;
15+
import android.text.TextWatcher;
1416
import android.view.Menu;
1517
import android.view.MenuInflater;
1618
import android.view.MenuItem;
@@ -93,7 +95,7 @@ public static Intent newIntent(@NonNull Context context, @NonNull String claimUU
9395
RadioButton rbEmergency, rbReferral, rbOther, rbPositive, rbNegative;
9496
ImageButton btnScan;
9597
LinearLayout llFagepFields;
96-
TextInputLayout ettClaimPrefix, ettGuaranteeNo;
98+
TextInputLayout ettClaimPrefix, ettGuaranteeNo, tilCHFID;
9799

98100
@Override
99101
protected void onCreate(Bundle savedInstanceState) {
@@ -140,6 +142,7 @@ protected void onCreate(Bundle savedInstanceState) {
140142
etVisitType = findViewById(R.id.etVisitType);
141143
ettClaimPrefix = findViewById(R.id.ettClaimPrefix);
142144
ettGuaranteeNo = findViewById(R.id.ettGuaranteeNo);
145+
tilCHFID = findViewById(R.id.tilCHFID);
143146

144147
String[] visitTypes = getResources().getStringArray(R.array.visitType);
145148
ArrayAdapter<String> visitTypeAdapter = new ArrayAdapter<>(this, android.R.layout.simple_dropdown_item_1line, visitTypes);
@@ -340,6 +343,24 @@ public void onItemClick(AdapterView<?> adapterView, View view, int position, lon
340343
}
341344
});
342345
}
346+
347+
etInsureeNumber.addTextChangedListener(new TextWatcher() {
348+
@Override
349+
public void beforeTextChanged(CharSequence s, int start, int count, int after) {}
350+
351+
@Override
352+
public void onTextChanged(CharSequence s, int start, int before, int count) {}
353+
354+
@Override
355+
public void afterTextChanged(Editable s) {
356+
int length = s != null ? s.length() : 0;
357+
if (length > 0 && length < 12) {
358+
tilCHFID.setError(getResources().getString(R.string.minChfIdRequired));
359+
} else {
360+
tilCHFID.setError(null);
361+
}
362+
}
363+
});
343364
}
344365

345366
private boolean isIntentReadonly() {
@@ -776,6 +797,9 @@ private boolean isValidData() {
776797
if (etInsureeNumber.getText().length() == 0) {
777798
showValidationDialog(etInsureeNumber, getResources().getString(R.string.MissingCHFID));
778799
return false;
800+
} else if(etInsureeNumber.getText().length() < 12){
801+
showValidationDialog(etInsureeNumber, getResources().getString(R.string.minChfIdRequired));
802+
return false;
779803
}
780804

781805
/*if (!etProgram.getText().toString().equals("VIH")) {

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

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -75,21 +75,20 @@
7575
android:orientation="horizontal">
7676

7777
<com.google.android.material.textfield.TextInputLayout
78-
android:layout_width="250dp"
78+
android:id="@+id/tilCHFID"
79+
android:layout_width="match_parent"
7980
android:layout_height="wrap_content"
8081
android:hint="@string/CHFID"
81-
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox">
82-
<EditText
82+
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
83+
app:errorEnabled="true">
84+
<com.google.android.material.textfield.TextInputEditText
8385
android:id="@+id/etCHFID"
8486
android:layout_width="match_parent"
8587
android:layout_height="55dp"
86-
android:layout_weight="1"
8788
android:ems="10"
8889
android:fontFamily="sans-serif-light"
8990
android:inputType="text"
90-
android:maxLength="20">
91-
<requestFocus/>
92-
</EditText>
91+
android:maxLength="20"/>
9392
</com.google.android.material.textfield.TextInputLayout>
9493

9594
<ImageButton

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -567,4 +567,5 @@
567567
<string name="newVersion">Nouvelle version </string>
568568
<string name="invalidDisease">Code de diagnostic invalide</string>
569569
<string name="InvalidProgram">Le programme saisi est invalide</string>
570+
<string name="minChfIdRequired">Le numéro d\'assuré doit contenir minimum 12 caractères</string>
570571
</resources>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -251,4 +251,5 @@
251251
<string name="newVersion">New version </string>
252252
<string name="invalidDisease">Invalid disease code</string>
253253
<string name="InvalidProgram">Invalid program</string>
254+
<string name="minChfIdRequired">The insuree number must contain at least 12 characters</string>
254255
</resources>

0 commit comments

Comments
 (0)