diff --git a/build.gradle b/build.gradle index e5ab07cc..17c10678 100644 --- a/build.gradle +++ b/build.gradle @@ -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 diff --git a/claimManagement/build.gradle b/claimManagement/build.gradle index c3a245d7..6f5857b2 100644 --- a/claimManagement/build.gradle +++ b/claimManagement/build.gradle @@ -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' } @@ -180,6 +180,7 @@ android { packagingOptions { exclude 'META-INF/DEPENDENCIES' } + namespace 'org.openimis.imisclaims' } apollo { diff --git a/claimManagement/src/main/AndroidManifest.xml b/claimManagement/src/main/AndroidManifest.xml index db8ddd0b..707f467d 100644 --- a/claimManagement/src/main/AndroidManifest.xml +++ b/claimManagement/src/main/AndroidManifest.xml @@ -1,7 +1,6 @@ + xmlns:tools="http://schemas.android.com/tools"> diff --git a/claimManagement/src/main/graphql/org.openimis.imisclaim/GetClaims.graphql b/claimManagement/src/main/graphql/org.openimis.imisclaim/GetClaims.graphql index 66230f0a..f4df3062 100644 --- a/claimManagement/src/main/graphql/org.openimis.imisclaim/GetClaims.graphql +++ b/claimManagement/src/main/graphql/org.openimis.imisclaim/GetClaims.graphql @@ -48,6 +48,10 @@ query GetClaims($claim_administrator_code: String, $status_claim: Int, $visit_da adjustment explanation guaranteeId + program { + idProgram + nameProgram + } services { qtyProvided qtyApproved diff --git a/claimManagement/src/main/graphql/org.openimis.imisclaim/GetPrograms.graphql b/claimManagement/src/main/graphql/org.openimis.imisclaim/GetPrograms.graphql new file mode 100644 index 00000000..f54154e2 --- /dev/null +++ b/claimManagement/src/main/graphql/org.openimis.imisclaim/GetPrograms.graphql @@ -0,0 +1,11 @@ +query GetPrograms($first: Int) { + program(first: $first){ + edges{ + node{ + idProgram + code + nameProgram + } + } + } +} \ No newline at end of file diff --git a/claimManagement/src/main/graphql/org.openimis.imisclaim/schema.graphqls b/claimManagement/src/main/graphql/org.openimis.imisclaim/schema.graphqls index 805a8000..771be2e3 100644 --- a/claimManagement/src/main/graphql/org.openimis.imisclaim/schema.graphqls +++ b/claimManagement/src/main/graphql/org.openimis.imisclaim/schema.graphqls @@ -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 { @@ -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! @@ -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 { @@ -5891,6 +5923,7 @@ input CreateClaimMutationInput { services: [ClaimServiceInputType] attachments: [ClaimAttachmentInputType] clientMutationId: String + program: Int! } scalar ClaimCodeInputType diff --git a/claimManagement/src/main/java/org/openimis/imisclaims/ClaimActivity.java b/claimManagement/src/main/java/org/openimis/imisclaims/ClaimActivity.java index e9894971..378da28b 100644 --- a/claimManagement/src/main/java/org/openimis/imisclaims/ClaimActivity.java +++ b/claimManagement/src/main/java/org/openimis/imisclaims/ClaimActivity.java @@ -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; @@ -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 visitTypeAdapter = new ArrayAdapter<>(this, android.R.layout.simple_dropdown_item_1line, visitTypes); @@ -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()); @@ -468,6 +474,7 @@ private void ClearForm() { etPatientCondition.setText(""); etVisitType.setText(""); etClaimCode.requestFocus(); + etProgram.setText(""); } private void disableForm() { @@ -491,6 +498,7 @@ private void disableForm() { disableView(etPreAuthorization); disableView(etPatientCondition); disableView(etVisitType); + disableView(etProgram); } private void fillClaimFromRestore(Claim claim) { @@ -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": @@ -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{ @@ -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{ diff --git a/claimManagement/src/main/java/org/openimis/imisclaims/MainActivity.java b/claimManagement/src/main/java/org/openimis/imisclaims/MainActivity.java index 2ef953f4..9c41142b 100644 --- a/claimManagement/src/main/java/org/openimis/imisclaims/MainActivity.java +++ b/claimManagement/src/main/java/org/openimis/imisclaims/MainActivity.java @@ -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; @@ -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; @@ -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", ""); @@ -663,6 +666,11 @@ public void run() { sqlHandler.InsertHealthFacilities(hf.getId(), hf.getCode(), hf.getName()); } + List programs = new FetchPrograms().execute(); + for (Program program : programs) { + sqlHandler.InsertPrograms(program.getIdProgram(), program.getCode(), program.getNameProgram()); + } + runOnUiThread(() -> { progressDialog.dismiss(); if (officerCode != null) { diff --git a/claimManagement/src/main/java/org/openimis/imisclaims/ProgramAdapter.java b/claimManagement/src/main/java/org/openimis/imisclaims/ProgramAdapter.java new file mode 100644 index 00000000..3ba11366 --- /dev/null +++ b/claimManagement/src/main/java/org/openimis/imisclaims/ProgramAdapter.java @@ -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) { + } +} diff --git a/claimManagement/src/main/java/org/openimis/imisclaims/SQLHandler.java b/claimManagement/src/main/java/org/openimis/imisclaims/SQLHandler.java index 159a045d..e64ce21d 100644 --- a/claimManagement/src/main/java/org/openimis/imisclaims/SQLHandler.java +++ b/claimManagement/src/main/java/org/openimis/imisclaims/SQLHandler.java @@ -17,6 +17,7 @@ import org.json.JSONObject; import org.openimis.imisclaims.tools.Log; +import java.util.List; import java.util.Locale; public class SQLHandler extends SQLiteOpenHelper { @@ -40,7 +41,7 @@ public class SQLHandler extends SQLiteOpenHelper { private static final String CreateTableControls = "CREATE TABLE IF NOT EXISTS tblControls(FieldName TEXT, Adjustability TEXT);"; private static final String CreateTableClaimAdmins = "CREATE TABLE IF NOT EXISTS tblClaimAdmins(Code TEXT, HFCode TEXT ,Name TEXT);"; private static final String CreateTableReferences = "CREATE TABLE IF NOT EXISTS tblReferences(Code TEXT, Name TEXT, Type TEXT, Price TEXT);"; - private static final String createTableClaimDetails = "CREATE TABLE IF NOT EXISTS tblClaimDetails(ClaimUUID TEXT, ClaimDate TEXT, HFCode TEXT, ClaimAdmin TEXT, ClaimCode TEXT, GuaranteeNumber TEXT, InsureeNumber TEXT, StartDate TEXT, EndDate TEXT, ICDCode TEXT, Comment TEXT, Total TEXT, ICDCode1 TEXT, ICDCode2 TEXT, ICDCode3 TEXT, ICDCode4 TEXT, VisitType TEXT, ReferalHF TEXT, PatientCondition TEXT,PreAuthorization Int );"; + private static final String createTableClaimDetails = "CREATE TABLE IF NOT EXISTS tblClaimDetails(ClaimUUID TEXT, ClaimDate TEXT, HFCode TEXT, ClaimAdmin TEXT, ClaimCode TEXT, GuaranteeNumber TEXT, InsureeNumber TEXT, StartDate TEXT, EndDate TEXT, ICDCode TEXT, Comment TEXT, Total TEXT, ICDCode1 TEXT, ICDCode2 TEXT, ICDCode3 TEXT, ICDCode4 TEXT, VisitType TEXT, ReferalHF TEXT, PatientCondition TEXT,PreAuthorization Int, Program TEXT );"; private static final String createTableClaimItems = "CREATE TABLE IF NOT EXISTS tblClaimItems(ClaimUUID TEXT, ItemCode TEXT, ItemPrice TEXT, ItemQuantity TEXT);"; private static final String createTableClaimServices = "CREATE TABLE IF NOT EXISTS tblClaimServices(ClaimUUID TEXT, ServiceCode TEXT, ServicePrice TEXT, ServiceQuantity TEXT, ServicePackageType TEXT, SubServicesItems TEXT);"; private static final String createTableClaimUploadStatus = "CREATE TABLE IF NOT EXISTS tblClaimUploadStatus(ClaimUUID TEXT, UploadDate TEXT, UploadStatus TEXT, UploadMessage TEXT);"; @@ -49,6 +50,7 @@ public class SQLHandler extends SQLiteOpenHelper { private static final String CreateTableSubServices = "CREATE TABLE IF NOT EXISTS tblSubServices(ServiceId text, ServiceLinked text, Quantity text, Price text);"; private static final String CreateTableSubItems = "CREATE TABLE IF NOT EXISTS tblSubItems(ItemId text, ServiceId text, Quantity text, Price text);"; private static final String CreateTableHealthFacilities = "CREATE TABLE IF NOT EXISTS tblHealthFacilities(Id TEXT, Code TEXT, Name TEXT);"; + private static final String CreateTablePrograms = "CREATE TABLE IF NOT EXISTS tblPrograms(Id TEXT, Code TEXT, Name TEXT);"; public final String REFERENCE_UNKNOWN; @@ -322,7 +324,7 @@ public void createTables() { String[] commands = {CreateTableControls, CreateTableReferences, CreateTableClaimAdmins, createTablePolicyInquiry, createTableClaimDetails, createTableClaimItems, createTableClaimServices, createTableClaimUploadStatus, CreateTableSubItems, - CreateTableSubServices,CreateTableItems,CreateTableServices, CreateTableHealthFacilities}; + CreateTableSubServices,CreateTableItems,CreateTableServices, CreateTableHealthFacilities, CreateTablePrograms}; for (String command : commands) { try { db.execSQL(command); @@ -422,7 +424,7 @@ public void deleteClaim(String claimUUID) { public JSONObject getClaim(String claimUUID) { JSONArray claimDetails = getQueryResultAsJsonArray("tblClaimDetails", - new String[]{"ClaimUUID", "ClaimDate", "HFCode", "ClaimAdmin", "ClaimCode", "GuaranteeNumber", "InsureeNumber", "StartDate", "EndDate", "ICDCode", "Comment", "Total", "ICDCode1", "ICDCode2", "ICDCode3", "ICDCode4", "VisitType", "ReferalHF", "PatientCondition", "PreAuthorization"}, + new String[]{"ClaimUUID", "ClaimDate", "HFCode", "ClaimAdmin", "ClaimCode", "GuaranteeNumber", "InsureeNumber", "StartDate", "EndDate", "ICDCode", "Comment", "Total", "ICDCode1", "ICDCode2", "ICDCode3", "ICDCode4", "VisitType", "ReferalHF", "PatientCondition", "PreAuthorization", "Program"}, "LOWER(ClaimUUID) = ?", new String[]{claimUUID.toLowerCase(Locale.ROOT)}); @@ -454,7 +456,7 @@ public JSONArray getAllPendingClaims() { // Rename InsureeNumber to CHFID // This is required to support legacy Rest API and Web App JSONArray claims = getQueryResultAsJsonArray( - "SELECT ClaimUUID, ClaimDate, HFCode, ClaimAdmin, ClaimCode, GuaranteeNumber, InsureeNumber AS CHFID, StartDate, EndDate, ICDCode, Comment, Total, ICDCode1, ICDCode2, ICDCode3, ICDCode4, VisitType" + + "SELECT ClaimUUID, ClaimDate, HFCode, ClaimAdmin, ClaimCode, GuaranteeNumber, InsureeNumber AS CHFID, StartDate, EndDate, ICDCode, Comment, Total, ICDCode1, ICDCode2, ICDCode3, ICDCode4, VisitType, Program" + " FROM tblClaimDetails cd" + " WHERE NOT EXISTS (SELECT cus.ClaimUUID FROM tblClaimUploadStatus cus WHERE cus.ClaimUUID = cd.ClaimUUID AND cus.UploadStatus != ?)", new String[]{CLAIM_UPLOAD_STATUS_ERROR} @@ -940,4 +942,82 @@ public void InsertHealthFacilities(String Id, String Code, String Name) { e.printStackTrace(); } } + + public Cursor SearchProgram(String InputText) { + Cursor c = db.rawQuery("SELECT Name as _id,Code, Name FROM tblPrograms WHERE (Code LIKE '%" + InputText + "%' OR Name LIKE '%" + InputText + "%')", null); + if (c != null) { + c.moveToFirst(); + } + + return c; + } + + public void InsertPrograms(String Id, String Code, String Name) { + try { + ContentValues cv = new ContentValues(); + cv.put("Id", Id); + cv.put("Code", Code); + cv.put("Name", Name); + db.insert("tblPrograms", null, cv); + } catch (Exception e) { + e.printStackTrace(); + } + } + + public String getProgamName(String program) { + String name = ""; + try { + String table = "tblPrograms"; + String[] columns = {"Name"}; + String selection = "Name=?"; + String[] selectionArgs = {program}; + String limit = "1"; + Cursor c = db.query(table, columns, selection, selectionArgs, null, null, null, limit); + if (c.getCount() == 1) { + c.moveToFirst(); + name = c.getString(c.getColumnIndexOrThrow("Name")); + } + } catch (Exception e) { + e.printStackTrace(); + } + return name; + } + + public int getProgamId(String programName) { + String id = "0"; + try { + String table = "tblPrograms"; + String[] columns = {"Id"}; + String selection = "Name=?"; + String[] selectionArgs = {programName}; + String limit = "1"; + Cursor c = db.query(table, columns, selection, selectionArgs, null, null, null, limit); + if (c.getCount() == 1) { + c.moveToFirst(); + id = c.getString(c.getColumnIndexOrThrow("Id")); + } + } catch (Exception e) { + e.printStackTrace(); + } + return Integer.valueOf(id); + } + + public String getProgamCode(String programName) { + String code = ""; + try { + String table = "tblPrograms"; + String[] columns = {"Code"}; + String selection = "Name=?"; + String[] selectionArgs = {programName}; + String limit = "1"; + Cursor c = db.query(table, columns, selection, selectionArgs, null, null, null, limit); + if (c.getCount() == 1) { + c.moveToFirst(); + code = c.getString(c.getColumnIndexOrThrow("Code")); + } + } catch (Exception e) { + e.printStackTrace(); + } + return code; + } } diff --git a/claimManagement/src/main/java/org/openimis/imisclaims/domain/entity/Claim.java b/claimManagement/src/main/java/org/openimis/imisclaims/domain/entity/Claim.java index 85f85803..749887b0 100644 --- a/claimManagement/src/main/java/org/openimis/imisclaims/domain/entity/Claim.java +++ b/claimManagement/src/main/java/org/openimis/imisclaims/domain/entity/Claim.java @@ -79,6 +79,9 @@ public class Claim implements Parcelable { @NonNull private final List medications; + @NonNull + private final String claimProgram; + public Claim( @NonNull String uuid, @@ -103,7 +106,8 @@ public Claim( @Nullable String adjustment, @Nullable String guaranteeNumber, @NonNull List services, - @NonNull List medications + @NonNull List medications, + @NonNull String claimProgram ) { this.uuid = uuid; this.healthFacilityCode = healthFacilityCode; @@ -128,6 +132,7 @@ public Claim( this.guaranteeNumber = guaranteeNumber; this.services = services; this.medications = medications; + this.claimProgram = claimProgram; } protected Claim(Parcel in) { @@ -179,6 +184,7 @@ protected Claim(Parcel in) { } else { status = Claim.Status.valueOf(in.readString()); } + claimProgram = in.readString(); } @Override @@ -237,6 +243,7 @@ public void writeToParcel(Parcel dest, int flags) { dest.writeByte((byte) 1); dest.writeString(status.name()); } + dest.writeString(claimProgram); } @Override @@ -404,6 +411,11 @@ public Claim[] newArray(int size) { } }; + @NonNull + public String getClaimProgram() { + return claimProgram; + } + public static class Service extends org.openimis.imisclaims.domain.entity.Service { @NonNull diff --git a/claimManagement/src/main/java/org/openimis/imisclaims/domain/entity/PendingClaim.java b/claimManagement/src/main/java/org/openimis/imisclaims/domain/entity/PendingClaim.java index fbb3c1e7..45ca6c7a 100644 --- a/claimManagement/src/main/java/org/openimis/imisclaims/domain/entity/PendingClaim.java +++ b/claimManagement/src/main/java/org/openimis/imisclaims/domain/entity/PendingClaim.java @@ -29,6 +29,7 @@ public static List fromJson(@NonNull JSONArray array) throws Excep /* claimCode = */ details.getString("ClaimCode"), /* guaranteeNumber = */ details.getString("GuaranteeNumber"), /* chfId = */ details.getString("CHFID"), + /* claimProgram = */ details.getString("Program"), /* startDate = */ DateUtils.dateFromString(details.getString("StartDate")), /* endDate = */ DateUtils.dateFromString(details.getString("EndDate")), /* icdCode = */ details.getString("ICDCode"), @@ -82,6 +83,8 @@ public static List fromJson(@NonNull JSONArray array) throws Excep private final List services; @NonNull private final List medications; + @NonNull + private final String claimProgram; public PendingClaim( @NonNull Date claimDate, @@ -90,6 +93,7 @@ public PendingClaim( @NonNull String claimCode, @Nullable String guaranteeNumber, @NonNull String chfId, + @Nullable String claimProgram, @NonNull Date startDate, @NonNull Date endDate, @NonNull String icdCode, @@ -121,6 +125,7 @@ public PendingClaim( this.visitType = visitType; this.services = services; this.medications = medications; + this.claimProgram = claimProgram; } protected PendingClaim(Parcel in) { @@ -142,6 +147,7 @@ protected PendingClaim(Parcel in) { visitType = in.readString(); services = in.createTypedArrayList(Service.CREATOR); medications = in.createTypedArrayList(Medication.CREATOR); + claimProgram = in.readString(); } @Override @@ -164,6 +170,7 @@ public void writeToParcel(Parcel dest, int flags) { dest.writeString(visitType); dest.writeTypedList(services); dest.writeTypedList(medications); + dest.writeString(claimProgram); } @Override @@ -251,6 +258,11 @@ public String getVisitType() { return visitType; } + @NonNull + public String getClaimProgram() { + return claimProgram; + } + @NonNull public List getServices() { return services; @@ -408,6 +420,7 @@ public double getQuantity() { return quantity; } + public static final Creator CREATOR = new Creator<>() { @Override public Medication createFromParcel(Parcel in) { diff --git a/claimManagement/src/main/java/org/openimis/imisclaims/domain/entity/Program.java b/claimManagement/src/main/java/org/openimis/imisclaims/domain/entity/Program.java new file mode 100644 index 00000000..57b1ac0a --- /dev/null +++ b/claimManagement/src/main/java/org/openimis/imisclaims/domain/entity/Program.java @@ -0,0 +1,71 @@ +package org.openimis.imisclaims.domain.entity; + +import android.os.Parcel; +import android.os.Parcelable; + +import androidx.annotation.NonNull; + +public class Program implements Parcelable { + + @NonNull + private final String idProgram; + @NonNull + private final String code; + @NonNull + private final String nameProgram; + + public Program( + @NonNull String idProgram, + @NonNull String code, + @NonNull String nameProgram + ) { + this.idProgram = idProgram; + this.code = code; + this.nameProgram = nameProgram; + } + + protected Program(Parcel in) { + idProgram = in.readString(); + code = in.readString(); + nameProgram = in.readString(); + } + + @Override + public void writeToParcel(Parcel dest, int flags) { + dest.writeString(idProgram); + dest.writeString(code); + dest.writeString(nameProgram); + } + + @Override + public int describeContents() { + return 0; + } + + @NonNull + public String getIdProgram() { + return idProgram; + } + + @NonNull + public String getCode() { + return code; + } + + @NonNull + public String getNameProgram() { + return nameProgram; + } + + public static final Parcelable.Creator CREATOR = new Parcelable.Creator<>() { + @Override + public Program createFromParcel(Parcel in) { + return new Program(in); + } + + @Override + public Program[] newArray(int size) { + return new Program[size]; + } + }; +} \ No newline at end of file diff --git a/claimManagement/src/main/java/org/openimis/imisclaims/network/request/GetProgramsGraphQLRequest.java b/claimManagement/src/main/java/org/openimis/imisclaims/network/request/GetProgramsGraphQLRequest.java new file mode 100644 index 00000000..e76586bc --- /dev/null +++ b/claimManagement/src/main/java/org/openimis/imisclaims/network/request/GetProgramsGraphQLRequest.java @@ -0,0 +1,19 @@ +package org.openimis.imisclaims.network.request; + +import androidx.annotation.NonNull; +import androidx.annotation.WorkerThread; + +import com.apollographql.apollo.api.Input; +import org.openimis.imisclaims.GetProgramsQuery; + +import java.util.List; + +public class GetProgramsGraphQLRequest extends BaseGraphQLRequest { + + @NonNull + @WorkerThread + public List get() throws Exception { + return makeSynchronous(new GetProgramsQuery(Input.fromNullable(10))).getData().program().edges(); + } + +} \ No newline at end of file diff --git a/claimManagement/src/main/java/org/openimis/imisclaims/network/util/OkHttpUtils.java b/claimManagement/src/main/java/org/openimis/imisclaims/network/util/OkHttpUtils.java index 3b59abed..e3792509 100644 --- a/claimManagement/src/main/java/org/openimis/imisclaims/network/util/OkHttpUtils.java +++ b/claimManagement/src/main/java/org/openimis/imisclaims/network/util/OkHttpUtils.java @@ -8,6 +8,8 @@ import org.openimis.imisclaims.Global; import org.openimis.imisclaims.network.okhttp.AuthorizationInterceptor; +import java.util.concurrent.TimeUnit; + import javax.net.ssl.SSLContext; import javax.net.ssl.TrustManager; import javax.net.ssl.X509TrustManager; @@ -29,6 +31,7 @@ public static OkHttpClient getDefaultOkHttpClient() { synchronized (OkHttpUtils.class) { if (client == null) { OkHttpClient.Builder builder = new OkHttpClient.Builder(); + builder.readTimeout(5, TimeUnit.MINUTES); HttpLoggingInterceptor interceptor = new HttpLoggingInterceptor(); interceptor.setLevel(BuildConfig.DEBUG ? HttpLoggingInterceptor.Level.BODY : HttpLoggingInterceptor.Level.BASIC); builder.addInterceptor(interceptor); diff --git a/claimManagement/src/main/java/org/openimis/imisclaims/usecase/FetchClaims.java b/claimManagement/src/main/java/org/openimis/imisclaims/usecase/FetchClaims.java index 7a7f6e34..87f27206 100644 --- a/claimManagement/src/main/java/org/openimis/imisclaims/usecase/FetchClaims.java +++ b/claimManagement/src/main/java/org/openimis/imisclaims/usecase/FetchClaims.java @@ -121,7 +121,8 @@ private Claim toClaim( /* adjustment = */ node.adjustment(), /* guaranteeNumber = */ node.guaranteeId(), /* services = */ serviceMapper.map(node.services()), - /* medications = */ medicationMapper.map(node.items()) + /* medications = */ medicationMapper.map(node.items()), + /* claimProgram = */ node.program() != null ? node.program().nameProgram(): null ); } diff --git a/claimManagement/src/main/java/org/openimis/imisclaims/usecase/FetchPrograms.java b/claimManagement/src/main/java/org/openimis/imisclaims/usecase/FetchPrograms.java new file mode 100644 index 00000000..5d445442 --- /dev/null +++ b/claimManagement/src/main/java/org/openimis/imisclaims/usecase/FetchPrograms.java @@ -0,0 +1,45 @@ +package org.openimis.imisclaims.usecase; + +import androidx.annotation.NonNull; +import androidx.annotation.WorkerThread; + +import org.openimis.imisclaims.GetControlsQuery; +import org.openimis.imisclaims.GetProgramsQuery; +import org.openimis.imisclaims.domain.entity.Control; +import org.openimis.imisclaims.domain.entity.Program; +import org.openimis.imisclaims.network.request.GetProgramsGraphQLRequest; +import org.openimis.imisclaims.network.util.Mapper; + +import java.util.List; +import java.util.Objects; + +public class FetchPrograms { + + @NonNull + private final GetProgramsGraphQLRequest request; + + public FetchPrograms() { + this(new GetProgramsGraphQLRequest()); + } + + public FetchPrograms( + @NonNull GetProgramsGraphQLRequest request + ) { + this.request = request; + } + + @WorkerThread + @NonNull + public List execute() throws Exception { + return Mapper.map(request.get(), dto -> { + GetProgramsQuery.Node node = Objects.requireNonNull(dto.node()); + return new Program( + /* idProgram = */ node.idProgram(), + /* code = */ node.code(), + /* nameProgram = */ node.nameProgram() + ); + }); + } + + +} \ No newline at end of file diff --git a/claimManagement/src/main/res/layout/activity_claim.xml b/claimManagement/src/main/res/layout/activity_claim.xml index 09c4edb3..a010d924 100644 --- a/claimManagement/src/main/res/layout/activity_claim.xml +++ b/claimManagement/src/main/res/layout/activity_claim.xml @@ -149,6 +149,22 @@ android:hint="@string/EndDate" /> + + + + + + + + + \ No newline at end of file diff --git a/claimManagement/src/main/res/values/strings.xml b/claimManagement/src/main/res/values/strings.xml index 9e4c04d2..085b491e 100644 --- a/claimManagement/src/main/res/values/strings.xml +++ b/claimManagement/src/main/res/values/strings.xml @@ -256,4 +256,5 @@ This healthfacility don\'t have services pricelist This healthfacility don\'t have items pricelist New changes: + Program diff --git a/gradle.properties b/gradle.properties index 5465fec0..e3dfef4e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,2 +1,5 @@ +android.defaults.buildfeatures.buildconfig=true android.enableJetifier=true +android.nonFinalResIds=false +android.nonTransitiveRClass=false android.useAndroidX=true \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 8c0fb64a..d64cd491 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index a77e98eb..37f853b1 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,7 @@ -#Fri Dec 03 10:17:47 CET 2021 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 +networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 91a7e269..1aa94a42 100755 --- a/gradlew +++ b/gradlew @@ -1,79 +1,127 @@ -#!/usr/bin/env bash +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# ############################################################################## -## -## Gradle start up script for UN*X -## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# ############################################################################## -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS="" +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum -warn ( ) { +warn () { echo "$*" -} +} >&2 -die ( ) { +die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac -# For Cygwin, ensure paths are in UNIX format before anything is touched. -if $cygwin ; then - [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"` -fi - -# Attempt to set APP_HOME -# Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi -done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >&- -APP_HOME="`pwd -P`" -cd "$SAVED" >&- - CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + # Determine the Java command to use to start the JVM. if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -82,83 +130,120 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the location of your Java installation." + fi fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac fi -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) -# For Cygwin, switch paths to Windows format before running java -if $cygwin ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) fi - i=$((i+1)) + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg done - case $i in - (0) set -- ;; - (1) set -- "$args0" ;; - (2) set -- "$args0" "$args1" ;; - (3) set -- "$args0" "$args1" "$args2" ;; - (4) set -- "$args0" "$args1" "$args2" "$args3" ;; - (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac fi -# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules -function splitJvmOpts() { - JVM_OPTS=("$@") -} -eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS -JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" -exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat index 8a0b282a..6689b85b 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -1,90 +1,92 @@ -@if "%DEBUG%" == "" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS= - -set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto init - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:init -@rem Get command-line arguments, handling Windowz variants - -if not "%OS%" == "Windows_NT" goto win9xME_args -if "%@eval[2+2]" == "4" goto 4NT_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* -goto execute - -:4NT_args -@rem Get arguments from the 4NT Shell from JP Software -set CMD_LINE_ARGS=%$ - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega