Skip to content

Commit d919616

Browse files
vaneck237vaneck237
committed
fix claim form
1 parent 40bdb81 commit d919616

5 files changed

Lines changed: 63 additions & 27 deletions

File tree

‎claimManagement/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ android {
2727
minSdkVersion 23
2828
targetSdkVersion 32
2929
versionCode 4
30-
versionName "1.1.0"
30+
versionName "1.1.1"
3131
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
3232
}
3333
buildTypes {

‎claimManagement/src/comoresDev/res/values-fr/strings.xml‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<resources>
3+
<string name="PatientCondition">État du patient à la sortie</string>
4+
<string name="Healed">Guéri</string>
5+
<string name="Deceased">Décédé</string>
6+
<string name="Escaped">Évadé</string>
7+
<string name="preAuthorization">Pré-Autorisation</string>
8+
<string name="ReferralCode">Code de référence</string>
9+
<string name="MissingReferralCode">Veuillez entrer le code de référence</string>
10+
<string name="MissingPatientCondition">Sélectionnez l\'état du patient à la sortie</string>
11+
<string name="Reference">Référence</string>
12+
<string name="ReferalHF">Référence des structures de santé</string>
13+
<string name="ConfirmDeleteClaim">Voulez-vous supprimer cette prestation?</string>
14+
<string name="Item">Médicament ou dispositif</string>
15+
<string name="Service">Services de santé</string>
16+
<string name="ClaimCode">Numéro de facture</string>
17+
<string name="Diagnosis">Diagnostic Principal</string>
18+
<string name="DeleteClaim">Supprimer la prestation</string>
19+
</resources>

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

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,10 @@ protected void onCreate(Bundle savedInstanceState) {
145145
etDiagnosis4.setThreshold(1);
146146
etDiagnosis4.setOnItemClickListener(adapter);
147147

148+
etDiagnosis2.setVisibility(View.GONE);
149+
etDiagnosis3.setVisibility(View.GONE);
150+
etDiagnosis4.setVisibility(View.GONE);
151+
148152
HFAdapter hfAdapter = new HFAdapter(ClaimActivity.this, sqlHandler);
149153
etReferalHF.setAdapter(hfAdapter);
150154
etReferalHF.setThreshold(1);
@@ -262,7 +266,7 @@ private void confirmDelete() {
262266
} else {
263267
Log.e(LOG_TAG, "Delete claim invoked, but no claim UUID");
264268
}
265-
});
269+
}).setCancelable(true);
266270
}
267271

268272
private void confirmArchive() {
@@ -740,6 +744,11 @@ private boolean isValidData() {
740744
}
741745
}
742746

747+
if(rgPatientCondition.getCheckedRadioButtonId() == -1){
748+
showValidationDialog(rgVisitType, getResources().getString(R.string.MissingPatientCondition));
749+
return false;
750+
}
751+
743752
return true;
744753
}
745754

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

Lines changed: 31 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -39,29 +39,7 @@
3939
android:ems="10"
4040
android:fontFamily="sans-serif-light"
4141
android:hint="@string/ClaimAdmin"
42-
android:maxLength="8"></EditText>
43-
44-
<EditText
45-
android:id="@+id/etClaimCode"
46-
android:layout_width="match_parent"
47-
android:layout_height="wrap_content"
48-
android:ems="10"
49-
android:fontFamily="sans-serif-light"
50-
android:hint="@string/ClaimCode"
51-
android:maxLength="8">
52-
53-
<requestFocus />
54-
</EditText>
55-
56-
<EditText
57-
android:id="@+id/etGuaranteeNo"
58-
android:layout_width="match_parent"
59-
android:layout_height="wrap_content"
60-
android:ems="10"
61-
android:fontFamily="sans-serif-light"
62-
android:hint="@string/GuaranteeNo"
63-
64-
android:maxLength="8"></EditText>
42+
android:maxLength="8"/>
6543

6644
<LinearLayout
6745
android:layout_width="match_parent"
@@ -77,7 +55,7 @@
7755
android:fontFamily="sans-serif-light"
7856
android:hint="@string/CHFID"
7957
android:inputType="number"
80-
android:maxLength="12"></EditText>
58+
android:maxLength="12"/>
8159

8260
<ImageButton
8361
android:id="@+id/btnScan"
@@ -90,6 +68,26 @@
9068

9169
</LinearLayout>
9270

71+
<EditText
72+
android:id="@+id/etClaimCode"
73+
android:layout_width="match_parent"
74+
android:layout_height="wrap_content"
75+
android:ems="10"
76+
android:fontFamily="sans-serif-light"
77+
android:hint="@string/ClaimCode"
78+
android:maxLength="8">
79+
<requestFocus />
80+
</EditText>
81+
82+
<EditText
83+
android:id="@+id/etGuaranteeNo"
84+
android:layout_width="match_parent"
85+
android:layout_height="wrap_content"
86+
android:ems="10"
87+
android:fontFamily="sans-serif-light"
88+
android:hint="@string/GuaranteeNo"
89+
android:maxLength="8"/>
90+
9391
<LinearLayout
9492
android:layout_width="match_parent"
9593
android:layout_height="wrap_content"
@@ -184,6 +182,12 @@
184182

185183
</LinearLayout>
186184

185+
<TextView
186+
android:layout_width="wrap_content"
187+
android:layout_height="wrap_content"
188+
android:layout_marginTop="10dp"
189+
android:text="@string/VisitType"/>
190+
187191
<RadioGroup
188192
android:id="@+id/rgVisitType"
189193
android:layout_width="wrap_content"
@@ -201,7 +205,7 @@
201205
android:layout_width="wrap_content"
202206
android:layout_height="wrap_content"
203207
android:tag="R"
204-
android:text="@string/Referral" />
208+
android:text="@string/Reference" />
205209

206210
<RadioButton
207211
android:id="@+id/rbOther"
@@ -233,11 +237,13 @@
233237
android:id="@+id/etPreAuthorization"
234238
android:layout_width="wrap_content"
235239
android:layout_height="wrap_content"
240+
android:layout_marginTop="10dp"
236241
android:text="@string/preAuthorization"/>
237242

238243
<TextView
239244
android:layout_width="wrap_content"
240245
android:layout_height="wrap_content"
246+
android:layout_marginTop="10dp"
241247
android:text="@string/PatientCondition"/>
242248
<RadioGroup
243249
android:id="@+id/rgPatientCondition"

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -240,4 +240,6 @@
240240
<string name="Escaped">Escaped</string>
241241
<string name="ReferralCode">Referral Code</string>
242242
<string name="MissingReferralCode">Please enter a referral Code</string>
243+
<string name="Reference">Reference</string>
244+
<string name="MissingPatientCondition">Please select patient condition at discharge</string>
243245
</resources>

0 commit comments

Comments
 (0)