control manualPrice fields for complex product

vaneck237 · vaneck237 · commit f88bbb3cd820 · 2025-01-06T10:09:27.000+01:00
diff --git a/claimManagement/build.gradle b/claimManagement/build.gradle
@@ -81,7 +81,7 @@ android {
         comoresDev{
             applicationIdSuffix ".comoresDev"
             resValue "string", "app_name_claims", "Claims Comores"
-            buildConfigField "String", "API_BASE_URL", '"https://test.amg.km/"'
+            buildConfigField "String", "API_BASE_URL", '"https://dev.amg.km/"'
             dimension 'std'
         }
 
diff --git a/claimManagement/src/main/graphql/org.openimis.imisclaim/GetServices.graphql b/claimManagement/src/main/graphql/org.openimis.imisclaim/GetServices.graphql
@@ -12,6 +12,7 @@ query GetServices ($offset: Int) {
         type
         price
         careType
+        manualPrice
         serviceserviceSet {
           service {
             id
diff --git a/claimManagement/src/main/graphql/org.openimis.imisclaim/schema.graphqls b/claimManagement/src/main/graphql/org.openimis.imisclaim/schema.graphqls
@@ -1076,6 +1076,7 @@ type ServiceGQLType implements Node {
   claimserviceSet: [ClaimServiceGQLType!]!
   serviceserviceSet: [SubServiceGQLType]
   servicesLinked: [SubItemGQLType]
+  manualPrice: Boolean
 }
 
 type SubServiceGQLType {
diff --git a/claimManagement/src/main/java/org/openimis/imisclaims/AddServices.java b/claimManagement/src/main/java/org/openimis/imisclaims/AddServices.java
@@ -41,6 +41,7 @@ public class AddServices extends ImisActivity {
     public static ArrayList<HashMap<String, String>> lvSServiceList;
     public static ArrayList<HashMap<String, String>> lvSItemList;
     public static String packageType;
+    public static String manualPrice;
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
@@ -92,6 +93,7 @@ public void onCreate(Bundle savedInstanceState) {
                     String Code = cursor.getString(itemColumnIndex);
                     String Name = cursor.getString(descColumnIndex);
                     packageType = sqlHandler.getPackageType(Code);
+                    manualPrice = sqlHandler.getManualPrice(Code);
                     String id = sqlHandler.getServiceId(Code);
 
                     oService = new HashMap<>();
@@ -103,8 +105,10 @@ public void onCreate(Bundle savedInstanceState) {
                     etSAmount.setText(sqlHandler.getServicePrice(Code));
                     etSName.setText(sqlHandler.getServiceName(Code));
                     if (!packageType.equals("S")) {
-                        etSAmount.setText("");
-                        sServicePrice = 0;
+                        if(manualPrice.equals("0")){
+                            etSAmount.setText("");
+                            sServicePrice = 0;
+                        }
                         try {
                             JSONArray subServices = sqlHandler.getSubServicesIds(id);
                             JSONArray subServiceArr = new JSONArray();
@@ -132,7 +136,6 @@ public void onCreate(Bundle savedInstanceState) {
                                 sService.put("QtyMax", obj.getString("QuantityMax"));
                                 lvSServiceList.add(sService);
                             }
-                            Log.e("subItems",subItemArr.toString());
                             for (int i = 0; i < subItemArr.length(); i++) {
                                 JSONObject obj = subItemArr.getJSONObject(i);
                                 HashMap<String, String> sItem = new HashMap<>();
diff --git a/claimManagement/src/main/java/org/openimis/imisclaims/CustomAdapter.java b/claimManagement/src/main/java/org/openimis/imisclaims/CustomAdapter.java
@@ -76,7 +76,7 @@ public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) {
             public void afterTextChanged(Editable editable) {
                 float amount = 0;
                 int qtyMax = Integer.valueOf(editModelArrayList.get(position).getQtyMax());
-                if(!holder.editQty.getText().toString().equals("")){
+                if(!holder.editQty.getText().toString().isEmpty()){
                     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();
@@ -89,10 +89,12 @@ public void afterTextChanged(Editable editable) {
                         }
                     }
                 }
-                for(int i = 0 ; i < editModelArrayList.size(); i++){
-                    amount = amount + (Float.valueOf(editModelArrayList.get(i).getQty()) * Float.valueOf(editModelArrayList.get(i).getPrice())) ;
+                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()));
+                    }
+                    AddServices.etSAmount.setText(String.valueOf(amount));
                 }
-                AddServices.etSAmount.setText(String.valueOf(amount));
             }
         });
         return convertView;
diff --git a/claimManagement/src/main/java/org/openimis/imisclaims/MainActivity.java b/claimManagement/src/main/java/org/openimis/imisclaims/MainActivity.java
@@ -754,7 +754,8 @@ public void downloadServices(@Nullable final String officerCode) {
                                     service.getCode(),
                                     service.getName(), "S",
                                     String.valueOf(service.getPrice()),
-                                    service.getPackageType());
+                                    service.getPackageType(),
+                                    service.getManualPrice());
 
                             if (service.getSubServices() != null && !service.getSubServices().isEmpty()) {
                                 List<SubServiceItem> subServices = service.getSubServices();
diff --git a/claimManagement/src/main/java/org/openimis/imisclaims/SQLHandler.java b/claimManagement/src/main/java/org/openimis/imisclaims/SQLHandler.java
@@ -44,7 +44,7 @@ public class SQLHandler extends SQLiteOpenHelper {
     private static final String createTableClaimItems = "CREATE TABLE IF NOT EXISTS tblClaimItems(ClaimUUID TEXT, ItemId TEXT, ItemCode TEXT, ItemPrice TEXT, ItemQuantity TEXT);";
     private static final String createTableClaimServices = "CREATE TABLE IF NOT EXISTS tblClaimServices(ClaimUUID TEXT,ServiceId 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);";
-    private static final String CreateTableServices = "CREATE TABLE IF NOT EXISTS tblServices(Id text, Code text, Name text, Type text, Price text, PackageType text);";
+    private static final String CreateTableServices = "CREATE TABLE IF NOT EXISTS tblServices(Id text, Code text, Name text, Type text, Price text, PackageType text, ManualPrice Int);";
     private static final String CreateTableItems = "CREATE TABLE IF NOT EXISTS tblItems(Id text, Code text, Name text, Type text, Price text);";
     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);";
@@ -702,6 +702,22 @@ public String getPackageType(String code) {
         return packageType;
     }
 
+    public String getManualPrice(String code) {
+        String manualPrice = "";
+        try (Cursor c = db.query("tblServices", new String[]{"ManualPrice"}, "LOWER(Code) = LOWER(?)", new String[]{code}, null, null, null, "1")) {
+            c.moveToFirst();
+            if (!c.isAfterLast()) {
+                String result = c.getString(0);
+                if (!TextUtils.isEmpty(result)) {
+                    manualPrice = result;
+                }
+            }
+        } catch (SQLException e) {
+            Log.d("ErrorOnFetchingData", String.format("Error while getting price of %s", code), e);
+        }
+        return manualPrice;
+    }
+
     public String getServiceId(String code) {
         String id = "";
         try (Cursor c = db.query("tblServices", new String[]{"Id"}, "LOWER(Code) = LOWER(?)", new String[]{code}, null, null, null, "1")) {
@@ -734,7 +750,7 @@ public String getItemId(String code) {
         return id;
     }
 
-    public void InsertService(String Id, String Code, String Name, String Type, String Price, String PackageType) {
+    public void InsertService(String Id, String Code, String Name, String Type, String Price, String PackageType, int ManualPrice) {
         try {
             ContentValues cv = new ContentValues();
             cv.put("Id", Id);
@@ -743,6 +759,7 @@ public void InsertService(String Id, String Code, String Name, String Type, Stri
             cv.put("Type", Type);
             cv.put("Price", Price);
             cv.put("PackageType", PackageType);
+            cv.put("ManualPrice", ManualPrice);
             db.insert("tblServices", null, cv);
         } catch (Exception e) {
             e.printStackTrace();
diff --git a/claimManagement/src/main/java/org/openimis/imisclaims/domain/entity/Service.java b/claimManagement/src/main/java/org/openimis/imisclaims/domain/entity/Service.java
@@ -28,6 +28,7 @@ public class Service implements Parcelable {
     private List<SubServiceItem> subItems;
     @Nullable
     private String packageType;
+    private int manualPrice;
 
     public Service(
             @NonNull String id,
@@ -36,6 +37,7 @@ public Service(
             double price,
             @NonNull String currency,
             @Nullable String packageType,
+            int manualPrice,
             @Nullable List<SubServiceItem> subServices,
             @Nullable List<SubServiceItem> subItems
     ){
@@ -45,6 +47,7 @@ public Service(
         this.price = price;
         this.currency = currency;
         this.packageType = packageType;
+        this.manualPrice = manualPrice;
         this.subServices = subServices;
         this.subItems = subItems;
     }
@@ -68,6 +71,7 @@ protected Service(Parcel in) {
         price = in.readDouble();
         currency = in.readString();
         packageType = in.readString();
+        manualPrice = in.readInt();
         subServices = in.createTypedArrayList(SubServiceItem.CREATOR);
         subItems = in.createTypedArrayList(SubServiceItem.CREATOR);
     }
@@ -82,6 +86,7 @@ public void writeToParcel(Parcel dest, int flags) {
         dest.writeString(packageType);
         dest.writeTypedList(subServices);
         dest.writeTypedList(subItems);
+        dest.writeInt(manualPrice);
     }
 
     @Override
@@ -113,6 +118,8 @@ public String getCurrency() {
 
     @NonNull
     public  String getPackageType(){ return packageType; }
+    @NonNull
+    public int getManualPrice(){ return manualPrice; }
     @Nullable
     public List<SubServiceItem> getSubServices() {
         return subServices;
diff --git a/claimManagement/src/main/java/org/openimis/imisclaims/usecase/FetchServices.java b/claimManagement/src/main/java/org/openimis/imisclaims/usecase/FetchServices.java
@@ -56,6 +56,7 @@ private Service toService(
                 /* price = */ node.price(),
                 "XAF",
                 /* packageType = */ node.packagetype(),
+                /* manualPrice = */ node.manualPrice() ? 1 : 0,
                 /* subServices = */ subServiceMapper.map(node.serviceserviceSet()),
                 /* subItems = */ subItemMapper.map(node.servicesLinked())
         );

Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ android {`
`81`	`81`	`comoresDev{`
`82`	`82`	`applicationIdSuffix ".comoresDev"`
`83`	`83`	`resValue "string", "app_name_claims", "Claims Comores"`
`84`		`- buildConfigField "String", "API_BASE_URL", '"https://test.amg.km/"'`
	`84`	`+ buildConfigField "String", "API_BASE_URL", '"https://dev.amg.km/"'`
`85`	`85`	`dimension 'std'`
`86`	`86`	`}`
`87`	`87`
Original file line number	Diff line number	Diff line change
`@@ -1076,6 +1076,7 @@ type ServiceGQLType implements Node {`
`1076`	`1076`	`claimserviceSet: [ClaimServiceGQLType!]!`
`1077`	`1077`	`serviceserviceSet: [SubServiceGQLType]`
`1078`	`1078`	`servicesLinked: [SubItemGQLType]`
	`1079`	`+ manualPrice: Boolean`
`1079`	`1080`	`}`
`1080`	`1081`
`1081`	`1082`	`type SubServiceGQLType {`
Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) {`
`76`	`76`	`public void afterTextChanged(Editable editable) {`
`77`	`77`	`float amount = 0;`
`78`	`78`	`int qtyMax = Integer.valueOf(editModelArrayList.get(position).getQtyMax());`
`79`		`- if(!holder.editQty.getText().toString().equals("")){`
	`79`	`+ if(!holder.editQty.getText().toString().isEmpty()){`
`80`	`80`	`if (AddServices.packageType.equals("F")){`
`81`	`81`	`if(Float.valueOf(holder.editQty.getText().toString()) > qtyMax){`
`82`	`82`	`Toast.makeText(context, context.getResources().getString(R.string.qtyAlert) + " " + qtyMax, Toast.LENGTH_LONG).show();`
`@@ -89,10 +89,12 @@ public void afterTextChanged(Editable editable) {`
`89`	`89`	`}`
`90`	`90`	`}`
`91`	`91`	`}`
`92`		`- for(int i = 0 ; i < editModelArrayList.size(); i++){`
`93`		`- amount = amount + (Float.valueOf(editModelArrayList.get(i).getQty()) * Float.valueOf(editModelArrayList.get(i).getPrice())) ;`
	`92`	`+ if(AddServices.manualPrice.equals("0")){`
	`93`	`+ for(int i = 0 ; i < editModelArrayList.size(); i++){`
	`94`	`+ amount = amount + (Float.valueOf(editModelArrayList.get(i).getQty()) * Float.valueOf(editModelArrayList.get(i).getPrice()));`
	`95`	`+ }`
	`96`	`+ AddServices.etSAmount.setText(String.valueOf(amount));`
`94`	`97`	`}`
`95`		`- AddServices.etSAmount.setText(String.valueOf(amount));`
`96`	`98`	`}`
`97`	`99`	`});`
`98`	`100`	`return convertView;`