Skip to content

Commit 7763acc

Browse files
authored
Merge pull request #57 from mngoe/feature-34768-test
remove diagnosis fields
2 parents a17a3c0 + fa8451a commit 7763acc

5 files changed

Lines changed: 15 additions & 8 deletions

File tree

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ buildscript {
77
mavenCentral()
88
}
99
dependencies {
10-
classpath 'com.android.tools.build:gradle:7.3.1'
10+
classpath 'com.android.tools.build:gradle:8.13.0'
1111
classpath 'com.apollographql.apollo:apollo-gradle-plugin:2.5.14'
1212

1313
// NOTE: Do not place your application dependencies here; they belong

claimManagement/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,7 @@ android {
189189
packagingOptions {
190190
exclude 'META-INF/DEPENDENCIES'
191191
}
192+
namespace 'org.openimis.imisclaims'
192193
}
193194

194195
apollo {

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

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import android.widget.DatePicker;
2323
import android.widget.EditText;
2424
import android.widget.ImageButton;
25+
import android.widget.LinearLayout;
2526
import android.widget.RadioButton;
2627
import android.widget.RadioGroup;
2728
import android.widget.TextView;
@@ -85,6 +86,7 @@ public static Intent newIntent(@NonNull Context context, @NonNull String claimUU
8586
RadioButton rbEmergency, rbReferral, rbOther, rbHealed, rbDiseased, rbEscaped, rbReferal;
8687
ImageButton btnScan;
8788
CheckBox etPreAuthorization;
89+
LinearLayout llDiagnosis;
8890

8991
@Override
9092
protected void onCreate(Bundle savedInstanceState) {
@@ -130,6 +132,7 @@ protected void onCreate(Bundle savedInstanceState) {
130132
etPreAuthorization = findViewById(R.id.etPreAuthorization);
131133
etReferralCode = findViewById(R.id.etReferralCode);
132134
etPrescriber = findViewById(R.id.etPrescriber);
135+
llDiagnosis = findViewById(R.id.ll_diagnosis);
133136

134137
tvItemTotal.setText("0");
135138
tvServiceTotal.setText("0");
@@ -168,6 +171,8 @@ protected void onCreate(Bundle savedInstanceState) {
168171
etReferalHF.setVisibility(View.GONE);
169172
etPreAuthorization.setVisibility(View.GONE);
170173
etReferralCode.setVisibility(View.GONE);
174+
etDiagnosis.setVisibility(View.GONE);
175+
llDiagnosis.setVisibility(View.GONE);
171176

172177
rgVisitType.setOnCheckedChangeListener((radioGroup, i) -> {
173178
if(radioGroup.getCheckedRadioButtonId() == R.id.rbReferral){
@@ -792,10 +797,10 @@ private boolean isValidData() {
792797
Log.e(LOG_TAG, "Error while parsing dates", e);
793798
}
794799

795-
if (etDiagnosis.getText().length() == 0) {
796-
showValidationDialog(etDiagnosis, getResources().getString(R.string.MissingDisease));
797-
return false;
798-
}
800+
// if (etDiagnosis.getText().length() == 0) {
801+
// showValidationDialog(etDiagnosis, getResources().getString(R.string.MissingDisease));
802+
// return false;
803+
// }
799804

800805
if (rgVisitType.getCheckedRadioButtonId() == -1) {
801806
showValidationDialog(rgVisitType, getResources().getString(R.string.MissingVisitType));

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@
9090
android:maxLength="8"/>
9191

9292
<LinearLayout
93+
android:id="@+id/ll_diagnosis"
9394
android:layout_width="match_parent"
9495
android:layout_height="wrap_content"
9596
android:orientation="horizontal">
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Fri Dec 03 10:17:47 CET 2021
1+
#Thu Dec 04 17:05:34 WAT 2025
22
distributionBase=GRADLE_USER_HOME
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
43
distributionPath=wrapper/dists
5-
zipStorePath=wrapper/dists
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
65
zipStoreBase=GRADLE_USER_HOME
6+
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)