Skip to content

Commit 3ddb152

Browse files
committed
remove diagnosis fields
1 parent 75b1167 commit 3ddb152

10 files changed

Lines changed: 310 additions & 213 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/AndroidManifest.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
xmlns:tools="http://schemas.android.com/tools"
4-
package="org.openimis.imisclaims">
3+
xmlns:tools="http://schemas.android.com/tools">
54

65
<uses-permission android:name="android.permission.INTERNET" />
76
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />

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");
@@ -158,6 +161,8 @@ protected void onCreate(Bundle savedInstanceState) {
158161
etDiagnosis2.setVisibility(View.GONE);
159162
etDiagnosis3.setVisibility(View.GONE);
160163
etDiagnosis4.setVisibility(View.GONE);
164+
etDiagnosis.setVisibility(View.GONE);
165+
llDiagnosis.setVisibility(View.GONE);
161166

162167
HFAdapter hfAdapter = new HFAdapter(ClaimActivity.this, sqlHandler);
163168
etReferalHF.setAdapter(hfAdapter);
@@ -791,10 +796,10 @@ private boolean isValidData() {
791796
Log.e(LOG_TAG, "Error while parsing dates", e);
792797
}
793798

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

799804
if (rgVisitType.getCheckedRadioButtonId() == -1) {
800805
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
@@ -123,6 +123,7 @@
123123
android:hint="@string/Diagnosis"></AutoCompleteTextView>
124124

125125
<LinearLayout
126+
android:id="@+id/ll_diagnosis"
126127
android:layout_width="match_parent"
127128
android:layout_height="69dp"
128129
android:orientation="horizontal">

gradle.properties

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,5 @@
1+
android.defaults.buildfeatures.buildconfig=true
12
android.enableJetifier=true
3+
android.nonFinalResIds=false
4+
android.nonTransitiveRClass=false
25
android.useAndroidX=true

gradle/wrapper/gradle-wrapper.jar

-6.28 KB
Binary file not shown.
Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
#Fri Dec 03 10:17:47 CET 2021
21
distributionBase=GRADLE_USER_HOME
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
42
distributionPath=wrapper/dists
5-
zipStorePath=wrapper/dists
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
4+
networkTimeout=10000
5+
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME
7+
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)