From 3a7c5f42b427f2c6b5b34d85c26cb089a4f8811b Mon Sep 17 00:00:00 2001 From: Gagan290 Date: Fri, 24 Mar 2017 17:36:50 +0530 Subject: [PATCH] Additional Visibility Correction --- .../cpm/com/gskmtorange/Database/GSKOrangeDB.java | 1 + .../dailyentry/AdditionalVisibility.java | 4 +++- .../dailyentry/T2PComplianceActivity.java | 4 ++-- .../MSL_Availability_StockFacingActivity.java | 13 +++++++++++++ 4 files changed, 19 insertions(+), 3 deletions(-) diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java index e1137ce..8ecd248 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java @@ -198,6 +198,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper { db.delete(CommonString.TABLE_INSERT_CATEGORY_PICTURE_LIST, "Store_Id='" + storeid + "'", null); + db.delete(CommonString.TABLE_INSERT_MSL_AVAILABILITY_STOCK_FACING, "Store_Id='" + storeid + "'", null); } public void deleteAllTables() { diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/AdditionalVisibility.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/AdditionalVisibility.java index a442d98..8c61768 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/AdditionalVisibility.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/AdditionalVisibility.java @@ -447,7 +447,9 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl adGt.setBtn_toogle(togglevalue); adGt.setCategoryId(categoryId); - adGt.setSkuDialogList(defdata); + ArrayList listdataTemp = new ArrayList<>(); + listdataTemp.addAll(defdata); + adGt.setSkuDialogList(listdataTemp); if (validateData(adGt)) { AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder( diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2PComplianceActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2PComplianceActivity.java index b3d12fa..6d2ea5a 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2PComplianceActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2PComplianceActivity.java @@ -259,7 +259,7 @@ public class T2PComplianceActivity extends AppCompatActivity { if (((ToggleButton) v).getText().toString().equalsIgnoreCase(getResources().getString(R.string.yes))) { mItem.setPresent(true); } else { - mItem.setPresent(false); + /* mItem.setPresent(false); mItem.getGapsChecklist().clear(); mItem.getSkulist().clear(); @@ -280,7 +280,7 @@ public class T2PComplianceActivity extends AppCompatActivity { new File(str + mItem.getImage2()).delete(); mItem.setImage2(""); } - +*/ AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(T2PComplianceActivity.this); alertDialogBuilder.setTitle(getResources().getString(R.string.dialog_title)); diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/MSL_Availability_StockFacingActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/MSL_Availability_StockFacingActivity.java index 5c8f1ed..b88b563 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/MSL_Availability_StockFacingActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/MSL_Availability_StockFacingActivity.java @@ -716,9 +716,21 @@ public class MSL_Availability_StockFacingActivity extends AppCompatActivity { childData.setToggleValue("1"); finalHolder.stock.setVisibility(View.GONE); childData.setStock(""); + childData.setFacing(""); } else { + childData.setStock(""); + childData.setFacing(""); + childData.setToggleValue("0"); finalHolder.stock.setVisibility(View.VISIBLE); + + if (Integer.parseInt(childData.getMbq()) == 0) { + childData.setStock("0"); + childData.setFacing("0"); + + /*finalHolder.stock.setText("0"); + finalHolder.facing.setText("0");*/ + } } expandableListView.invalidateViews(); @@ -734,6 +746,7 @@ public class MSL_Availability_StockFacingActivity extends AppCompatActivity { } + final ViewHolder finalHolder2 = holder; holder.stock.setOnFocusChangeListener(new View.OnFocusChangeListener() { @Override public void onFocusChange(View v, boolean hasFocus) {