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 246218e..ad89c71 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java @@ -79,7 +79,8 @@ public class GSKOrangeDB extends SQLiteOpenHelper { db.execSQL(CommonString.CREATE_TABLE_INSERT_STOCK_FACING_HEADER); db.execSQL(CommonString.CREATE_TABLE_INSERT_STOCK_FACING_CHILD); db.execSQL(CommonString.CREATE_TABLE_INSERT_ADDITIONAL_PROMO_COMPLIANCE); - + db.execSQL(CommonString.CREATE_TABLE_INSERT_PROMO_SKU); + //Gagan End db.execSQL(CommonString.CREATE_TABLE_STORE_GEOTAGGING); @@ -250,11 +251,8 @@ public class GSKOrangeDB extends SQLiteOpenHelper { try { - - - - dbcursor = db.rawQuery("SELECT * FROM(SELECT DISTINCT BR.BRAND_ID, SCM.SUB_CATEGORY||'-'||BR.BRAND AS BRAND FROM MAPPING_STOCK MS INNER JOIN SKU_MASTER SM ON MS.SKU_ID = SM.SKU_ID INNER JOIN BRAND_MASTER BR ON SM.BRAND_ID=BR.BRAND_ID INNER JOIN SUB_CATEGORY_MASTER SCM ON BR.SUB_CATEGORY_ID = SCM.SUB_CATEGORY_ID WHERE MS.KEYACCOUNT_ID ='"+key_account_id +"' AND STORETYPE_ID ='" + store_type_id + "' AND CLASS_ID = '"+ class_id +"') As Brand",null); - if(dbcursor != null){ + dbcursor = db.rawQuery("SELECT * FROM(SELECT DISTINCT BR.BRAND_ID, SCM.SUB_CATEGORY||'-'||BR.BRAND AS BRAND FROM MAPPING_STOCK MS INNER JOIN SKU_MASTER SM ON MS.SKU_ID = SM.SKU_ID INNER JOIN BRAND_MASTER BR ON SM.BRAND_ID=BR.BRAND_ID INNER JOIN SUB_CATEGORY_MASTER SCM ON BR.SUB_CATEGORY_ID = SCM.SUB_CATEGORY_ID WHERE MS.KEYACCOUNT_ID ='" + key_account_id + "' AND STORETYPE_ID ='" + store_type_id + "' AND CLASS_ID = '" + class_id + "') As Brand", null); + if (dbcursor != null) { dbcursor.moveToFirst(); while (!dbcursor.isAfterLast()) { @@ -1502,5 +1500,30 @@ public class GSKOrangeDB extends SQLiteOpenHelper { return list; } + public void InsertPromoSkuData(ArrayList promoSkuListData) { + ContentValues values = new ContentValues(); + try { + db.beginTransaction(); + for (int i = 0; i < promoSkuListData.size(); i++) { + Promo_Compliance_DataGetterSetter data = promoSkuListData.get(i); + + values.put("STORE_ID", Integer.parseInt(data.getStore_id())); + values.put("SKU_ID", Integer.parseInt(data.getSku_id())); + values.put("SKU", data.getSku()); + values.put("PROMO_ID", Integer.parseInt(data.getPromo_id())); + values.put("PROMO", data.getPromo()); + values.put("IN_STOCK_VALUE", Integer.parseInt(data.getIn_stock())); + values.put("PROMO_ANNOUNCER_VALUE", Integer.parseInt(data.getPromo_announcer())); + values.put("RUNNING_POS_VALUE", Integer.parseInt(data.getRunning_pos())); + + db.insert(CommonString.TABLE_INSERT_PROMO_SKU, null, values); + } + db.setTransactionSuccessful(); + db.endTransaction(); + } catch (Exception ex) { + Log.d("Exception ", " InsertAdditionalPromoData " + ex.toString()); + } + } + //Gagan End Method } diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/constant/CommonString.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/constant/CommonString.java index 087a331..123d57c 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/constant/CommonString.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/constant/CommonString.java @@ -291,5 +291,39 @@ public class CommonString { + ")"; + public static final String TABLE_INSERT_PROMO_SKU = "Promo_SKU_Data"; + + public static final String CREATE_TABLE_INSERT_PROMO_SKU = "CREATE TABLE IF NOT EXISTS " + + TABLE_INSERT_PROMO_SKU + + "(" + + "KEY_ID" + + " INTEGER PRIMARY KEY AUTOINCREMENT ," + + + "STORE_ID" + + " INTEGER," + + + "SKU_ID" + + " INTEGER," + + + "SKU" + + " VARCHAR," + + + "PROMO_ID" + + " INTEGER," + + + "PROMO" + + " VARCHAR," + + + "IN_STOCK_VALUE" + + " INTEGER," + + + "PROMO_ANNOUNCER_VALUE" + + " INTEGER," + + + "RUNNING_POS_VALUE" + + " INTEGER" + + + ")"; + //Gagan Code End } 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 6b2dc70..d62a574 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 @@ -201,8 +201,10 @@ public class PromoComplianceActivity extends AppCompatActivity { fab.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - Snackbar.make(view, "Replace with your own action", Snackbar.LENGTH_LONG) - .setAction("Action", null).show(); + /*Snackbar.make(view, "Replace with your own action", Snackbar.LENGTH_LONG) + .setAction("Action", null).show();*/ + + db.InsertPromoSkuData(promoSkuListData); } });