Skip to content

fix complex product process #124

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

Open
vaneck237 wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

fix complex product process #124

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
1 change: 1 addition & 0 deletions claimManagement/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ repositories {
}

android {
namespace 'org.openimis.imisclaims'
compileSdkVersion 32
buildToolsVersion '33.0.0'

Expand Down
25 changes: 11 additions & 14 deletions claimManagement/src/main/java/org/openimis/imisclaims/CustomAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
package org.openimis.imisclaims;
import static org.openimis.imisclaims.util.AndroidUtils.showDialog;

import android.content.Context;
import android.text.Editable;
import android.text.TextWatcher;
Expand All @@ -8,10 +10,6 @@
import android.widget.BaseAdapter;
import android.widget.EditText;
import android.widget.TextView;
import android.widget.Toast;

import org.json.JSONException;
import org.json.JSONObject;

import java.util.ArrayList;
public class CustomAdapter extends BaseAdapter {
Expand Down Expand Up @@ -71,7 +69,7 @@ public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2)
@Override
public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) {
// faire les controle en fonction du package type
if(!holder.editQty.getText().toString().equals("")){
if(!holder.editQty.getText().toString().isEmpty()){
editModelArrayList.get(position).setQty(holder.editQty.getText().toString());
}else{
editModelArrayList.get(position).setQty("0");
Expand All @@ -80,31 +78,30 @@ public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) {
@Override
public void afterTextChanged(Editable editable) {
float amount = 0;
int qtyMax = Integer.valueOf(editModelArrayList.get(position).getQtyMax());
int qtyMax = Integer.parseInt(editModelArrayList.get(position).getQtyMax());
if(!holder.editQty.getText().toString().isEmpty()){
float qty = Float.parseFloat(holder.editQty.getText().toString());
if (AddServices.packageType.equals("F")){
if(Float.valueOf(holder.editQty.getText().toString()) > qtyMax){
Toast.makeText(context, context.getResources().getString(R.string.qtyAlert) + " " + qtyMax, Toast.LENGTH_LONG).show();
holder.editQty.setText(String.valueOf(qtyMax));
if( qty > qtyMax){
holder.editQty.setError(context.getResources().getString(R.string.qtyAlert) + " " + qtyMax);
}
}else if (AddServices.packageType.equals("P")){
if(Float.valueOf(holder.editQty.getText().toString()) != qtyMax && Float.valueOf(holder.editQty.getText().toString()) != 0 ){
Toast.makeText(context, context.getResources().getString(R.string.qtyAlertAsk) + " " + qtyMax, Toast.LENGTH_LONG).show();
holder.editQty.setText(String.valueOf(qtyMax));
if(qty != qtyMax && qty != 0){
holder.editQty.setError(context.getResources().getString(R.string.qtyAlertAsk) + " " + qtyMax);
}
}
}
if(AddServices.manualPrice.equals("0")){
for(int i = 0 ; i < editModelArrayList.size(); i++){
amount = amount + (Float.valueOf(editModelArrayList.get(i).getQty()) * Float.valueOf(editModelArrayList.get(i).getPrice()));
amount = amount + (Float.parseFloat(editModelArrayList.get(i).getQty()) * Float.parseFloat(editModelArrayList.get(i).getPrice()));
}
AddServices.etSAmount.setText(String.valueOf(amount));
}
}
});
return convertView;
}
private class ViewHolder {
private static class ViewHolder {
protected EditText editQty;
protected EditText editName;
protected EditText editPrice;
Expand Down
2 changes: 2 additions & 0 deletions gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
android.enableJetifier=true
android.useAndroidX=true
android.defaults.buildfeatures.buildconfig=true
android.nonFinalResIds=false
Loading