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 92f18ff..be331aa 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java @@ -96,7 +96,7 @@ import cpm.com.gskmtorange.xmlGetterSetter.TableBean; */ public class GSKOrangeDB extends SQLiteOpenHelper { - public static final String DATABASE_NAME = "GSK_ORANGE_DB68"; + public static final String DATABASE_NAME = "GSK_ORANGE_DB612"; public static final int DATABASE_VERSION = 15; TableBean tableBean; private SQLiteDatabase db; @@ -198,11 +198,11 @@ public class GSKOrangeDB extends SQLiteOpenHelper { db.execSQL(TableBean.getTable_SUPERVISOR_LIST());//--Added 01.10.2018 db.execSQL(TableBean.getTable_CONFIGURATION_MASTER());//--Added 03.10.2018 - if(TableBean.getTable_MAPPING_STOCK_STOREWISE()!=null){ + if (TableBean.getTable_MAPPING_STOCK_STOREWISE() != null) { db.execSQL(TableBean.getTable_MAPPING_STOCK_STOREWISE());//--Added 04.12.2018 } - if(TableBean.getTable_MAPPING_PLANOGRAM_STORE_WISE()!=null){ + if (TableBean.getTable_MAPPING_PLANOGRAM_STORE_WISE() != null) { db.execSQL(TableBean.getTable_MAPPING_PLANOGRAM_STORE_WISE());//--Added 17.01.2019 } @@ -393,6 +393,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper { values.put("LATITUDE", data.getLATITUDE().get(i)); values.put("LONGITUDE", data.getLONGITUDE().get(i)); values.put("POG_TYPE_ID", data.getPOG_TYPE_ID().get(i)); + values.put("FACING_HIDE", data.getFACING_HIDE().get(i)); db.insert("JOURNEY_PLAN", null, values); @@ -412,7 +413,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper { dbcursor = db.rawQuery("Select DISTINCT BM.BRAND As BRAND, BM.BRAND_ID As BRAND_ID, DM.DISPLAY As DISPLAY, " + "DM.DISPLAY_ID As DISPLAY_ID, DM.IMAGE_URL As IMAGE_URL, DM.IMAGE_PATH As IMAGE_PATH, " + - "T.CATEGORY_FIXTURE As CATEGORY_FIXTURE,T.ALLOW_QTY As ALLOW_QTY from BRAND_MASTER BM INNER JOIN "+ tableName +" T " + + "T.CATEGORY_FIXTURE As CATEGORY_FIXTURE,T.ALLOW_QTY As ALLOW_QTY from BRAND_MASTER BM INNER JOIN " + tableName + " T " + "ON BM.BRAND_ID = T.BRAND_ID INNER JOIN DISPLAY_MASTER DM " + "ON T.DISPLAY_ID= DM.DISPLAY_ID INNER JOIN SUB_CATEGORY_MASTER SCM ON BM.SUB_CATEGORY_ID = SCM.SUB_CATEGORY_ID " + "WHERE T.STORE_ID = '" + store_id + "' AND SCM.CATEGORY_ID ='" + category_id + "'", null); @@ -522,13 +523,12 @@ public class GSKOrangeDB extends SQLiteOpenHelper { try { - if(key_account_id!=null){ + if (key_account_id != null) { dbcursor = db.rawQuery("SELECT * FROM(SELECT DISTINCT BR.BRAND_ID, SCM.SUB_CATEGORY||'-'||BR.BRAND AS BRAND FROM " + tableName + " 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 + "' AND BR.COMPANY_ID ='1' AND SCM.CATEGORY_ID = '" + category_id + "' ORDER BY SCM.SUB_CATEGORY_SEQUENCE, BR.BRAND_SEQUENCE ) As Brand", null); - } - else { + } else { dbcursor = db.rawQuery("SELECT * FROM(SELECT DISTINCT BR.BRAND_ID, SCM.SUB_CATEGORY||'-'||BR.BRAND AS BRAND FROM MAPPING_STOCK_STOREWISE 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.STORE_ID ='" + store_id + "' " + @@ -575,13 +575,12 @@ public class GSKOrangeDB extends SQLiteOpenHelper { try { - if(key_account_id!=null){ - dbcursor = db.rawQuery("SELECT DISTINCT SM.SKU, SM.SKU_ID, BR.BRAND_ID FROM "+ tableName +" MS INNER JOIN SKU_MASTER SM ON MS.SKU_ID = SM.SKU_ID " + + if (key_account_id != null) { + dbcursor = db.rawQuery("SELECT DISTINCT SM.SKU, SM.SKU_ID, BR.BRAND_ID FROM " + tableName + " 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 + "' AND SM.BRAND_ID='" + brand_id + "' " + "AND MS.SHOW_ADDITIONAL_VISIBILITY='1' ORDER BY SM.PROMO_SKU, SM.SKU", null); - } - else { + } else { dbcursor = db.rawQuery("SELECT DISTINCT SM.SKU, SM.SKU_ID, BR.BRAND_ID FROM MAPPING_STOCK_STOREWISE 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.STORE_ID ='" + store_id + "' AND SM.BRAND_ID='" + brand_id + "' " + @@ -688,6 +687,9 @@ public class GSKOrangeDB extends SQLiteOpenHelper { sb.setPOG_TYPE_ID(dbcursor.getString(dbcursor .getColumnIndexOrThrow("POG_TYPE_ID"))); + sb.setFACING_HIDE(dbcursor.getString(dbcursor + .getColumnIndexOrThrow("FACING_HIDE"))); + list.add(sb); dbcursor.moveToNext(); } @@ -1100,7 +1102,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper { db.insert(tableName, null, values); } } catch (Exception ex) { - Log.d("Exception ", " in "+ tableName + ex.toString()); + Log.d("Exception ", " in " + tableName + ex.toString()); } } @@ -1112,7 +1114,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper { try { - if(keyAccountId!=null){ + if (keyAccountId != null) { dbcursor = db.rawQuery("Select DISTINCT CA.CATEGORY_ID,CA.CATEGORY " + "from " + tableName + " M " + "inner join SKU_MASTER SK " + @@ -1126,8 +1128,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper { "where M.KEYACCOUNT_ID='" + keyAccountId + "' AND " + "M.STORETYPE_ID='" + storeTypeId + "' AND " + "M.CLASS_ID='" + classId + "'", null); - } - else { + } else { dbcursor = db.rawQuery("Select DISTINCT CA.CATEGORY_ID,CA.CATEGORY " + "from MAPPING_STOCK_STOREWISE M " + "inner join SKU_MASTER SK " + @@ -1612,7 +1613,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper { String sub_reason_id = data.getSub_reasonId(); - if(sub_reason_id.equals("")){ + if (sub_reason_id.equals("")) { sub_reason_id = "0"; } @@ -1747,7 +1748,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper { db.insert(tableName, null, values); } } catch (Exception ex) { - Log.d("Exception ", " in "+ tableName + ex.toString()); + Log.d("Exception ", " in " + tableName + ex.toString()); } } @@ -1758,7 +1759,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper { try { dbcursor = db.rawQuery("Select M.* " + - "from "+ tableName +" M " + + "from " + tableName + " M " + "inner join SKU_MASTER SK " + "on M.SKU_ID=SK.SKU_ID " + "inner join BRAND_MASTER BR " + @@ -1813,7 +1814,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper { list.add(promo); dbcursor = db.rawQuery("Select DISTINCT M.* " + - "from "+ tableName +" M " + + "from " + tableName + " M " + "inner join SKU_MASTER SK " + "on M.SKU_ID=SK.SKU_ID " + "inner join BRAND_MASTER BR " + @@ -2049,9 +2050,9 @@ public class GSKOrangeDB extends SQLiteOpenHelper { table = CommonString.KEY_JOURNEY_PLAN; } else if (flag_from.equals(CommonString.FROM_ADDITIONAL)) { table = CommonString.KEY_JOURNEY_PLAN_ADDITIONAL; - }else if (flag_from.equals(CommonString.FROM_PHARMA)) { + } else if (flag_from.equals(CommonString.FROM_PHARMA)) { table = CommonString.KEY_JOURNEY_PLAN_PHARMA; - }else if (flag_from.equals(CommonString.FROM_ADDITIONAL_ADHOC)) { + } else if (flag_from.equals(CommonString.FROM_ADDITIONAL_ADHOC)) { table = CommonString.KEY_ADHOC_JOURNEYPLAN_ADDITIONAL; } else { table = CommonString.KEY_ADHOC_JOURNEY_PLAN; @@ -2079,13 +2080,13 @@ public class GSKOrangeDB extends SQLiteOpenHelper { if (flag_from != null) { if (flag_from.equals(CommonString.FROM_JCP)) { table = CommonString.KEY_JOURNEY_PLAN; - } else if (flag_from.equals(CommonString.FROM_ADDITIONAL)) { + } else if (flag_from.equals(CommonString.FROM_ADDITIONAL)) { table = CommonString.KEY_JOURNEY_PLAN_ADDITIONAL; - } else if (flag_from.equals(CommonString.FROM_PHARMA)) { + } else if (flag_from.equals(CommonString.FROM_PHARMA)) { table = CommonString.KEY_JOURNEY_PLAN_PHARMA; - }else if (flag_from.equals(CommonString.FROM_ADDITIONAL_ADHOC)) { + } else if (flag_from.equals(CommonString.FROM_ADDITIONAL_ADHOC)) { table = CommonString.KEY_ADHOC_JOURNEYPLAN_ADDITIONAL; - }else{ + } else { table = CommonString.KEY_ADHOC_JOURNEY_PLAN; } } else { @@ -2504,7 +2505,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper { "ORDER BY ORDERID ", null);*/ dbcursor = db.rawQuery("Select PERIOD, ROUND(avg(MSL),1) as MSL,ROUND(avg(sos),1) as SOS ," + " ROUND(avg(t2p),1) as T2P,ROUND(avg(pROMO),1) as PROMO , ROUND(avg(pLANOGRAM),1) as PLANOGRAM " + - "from "+ tableName + + "from " + tableName + " where STORE_ID='" + store_id + "' " + "GROUP BY PERIOD " + "ORDER BY ORDERID ", null); @@ -2719,7 +2720,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper { } - public ArrayList getBrandMasterDataNew(String key_account_id, String category_id,String store_type_id,String class_id) { + public ArrayList getBrandMasterDataNew(String key_account_id, String category_id, String store_type_id, String class_id) { Cursor cursordata = null; ArrayList Data = new ArrayList(); @@ -2787,11 +2788,10 @@ public class GSKOrangeDB extends SQLiteOpenHelper { try { - if(brand_id==null){ + if (brand_id == null) { cursordata = db.rawQuery("SELECT * FROM SKU_MASTER ", null); - } - else { - cursordata = db.rawQuery("SELECT * FROM SKU_MASTER where BRAND_ID = '"+ brand_id +"' ORDER BY SKU_SEQUENCE", null); + } else { + cursordata = db.rawQuery("SELECT * FROM SKU_MASTER where BRAND_ID = '" + brand_id + "' ORDER BY SKU_SEQUENCE", null); } @@ -3438,15 +3438,14 @@ public class GSKOrangeDB extends SQLiteOpenHelper { Cursor dbcursor = null; try { - if(store_type_id!=null){ + if (store_type_id != null) { dbcursor = db.rawQuery("SELECT * FROM MAPPING_PLANOGRAM where CATEGORY_ID='" + category_id + "' AND STORETYPE_ID ='" + store_type_id + "' AND CLASS_ID ='" + class_id + "'", null); - }else { + } else { dbcursor = db.rawQuery("SELECT * FROM MAPPING_PLANOGRAM_STORE_WISE where CATEGORY_ID='" + category_id + "' AND STORE_ID ='" + store_id + "'", null); } - if (dbcursor != null) { dbcursor.moveToFirst(); while (!dbcursor.isAfterLast()) { @@ -3791,7 +3790,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper { try { dbcursor = db.rawQuery("Select M.* " + - "from "+ tableName +" M " + + "from " + tableName + " M " + "inner join SKU_MASTER SK " + "on M.SKU_ID=SK.SKU_ID " + "inner join BRAND_MASTER BR " + @@ -3865,8 +3864,8 @@ public class GSKOrangeDB extends SQLiteOpenHelper { try { - if(keyAccount_id!=null){ - dbcursor = db.rawQuery("Select M.* from "+ tableName +" M " + + if (keyAccount_id != null) { + dbcursor = db.rawQuery("Select M.* from " + tableName + " M " + "inner join SKU_MASTER SK " + "on M.SKU_ID=SK.SKU_ID " + "inner join BRAND_MASTER BR " + @@ -3878,8 +3877,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper { "where CA.CATEGORY_ID='" + category_id + "' AND M.KEYACCOUNT_ID = '" + keyAccount_id + "' " + "AND M.STORETYPE_ID = '" + storeType_id + "' AND M.CLASS_ID = '" + class_id + "' " + "order by SB.SUB_CATEGORY,BR.BRAND ", null); - } - else { + } else { dbcursor = db.rawQuery("Select M.* from MAPPING_STOCK_STOREWISE M " + "inner join SKU_MASTER SK " + "on M.SKU_ID=SK.SKU_ID " + @@ -3889,7 +3887,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper { "on BR.SUB_CATEGORY_ID=SB.SUB_CATEGORY_ID " + "inner join CATEGORY_MASTER CA " + "on SB.CATEGORY_ID=CA.CATEGORY_ID " + - "where CA.CATEGORY_ID='" + category_id + "' AND M.STORE_ID = '" + store_id + "' "+ + "where CA.CATEGORY_ID='" + category_id + "' AND M.STORE_ID = '" + store_id + "' " + "order by SB.SUB_CATEGORY,BR.BRAND ", null); } @@ -3919,7 +3917,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper { Cursor dbcursor = null; try { - dbcursor = db.rawQuery("SELECT * FROM "+ tableName +" M INNER JOIN BRAND_MASTER BR ON M.BRAND_ID = BR.BRAND_ID " + + dbcursor = db.rawQuery("SELECT * FROM " + tableName + " M INNER JOIN BRAND_MASTER BR ON M.BRAND_ID = BR.BRAND_ID " + "INNER JOIN SUB_CATEGORY_MASTER SB ON BR.SUB_CATEGORY_ID = SB.SUB_CATEGORY_ID " + "INNER JOIN CATEGORY_MASTER CA ON SB.CATEGORY_ID = CA.CATEGORY_ID " + "WHERE M.STORE_ID = '" + store_id + "' AND CA.CATEGORY_ID= '" + category_id + "'", null); @@ -3947,7 +3945,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper { try { dbcursor = db.rawQuery("Select M.* " + - "from "+ tableName +" M " + + "from " + tableName + " M " + "inner join SKU_MASTER SK " + "on M.SKU_ID=SK.SKU_ID " + "inner join BRAND_MASTER BR " + @@ -4023,7 +4021,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper { db.insert(tableName, null, values); } } catch (Exception ex) { - Log.d("Exception ", tableName +" " + ex.toString()); + Log.d("Exception ", tableName + " " + ex.toString()); } } @@ -4034,16 +4032,15 @@ public class GSKOrangeDB extends SQLiteOpenHelper { try { - if(keyAccount_id!=null){ + if (keyAccount_id != null) { cursordata = db.rawQuery("SELECT DISTINCT BR.BRAND_ID, BR.BRAND FROM SKU_MASTER SK INNER JOIN BRAND_MASTER BR ON SK.BRAND_ID = BR.BRAND_ID " + "INNER JOIN SUB_CATEGORY_MASTER SB ON BR.SUB_CATEGORY_ID = SB.SUB_CATEGORY_ID " + "INNER JOIN CATEGORY_MASTER CA ON SB.CATEGORY_ID = CA.CATEGORY_ID " + "INNER JOIN " + - "(SELECT DISTINCT SKU_ID FROM "+ tableName +" WHERE KEYACCOUNT_ID = '" + keyAccount_id + "' AND STORETYPE_ID = '" + storeType_id + "' AND CLASS_ID = '" + class_id + "') A " + + "(SELECT DISTINCT SKU_ID FROM " + tableName + " WHERE KEYACCOUNT_ID = '" + keyAccount_id + "' AND STORETYPE_ID = '" + storeType_id + "' AND CLASS_ID = '" + class_id + "') A " + "ON SK.SKU_ID = A.SKU_ID " + "WHERE CA.CATEGORY_ID = '" + category_id + "'", null); - } - else { + } else { cursordata = db.rawQuery("SELECT DISTINCT BR.BRAND_ID, BR.BRAND||'('||SB.SUB_CATEGORY||')' as BRAND FROM SKU_MASTER SK INNER JOIN BRAND_MASTER BR ON SK.BRAND_ID = BR.BRAND_ID " + "INNER JOIN SUB_CATEGORY_MASTER SB ON BR.SUB_CATEGORY_ID = SB.SUB_CATEGORY_ID " + "INNER JOIN CATEGORY_MASTER CA ON SB.CATEGORY_ID = CA.CATEGORY_ID " + @@ -4051,7 +4048,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper { "(SELECT DISTINCT SKU_ID FROM MAPPING_STOCK_STOREWISE WHERE STORE_ID = '" + store_id + "') A " + "ON SK.SKU_ID = A.SKU_ID " + "WHERE BR.COMPANY_ID =1 AND CA.CATEGORY_ID ='" + category_id + "'", null); - // "WHERE CA.CATEGORY_ID = '" + category_id + "'", null); + // "WHERE CA.CATEGORY_ID = '" + category_id + "'", null); } @@ -4599,8 +4596,8 @@ public class GSKOrangeDB extends SQLiteOpenHelper { Cursor dbcursor = null; try { - if(key_account_id!=null){ - dbcursor = db.rawQuery("SELECT DISTINCT SB.SUB_CATEGORY_ID, MIA.IMAGE_ALLOW,SB.SUB_CATEGORY FROM "+ tableName +" M INNER JOIN SKU_MASTER SK ON M.SKU_ID = SK.SKU_ID" + + if (key_account_id != null) { + dbcursor = db.rawQuery("SELECT DISTINCT SB.SUB_CATEGORY_ID, MIA.IMAGE_ALLOW,SB.SUB_CATEGORY FROM " + tableName + " M INNER JOIN SKU_MASTER SK ON M.SKU_ID = SK.SKU_ID" + " INNER JOIN BRAND_MASTER BR ON SK.BRAND_ID = BR.BRAND_ID" + " INNER JOIN SUB_CATEGORY_MASTER SB ON BR.SUB_CATEGORY_ID = SB.SUB_CATEGORY_ID" + " INNER JOIN CATEGORY_MASTER CA ON SB.CATEGORY_ID = CA.CATEGORY_ID" + @@ -4608,8 +4605,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper { " WHERE M.KEYACCOUNT_ID = '" + key_account_id + " ' AND M.STORETYPE_ID = '" + store_type_id + "' AND M.CLASS_ID = '" + class_id + "' AND CA.CATEGORY_ID = '" + categoryId + "'", null); - } - else { + } else { dbcursor = db.rawQuery("SELECT DISTINCT SB.SUB_CATEGORY_ID, MIA.IMAGE_ALLOW,SB.SUB_CATEGORY FROM MAPPING_STOCK_STOREWISE M INNER JOIN SKU_MASTER SK ON M.SKU_ID = SK.SKU_ID" + " INNER JOIN BRAND_MASTER BR ON SK.BRAND_ID = BR.BRAND_ID" + " INNER JOIN SUB_CATEGORY_MASTER SB ON BR.SUB_CATEGORY_ID = SB.SUB_CATEGORY_ID" + @@ -5079,7 +5075,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper { try { - dbcursor = db.rawQuery("SELECT * from " + CommonString.TABLE_COVERAGE_DATA + " where " + CommonString.KEY_STORE_ID + "='" + store_id + "' AND " + CommonString.KEY_VISIT_DATE + "='" + visitDate + "'", + dbcursor = db.rawQuery("SELECT * from " + CommonString.TABLE_COVERAGE_DATA + " where " + CommonString.KEY_STORE_ID + "='" + store_id + "' AND " + CommonString.KEY_VISIT_DATE + "='" + visitDate + "'", null); @@ -5206,32 +5202,50 @@ public class GSKOrangeDB extends SQLiteOpenHelper { //14-03-2017 //MSL_Availability_StockFacing public ArrayList getMSL_Availability_StockFacingHeaderData( - String category_id, String keyAccount_id, String storeType_id, String class_id, String store_id, String tableName, String tableMappingSOS) { + String category_id, String keyAccount_id, String storeType_id, String class_id, String store_id, String tableName, String tableMappingSOS, String store_flag_facing_hide) { ArrayList list = new ArrayList<>(); Cursor dbcursor = null; try { - if(keyAccount_id!=null){ + if (keyAccount_id != null) { + if (store_flag_facing_hide.equals("1")) { + dbcursor = db.rawQuery("Select DISTINCT SB.SUB_CATEGORY_ID,SB.SUB_CATEGORY,BR.BRAND_ID,BR.BRAND,BR.COMPANY_ID ," + + " (SELECT SUM(SOS_TARGET) FROM " + tableMappingSOS + " WHERE STORE_ID = 1 AND BRAND_ID = BR.BRAND_ID)AS SOS_TARGET " + + "from " + tableName + " M " + + "inner join SKU_MASTER SK " + + "on M.SKU_ID=SK.SKU_ID " + + "inner join BRAND_MASTER BR " + + "on SK.BRAND_ID=BR.BRAND_ID " + + "inner join SUB_CATEGORY_MASTER SB " + + "on BR.SUB_CATEGORY_ID=SB.SUB_CATEGORY_ID " + + "inner join CATEGORY_MASTER CA " + + "on SB.CATEGORY_ID=CA.CATEGORY_ID " + + "where CA.CATEGORY_ID='" + category_id + "' AND M.KEYACCOUNT_ID = '" + keyAccount_id + + "' AND M.STORETYPE_ID = '" + storeType_id + "' AND M.CLASS_ID = '" + class_id + "' AND MUST_HAVE = '" + 1 + "'" + + "order by SB.SUB_CATEGORY,BR.COMPANY_ID,BR.BRAND", null); + + } else { + dbcursor = db.rawQuery("Select DISTINCT SB.SUB_CATEGORY_ID,SB.SUB_CATEGORY,BR.BRAND_ID,BR.BRAND,BR.COMPANY_ID ," + + " (SELECT SUM(SOS_TARGET) FROM " + tableMappingSOS + " WHERE STORE_ID = 1 AND BRAND_ID = BR.BRAND_ID)AS SOS_TARGET " + + "from " + tableName + " M " + + "inner join SKU_MASTER SK " + + "on M.SKU_ID=SK.SKU_ID " + + "inner join BRAND_MASTER BR " + + "on SK.BRAND_ID=BR.BRAND_ID " + + "inner join SUB_CATEGORY_MASTER SB " + + "on BR.SUB_CATEGORY_ID=SB.SUB_CATEGORY_ID " + + "inner join CATEGORY_MASTER CA " + + "on SB.CATEGORY_ID=CA.CATEGORY_ID " + + "where CA.CATEGORY_ID='" + category_id + "' AND M.KEYACCOUNT_ID = '" + keyAccount_id + + "' AND M.STORETYPE_ID = '" + storeType_id + "' AND M.CLASS_ID = '" + class_id + "'" + + "order by SB.SUB_CATEGORY,BR.COMPANY_ID,BR.BRAND", null); + + } + } else { dbcursor = db.rawQuery("Select DISTINCT SB.SUB_CATEGORY_ID,SB.SUB_CATEGORY,BR.BRAND_ID,BR.BRAND,BR.COMPANY_ID ," + - " (SELECT SUM(SOS_TARGET) FROM "+ tableMappingSOS +" WHERE STORE_ID = 1 AND BRAND_ID = BR.BRAND_ID)AS SOS_TARGET " + - "from "+ tableName +" M " + - "inner join SKU_MASTER SK " + - "on M.SKU_ID=SK.SKU_ID " + - "inner join BRAND_MASTER BR " + - "on SK.BRAND_ID=BR.BRAND_ID " + - "inner join SUB_CATEGORY_MASTER SB " + - "on BR.SUB_CATEGORY_ID=SB.SUB_CATEGORY_ID " + - "inner join CATEGORY_MASTER CA " + - "on SB.CATEGORY_ID=CA.CATEGORY_ID " + - "where CA.CATEGORY_ID='" + category_id + "' AND M.KEYACCOUNT_ID = '" + keyAccount_id + - "' AND M.STORETYPE_ID = '" + storeType_id + "' AND M.CLASS_ID = '" + class_id + "'" + - "order by SB.SUB_CATEGORY,BR.COMPANY_ID,BR.BRAND", null); - } - else { - dbcursor = db.rawQuery("Select DISTINCT SB.SUB_CATEGORY_ID,SB.SUB_CATEGORY,BR.BRAND_ID,BR.BRAND,BR.COMPANY_ID ," + - " (SELECT SUM(SOS_TARGET) FROM "+ tableMappingSOS +" WHERE STORE_ID = 1 AND BRAND_ID = BR.BRAND_ID)AS SOS_TARGET " + + " (SELECT SUM(SOS_TARGET) FROM " + tableMappingSOS + " WHERE STORE_ID = 1 AND BRAND_ID = BR.BRAND_ID)AS SOS_TARGET " + "from MAPPING_STOCK_STOREWISE M " + "inner join SKU_MASTER SK " + "on M.SKU_ID=SK.SKU_ID " + @@ -5242,29 +5256,10 @@ public class GSKOrangeDB extends SQLiteOpenHelper { "inner join CATEGORY_MASTER CA " + "on SB.CATEGORY_ID=CA.CATEGORY_ID " + "where CA.CATEGORY_ID='" + category_id + "' AND M.STORE_ID = '" + store_id + "'" + - " order by SB.SUB_CATEGORY_SEQUENCE_SA, BR.BRAND_SEQUENCE_SA", null); - //" order by SB.SUB_CATEGORY,BR.COMPANY_ID,BR.BRAND, BR.BRAND_SEQUENCE", null); + " order by SB.SUB_CATEGORY_SEQUENCE_SA, BR.BRAND_SEQUENCE_SA", null); + } - - - - - /*dbcursor = db.rawQuery("Select DISTINCT SB.SUB_CATEGORY_ID,SB.SUB_CATEGORY,BR.BRAND_ID,BR.BRAND " + - "from MAPPING_STOCK M " + - "inner join SKU_MASTER SK " + - "on M.SKU_ID=SK.SKU_ID " + - "inner join BRAND_MASTER BR " + - "on SK.BRAND_ID=BR.BRAND_ID " + - "inner join SUB_CATEGORY_MASTER SB " + - "on BR.SUB_CATEGORY_ID=SB.SUB_CATEGORY_ID " + - "inner join CATEGORY_MASTER CA " + - "on SB.CATEGORY_ID=CA.CATEGORY_ID " + - "where M.MUST_HAVE=1 AND CA.CATEGORY_ID='" + category_id + - "' AND M.KEYACCOUNT_ID = '" + keyAccount_id + - "' AND M.STORETYPE_ID = '" + storeType_id + "' AND M.CLASS_ID = '" + class_id + "'" + - "order by SB.SUB_CATEGORY,BR.BRAND", null);*/ - if (dbcursor != null) { dbcursor.moveToFirst(); while (!dbcursor.isAfterLast()) { @@ -5276,7 +5271,6 @@ public class GSKOrangeDB extends SQLiteOpenHelper { cd.setBrand(dbcursor.getString(dbcursor.getColumnIndexOrThrow("BRAND"))); cd.setCompany_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("COMPANY_ID"))); - list.add(cd); dbcursor.moveToNext(); } @@ -5291,67 +5285,50 @@ public class GSKOrangeDB extends SQLiteOpenHelper { } public ArrayList getMSL_Availability_StockFacingSKUData( - String subCategoryId, String category_id, String brand_id, String keyAccount_id, String storeType_id, String class_id, String store_id, String tableName) { + String subCategoryId, String category_id, String brand_id, String keyAccount_id, String storeType_id, String class_id, String store_id, String tableName, String store_flag_facing_hide) { ArrayList list = new ArrayList<>(); Cursor dbcursor = null; try { - if(keyAccount_id!=null){ - dbcursor = db.rawQuery("Select DISTINCT SK.SKU_ID,SK.SKU,SK.MRP,SK.SKU_SEQUENCE,M.MBQ,BR.COMPANY_ID,M.MUST_HAVE,ifnull(PE.SUB_CATEGORY_ID,0) as PRICING " + - "from "+ tableName +" M " + - "inner join SKU_MASTER SK " + - "on M.SKU_ID=SK.SKU_ID " + - "inner join BRAND_MASTER BR " + - "on SK.BRAND_ID=BR.BRAND_ID " + - "inner join SUB_CATEGORY_MASTER SB " + - "on BR.SUB_CATEGORY_ID=SB.SUB_CATEGORY_ID " + - "left join (SELECT * FROM MAPPING_SKU_PRICING_ENABLE WHERE STORE_ID ='" + store_id + "' AND SUB_CATEGORY_ID ='" + subCategoryId + "')AS PE on PE.SUB_CATEGORY_ID=SB.SUB_CATEGORY_ID " + - "inner join CATEGORY_MASTER CA " + - "on SB.CATEGORY_ID=CA.CATEGORY_ID " + - "where CA.CATEGORY_ID='" + category_id + "' AND BR.BRAND_ID='" + brand_id + - "' AND M.KEYACCOUNT_ID = '" + keyAccount_id + "' AND M.STORETYPE_ID = '" + storeType_id + - "' AND M.CLASS_ID = '" + class_id + "' order by M.MUST_HAVE DESC", null); + if (keyAccount_id != null) { + if (store_flag_facing_hide.equals("1")) { + dbcursor = db.rawQuery("Select DISTINCT SK.SKU_ID,SK.SKU,SK.MRP,SK.SKU_SEQUENCE,M.MBQ,BR.COMPANY_ID,M.MUST_HAVE,ifnull(PE.SUB_CATEGORY_ID,0) as PRICING " + + "from " + tableName + " M " + + "inner join SKU_MASTER SK " + + "on M.SKU_ID=SK.SKU_ID " + + "inner join BRAND_MASTER BR " + + "on SK.BRAND_ID=BR.BRAND_ID " + + "inner join SUB_CATEGORY_MASTER SB " + + "on BR.SUB_CATEGORY_ID=SB.SUB_CATEGORY_ID " + + "left join (SELECT * FROM MAPPING_SKU_PRICING_ENABLE WHERE STORE_ID ='" + store_id + "' AND SUB_CATEGORY_ID ='" + subCategoryId + "')AS PE on PE.SUB_CATEGORY_ID=SB.SUB_CATEGORY_ID " + + "inner join CATEGORY_MASTER CA " + + "on SB.CATEGORY_ID=CA.CATEGORY_ID " + + "where CA.CATEGORY_ID='" + category_id + "' AND BR.BRAND_ID='" + brand_id + + "' AND M.KEYACCOUNT_ID = '" + keyAccount_id + "' AND M.STORETYPE_ID = '" + storeType_id + "' AND MUST_HAVE = '" + 1 + + "' AND M.CLASS_ID = '" + class_id + "' order by M.MUST_HAVE DESC", null); - /* Select DISTINCT SK.SKU_ID,SK.SKU,SK.MRP,SK.SKU_SEQUENCE,M.MBQ,BR.COMPANY_ID,M.MUST_HAVE, ifnull(PE.SUB_CATEGORY_ID,0) as PRICING from MAPPING_STOCK M - inner join SKU_MASTER SK on M.SKU_ID=SK.SKU_ID inner join BRAND_MASTER BR on SK.BRAND_ID=BR.BRAND_ID - inner join SUB_CATEGORY_MASTER SB on BR.SUB_CATEGORY_ID=SB.SUB_CATEGORY_ID - left join (SELECT * FROM MAPPING_SKU_PRICING_ENABLE WHERE STORE_ID = 1024 AND SUB_CATEGORY_ID = 3)AS PE on PE.SUB_CATEGORY_ID=SB.SUB_CATEGORY_ID - inner join CATEGORY_MASTER CA on SB.CATEGORY_ID=CA.CATEGORY_ID - where CA.CATEGORY_ID='2' AND BR.BRAND_ID='24' AND M.KEYACCOUNT_ID = '47' AND M.STORETYPE_ID = '6' AND M.CLASS_ID = '193' - order by M.MUST_HAVE DESC*/ -/* - dbcursor = db.rawQuery("Select DISTINCT SK.SKU_ID,SK.SKU,SK.MRP,SK.SKU_SEQUENCE,M.MBQ,BR.COMPANY_ID,M.MUST_HAVE " + - "from "+ tableName +" M " + - "inner join SKU_MASTER SK " + - "on M.SKU_ID=SK.SKU_ID " + - "inner join BRAND_MASTER BR " + - "on SK.BRAND_ID=BR.BRAND_ID " + - "inner join SUB_CATEGORY_MASTER SB " + - "on BR.SUB_CATEGORY_ID=SB.SUB_CATEGORY_ID " + - "inner join CATEGORY_MASTER CA " + - "on SB.CATEGORY_ID=CA.CATEGORY_ID " + - "where CA.CATEGORY_ID='" + category_id + "' AND BR.BRAND_ID='" + brand_id + - "' AND M.KEYACCOUNT_ID = '" + keyAccount_id + "' AND M.STORETYPE_ID = '" + storeType_id + - "' AND M.CLASS_ID = '" + class_id + "' order by M.MUST_HAVE DESC", null); -*/ - } - else { - /* dbcursor = db.rawQuery("Select DISTINCT SK.SKU_ID,SK.SKU,SK.MRP,SK.SKU_SEQUENCE,M.MBQ,BR.COMPANY_ID,M.MUST_HAVE " + - "from MAPPING_STOCK_STOREWISE M " + - "inner join SKU_MASTER SK " + - "on M.SKU_ID=SK.SKU_ID " + - "inner join BRAND_MASTER BR " + - "on SK.BRAND_ID=BR.BRAND_ID " + - "inner join SUB_CATEGORY_MASTER SB " + - "on BR.SUB_CATEGORY_ID=SB.SUB_CATEGORY_ID " + - "inner join CATEGORY_MASTER CA " + - "on SB.CATEGORY_ID=CA.CATEGORY_ID " + - "where CA.CATEGORY_ID='" + category_id + "' AND BR.BRAND_ID='" + brand_id + - "' AND M.STORE_ID = '" + store_id + "' order by SK.SKU_SEQUENCE_SA", null); - //"' AND M.STORE_ID = '" + store_id + "' order by M.MUST_HAVE DESC", null);*/ + } else { + dbcursor = db.rawQuery("Select DISTINCT SK.SKU_ID,SK.SKU,SK.MRP,SK.SKU_SEQUENCE,M.MBQ,BR.COMPANY_ID,M.MUST_HAVE,ifnull(PE.SUB_CATEGORY_ID,0) as PRICING " + + "from " + tableName + " M " + + "inner join SKU_MASTER SK " + + "on M.SKU_ID=SK.SKU_ID " + + "inner join BRAND_MASTER BR " + + "on SK.BRAND_ID=BR.BRAND_ID " + + "inner join SUB_CATEGORY_MASTER SB " + + "on BR.SUB_CATEGORY_ID=SB.SUB_CATEGORY_ID " + + "left join (SELECT * FROM MAPPING_SKU_PRICING_ENABLE WHERE STORE_ID ='" + store_id + "' AND SUB_CATEGORY_ID ='" + subCategoryId + "')AS PE on PE.SUB_CATEGORY_ID=SB.SUB_CATEGORY_ID " + + "inner join CATEGORY_MASTER CA " + + "on SB.CATEGORY_ID=CA.CATEGORY_ID " + + "where CA.CATEGORY_ID='" + category_id + "' AND BR.BRAND_ID='" + brand_id + + "' AND M.KEYACCOUNT_ID = '" + keyAccount_id + "' AND M.STORETYPE_ID = '" + storeType_id + + "' AND M.CLASS_ID = '" + class_id + "' order by M.MUST_HAVE DESC", null); + + } + + } else { dbcursor = db.rawQuery("Select DISTINCT SK.SKU_ID,SK.SKU,SK.MRP,SK.SKU_SEQUENCE,M.MBQ,BR.COMPANY_ID,M.MUST_HAVE,ifnull(PE.SUB_CATEGORY_ID,0) as PRICING " + "from MAPPING_STOCK_STOREWISE M " + "inner join SKU_MASTER SK " + @@ -5365,9 +5342,8 @@ public class GSKOrangeDB extends SQLiteOpenHelper { "on SB.CATEGORY_ID=CA.CATEGORY_ID " + "where CA.CATEGORY_ID='" + category_id + "' AND BR.BRAND_ID='" + brand_id + "' AND M.STORE_ID = '" + store_id + "' order by SK.SKU_SEQUENCE_SA", null); - //"' AND M.STORE_ID = '" + store_id + "' order by M.MUST_HAVE DESC", null); - } + } if (dbcursor != null) { @@ -5599,16 +5575,16 @@ public class GSKOrangeDB extends SQLiteOpenHelper { //get Sub Category Master public ArrayList getSubCategoryMaster( - String category_id,String store_id,String countery_id) { + String category_id, String store_id, String countery_id) { ArrayList list = new ArrayList<>(); Cursor dbcursor = null; try { - // dbcursor = db.rawQuery("SELECT * FROM SUB_CATEGORY_MASTER WHERE CATEGORY_ID = '" + category_id + "'", null); + // dbcursor = db.rawQuery("SELECT * FROM SUB_CATEGORY_MASTER WHERE CATEGORY_ID = '" + category_id + "'", null); //kenya - if (countery_id.equalsIgnoreCase("7")||countery_id.equalsIgnoreCase("8")){ + if (countery_id.equalsIgnoreCase("7") || countery_id.equalsIgnoreCase("8")) { dbcursor = db.rawQuery("SELECT DISTINCT BR.sub_category_id, SUB_Category FROM SKU_MASTER SK INNER JOIN BRAND_MASTER BR ON SK.BRAND_ID = BR.BRAND_ID " + "INNER JOIN SUB_CATEGORY_MASTER SB ON BR.SUB_CATEGORY_ID = SB.SUB_CATEGORY_ID " + "INNER JOIN CATEGORY_MASTER CA ON SB.CATEGORY_ID = CA.CATEGORY_ID " + @@ -5616,7 +5592,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper { "(SELECT DISTINCT SKU_ID FROM MAPPING_STOCK_STOREWISE WHERE STORE_ID = '" + store_id + "') A " + "ON SK.SKU_ID = A.SKU_ID " + "WHERE BR.COMPANY_ID =1 AND CA.CATEGORY_ID ='" + category_id + "'", null); - }else { + } else { dbcursor = db.rawQuery("SELECT * FROM SUB_CATEGORY_MASTER WHERE CATEGORY_ID = '" + category_id + "'", null); } @@ -5954,10 +5930,10 @@ public class GSKOrangeDB extends SQLiteOpenHelper { try { - if(keyAccount_id!=null){ + if (keyAccount_id != null) { dbcursor = db.rawQuery("Select DISTINCT SB.SUB_CATEGORY_ID,SB.SUB_CATEGORY,BR.BRAND_ID,BR.BRAND,BR.COMPANY_ID ," + - " (SELECT SUM(SOS_TARGET) FROM "+ tableMappingSOSTarget +" WHERE STORE_ID = 1 AND BRAND_ID = BR.BRAND_ID)AS SOS_TARGET " + - "from "+ tableName +" M " + + " (SELECT SUM(SOS_TARGET) FROM " + tableMappingSOSTarget + " WHERE STORE_ID = 1 AND BRAND_ID = BR.BRAND_ID)AS SOS_TARGET " + + "from " + tableName + " M " + "inner join SKU_MASTER SK " + "on M.SKU_ID=SK.SKU_ID " + "inner join BRAND_MASTER BR " + @@ -5969,10 +5945,9 @@ public class GSKOrangeDB extends SQLiteOpenHelper { "where CA.CATEGORY_ID='" + category_id + "' AND M.KEYACCOUNT_ID = '" + keyAccount_id + "' AND M.STORETYPE_ID = '" + storeType_id + "' AND M.CLASS_ID = '" + class_id + "' AND BR.COMPANY_ID='" + 1 + "' " + "order by SB.SUB_CATEGORY,BR.COMPANY_ID,BR.BRAND", null); - } - else { + } else { dbcursor = db.rawQuery("Select DISTINCT SB.SUB_CATEGORY_ID,SB.SUB_CATEGORY,BR.BRAND_ID,BR.BRAND,BR.COMPANY_ID ," + - " (SELECT SUM(SOS_TARGET) FROM "+ tableMappingSOSTarget +" WHERE STORE_ID = 1 AND BRAND_ID = BR.BRAND_ID)AS SOS_TARGET " + + " (SELECT SUM(SOS_TARGET) FROM " + tableMappingSOSTarget + " WHERE STORE_ID = 1 AND BRAND_ID = BR.BRAND_ID)AS SOS_TARGET " + "from MAPPING_STOCK_STOREWISE M " + "inner join SKU_MASTER SK " + "on M.SKU_ID=SK.SKU_ID " + @@ -6257,13 +6232,12 @@ public class GSKOrangeDB extends SQLiteOpenHelper { ArrayList pogData = new ArrayList<>(); try { - if(planogramType==null){ - cursordata = db.rawQuery("Select DISTINCT QUESTION , QUESTION_ID, QTYPE from POG_QUESTION_NEW " + "where SUB_CATEGORY_ID ='" + sub_category_id + "'AND POG_TYPE_ID='" + pog_type_id +"' " + - "AND STORETYPE_ID='"+ store_type_id +"'", null); - } - else { - cursordata = db.rawQuery("Select DISTINCT QUESTION , QUESTION_ID, QTYPE from POG_QUESTION_NEW " + "where SUB_CATEGORY_ID ='" + sub_category_id + "'AND POG_TYPE_ID='" + pog_type_id +"' " + - "AND STORETYPE_ID='"+ store_type_id +"'AND QTYPE='"+ planogramType +"'", null); + if (planogramType == null) { + cursordata = db.rawQuery("Select DISTINCT QUESTION , QUESTION_ID, QTYPE from POG_QUESTION_NEW " + "where SUB_CATEGORY_ID ='" + sub_category_id + "'AND POG_TYPE_ID='" + pog_type_id + "' " + + "AND STORETYPE_ID='" + store_type_id + "'", null); + } else { + cursordata = db.rawQuery("Select DISTINCT QUESTION , QUESTION_ID, QTYPE from POG_QUESTION_NEW " + "where SUB_CATEGORY_ID ='" + sub_category_id + "'AND POG_TYPE_ID='" + pog_type_id + "' " + + "AND STORETYPE_ID='" + store_type_id + "'AND QTYPE='" + planogramType + "'", null); } @@ -6372,13 +6346,12 @@ public class GSKOrangeDB extends SQLiteOpenHelper { //dbcursor = db.rawQuery("SELECT DISTINCT SM.SUB_CATEGORY_ID,SM.SUB_CATEGORY FROM SUB_CATEGORY_MASTER SM INNER JOIN POG_QUESTION PG ON SM.SUB_CATEGORY_ID = PG.SUB_CATEGORY_ID WHERE CATEGORY_ID = '" + category_id + "'", null); - if(planogramType==null){ + if (planogramType == null) { dbcursor = db.rawQuery("SELECT DISTINCT SM.SUB_CATEGORY_ID,SM.SUB_CATEGORY FROM SUB_CATEGORY_MASTER SM INNER JOIN POG_QUESTION_NEW PG ON SM.SUB_CATEGORY_ID = PG.SUB_CATEGORY_ID " + - "WHERE CATEGORY_ID = '" + category_id + "' AND POG_TYPE_ID='" + pog_type_id +"' AND STORETYPE_ID='"+ store_type_id +"'", null); - } - else { + "WHERE CATEGORY_ID = '" + category_id + "' AND POG_TYPE_ID='" + pog_type_id + "' AND STORETYPE_ID='" + store_type_id + "'", null); + } else { dbcursor = db.rawQuery("SELECT DISTINCT SM.SUB_CATEGORY_ID,SM.SUB_CATEGORY FROM SUB_CATEGORY_MASTER SM INNER JOIN POG_QUESTION_NEW PG ON SM.SUB_CATEGORY_ID = PG.SUB_CATEGORY_ID " + - "WHERE CATEGORY_ID = '" + category_id + "' AND POG_TYPE_ID='" + pog_type_id +"' AND STORETYPE_ID='"+ store_type_id +"' AND QTYPE='"+ planogramType +"'", null); + "WHERE CATEGORY_ID = '" + category_id + "' AND POG_TYPE_ID='" + pog_type_id + "' AND STORETYPE_ID='" + store_type_id + "' AND QTYPE='" + planogramType + "'", null); } if (dbcursor != null) { @@ -6588,6 +6561,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper { values.put("LATITUDE", data.getLATITUDE().get(i)); values.put("LONGITUDE", data.getLONGITUDE().get(i)); values.put("POG_TYPE_ID", data.getPOG_TYPE_ID().get(i)); + values.put("FACING_HIDE", data.getFACING_HIDE().get(i)); db.insert("ADHOC_JOURNEYPLAN", null, values); @@ -6802,7 +6776,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper { try { - dbcursor = db.rawQuery("SELECT * FROM "+ tableName +" WHERE " + CommonString.KEY_STORE_ID + " = '" + store_id + dbcursor = db.rawQuery("SELECT * FROM " + tableName + " WHERE " + CommonString.KEY_STORE_ID + " = '" + store_id + "' AND " + CommonString.KEY_CATEGORY_ID + " ='" + category_id + "' AND " + CommonString.KEY_SUB_CATEGORY_ID + " ='" + subcategory_id + "'", null); @@ -6918,7 +6892,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper { ArrayList list = new ArrayList<>(); Cursor dbcursor = null; try { - dbcursor = db.rawQuery("SELECT * FROM NON_WORKING_SUB_REASON WHERE REASON_ID ='"+ reason_id +"'", null); + dbcursor = db.rawQuery("SELECT * FROM NON_WORKING_SUB_REASON WHERE REASON_ID ='" + reason_id + "'", null); if (dbcursor != null) { dbcursor.moveToFirst(); @@ -7003,24 +6977,23 @@ public class GSKOrangeDB extends SQLiteOpenHelper { } public void insertCoachingVisitData(CoachingVisitGetterSetter data, String store_id) { - db.delete("COACHING_VISIT", "STORE_ID" + "='" + store_id + "' AND EMP_ID ='" + data.getEmp_id() +"'", null); + db.delete("COACHING_VISIT", "STORE_ID" + "='" + store_id + "' AND EMP_ID ='" + data.getEmp_id() + "'", null); ContentValues values = new ContentValues(); try { - values.put(CommonString.KEY_EMP_ID, Integer.parseInt(data.getEmp_id())); - values.put(CommonString.KEY_STORE_ID, store_id); - values.put(CommonString.KEY_IMAGE, data.getImg_path()); + values.put(CommonString.KEY_EMP_ID, Integer.parseInt(data.getEmp_id())); + values.put(CommonString.KEY_STORE_ID, store_id); + values.put(CommonString.KEY_IMAGE, data.getImg_path()); - int exist; - if(data.isExists()){ - exist = 1; - } - else { - exist = 0; - } - values.put(CommonString.KEY_EXIST, exist); + int exist; + if (data.isExists()) { + exist = 1; + } else { + exist = 0; + } + values.put(CommonString.KEY_EXIST, exist); - db.insert("COACHING_VISIT", null, values); + db.insert("COACHING_VISIT", null, values); } catch (Exception ex) { Log.d("Database Exception ", ex.toString()); @@ -7046,7 +7019,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper { sb.setEmp_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_EMP_ID))); sb.setImg_path(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_IMAGE))); - sb.setExists(dbcursor.getInt(dbcursor.getColumnIndexOrThrow(CommonString.KEY_EXIST))==1); + sb.setExists(dbcursor.getInt(dbcursor.getColumnIndexOrThrow(CommonString.KEY_EXIST)) == 1); coachingVisitList.add(sb); @@ -7118,17 +7091,17 @@ public class GSKOrangeDB extends SQLiteOpenHelper { ContentValues values = new ContentValues(); try { - values.put(CommonString.KEY_STORE_NAME, data.getSTORE_NAME()); - values.put(CommonString.KEY_ADDRESS, data.getADDRESS()); - values.put(CommonString.KEY_IMAGE, data.getIN_TIME_IMAGE()); - values.put(CommonString.KEY_IMAGE1, data.getOUT_TIME_IMAGE()); - values.put(CommonString.KEY_UPLOAD_STATUS, data.getUPLOAD_STATUS()); - values.put(CommonString.KEY_VISIT_DATE, data.getVISIT_DATE()); - values.put(CommonString.KEY_IN_TIME, data.getIn_time()); - values.put(CommonString.KEY_LATITUDE, data.getLATITUDE()); - values.put(CommonString.KEY_LONGITUDE, data.getLONGITUDE()); + values.put(CommonString.KEY_STORE_NAME, data.getSTORE_NAME()); + values.put(CommonString.KEY_ADDRESS, data.getADDRESS()); + values.put(CommonString.KEY_IMAGE, data.getIN_TIME_IMAGE()); + values.put(CommonString.KEY_IMAGE1, data.getOUT_TIME_IMAGE()); + values.put(CommonString.KEY_UPLOAD_STATUS, data.getUPLOAD_STATUS()); + values.put(CommonString.KEY_VISIT_DATE, data.getVISIT_DATE()); + values.put(CommonString.KEY_IN_TIME, data.getIn_time()); + values.put(CommonString.KEY_LATITUDE, data.getLATITUDE()); + values.put(CommonString.KEY_LONGITUDE, data.getLONGITUDE()); - db.insert("DELIVERY_CALLS", null, values); + db.insert("DELIVERY_CALLS", null, values); } catch (Exception ex) { Log.d("Exception ", " in DELIVERY_CALLS " + ex.toString()); @@ -7160,10 +7133,9 @@ public class GSKOrangeDB extends SQLiteOpenHelper { Cursor dbcursor = null; try { - if(visit_date==null){ + if (visit_date == null) { dbcursor = db.rawQuery("SELECT * FROM DELIVERY_CALLS ", null); - } - else { + } else { dbcursor = db.rawQuery("SELECT * FROM DELIVERY_CALLS WHERE VISIT_DATE='" + visit_date + "'", null); } @@ -7215,9 +7187,9 @@ public class GSKOrangeDB extends SQLiteOpenHelper { public void InsertMappingStockSTOREWISE(MappingStockStorewiseGetterSetter data) { try { - db.delete("MAPPING_STOCK_STOREWISE", null, null); + db.delete("MAPPING_STOCK_STOREWISE", null, null); - ContentValues values = new ContentValues(); + ContentValues values = new ContentValues(); for (int i = 0; i < data.getSTORE_ID().size(); i++) { @@ -7272,22 +7244,22 @@ public class GSKOrangeDB extends SQLiteOpenHelper { public void InsertPromoSKUwiseData(ArrayList promoSkuwiseListData, String category_id, String store_id, boolean exists) { try { - db.delete(CommonString.TABLE_INSERT_PROMO_SKUWISE, "STORE_ID = '"+ store_id +"' AND CATEGORY_ID ='"+ category_id +"'", null); - db.delete(CommonString.TABLE_INSERT_PROMO_SKUWISE_EXISTS, "STORE_ID = '"+ store_id +"' AND CATEGORY_ID ='"+ category_id +"'", null); + db.delete(CommonString.TABLE_INSERT_PROMO_SKUWISE, "STORE_ID = '" + store_id + "' AND CATEGORY_ID ='" + category_id + "'", null); + db.delete(CommonString.TABLE_INSERT_PROMO_SKUWISE_EXISTS, "STORE_ID = '" + store_id + "' AND CATEGORY_ID ='" + category_id + "'", null); - ContentValues values = new ContentValues(); - ContentValues values1 = new ContentValues(); - int existexist_int = 0; + ContentValues values = new ContentValues(); + ContentValues values1 = new ContentValues(); + int existexist_int = 0; - if(exists){ - existexist_int = 1; - } + if (exists) { + existexist_int = 1; + } - values1.put("STORE_ID", Integer.parseInt(store_id)); - values1.put("CATEGORY_ID", Integer.parseInt(category_id)); - values1.put("Existss", existexist_int); + values1.put("STORE_ID", Integer.parseInt(store_id)); + values1.put("CATEGORY_ID", Integer.parseInt(category_id)); + values1.put("Existss", existexist_int); - long id = db.insert(CommonString.TABLE_INSERT_PROMO_SKUWISE_EXISTS, null, values1); + long id = db.insert(CommonString.TABLE_INSERT_PROMO_SKUWISE_EXISTS, null, values1); db.beginTransaction(); @@ -7323,12 +7295,11 @@ public class GSKOrangeDB extends SQLiteOpenHelper { try { - if(category_id==null){ + if (category_id == null) { //common_id is passed in variable store_id in this case dbcursor = db.rawQuery("Select * from Promo_SKUwise_Data " + "where COMMON_ID='" + store_id + "'", null); - } - else { + } else { dbcursor = db.rawQuery("Select * from Promo_SKUwise_Data " + "where STORE_ID='" + store_id + "' AND CATEGORY_ID='" + category_id + "'", null); } @@ -7369,11 +7340,10 @@ public class GSKOrangeDB extends SQLiteOpenHelper { try { - if(category_id==null){ + if (category_id == null) { dbcursor = db.rawQuery("Select * from Promo_SKUwise_Exists_Data " + "where STORE_ID='" + store_id + "'", null); - } - else { + } else { dbcursor = db.rawQuery("Select * from Promo_SKUwise_Exists_Data " + "where STORE_ID='" + store_id + "' AND CATEGORY_ID='" + category_id + "'", null); } @@ -7411,7 +7381,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper { dbcursor = db.rawQuery("SELECT DISTINCT SC.SUB_CATEGORY_ID, SUB_CATEGORY FROM SUB_CATEGORY_MASTER SC INNER JOIN " + "BRAND_MASTER BM ON SC.SUB_CATEGORY_ID = BM.SUB_CATEGORY_ID INNER JOIN " + "SKU_MASTER SM ON BM.BRAND_ID = SM.BRAND_ID INNER JOIN " + - "MAPPING_STOCK_STOREWISE M ON M.SKU_ID = SM.SKU_ID WHERE CATEGORY_ID = '"+ category_id + "'", null); + "MAPPING_STOCK_STOREWISE M ON M.SKU_ID = SM.SKU_ID WHERE CATEGORY_ID = '" + category_id + "'", null); if (dbcursor != null) { dbcursor.moveToFirst(); @@ -7440,9 +7410,9 @@ public class GSKOrangeDB extends SQLiteOpenHelper { try { - cursordata = db.rawQuery("SELECT DISTINCT SM.SKU_ID, SM.SKU,SM.BRAND_ID,SM.SKU_SEQUENCE,SM.MRP FROM BRAND_MASTER BM INNER JOIN " + - "SKU_MASTER SM ON BM.BRAND_ID = SM.BRAND_ID INNER JOIN " + - "MAPPING_STOCK_STOREWISE M ON M.SKU_ID = SM.SKU_ID WHERE BM.BRAND_ID = '"+ brand_id +"' ORDER BY SKU_SEQUENCE", null); + cursordata = db.rawQuery("SELECT DISTINCT SM.SKU_ID, SM.SKU,SM.BRAND_ID,SM.SKU_SEQUENCE,SM.MRP FROM BRAND_MASTER BM INNER JOIN " + + "SKU_MASTER SM ON BM.BRAND_ID = SM.BRAND_ID INNER JOIN " + + "MAPPING_STOCK_STOREWISE M ON M.SKU_ID = SM.SKU_ID WHERE BM.BRAND_ID = '" + brand_id + "' ORDER BY SKU_SEQUENCE", null); if (cursordata != null) { cursordata.moveToFirst(); @@ -7536,13 +7506,13 @@ public class GSKOrangeDB extends SQLiteOpenHelper { ContentValues values = new ContentValues(); try { - values.put(CommonString.KEY_STORE_ID, store_id); - values.put(CommonString.KEY_VISIT_DATE, visitDate); + values.put(CommonString.KEY_STORE_ID, store_id); + values.put(CommonString.KEY_VISIT_DATE, visitDate); - db.insert(CommonString.TABLE_IS_ADHOC_SAVED, null, values); + db.insert(CommonString.TABLE_IS_ADHOC_SAVED, null, values); } catch (Exception ex) { - Log.d("Exception ", " in "+ CommonString.TABLE_IS_ADHOC_SAVED + ex.toString()); + Log.d("Exception ", " in " + CommonString.TABLE_IS_ADHOC_SAVED + ex.toString()); } } @@ -7556,7 +7526,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper { //dbcursor = db.rawQuery("SELECT DISTINCT SM.SUB_CATEGORY_ID,SM.SUB_CATEGORY FROM SUB_CATEGORY_MASTER SM INNER JOIN POG_QUESTION PG ON SM.SUB_CATEGORY_ID = PG.SUB_CATEGORY_ID WHERE CATEGORY_ID = '" + category_id + "'", null); dbcursor = db.rawQuery("SELECT DISTINCT PG.QTYPE FROM SUB_CATEGORY_MASTER SM INNER JOIN POG_QUESTION_NEW PG ON SM.SUB_CATEGORY_ID = PG.SUB_CATEGORY_ID " + - "WHERE CATEGORY_ID = '" + category_id + "' AND POG_TYPE_ID='" + pog_type_id +"' AND STORETYPE_ID='"+ store_type_id +"'", null); + "WHERE CATEGORY_ID = '" + category_id + "' AND POG_TYPE_ID='" + pog_type_id + "' AND STORETYPE_ID='" + store_type_id + "'", null); if (dbcursor != null) { dbcursor.moveToFirst(); @@ -7582,14 +7552,14 @@ public class GSKOrangeDB extends SQLiteOpenHelper { public void InsertCounterfeitProductData(ArrayList counterfeitProductListData, String category_id, String store_id, boolean exists) { try { - db.delete(CommonString.TABLE_INSERT_COUNTERFEIT_PRODUCT, "STORE_ID = '"+ store_id +"' AND CATEGORY_ID ='"+ category_id +"'", null); - db.delete(CommonString.TABLE_INSERT_COUNTERFEIT_PRODUCT_EXISTS, "STORE_ID = '"+ store_id +"' AND CATEGORY_ID ='"+ category_id +"'", null); + db.delete(CommonString.TABLE_INSERT_COUNTERFEIT_PRODUCT, "STORE_ID = '" + store_id + "' AND CATEGORY_ID ='" + category_id + "'", null); + db.delete(CommonString.TABLE_INSERT_COUNTERFEIT_PRODUCT_EXISTS, "STORE_ID = '" + store_id + "' AND CATEGORY_ID ='" + category_id + "'", null); ContentValues values = new ContentValues(); ContentValues values1 = new ContentValues(); int existexist_int = 0; - if(exists){ + if (exists) { existexist_int = 1; } @@ -7631,11 +7601,10 @@ public class GSKOrangeDB extends SQLiteOpenHelper { try { - if(category_id==null){ + if (category_id == null) { dbcursor = db.rawQuery("Select * from COUNTERFEIT_PRODUCT_EXISTS " + "where STORE_ID='" + store_id + "'", null); - } - else { + } else { dbcursor = db.rawQuery("Select * from COUNTERFEIT_PRODUCT_EXISTS " + "where STORE_ID='" + store_id + "' AND CATEGORY_ID='" + category_id + "'", null); } @@ -7668,12 +7637,11 @@ public class GSKOrangeDB extends SQLiteOpenHelper { try { - if(category_id==null){ + if (category_id == null) { //common_id is passed in variable store_id in this case dbcursor = db.rawQuery("Select * from COUNTERFEIT_PRODUCT " + "where COMMON_ID='" + store_id + "'", null); - } - else { + } else { dbcursor = db.rawQuery("Select * from COUNTERFEIT_PRODUCT " + "where STORE_ID='" + store_id + "' AND CATEGORY_ID='" + category_id + "'", null); } @@ -7755,8 +7723,8 @@ public class GSKOrangeDB extends SQLiteOpenHelper { Cursor dbcursor = null; try { - dbcursor = db.rawQuery("Select * from " + CommonString.TABLE_INSERT_STOCK + - " where category_id='" + category_id + "' and Store_Id='" + store_id + "'", null); + dbcursor = db.rawQuery("Select * from " + CommonString.TABLE_INSERT_STOCK + + " where category_id='" + category_id + "' and Store_Id='" + store_id + "'", null); if (dbcursor != null) { if (dbcursor.moveToFirst()) { @@ -7939,6 +7907,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper { Log.d("Exception in ADHOC_JCP", ex.toString()); } } + //MSL_Availability_StockFacing Server Upload Data public ArrayList getStockUploadServerData(String store_id) { ArrayList list = new ArrayList<>(); @@ -8092,7 +8061,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper { try { //dbcursor = db.rawQuery("SELECT DISTINCT CHAT_ID, MESSAGE, MESSAGEDATE, SENDERID, SENDER, STOREID FROM CHAT_MESSAGE WHERE STOREID='" + store_id +"' ORDER BY ORDERID", null); - dbcursor = db.rawQuery("SELECT * FROM MAPPING_PHARMA_QUESTION WHERE QUESTION_ID='"+ questionId +"' ORDER BY QUESTION_SEQUENCE", null); + dbcursor = db.rawQuery("SELECT * FROM MAPPING_PHARMA_QUESTION WHERE QUESTION_ID='" + questionId + "' ORDER BY QUESTION_SEQUENCE", null); if (dbcursor != null) { dbcursor.moveToFirst(); @@ -8125,8 +8094,8 @@ public class GSKOrangeDB extends SQLiteOpenHelper { HashMap> hashMapListChildData, ImageGetterSetter imageData) { - db.delete(CommonString.TABLE_INSERT_STORE_PROFILE_DATA, CommonString.KEY_STORE_ID +"='" +storeId +"'", null); - db.delete(CommonString.TABLE_INSERT_PHARMA_IMAGE_DATA, CommonString.KEY_STORE_ID +"='" +storeId +"'", null); + db.delete(CommonString.TABLE_INSERT_STORE_PROFILE_DATA, CommonString.KEY_STORE_ID + "='" + storeId + "'", null); + db.delete(CommonString.TABLE_INSERT_PHARMA_IMAGE_DATA, CommonString.KEY_STORE_ID + "='" + storeId + "'", null); ContentValues values = new ContentValues(); ContentValues values1 = new ContentValues(); @@ -8173,9 +8142,9 @@ public class GSKOrangeDB extends SQLiteOpenHelper { try { dbcursor = db.rawQuery("Select Distinct SP.QUESTION_ID , SP.BRAND, SP.BRAND_ID, SP.SUB_CATEGORY_ID, SP.SUB_CATEGORY, ifnull(SS.GSK_FACING,'') GSK_FACING, ifnull(SS.COMPETITION_FACING,'') COMPETITION_FACING " + - " from " + CommonString.TABLE_INSERT_STORE_PROFILE_DATA +" SP LEFT JOIN "+ CommonString.TABLE_INSERT_SOS_PHARMA_DATA+ - " SS ON (SP.SUB_CATEGORY_ID = SS.SUB_CATEGORY_ID) AND (SP.BRAND_ID = SS.BRAND_ID) where SP.STORE_ID ='" + store_id + "' AND SP.QUESTION_ID='"+ questionId +"' AND "+ - CommonString.KEY_PRESENT +"='1'", null); + " from " + CommonString.TABLE_INSERT_STORE_PROFILE_DATA + " SP LEFT JOIN " + CommonString.TABLE_INSERT_SOS_PHARMA_DATA + + " SS ON (SP.SUB_CATEGORY_ID = SS.SUB_CATEGORY_ID) AND (SP.BRAND_ID = SS.BRAND_ID) where SP.STORE_ID ='" + store_id + "' AND SP.QUESTION_ID='" + questionId + "' AND " + + CommonString.KEY_PRESENT + "='1'", null); if (dbcursor != null) { dbcursor.moveToFirst(); @@ -8210,7 +8179,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper { try { dbcursor = db.rawQuery("Select DISTINCT QUESTION_ID, QUESTION from " + CommonString.TABLE_INSERT_STORE_PROFILE_DATA + - " where "+ CommonString.KEY_STORE_ID +"='" + store_id + "'", null); + " where " + CommonString.KEY_STORE_ID + "='" + store_id + "'", null); if (dbcursor != null) { dbcursor.moveToFirst(); @@ -8239,13 +8208,12 @@ public class GSKOrangeDB extends SQLiteOpenHelper { Cursor dbcursor = null; try { - if(questionId==null){ + if (questionId == null) { dbcursor = db.rawQuery("Select * from " + CommonString.TABLE_INSERT_STORE_PROFILE_DATA + - " where "+ CommonString.KEY_STORE_ID +"='" + store_id + "'", null); - } - else { + " where " + CommonString.KEY_STORE_ID + "='" + store_id + "'", null); + } else { dbcursor = db.rawQuery("Select * from " + CommonString.TABLE_INSERT_STORE_PROFILE_DATA + - " where "+ CommonString.KEY_STORE_ID +"='" + store_id + "' AND " + CommonString.KEY_QUESTION_ID +"='"+ questionId +"'", null); + " where " + CommonString.KEY_STORE_ID + "='" + store_id + "' AND " + CommonString.KEY_QUESTION_ID + "='" + questionId + "'", null); } if (dbcursor != null) { @@ -8279,28 +8247,28 @@ public class GSKOrangeDB extends SQLiteOpenHelper { public void InsertSOSPharma( String storeId, List sosListData) { - db.delete(CommonString.TABLE_INSERT_SOS_PHARMA_DATA, CommonString.KEY_STORE_ID +"='" +storeId +"'", null); + db.delete(CommonString.TABLE_INSERT_SOS_PHARMA_DATA, CommonString.KEY_STORE_ID + "='" + storeId + "'", null); ContentValues values = new ContentValues(); try { //db.beginTransaction(); - for (int j = 0; j < sosListData.size(); j++) { - PharmaSOSGetterSetter data = sosListData.get(j); + for (int j = 0; j < sosListData.size(); j++) { + PharmaSOSGetterSetter data = sosListData.get(j); - values.put(CommonString.KEY_STORE_ID, storeId); - values.put(CommonString.KEY_QUESTION_ID, data.getQUESTION_ID()); - values.put(CommonString.KEY_QUESTION, data.getQUESTION()); - values.put(CommonString.KEY_SUB_CATEGORY_ID, data.getSUB_CATEGORY_ID()); - values.put(CommonString.KEY_SUB_CATEGORY, data.getSUB_CATEGORY()); - values.put(CommonString.KEY_BRAND_ID, data.getBRAND_ID()); - values.put(CommonString.KEY_BRAND, data.getBRAND()); - values.put(CommonString.KEY_GSK_FACING, data.getGskFacing()); - values.put(CommonString.KEY_COMPETITION_FACING, data.getCompetitorFacing()); + values.put(CommonString.KEY_STORE_ID, storeId); + values.put(CommonString.KEY_QUESTION_ID, data.getQUESTION_ID()); + values.put(CommonString.KEY_QUESTION, data.getQUESTION()); + values.put(CommonString.KEY_SUB_CATEGORY_ID, data.getSUB_CATEGORY_ID()); + values.put(CommonString.KEY_SUB_CATEGORY, data.getSUB_CATEGORY()); + values.put(CommonString.KEY_BRAND_ID, data.getBRAND_ID()); + values.put(CommonString.KEY_BRAND, data.getBRAND()); + values.put(CommonString.KEY_GSK_FACING, data.getGskFacing()); + values.put(CommonString.KEY_COMPETITION_FACING, data.getCompetitorFacing()); - db.insert(CommonString.TABLE_INSERT_SOS_PHARMA_DATA, null, values); - } + db.insert(CommonString.TABLE_INSERT_SOS_PHARMA_DATA, null, values); + } /*db.setTransactionSuccessful(); db.endTransaction();*/ @@ -8314,7 +8282,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper { String storeId, List hashMapListHeaderData, HashMap> hashMapListChildData) { - db.delete(CommonString.TABLE_INSERT_PHARMA_MSL_DATA, CommonString.KEY_STORE_ID +"='" +storeId +"'", null); + db.delete(CommonString.TABLE_INSERT_PHARMA_MSL_DATA, CommonString.KEY_STORE_ID + "='" + storeId + "'", null); ContentValues values = new ContentValues(); @@ -8368,18 +8336,18 @@ public class GSKOrangeDB extends SQLiteOpenHelper { try { - dbcursor = db.rawQuery("Select DISTINCT SB.SUB_CATEGORY_ID,SB.SUB_CATEGORY,BR.BRAND_ID,BR.BRAND,BR.COMPANY_ID " + - "from MAPPING_PHARMA_MSL M " + - "inner join SKU_MASTER SK " + - "on M.SKU_ID=SK.SKU_ID " + - "inner join BRAND_MASTER BR " + - "on SK.BRAND_ID=BR.BRAND_ID " + - "inner join SUB_CATEGORY_MASTER SB " + - "on BR.SUB_CATEGORY_ID=SB.SUB_CATEGORY_ID " + - "inner join CATEGORY_MASTER CA " + - "on SB.CATEGORY_ID=CA.CATEGORY_ID " + - "where BR.COMPANY_ID='" + 1 + "' " + - "order by SB.SUB_CATEGORY,BR.COMPANY_ID,BR.BRAND", null); + dbcursor = db.rawQuery("Select DISTINCT SB.SUB_CATEGORY_ID,SB.SUB_CATEGORY,BR.BRAND_ID,BR.BRAND,BR.COMPANY_ID " + + "from MAPPING_PHARMA_MSL M " + + "inner join SKU_MASTER SK " + + "on M.SKU_ID=SK.SKU_ID " + + "inner join BRAND_MASTER BR " + + "on SK.BRAND_ID=BR.BRAND_ID " + + "inner join SUB_CATEGORY_MASTER SB " + + "on BR.SUB_CATEGORY_ID=SB.SUB_CATEGORY_ID " + + "inner join CATEGORY_MASTER CA " + + "on SB.CATEGORY_ID=CA.CATEGORY_ID " + + "where BR.COMPANY_ID='" + 1 + "' " + + "order by SB.SUB_CATEGORY,BR.COMPANY_ID,BR.BRAND", null); if (dbcursor != null) { dbcursor.moveToFirst(); @@ -8455,7 +8423,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper { try { dbcursor = db.rawQuery("Select * from " + CommonString.TABLE_INSERT_PHARMA_IMAGE_DATA + - " where "+ CommonString.KEY_STORE_ID +"='" + store_id + "'", null); + " where " + CommonString.KEY_STORE_ID + "='" + store_id + "'", null); if (dbcursor != null) { dbcursor.moveToFirst(); @@ -8485,8 +8453,8 @@ public class GSKOrangeDB extends SQLiteOpenHelper { try { - dbcursor = db.rawQuery("Select * from " + CommonString.TABLE_INSERT_PHARMA_MSL_DATA + - " where "+ CommonString.KEY_STORE_ID +"='" + store_id + "'", null); + dbcursor = db.rawQuery("Select * from " + CommonString.TABLE_INSERT_PHARMA_MSL_DATA + + " where " + CommonString.KEY_STORE_ID + "='" + store_id + "'", null); if (dbcursor != null) { dbcursor.moveToFirst(); @@ -8567,14 +8535,14 @@ public class GSKOrangeDB extends SQLiteOpenHelper { public void InsertComptionPromotData(ArrayList counterfeitProductListData, String category_id, String store_id, boolean exists) { try { - db.delete(CommonString.TABLE_INSERT_COMPETIOTIONN_PROMO, "STORE_ID = '"+ store_id +"' AND CATEGORY_ID ='"+ category_id +"'", null); - db.delete(CommonString.TABLE_INSERT_COMPETIOTIONN_PROMO_EXISTS, "STORE_ID = '"+ store_id +"' AND CATEGORY_ID ='"+ category_id +"'", null); + db.delete(CommonString.TABLE_INSERT_COMPETIOTIONN_PROMO, "STORE_ID = '" + store_id + "' AND CATEGORY_ID ='" + category_id + "'", null); + db.delete(CommonString.TABLE_INSERT_COMPETIOTIONN_PROMO_EXISTS, "STORE_ID = '" + store_id + "' AND CATEGORY_ID ='" + category_id + "'", null); ContentValues values = new ContentValues(); ContentValues values1 = new ContentValues(); int existexist_int = 0; - if(exists){ + if (exists) { existexist_int = 1; } @@ -8616,11 +8584,10 @@ public class GSKOrangeDB extends SQLiteOpenHelper { try { - if(category_id==null){ + if (category_id == null) { dbcursor = db.rawQuery("Select * from COMPETIOTIONN_PROMO_EXISTS " + "where STORE_ID='" + store_id + "'", null); - } - else { + } else { dbcursor = db.rawQuery("Select * from COMPETIOTIONN_PROMO_EXISTS " + "where STORE_ID='" + store_id + "' AND CATEGORY_ID='" + category_id + "'", null); } @@ -8654,12 +8621,11 @@ public class GSKOrangeDB extends SQLiteOpenHelper { try { - if(category_id==null){ + if (category_id == null) { dbcursor = db.rawQuery("Select * from COMPETIOTIONN_PROMO " + "where COMMON_ID='" + store_id + "'", null); - } - else { + } else { dbcursor = db.rawQuery("Select * from COMPETIOTIONN_PROMO " + "where STORE_ID='" + store_id + "' AND CATEGORY_ID='" + category_id + "'", null); } @@ -8693,7 +8659,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper { return list; } - public ArrayList getCompetionData(String keyaccountId, String storetypeid,String classid,String categoryid,int subcategoryId) { + public ArrayList getCompetionData(String keyaccountId, String storetypeid, String classid, String categoryid, int subcategoryId) { Cursor cursordata = null; ArrayList Data = new ArrayList(); @@ -8702,7 +8668,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper { cursordata = db.rawQuery("Select DISTINCT bm.BRAND_ID,bm.BRAND from MAPPING_STOCK ms inner join SKU_MASTER sm on sm.SKU_ID=ms.SKU_ID " + "inner join BRAND_MASTER bm on bm.BRAND_ID=sm.BRAND_ID " + "inner join SUB_CATEGORY_MASTER cm on cm.SUB_CATEGORY_ID=bm.SUB_CATEGORY_ID " + - "WHERE ms.KEYACCOUNT_ID = '" + keyaccountId + "' AND ms.STORETYPE_ID='" + storetypeid +"' AND ms.CLASS_ID='" + classid +"' AND cm.CATEGORY_ID='" + categoryid +"'AND cm.SUB_CATEGORY_ID='" + subcategoryId +"' AND bm.COMPANY_ID<>1 ", null); + "WHERE ms.KEYACCOUNT_ID = '" + keyaccountId + "' AND ms.STORETYPE_ID='" + storetypeid + "' AND ms.CLASS_ID='" + classid + "' AND cm.CATEGORY_ID='" + categoryid + "'AND cm.SUB_CATEGORY_ID='" + subcategoryId + "' AND bm.COMPANY_ID<>1 ", null); if (cursordata != null) { @@ -8728,7 +8694,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper { } - public ArrayList getSubcategoryData(String keyaccountId, String storetypeid,String classid,String categoryid) { + public ArrayList getSubcategoryData(String keyaccountId, String storetypeid, String classid, String categoryid) { Cursor cursordata = null; ArrayList Data = new ArrayList(); @@ -8737,7 +8703,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper { cursordata = db.rawQuery("Select DISTINCT cm.SUB_CATEGORY_ID,cm.SUB_CATEGORY from MAPPING_STOCK ms inner join SKU_MASTER sm on sm.SKU_ID=ms.SKU_ID " + "inner join BRAND_MASTER bm on bm.BRAND_ID=sm.BRAND_ID " + "inner join SUB_CATEGORY_MASTER cm on cm.SUB_CATEGORY_ID=bm.SUB_CATEGORY_ID " + - "WHERE ms.KEYACCOUNT_ID = '" + keyaccountId + "' AND ms.STORETYPE_ID='" + storetypeid +"' AND ms.CLASS_ID='" + classid +"' AND cm.CATEGORY_ID='" + categoryid +"' AND bm.COMPANY_ID<>1 ", null); + "WHERE ms.KEYACCOUNT_ID = '" + keyaccountId + "' AND ms.STORETYPE_ID='" + storetypeid + "' AND ms.CLASS_ID='" + classid + "' AND cm.CATEGORY_ID='" + categoryid + "' AND bm.COMPANY_ID<>1 ", null); if (cursordata != null) { cursordata.moveToFirst(); @@ -8868,7 +8834,6 @@ public class GSKOrangeDB extends SQLiteOpenHelper { } - public ArrayList getSTORE_CATEGORY_WISE(String store_id, String category_id, String tableName) { ArrayList list = new ArrayList<>(); Cursor dbcursor = null; diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/GetterSetter/StoreBean.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/GetterSetter/StoreBean.java index 58ce516..baaa07f 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/GetterSetter/StoreBean.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/GetterSetter/StoreBean.java @@ -26,6 +26,16 @@ public class StoreBean implements Serializable{ String LONGITUDE; String POG_TYPE_ID; + public String getFACING_HIDE() { + return FACING_HIDE; + } + + public void setFACING_HIDE(String FACING_HIDE) { + this.FACING_HIDE = FACING_HIDE; + } + + String FACING_HIDE; + public String getSTORE_ID() { return STORE_ID; } diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/LoginActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/LoginActivity.java index 13165a1..045ba09 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/LoginActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/LoginActivity.java @@ -202,7 +202,7 @@ public class LoginActivity extends AppCompatActivity implements GoogleApiClient. mPasswordView.setText("cpm123");*/ //UAE - /* museridView.setText("testuae"); + /* museridView.setText("testuae"); mPasswordView.setText("cpm123");*/ @@ -213,13 +213,13 @@ public class LoginActivity extends AppCompatActivity implements GoogleApiClient. mPasswordView.setText("cpm123");*/ /* museridView.setText("Ahmed.saied"); mPasswordView.setText("cpm@123");*/ - museridView.setText("testksa"); - mPasswordView.setText("cpm123"); + /* museridView.setText("testksa"); + mPasswordView.setText("cpm123");*/ //turkey - /*museridView.setText("testmer"); - mPasswordView.setText("cpm123");*/ + museridView.setText("testmer"); + mPasswordView.setText("cpm123"); //sa /* museridView.setText("testsa"); mPasswordView.setText("cpm123"); 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 37dd438..5577f9e 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/constant/CommonString.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/constant/CommonString.java @@ -103,6 +103,7 @@ public class CommonString { public static final String KEY_JOURNEY_PLAN_PHARMA = "JOURNEY_PLAN_PHARMA"; public static final String KEY_ADHOC_JOURNEYPLAN_ADDITIONAL = "ADHOC_JOURNEYPLAN_ADDITIONAL"; public static final String KEY_STORE_FLAG = "STORE_FLAG"; + public static final String KEY_STORE_FLAG_FACING_HIDE = "STORE_FLAG_FACING_HIDE"; public static final String FROM_DEVIATION = "DEVIATION"; public static final String FROM_JCP = "JCP"; public static final String FROM_ADDITIONAL = "ADDITIONAL"; diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/NewStockDataActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/NewStockDataActivity.java index 1fad3a3..d33c482 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/NewStockDataActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/NewStockDataActivity.java @@ -83,7 +83,7 @@ public class NewStockDataActivity extends AppCompatActivity implements DialogCa LinearLayout lin_camera1, lin_camera2, lin_camera3, lin_camera4; GSKOrangeDB db; String categoryName, categoryId, storeId, Error_Message = ""; - String store_id, visit_date, username, intime, date, keyAccount_id, class_id, storeType_id, camera_allow, country_id, store_flag_str; + String store_id,store_flag_hide, visit_date, username, intime, date, keyAccount_id, class_id, storeType_id, camera_allow, country_id, store_flag_str; boolean isDialogOpen = true; private SharedPreferences preferences; int scrollPosition = 0; @@ -127,6 +127,7 @@ public class NewStockDataActivity extends AppCompatActivity implements DialogCa preferences = PreferenceManager.getDefaultSharedPreferences(this); CommonFunctions.updateLangResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, "")); store_id = preferences.getString(CommonString.KEY_STORE_ID, null); + store_flag_hide = preferences.getString(CommonString.KEY_STORE_FLAG_FACING_HIDE, null); visit_date = preferences.getString(CommonString.KEY_DATE, null); date = preferences.getString(CommonString.KEY_DATE, null); username = preferences.getString(CommonString.KEY_USERNAME, null); @@ -668,11 +669,11 @@ public class NewStockDataActivity extends AppCompatActivity implements DialogCa //Header if (country_id.equals("7")) { - headerDataList = db.getMSL_Availability_StockFacingHeaderData(categoryId, null, null, null, store_id, CommonString.TABLE_MAPPING_STOCK_STOREWISE, CommonString.TABLE_MAPPING_SOS_TARGET); + headerDataList = db.getMSL_Availability_StockFacingHeaderData(categoryId, null, null, null, store_id, CommonString.TABLE_MAPPING_STOCK_STOREWISE, CommonString.TABLE_MAPPING_SOS_TARGET,store_flag_hide); } else if (store_flag_str.equalsIgnoreCase(CommonString.FROM_DEVIATION)) { - headerDataList = db.getMSL_Availability_StockFacingHeaderData(categoryId, keyAccount_id, storeType_id, class_id, store_id, CommonString.TABLE_MAPPING_STOCK_ADHOC, CommonString.TABLE_MAPPING_SOS_TARGET_ADHOC); + headerDataList = db.getMSL_Availability_StockFacingHeaderData(categoryId, keyAccount_id, storeType_id, class_id, store_id, CommonString.TABLE_MAPPING_STOCK_ADHOC, CommonString.TABLE_MAPPING_SOS_TARGET_ADHOC,store_flag_hide); } else { - headerDataList = db.getMSL_Availability_StockFacingHeaderData(categoryId, keyAccount_id, storeType_id, class_id, store_id, CommonString.TABLE_MAPPING_STOCK, CommonString.TABLE_MAPPING_SOS_TARGET); + headerDataList = db.getMSL_Availability_StockFacingHeaderData(categoryId, keyAccount_id, storeType_id, class_id, store_id, CommonString.TABLE_MAPPING_STOCK, CommonString.TABLE_MAPPING_SOS_TARGET,store_flag_hide); } @@ -684,11 +685,11 @@ public class NewStockDataActivity extends AppCompatActivity implements DialogCa childDataList = db.getMSL_Availability_StockFacingSKU_AfterSaveData(categoryId, headerDataList.get(i).getBrand_id(), store_id); if (!(childDataList.size() > 0)) { if (country_id.equals("7")) { - childDataList = db.getMSL_Availability_StockFacingSKUData(headerDataList.get(i).getSub_category_id(),categoryId, headerDataList.get(i).getBrand_id(), null, null, null, store_id, CommonString.TABLE_MAPPING_STOCK_STOREWISE); + childDataList = db.getMSL_Availability_StockFacingSKUData(headerDataList.get(i).getSub_category_id(),categoryId, headerDataList.get(i).getBrand_id(), null, null, null, store_id, CommonString.TABLE_MAPPING_STOCK_STOREWISE,store_flag_hide); } else if (store_flag_str.equalsIgnoreCase(CommonString.FROM_DEVIATION)) { - childDataList = db.getMSL_Availability_StockFacingSKUData(headerDataList.get(i).getSub_category_id(),categoryId, headerDataList.get(i).getBrand_id(), keyAccount_id, storeType_id, class_id, store_id, CommonString.TABLE_MAPPING_STOCK_ADHOC); + childDataList = db.getMSL_Availability_StockFacingSKUData(headerDataList.get(i).getSub_category_id(),categoryId, headerDataList.get(i).getBrand_id(), keyAccount_id, storeType_id, class_id, store_id, CommonString.TABLE_MAPPING_STOCK_ADHOC,store_flag_hide); } else { - childDataList = db.getMSL_Availability_StockFacingSKUData(headerDataList.get(i).getSub_category_id(),categoryId, headerDataList.get(i).getBrand_id(), keyAccount_id, storeType_id, class_id, store_id, CommonString.TABLE_MAPPING_STOCK); + childDataList = db.getMSL_Availability_StockFacingSKUData(headerDataList.get(i).getSub_category_id(),categoryId, headerDataList.get(i).getBrand_id(), keyAccount_id, storeType_id, class_id, store_id, CommonString.TABLE_MAPPING_STOCK,store_flag_hide); } } diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StockActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StockActivity.java index 56e9bc3..0087d4e 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StockActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StockActivity.java @@ -265,13 +265,13 @@ public class StockActivity extends AppCompatActivity implements DialogCallbackLi childDataList = db.getStockAfterSaveData(categoryId, headerDataList.get(i).getBrand_id(), store_id); if (!(childDataList.size() > 0)) { if (country_id.equals("7")) { - childDataList = db.getMSL_Availability_StockFacingSKUData(headerDataList.get(i).getSub_category_id(),categoryId, headerDataList.get(i).getBrand_id(), null, null, null, store_id, CommonString.TABLE_MAPPING_STOCK_STOREWISE); + childDataList = db.getMSL_Availability_StockFacingSKUData(headerDataList.get(i).getSub_category_id(),categoryId, headerDataList.get(i).getBrand_id(), null, null, null, store_id, CommonString.TABLE_MAPPING_STOCK_STOREWISE,"0"); } else if (store_flag_str.equalsIgnoreCase(CommonString.FROM_DEVIATION)) { - childDataList = db.getMSL_Availability_StockFacingSKUData(headerDataList.get(i).getSub_category_id(),categoryId, headerDataList.get(i).getBrand_id(), keyAccount_id, storeType_id, class_id, store_id, CommonString.TABLE_MAPPING_STOCK_ADHOC); + childDataList = db.getMSL_Availability_StockFacingSKUData(headerDataList.get(i).getSub_category_id(),categoryId, headerDataList.get(i).getBrand_id(), keyAccount_id, storeType_id, class_id, store_id, CommonString.TABLE_MAPPING_STOCK_ADHOC,"0"); } else if (store_flag_str.equalsIgnoreCase(CommonString.FROM_ADDITIONAL)) { - childDataList = db.getMSL_Availability_StockFacingSKUData(headerDataList.get(i).getSub_category_id(),categoryId, headerDataList.get(i).getBrand_id(), keyAccount_id, storeType_id, class_id, store_id, CommonString.TABLE_MAPPING_STOCK_ADDITIONAL); + childDataList = db.getMSL_Availability_StockFacingSKUData(headerDataList.get(i).getSub_category_id(),categoryId, headerDataList.get(i).getBrand_id(), keyAccount_id, storeType_id, class_id, store_id, CommonString.TABLE_MAPPING_STOCK_ADDITIONAL,"0"); } else { - childDataList = db.getMSL_Availability_StockFacingSKUData(headerDataList.get(i).getSub_category_id(),categoryId, headerDataList.get(i).getBrand_id(), keyAccount_id, storeType_id, class_id, store_id, CommonString.TABLE_MAPPING_STOCK); + childDataList = db.getMSL_Availability_StockFacingSKUData(headerDataList.get(i).getSub_category_id(),categoryId, headerDataList.get(i).getBrand_id(), keyAccount_id, storeType_id, class_id, store_id, CommonString.TABLE_MAPPING_STOCK,"0"); } } diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StockDataActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StockDataActivity.java index e9fa74d..8283b61 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StockDataActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StockDataActivity.java @@ -272,10 +272,10 @@ public class StockDataActivity extends AppCompatActivity implements DialogCallba if (!(childDataList.size() > 0)) { if(store_flag_str.equalsIgnoreCase(CommonString.FROM_DEVIATION)) { - childDataList = db.getMSL_Availability_StockFacingSKUData(headerDataList.get(i).getSub_category_id(),categoryId, headerDataList.get(i).getBrand_id(), keyAccount_id, storeType_id, class_id, null, CommonString.TABLE_MAPPING_STOCK_ADHOC); + childDataList = db.getMSL_Availability_StockFacingSKUData(headerDataList.get(i).getSub_category_id(),categoryId, headerDataList.get(i).getBrand_id(), keyAccount_id, storeType_id, class_id, null, CommonString.TABLE_MAPPING_STOCK_ADHOC,"0"); } else { - childDataList = db.getMSL_Availability_StockFacingSKUData(headerDataList.get(i).getSub_category_id(),categoryId, headerDataList.get(i).getBrand_id(), keyAccount_id, storeType_id, class_id, null, CommonString.TABLE_MAPPING_STOCK); + childDataList = db.getMSL_Availability_StockFacingSKUData(headerDataList.get(i).getSub_category_id(),categoryId, headerDataList.get(i).getBrand_id(), keyAccount_id, storeType_id, class_id, null, CommonString.TABLE_MAPPING_STOCK,"0"); } } diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StockPricingActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StockPricingActivity.java index 2f9794d..fbab183 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StockPricingActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StockPricingActivity.java @@ -46,7 +46,7 @@ public class StockPricingActivity extends AppCompatActivity { private SharedPreferences preferences; String categoryName, categoryId, Error_Message = ""; - String store_id, visit_date, username, intime, date, keyAccount_id, class_id, storeType_id, camera_allow, country_id, store_flag_str; + String store_id,store_flag_hide, visit_date, username, intime, date, keyAccount_id, class_id, storeType_id, camera_allow, country_id, store_flag_str; GSKOrangeDB db; ArrayList headerDataList; @@ -76,6 +76,7 @@ public class StockPricingActivity extends AppCompatActivity { preferences = PreferenceManager.getDefaultSharedPreferences(this); CommonFunctions.updateLangResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, "")); store_id = preferences.getString(CommonString.KEY_STORE_ID, null); + store_flag_hide = preferences.getString(CommonString.KEY_STORE_FLAG_FACING_HIDE, null); visit_date = preferences.getString(CommonString.KEY_DATE, null); date = preferences.getString(CommonString.KEY_DATE, null); username = preferences.getString(CommonString.KEY_USERNAME, null); @@ -115,7 +116,7 @@ public class StockPricingActivity extends AppCompatActivity { hashMapListChildData = new HashMap<>(); //Header - headerDataList = db.getMSL_Availability_StockFacingHeaderData(categoryId, keyAccount_id, storeType_id, class_id, store_id, CommonString.TABLE_MAPPING_STOCK, CommonString.TABLE_MAPPING_SOS_TARGET); + headerDataList = db.getMSL_Availability_StockFacingHeaderData(categoryId, keyAccount_id, storeType_id, class_id, store_id, CommonString.TABLE_MAPPING_STOCK, CommonString.TABLE_MAPPING_SOS_TARGET,store_flag_hide); if (headerDataList.size() > 0) { for (int i = 0; i < headerDataList.size(); i++) { @@ -124,7 +125,7 @@ public class StockPricingActivity extends AppCompatActivity { childDataList = new ArrayList<>(); //childDataList = db.getMSL_Availability_StockFacingSKU_AfterSaveData(categoryId, headerDataList.get(i).getBrand_id(), store_id); if (childDataList.size() == 0) { - childDataList = db.getMSL_Availability_StockFacingSKUData(headerDataList.get(i).getSub_category_id(),categoryId, headerDataList.get(i).getBrand_id(), keyAccount_id, storeType_id, class_id, store_id, CommonString.TABLE_MAPPING_STOCK); + childDataList = db.getMSL_Availability_StockFacingSKUData(headerDataList.get(i).getSub_category_id(),categoryId, headerDataList.get(i).getBrand_id(), keyAccount_id, storeType_id, class_id, store_id, CommonString.TABLE_MAPPING_STOCK,"0"); } hashMapListChildData.put(hashMapListHeaderData.get(i), childDataList); diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreListActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreListActivity.java index eba8231..d03b03b 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreListActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreListActivity.java @@ -153,7 +153,7 @@ public class StoreListActivity extends AppCompatActivity implements GoogleApiCli RecyclerView recyclerView; private SharedPreferences.Editor editor = null; LinearLayout linearlay; - String store_id, userId, culture_id, visit_date; + String store_id, userId, culture_id, visit_date,store_facing_hide; private Dialog dialog; boolean result_flag = false, leaveflag = false; FloatingActionButton fab; @@ -775,6 +775,7 @@ public class StoreListActivity extends AppCompatActivity implements GoogleApiCli public void onClick(View v) { store_id = current.getSTORE_ID(); + store_facing_hide = current.getFACING_HIDE(); storeCurrentObj = current; if (current.getUPLOAD_STATUS().equalsIgnoreCase(CommonString.KEY_U) || current.getUPLOAD_STATUS().equalsIgnoreCase(CommonString.KEY_UN)) { @@ -885,6 +886,7 @@ public class StoreListActivity extends AppCompatActivity implements GoogleApiCli editor = preferences.edit(); editor.putString(CommonString.KEY_STORE_FLAG, store_flag_str); + editor.putString(CommonString.KEY_STORE_FLAG_FACING_HIDE, current.getFACING_HIDE()); editor.putString(CommonString.KEY_STORE_ID, current.getSTORE_ID()); editor.putString(CommonString.KEY_STORE_NAME, current.getSTORE_NAME()); editor.putString(CommonString.KEY_VISIT_DATE, current.getVISIT_DATE()); @@ -934,6 +936,7 @@ public class StoreListActivity extends AppCompatActivity implements GoogleApiCli editor = preferences.edit(); editor.putString(CommonString.KEY_STORE_FLAG, store_flag_str); + editor.putString(CommonString.KEY_STORE_FLAG_FACING_HIDE, current.getFACING_HIDE()); editor.putString(CommonString.KEY_STORE_ID, current.getSTORE_ID()); editor.putString(CommonString.KEY_STORE_NAME, current.getSTORE_NAME()); editor.putString(CommonString.KEY_VISIT_DATE, current.getVISIT_DATE()); @@ -960,6 +963,8 @@ public class StoreListActivity extends AppCompatActivity implements GoogleApiCli Intent in = new Intent(StoreListActivity.this, StoreimageActivity.class); in.putExtra(CommonString.KEY_STORE_FLAG, store_flag_str); in.putExtra(CommonString.KEY_STORE_ID, store_id); + in.putExtra(CommonString.KEY_STORE_FLAG_FACING_HIDE, store_facing_hide); + startActivity(in); overridePendingTransition(R.anim.activity_in, R.anim.activity_out); } @@ -1165,6 +1170,7 @@ public class StoreListActivity extends AppCompatActivity implements GoogleApiCli editor = preferences.edit(); editor.putString(CommonString.KEY_STORE_ID, current.getSTORE_ID()); + editor.putString(CommonString.KEY_STORE_FLAG_FACING_HIDE, current.getFACING_HIDE()); editor.putString(CommonString.KEY_STORE_NAME, current.getSTORE_NAME()); editor.putString(CommonString.KEY_VISIT_DATE, current.getVISIT_DATE()); editor.putString(CommonString.KEY_CAMERA_ALLOW, current.getCAMERA_ALLOW()); @@ -1186,6 +1192,7 @@ public class StoreListActivity extends AppCompatActivity implements GoogleApiCli Intent in = new Intent(StoreListActivity.this, StoreimageActivity.class); in.putExtra(CommonString.KEY_STORE_FLAG, store_flag_str); in.putExtra(CommonString.KEY_STORE_ID, current.getSTORE_ID()); + in.putExtra(CommonString.KEY_STORE_FLAG_FACING_HIDE, store_facing_hide); startActivity(in); overridePendingTransition(R.anim.activity_in, R.anim.activity_out); dialog.cancel(); @@ -1240,6 +1247,7 @@ public class StoreListActivity extends AppCompatActivity implements GoogleApiCli int id) { editor = preferences.edit(); + editor.putString(CommonString.KEY_STORE_FLAG_FACING_HIDE, current.getFACING_HIDE()); editor.putString(CommonString.KEY_STORE_ID, current.getSTORE_ID()); editor.putString(CommonString.KEY_STORE_NAME, current.getSTORE_NAME()); editor.putString(CommonString.KEY_VISIT_DATE, current.getVISIT_DATE()); @@ -1259,6 +1267,7 @@ public class StoreListActivity extends AppCompatActivity implements GoogleApiCli Intent in = new Intent(StoreListActivity.this, GeoTagActivity.class); in.putExtra(CommonString.KEY_STORE_FLAG, store_flag_str); in.putExtra(CommonString.KEY_STORE_ID, current.getSTORE_ID()); + in.putExtra(CommonString.KEY_STORE_FLAG_FACING_HIDE, store_facing_hide); startActivity(in); overridePendingTransition(R.anim.activity_in, R.anim.activity_out); dialog1.cancel(); @@ -2148,6 +2157,7 @@ public class StoreListActivity extends AppCompatActivity implements GoogleApiCli Intent in = new Intent(StoreListActivity.this, GeoTagActivity.class); in.putExtra(CommonString.KEY_STORE_FLAG, store_flag_str); in.putExtra(CommonString.KEY_STORE_ID, store_id); + in.putExtra(CommonString.KEY_STORE_FLAG_FACING_HIDE, store_facing_hide); startActivity(in); overridePendingTransition(R.anim.activity_in, R.anim.activity_out); dialog1.cancel(); @@ -2162,6 +2172,7 @@ public class StoreListActivity extends AppCompatActivity implements GoogleApiCli Intent in = new Intent(StoreListActivity.this, StoreimageActivity.class); in.putExtra(CommonString.KEY_STORE_FLAG, store_flag_str); in.putExtra(CommonString.KEY_STORE_ID, store_id); + in.putExtra(CommonString.KEY_STORE_FLAG_FACING_HIDE, store_facing_hide); startActivity(in); overridePendingTransition(R.anim.activity_in, R.anim.activity_out); } 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 5babe63..20c80e1 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 @@ -71,23 +71,18 @@ import cpm.com.gskmtorange.xmlGetterSetter.StockFacing_PlanogramTrackerDataGette public class MSL_Availability_StockFacingActivity extends AppCompatActivity implements DialogCallbackListener { ExpandableListView expandableListView; TextView txt_mslAvailabilityName; - ArrayList headerDataList; ArrayList childDataList; List hashMapListHeaderData; HashMap> hashMapListChildData; - List checkHeaderArray = new ArrayList<>(); boolean checkflag = true; - ExpandableListAdapter adapter; ImageView camera1, camera2, camera3, camera4; LinearLayout lin_camera1, lin_camera2, lin_camera3, lin_camera4; - GSKOrangeDB db; - String categoryName, categoryId, storeId, Error_Message = ""; - String store_id, visit_date, username, intime, date, keyAccount_id, class_id, storeType_id, camera_allow, country_id, store_flag_str; + String store_id, store_flag_hide, visit_date, username, intime, date, keyAccount_id, class_id, storeType_id, camera_allow, country_id, store_flag_str; boolean isDialogOpen = true; private SharedPreferences preferences; int scrollPosition = 0; @@ -133,6 +128,8 @@ public class MSL_Availability_StockFacingActivity extends AppCompatActivity impl preferences = PreferenceManager.getDefaultSharedPreferences(this); CommonFunctions.updateLangResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, "")); store_id = preferences.getString(CommonString.KEY_STORE_ID, null); + store_flag_hide = preferences.getString(CommonString.KEY_STORE_FLAG_FACING_HIDE, null); + visit_date = preferences.getString(CommonString.KEY_DATE, null); date = preferences.getString(CommonString.KEY_DATE, null); username = preferences.getString(CommonString.KEY_USERNAME, null); @@ -185,47 +182,10 @@ public class MSL_Availability_StockFacingActivity extends AppCompatActivity impl finish(); overridePendingTransition(R.anim.activity_back_in, R.anim.activity_back_out); - /*AlertDialog.Builder builder = new AlertDialog.Builder(MSL_Availability_StockFacingActivity.this); - builder.setMessage(getResources().getString(R.string.check_save_message)) - .setCancelable(false) - .setPositiveButton(getResources().getString(R.string.yes), new DialogInterface.OnClickListener() { - public void onClick(DialogInterface dialog, int id) { - db.open(); - - if (db.checkMsl_Availability_StockFacingData(store_id, categoryId)) { - db.updateMSL_Availability_StockFacing(store_id, categoryId, hashMapListHeaderData, hashMapListChildData); - Snackbar.make(view, getResources().getString(R.string.update_message), Snackbar.LENGTH_LONG).setAction("Action", null).show(); - } else { - db.InsertMSL_Availability_StockFacing(store_id, categoryId, hashMapListHeaderData, hashMapListChildData); - Snackbar.make(view, getResources().getString(R.string.save_message), Snackbar.LENGTH_LONG).setAction("Action", null).show(); - } - finish(); - overridePendingTransition(R.anim.activity_back_in, R.anim.activity_back_out); - } - }) - .setNegativeButton(getResources().getString(R.string.no), new DialogInterface.OnClickListener() { - public void onClick(DialogInterface dialog, int id) { - dialog.cancel(); - } - }); - AlertDialog alert = builder.create(); - alert.show();*/ } else { for (int i = 0; i < adapter.getGroupCount(); i++) expandableListView.expandGroup(i); - /*AlertDialog.Builder builder = new AlertDialog.Builder(MSL_Availability_StockFacingActivity.this); - builder.setMessage(Error_Message) - .setCancelable(false) - .setPositiveButton(R.string.ok, new DialogInterface.OnClickListener() { - public void onClick(DialogInterface dialog, int id) { - //expandableListView.smoothScrollToPosition(scrollPosition); - - dialog.dismiss(); - } - }); - AlertDialog alert = builder.create(); - alert.show();*/ } } @@ -308,49 +268,6 @@ public class MSL_Availability_StockFacingActivity extends AppCompatActivity impl } - /* view = (RelativeLayout)findViewById(R.id.content_msl__availability); - //bmImage = (ImageView)findViewById(R.id.image); - - view.setDrawingCacheEnabled(true); - // this is the important code :) - // Without it the view will have a dimension of 0,0 and the bitmap will be null - - view.measure(View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED), - View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED)); - - view.layout(0, 0, view.getMeasuredWidth(), view.getMeasuredHeight()); - - view.buildDrawingCache(true); - final Bitmap b = Bitmap.createBitmap(view.getDrawingCache()); - view.setDrawingCacheEnabled(false); // clear drawing cache - - //bmImage.setImageBitmap(b); - - try{ - - - File yourFile = new File(FILE_PATH+"imgForTxt.png"); - yourFile.createNewFile(); // if file already exists will do nothing - final FileOutputStream stream = new FileOutputStream(yourFile, false); //create your FileOutputStream here - - new Thread(new Runnable() { - public void run(){ - b.compress(Bitmap.CompressFormat.PNG, 85, stream); - b.recycle(); - try { - stream.close(); - } catch (IOException e) { - e.printStackTrace(); - } - } - }).start(); - - } - catch (FileNotFoundException e) { - e.printStackTrace(); - } catch (IOException e) { - e.printStackTrace(); - }*/ } @Override @@ -373,32 +290,6 @@ public class MSL_Availability_StockFacingActivity extends AppCompatActivity impl } - /* AlertDialog.Builder builder = new AlertDialog.Builder(MSL_Availability_StockFacingActivity.this); - builder.setTitle(getResources().getString(R.string.dialog_title)); - builder.setMessage(getResources().getString(R.string.data_will_be_lost)).setCancelable(false) - .setPositiveButton(getResources().getString(R.string.yes), new DialogInterface.OnClickListener() { - public void onClick(DialogInterface dialog, int id) { - - //adapter.notifyDataSetChanged(); - - if (!validateData(hashMapListHeaderData, hashMapListChildData)) { - if (!camera_allow.equals("1")) { - db.deletePlanogramListStoreAndCategorywise(store_id, categoryId, - planogramShelfHeaderDataList, planogramHashMapListChildData); - } - } - finish(); - overridePendingTransition(R.anim.activity_back_in, R.anim.activity_back_out); - } - }) - .setNegativeButton(getResources().getString(R.string.no), new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) { - - } - }); - AlertDialog alert = builder.create(); - alert.show();*/ //finish(); } else if (id == R.id.action_planogram) {//Planogram Dialog expandableListView.clearFocus(); @@ -438,8 +329,7 @@ public class MSL_Availability_StockFacingActivity extends AppCompatActivity impl if (!planogram_image.equals("")) { if (new File(str_planogram + planogram_image).exists()) { Bitmap bmp = BitmapFactory.decodeFile(str_planogram + planogram_image); - // img_planogram.setRotation(90); - //img_planogram.setImageBitmap(bmp); + setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE); String imagePath = "file://" + CommonString.FILE_PATH_PLANOGRAM + "/" + planogram_image; @@ -447,11 +337,7 @@ public class MSL_Availability_StockFacingActivity extends AppCompatActivity impl webView.loadDataWithBaseURL("", html, "text/html", "utf-8", ""); dialog.show(); - } /*else { - //webView.loadUrl(String.valueOf(R.drawable.sad_cloud)); - - //img_planogram.setBackgroundResource(R.drawable.sad_cloud); - }*/ + } } @@ -513,131 +399,9 @@ public class MSL_Availability_StockFacingActivity extends AppCompatActivity impl } private void cameraMethod() { - /*cameraData = new Store_wise_camera_DataGetterSetter(); - - if (db.isStorewiseCameraSave(store_id, categoryId)) { - cameraData = db.getStore_wise_camera(store_id, categoryId); - } else { - cameraData.setStore_id(store_id); - cameraData.setCategory_id(categoryId); - cameraData.setCamera1(""); - cameraData.setCamera2(""); - cameraData.setCamera3(""); - cameraData.setCamera4(""); - cameraData.setCheckSaveStatus("0"); - } - - - if (camera_allow.equals("1")) { - - findViewById(R.id.view_camera2).setVisibility(View.VISIBLE); - findViewById(R.id.view_camera3).setVisibility(View.VISIBLE); - - if (cameraData.getCamera1().equals("")) { - camera1.setBackgroundResource(R.mipmap.camera_orange); - } else { - camera1.setBackgroundResource(R.mipmap.camera_green); - } - - if (cameraData.getCamera2().equals("")) { - camera2.setBackgroundResource(R.mipmap.camera_orange); - } else { - camera2.setBackgroundResource(R.mipmap.camera_green); - } - - if (cameraData.getCamera3().equals("")) { - camera3.setBackgroundResource(R.mipmap.camera_orange); - } else { - camera3.setBackgroundResource(R.mipmap.camera_green); - } - - if (cameraData.getCamera4().equals("")) { - camera4.setBackgroundResource(R.mipmap.camera_orange); - } else { - camera4.setBackgroundResource(R.mipmap.camera_green); - } - - - lin_camera1.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View view) { - _pathforcheck = "Stock_Camera1_" + store_id + "_" + categoryId - + "_" + visit_date.replace("/", "") + "_" + CommonFunctions.getCurrentTimeWithLanguage(getApplicationContext()).replace(":", "") + ".jpg"; - path = str_planogram+ _pathforcheck; - - startCameraActivity(3); - } - }); - - lin_camera2.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View view) { - _pathforcheck = "Stock_Camera2_" + store_id + "_" + categoryId - + "_" + visit_date.replace("/", "") + "_" + CommonFunctions.getCurrentTimeWithLanguage(getApplicationContext()).replace(":", "") + ".jpg"; - path = str_planogram+ _pathforcheck; - - startCameraActivity(4); - } - }); - - lin_camera3.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View view) { - _pathforcheck = "Stock_Camera3_" + store_id + "_" + categoryId - + "_" + visit_date.replace("/", "") + "_" + CommonFunctions.getCurrentTimeWithLanguage(getApplicationContext()).replace(":", "") + ".jpg"; - path = str_planogram+ _pathforcheck; - - startCameraActivity(5); - } - }); - - lin_camera4.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View view) { - _pathforcheck = "Stock_Camera4_" + store_id + "_" + categoryId - + "_" + visit_date.replace("/", "") + "_" + CommonFunctions.getCurrentTimeWithLanguage(getApplicationContext()).replace(":", "") + ".jpg"; - path = str_planogram+ _pathforcheck; - - startCameraActivity(6); - } - }); - - } else {*/ if (!camera_allow.equals("1")) { findViewById(R.id.lin_camera).setVisibility(View.GONE); - /* findViewById(R.id.lin_camera).setVisibility(View.VISIBLE); - - findViewById(R.id.view_camera2).setVisibility(View.GONE); - findViewById(R.id.view_camera3).setVisibility(View.GONE); - - lin_camera2.setVisibility(View.GONE); - lin_camera3.setVisibility(View.GONE); - lin_camera4.setVisibility(View.GONE); - - if (db.isPlanogramAddShelfSaveData(store_id, categoryId)) { - camera1.setBackgroundResource(R.mipmap.new_no_camera_done_edit); - } else { - camera1.setBackgroundResource(R.mipmap.new_no_camera); - } - - lin_camera1.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View view) { - Intent intent = new Intent(MSL_Availability_StockFacingActivity.this, - StockFacing_PlanogramTrackerActivity.class); - - intent.putExtra("storeId", store_id); - intent.putExtra("keyAccount_id", keyAccount_id); - intent.putExtra("class_id", class_id); - intent.putExtra("storeType_id", storeType_id); - intent.putExtra("categoryId", categoryId); - intent.putExtra("categoryName", categoryName); - - startActivityForResult(intent, 100); - } - - });*/ } else { findViewById(R.id.lin_camera).setVisibility(View.GONE); } @@ -674,11 +438,11 @@ public class MSL_Availability_StockFacingActivity extends AppCompatActivity impl //Header if (country_id.equals("7") || country_id.equals("8")) { - headerDataList = db.getMSL_Availability_StockFacingHeaderData(categoryId, null, null, null, store_id, CommonString.TABLE_MAPPING_STOCK_STOREWISE, CommonString.TABLE_MAPPING_SOS_TARGET); + headerDataList = db.getMSL_Availability_StockFacingHeaderData(categoryId, null, null, null, store_id, CommonString.TABLE_MAPPING_STOCK_STOREWISE, CommonString.TABLE_MAPPING_SOS_TARGET, store_flag_hide); } else if (store_flag_str.equalsIgnoreCase(CommonString.FROM_DEVIATION)) { - headerDataList = db.getMSL_Availability_StockFacingHeaderData(categoryId, keyAccount_id, storeType_id, class_id, store_id, CommonString.TABLE_MAPPING_STOCK_ADHOC, CommonString.TABLE_MAPPING_SOS_TARGET_ADHOC); + headerDataList = db.getMSL_Availability_StockFacingHeaderData(categoryId, keyAccount_id, storeType_id, class_id, store_id, CommonString.TABLE_MAPPING_STOCK_ADHOC, CommonString.TABLE_MAPPING_SOS_TARGET_ADHOC, store_flag_hide); } else { - headerDataList = db.getMSL_Availability_StockFacingHeaderData(categoryId, keyAccount_id, storeType_id, class_id, store_id, CommonString.TABLE_MAPPING_STOCK, CommonString.TABLE_MAPPING_SOS_TARGET); + headerDataList = db.getMSL_Availability_StockFacingHeaderData(categoryId, keyAccount_id, storeType_id, class_id, store_id, CommonString.TABLE_MAPPING_STOCK, CommonString.TABLE_MAPPING_SOS_TARGET, store_flag_hide); } @@ -690,11 +454,11 @@ public class MSL_Availability_StockFacingActivity extends AppCompatActivity impl childDataList = db.getMSL_Availability_StockFacingSKU_AfterSaveData(categoryId, headerDataList.get(i).getBrand_id(), store_id); if (!(childDataList.size() > 0)) { if (country_id.equals("7") || country_id.equals("8")) { - childDataList = db.getMSL_Availability_StockFacingSKUData(headerDataList.get(i).getSub_category_id(), categoryId, headerDataList.get(i).getBrand_id(), null, null, null, store_id, CommonString.TABLE_MAPPING_STOCK_STOREWISE); + childDataList = db.getMSL_Availability_StockFacingSKUData(headerDataList.get(i).getSub_category_id(), categoryId, headerDataList.get(i).getBrand_id(), null, null, null, store_id, CommonString.TABLE_MAPPING_STOCK_STOREWISE, store_flag_hide); } else if (store_flag_str.equalsIgnoreCase(CommonString.FROM_DEVIATION)) { - childDataList = db.getMSL_Availability_StockFacingSKUData(headerDataList.get(i).getSub_category_id(), categoryId, headerDataList.get(i).getBrand_id(), keyAccount_id, storeType_id, class_id, store_id, CommonString.TABLE_MAPPING_STOCK_ADHOC); + childDataList = db.getMSL_Availability_StockFacingSKUData(headerDataList.get(i).getSub_category_id(), categoryId, headerDataList.get(i).getBrand_id(), keyAccount_id, storeType_id, class_id, store_id, CommonString.TABLE_MAPPING_STOCK_ADHOC, store_flag_hide); } else { - childDataList = db.getMSL_Availability_StockFacingSKUData(headerDataList.get(i).getSub_category_id(), categoryId, headerDataList.get(i).getBrand_id(), keyAccount_id, storeType_id, class_id, store_id, CommonString.TABLE_MAPPING_STOCK); + childDataList = db.getMSL_Availability_StockFacingSKUData(headerDataList.get(i).getSub_category_id(), categoryId, headerDataList.get(i).getBrand_id(), keyAccount_id, storeType_id, class_id, store_id, CommonString.TABLE_MAPPING_STOCK, store_flag_hide); } } @@ -738,7 +502,7 @@ public class MSL_Availability_StockFacingActivity extends AppCompatActivity impl //Company_id if (listDataChild.get(listDataHeader.get(i)).get(j).getCompany_id().equals("1")) { if (data.getMust_have().equals("1")) { - //usk + //usk ksa pricing if (!defaultpricing.equals("0")) { if (pricing.equals("")) { if (!checkHeaderArray.contains(i)) { @@ -753,15 +517,44 @@ public class MSL_Availability_StockFacingActivity extends AppCompatActivity impl } } - if (faceup.equals("")) { - if (!checkHeaderArray.contains(i)) { - checkHeaderArray.add(i); + if (store_flag_hide.equals("0")) { + if (faceup.equals("")) { + if (!checkHeaderArray.contains(i)) { + checkHeaderArray.add(i); + } + scrollPosition = i + j + childCount; + all_flag = false; + flag = false; + child_flag = false; + Error_Message = getResources().getString(R.string.faceup_value); + } else { + if (data.getToggleValue().equals("0")) { + if (stock.equals("")) { + if (!checkHeaderArray.contains(i)) { + checkHeaderArray.add(i); + } + scrollPosition = i + j + childCount; + all_flag = false; + flag = false; + child_flag = false; + Error_Message = getResources().getString(R.string.stock_value); + } + } else { + //for Egypt + if (country_id.equals("6")) { + if (stock.equals("")) { + if (!checkHeaderArray.contains(i)) { + checkHeaderArray.add(i); + } + scrollPosition = i + j + childCount; + all_flag = false; + flag = false; + child_flag = false; + Error_Message = getResources().getString(R.string.stock_value); + } + } + } } - scrollPosition = i + j + childCount; - all_flag = false; - flag = false; - child_flag = false; - Error_Message = getResources().getString(R.string.faceup_value); } else { if (data.getToggleValue().equals("0")) { if (stock.equals("")) { @@ -790,19 +583,23 @@ public class MSL_Availability_StockFacingActivity extends AppCompatActivity impl } } } + } } else { - if (faceup.equals("")) { - if (!checkHeaderArray.contains(i)) { - checkHeaderArray.add(i); + if (store_flag_hide.equals("0")) { + if (faceup.equals("")) { + if (!checkHeaderArray.contains(i)) { + checkHeaderArray.add(i); + } + scrollPosition = i + j + childCount; + all_flag = false; + flag = false; + child_flag = false; + Error_Message = getResources().getString(R.string.faceup_value); } - scrollPosition = i + j + childCount; - all_flag = false; - flag = false; - child_flag = false; - Error_Message = getResources().getString(R.string.faceup_value); } //usk +/* if (!defaultpricing.equals("0")) { if (pricing.equals("")) { if (!checkHeaderArray.contains(i)) { @@ -816,26 +613,9 @@ public class MSL_Availability_StockFacingActivity extends AppCompatActivity impl } } - - } - //usk -/* - if (defaultpricing.equals("0")) { - if (pricing.equals("")) { - if (!checkHeaderArray.contains(i)) { - checkHeaderArray.add(i); - } - scrollPosition = i + j + childCount; - all_flag = false; - flag = false; - child_flag = false; - Error_Message = getResources().getString(R.string.title_activity_stock_pricing); - - } - - } */ + } if (!child_flag) listTemp.add(data); @@ -866,32 +646,6 @@ public class MSL_Availability_StockFacingActivity extends AppCompatActivity impl public void onBackPressed() { //super.onBackPressed(); - /*AlertDialog.Builder builder = new AlertDialog.Builder(MSL_Availability_StockFacingActivity.this); - builder.setTitle(getResources().getString(R.string.dialog_title)); - builder.setMessage(getResources().getString(R.string.data_will_be_lost)).setCancelable(false) - .setPositiveButton(getResources().getString(R.string.yes), new DialogInterface.OnClickListener() { - public void onClick(DialogInterface dialog, int id) { - - //adapter.notifyDataSetChanged(); - if (!validateData(hashMapListHeaderData, hashMapListChildData)) { - - if (!camera_allow.equals("1")) { - db.deletePlanogramListStoreAndCategorywise(store_id, categoryId, - planogramShelfHeaderDataList, planogramHashMapListChildData); - } - } - finish(); - overridePendingTransition(R.anim.activity_back_in, R.anim.activity_back_out); - } - }) - .setNegativeButton(getResources().getString(R.string.no), new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) { - - } - }); - AlertDialog alert = builder.create(); - alert.show();*/ if (editFlag) { CommonFunctions.showAlertDialog(MSL_Availability_StockFacingActivity.this, getResources().getString(R.string.data_will_be_lost)); } else { @@ -900,20 +654,6 @@ public class MSL_Availability_StockFacingActivity extends AppCompatActivity impl } - /* if(flag){ - //adapter.notifyDataSetChanged(); - if (!validateData(hashMapListHeaderData, hashMapListChildData)) { - - if (!camera_allow.equals("1")) { - db.deletePlanogramListStoreAndCategorywise(store_id, categoryId, - planogramShelfHeaderDataList, planogramHashMapListChildData); - } - } - finish(); - overridePendingTransition(R.anim.activity_back_in, R.anim.activity_back_out); - }*/ - - } public class ExpandableListAdapter extends BaseExpandableListAdapter { @@ -1036,6 +776,7 @@ public class MSL_Availability_StockFacingActivity extends AppCompatActivity impl holder.stock = (EditText) convertView.findViewById(R.id.ed_stock); holder.ed_pricing = (EditText) convertView.findViewById(R.id.ed_pricing); + holder.facing_view = convertView.findViewById(R.id.facing_view); holder.stock_view = convertView.findViewById(R.id.stock_view); holder.pricing_view = convertView.findViewById(R.id.pricing_view); convertView.setTag(holder); @@ -1043,6 +784,14 @@ public class MSL_Availability_StockFacingActivity extends AppCompatActivity impl holder = (ViewHolder) convertView.getTag(); } + // uae facing hide + if (store_flag_hide.equals("1")) { + holder.facing.setVisibility(View.GONE); + holder.facing_view.setVisibility(View.GONE); + } else { + holder.facing.setVisibility(View.VISIBLE); + holder.facing_view.setVisibility(View.VISIBLE); + } //usk if (childData.getPricing().equals("0")) { holder.ed_pricing.setVisibility(View.GONE); @@ -1282,13 +1031,7 @@ public class MSL_Availability_StockFacingActivity extends AppCompatActivity impl holder.ed_pricing.setOnFocusChangeListener(new View.OnFocusChangeListener() { @Override public void onFocusChange(View v, boolean hasFocus) { - /*final EditText caption = (EditText) v; - String edStock = caption.getText().toString().replaceFirst("^0+(?!$)", ""); - if (!edStock.equals("")) { - String stock = edStock; - - }*/ if (!hasFocus) { final EditText Caption = (EditText) v; String value1 = Caption.getText().toString().replaceFirst("^0+(?!$)", ""); @@ -1637,7 +1380,7 @@ public class MSL_Availability_StockFacingActivity extends AppCompatActivity impl ToggleButton toggle_available; LinearLayout lin_category; EditText facing, stock, ed_pricing; - View stock_view, pricing_view; + View stock_view, pricing_view, facing_view; } diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/PreviousDataUploadActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/PreviousDataUploadActivity.java index 20806df..64e1987 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/PreviousDataUploadActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/PreviousDataUploadActivity.java @@ -633,7 +633,7 @@ public class PreviousDataUploadActivity extends AppCompatActivity { request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_UPLOAD_STOCK_XML_DATA); request.addProperty("XMLDATA", sos_xml); - request.addProperty("KEYS", "STOCK_AVAILABILITY_POINT_LATEST_NEW"); + request.addProperty("KEYS", "STOCK_AVAILABILITY_WITH_PRICING"); request.addProperty("USERNAME", userId); request.addProperty("MID", mid); diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java index dc443e0..c71b36c 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java @@ -865,7 +865,7 @@ public class UploadActivity extends AppCompatActivity { request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_UPLOAD_STOCK_XML_DATA); request.addProperty("XMLDATA", sos_xml); - request.addProperty("KEYS", "STOCK_AVAILABILITY_POINT_LATEST_NEW"); + request.addProperty("KEYS", "STOCK_AVAILABILITY_WITH_PRICING"); request.addProperty("USERNAME", userId); request.addProperty("MID", mid); diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadImageWithRetrofit.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadImageWithRetrofit.java index 3edf0ff..f8071b1 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadImageWithRetrofit.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadImageWithRetrofit.java @@ -152,7 +152,7 @@ public class UploadImageWithRetrofit { call.enqueue(new retrofit.Callback() { @Override public void onResponse(retrofit.Response response) { - if (response.isSuccess() && response.body().contains("Success")) { + if (response.isSuccess() && response.body().contains("Success")) { finalFile.delete(); status = 1; uploadedFiles++; @@ -306,53 +306,79 @@ public class UploadImageWithRetrofit { } - public File saveBitmapToFileSmaller(File file) { - File file2 = file; - try { - int inWidth = 0; - int inHeight = 0; + public File saveBitmapToFileSmaller(File file) { + File file2 = file; + try { - InputStream in = new FileInputStream(file2); - // decode image size (decode metadata only, not the whole image) - BitmapFactory.Options options = new BitmapFactory.Options(); - options.inJustDecodeBounds = true; - BitmapFactory.decodeStream(in, null, options); - in.close(); - in = null; + InputStream in = new FileInputStream(file2); + // decode image size (decode metadata only, not the whole image) + BitmapFactory.Options options = new BitmapFactory.Options(); + options.inJustDecodeBounds = true; + BitmapFactory.decodeStream(in, null, options); + in.close(); - // save width and height - inWidth = options.outWidth; - inHeight = options.outHeight; + // decode full image pre-resized + in = new FileInputStream(file2); + options = new BitmapFactory.Options(); + // decode full image + Bitmap roughBitmap = BitmapFactory.decodeStream(in, null, options); - // decode full image pre-resized - in = new FileInputStream(file2); - options = new BitmapFactory.Options(); - // calc rough re-size (this is no exact resize) - //usk commonet code - // options.inSampleSize = Math.max(inWidth / 1632, inHeight / 1224); - // decode full image - Bitmap roughBitmap = BitmapFactory.decodeStream(in, null, options); + // save image + FileOutputStream out = new FileOutputStream(file2); + roughBitmap.compress(Bitmap.CompressFormat.JPEG, 100, out); - // calc exact destination size - Matrix m = new Matrix(); - RectF inRect = new RectF(0, 0, roughBitmap.getWidth(), roughBitmap.getHeight()); - RectF outRect = new RectF(0, 0, 1632, 1224); - m.setRectToRect(inRect, outRect, Matrix.ScaleToFit.CENTER); - float[] values = new float[9]; - m.getValues(values); - // resize bitmap - Bitmap resizedBitmap = Bitmap.createScaledBitmap(roughBitmap, (int) (roughBitmap.getWidth() * values[0]), (int) (roughBitmap.getHeight() * values[4]), true); - // save image - FileOutputStream out = new FileOutputStream(file2); - // resizedBitmap.compress(Bitmap.CompressFormat.JPEG, 80, out); - resizedBitmap.compress(Bitmap.CompressFormat.JPEG, 100, out); + } catch (Exception e) { + Log.e("Image", e.toString(), e); + return file; + } + return file2; + } + /* public File saveBitmapToFileSmaller(File file) { + File file2 = file; + try { + int inWidth = 0; + int inHeight = 0; + + InputStream in = new FileInputStream(file2); + // decode image size (decode metadata only, not the whole image) + BitmapFactory.Options options = new BitmapFactory.Options(); + options.inJustDecodeBounds = true; + BitmapFactory.decodeStream(in, null, options); + in.close(); + in = null; + + // save width and height + inWidth = options.outWidth; + inHeight = options.outHeight; + + // decode full image pre-resized + in = new FileInputStream(file2); + options = new BitmapFactory.Options(); + // calc rough re-size (this is no exact resize) + options.inSampleSize = Math.max(inWidth / 1632, inHeight / 1224); + // decode full image + Bitmap roughBitmap = BitmapFactory.decodeStream(in, null, options); + + // calc exact destination size + Matrix m = new Matrix(); + RectF inRect = new RectF(0, 0, roughBitmap.getWidth(), roughBitmap.getHeight()); + RectF outRect = new RectF(0, 0, 1632, 1224); + m.setRectToRect(inRect, outRect, Matrix.ScaleToFit.CENTER); + float[] values = new float[9]; + m.getValues(values); + // resize bitmap + Bitmap resizedBitmap = Bitmap.createScaledBitmap(roughBitmap, (int) (roughBitmap.getWidth() * values[0]), (int) (roughBitmap.getHeight() * values[4]), true); + // save image + FileOutputStream out = new FileOutputStream(file2); + resizedBitmap.compress(Bitmap.CompressFormat.JPEG, 80, out); + + } catch (Exception e) { + Log.e("Image", e.toString(), e); + return file; + } + return file2; + }*/ - } catch (Exception e) { - Log.e("Image", e.toString(), e); - return file; - } - return file2; - } public void showAlert(final Context context, String str, final boolean flag) { diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/JourneyPlanGetterSetter.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/JourneyPlanGetterSetter.java index 0c416c2..5c41a84 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/JourneyPlanGetterSetter.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/JourneyPlanGetterSetter.java @@ -30,6 +30,16 @@ public class JourneyPlanGetterSetter implements Serializable{ ArrayList POG_TYPE_ID = new ArrayList(); + public ArrayList getFACING_HIDE() { + return FACING_HIDE; + } + + public void setFACING_HIDE(String FACING_HIDE) { + this.FACING_HIDE.add(FACING_HIDE); + } + + ArrayList FACING_HIDE = new ArrayList(); + public ArrayList getCHANNEL_ID() { return CHANNEL_ID; } diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlHandlers/XMLHandlers.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlHandlers/XMLHandlers.java index 2753baa..051508b 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlHandlers/XMLHandlers.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlHandlers/XMLHandlers.java @@ -222,6 +222,9 @@ public class XMLHandlers { if (xpp.getName().equals("POG_TYPE_ID")) { jcpGetterSetter.setPOG_TYPE_ID(xpp.nextText()); } + if (xpp.getName().equals("FACING_HIDE")) { + jcpGetterSetter.setFACING_HIDE(xpp.nextText()); + } } xpp.next(); } diff --git a/GSKMTOrange/src/main/res/layout/item_msl_availability_stock_facing_child.xml b/GSKMTOrange/src/main/res/layout/item_msl_availability_stock_facing_child.xml index 1f7e184..cf8abe2 100644 --- a/GSKMTOrange/src/main/res/layout/item_msl_availability_stock_facing_child.xml +++ b/GSKMTOrange/src/main/res/layout/item_msl_availability_stock_facing_child.xml @@ -99,13 +99,14 @@ android:gravity="center" android:inputType="numberDecimal" android:maxLength="3" - android:paddingBottom="5dp" android:paddingTop="5dp" + android:paddingBottom="5dp" android:textAppearance="?android:attr/textAppearanceSmall" android:textColor="#222" android:textColorHint="#666" />