Skip to content

OTC-587: Null on the claim admin application #68

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
delcroip merged 1 commit into from
May 30, 2022
Merged

OTC-587: Null on the claim admin application #68

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
3 changes: 2 additions & 1 deletion claimManagement/src/main/java/org/openimis/imisclaims/ImisActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,8 +175,9 @@ private AlertDialog showLoginDialogBox(Runnable onLoggedIn, Runnable onCancel) {
final TextView username = promptsView.findViewById(R.id.UserName);
final TextView password = promptsView.findViewById(R.id.Password);


String officer_code = ((Global) getApplicationContext()).getOfficerCode();
username.setText(String.valueOf(officer_code));
username.setText(officer_code != null ? officer_code : "");

// set dialog message
alertDialogBuilder
Expand Down
6 changes: 3 additions & 3 deletions claimManagement/src/main/java/org/openimis/imisclaims/MainActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -517,8 +517,8 @@ public void validateClaimAdminCode(final String claimAdminCode) {
Toast.makeText(getBaseContext(), R.string.MissingClaimAdmin, Toast.LENGTH_LONG).show();
ClaimAdminDialogBox();
} else {
String ClaimName = sqlHandler.getClaimAdminInfo(claimAdminCode, sqlHandler.CA_NAME_COLUMN);
String HealthFacilityName = sqlHandler.getClaimAdminInfo(claimAdminCode, sqlHandler.CA_HF_CODE_COLUMN);
String ClaimName = sqlHandler.getClaimAdminInfo(claimAdminCode, SQLHandler.CA_NAME_COLUMN);
String HealthFacilityName = sqlHandler.getClaimAdminInfo(claimAdminCode, SQLHandler.CA_HF_CODE_COLUMN);
if (ClaimName.equals("")) {
Toast.makeText(MainActivity.this, getResources().getString(R.string.invalidClaimAdminCode), Toast.LENGTH_LONG).show();
ClaimAdminDialogBox();
Expand All @@ -527,7 +527,7 @@ public void validateClaimAdminCode(final String claimAdminCode) {
global.setOfficerCode(claimAdminCode);
global.setOfficerName(ClaimName);
global.setOfficerHealthFacility(HealthFacilityName);
AdminName = (TextView) findViewById(R.id.AdminName);
AdminName = findViewById(R.id.AdminName);
AdminName.setText(global.getOfficeName());
Cursor c = sqlHandler.getMapping("I");
if (c.getCount() == 0) {
Expand Down
5 changes: 2 additions & 3 deletions claimManagement/src/main/java/org/openimis/imisclaims/SQLHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,9 +254,8 @@ public boolean checkIfAny(String table) {

public String getClaimAdminInfo(String Code, String column) {
String Info = "";
try {
String query = "SELECT " + column + " FROM tblClaimAdmins WHERE upper(Code) like '" + Code.toUpperCase() + "'";
Cursor cursor1 = db.rawQuery(query, null);
String query = "SELECT " + column + " FROM tblClaimAdmins WHERE upper(Code) like '" + Code.toUpperCase() + "'";
try (Cursor cursor1 = db.rawQuery(query, null)){
// looping through all rows
if (cursor1.moveToFirst()) {
do {
Expand Down
12 changes: 6 additions & 6 deletions claimManagement/src/main/res/menu/activity_main_drawer.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,17 +41,17 @@
android:icon="@drawable/mapservices"
android:title="@string/retrieve" />
<item
android:id="@+id/nav_quit"
android:icon="@drawable/ic_quit1"
android:title="@string/quit" />
android:id="@+id/nav_settings"
android:icon="@drawable/settings"
android:title="@string/settings" />
<item
android:id="@+id/nav_about"
android:icon="@drawable/ic_about1"
android:title="@string/about" />
<item
android:id="@+id/nav_settings"
android:icon="@drawable/settings"
android:title="@string/settings" />
android:id="@+id/nav_quit"
android:icon="@drawable/ic_quit1"
android:title="@string/quit" />
</group>

</menu>