Skip to content

remove diagnosis fields #57

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vaneck237 merged 1 commit into from
Dec 16, 2025
Merged

remove diagnosis fields #57

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:7.3.1'
classpath 'com.android.tools.build:gradle:8.13.0'
classpath 'com.apollographql.apollo:apollo-gradle-plugin:2.5.14'

// NOTE: Do not place your application dependencies here; they belong
Expand Down
1 change: 1 addition & 0 deletions claimManagement/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,7 @@ android {
packagingOptions {
exclude 'META-INF/DEPENDENCIES'
}
namespace 'org.openimis.imisclaims'
}

apollo {
Expand Down
13 changes: 9 additions & 4 deletions claimManagement/src/main/java/org/openimis/imisclaims/ClaimActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import android.widget.DatePicker;
import android.widget.EditText;
import android.widget.ImageButton;
import android.widget.LinearLayout;
import android.widget.RadioButton;
import android.widget.RadioGroup;
import android.widget.TextView;
Expand Down Expand Up @@ -85,6 +86,7 @@ public static Intent newIntent(@NonNull Context context, @NonNull String claimUU
RadioButton rbEmergency, rbReferral, rbOther, rbHealed, rbDiseased, rbEscaped, rbReferal;
ImageButton btnScan;
CheckBox etPreAuthorization;
LinearLayout llDiagnosis;

@Override
protected void onCreate(Bundle savedInstanceState) {
Expand Down Expand Up @@ -130,6 +132,7 @@ protected void onCreate(Bundle savedInstanceState) {
etPreAuthorization = findViewById(R.id.etPreAuthorization);
etReferralCode = findViewById(R.id.etReferralCode);
etPrescriber = findViewById(R.id.etPrescriber);
llDiagnosis = findViewById(R.id.ll_diagnosis);

tvItemTotal.setText("0");
tvServiceTotal.setText("0");
Expand Down Expand Up @@ -168,6 +171,8 @@ protected void onCreate(Bundle savedInstanceState) {
etReferalHF.setVisibility(View.GONE);
etPreAuthorization.setVisibility(View.GONE);
etReferralCode.setVisibility(View.GONE);
etDiagnosis.setVisibility(View.GONE);
llDiagnosis.setVisibility(View.GONE);

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

if (etDiagnosis.getText().length() == 0) {
showValidationDialog(etDiagnosis, getResources().getString(R.string.MissingDisease));
return false;
}
// if (etDiagnosis.getText().length() == 0) {
// showValidationDialog(etDiagnosis, getResources().getString(R.string.MissingDisease));
// return false;
// }

if (rgVisitType.getCheckedRadioButtonId() == -1) {
showValidationDialog(rgVisitType, getResources().getString(R.string.MissingVisitType));
Expand Down
1 change: 1 addition & 0 deletions claimManagement/src/main/res/layout/activity_claim.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@
android:maxLength="8"/>

<LinearLayout
android:id="@+id/ll_diagnosis"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
Expand Down
6 changes: 3 additions & 3 deletions gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Fri Dec 03 10:17:47 CET 2021
#Thu Dec 04 17:05:34 WAT 2025
distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading