Skip to content

Commit 98ed387

Browse files
delcroipdelcroip
authored
Merge pull request openimis#85 from openimis/revert-83-feature/OTC-745
Revert "OTC-745 Implemented claim 2-way sync"
2 parents a7bdaf9 + d60c254 commit 98ed387

24 files changed

Lines changed: 321 additions & 1097 deletions

‎claimManagement/build.gradle‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,7 @@ android {
130130
resValue "string", "app_name_claims", "Claims CNASS TRAIN"
131131
dimension = 'std'
132132
}
133+
133134
}
134135

135136
sourceSets {

‎claimManagement/src/main/java/org/openimis/imisclaims/AddItems.java‎

Lines changed: 2 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,16 @@
66
import android.text.Editable;
77
import android.text.TextWatcher;
88
import android.view.View;
9-
import android.view.ViewGroup;
10-
import android.view.ViewParent;
119
import android.widget.AutoCompleteTextView;
1210
import android.widget.Button;
1311
import android.widget.EditText;
14-
import android.widget.LinearLayout;
1512
import android.widget.ListView;
1613
import android.widget.SimpleAdapter;
1714
import android.widget.TextView;
1815

1916
import java.util.HashMap;
2017

2118
import org.openimis.imisclaims.tools.Log;
22-
import org.openimis.imisclaims.util.StringUtils;
2319

2420
public class AddItems extends ImisActivity {
2521
ListView lvItems;
@@ -51,33 +47,10 @@ public void onCreate(Bundle savedInstanceState) {
5147
btnAdd = findViewById(R.id.btnAdd);
5248

5349
alAdapter = new SimpleAdapter(AddItems.this, ClaimActivity.lvItemList, R.layout.lvitem,
54-
new String[]{"Code", "Name", "Price", "Quantity", "PriceAdjusted", "QuantityAdjusted", "Explanation", "Justification", "Result"},
55-
new int[]{R.id.tvLvCode, R.id.tvLvName, R.id.tvLvPrice, R.id.tvLvQuantity, R.id.tvLvPriceAdjusted, R.id.tvLvQuantityAdjusted, R.id.tvLvExplanation, R.id.tvLvJustification, R.id.tvLvResult});
50+
new String[]{"Code", "Name", "Price", "Quantity"},
51+
new int[]{R.id.tvLvCode, R.id.tvLvName, R.id.tvLvPrice, R.id.tvLvQuantity});
5652
lvItems.setAdapter(alAdapter);
5753

58-
alAdapter.setViewBinder((view, data, textRepresentation) -> {
59-
TextView textView = (TextView) view;
60-
textView.setText(textRepresentation);
61-
62-
int id = view.getId();
63-
64-
if ((id == R.id.tvLvPriceAdjusted || id == R.id.tvLvQuantityAdjusted || id == R.id.tvLvExplanation || id == R.id.tvLvJustification || id == R.id.tvLvResult) && !StringUtils.isEmpty(textRepresentation)) {
65-
view.getParent().getParent();
66-
67-
ViewGroup containingLayout = (ViewGroup) view.getParent().getParent();
68-
LinearLayout rootView = (LinearLayout) containingLayout.getParent();
69-
70-
LinearLayout quantityAdjustedRow = rootView.findViewById(R.id.QuantityAdjustedRow);
71-
LinearLayout priceAdjustedRow = rootView.findViewById(R.id.PriceAdjustedRow);
72-
LinearLayout resultRow = rootView.findViewById(R.id.ResultRow);
73-
quantityAdjustedRow.setVisibility(View.VISIBLE);
74-
priceAdjustedRow.setVisibility(View.VISIBLE);
75-
resultRow.setVisibility(View.VISIBLE);
76-
}
77-
78-
return true;
79-
});
80-
8154
if (isIntentReadonly()) {
8255
disableView(etQuantity);
8356
disableView(etAmount);

‎claimManagement/src/main/java/org/openimis/imisclaims/AddServices.java‎

Lines changed: 2 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,14 @@
66
import android.text.Editable;
77
import android.text.TextWatcher;
88
import android.view.View;
9-
import android.view.ViewGroup;
10-
import android.view.ViewParent;
119
import android.widget.AutoCompleteTextView;
1210
import android.widget.Button;
1311
import android.widget.EditText;
14-
import android.widget.LinearLayout;
1512
import android.widget.ListView;
1613
import android.widget.SimpleAdapter;
1714
import android.widget.TextView;
1815

1916
import org.openimis.imisclaims.tools.Log;
20-
import org.openimis.imisclaims.util.StringUtils;
2117

2218
import java.util.HashMap;
2319

@@ -49,31 +45,8 @@ public void onCreate(Bundle savedInstanceState) {
4945
btnAdd = findViewById(R.id.btnAdd);
5046

5147
alAdapter = new SimpleAdapter(AddServices.this, ClaimActivity.lvServiceList, R.layout.lvitem,
52-
new String[]{"Code", "Name", "Price", "Quantity", "PriceAdjusted", "QuantityAdjusted", "Explanation", "Justification", "Result"},
53-
new int[]{R.id.tvLvCode, R.id.tvLvName, R.id.tvLvPrice, R.id.tvLvQuantity, R.id.tvLvPriceAdjusted, R.id.tvLvQuantityAdjusted, R.id.tvLvExplanation, R.id.tvLvJustification, R.id.tvLvResult});
54-
55-
alAdapter.setViewBinder((view, data, textRepresentation) -> {
56-
TextView textView = (TextView) view;
57-
textView.setText(textRepresentation);
58-
59-
int id = view.getId();
60-
61-
if ((id == R.id.tvLvPriceAdjusted || id == R.id.tvLvQuantityAdjusted || id == R.id.tvLvExplanation || id == R.id.tvLvJustification || id == R.id.tvLvResult) && !StringUtils.isEmpty(textRepresentation)) {
62-
view.getParent().getParent();
63-
64-
ViewGroup containingLayout = (ViewGroup) view.getParent().getParent();
65-
LinearLayout rootView = (LinearLayout) containingLayout.getParent();
66-
67-
LinearLayout quantityAdjustedRow = rootView.findViewById(R.id.QuantityAdjustedRow);
68-
LinearLayout priceAdjustedRow = rootView.findViewById(R.id.PriceAdjustedRow);
69-
LinearLayout resultRow = rootView.findViewById(R.id.ResultRow);
70-
quantityAdjustedRow.setVisibility(View.VISIBLE);
71-
priceAdjustedRow.setVisibility(View.VISIBLE);
72-
resultRow.setVisibility(View.VISIBLE);
73-
}
74-
75-
return true;
76-
});
48+
new String[]{"Code", "Name", "Price", "Quantity"},
49+
new int[]{R.id.tvLvCode, R.id.tvLvName, R.id.tvLvPrice, R.id.tvLvQuantity});
7750

7851
lvServices.setAdapter(alAdapter);
7952

‎claimManagement/src/main/java/org/openimis/imisclaims/AppInformation.java‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -30,18 +30,10 @@ public static String getDateFormat() {
3030
return "yyyy-MM-dd";
3131
}
3232

33-
public static String getTimeFormat() {
34-
return "HH:mm:ss";
35-
}
36-
3733
public static String getISODatetimeFormat() {
3834
return "yyyy-MM-dd'T'HH:mm:ss.SSSSSSSXXX";
3935
}
4036

41-
public static String getISOShortDatetimeFormat() {
42-
return "yyyy-MM-dd'T'HH:mm:ss";
43-
}
44-
4537
public static String getFileDatetimeFormat() {
4638
return "yyyy-MM-dd'T'HH-mm-ss";
4739
}
@@ -50,18 +42,10 @@ public static SimpleDateFormat getDefaultDateFormatter() {
5042
return new SimpleDateFormat(getDateFormat(), Locale.US);
5143
}
5244

53-
public static SimpleDateFormat getDefaultTimeFormatter() {
54-
return new SimpleDateFormat(getTimeFormat(), Locale.US);
55-
}
56-
5745
public static SimpleDateFormat getDefaultIsoDatetimeFormatter() {
5846
return new SimpleDateFormat(getISODatetimeFormat(), Locale.US);
5947
}
6048

61-
public static SimpleDateFormat getDefaultIsoShortDatetimeFormatter() {
62-
return new SimpleDateFormat(getISOShortDatetimeFormat(), Locale.US);
63-
}
64-
6549
public static SimpleDateFormat getDefaultFileDatetimeFormatter() {
6650
return new SimpleDateFormat(getFileDatetimeFormat(), Locale.US);
6751
}

‎claimManagement/src/main/java/org/openimis/imisclaims/ClaimActivity.java‎

Lines changed: 24 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@
2525
import org.json.JSONException;
2626
import org.json.JSONObject;
2727
import org.openimis.imisclaims.tools.Log;
28-
import org.openimis.imisclaims.util.JsonUtils;
29-
import org.openimis.imisclaims.util.StringUtils;
3028

3129
import java.text.SimpleDateFormat;
3230
import java.util.ArrayList;
@@ -54,7 +52,7 @@ public class ClaimActivity extends ImisActivity {
5452
private int year, month, day;
5553
int TotalItemService;
5654

57-
EditText etStartDate, etEndDate, etClaimCode, etHealthFacility, etInsureeNumber, etClaimAdmin, etGuaranteeNo, etTotalClaimed, etTotalApproved, etTotalAdjusted, etExplanation, etAdjustment;
55+
EditText etStartDate, etEndDate, etClaimCode, etHealthFacility, etInsureeNumber, etClaimAdmin, etGuaranteeNo;
5856
AutoCompleteTextView etDiagnosis, etDiagnosis1, etDiagnosis2, etDiagnosis3, etDiagnosis4;
5957
TextView tvItemTotal, tvServiceTotal;
6058
Button btnPost, btnNew;
@@ -97,11 +95,6 @@ protected void onCreate(Bundle savedInstanceState) {
9795
rbEmergency = findViewById(R.id.rbEmergency);
9896
rbReferral = findViewById(R.id.rbReferral);
9997
rbOther = findViewById(R.id.rbOther);
100-
etTotalClaimed = findViewById(R.id.etTotalClaimed);
101-
etTotalApproved = findViewById(R.id.etTotalApproved);
102-
etTotalAdjusted = findViewById(R.id.etTotalAdjusted);
103-
etExplanation = findViewById(R.id.etExplanation);
104-
etAdjustment = findViewById(R.id.etAdjustment);
10598

10699

107100
tvItemTotal.setText("0");
@@ -161,7 +154,6 @@ protected void onCreate(Bundle savedInstanceState) {
161154
}));
162155
}),
163156
() -> {
164-
progressDialog.dismiss();
165157
},
166158
500
167159
);
@@ -395,7 +387,7 @@ private void fillClaimFromRestore(String claimRestoreText) {
395387

396388
if (etGuaranteeNo.getVisibility() != View.GONE) {
397389
String guaranteeNumber = claim.getString("guarantee_number");
398-
if (StringUtils.isEmpty(guaranteeNumber, true))
390+
if ("".equals(guaranteeNumber) || "null".equals(guaranteeNumber))
399391
etGuaranteeNo.setText("");
400392
else etGuaranteeNo.setText(guaranteeNumber);
401393
}
@@ -479,27 +471,27 @@ private void fillClaimFromDatabase(String claimUUID) {
479471
try {
480472
JSONObject claimDetails = claimObject.getJSONObject("details");
481473

482-
etClaimCode.setText(claimDetails.optString("ClaimCode"));
474+
etClaimCode.setText(claimDetails.getString("ClaimCode"));
483475
if (etClaimAdmin.getVisibility() != View.GONE) {
484-
etClaimAdmin.setText(claimDetails.optString("ClaimAdmin"));
476+
etClaimAdmin.setText(claimDetails.getString("ClaimAdmin"));
485477
}
486-
etHealthFacility.setText(claimDetails.optString("HFCode"));
478+
etHealthFacility.setText(claimDetails.getString("HFCode"));
487479

488480
if (etGuaranteeNo.getVisibility() != View.GONE) {
489-
etGuaranteeNo.setText(claimDetails.optString("GuaranteeNumber"));
481+
etGuaranteeNo.setText(claimDetails.getString("GuaranteeNumber"));
490482
}
491483

492-
etInsureeNumber.setText(claimDetails.optString("InsureeNumber"));
493-
etStartDate.setText(claimDetails.optString("StartDate"));
494-
etEndDate.setText(claimDetails.optString("EndDate"));
484+
etInsureeNumber.setText(claimDetails.getString("InsureeNumber"));
485+
etStartDate.setText(claimDetails.getString("StartDate"));
486+
etEndDate.setText(claimDetails.getString("EndDate"));
495487

496-
etDiagnosis.setText(claimDetails.optString("ICDCode"));
497-
etDiagnosis1.setText(claimDetails.optString("ICDCode1"));
498-
etDiagnosis2.setText(claimDetails.optString("ICDCode2"));
499-
etDiagnosis3.setText(claimDetails.optString("ICDCode3"));
500-
etDiagnosis4.setText(claimDetails.optString("ICDCode4"));
488+
etDiagnosis.setText(claimDetails.getString("ICDCode"));
489+
etDiagnosis1.setText(claimDetails.getString("ICDCode1"));
490+
etDiagnosis2.setText(claimDetails.getString("ICDCode2"));
491+
etDiagnosis3.setText(claimDetails.getString("ICDCode3"));
492+
etDiagnosis4.setText(claimDetails.getString("ICDCode4"));
501493

502-
switch (claimDetails.optString("VisitType").substring(0, 1)) {
494+
switch (claimDetails.getString("VisitType")) {
503495
case "E":
504496
rgVisitType.check(R.id.rbEmergency);
505497
break;
@@ -513,44 +505,17 @@ private void fillClaimFromDatabase(String claimUUID) {
513505
rgVisitType.clearCheck();
514506
}
515507

516-
// Show claim adjustment if available (after update)
517-
if (!(JsonUtils.isStringEmpty(claimDetails, "Total", true)
518-
&& JsonUtils.isStringEmpty(claimDetails, "TotalApproved", true)
519-
&& JsonUtils.isStringEmpty(claimDetails, "TotalAdjusted", true)
520-
&& JsonUtils.isStringEmpty(claimDetails, "Explanation", true)
521-
&& JsonUtils.isStringEmpty(claimDetails, "Adjustment", true))) {
522-
523-
etTotalClaimed.setVisibility(View.VISIBLE);
524-
etTotalApproved.setVisibility(View.VISIBLE);
525-
etTotalAdjusted.setVisibility(View.VISIBLE);
526-
etExplanation.setVisibility(View.VISIBLE);
527-
etAdjustment.setVisibility(View.VISIBLE);
528-
529-
etTotalClaimed.setText(claimDetails.optString("Total"));
530-
etTotalApproved.setText(claimDetails.optString("TotalApproved"));
531-
etTotalAdjusted.setText(claimDetails.optString("TotalAdjusted"));
532-
etExplanation.setText(claimDetails.optString("Explanation"));
533-
etAdjustment.setText(claimDetails.optString("Adjustment"));
534-
}
535-
536-
537508
lvItemList.clear();
538509
if (claimObject.has("items")) {
539510
JSONArray items = claimObject.getJSONArray("items");
540511
for (int i = 0; i < items.length(); i++) {
541512
HashMap<String, String> item = new HashMap<>();
542513
JSONObject itemJson = items.getJSONObject(i);
543514

544-
item.put("Name", sqlHandler.getReferenceName(itemJson.optString("ItemCode")));
545-
item.put("Code", itemJson.optString("ItemCode"));
546-
item.put("Price", itemJson.optString("ItemPrice"));
547-
item.put("Quantity", itemJson.optString("ItemQuantity"));
548-
item.put("PriceAdjusted", itemJson.optString("ItemPriceAdjusted"));
549-
item.put("QuantityAdjusted", itemJson.optString("ItemQuantityAdjusted"));
550-
item.put("Explanation", itemJson.optString("ItemExplanation"));
551-
item.put("Justification", itemJson.optString("ItemJustification"));
552-
item.put("Valuated", itemJson.optString("ItemValuated"));
553-
item.put("Result", itemJson.optString("ItemResult"));
515+
item.put("Name", sqlHandler.getReferenceName(itemJson.getString("ItemCode")));
516+
item.put("Code", itemJson.getString("ItemCode"));
517+
item.put("Price", itemJson.getString("ItemPrice"));
518+
item.put("Quantity", itemJson.getString("ItemQuantity"));
554519

555520
lvItemList.add(item);
556521
}
@@ -564,16 +529,10 @@ private void fillClaimFromDatabase(String claimUUID) {
564529
HashMap<String, String> service = new HashMap<>();
565530
JSONObject serviceJson = services.getJSONObject(i);
566531

567-
service.put("Name", sqlHandler.getReferenceName(serviceJson.optString("ServiceCode")));
568-
service.put("Code", serviceJson.optString("ServiceCode"));
569-
service.put("Price", serviceJson.optString("ServicePrice"));
570-
service.put("Quantity", serviceJson.optString("ServiceQuantity"));
571-
service.put("PriceAdjusted", serviceJson.optString("ServicePriceAdjusted"));
572-
service.put("QuantityAdjusted", serviceJson.optString("ServiceQuantityAdjusted"));
573-
service.put("Explanation", serviceJson.optString("ServiceExplanation"));
574-
service.put("Justification", serviceJson.optString("ServiceJustification"));
575-
service.put("Valuated", serviceJson.optString("ServiceValuated"));
576-
service.put("Result", serviceJson.optString("ServiceResult"));
532+
service.put("Name", sqlHandler.getReferenceName(serviceJson.getString("ServiceCode")));
533+
service.put("Code", serviceJson.getString("ServiceCode"));
534+
service.put("Price", serviceJson.getString("ServicePrice"));
535+
service.put("Quantity", serviceJson.getString("ServiceQuantity"));
577536

578537
lvServiceList.add(service);
579538
}
@@ -705,7 +664,7 @@ protected void showValidationDialog(View view, String msg) {
705664
}
706665

707666
protected void confirmNewDialog(String msg) {
708-
runOnUiThread(() -> showDialog(null, msg, (dialog, which) -> ClearForm(), (dialog, which) -> dialog.dismiss()));
667+
runOnUiThread(() -> showDialog(msg, (dialog, which) -> ClearForm(), (dialog, which) -> dialog.dismiss()));
709668
}
710669

711670
private boolean saveClaim() {
@@ -721,16 +680,13 @@ private boolean saveClaim() {
721680
Calendar cal = Calendar.getInstance();
722681
String claimDate = format.format(cal.getTime());
723682

724-
SimpleDateFormat isoFormat = AppInformation.DateTimeInfo.getDefaultIsoShortDatetimeFormatter();
725-
726683
int SelectedId;
727684
SelectedId = rgVisitType.getCheckedRadioButtonId();
728685
RadioButton selectedTypeButton;
729686
selectedTypeButton = findViewById(SelectedId);
730687
String visitType = selectedTypeButton.getTag().toString();
731688

732689
ContentValues claimCV = new ContentValues();
733-
String updateDate = isoFormat.format(new Date());
734690

735691
claimCV.put("ClaimUUID", claimUUID);
736692
claimCV.put("ClaimDate", claimDate);
@@ -749,7 +705,6 @@ private boolean saveClaim() {
749705
claimCV.put("ICDCode3", etDiagnosis3.getText().toString());
750706
claimCV.put("ICDCode4", etDiagnosis4.getText().toString());
751707
claimCV.put("VisitType", visitType);
752-
claimCV.put("LastUpdated", updateDate);
753708

754709
ArrayList<ContentValues> claimItemCVs = new ArrayList<>(lvItemList.size());
755710
for (int i = 0; i < lvItemList.size(); i++) {
@@ -759,7 +714,6 @@ private boolean saveClaim() {
759714
claimItemCV.put("ItemCode", lvItemList.get(i).get("Code"));
760715
claimItemCV.put("ItemPrice", lvItemList.get(i).get("Price"));
761716
claimItemCV.put("ItemQuantity", lvItemList.get(i).get("Quantity"));
762-
claimItemCV.put("LastUpdated", updateDate);
763717

764718
claimItemCVs.add(claimItemCV);
765719
}
@@ -772,7 +726,6 @@ private boolean saveClaim() {
772726
claimServiceCV.put("ServiceCode", lvServiceList.get(i).get("Code"));
773727
claimServiceCV.put("ServicePrice", lvServiceList.get(i).get("Price"));
774728
claimServiceCV.put("ServiceQuantity", lvServiceList.get(i).get("Quantity"));
775-
claimServiceCV.put("LastUpdated", updateDate);
776729

777730
claimServiceCVs.add(claimServiceCV);
778731
}

‎claimManagement/src/main/java/org/openimis/imisclaims/EnquireActivity.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@ private void getInsureeInfo() {
277277
} else if (responseCode == HttpURLConnection.HTTP_NOT_FOUND) {
278278
runOnUiThread(() -> showDialog(getResources().getString(R.string.RecordNotFound)));
279279
} else {
280-
runOnUiThread(() -> showDialog(rest.getHttpError(this, responseCode, response.getStatusLine().getReasonPhrase(), null)));
280+
runOnUiThread(() -> showDialog(rest.getHttpError(this, responseCode, response.getStatusLine().getReasonPhrase())));
281281
}
282282
} catch (Exception e) {
283283
Log.e(LOG_TAG, "Fetching online enquire failed", e);

0 commit comments

Comments
 (0)