Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
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
3 changes: 2 additions & 1 deletion claimManagement/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ android {
demoProd {
applicationIdSuffix ".demoProd"
resValue "string", "app_name_claims", "Claims Demo"
buildConfigField "String", "API_BASE_URL", '"http://demo.openimis.org/"'
buildConfigField "String", "API_BASE_URL", '"https://demo.openimis.org/"'
dimension 'std'
}

Expand Down Expand Up @@ -180,6 +180,7 @@ android {
packagingOptions {
exclude 'META-INF/DEPENDENCIES'
}
namespace 'org.openimis.imisclaims'
}

apollo {
Expand Down
3 changes: 1 addition & 2 deletions claimManagement/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="org.openimis.imisclaims">
xmlns:tools="http://schemas.android.com/tools">

<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,10 @@ query GetClaims($claim_administrator_code: String, $status_claim: Int, $visit_da
adjustment
explanation
guaranteeId
program {
idProgram
nameProgram
}
services {
qtyProvided
qtyApproved
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
query GetPrograms($first: Int) {
program(first: $first){
edges{
node{
idProgram
code
nameProgram
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,20 @@ type Query {
usernameLength: Int
_debug: DjangoDebug
node("""The ID of the object""" id: ID!): Node
program(first: Int): ProgramGQLTypeConnection
}

type ProgramGQLTypeConnection {
"""
Pagination data for this connection.
"""
pageInfo: PageInfo!
"""
Contains the nodes in this connection.
"""
edges: [ProgramGQLTypeEdge]!
totalCount: Int
edgeCount: Int
}

type ControlGQLTypeConnection {
Expand Down Expand Up @@ -444,6 +458,23 @@ type InteractiveUserGQLType implements Node {
roles: [RoleGQLType]
}

type ProgramGQLTypeEdge {
"""
The item at the end of the edge
"""
node: ProgramGQLType
"""
A cursor for use in pagination
"""
cursor: String!
}

type ProgramGQLType {
idProgram: String!
code: String!
nameProgram: String!
}

type LanguageGQLType {
code: String!
name: String!
Expand Down Expand Up @@ -1472,6 +1503,7 @@ type ClaimGQLType implements Node {
dedrems(offset: Int, before: String, after: String, first: Int, last: Int): ClaimDedRemGQLTypeConnection!
clientMutationId: String
dateProcessedTo: Date
program: ProgramGQLType
}

type FeedbackGQLType {
Expand Down Expand Up @@ -5891,6 +5923,7 @@ input CreateClaimMutationInput {
services: [ClaimServiceInputType]
attachments: [ClaimAttachmentInputType]
clientMutationId: String
program: Int!
}

scalar ClaimCodeInputType
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ public static Intent newIntent(@NonNull Context context, @NonNull String claimUU
String patientCondition, visitType;

EditText etStartDate, etEndDate, etClaimCode, etHealthFacility, etInsureeNumber, etClaimAdmin, etGuaranteeNo;
AutoCompleteTextView etDiagnosis, etDiagnosis1, etDiagnosis2, etDiagnosis3, etDiagnosis4, etReferalHF, etPatientCondition, etVisitType;
AutoCompleteTextView etDiagnosis, etDiagnosis1, etDiagnosis2, etDiagnosis3, etDiagnosis4, etReferalHF, etPatientCondition, etVisitType, etProgram;
TextView tvItemTotal, tvServiceTotal;
Button btnPost, btnNew;
RadioGroup rgVisitType;
Expand Down Expand Up @@ -124,6 +124,7 @@ protected void onCreate(Bundle savedInstanceState) {
etPatientCondition = findViewById(R.id.patientCondition);
etVisitType = findViewById(R.id.etVisitType);
tfReferal = findViewById(R.id.tfReferal);
etProgram = findViewById(R.id.etProgram);

String[] visitTypes = getResources().getStringArray(R.array.visitType);
ArrayAdapter<String> visitTypeAdapter = new ArrayAdapter<>(this, android.R.layout.simple_dropdown_item_1line, visitTypes);
Expand Down Expand Up @@ -223,6 +224,11 @@ public void onItemClick(AdapterView<?> adapterView, View view, int position, lon
return false;
});

ProgramAdapter progamAdapter = new ProgramAdapter(ClaimActivity.this, sqlHandler);
etProgram.setAdapter(progamAdapter);
etProgram.setThreshold(1);
etReferalHF.setOnItemClickListener(progamAdapter);

findViewById(R.id.ivAddItem).setOnClickListener(v -> addItem());
findViewById(R.id.ivAddService).setOnClickListener(v -> addService());

Expand Down Expand Up @@ -468,6 +474,7 @@ private void ClearForm() {
etPatientCondition.setText("");
etVisitType.setText("");
etClaimCode.requestFocus();
etProgram.setText("");
}

private void disableForm() {
Expand All @@ -491,6 +498,7 @@ private void disableForm() {
disableView(etPreAuthorization);
disableView(etPatientCondition);
disableView(etVisitType);
disableView(etProgram);
}

private void fillClaimFromRestore(Claim claim) {
Expand Down Expand Up @@ -522,6 +530,7 @@ private void fillClaimFromRestore(Claim claim) {
etDiagnosis2.setText(sqlHandler.getDiseaseCode(claim.getSecDg2()));
etDiagnosis3.setText(sqlHandler.getDiseaseCode(claim.getSecDg3()));
etDiagnosis4.setText(sqlHandler.getDiseaseCode(claim.getSecDg4()));
etProgram.setText(sqlHandler.getProgamName(claim.getClaimProgram()));

switch (claim.getVisitType() != null ? claim.getVisitType() : "") {
case "E":
Expand Down Expand Up @@ -597,6 +606,7 @@ private void fillClaimFromDatabase(String claimUUID) {
etDiagnosis3.setText(claimDetails.getString("ICDCode3"));
etDiagnosis4.setText(claimDetails.getString("ICDCode4"));
etReferalHF.setText(claimDetails.getString("ReferalHF"));
etProgram.setText(claimDetails.getString("Program"));
if(claimDetails.getInt("PreAuthorization") == 1){
etPreAuthorization.setChecked(true);
}else{
Expand Down Expand Up @@ -848,6 +858,7 @@ private boolean saveClaim() {
claimCV.put("VisitType", etVisitType.getTag().toString());
claimCV.put("ReferalHF", etReferalHF.getText().toString());
claimCV.put("PatientCondition", etPatientCondition.getTag().toString());
claimCV.put("Program", etProgram.getText().toString());
if(etPreAuthorization.isChecked()){
claimCV.put("PreAuthorization", 1);
}else{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
import org.openimis.imisclaims.domain.entity.HealthFacility;
import org.openimis.imisclaims.domain.entity.Medication;
import org.openimis.imisclaims.domain.entity.PaymentList;
import org.openimis.imisclaims.domain.entity.Program;
import org.openimis.imisclaims.domain.entity.Service;
import org.openimis.imisclaims.domain.entity.SubServiceItem;
import org.openimis.imisclaims.tools.Log;
Expand All @@ -53,6 +54,7 @@
import org.openimis.imisclaims.usecase.FetchDiagnosesServicesItems;
import org.openimis.imisclaims.usecase.FetchHealthfacilities;
import org.openimis.imisclaims.usecase.FetchPaymentList;
import org.openimis.imisclaims.usecase.FetchPrograms;

import java.io.File;
import java.io.FileOutputStream;
Expand Down Expand Up @@ -614,6 +616,7 @@ public void run() {
sqlHandler.ClearAll("tblItems");
sqlHandler.ClearMapping("S");
sqlHandler.ClearMapping("I");
sqlHandler.ClearAll("tblPrograms");
//Insert Diagnoses
for (Diagnosis diagnosis : diagnosesServicesMedications.getDiagnoses()) {
sqlHandler.InsertReferences(diagnosis.getCode(), diagnosis.getName(), "D", "");
Expand Down Expand Up @@ -663,6 +666,11 @@ public void run() {
sqlHandler.InsertHealthFacilities(hf.getId(), hf.getCode(), hf.getName());
}

List<Program> programs = new FetchPrograms().execute();
for (Program program : programs) {
sqlHandler.InsertPrograms(program.getIdProgram(), program.getCode(), program.getNameProgram());
}

runOnUiThread(() -> {
progressDialog.dismiss();
if (officerCode != null) {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
package org.openimis.imisclaims;

import android.content.Context;
import android.database.Cursor;
import android.database.sqlite.SQLiteDatabase;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.AdapterView;
import android.widget.CursorAdapter;
import android.widget.TextView;

import org.json.JSONArray;
import org.json.JSONException;
import org.openimis.imisclaims.tools.Log;

import java.util.ArrayList;
import java.util.List;

public class ProgramAdapter extends CursorAdapter implements AdapterView.OnItemClickListener {
SQLHandler sqlHandler;
SQLiteDatabase db;

public ProgramAdapter(Context context, SQLHandler sqlHandler) {
super(context, null, 0);
this.sqlHandler = sqlHandler;
}

@Override
public View newView(Context context, Cursor cursor, ViewGroup parent) {
return LayoutInflater.from(context).inflate(R.layout.program_list, parent, false);
}

@Override
public void bindView(View view, Context context, Cursor cursor) {
final int descColumnIndex = cursor.getColumnIndexOrThrow("Name");
String Suggestion = cursor.getString(descColumnIndex);
TextView text1 = view.findViewById(R.id.text2);
text1.setText(Suggestion);

}

@Override
public Cursor runQueryOnBackgroundThread(CharSequence constraint) {
if (getFilterQueryProvider() != null) {
return getFilterQueryProvider().runQuery(constraint);
}

return sqlHandler.SearchProgram((constraint != null ? constraint.toString() : ""));
}

@Override
public CharSequence convertToString(Cursor c) {
return c.getString(c.getColumnIndexOrThrow("Name"));
}


@Override
public void onItemClick(AdapterView<?> listView, View view, int position, long id) {
}
}
Loading