Skip to content

Commit a78333a

Browse files
committed
fix complex product process
1 parent e530891 commit a78333a

3 files changed

Lines changed: 14 additions & 14 deletions

File tree

claimManagement/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ repositories {
1919
}
2020

2121
android {
22+
namespace 'org.openimis.imisclaims'
2223
compileSdkVersion 32
2324
buildToolsVersion '33.0.0'
2425

claimManagement/src/main/java/org/openimis/imisclaims/CustomAdapter.java

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
package org.openimis.imisclaims;
2+
import static org.openimis.imisclaims.util.AndroidUtils.showDialog;
3+
24
import android.content.Context;
35
import android.text.Editable;
46
import android.text.TextWatcher;
@@ -8,10 +10,6 @@
810
import android.widget.BaseAdapter;
911
import android.widget.EditText;
1012
import android.widget.TextView;
11-
import android.widget.Toast;
12-
13-
import org.json.JSONException;
14-
import org.json.JSONObject;
1513

1614
import java.util.ArrayList;
1715
public class CustomAdapter extends BaseAdapter {
@@ -71,7 +69,7 @@ public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2)
7169
@Override
7270
public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) {
7371
// faire les controle en fonction du package type
74-
if(!holder.editQty.getText().toString().equals("")){
72+
if(!holder.editQty.getText().toString().isEmpty()){
7573
editModelArrayList.get(position).setQty(holder.editQty.getText().toString());
7674
}else{
7775
editModelArrayList.get(position).setQty("0");
@@ -80,31 +78,30 @@ public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) {
8078
@Override
8179
public void afterTextChanged(Editable editable) {
8280
float amount = 0;
83-
int qtyMax = Integer.valueOf(editModelArrayList.get(position).getQtyMax());
81+
int qtyMax = Integer.parseInt(editModelArrayList.get(position).getQtyMax());
8482
if(!holder.editQty.getText().toString().isEmpty()){
83+
float qty = Float.parseFloat(holder.editQty.getText().toString());
8584
if (AddServices.packageType.equals("F")){
86-
if(Float.valueOf(holder.editQty.getText().toString()) > qtyMax){
87-
Toast.makeText(context, context.getResources().getString(R.string.qtyAlert) + " " + qtyMax, Toast.LENGTH_LONG).show();
88-
holder.editQty.setText(String.valueOf(qtyMax));
85+
if( qty > qtyMax){
86+
holder.editQty.setError(context.getResources().getString(R.string.qtyAlert) + " " + qtyMax);
8987
}
9088
}else if (AddServices.packageType.equals("P")){
91-
if(Float.valueOf(holder.editQty.getText().toString()) != qtyMax && Float.valueOf(holder.editQty.getText().toString()) != 0 ){
92-
Toast.makeText(context, context.getResources().getString(R.string.qtyAlertAsk) + " " + qtyMax, Toast.LENGTH_LONG).show();
93-
holder.editQty.setText(String.valueOf(qtyMax));
89+
if(qty != qtyMax && qty != 0){
90+
holder.editQty.setError(context.getResources().getString(R.string.qtyAlertAsk) + " " + qtyMax);
9491
}
9592
}
9693
}
9794
if(AddServices.manualPrice.equals("0")){
9895
for(int i = 0 ; i < editModelArrayList.size(); i++){
99-
amount = amount + (Float.valueOf(editModelArrayList.get(i).getQty()) * Float.valueOf(editModelArrayList.get(i).getPrice()));
96+
amount = amount + (Float.parseFloat(editModelArrayList.get(i).getQty()) * Float.parseFloat(editModelArrayList.get(i).getPrice()));
10097
}
10198
AddServices.etSAmount.setText(String.valueOf(amount));
10299
}
103100
}
104101
});
105102
return convertView;
106103
}
107-
private class ViewHolder {
104+
private static class ViewHolder {
108105
protected EditText editQty;
109106
protected EditText editName;
110107
protected EditText editPrice;

gradle.properties

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
android.enableJetifier=true
22
android.useAndroidX=true
3+
android.defaults.buildfeatures.buildconfig=true
4+
android.nonFinalResIds=false

0 commit comments

Comments
 (0)