From b340e292e503e2e200b16f44444af085efba6552 Mon Sep 17 00:00:00 2001 From: Gagan290 Date: Mon, 16 Jan 2017 18:00:12 +0530 Subject: [PATCH] //Stock_FacingActivity Changes today --- .../com/gskmtorange/Database/GSKOrangeDB.java | 8 +-- .../MSL_AvailabilityActivity.java | 18 +++-- .../PromoComplianceActivity.java | 65 ++++++++++--------- .../gsk_dailyentry/Stock_FacingActivity.java | 2 +- 4 files changed, 46 insertions(+), 47 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 cd83fb0..58c8bef 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java @@ -974,13 +974,13 @@ public class GSKOrangeDB extends SQLiteOpenHelper { } } - public ArrayList getMSL_AvailabilitySKU_AfterSaveData(String category_id, String brand_id) { + public ArrayList getMSL_AvailabilitySKU_AfterSaveData(String category_id, String brand_id, String store_id) { ArrayList list = new ArrayList<>(); Cursor dbcursor = null; try { dbcursor = db.rawQuery("Select * from Msl_Availability_Data " + - "where category_id='" + category_id + "' and Brand_Id='" + brand_id + "'", null); + "where category_id='" + category_id + "' and Brand_Id='" + brand_id + "' AND Store_Id='" + store_id + "'", null); if (dbcursor != null) { dbcursor.moveToFirst(); @@ -1232,13 +1232,13 @@ public class GSKOrangeDB extends SQLiteOpenHelper { return list; } - public ArrayList getStockAndFacingSKU_AfterSaveData(String category_id, String brand_id) { + public ArrayList getStockAndFacingSKU_AfterSaveData(String category_id, String brand_id, String store_id) { ArrayList list = new ArrayList<>(); Cursor dbcursor = null; try { dbcursor = db.rawQuery("Select * from Stock_Facing_Child_Data " + - "where category_id='" + category_id + "' and Brand_Id='" + brand_id + "'", null); + "where category_id='" + category_id + "' and Brand_Id='" + brand_id + "' AND Store_Id='" + store_id + "'", null); if (dbcursor != null) { dbcursor.moveToFirst(); diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/MSL_AvailabilityActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/MSL_AvailabilityActivity.java index dc5c0b5..ac5c33e 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/MSL_AvailabilityActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/MSL_AvailabilityActivity.java @@ -72,11 +72,11 @@ public class MSL_AvailabilityActivity extends AppCompatActivity { db = new GSKOrangeDB(this); db.open(); - + //preference data preferences = PreferenceManager.getDefaultSharedPreferences(this); - updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, "")); + updateResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, "")); store_id = preferences.getString(CommonString.KEY_STORE_ID, null); visit_date = preferences.getString(CommonString.KEY_DATE, null); date = preferences.getString(CommonString.KEY_DATE, null); @@ -226,7 +226,7 @@ public class MSL_AvailabilityActivity extends AppCompatActivity { @Override protected void onResume() { super.onResume(); - updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, "")); + updateResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, "")); } private void prepareList() { @@ -242,7 +242,7 @@ public class MSL_AvailabilityActivity extends AppCompatActivity { hashMapListHeaderData.add(headerDataList.get(i)); //childDataList = new ArrayList<>(); - childDataList = db.getMSL_AvailabilitySKU_AfterSaveData(categoryId, headerDataList.get(i).getBrand_id()); + childDataList = db.getMSL_AvailabilitySKU_AfterSaveData(categoryId, headerDataList.get(i).getBrand_id(), store_id); if (!(childDataList.size() > 0)) { childDataList = db.getMSL_AvailabilitySKUData(categoryId, headerDataList.get(i).getBrand_id()); } @@ -491,15 +491,13 @@ public class MSL_AvailabilityActivity extends AppCompatActivity { private static boolean updateResources(Context context, String language) { - String lang ; + String lang; - if(language.equalsIgnoreCase("English")){ + if (language.equalsIgnoreCase("English")) { lang = "EN"; - } - else if(language.equalsIgnoreCase("UAE")) { + } else if (language.equalsIgnoreCase("UAE")) { lang = "AR"; - } - else { + } else { lang = "TR"; } diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/PromoComplianceActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/PromoComplianceActivity.java index 9bc7dd1..239bcee 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/PromoComplianceActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/PromoComplianceActivity.java @@ -50,15 +50,13 @@ public class PromoComplianceActivity extends AppCompatActivity { private static boolean updateResources(Context context, String language) { - String lang ; + String lang; - if(language.equalsIgnoreCase("English")){ + if (language.equalsIgnoreCase("English")) { lang = "EN"; - } - else if(language.equalsIgnoreCase("UAE")) { + } else if (language.equalsIgnoreCase("UAE")) { lang = "AR"; - } - else { + } else { lang = "TR"; } @@ -99,11 +97,11 @@ public class PromoComplianceActivity extends AppCompatActivity { btn_add = (Button) findViewById(R.id.btn_add); db = new GSKOrangeDB(this); - db.open(); + db.open(); //preference data preferences = PreferenceManager.getDefaultSharedPreferences(this); - updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, "")); + updateResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, "")); store_id = preferences.getString(CommonString.KEY_STORE_ID, null); visit_date = preferences.getString(CommonString.KEY_DATE, null); date = preferences.getString(CommonString.KEY_DATE, null); @@ -218,31 +216,34 @@ public class PromoComplianceActivity extends AppCompatActivity { btn_add.setOnClickListener(new View.OnClickListener() { @Override public void onClick(final View v) { - AlertDialog.Builder builder = new AlertDialog.Builder(PromoComplianceActivity.this); - builder.setMessage("Are you sure you want to add") - .setCancelable(false) - .setPositiveButton("Yes", new DialogInterface.OnClickListener() { - public void onClick(DialogInterface dialog, int id) { + if (!cd.getSp_promo().equals("0")) { + AlertDialog.Builder builder = new AlertDialog.Builder(PromoComplianceActivity.this); + builder.setMessage("Are you sure you want to add") + .setCancelable(false) + .setPositiveButton("Yes", new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int id) { + db.InsertAdditionalPromoData(cd, categoryId); + AdditionalPromoListView(); - db.InsertAdditionalPromoData(cd, categoryId); - AdditionalPromoListView(); + sp_promo.setSelection(0); + toggle_add_InStock.setChecked(true); + toggle_add_promoAnnouncer.setChecked(true); + toggle_add_runningPos.setChecked(true); - sp_promo.setSelection(0); - toggle_add_InStock.setChecked(true); - toggle_add_promoAnnouncer.setChecked(true); - toggle_add_runningPos.setChecked(true); - - Snackbar.make(v, "promo is add", Snackbar.LENGTH_LONG).setAction("Action", null).show(); - //Toast.makeText(getApplicationContext(), "promo is add", Toast.LENGTH_LONG).show(); - } - }) - .setNegativeButton("No", new DialogInterface.OnClickListener() { - public void onClick(DialogInterface dialog, int id) { - dialog.cancel(); - } - }); - AlertDialog alert = builder.create(); - alert.show(); + Snackbar.make(v, "promo is add", Snackbar.LENGTH_LONG).setAction("Action", null).show(); + //Toast.makeText(getApplicationContext(), "promo is add", Toast.LENGTH_LONG).show(); + } + }) + .setNegativeButton("No", new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int id) { + dialog.cancel(); + } + }); + AlertDialog alert = builder.create(); + alert.show(); + } else { + Snackbar.make(v, "Select the promo value", Snackbar.LENGTH_LONG).setAction("Action", null).show(); + } } }); @@ -295,7 +296,7 @@ public class PromoComplianceActivity extends AppCompatActivity { @Override protected void onResume() { super.onResume(); - updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, "")); + updateResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, "")); } private void prepareList() { diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/Stock_FacingActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/Stock_FacingActivity.java index 51dc9e7..aba8c57 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/Stock_FacingActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/Stock_FacingActivity.java @@ -300,7 +300,7 @@ public class Stock_FacingActivity extends AppCompatActivity { hashMapListHeaderData.add(headerDataList.get(i)); //Child Data - childDataList = db.getStockAndFacingSKU_AfterSaveData(categoryId, headerDataList.get(i).getBrand_id()); + childDataList = db.getStockAndFacingSKU_AfterSaveData(categoryId, headerDataList.get(i).getBrand_id(), store_id); if (!(childDataList.size() > 0)) { childDataList = db.getStockAndFacingSKUData(categoryId, headerDataList.get(i).getBrand_id()); }