UAE_facing_hide

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;
@@ -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);
 
@@ -527,8 +528,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
                         "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 + "' " +
@@ -580,8 +580,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
                         "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();
                 }
@@ -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 " +
@@ -2789,8 +2790,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
 
             if (brand_id == null) {
                 cursordata = db.rawQuery("SELECT * FROM SKU_MASTER ", null);
-            }
+            } else {
-            else {
                 cursordata = db.rawQuery("SELECT * FROM SKU_MASTER where BRAND_ID = '" + brand_id + "' ORDER BY SKU_SEQUENCE", null);
             }
 
@@ -3446,7 +3446,6 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
             }
 
 
-
             if (dbcursor != null) {
                 dbcursor.moveToFirst();
                 while (!dbcursor.isAfterLast()) {
@@ -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 " +
@@ -4042,8 +4040,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
                         "(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 " +
@@ -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" +
@@ -5206,7 +5202,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
     //14-03-2017
     //MSL_Availability_StockFacing
     public ArrayList<MSL_AvailabilityStockFacingGetterSetter> 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<MSL_AvailabilityStockFacingGetterSetter> list = new ArrayList<>();
         Cursor dbcursor = null;
@@ -5214,6 +5210,23 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
         try {
 
             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 " +
@@ -5228,8 +5241,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 + "'" +
                             "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 " + tableMappingSOS + " WHERE STORE_ID = 1 AND BRAND_ID = BR.BRAND_ID)AS SOS_TARGET " +
                         "from MAPPING_STOCK_STOREWISE M " +
@@ -5243,28 +5257,9 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
                         "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);
+
             }
 
-
-
-
-
-            /*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,7 +5285,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
     }
 
     public ArrayList<MSL_AvailabilityStockFacingGetterSetter> 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<MSL_AvailabilityStockFacingGetterSetter> list = new ArrayList<>();
         Cursor dbcursor = null;
@@ -5299,6 +5293,24 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
         try {
 
             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);
+
+
+                } 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 " +
@@ -5314,44 +5326,9 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
                             "' 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);
 
-
-               /* 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 " +
+            } else {
-                        "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);*/
                 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) {
@@ -5969,8 +5945,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 + "' 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 " +
                         "from MAPPING_STOCK_STOREWISE M " +
@@ -6260,8 +6235,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
             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 {
-            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);
             }
@@ -6375,8 +6349,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
             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 {
-            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);
             }
@@ -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);
 
@@ -7014,8 +6988,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
             int exist;
             if (data.isExists()) {
                 exist = 1;
-                }
+            } else {
-                else {
                 exist = 0;
             }
             values.put(CommonString.KEY_EXIST, exist);
@@ -7162,8 +7135,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
         try {
             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);
             }
 
@@ -7327,8 +7299,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
                 //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);
             }
@@ -7372,8 +7343,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
             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);
             }
@@ -7634,8 +7604,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
             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);
             }
@@ -7672,8 +7641,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
                 //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);
             }
@@ -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<MSL_AvailabilityStockFacingGetterSetter> getStockUploadServerData(String store_id) {
         ArrayList<MSL_AvailabilityStockFacingGetterSetter> list = new ArrayList<>();
@@ -8242,8 +8211,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
             if (questionId == null) {
                 dbcursor = db.rawQuery("Select * from " + CommonString.TABLE_INSERT_STORE_PROFILE_DATA +
                         " where " + CommonString.KEY_STORE_ID + "='" + store_id + "'", null);
-            }
+            } else {
-            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);
             }
@@ -8619,8 +8587,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
             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);
             }
@@ -8658,8 +8625,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
 
                 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);
             }
@@ -8868,7 +8834,6 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
     }
 
 
-
     public ArrayList<STORE_CATEGORY_WISEGetterSetter> getSTORE_CATEGORY_WISE(String store_id, String category_id, String tableName) {
         ArrayList<STORE_CATEGORY_WISEGetterSetter> list = new ArrayList<>();
         Cursor dbcursor = null;

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;
     }

GSKMTOrange/src/main/java/cpm/com/gskmtorange/LoginActivity.java

@@ -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");
+      /*  museridView.setText("testksa");
-        mPasswordView.setText("cpm123");
+        mPasswordView.setText("cpm123");*/
 
 
         //turkey
-        /*museridView.setText("testmer");
+        museridView.setText("testmer");
-        mPasswordView.setText("cpm123");*/
+        mPasswordView.setText("cpm123");
         //sa
       /*  museridView.setText("testsa");
         mPasswordView.setText("cpm123");

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";

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);
                         }
                     }
 

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");
                         }
                     }
 

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");
                         }
                     }
 

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<MSL_AvailabilityStockFacingGetterSetter> 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);

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);
                                 }

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<MSL_AvailabilityStockFacingGetterSetter> headerDataList;
     ArrayList<MSL_AvailabilityStockFacingGetterSetter> childDataList;
     List<MSL_AvailabilityStockFacingGetterSetter> hashMapListHeaderData;
     HashMap<MSL_AvailabilityStockFacingGetterSetter, List<MSL_AvailabilityStockFacingGetterSetter>> hashMapListChildData;
-
     List<Integer> 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,6 +517,7 @@ public class MSL_Availability_StockFacingActivity extends AppCompatActivity impl
                             }
                         }
 
+                        if (store_flag_hide.equals("0")) {
                             if (faceup.equals("")) {
                                 if (!checkHeaderArray.contains(i)) {
                                     checkHeaderArray.add(i);
@@ -790,8 +555,38 @@ public class MSL_Availability_StockFacingActivity extends AppCompatActivity impl
                                     }
                                 }
                             }
+                        } 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);
+                                    }
+                                }
+                            }
+                        }
+
+                    }
+                } else {
+                    if (store_flag_hide.equals("0")) {
                         if (faceup.equals("")) {
                             if (!checkHeaderArray.contains(i)) {
                                 checkHeaderArray.add(i);
@@ -802,7 +597,9 @@ public class MSL_Availability_StockFacingActivity extends AppCompatActivity impl
                             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;
     }
 
 

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);
 

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);
 

GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadImageWithRetrofit.java

@@ -307,6 +307,33 @@ public class UploadImageWithRetrofit {
     }
 
    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();
+
+           // decode full image pre-resized
+           in = new FileInputStream(file2);
+           options = new BitmapFactory.Options();
+           // decode full image
+           Bitmap roughBitmap = BitmapFactory.decodeStream(in, null, options);
+
+           // save image
+           FileOutputStream out = new FileOutputStream(file2);
+           roughBitmap.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;
@@ -328,8 +355,7 @@ public class UploadImageWithRetrofit {
            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);
-           // options.inSampleSize = Math.max(inWidth / 1632, inHeight / 1224);
            // decode full image
            Bitmap roughBitmap = BitmapFactory.decodeStream(in, null, options);
 
@@ -344,15 +370,15 @@ public class UploadImageWithRetrofit {
            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, 80, out);
-            resizedBitmap.compress(Bitmap.CompressFormat.JPEG, 100, out);
 
        } catch (Exception e) {
            Log.e("Image", e.toString(), e);
            return file;
        }
        return file2;
-    }
+   }*/
+
 
     public void showAlert(final Context context, String str, final boolean flag) {
 

GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/JourneyPlanGetterSetter.java

@@ -30,6 +30,16 @@ public class JourneyPlanGetterSetter implements Serializable{
 
 	ArrayList<String> POG_TYPE_ID  = new ArrayList<String>();
 
+    public ArrayList<String> getFACING_HIDE() {
+        return FACING_HIDE;
+    }
+
+    public void setFACING_HIDE(String FACING_HIDE) {
+        this.FACING_HIDE.add(FACING_HIDE);
+    }
+
+    ArrayList<String> FACING_HIDE  = new ArrayList<String>();
+
 	public ArrayList<String> getCHANNEL_ID() {
 		return CHANNEL_ID;
 	}

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();
             }

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" />
 
                         <View
+                            android:id="@+id/facing_view"
                             android:layout_width="match_parent"
                             android:layout_height="1dp"
                             android:background="@color/black" />