Skip to content

Commit 3d5d826

Browse files
delcroipdelcroip
authored
Merge pull request #95 from mngoe/feature-30875
upgrade claim form
2 parents ed9c726 + be9b597 commit 3d5d826

File tree

6 files changed

+145
-86
lines changed

6 files changed

+145
-86
lines changed

‎.DS_Store‎

0 Bytes
Binary file not shown.

‎claimManagement/.DS_Store‎

6 KB
Binary file not shown.

‎claimManagement/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -215,8 +215,8 @@ dependencies {
215215
because("Apollo 3+ only works with Kotlin coroutines")
216216
}
217217
testImplementation 'junit:junit:4.12'
218-
androidTestImplementation 'androidx.test.ext:junit:1.1.1'
219-
androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0'
218+
androidTestImplementation 'androidx.test.ext:junit:1.1.5'
219+
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
220220
implementation group: 'com.squareup.picasso', name: 'picasso', version: '2.71828'
221221
implementation group: 'net.lingala.zip4j', name: 'zip4j', version: '1.2.7'
222222

‎claimManagement/src/main/AndroidManifest.xml‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,9 @@
1616
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
1717
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" /> <!-- These statements are required as these permissions will be included otherwise -->
1818
<uses-permission
19-
android:name="android.permission.READ_CALL_LOG"
20-
tools:node="remove" />
19+
android:name="android.permission.READ_CALL_LOG"/>
2120
<uses-permission
22-
android:name="android.permission.READ_CONTACTS"
23-
tools:node="remove" />
21+
android:name="android.permission.READ_CONTACTS"/>
2422

2523
<application
2624
android:name=".Global"

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

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@
2929
import androidx.annotation.NonNull;
3030
import androidx.appcompat.view.menu.MenuBuilder;
3131

32+
import com.google.android.material.textfield.TextInputLayout;
33+
3234
import org.json.JSONArray;
3335
import org.json.JSONException;
3436
import org.json.JSONObject;
@@ -79,6 +81,7 @@ public static Intent newIntent(@NonNull Context context, @NonNull String claimUU
7981
RadioButton rbEmergency, rbReferral, rbOther;
8082
ImageButton btnScan;
8183
CheckBox etPreAuthorization;
84+
TextInputLayout tfReferal;
8285

8386
@Override
8487
protected void onCreate(Bundle savedInstanceState) {
@@ -119,6 +122,7 @@ protected void onCreate(Bundle savedInstanceState) {
119122
etPreAuthorization = findViewById(R.id.etPreAuthorization);
120123
etPatientCondition = findViewById(R.id.patientCondition);
121124
etVisitType = findViewById(R.id.etVisitType);
125+
tfReferal = findViewById(R.id.tfReferal);
122126

123127
String[] visitTypes = getResources().getStringArray(R.array.visitType);
124128
ArrayAdapter<String> visitTypeAdapter = new ArrayAdapter<>(this, android.R.layout.simple_dropdown_item_1line, visitTypes);
@@ -130,19 +134,19 @@ public void onItemClick(AdapterView<?> adapterView, View view, int position, lon
130134
String item = adapterView.getItemAtPosition(position).toString();
131135
switch(item){
132136
case "Emergency":
133-
visitType = "E";
134-
etReferalHF.setVisibility(View.GONE);
137+
etVisitType.setTag("E");
138+
tfReferal.setVisibility(View.GONE);
135139
break;
136140
case "Referral":
137-
visitType = "R";
138-
etReferalHF.setVisibility(View.VISIBLE);
141+
etVisitType.setTag("R");;
142+
tfReferal.setVisibility(View.VISIBLE);
139143
break;
140144
case "Other":
141-
visitType = "O";
142-
etReferalHF.setVisibility(View.GONE);
145+
etVisitType.setTag("O");;
146+
tfReferal.setVisibility(View.GONE);
143147
break;
144148
default:
145-
visitType = "";
149+
etVisitType.setTag("");
146150
break;
147151
}
148152
}
@@ -157,16 +161,16 @@ public void onItemClick(AdapterView<?> adapterView, View view, int position, lon
157161
String item = adapterView.getItemAtPosition(position).toString();
158162
switch(item){
159163
case "Healed":
160-
patientCondition = "H";
164+
etPatientCondition.setTag("H");
161165
break;
162166
case "Deceased":
163-
patientCondition = "D";
167+
etPatientCondition.setTag("D");
164168
break;
165169
case "Escaped":
166-
patientCondition = "E";
170+
etPatientCondition.setTag("E");
167171
break;
168172
case "Referral":
169-
patientCondition = "R";
173+
etPatientCondition.setTag("R");
170174
break;
171175
}
172176
}
@@ -204,7 +208,7 @@ public void onItemClick(AdapterView<?> adapterView, View view, int position, lon
204208
etReferalHF.setOnItemClickListener(hfAdapter);
205209

206210
etPreAuthorization.setChecked(false);
207-
etReferalHF.setVisibility(View.GONE);
211+
tfReferal.setVisibility(View.GONE);
208212

209213
etStartDate.setOnTouchListener((v, event) -> {
210214
showDialog(StartDate_Dialog_ID);
@@ -446,6 +450,7 @@ private void ClearForm() {
446450
etDiagnosis4.setText("");
447451
etPreAuthorization.setChecked(false);
448452
etReferalHF.setText("");
453+
tfReferal.setVisibility(View.GONE);
449454
rgVisitType.clearCheck();
450455
etPatientCondition.setText("");
451456
etVisitType.setText("");
@@ -587,30 +592,31 @@ private void fillClaimFromDatabase(String claimUUID) {
587592

588593
switch (claimDetails.getString("VisitType")) {
589594
case "E":
590-
etVisitType.setText("Emergency");
595+
etVisitType.setText(getResources().getString(R.string.Emergency));
591596
break;
592597
case "R":
593-
etVisitType.setText("Referral");
598+
etVisitType.setText(getResources().getString(R.string.Referral));
599+
tfReferal.setVisibility(View.VISIBLE);
594600
break;
595601
case "O":
596-
etVisitType.setText("Other");
602+
etVisitType.setText(getResources().getString(R.string.Other));
597603
break;
598604
default:
599605
etVisitType.setText("");
600606
}
601607

602608
switch (claimDetails.getString("PatientCondition")) {
603609
case "H":
604-
etPatientCondition.setText("Healed");
610+
etPatientCondition.setText(getResources().getString(R.string.Healed));
605611
break;
606612
case "D":
607-
etPatientCondition.setText("Deceased");
613+
etPatientCondition.setText(getResources().getString(R.string.Deceased));
608614
break;
609615
case "E":
610-
etPatientCondition.setText("Escaped");
616+
etPatientCondition.setText(getResources().getString(R.string.Escaped));
611617
break;
612618
case "R":
613-
etPatientCondition.setText("Referral");
619+
etPatientCondition.setText(getResources().getString(R.string.Referral));
614620
break;
615621
default:
616622
etPatientCondition.setText("");
@@ -633,12 +639,6 @@ private void fillClaimFromDatabase(String claimUUID) {
633639
}
634640
tvItemTotal.setText(String.valueOf(lvItemList.size()));
635641

636-
if(etVisitType.getText().equals("Referral")){
637-
etReferalHF.setEnabled(true);
638-
}else{
639-
disableView(etReferalHF);
640-
}
641-
642642
lvServiceList.clear();
643643
if (claimObject.has("services")) {
644644
JSONArray services = claimObject.getJSONArray("services");
@@ -823,9 +823,9 @@ private boolean saveClaim() {
823823
claimCV.put("ICDCode2", etDiagnosis2.getText().toString());
824824
claimCV.put("ICDCode3", etDiagnosis3.getText().toString());
825825
claimCV.put("ICDCode4", etDiagnosis4.getText().toString());
826-
claimCV.put("VisitType", visitType);
826+
claimCV.put("VisitType", etVisitType.getTag().toString());
827827
claimCV.put("ReferalHF", etReferalHF.getText().toString());
828-
claimCV.put("PatientCondition", patientCondition);
828+
claimCV.put("PatientCondition", etPatientCondition.getTag().toString());
829829
if(etPreAuthorization.isChecked()){
830830
claimCV.put("PreAuthorization", 1);
831831
}else{

0 commit comments

Comments
 (0)