diff --git a/GSKMTOrange/src/main/AndroidManifest.xml b/GSKMTOrange/src/main/AndroidManifest.xml index 85571b0..924bc56 100644 --- a/GSKMTOrange/src/main/AndroidManifest.xml +++ b/GSKMTOrange/src/main/AndroidManifest.xml @@ -171,9 +171,17 @@ android:label="@string/title_activity_upload" android:screenOrientation="portrait" /> + + \ No newline at end of file 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 e696a4d..1650296 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java @@ -43,10 +43,13 @@ import cpm.com.gskmtorange.xmlGetterSetter.MappingPromotionGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.MappingStockGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.Promo_Compliance_DataGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.STORE_PERFORMANCE_MasterGetterSetter; +import cpm.com.gskmtorange.xmlGetterSetter.StockFacing_PlanogramTrackerDataGetterSetter; +import cpm.com.gskmtorange.xmlGetterSetter.ShelfMasterGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.SkuGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.SkuMasterGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.Stock_FacingGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.StoreWisePerformaceGetterSetter; +import cpm.com.gskmtorange.xmlGetterSetter.Store_wise_camera_DataGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.SubCategoryMasterGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.T2PGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.TableBean; @@ -130,8 +133,16 @@ public class GSKOrangeDB extends SQLiteOpenHelper { db.execSQL(TableBean.getAdditionalDisplay()); db.execSQL(TableBean.getMappingSosTarget()); + db.execSQL(CommonString.CREATE_TABLE_INSERT_BRAND_AVAIBILITY_DATA); + db.execSQL(TableBean.getShelfMaster()); + + db.execSQL(CommonString.CREATE_TABLE_INSERT_STOCK_FACING_PLANOGRAM_TRACKER_HEADER); + db.execSQL(CommonString.CREATE_TABLE_INSERT_STOCK_FACING_PLANOGRAM_TRACKER_CHILD); + + db.execSQL(CommonString.CREATE_TABLE_INSERT_STORE_CAMERA); + } catch (SQLException e) { e.printStackTrace(); Toast.makeText(context, "Error -" + e.toString(), Toast.LENGTH_SHORT).show(); @@ -191,9 +202,14 @@ public class GSKOrangeDB extends SQLiteOpenHelper { //Gagan end code db.delete(CommonString.TABLE_INSERT_T2P_COMPLIANCE, null, null); + db.delete(CommonString.TABLE_INSERT_T2P_GAPS, null, null); db.delete(CommonString.TABLE_INSERT_T2P_SKU, null, null); db.delete(CommonString.TABLE_INSERT_BRAND_AVAIBILITY_DATA, null, null); + + db.delete(CommonString.TABLE_INSERT_STOCK_FACING_PLANOGRAM_TRACKER_HEADER, null, null); + db.delete(CommonString.TABLE_INSERT_STOCK_FACING_PLANOGRAM_TRACKER_CHILD, null, null); + } public void InsertJCP(JourneyPlanGetterSetter data) { @@ -3578,6 +3594,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper { } } + public ArrayList getBrandAvailbilitydata(String store_id, String category_id, String keyAccount_id, String class_id, String storeType_id) { Cursor cursordata = null; ArrayList Data = new ArrayList(); @@ -3659,13 +3676,114 @@ public class GSKOrangeDB extends SQLiteOpenHelper { BG.setBRAND_ID(dbcursor.getString(dbcursor.getColumnIndexOrThrow("BRAND_ID"))); list.add(BG); + dbcursor.moveToNext(); + } + dbcursor.close(); + return list; + } + } catch (Exception e) { + + Log.d("Exception ", "get MSL_AvailabilityHeader!" + e.toString()); + } + return list; + } + + //Stock Facing Planogram Tracker + public void InsertSHELF_MASTER(ShelfMasterGetterSetter data) { + db.delete("SHELF_MASTER", null, null); + + ContentValues values = new ContentValues(); + try { + for (int i = 0; i < data.getSHELF_ID().size(); i++) { + + values.put("SHELF_ID", data.getSHELF_ID().get(i)); + values.put("SHELF", data.getSHELF().get(i)); + + db.insert("SHELF_MASTER", null, values); + } + } catch (Exception ex) { + Log.d("Exception ", " SHELF_MASTER " + ex.toString()); + } + } + + public ArrayList getSHELF_MASTERData() { + Cursor cursordata = null; + ArrayList Data = new ArrayList<>(); + + try { + StockFacing_PlanogramTrackerDataGetterSetter sb1 = new StockFacing_PlanogramTrackerDataGetterSetter(); + sb1.setShelf_id("0"); + sb1.setShelf("Select"); + + Data.add(sb1); + + cursordata = db.rawQuery("SELECT * FROM SHELF_MASTER ", null); + + if (cursordata != null) { + cursordata.moveToFirst(); + while (!cursordata.isAfterLast()) { + StockFacing_PlanogramTrackerDataGetterSetter sb = new StockFacing_PlanogramTrackerDataGetterSetter(); + sb.setShelf_id(cursordata.getString(cursordata.getColumnIndexOrThrow("SHELF_ID"))); + sb.setShelf(cursordata.getString(cursordata.getColumnIndexOrThrow("SHELF"))); + + Data.add(sb); + cursordata.moveToNext(); + } + cursordata.close(); + } + } catch (Exception ex) { + Log.d("Exception ", " Get SHELF_MASTER " + ex.toString()); + } + return Data; + } + + public ArrayList getStockAndFacingPlanogramDefaultSKUData( + String category_id, String brand_id, String keyAccount_id, String storeType_id, String class_id) { + + ArrayList list = new ArrayList<>(); + Cursor dbcursor = null; + + try { + dbcursor = db.rawQuery("Select DISTINCT SK.SKU_ID,SK.SKU,SK.MRP,SK.SKU_SEQUENCE,M.MBQ,BR.COMPANY_ID " + + "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 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 + "'", null); + + if (dbcursor != null) { + + dbcursor.moveToFirst(); + while (!dbcursor.isAfterLast()) { + StockFacing_PlanogramTrackerDataGetterSetter cd = new StockFacing_PlanogramTrackerDataGetterSetter(); + + cd.setSku_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SKU_ID"))); + cd.setSku(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SKU"))); + cd.setMrp(dbcursor.getString(dbcursor.getColumnIndexOrThrow("MRP"))); + cd.setSku_sequence(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SKU_SEQUENCE"))); + cd.setMbq(dbcursor.getString(dbcursor.getColumnIndexOrThrow("MBQ"))); + cd.setCompany_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("COMPANY_ID"))); + /*cd.setStock(""); + cd.setFacing("");*/ + cd.setCheckbox_sku("0"); + + list.add(cd); + dbcursor.moveToNext(); } dbcursor.close(); return list; } } catch (Exception e) { - return list; + + Log.d("Exception ", "get MSL_AvailabilityHeader!" + e.toString()); } return list; } @@ -3681,6 +3799,330 @@ public class GSKOrangeDB extends SQLiteOpenHelper { dbcursor = db.rawQuery("SELECT * FROM " + CommonString.TABLE_INSERT_T2P_COMPLIANCE + " where " + CommonString.KEY_STORE_ID + "='" + store_id + "'", null); +======= + public void InsertStock_Facing_PlanogramTracker(String storeId, String categoryId, String company_id, String brand_id, String sub_category_id, + List hashMapListHeaderData, + HashMap> hashMapListChildData) { + ContentValues values = new ContentValues(); + ContentValues values1 = new ContentValues(); + + try { + db.beginTransaction(); + for (int i = 0; i < hashMapListHeaderData.size(); i++) { + StockFacing_PlanogramTrackerDataGetterSetter data1 = hashMapListHeaderData.get(i); + + values1.put("store_id", storeId); + values1.put("category_id", categoryId); + values1.put("company_id", company_id); + values1.put("brand_id", brand_id); + values1.put("sub_category_id", sub_category_id); + values1.put("Shelf", data1.getSp_addShelf()); + values1.put("Shelf_id", data1.getSp_addShelf_id()); + values1.put("Shelf_Position", data1.getSp_shelfPosition()); + + long pos = db.insert(CommonString.TABLE_INSERT_STOCK_FACING_PLANOGRAM_TRACKER_HEADER, null, values1); + + for (int j = 0; j < hashMapListChildData.get(hashMapListHeaderData.get(i)).size(); j++) { + StockFacing_PlanogramTrackerDataGetterSetter data = hashMapListChildData.get(hashMapListHeaderData.get(i)).get(j); + + values.put("common_id", pos); + values.put("Shelf", data1.getSp_addShelf()); + values.put("Shelf_id", data.getSp_addShelf_id()); + values.put("Shelf_Position", data1.getSp_shelfPosition()); + values.put("sku", data.getSku()); + values.put("sku_id", data.getSku_id()); + values.put("checkbox_sku", data.getCheckbox_sku()); + + db.insert(CommonString.TABLE_INSERT_STOCK_FACING_PLANOGRAM_TRACKER_CHILD, null, values); + } + } + db.setTransactionSuccessful(); + db.endTransaction(); + } catch (Exception ex) { + Log.d("Exception ", " in Insert Stock Facing Planogram Tracker " + ex.toString()); + } + } + + //Stock Facing Planogram Server Upload Data + public ArrayList getStockAndFacingPlanogramServerUploadData(String store_id) { + ArrayList list = new ArrayList<>(); + Cursor dbcursor = null; + + try { + dbcursor = db.rawQuery("Select C.Shelf_id,C.Shelf_Position,C.sku_id,C.checkbox_sku,H.category_id,H.company_id,H.brand_id,H.sub_category_id " + + "from Stock_Facing_Planogram_Header_Data H " + + "inner join Stock_Facing_Planogram_Child_Data C " + + "on H.KEY_ID=C.common_id AND H.Shelf_id=C.Shelf_id " + + "where H.store_id='" + store_id + "'", null); + + if (dbcursor != null) { + dbcursor.moveToFirst(); + while (!dbcursor.isAfterLast()) { + + StockFacing_PlanogramTrackerDataGetterSetter cd = new StockFacing_PlanogramTrackerDataGetterSetter(); + + cd.setSp_addShelf_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("Shelf_id"))); + cd.setSp_shelfPosition(dbcursor.getString(dbcursor.getColumnIndexOrThrow("Shelf_Position"))); + cd.setSku_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("sku_id"))); + cd.setCheckbox_sku(dbcursor.getString(dbcursor.getColumnIndexOrThrow("checkbox_sku"))); + cd.setCategory_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("category_id"))); + cd.setCompany_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("company_id"))); + cd.setBrand_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("brand_id"))); + cd.setSub_category_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("sub_category_id"))); + + list.add(cd); + + dbcursor.moveToNext(); + } + dbcursor.close(); + return list; + } + } catch (Exception e) { + + Log.d("Exception ", "get Stock Facing Planogram server upload !" + e.toString()); + } + return list; + } + + + public void InsertStore_wise_camera(Store_wise_camera_DataGetterSetter data) { + + ContentValues values = new ContentValues(); + try { + values.put("Store_id", data.getStore_id()); + values.put("Category_id", data.getCategory_id()); + values.put("Camera1", data.getCamera1()); + values.put("Camera2", data.getCamera2()); + values.put("Camera3", data.getCamera3()); + values.put("Camera4", data.getCamera4()); + values.put("checkSaveStatus", data.getCheckSaveStatus()); + + db.insert(CommonString.TABLE_INSERT_STORE_CAMERA, null, values); + } catch (Exception ex) { + Log.d("Exception ", " Store_wise_camera " + ex.toString()); + } + } + + public Store_wise_camera_DataGetterSetter getStore_wise_camera(String store_id, String category_id) { + Store_wise_camera_DataGetterSetter data = new Store_wise_camera_DataGetterSetter(); + Cursor dbcursor = null; + + try { + dbcursor = db.rawQuery("Select * from Store_wise_camera " + + "where Store_id='" + store_id + "' and Category_id='" + category_id + "'", null); + + if (dbcursor != null) { + dbcursor.moveToFirst(); + while (!dbcursor.isAfterLast()) { + + data.setStore_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("Store_id"))); + data.setCategory_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("Category_id"))); + data.setCamera1(dbcursor.getString(dbcursor.getColumnIndexOrThrow("Camera1"))); + data.setCamera2(dbcursor.getString(dbcursor.getColumnIndexOrThrow("Camera2"))); + data.setCamera3(dbcursor.getString(dbcursor.getColumnIndexOrThrow("Camera3"))); + data.setCamera4(dbcursor.getString(dbcursor.getColumnIndexOrThrow("Camera4"))); + data.setCheckSaveStatus(dbcursor.getString(dbcursor.getColumnIndexOrThrow("checkSaveStatus"))); + + dbcursor.moveToNext(); + } + dbcursor.close(); + return data; + } + } catch (Exception e) { + Log.d("Exception ", "get Stock Facing Planogram server upload !" + e.toString()); + return data; + } + return data; + } + + //check if table is empty + public boolean isStorewiseCameraSave(String store_id, String category_id) { + boolean filled = false; + Cursor dbcursor = null; + + try { + dbcursor = db.rawQuery("Select checkSaveStatus from Store_wise_camera " + + "where Store_id='" + store_id + "' and Category_id='" + category_id + "'", null); + + if (dbcursor != null) { + dbcursor.moveToFirst(); + String value = dbcursor.getString(dbcursor.getColumnIndexOrThrow("checkSaveStatus")); + + if (value.equals("1")) { + filled = true; + } else { + filled = false; + } + //dbcursor.close(); + } + } catch (Exception e) { + Log.d("Exception ", " when fetching Records!!!!!!!!!!!!!!!!!!!!! " + e.toString()); + return filled; + } + return filled; + } + + public void updateStore_wise_camera(Store_wise_camera_DataGetterSetter data) { + + ContentValues values = new ContentValues(); + try { + //values.put("Store_id", data.getStore_id()); + //values.put("Category_id", data.getCategory_id()); + values.put("Camera1", data.getCamera1()); + values.put("Camera2", data.getCamera2()); + values.put("Camera3", data.getCamera3()); + values.put("Camera4", data.getCamera4()); + + db.update(CommonString.TABLE_INSERT_STORE_CAMERA, values, + " Store_id='" + data.getStore_id() + "' and Category_id='" + data.getCategory_id() + "'", null); + } catch (Exception ex) { + Log.d("Exception ", " Store_wise_camera " + ex.toString()); + } + } + + public void deleteStore_wise_camera(String store_id, String category_id) { + db.delete(CommonString.TABLE_INSERT_STORE_CAMERA, null, null); + } + + //Stock Facing Planogram Server Upload Data + public ArrayList getStoreWiseCameraServerUploadData(String store_id) { + ArrayList list = new ArrayList<>(); + Cursor dbcursor = null; + + try { + dbcursor = db.rawQuery("Select * from Store_wise_camera " + + "where Store_id='" + store_id + "'", null); + + if (dbcursor != null) { + dbcursor.moveToFirst(); + while (!dbcursor.isAfterLast()) { + Store_wise_camera_DataGetterSetter data = new Store_wise_camera_DataGetterSetter(); + + data.setStore_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("Store_id"))); + data.setCategory_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("Category_id"))); + data.setCamera1(dbcursor.getString(dbcursor.getColumnIndexOrThrow("Camera1"))); + data.setCamera2(dbcursor.getString(dbcursor.getColumnIndexOrThrow("Camera2"))); + data.setCamera3(dbcursor.getString(dbcursor.getColumnIndexOrThrow("Camera3"))); + data.setCamera4(dbcursor.getString(dbcursor.getColumnIndexOrThrow("Camera4"))); + + list.add(data); + dbcursor.moveToNext(); + } + dbcursor.close(); + return list; + } + } catch (Exception e) { + Log.d("Exception ", "get Stock Facing Planogram server upload !" + e.toString()); + return list; + } + return list; + } + + //Stock_facing Planogram Add Sku + public ArrayList getPlanogramAddSkuHeaderData( + String category_id, String keyAccount_id, String storeType_id, String class_id) { + + ArrayList list = new ArrayList<>(); + Cursor dbcursor = null; + + try { + 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 MAPPING_SOS_TARGET WHERE STORE_ID = 1 AND BRAND_ID = BR.BRAND_ID)AS SOS_TARGET " + + "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 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); + + if (dbcursor != null) { + dbcursor.moveToFirst(); + while (!dbcursor.isAfterLast()) { + StockFacing_PlanogramTrackerDataGetterSetter cd = new StockFacing_PlanogramTrackerDataGetterSetter(); + + cd.setCompany_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("COMPANY_ID"))); + cd.setSub_category_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SUB_CATEGORY_ID"))); + cd.setSub_category(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SUB_CATEGORY"))); + cd.setBrand_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("BRAND_ID"))); + cd.setBrand(dbcursor.getString(dbcursor.getColumnIndexOrThrow("BRAND"))); + + list.add(cd); + dbcursor.moveToNext(); + } + dbcursor.close(); + return list; + } + } catch (Exception e) { + Log.d("Exception ", "get Planogram Add Sku Header!" + e.toString()); + return list; + } + return list; + } + + public ArrayList getPlanogramAddSkuChildData( + String category_id, String brand_id, String keyAccount_id, String storeType_id, String class_id) { + + ArrayList list = new ArrayList<>(); + Cursor dbcursor = null; + + try { + dbcursor = db.rawQuery("Select DISTINCT SK.SKU_ID,SK.SKU,SK.MRP,SK.SKU_SEQUENCE,M.MBQ,BR.COMPANY_ID " + + "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 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 + "'", null); + + if (dbcursor != null) { + + dbcursor.moveToFirst(); + while (!dbcursor.isAfterLast()) { + StockFacing_PlanogramTrackerDataGetterSetter cd = new StockFacing_PlanogramTrackerDataGetterSetter(); + + cd.setSku_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SKU_ID"))); + cd.setSku(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SKU"))); + cd.setMrp(dbcursor.getString(dbcursor.getColumnIndexOrThrow("MRP"))); + cd.setSku_sequence(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SKU_SEQUENCE"))); + cd.setMbq(dbcursor.getString(dbcursor.getColumnIndexOrThrow("MBQ"))); + cd.setCompany_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("COMPANY_ID"))); + + list.add(cd); + dbcursor.moveToNext(); + } + dbcursor.close(); + return list; + } + } catch (Exception e) { + + Log.d("Exception ", "get MSL_AvailabilityHeader!" + e.toString()); + + } + return list; + } + + // get T2P Compliance data + public ArrayList getT2pCompliancedaletedata(String store_id) { + + ArrayList list = new ArrayList<>(); + Cursor dbcursor = null; + try { + + dbcursor = db.rawQuery("SELECT * FROM " + CommonString.TABLE_INSERT_T2P_COMPLIANCE + " where " + + CommonString.KEY_STORE_ID + "='" + store_id + "'", null); + if (dbcursor != null) { dbcursor.moveToFirst(); @@ -3688,31 +4130,18 @@ public class GSKOrangeDB extends SQLiteOpenHelper { T2PGetterSetter tp = new T2PGetterSetter(); tp.setKey_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_ID))); - - /* tp.setDisplay_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_DISPLAY_ID))); - tp.setBrand_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_BRAND_ID))); - tp.setBrand(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_BRAND))); - tp.setDisplay(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_DISPLAY))); - tp.setRef_image_url(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_IMAGE_URL))); - tp.setRef_image_path(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_IMAGE_PATH))); - tp.setImage(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_IMAGE))); - tp.setImage1(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_IMAGE1))); - tp.setImage2(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_IMAGE2))); - tp.setRemark(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_REMARK))); - tp.setCategory_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_CATEGORY_ID))); - tp.setPresent((dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_PRESENT)).equalsIgnoreCase("1"))); -*/ list.add(tp); + dbcursor.moveToNext(); } dbcursor.close(); return list; } } catch (Exception e) { - return list; + + Log.d("Exception ", "get MSL_AvailabilityHeader!" + e.toString()); } return list; } - } 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 d93b855..39f40ee 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/constant/CommonString.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/constant/CommonString.java @@ -551,26 +551,121 @@ public class CommonString { + ")"; - public static final String TABLE_INSERT_BRAND_AVAIBILITY_DATA = "Camera_Not_Allowed"; + public static final String TABLE_INSERT_STOCK_FACING_PLANOGRAM_TRACKER_HEADER = "Stock_Facing_Planogram_Header_Data"; - public static final String CREATE_TABLE_INSERT_BRAND_AVAIBILITY_DATA = "CREATE TABLE IF NOT EXISTS " - + TABLE_INSERT_BRAND_AVAIBILITY_DATA + public static final String CREATE_TABLE_INSERT_STOCK_FACING_PLANOGRAM_TRACKER_HEADER = "CREATE TABLE IF NOT EXISTS " + + TABLE_INSERT_STOCK_FACING_PLANOGRAM_TRACKER_HEADER + + + "(" + + "KEY_ID" + + " INTEGER PRIMARY KEY AUTOINCREMENT ," + + "store_id" + + " VARCHAR," + + + "category_id" + + " VARCHAR," + + + "company_id" + + " VARCHAR," + + + "brand_id" + + " VARCHAR," + + + "sub_category_id" + + " VARCHAR," + + + "Shelf" + + " VARCHAR," + + + "Shelf_id" + + " VARCHAR," + + + "Shelf_Position" + + " VARCHAR" + + + ")"; + + public static final String TABLE_INSERT_STOCK_FACING_PLANOGRAM_TRACKER_CHILD = "Stock_Facing_Planogram_Child_Data"; + + public static final String CREATE_TABLE_INSERT_STOCK_FACING_PLANOGRAM_TRACKER_CHILD = "CREATE TABLE IF NOT EXISTS " + + TABLE_INSERT_STOCK_FACING_PLANOGRAM_TRACKER_CHILD + "(" + "KEY_ID" + " INTEGER PRIMARY KEY AUTOINCREMENT ," - + "COMMON_ID" - + " INTEGER," - - + "BRAND_NAME" + + "common_id" + " VARCHAR," - + "BRAND_ID" - + " INTEGER" + + "Shelf" + + " VARCHAR," + + + "Shelf_id" + + " VARCHAR," + + + "Shelf_Position" + + " VARCHAR," + + + "sku" + + " VARCHAR," + + + "sku_id" + + " VARCHAR," + + + "checkbox_sku" + + " VARCHAR" + ")"; + public static final String TABLE_INSERT_STORE_CAMERA = "Store_wise_camera"; + + public static final String CREATE_TABLE_INSERT_STORE_CAMERA = "CREATE TABLE IF NOT EXISTS " + + TABLE_INSERT_STORE_CAMERA + + "(" + + "KEY_ID" + + " INTEGER PRIMARY KEY AUTOINCREMENT ," + + + "Store_id" + + " VARCHAR," + + + "Category_id" + + " VARCHAR," + + + "Camera1" + + " VARCHAR," + + + "Camera2" + + " VARCHAR," + + + "Camera3" + + " VARCHAR," + + + "Camera4" + + " VARCHAR," + + + "checkSaveStatus" + + " VARCHAR" + + + ")"; + + public static final String TABLE_INSERT_BRAND_AVAIBILITY_DATA = "Camera_Not_Allowed"; + + public static final String CREATE_TABLE_INSERT_BRAND_AVAIBILITY_DATA = "CREATE TABLE IF NOT EXISTS " + + TABLE_INSERT_BRAND_AVAIBILITY_DATA + + "(" + + "KEY_ID" + + " INTEGER PRIMARY KEY AUTOINCREMENT ," + + + "COMMON_ID" + + " INTEGER," + + + "BRAND_NAME" + + " VARCHAR," + + + "BRAND_ID" + + " INTEGER" + + + ")"; } diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/download/DownloadActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/download/DownloadActivity.java index 19042ed..ca91016 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/download/DownloadActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/download/DownloadActivity.java @@ -59,6 +59,7 @@ import cpm.com.gskmtorange.xmlGetterSetter.MappingPromotionGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.MappingStockGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.NonWorkingReasonGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.STORE_PERFORMANCE_MasterGetterSetter; +import cpm.com.gskmtorange.xmlGetterSetter.ShelfMasterGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.SkuMasterGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.SubCategoryMasterGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.TableBean; @@ -86,15 +87,16 @@ public class DownloadActivity extends AppCompatActivity { STORE_PERFORMANCE_MasterGetterSetter store_performance_masterGetterSetter; ADDITIONAL_DISPLAY_MASTERGetterSetter additional_display_getter_setter; MAPPING_SOS_TARGET_MasterGetterSetter mapping_sos_target_masterGetterSetter; - MAPPING_PLANOGRAM_MasterGetterSetter mapping_planogram_masterGetterSetter; + ShelfMasterGetterSetter shelfMasterGetterSetter; + private Dialog dialog; private ProgressBar pb; private TextView percentage, message; private SharedPreferences preferences = null; Toolbar toolbar; String str; - boolean ResultFlag=true; + boolean ResultFlag = true; @Override protected void onCreate(Bundle savedInstanceState) { @@ -776,6 +778,43 @@ public class DownloadActivity extends AppCompatActivity { publishProgress(data); + //SHELF_MASTER + request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_NAME_UNIVERSAL_DOWNLOAD); + request.addProperty("UserName", userId); + request.addProperty("Type", "SHELF_MASTER"); + request.addProperty("cultureid", culture_id); + + envelope = new SoapSerializationEnvelope(SoapEnvelope.VER11); + envelope.dotNet = true; + envelope.setOutputSoapObject(request); + + androidHttpTransport = new HttpTransportSE(CommonString.URL); + androidHttpTransport.call(CommonString.SOAP_ACTION_UNIVERSAL, envelope); + + result = envelope.getResponse(); + + if (result.toString() != null) { + xpp.setInput(new StringReader(result.toString())); + xpp.next(); + eventType = xpp.getEventType(); + shelfMasterGetterSetter = XMLHandlers.shelfMasterXMLHandler(xpp, eventType); + + String table_ShelfMaster = shelfMasterGetterSetter.getTable_SHELF_MASTER(); + if (table_ShelfMaster != null) { + resultHttp = CommonString.KEY_SUCCESS; + TableBean.setShelfMaster(table_ShelfMaster); + } + + if (shelfMasterGetterSetter.getSHELF_ID().size() > 0) { + data.value = 96; + data.name = "SHELF_MASTER " + getResources().getString(R.string.download_data); + } + } + publishProgress(data); + + + //Images DownLoads + //MAPPING_PLANOGRAM Image save into folder if (mapping_planogram_masterGetterSetter != null) { @@ -912,55 +951,45 @@ public class DownloadActivity extends AppCompatActivity { db.InsertMAPPING_PLANOGRAM(mapping_planogram_masterGetterSetter); db.InsertADDITIONAL_DISPLAY(additional_display_getter_setter); db.InsertMAPPING_SOS_TARGET(mapping_sos_target_masterGetterSetter); + db.InsertSHELF_MASTER(shelfMasterGetterSetter); } catch (MalformedURLException e) { - ResultFlag=false; - str=CommonString.MESSAGE_EXCEPTION; + ResultFlag = false; + str = CommonString.MESSAGE_EXCEPTION; return CommonString.MESSAGE_EXCEPTION; - } - catch (SocketTimeoutException e) { - ResultFlag=false; - str=CommonString.MESSAGE_SOCKETEXCEPTION; + } catch (SocketTimeoutException e) { + ResultFlag = false; + str = CommonString.MESSAGE_SOCKETEXCEPTION; return CommonString.MESSAGE_SOCKETEXCEPTION; - } - catch (InterruptedIOException e){ + } catch (InterruptedIOException e) { - ResultFlag=false; - str=CommonString.MESSAGE_EXCEPTION; + ResultFlag = false; + str = CommonString.MESSAGE_EXCEPTION; return CommonString.MESSAGE_EXCEPTION; } catch (IOException e) { - ResultFlag=false; - str=CommonString.MESSAGE_SOCKETEXCEPTION; + ResultFlag = false; + str = CommonString.MESSAGE_SOCKETEXCEPTION; return CommonString.MESSAGE_SOCKETEXCEPTION; - } - catch (XmlPullParserException e) { - ResultFlag=false; - str=CommonString.MESSAGE_XmlPull; + } catch (XmlPullParserException e) { + ResultFlag = false; + str = CommonString.MESSAGE_XmlPull; return CommonString.MESSAGE_XmlPull; } catch (Exception e) { - ResultFlag=false; - str=CommonString.MESSAGE_EXCEPTION; + ResultFlag = false; + str = CommonString.MESSAGE_EXCEPTION; return CommonString.MESSAGE_EXCEPTION; } - if(ResultFlag) - { + if (ResultFlag) { return ""; - } - else - { + } else { return str; } - - - - - } @Override @@ -976,15 +1005,13 @@ public class DownloadActivity extends AppCompatActivity { protected void onPostExecute(String s) { super.onPostExecute(s); - if(s.equalsIgnoreCase("")){ + if (s.equalsIgnoreCase("")) { dialog.dismiss(); showAlert(getString(R.string.data_downloaded_successfully)); - } - else - { + } else { dialog.dismiss(); - showAlert(getString(R.string.datanotfound)+" "+s); + showAlert(getString(R.string.datanotfound) + " " + s); } } diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/StockFacing_PlanogramTrackerActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/StockFacing_PlanogramTrackerActivity.java new file mode 100644 index 0000000..76f7359 --- /dev/null +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/StockFacing_PlanogramTrackerActivity.java @@ -0,0 +1,863 @@ +package cpm.com.gskmtorange.gsk_dailyentry; + +import android.app.AlertDialog; +import android.app.Dialog; +import android.content.Context; +import android.content.DialogInterface; +import android.content.Intent; +import android.content.SharedPreferences; +import android.content.pm.ActivityInfo; +import android.content.res.Resources; +import android.graphics.Bitmap; +import android.graphics.BitmapFactory; +import android.graphics.Typeface; +import android.graphics.drawable.ColorDrawable; +import android.os.Bundle; +import android.preference.PreferenceManager; +import android.support.design.widget.FloatingActionButton; +import android.support.design.widget.Snackbar; +import android.support.v7.app.AppCompatActivity; +import android.support.v7.widget.CardView; +import android.support.v7.widget.Toolbar; +import android.view.LayoutInflater; +import android.view.MenuItem; +import android.view.View; +import android.view.ViewGroup; +import android.view.Window; +import android.view.WindowManager; +import android.view.inputmethod.InputMethodManager; +import android.webkit.WebView; +import android.widget.AbsListView; +import android.widget.AdapterView; +import android.widget.ArrayAdapter; +import android.widget.BaseExpandableListAdapter; +import android.widget.Button; +import android.widget.CheckBox; +import android.widget.CompoundButton; +import android.widget.EditText; +import android.widget.ExpandableListView; +import android.widget.ImageView; +import android.widget.LinearLayout; +import android.widget.Spinner; +import android.widget.TextView; +import android.widget.Toast; + +import java.io.File; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; + +import cpm.com.gskmtorange.Database.GSKOrangeDB; +import cpm.com.gskmtorange.R; +import cpm.com.gskmtorange.constant.CommonString; +import cpm.com.gskmtorange.xmlGetterSetter.MAPPING_PLANOGRAM_DataGetterSetter; +import cpm.com.gskmtorange.xmlGetterSetter.StockFacing_PlanogramTrackerDataGetterSetter; +import cpm.com.gskmtorange.xmlGetterSetter.Stock_FacingGetterSetter; + +public class StockFacing_PlanogramTrackerActivity extends AppCompatActivity { + Button btn_addShelf, btn_addSKU; + ExpandableListView expandableListView; + String brand, brand_id, company_id, sub_category, sub_category_id; + String addShelfPosition = ""; + ArrayAdapter shelfPositionAdapter, shelfAdapter; + ArrayList shelfList; + GSKOrangeDB db; + PlanogramExpandableListAdapter adapter; + String categoryName, categoryId, Error_Message = ""; + boolean checkflag = true; + List checkHeaderArray = new ArrayList<>(); + + ArrayList shelfHeaderDataList = new ArrayList<>(); + ArrayList childDataList, tempChildDataList; + HashMap> hashMapListChildData = new HashMap<>(); + private SharedPreferences preferences; + + String store_id, visit_date, username, intime, date, keyAccount_id, class_id, storeType_id, camera_allow; + + ExpandableListAdapter adapter1; + ArrayList addSkuHeaderList; + ArrayList addSkuChildList; + HashMap> addSkuHashMapChildData; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_stock_facing__planogram_tracker); + + try { + Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar); + setSupportActionBar(toolbar); + getSupportActionBar().setHomeButtonEnabled(true); + getSupportActionBar().setDisplayHomeAsUpEnabled(true); + + db = new GSKOrangeDB(this); + db.open(); + + preferences = PreferenceManager.getDefaultSharedPreferences(this); + //updateResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, "")); + + store_id = preferences.getString(CommonString.KEY_STORE_ID, null); + visit_date = preferences.getString(CommonString.KEY_DATE, null); + date = preferences.getString(CommonString.KEY_DATE, null); + username = preferences.getString(CommonString.KEY_USERNAME, null); + intime = preferences.getString(CommonString.KEY_STORE_IN_TIME, ""); + keyAccount_id = preferences.getString(CommonString.KEY_KEYACCOUNT_ID, ""); + class_id = preferences.getString(CommonString.KEY_CLASS_ID, ""); + storeType_id = preferences.getString(CommonString.KEY_STORETYPE_ID, ""); + camera_allow = preferences.getString(CommonString.KEY_CAMERA_ALLOW, ""); + + categoryName = getIntent().getStringExtra("categoryName"); + categoryId = getIntent().getStringExtra("categoryId"); + + btn_addShelf = (Button) findViewById(R.id.btn_addShelf); + expandableListView = (ExpandableListView) findViewById(R.id.exp_PlanogramListView); + + Intent intent = getIntent(); + /*brand = intent.getStringExtra("brand"); + brand_id = intent.getStringExtra("brand_id"); + company_id = intent.getStringExtra("company_id"); + sub_category = intent.getStringExtra("sub_category"); + sub_category_id = intent.getStringExtra("sub_category_id");*/ + + + //Shelf Position Adapter + shelfPositionAdapter = new ArrayAdapter(StockFacing_PlanogramTrackerActivity.this, android.R.layout.simple_list_item_1); + shelfPositionAdapter.add(getResources().getString(R.string.select)); //Select + for (int i = 7; i >= 1; i--) { + shelfPositionAdapter.add(String.valueOf(i)); + } + + //Shelf List + shelfList = new ArrayList<>(); + shelfList = db.getSHELF_MASTERData(); + + shelfAdapter = new ArrayAdapter(StockFacing_PlanogramTrackerActivity.this, android.R.layout.simple_list_item_1); + for (int j = 0; j < shelfList.size(); j++) { + shelfAdapter.add(shelfList.get(j).getShelf()); + } + + btn_addShelf.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(final View view1) { + final Dialog dialog = new Dialog(StockFacing_PlanogramTrackerActivity.this); + dialog.requestWindowFeature(Window.FEATURE_NO_TITLE); + dialog.getWindow().setBackgroundDrawable(new ColorDrawable(android.graphics.Color.TRANSPARENT)); + dialog.setContentView(R.layout.dialog_stock_facing_planogram_tracker); + + Button addShelf = (Button) dialog.findViewById(R.id.dialog_btn_addShelf); + Button cancel = (Button) dialog.findViewById(R.id.dialog_btn_cancel); + Spinner sp_addShelf = (Spinner) dialog.findViewById(R.id.sp_addShelf); + Spinner sp_shelfPosition = (Spinner) dialog.findViewById(R.id.sp_shelfPosition); + + sp_addShelf.setAdapter(shelfAdapter); + sp_shelfPosition.setAdapter(shelfPositionAdapter); + + final StockFacing_PlanogramTrackerDataGetterSetter data = new StockFacing_PlanogramTrackerDataGetterSetter(); + + sp_addShelf.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() { + @Override + public void onItemSelected(AdapterView adapterView, View view, int position, long l) { + for (int i1 = 0; i1 < shelfList.size(); i1++) { + if (position == i1) { + //Selected spinner position value + data.setSp_addShelf_id(shelfList.get(i1).getShelf_id()); + data.setSp_addShelf(shelfList.get(i1).getShelf()); + } + } + } + + @Override + public void onNothingSelected(AdapterView adapterView) { + + } + }); + + sp_shelfPosition.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() { + @Override + public void onItemSelected(AdapterView parent, View view, int position, long l) { + data.setSp_shelfPosition(parent.getItemAtPosition(position).toString()); + } + + @Override + public void onNothingSelected(AdapterView adapterView) { + + } + }); + + cancel.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + dialog.dismiss(); + } + }); + + addShelf.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + + if (!data.getSp_addShelf_id().equals("0") && !data.getSp_shelfPosition().equals("Select")) { + + shelfHeaderDataList.add(data); + + dialog.dismiss(); + prepareHeaderList(shelfHeaderDataList); + } else { + Toast.makeText(StockFacing_PlanogramTrackerActivity.this, getResources().getString(R.string.empty_field), Toast.LENGTH_SHORT).show(); + } + } + }); + + dialog.show(); + } + }); + + + final FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab_stockFacing_PlanogramTracker); + fab.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + /*Snackbar.make(view, "Replace with your own action", Snackbar.LENGTH_LONG) + .setAction("Action", null).show();*/ + + if (validateData(shelfHeaderDataList, hashMapListChildData)) { + AlertDialog.Builder builder = new AlertDialog.Builder(StockFacing_PlanogramTrackerActivity.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.InsertStock_Facing_PlanogramTracker(store_id, categoryId, company_id, brand_id, + sub_category_id, shelfHeaderDataList, hashMapListChildData);*/ + + 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 { + AlertDialog.Builder builder = new AlertDialog.Builder(StockFacing_PlanogramTrackerActivity.this); + builder.setMessage(Error_Message) + .setCancelable(false) + .setPositiveButton(getResources().getString(R.string.ok), new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int id) { + dialog.dismiss(); + } + }); + AlertDialog alert = builder.create(); + alert.show(); + } + + } + }); + + + expandableListView.setOnScrollListener(new AbsListView.OnScrollListener() { + @Override + public void onScroll(AbsListView view, int firstVisibleItem, int visibleItemCount, int totalItemCount) { + int lastItem = firstVisibleItem + visibleItemCount; + + if (firstVisibleItem == 0) { + fab.setVisibility(View.VISIBLE); + } else if (lastItem == totalItemCount) { + fab.setVisibility(View.INVISIBLE); + } /*else { + fab.setVisibility(View.VISIBLE); + }*/ + } + + @Override + public void onScrollStateChanged(AbsListView arg0, int arg1) { + InputMethodManager inputManager = (InputMethodManager) getApplicationContext() + .getSystemService(Context.INPUT_METHOD_SERVICE); + if (getCurrentFocus() != null) { + inputManager.hideSoftInputFromWindow(getCurrentFocus().getWindowToken(), 0); + getCurrentFocus().clearFocus(); + } + + //expandableListView.invalidateViews(); + } + }); + + expandableListView.setOnGroupClickListener(new ExpandableListView.OnGroupClickListener() { + @Override + public boolean onGroupClick(ExpandableListView parent, View v, int groupPosition, long id) { + return true; + } + }); + + /*expandableListView.setOnScrollListener(new AbsListView.OnScrollListener() { + @Override + public void onScroll(AbsListView view, int firstVisibleItem, int visibleItemCount, int totalItemCount) { + int lastItem = firstVisibleItem + visibleItemCount; + + *//*if (firstVisibleItem == 0) { + fab.setVisibility(View.VISIBLE); + } else if (lastItem == totalItemCount) { + fab.setVisibility(View.INVISIBLE); + } else { + fab.setVisibility(View.VISIBLE); + }*//* + } + + @Override + public void onScrollStateChanged(AbsListView arg0, int arg1) { + InputMethodManager inputManager = (InputMethodManager) getApplicationContext() + .getSystemService(Context.INPUT_METHOD_SERVICE); + if (getCurrentFocus() != null) { + inputManager.hideSoftInputFromWindow(getCurrentFocus().getWindowToken(), 0); + getCurrentFocus().clearFocus(); + } + + //expandableListView.invalidateViews(); + } + }); + + // Listview Group click listener + expandableListView.setOnGroupClickListener(new ExpandableListView.OnGroupClickListener() { + @Override + public boolean onGroupClick(ExpandableListView parent, View v, int groupPosition, long id) { + return false; + } + }); + + // Listview Group expanded listener + expandableListView.setOnGroupExpandListener(new ExpandableListView.OnGroupExpandListener() { + @Override + public void onGroupExpand(int groupPosition) { + InputMethodManager inputManager = (InputMethodManager) getApplicationContext() + .getSystemService(Context.INPUT_METHOD_SERVICE); + if (getWindow().getCurrentFocus() != null) { + inputManager.hideSoftInputFromWindow(getCurrentFocus().getWindowToken(), 0); + getCurrentFocus().clearFocus(); + } + } + }); + + // Listview Group collasped listener + expandableListView.setOnGroupCollapseListener(new ExpandableListView.OnGroupCollapseListener() { + @Override + public void onGroupCollapse(int groupPosition) { + InputMethodManager inputManager = (InputMethodManager) getApplicationContext() + .getSystemService(Context.INPUT_METHOD_SERVICE); + if (getWindow().getCurrentFocus() != null) { + inputManager.hideSoftInputFromWindow(getCurrentFocus().getWindowToken(), 0); + getCurrentFocus().clearFocus(); + } + } + }); + + // Listview on child click listener + expandableListView.setOnChildClickListener(new ExpandableListView.OnChildClickListener() { + @Override + public boolean onChildClick(ExpandableListView parent, View v, int groupPosition, + int childPosition, long id) { + return false; + } + });*/ + } catch (Resources.NotFoundException e) { + e.printStackTrace(); + } + } + + private void prepareHeaderList(ArrayList shelfHeaderDataList1) { + try { + //Header Data + if (shelfHeaderDataList1.size() > 0) { + + /*for (int i = 0; i < shelfHeaderDataList.size(); i++) { + hashMapListChildData.put(shelfHeaderDataList.get(i), childDataList); + + *//*if (childDataList != null && childDataList.size() > 0) { + if (shelfHeaderDataList.get(i).getSp_addShelf_id().equals(childDataList.get(i).getSp_addShelf_id())) { + hashMapListChildData.put(shelfHeaderDataList.get(i), childDataList); + } else { + hashMapListChildData.put(shelfHeaderDataList.get(i), tempChildDataList); + } + } else { + hashMapListChildData.put(shelfHeaderDataList.get(i), tempChildDataList); + }*//* + }*/ + + adapter = new PlanogramExpandableListAdapter(this, shelfHeaderDataList1, hashMapListChildData); + expandableListView.setAdapter(adapter); + + if (childDataList != null && childDataList.size() > 0) { + for (int j = 0; j < shelfHeaderDataList.size(); j++) { + if (hashMapListChildData.get(shelfHeaderDataList.get(j)).size() > 0) { + expandableListView.expandGroup(j); + } + } + } + } + } catch (Exception e) { + e.printStackTrace(); + } + } + + private void prepareSkuList(ArrayList childDataList1, + StockFacing_PlanogramTrackerDataGetterSetter object) { + try { + if (shelfHeaderDataList.size() > 0) { + + hashMapListChildData.put(object, childDataList1); + /*//Child Sku Data + for (int i = 0; i < shelfHeaderDataList.size(); i++) { + if (object.getSp_addShelf_id().equals(shelfHeaderDataList.get(i).getSp_addShelf_id())) { + hashMapListChildData.put(object, childDataList1); + } else { + hashMapListChildData.put(shelfHeaderDataList.get(i), childDataList); + } + }*/ + +/* adapter = new PlanogramExpandableListAdapter(this, shelfHeaderDataList, hashMapListChildData); + expandableListView.setAdapter(adapter);*/ + + adapter.notifyDataSetChanged(); + //expandableListView.invalidate(); + + + if (childDataList != null && childDataList.size() > 0) { + for (int j = 0; j < shelfHeaderDataList.size(); j++) { + if (hashMapListChildData.get(shelfHeaderDataList.get(j)).size() > 0) { + expandableListView.expandGroup(j); + } + } + } + } + } catch (Exception e) { + e.printStackTrace(); + } + } + + public class PlanogramExpandableListAdapter extends BaseExpandableListAdapter { + private Context _context; + private List _listDataHeader; + private HashMap> _listDataChild; + + public PlanogramExpandableListAdapter(Context context, List listDataHeader, + HashMap> listChildData) { + this._context = context; + this._listDataHeader = listDataHeader; + this._listDataChild = listChildData; + } + + @Override + public Object getGroup(int groupPosition) { + return this._listDataHeader.get(groupPosition); + } + + @Override + public int getGroupCount() { + return this._listDataHeader.size(); + } + + @Override + public long getGroupId(int groupPosition) { + return groupPosition; + } + + @Override + public View getGroupView(int groupPosition, boolean isExpanded, View convertView, ViewGroup parent) { + final StockFacing_PlanogramTrackerDataGetterSetter headerTitle = + (StockFacing_PlanogramTrackerDataGetterSetter) getGroup(groupPosition); + + if (headerTitle != null) { + if (convertView == null) { + LayoutInflater infalInflater = (LayoutInflater) _context.getSystemService(Context.LAYOUT_INFLATER_SERVICE); + convertView = infalInflater.inflate(R.layout.item_stock_facing_planogram_header, null, false); + } + + TextView txt_shelfHeader = (TextView) convertView.findViewById(R.id.txt_shelfHeader); + Button btn_addSku = (Button) convertView.findViewById(R.id.btn_addSku); + + txt_shelfHeader.setText(headerTitle.getSp_addShelf() + " (Position : " + headerTitle.getSp_shelfPosition() + ")"); + + btn_addSku.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + //Stock Facing Planogram SKU Data + tempChildDataList = db.getStockAndFacingPlanogramDefaultSKUData(categoryId, brand_id, + keyAccount_id, storeType_id, class_id); + + final Dialog dialog1 = new Dialog(StockFacing_PlanogramTrackerActivity.this); + dialog1.requestWindowFeature(Window.FEATURE_NO_TITLE); + dialog1.getWindow().setBackgroundDrawable(new ColorDrawable(android.graphics.Color.TRANSPARENT)); + dialog1.setContentView(R.layout.dialog_stock_facing_planogram_tracker_add_sku); + + //LinearLayout lin_addSku = (LinearLayout) dialog1.findViewById(R.id.lin_addSku); + Button addSKU = (Button) dialog1.findViewById(R.id.dialog_btn_addSku_Shelf); + Button cancel = (Button) dialog1.findViewById(R.id.dialog_btn_cancel_addSku); + ExpandableListView exp_addSkuListView = (ExpandableListView) dialog1.findViewById(R.id.exp_addSkuListView); + + cancel.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + dialog1.dismiss(); + } + }); + + dialogAddSkuList(exp_addSkuListView); + + /*childDataList = new ArrayList<>(); + + for (int i = 0; i < tempChildDataList.size(); i++) { + View view1 = getLayoutInflater().inflate(R.layout.item_stock_facing_planogram_child, null); + + TextView txt_skuChild = (TextView) view1.findViewById(R.id.txt_skuChild); + CheckBox chk_sku = (CheckBox) view1.findViewById(R.id.chk_sku); + + final StockFacing_PlanogramTrackerDataGetterSetter childData = tempChildDataList.get(i); + txt_skuChild.setText(childData.getSku()); + + childData.setSp_addShelf_id(headerTitle.getSp_addShelf_id()); + + if (childData.getCheckbox_sku().equals("0")) { + chk_sku.setChecked(false); + } else if (childData.getCheckbox_sku().equals("1")) { + chk_sku.setChecked(true); + } + + chk_sku.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() { + @Override + public void onCheckedChanged(CompoundButton compoundButton, boolean isCheck) { + if (isCheck) { + childData.setCheckbox_sku("1"); + } else { + childData.setCheckbox_sku("0"); + } + } + }); + + childDataList.add(childData); + lin_addSku.addView(view1); + }*/ + + addSKU.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + /*boolean flag = false; + for (int i = 0; i < childDataList.size(); i++) { + if (childDataList.get(i).getCheckbox_sku().equals("1")) { + flag = true; + break; + } + } + + if (flag) { + prepareSkuList(childDataList, headerTitle); + dialog1.dismiss(); + } else { + Snackbar.make(view, "Please select atleast one sku", Snackbar.LENGTH_LONG) + .setAction("Action", null).show(); + }*/ + + } + }); + dialog1.show(); + } + }); + + if (!checkflag) { + if (checkHeaderArray.contains(groupPosition)) { + txt_shelfHeader.setTextColor(getResources().getColor(android.R.color.holo_red_dark)); + } else { + txt_shelfHeader.setTextColor(getResources().getColor(R.color.colorPrimaryDark)); + } + } + + } + return convertView; + } + + @Override + public Object getChild(int groupPosition, int childPosititon) { + return this._listDataChild.get(this._listDataHeader.get(groupPosition)).get(childPosititon); + } + + @Override + public int getChildrenCount(int groupPosition) { + return this._listDataChild.get(this._listDataHeader.get(groupPosition)).size(); + } + + @Override + public long getChildId(int groupPosition, int childPosition) { + return childPosition; + } + + @Override + public View getChildView(int groupPosition, final int childPosition, boolean isLastChild, View convertView, ViewGroup parent) { + StockFacing_PlanogramTrackerDataGetterSetter childData = + (StockFacing_PlanogramTrackerDataGetterSetter) getChild(groupPosition, childPosition); + ViewHolder holder = null; + + if (childData != null) { + if (convertView == null) { + LayoutInflater infalInflater = (LayoutInflater) _context.getSystemService(Context.LAYOUT_INFLATER_SERVICE); + convertView = infalInflater.inflate(R.layout.item_stock_facing_planogram_child, null, false); + + holder = new ViewHolder(); + holder.txt_skuChild = (TextView) convertView.findViewById(R.id.txt_skuChild); + holder.checkBox = (CheckBox) convertView.findViewById(R.id.chk_sku); + + convertView.setTag(holder); + } else { + holder = (ViewHolder) convertView.getTag(); + } + + //holder.checkBox.setVisibility(View.GONE); + holder.checkBox.setEnabled(false); + + holder.txt_skuChild.setText(childData.getSku()); + + if (childData.getCheckbox_sku().equals("1")) { + holder.checkBox.setChecked(true); + } else { + holder.checkBox.setChecked(false); + } + } + + return convertView; + } + + @Override + public boolean hasStableIds() { + return false; + } + + @Override + public boolean isChildSelectable(int groupPosition, int childPosition) { + return true; + } + } + + public class ViewHolder { + TextView txt_skuChild; + CheckBox checkBox; + } + + boolean validateData(List listDataHeader, + HashMap> listDataChild) { + boolean flag = true; + checkHeaderArray.clear(); + + for (int i = 0; i < listDataHeader.size(); i++) { + + if (listDataChild.get(listDataHeader.get(i)) == null) { + if (!checkHeaderArray.contains(i)) { + checkHeaderArray.add(i); + } + + checkflag = false; + Error_Message = "add sku shelf can not be empty"; + break; + } else { + if (listDataChild.get(listDataHeader.get(i)).size() <= 0) { + if (!checkHeaderArray.contains(i)) { + checkHeaderArray.add(i); + } + + flag = false; + Error_Message = "add sku shelf can not be empty"; + break; + } + } + + if (flag == false) { + checkflag = false; + break; + } else { + checkflag = true; + } + } + + //expListView.invalidate(); + adapter.notifyDataSetChanged(); + + return checkflag; + } + + @Override + public void onBackPressed() { + //super.onBackPressed(); + + android.app.AlertDialog.Builder builder = new android.app.AlertDialog.Builder(StockFacing_PlanogramTrackerActivity.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.ok), new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int id) { + finish(); + } + }) + .setNegativeButton(getResources().getString(R.string.cancel), new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + } + }); + android.app.AlertDialog alert = builder.create(); + alert.show(); + } + + @Override + public boolean onOptionsItemSelected(MenuItem item) { + int id = item.getItemId(); + + if (id == android.R.id.home) { + android.app.AlertDialog.Builder builder = new android.app.AlertDialog.Builder(StockFacing_PlanogramTrackerActivity.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.ok), new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int id) { + finish(); + } + }) + .setNegativeButton(getResources().getString(R.string.cancel), new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + + } + }); + android.app.AlertDialog alert = builder.create(); + alert.show(); + } + + return super.onOptionsItemSelected(item); + } + + private void dialogAddSkuList(ExpandableListView exp_addSkuListView) { + try { + addSkuHeaderList = new ArrayList<>(); + addSkuChildList = new ArrayList<>(); + addSkuHashMapChildData = new HashMap<>(); + + //Header Data + addSkuHeaderList = db.getPlanogramAddSkuHeaderData(categoryId, keyAccount_id, storeType_id, class_id); + + if (addSkuHeaderList.size() > 0) { + + for (int i = 0; i < addSkuHeaderList.size(); i++) { + //Child Data + if (addSkuHeaderList.get(i).getCompany_id().equals("1")) { + + addSkuChildList = db.getPlanogramAddSkuChildData(categoryId, addSkuHeaderList.get(i).getBrand_id(), + keyAccount_id, storeType_id, class_id); + + addSkuHashMapChildData.put(addSkuHeaderList.get(i), addSkuChildList); + } + } + } + + adapter1 = new ExpandableListAdapter(this, addSkuHeaderList, addSkuHashMapChildData); + exp_addSkuListView.setAdapter(adapter1); + } catch (Exception e) { + e.printStackTrace(); + } + } + + public class ExpandableListAdapter extends BaseExpandableListAdapter { + private Context _context; + private List _listDataHeader; + private HashMap> _listDataChild; + + public ExpandableListAdapter(Context context, List listDataHeader, + HashMap> listChildData) { + this._context = context; + this._listDataHeader = listDataHeader; + this._listDataChild = listChildData; + } + + @Override + public Object getGroup(int groupPosition) { + return this._listDataHeader.get(groupPosition); + } + + @Override + public int getGroupCount() { + return this._listDataHeader.size(); + } + + @Override + public long getGroupId(int groupPosition) { + return groupPosition; + } + + @Override + public View getGroupView(final int groupPosition, boolean isExpanded, View convertView, ViewGroup parent) { + final StockFacing_PlanogramTrackerDataGetterSetter headerTitle = (StockFacing_PlanogramTrackerDataGetterSetter) getGroup(groupPosition); + + if (convertView == null) { + LayoutInflater infalInflater = (LayoutInflater) this._context.getSystemService(Context.LAYOUT_INFLATER_SERVICE); + convertView = infalInflater.inflate(R.layout.item_stock_facing_add_sku_header, null, false); + } + + TextView txt_stockFaceupHeader = (TextView) convertView.findViewById(R.id.txt_stockFaceupHeader); + + txt_stockFaceupHeader.setTypeface(null, Typeface.BOLD); + txt_stockFaceupHeader.setText(headerTitle.getSub_category() + "-" + headerTitle.getBrand()); + + return convertView; + } + + @Override + public Object getChild(int groupPosition, int childPosititon) { + return this._listDataChild.get(this._listDataHeader.get(groupPosition)).get(childPosititon); + } + + @Override + public int getChildrenCount(int groupPosition) { + return this._listDataChild.get(this._listDataHeader.get(groupPosition)).size(); + } + + @Override + public long getChildId(int groupPosition, int childPosition) { + return childPosition; + } + + @Override + public View getChildView(final int groupPosition, final int childPosition, boolean isLastChild, View convertView, ViewGroup parent) { + + final StockFacing_PlanogramTrackerDataGetterSetter childData = + (StockFacing_PlanogramTrackerDataGetterSetter) getChild(groupPosition, childPosition); + ViewHolder1 holder = null; + + if (convertView == null) { + LayoutInflater infalInflater = (LayoutInflater) this._context.getSystemService(Context.LAYOUT_INFLATER_SERVICE); + convertView = infalInflater.inflate(R.layout.item_stock_facing_planogram_child, null, false); + + holder = new ViewHolder1(); + holder.txt_skuName = (TextView) convertView.findViewById(R.id.txt_skuChild); + holder.chk_sku = (CheckBox) convertView.findViewById(R.id.chk_sku); + + convertView.setTag(holder); + } else { + holder = (ViewHolder1) convertView.getTag(); + } + + holder.txt_skuName.setText(childData.getSku()); + + + return convertView; + } + + @Override + public boolean hasStableIds() { + return false; + } + + @Override + public boolean isChildSelectable(int groupPosition, int childPosition) { + return true; + } + } + + public class ViewHolder1 { + //CardView cardView; + TextView txt_skuName; + CheckBox chk_sku; + } +} diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/Stock_FacingActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/Stock_FacingActivity.java index d8e6383..bfe7276 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/Stock_FacingActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/Stock_FacingActivity.java @@ -15,6 +15,7 @@ import android.content.res.Resources; import android.graphics.Bitmap; import android.graphics.BitmapFactory; import android.graphics.Color; +import android.graphics.LightingColorFilter; import android.graphics.Matrix; import android.graphics.Typeface; import android.graphics.drawable.ColorDrawable; @@ -70,6 +71,7 @@ import cpm.com.gskmtorange.dailyentry.T2PComplianceActivity; import cpm.com.gskmtorange.xmlGetterSetter.MAPPING_PLANOGRAM_DataGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.MSL_AvailabilityGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.Stock_FacingGetterSetter; +import cpm.com.gskmtorange.xmlGetterSetter.Store_wise_camera_DataGetterSetter; import static android.R.attr.angle; @@ -93,6 +95,10 @@ public class Stock_FacingActivity extends AppCompatActivity { String gallery_package = ""; private SharedPreferences preferences; boolean isExpand = true; + ImageView camera1, camera2, camera3, camera4; + LinearLayout lin_camera1, lin_camera2, lin_camera3, lin_camera4; + String img3 = "", img4 = "", img5 = "", img6 = ""; + Store_wise_camera_DataGetterSetter cameraData; private static boolean updateResources(Context context, String language) { @@ -132,6 +138,15 @@ public class Stock_FacingActivity extends AppCompatActivity { expandableListView = (ExpandableListView) findViewById(R.id.expandableListView); //txt_stockFacingName = (TextView) findViewById(R.id.txt_stockFacingName); + camera1 = (ImageView) findViewById(R.id.img_camera1); + camera2 = (ImageView) findViewById(R.id.img_camera2); + camera3 = (ImageView) findViewById(R.id.img_camera3); + camera4 = (ImageView) findViewById(R.id.img_camera4); + + lin_camera1 = (LinearLayout) findViewById(R.id.lin_camera1); + lin_camera2 = (LinearLayout) findViewById(R.id.lin_camera2); + lin_camera3 = (LinearLayout) findViewById(R.id.lin_camera3); + lin_camera4 = (LinearLayout) findViewById(R.id.lin_camera4); //preference data @@ -156,10 +171,15 @@ public class Stock_FacingActivity extends AppCompatActivity { getSupportActionBar().setHomeButtonEnabled(true); getSupportActionBar().setDisplayHomeAsUpEnabled(true); + //Stock Facing List prepareList(); str = CommonString.FILE_PATH + _pathforcheck; + //Camera + cameraMethod(); + + final FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab); fab.setOnClickListener(new View.OnClickListener() { @Override @@ -167,7 +187,14 @@ public class Stock_FacingActivity extends AppCompatActivity { /*Snackbar.make(view, "Replace with your own action", Snackbar.LENGTH_LONG) .setAction("Action", null).show();*/ - if (validateData(hashMapListHeaderData, hashMapListChildData)) { + /*if (db.isStorewiseCameraSave(store_id, categoryId)) { + db.updateStore_wise_camera(cameraData); + } else { + cameraData.setCheckSaveStatus("1"); + db.InsertStore_wise_camera(cameraData); + }*/ + + if (validateData(hashMapListHeaderData, hashMapListChildData, cameraData)) { AlertDialog.Builder builder = new AlertDialog.Builder(Stock_FacingActivity.this); builder.setMessage(getResources().getString(R.string.check_save_message)) .setCancelable(false) @@ -175,6 +202,15 @@ public class Stock_FacingActivity extends AppCompatActivity { public void onClick(DialogInterface dialog, int id) { db.open(); + //Camera insert or update + if (db.isStorewiseCameraSave(store_id, categoryId)) { + db.updateStore_wise_camera(cameraData); + } else { + cameraData.setCheckSaveStatus("1"); + db.InsertStore_wise_camera(cameraData); + } + + //Stock Facing insert or update if (db.checkStockAndFacingData(store_id, categoryId)) { db.updateStockAndFacing(store_id, categoryId, hashMapListHeaderData, hashMapListChildData); Snackbar.make(view, getResources().getString(R.string.update_message), Snackbar.LENGTH_LONG).setAction("Action", null).show(); @@ -197,7 +233,6 @@ public class Stock_FacingActivity extends AppCompatActivity { alert.show(); } else { AlertDialog.Builder builder = new AlertDialog.Builder(Stock_FacingActivity.this); - //builder.setMessage(getResources().getString(R.string.empty_field)) builder.setMessage(Error_Message) .setCancelable(false) .setPositiveButton(getResources().getString(R.string.ok), new DialogInterface.OnClickListener() { @@ -303,6 +338,124 @@ public class Stock_FacingActivity extends AppCompatActivity { } + 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("/", "") + "_" + getCurrentTime().replace(":", "") + ".jpg"; + path = str + _pathforcheck; + + startCameraActivity(3); + } + }); + + lin_camera2.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + _pathforcheck = "Stock_Camera2_" + store_id + "_" + categoryId + + "_" + visit_date.replace("/", "") + "_" + getCurrentTime().replace(":", "") + ".jpg"; + path = str + _pathforcheck; + + startCameraActivity(4); + } + }); + + lin_camera3.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + _pathforcheck = "Stock_Camera3_" + store_id + "_" + categoryId + + "_" + visit_date.replace("/", "") + "_" + getCurrentTime().replace(":", "") + ".jpg"; + path = str + _pathforcheck; + + startCameraActivity(5); + } + }); + + lin_camera4.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + _pathforcheck = "Stock_Camera4_" + store_id + "_" + categoryId + + "_" + visit_date.replace("/", "") + "_" + getCurrentTime().replace(":", "") + ".jpg"; + path = str + _pathforcheck; + + startCameraActivity(6); + } + }); + + } else { + 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); + + camera1.setBackgroundResource(R.mipmap.camera_grey); + + lin_camera1.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + Intent intent = new Intent(Stock_FacingActivity.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); + + startActivity(intent); + } + }); + } + } + private void prepareList() { try { hashMapListHeaderData = new ArrayList<>(); @@ -337,7 +490,8 @@ public class Stock_FacingActivity extends AppCompatActivity { } boolean validateData(List listDataHeader, - HashMap> listDataChild) { + HashMap> listDataChild, + Store_wise_camera_DataGetterSetter cameraData) { boolean flag = true; checkHeaderArray.clear(); @@ -354,9 +508,12 @@ public class Stock_FacingActivity extends AppCompatActivity { //Camera allow enable if (camera_allow.equalsIgnoreCase("1")) { - //if (!imagePath.equals("") || !imagePath1.equals("")) { - if (!stock.equals("0")) { - if (!imagePath.equals("") || !imagePath1.equals("")) { + //Atleast Single camera is click + if (!cameraData.getCamera1().equals("") || !cameraData.getCamera2().equals("") || + !cameraData.getCamera3().equals("") || !cameraData.getCamera4().equals("")) { + + if (!stock.equals("0")) { + //if (!imagePath.equals("") || !imagePath1.equals("")) { if (stock.equals("") || faceup.equals("")) { if (!checkHeaderArray.contains(i)) { checkHeaderArray.add(i); @@ -366,7 +523,7 @@ public class Stock_FacingActivity extends AppCompatActivity { Error_Message = getResources().getString(R.string.fill_data); break; } - } else { + /*} else { if (!checkHeaderArray.contains(i)) { checkHeaderArray.add(i); } @@ -374,27 +531,23 @@ public class Stock_FacingActivity extends AppCompatActivity { flag = false; Error_Message = getResources().getString(R.string.click_image); break; + }*/ + } else { + if (stock.equals("")) { + if (!checkHeaderArray.contains(i)) { + checkHeaderArray.add(i); + } + + flag = false; + Error_Message = getResources().getString(R.string.fill_data); + break; + } } } else { - if (stock.equals("")) { - if (!checkHeaderArray.contains(i)) { - checkHeaderArray.add(i); - } - - flag = false; - Error_Message = getResources().getString(R.string.fill_data); - break; - } - } - /*} else { - if (!checkHeaderArray.contains(i)) { - checkHeaderArray.add(i); - } - flag = false; Error_Message = getResources().getString(R.string.click_image); break; - }*/ + } } else { //Camera allow disable @@ -440,12 +593,152 @@ public class Stock_FacingActivity extends AppCompatActivity { checkflag = true; } } + + /*for (int i = 0; i < listDataHeader.size(); i++) { + String imagePath = listDataHeader.get(i).getImage1(); + String imagePath1 = listDataHeader.get(i).getImage2(); + + for (int j = 0; j < listDataChild.get(listDataHeader.get(i)).size(); j++) { + String stock = listDataChild.get(listDataHeader.get(i)).get(j).getStock(); + String faceup = listDataChild.get(listDataHeader.get(i)).get(j).getFacing(); + + //Company_id + if (listDataChild.get(listDataHeader.get(i)).get(j).getCompany_id().equals("1")) { + //Camera allow enable + if (camera_allow.equalsIgnoreCase("1")) { + + if (!stock.equals("0")) { + if (!imagePath.equals("") || !imagePath1.equals("")) { + if (stock.equals("") || faceup.equals("")) { + if (!checkHeaderArray.contains(i)) { + checkHeaderArray.add(i); + } + + flag = false; + Error_Message = getResources().getString(R.string.fill_data); + break; + } + } else { + if (!checkHeaderArray.contains(i)) { + checkHeaderArray.add(i); + } + + flag = false; + Error_Message = getResources().getString(R.string.click_image); + break; + } + } else { + if (stock.equals("")) { + if (!checkHeaderArray.contains(i)) { + checkHeaderArray.add(i); + } + + flag = false; + Error_Message = getResources().getString(R.string.fill_data); + break; + } + } + + } else { + //Camera allow disable + if (!stock.equals("0")) { + if (stock.equals("") || faceup.equals("")) { + if (!checkHeaderArray.contains(i)) { + checkHeaderArray.add(i); + } + + flag = false; + Error_Message = getResources().getString(R.string.fill_data); + break; + } + } else { + if (stock.equals("")) { + if (!checkHeaderArray.contains(i)) { + checkHeaderArray.add(i); + } + + flag = false; + Error_Message = getResources().getString(R.string.fill_data); + break; + } + } + } + } else { + if (faceup.equals("")) { + if (!checkHeaderArray.contains(i)) { + checkHeaderArray.add(i); + } + + flag = false; + Error_Message = getResources().getString(R.string.fill_data); + break; + } + } + } + + if (flag == false) { + checkflag = false; + break; + } else { + checkflag = true; + } + }*/ //expListView.invalidate(); adapter.notifyDataSetChanged(); return checkflag; } + private void startCameraActivity(int position) { + try { + Log.e("MakeMachine", "startCameraActivity()"); + File file = new File(path); + outputFileUri = Uri.fromFile(file); + + String defaultCameraPackage = ""; + final PackageManager packageManager = getPackageManager(); + List list = packageManager.getInstalledApplications(PackageManager.GET_UNINSTALLED_PACKAGES); + + for (int n = 0; n < list.size(); n++) { + if ((list.get(n).flags & ApplicationInfo.FLAG_SYSTEM) == 1) { + + //temp value in case camera is gallery app above jellybean + String packag = list.get(n).loadLabel(packageManager).toString(); + if (packag.equalsIgnoreCase("Gallery") || packag.equalsIgnoreCase("Galeri")) { + gallery_package = list.get(n).packageName; + } + + if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) { + if (packag.equalsIgnoreCase("Camera") || packag.equalsIgnoreCase("Kamera")) { + defaultCameraPackage = list.get(n).packageName; + break; + } + } else { + if (packag.equalsIgnoreCase("Camera") || packag.equalsIgnoreCase("Kamera")) { + defaultCameraPackage = list.get(n).packageName; + break; + } + } + } + } + + Intent intent = new Intent(android.provider.MediaStore.ACTION_IMAGE_CAPTURE); + intent.putExtra(MediaStore.EXTRA_OUTPUT, outputFileUri); + intent.setPackage(defaultCameraPackage); + startActivityForResult(intent, position); + + } catch (ActivityNotFoundException e) { + e.printStackTrace(); + Intent intent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE); + intent.putExtra(MediaStore.EXTRA_OUTPUT, outputFileUri); + intent.setPackage(gallery_package); + startActivityForResult(intent, position); + + } catch (Exception e) { + e.printStackTrace(); + } + } + private void startCameraActivity1(int position) { /*try { Log.e("Stock & Facing ", "startCameraActivity()"); @@ -661,6 +954,102 @@ public class Stock_FacingActivity extends AppCompatActivity { Log.e("Stock & Facing", "User cancelled"); } break; + + case 3: + if (resultCode == -1) { + if (_pathforcheck != null && !_pathforcheck.equals("")) { + if (new File(str + _pathforcheck).exists()) { + img3 = _pathforcheck; + _pathforcheck = ""; + + if (!img3.equalsIgnoreCase("")) { + cameraData.setCamera1(img3); + img3 = ""; + } + + if (cameraData.getCamera1().equals("")) { + camera1.setBackgroundResource(R.mipmap.camera_orange); + } else { + camera1.setBackgroundResource(R.mipmap.camera_green); + } + } + } + } else { + Log.e("Stock & Facing", "User cancelled"); + } + break; + + case 4: + if (resultCode == -1) { + if (_pathforcheck != null && !_pathforcheck.equals("")) { + if (new File(str + _pathforcheck).exists()) { + img4 = _pathforcheck; + _pathforcheck = ""; + + if (!img4.equalsIgnoreCase("")) { + cameraData.setCamera2(img4); + img4 = ""; + } + + if (cameraData.getCamera2().equals("")) { + camera2.setBackgroundResource(R.mipmap.camera_orange); + } else { + camera2.setBackgroundResource(R.mipmap.camera_green); + } + } + } + } else { + Log.e("Stock & Facing", "User cancelled"); + } + break; + + case 5: + if (resultCode == -1) { + if (_pathforcheck != null && !_pathforcheck.equals("")) { + if (new File(str + _pathforcheck).exists()) { + img5 = _pathforcheck; + _pathforcheck = ""; + + if (!img5.equalsIgnoreCase("")) { + cameraData.setCamera3(img5); + img5 = ""; + } + + if (cameraData.getCamera3().equals("")) { + camera3.setBackgroundResource(R.mipmap.camera_orange); + } else { + camera3.setBackgroundResource(R.mipmap.camera_green); + } + } + } + } else { + Log.e("Stock & Facing", "User cancelled"); + } + break; + + case 6: + if (resultCode == -1) { + if (_pathforcheck != null && !_pathforcheck.equals("")) { + if (new File(str + _pathforcheck).exists()) { + img6 = _pathforcheck; + _pathforcheck = ""; + + if (!img6.equalsIgnoreCase("")) { + cameraData.setCamera4(img6); + img6 = ""; + } + + if (cameraData.getCamera4().equals("")) { + camera4.setBackgroundResource(R.mipmap.camera_orange); + } else { + camera4.setBackgroundResource(R.mipmap.camera_green); + } + } + } + } else { + Log.e("Stock & Facing", "User cancelled"); + } + break; } super.onActivityResult(requestCode, resultCode, data); } @@ -790,7 +1179,6 @@ public class Stock_FacingActivity extends AppCompatActivity { } } - @Override public void onBackPressed() { //super.onBackPressed(); @@ -884,6 +1272,9 @@ public class Stock_FacingActivity extends AppCompatActivity { img_camera2.setVisibility(View.GONE); } + //img_camera1.setVisibility(View.GONE); + img_camera2.setVisibility(View.GONE); + //Camera allow enable if (camera_allow.equalsIgnoreCase("1")) { @@ -947,6 +1338,23 @@ public class Stock_FacingActivity extends AppCompatActivity { //Camera allow disable img_camera1.setBackgroundResource(R.mipmap.camera_grey); img_camera2.setBackgroundResource(R.mipmap.camera_grey); + + img_camera1.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + Intent intent = new Intent(Stock_FacingActivity.this, StockFacing_PlanogramTrackerActivity.class); + + intent.putExtra("brand", headerTitle.getBrand()); + intent.putExtra("brand_id", headerTitle.getBrand_id()); + intent.putExtra("company_id", headerTitle.getCompany_id()); + intent.putExtra("sub_category", headerTitle.getSub_category()); + intent.putExtra("sub_category_id", headerTitle.getSub_category_id()); + intent.putExtra("categoryName", categoryName); + intent.putExtra("categoryId", categoryId); + + startActivity(intent); + } + }); } if (headerTitle.getCompany_id().equals("1")) { 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 9de00c6..0ee120a 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/PreviousDataUploadActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/PreviousDataUploadActivity.java @@ -48,7 +48,9 @@ import cpm.com.gskmtorange.xmlGetterSetter.GapsChecklistGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.MSL_AvailabilityGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.Promo_Compliance_DataGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.SkuGetterSetter; +import cpm.com.gskmtorange.xmlGetterSetter.StockFacing_PlanogramTrackerDataGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.Stock_FacingGetterSetter; +import cpm.com.gskmtorange.xmlGetterSetter.Store_wise_camera_DataGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.T2PGetterSetter; import cpm.com.gskmtorange.xmlHandlers.FailureXMLHandler; @@ -76,7 +78,12 @@ public class PreviousDataUploadActivity extends AppCompatActivity { private FailureGetterSetter failureGetterSetter = null; private SharedPreferences preferences; private int factor, k = 0; + Object result = ""; + + ArrayList stockFacingPlanogramDataList; + ArrayList storeWiseCameraDataGetterSetters; + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -840,10 +847,213 @@ public class PreviousDataUploadActivity extends AppCompatActivity { data.name = getString(R.string.t2p_data_uploading); publishProgress(data); + + //Stock Facing Planogram Tracker + String stock_facing_planogram_xml = ""; + onXML = ""; + stockFacingPlanogramDataList = db.getStockAndFacingPlanogramServerUploadData(coverageList.get(i).getStoreId()); + + if (stockFacingPlanogramDataList.size() > 0) { + + for (int i1 = 0; i1 < stockFacingPlanogramDataList.size(); i1++) { + onXML = "[STOCK_FACING_PLANOGRAM_DATA]" + + "[MID]" + mid + "[/MID]" + + "[USER_ID]" + userId + "[/USER_ID]" + + "[SKU_ID]" + Integer.parseInt(stockFacingPlanogramDataList.get(i1).getSku_id()) + "[/SKU_ID]" + //+ "[category_id]" + Integer.parseInt(stockFacingPlanogramDataList.get(i1).getCategory_id()) + "[/category_id]" + //+ "[company_id]" + Integer.parseInt(stockFacingPlanogramDataList.get(i1).getCompany_id()) + "[/company_id]" + //+ "[sub_category_id]" + Integer.parseInt(stockFacingPlanogramDataList.get(i1).getSub_category_id()) + "[/sub_category_id]" + + "[BRAND_ID]" + Integer.parseInt(stockFacingPlanogramDataList.get(i1).getBrand_id()) + "[/BRAND_ID]" + + "[SHELF_ID]" + Integer.parseInt(stockFacingPlanogramDataList.get(i1).getSp_addShelf_id()) + "[/SHELF_ID]" + + "[SHELF_POSITION]" + Integer.parseInt(stockFacingPlanogramDataList.get(i1).getSp_shelfPosition()) + "[/SHELF_POSITION]" + + "[CHECKBOX]" + Integer.parseInt(stockFacingPlanogramDataList.get(i1).getCheckbox_sku()) + "[/CHECKBOX]" + + "[/STOCK_FACING_PLANOGRAM_DATA]"; + + stock_facing_planogram_xml = stock_facing_planogram_xml + onXML; + } + + final String sos_xml = "[DATA]" + stock_facing_planogram_xml + "[/DATA]"; + + request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_UPLOAD_STOCK_XML_DATA); + request.addProperty("XMLDATA", sos_xml); + request.addProperty("KEYS", "STOCK_FACING_PLANOGRAM_DATA"); + request.addProperty("USERNAME", userId); + request.addProperty("MID", mid); + + envelope = new SoapSerializationEnvelope(SoapEnvelope.VER11); + envelope.dotNet = true; + envelope.setOutputSoapObject(request); + + androidHttpTransport = new HttpTransportSE(CommonString.URL); + androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_STOCK_XML_DATA, envelope); + + result = envelope.getResponse(); + + if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { + return CommonString.METHOD_UPLOAD_STOCK_XML_DATA; + } + + if (result.toString().equalsIgnoreCase(CommonString.KEY_NO_DATA)) { + return CommonString.METHOD_UPLOAD_STOCK_XML_DATA; + } + + if (result.toString().equalsIgnoreCase(CommonString.KEY_FAILURE)) { + return CommonString.METHOD_UPLOAD_STOCK_XML_DATA; + } + } + data.value = 50; + data.name = getString(R.string.stock_planogram_data_uploading); + publishProgress(data); + + + //Store Wise Camera + String store_wise_camera_xml = ""; + onXML = ""; + storeWiseCameraDataGetterSetters = db.getStoreWiseCameraServerUploadData(coverageList.get(i).getStoreId()); + + if (storeWiseCameraDataGetterSetters.size() > 0) { + + for (int i1 = 0; i1 < storeWiseCameraDataGetterSetters.size(); i1++) { + onXML = "[STORE_WISE_CAMERA_DATA]" + + "[MID]" + mid + "[/MID]" + + "[USER_ID]" + userId + "[/USER_ID]" + + "[CAMERA1]" + storeWiseCameraDataGetterSetters.get(i).getCamera1() + "[/CAMERA1]" + + "[CAMERA2]" + storeWiseCameraDataGetterSetters.get(i).getCamera2() + "[/CAMERA2]" + + "[CAMERA3]" + storeWiseCameraDataGetterSetters.get(i).getCamera3() + "[/CAMERA3]" + + "[CAMERA4]" + storeWiseCameraDataGetterSetters.get(i).getCamera4() + "[/CAMERA4]" + + "[/STORE_WISE_CAMERA_DATA]"; + + store_wise_camera_xml = store_wise_camera_xml + onXML; + } + + final String sos_xml = "[DATA]" + store_wise_camera_xml + "[/DATA]"; + + request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_UPLOAD_STOCK_XML_DATA); + request.addProperty("XMLDATA", sos_xml); + request.addProperty("KEYS", "STORE_WISE_CAMERA_DATA"); + request.addProperty("USERNAME", userId); + request.addProperty("MID", mid); + + envelope = new SoapSerializationEnvelope(SoapEnvelope.VER11); + envelope.dotNet = true; + envelope.setOutputSoapObject(request); + + androidHttpTransport = new HttpTransportSE(CommonString.URL); + androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_STOCK_XML_DATA, envelope); + + result = envelope.getResponse(); + + if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { + return CommonString.METHOD_UPLOAD_STOCK_XML_DATA; + } + + if (result.toString().equalsIgnoreCase(CommonString.KEY_NO_DATA)) { + return CommonString.METHOD_UPLOAD_STOCK_XML_DATA; + } + + if (result.toString().equalsIgnoreCase(CommonString.KEY_FAILURE)) { + return CommonString.METHOD_UPLOAD_STOCK_XML_DATA; + } + } + data.value = 55; + data.name = getString(R.string.stock_planogram_data_uploading); + publishProgress(data); + + //Image Upload + //Store Wise Camera Images Upload + if (storeWiseCameraDataGetterSetters.size() > 0) { + for (int i1 = 0; i1 < storeWiseCameraDataGetterSetters.size(); i1++) { + + if (storeWiseCameraDataGetterSetters.get(i1).getCamera1() != null && !storeWiseCameraDataGetterSetters.get(i1).getCamera1().equals("")) { + if (new File(CommonString.FILE_PATH + storeWiseCameraDataGetterSetters.get(i1).getCamera1()).exists()) { + + try { + result = UploadImage(storeWiseCameraDataGetterSetters.get(i1).getCamera1(), "StockCameraImages"); + + if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { + return "StockCameraImages"; + } + + runOnUiThread(new Runnable() { + public void run() { + message.setText("StockFacing Images Uploaded"); + } + }); + } catch (Exception e) { + e.printStackTrace(); + } + } + } + + if (storeWiseCameraDataGetterSetters.get(i1).getCamera2() != null && !storeWiseCameraDataGetterSetters.get(i1).getCamera2().equals("")) { + if (new File(CommonString.FILE_PATH + storeWiseCameraDataGetterSetters.get(i1).getCamera2()).exists()) { + + try { + result = UploadImage(storeWiseCameraDataGetterSetters.get(i1).getCamera2(), "StockCameraImages"); + + if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { + return "StockCameraImages"; + } + + runOnUiThread(new Runnable() { + public void run() { + message.setText("StockFacing Images Uploaded"); + } + }); + } catch (Exception e) { + e.printStackTrace(); + } + } + } + + if (storeWiseCameraDataGetterSetters.get(i1).getCamera3() != null && !storeWiseCameraDataGetterSetters.get(i1).getCamera3().equals("")) { + if (new File(CommonString.FILE_PATH + storeWiseCameraDataGetterSetters.get(i1).getCamera3()).exists()) { + + try { + result = UploadImage(storeWiseCameraDataGetterSetters.get(i1).getCamera3(), "StockCameraImages"); + + if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { + return "StockCameraImages"; + } + + runOnUiThread(new Runnable() { + public void run() { + message.setText("StockFacing Images Uploaded"); + } + }); + } catch (Exception e) { + e.printStackTrace(); + } + } + } + + if (storeWiseCameraDataGetterSetters.get(i1).getCamera4() != null && !storeWiseCameraDataGetterSetters.get(i1).getCamera4().equals("")) { + if (new File(CommonString.FILE_PATH + storeWiseCameraDataGetterSetters.get(i1).getCamera4()).exists()) { + + try { + result = UploadImage(storeWiseCameraDataGetterSetters.get(i1).getCamera4(), "StockCameraImages"); + + if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { + return "StockCameraImages"; + } + + runOnUiThread(new Runnable() { + public void run() { + message.setText("StockFacing Images Uploaded"); + } + }); + } catch (Exception e) { + e.printStackTrace(); + } + } + } + } + } + //Stock Facing Images Upload - if (stock_facingHeaderList.size() > 0) { + /*if (stock_facingHeaderList.size() > 0) { for (int i1 = 0; i1 < stock_facingHeaderList.size(); i1++) { if (stock_facingHeaderList.get(i1).getImage1() != null && !stock_facingHeaderList.get(i1).getImage1().equals("")) { @@ -887,7 +1097,7 @@ public class PreviousDataUploadActivity extends AppCompatActivity { } } } - } + }*/ //// ashish visibility image start if (additionalVisibilityList.size() > 0) { 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 5d6654e..94c7d6e 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java @@ -51,7 +51,9 @@ import cpm.com.gskmtorange.xmlGetterSetter.GapsChecklistGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.MSL_AvailabilityGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.Promo_Compliance_DataGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.SkuGetterSetter; +import cpm.com.gskmtorange.xmlGetterSetter.StockFacing_PlanogramTrackerDataGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.Stock_FacingGetterSetter; +import cpm.com.gskmtorange.xmlGetterSetter.Store_wise_camera_DataGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.T2PGetterSetter; import cpm.com.gskmtorange.xmlHandlers.FailureXMLHandler; @@ -80,9 +82,12 @@ public class UploadActivity extends AppCompatActivity { private SharedPreferences preferences; private int factor, k = 0; Object result = ""; - Toolbar toolbar; + ArrayList stockFacingPlanogramDataList; + + ArrayList storeWiseCameraDataGetterSetters; + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -847,10 +852,213 @@ public class UploadActivity extends AppCompatActivity { data.name = getString(R.string.t2p_data_uploading); publishProgress(data); + + //Stock Facing Planogram Tracker + String stock_facing_planogram_xml = ""; + onXML = ""; + stockFacingPlanogramDataList = db.getStockAndFacingPlanogramServerUploadData(coverageList.get(i).getStoreId()); + + if (stockFacingPlanogramDataList.size() > 0) { + + for (int i1 = 0; i1 < stockFacingPlanogramDataList.size(); i1++) { + onXML = "[STOCK_FACING_PLANOGRAM_DATA]" + + "[MID]" + mid + "[/MID]" + + "[USER_ID]" + userId + "[/USER_ID]" + + "[SKU_ID]" + Integer.parseInt(stockFacingPlanogramDataList.get(i1).getSku_id()) + "[/SKU_ID]" + //+ "[category_id]" + Integer.parseInt(stockFacingPlanogramDataList.get(i1).getCategory_id()) + "[/category_id]" + //+ "[company_id]" + Integer.parseInt(stockFacingPlanogramDataList.get(i1).getCompany_id()) + "[/company_id]" + //+ "[sub_category_id]" + Integer.parseInt(stockFacingPlanogramDataList.get(i1).getSub_category_id()) + "[/sub_category_id]" + + "[BRAND_ID]" + Integer.parseInt(stockFacingPlanogramDataList.get(i1).getBrand_id()) + "[/BRAND_ID]" + + "[SHELF_ID]" + Integer.parseInt(stockFacingPlanogramDataList.get(i1).getSp_addShelf_id()) + "[/SHELF_ID]" + + "[SHELF_POSITION]" + Integer.parseInt(stockFacingPlanogramDataList.get(i1).getSp_shelfPosition()) + "[/SHELF_POSITION]" + + "[CHECKBOX]" + Integer.parseInt(stockFacingPlanogramDataList.get(i1).getCheckbox_sku()) + "[/CHECKBOX]" + + "[/STOCK_FACING_PLANOGRAM_DATA]"; + + stock_facing_planogram_xml = stock_facing_planogram_xml + onXML; + } + + final String sos_xml = "[DATA]" + stock_facing_planogram_xml + "[/DATA]"; + + request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_UPLOAD_STOCK_XML_DATA); + request.addProperty("XMLDATA", sos_xml); + request.addProperty("KEYS", "STOCK_FACING_PLANOGRAM_DATA"); + request.addProperty("USERNAME", userId); + request.addProperty("MID", mid); + + envelope = new SoapSerializationEnvelope(SoapEnvelope.VER11); + envelope.dotNet = true; + envelope.setOutputSoapObject(request); + + androidHttpTransport = new HttpTransportSE(CommonString.URL); + androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_STOCK_XML_DATA, envelope); + + result = envelope.getResponse(); + + if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { + return CommonString.METHOD_UPLOAD_STOCK_XML_DATA; + } + + if (result.toString().equalsIgnoreCase(CommonString.KEY_NO_DATA)) { + return CommonString.METHOD_UPLOAD_STOCK_XML_DATA; + } + + if (result.toString().equalsIgnoreCase(CommonString.KEY_FAILURE)) { + return CommonString.METHOD_UPLOAD_STOCK_XML_DATA; + } + } + data.value = 50; + data.name = getString(R.string.stock_planogram_data_uploading); + publishProgress(data); + + + //Store Wise Camera + String store_wise_camera_xml = ""; + onXML = ""; + storeWiseCameraDataGetterSetters = db.getStoreWiseCameraServerUploadData(coverageList.get(i).getStoreId()); + + if (storeWiseCameraDataGetterSetters.size() > 0) { + + for (int i1 = 0; i1 < storeWiseCameraDataGetterSetters.size(); i1++) { + onXML = "[STORE_WISE_CAMERA_DATA]" + + "[MID]" + mid + "[/MID]" + + "[USER_ID]" + userId + "[/USER_ID]" + + "[CAMERA1]" + storeWiseCameraDataGetterSetters.get(i).getCamera1() + "[/CAMERA1]" + + "[CAMERA2]" + storeWiseCameraDataGetterSetters.get(i).getCamera2() + "[/CAMERA2]" + + "[CAMERA3]" + storeWiseCameraDataGetterSetters.get(i).getCamera3() + "[/CAMERA3]" + + "[CAMERA4]" + storeWiseCameraDataGetterSetters.get(i).getCamera4() + "[/CAMERA4]" + + "[/STORE_WISE_CAMERA_DATA]"; + + store_wise_camera_xml = store_wise_camera_xml + onXML; + } + + final String sos_xml = "[DATA]" + store_wise_camera_xml + "[/DATA]"; + + request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_UPLOAD_STOCK_XML_DATA); + request.addProperty("XMLDATA", sos_xml); + request.addProperty("KEYS", "STORE_WISE_CAMERA_DATA"); + request.addProperty("USERNAME", userId); + request.addProperty("MID", mid); + + envelope = new SoapSerializationEnvelope(SoapEnvelope.VER11); + envelope.dotNet = true; + envelope.setOutputSoapObject(request); + + androidHttpTransport = new HttpTransportSE(CommonString.URL); + androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_STOCK_XML_DATA, envelope); + + result = envelope.getResponse(); + + if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { + return CommonString.METHOD_UPLOAD_STOCK_XML_DATA; + } + + if (result.toString().equalsIgnoreCase(CommonString.KEY_NO_DATA)) { + return CommonString.METHOD_UPLOAD_STOCK_XML_DATA; + } + + if (result.toString().equalsIgnoreCase(CommonString.KEY_FAILURE)) { + return CommonString.METHOD_UPLOAD_STOCK_XML_DATA; + } + } + data.value = 55; + data.name = getString(R.string.stock_planogram_data_uploading); + publishProgress(data); + + //Image Upload + //Store Wise Camera Images Upload + if (storeWiseCameraDataGetterSetters.size() > 0) { + for (int i1 = 0; i1 < storeWiseCameraDataGetterSetters.size(); i1++) { + + if (storeWiseCameraDataGetterSetters.get(i1).getCamera1() != null && !storeWiseCameraDataGetterSetters.get(i1).getCamera1().equals("")) { + if (new File(CommonString.FILE_PATH + storeWiseCameraDataGetterSetters.get(i1).getCamera1()).exists()) { + + try { + result = UploadImage(storeWiseCameraDataGetterSetters.get(i1).getCamera1(), "StockCameraImages"); + + if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { + return "StockCameraImages"; + } + + runOnUiThread(new Runnable() { + public void run() { + message.setText("StockFacing Images Uploaded"); + } + }); + } catch (Exception e) { + e.printStackTrace(); + } + } + } + + if (storeWiseCameraDataGetterSetters.get(i1).getCamera2() != null && !storeWiseCameraDataGetterSetters.get(i1).getCamera2().equals("")) { + if (new File(CommonString.FILE_PATH + storeWiseCameraDataGetterSetters.get(i1).getCamera2()).exists()) { + + try { + result = UploadImage(storeWiseCameraDataGetterSetters.get(i1).getCamera2(), "StockCameraImages"); + + if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { + return "StockCameraImages"; + } + + runOnUiThread(new Runnable() { + public void run() { + message.setText("StockFacing Images Uploaded"); + } + }); + } catch (Exception e) { + e.printStackTrace(); + } + } + } + + if (storeWiseCameraDataGetterSetters.get(i1).getCamera3() != null && !storeWiseCameraDataGetterSetters.get(i1).getCamera3().equals("")) { + if (new File(CommonString.FILE_PATH + storeWiseCameraDataGetterSetters.get(i1).getCamera3()).exists()) { + + try { + result = UploadImage(storeWiseCameraDataGetterSetters.get(i1).getCamera3(), "StockCameraImages"); + + if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { + return "StockCameraImages"; + } + + runOnUiThread(new Runnable() { + public void run() { + message.setText("StockFacing Images Uploaded"); + } + }); + } catch (Exception e) { + e.printStackTrace(); + } + } + } + + if (storeWiseCameraDataGetterSetters.get(i1).getCamera4() != null && !storeWiseCameraDataGetterSetters.get(i1).getCamera4().equals("")) { + if (new File(CommonString.FILE_PATH + storeWiseCameraDataGetterSetters.get(i1).getCamera4()).exists()) { + + try { + result = UploadImage(storeWiseCameraDataGetterSetters.get(i1).getCamera4(), "StockCameraImages"); + + if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { + return "StockCameraImages"; + } + + runOnUiThread(new Runnable() { + public void run() { + message.setText("StockFacing Images Uploaded"); + } + }); + } catch (Exception e) { + e.printStackTrace(); + } + } + } + } + } + //Stock Facing Images Upload - if (stock_facingHeaderList.size() > 0) { + /*if (stock_facingHeaderList.size() > 0) { for (int i1 = 0; i1 < stock_facingHeaderList.size(); i1++) { if (stock_facingHeaderList.get(i1).getImage1() != null && !stock_facingHeaderList.get(i1).getImage1().equals("")) { @@ -894,9 +1102,10 @@ public class UploadActivity extends AppCompatActivity { } } } - } -//// ashish visibility image start + }*/ + + // ashish visibility image start if (additionalVisibilityList.size() > 0) { for (int i1 = 0; i1 < additionalVisibilityList.size(); i1++) { diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/ShelfMasterGetterSetter.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/ShelfMasterGetterSetter.java new file mode 100644 index 0000000..0761aa1 --- /dev/null +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/ShelfMasterGetterSetter.java @@ -0,0 +1,34 @@ +package cpm.com.gskmtorange.xmlGetterSetter; + +import java.util.ArrayList; + +public class ShelfMasterGetterSetter { + String table_SHELF_MASTER; + + ArrayList SHELF_ID = new ArrayList<>(); + ArrayList SHELF = new ArrayList<>(); + + public String getTable_SHELF_MASTER() { + return table_SHELF_MASTER; + } + + public void setTable_SHELF_MASTER(String table_SHELF_MASTER) { + this.table_SHELF_MASTER = table_SHELF_MASTER; + } + + public ArrayList getSHELF_ID() { + return SHELF_ID; + } + + public void setSHELF_ID(String SHELF_ID) { + this.SHELF_ID.add(SHELF_ID); + } + + public ArrayList getSHELF() { + return SHELF; + } + + public void setSHELF(String SHELF) { + this.SHELF.add(SHELF); + } +} diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/StockFacing_PlanogramTrackerDataGetterSetter.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/StockFacing_PlanogramTrackerDataGetterSetter.java new file mode 100644 index 0000000..bb0db8e --- /dev/null +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/StockFacing_PlanogramTrackerDataGetterSetter.java @@ -0,0 +1,185 @@ +package cpm.com.gskmtorange.xmlGetterSetter; + +import java.util.ArrayList; + +public class StockFacing_PlanogramTrackerDataGetterSetter { + String shelf_id, shelf, sp_addShelf_id, sp_addShelf, sp_shelfPosition, checkbox_sku; + String category_id, sub_category_id, sub_category, brand_id, brand, + sku_id, sku, mrp, sku_sequence, stock, facing, mbq, company_id, image1, image2, sos_target; + + public String getShelf_id() { + return shelf_id; + } + + public void setShelf_id(String shelf_id) { + this.shelf_id = shelf_id; + } + + public String getShelf() { + return shelf; + } + + public void setShelf(String shelf) { + this.shelf = shelf; + } + + public String getSp_addShelf_id() { + return sp_addShelf_id; + } + + public void setSp_addShelf_id(String sp_addShelf_id) { + this.sp_addShelf_id = sp_addShelf_id; + } + + public String getSp_addShelf() { + return sp_addShelf; + } + + public void setSp_addShelf(String sp_addShelf) { + this.sp_addShelf = sp_addShelf; + } + + public String getSp_shelfPosition() { + return sp_shelfPosition; + } + + public void setSp_shelfPosition(String sp_shelfPosition) { + this.sp_shelfPosition = sp_shelfPosition; + } + + public String getCategory_id() { + return category_id; + } + + public void setCategory_id(String category_id) { + this.category_id = category_id; + } + + public String getSub_category_id() { + return sub_category_id; + } + + public void setSub_category_id(String sub_category_id) { + this.sub_category_id = sub_category_id; + } + + public String getSub_category() { + return sub_category; + } + + public void setSub_category(String sub_category) { + this.sub_category = sub_category; + } + + public String getBrand_id() { + return brand_id; + } + + public void setBrand_id(String brand_id) { + this.brand_id = brand_id; + } + + public String getBrand() { + return brand; + } + + public void setBrand(String brand) { + this.brand = brand; + } + + public String getSku_id() { + return sku_id; + } + + public void setSku_id(String sku_id) { + this.sku_id = sku_id; + } + + public String getSku() { + return sku; + } + + public void setSku(String sku) { + this.sku = sku; + } + + public String getMrp() { + return mrp; + } + + public void setMrp(String mrp) { + this.mrp = mrp; + } + + public String getSku_sequence() { + return sku_sequence; + } + + public void setSku_sequence(String sku_sequence) { + this.sku_sequence = sku_sequence; + } + + public String getStock() { + return stock; + } + + public void setStock(String stock) { + this.stock = stock; + } + + public String getFacing() { + return facing; + } + + public void setFacing(String facing) { + this.facing = facing; + } + + public String getMbq() { + return mbq; + } + + public void setMbq(String mbq) { + this.mbq = mbq; + } + + public String getCompany_id() { + return company_id; + } + + public void setCompany_id(String company_id) { + this.company_id = company_id; + } + + public String getImage1() { + return image1; + } + + public void setImage1(String image1) { + this.image1 = image1; + } + + public String getImage2() { + return image2; + } + + public void setImage2(String image2) { + this.image2 = image2; + } + + public String getSos_target() { + return sos_target; + } + + public void setSos_target(String sos_target) { + this.sos_target = sos_target; + } + + public String getCheckbox_sku() { + return checkbox_sku; + } + + public void setCheckbox_sku(String checkbox_sku) { + this.checkbox_sku = checkbox_sku; + } +} diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/Stock_Facing_PlanogramTrackerGetterSetter.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/Stock_Facing_PlanogramTrackerGetterSetter.java new file mode 100644 index 0000000..8422f9f --- /dev/null +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/Stock_Facing_PlanogramTrackerGetterSetter.java @@ -0,0 +1,138 @@ +package cpm.com.gskmtorange.xmlGetterSetter; + +/** + * Created by gagang on 23-12-2016. + */ + +public class Stock_Facing_PlanogramTrackerGetterSetter { + String category_id, sub_category_id, sub_category, brand_id, brand, + sku_id, sku, mrp, sku_sequence, stock, facing, mbq, company_id, image1, image2, sos_target; + + public String getSub_category_id() { + return sub_category_id; + } + + public void setSub_category_id(String sub_category_id) { + this.sub_category_id = sub_category_id; + } + + public String getSub_category() { + return sub_category; + } + + public void setSub_category(String sub_category) { + this.sub_category = sub_category; + } + + public String getBrand_id() { + return brand_id; + } + + public void setBrand_id(String brand_id) { + this.brand_id = brand_id; + } + + public String getBrand() { + return brand; + } + + public void setBrand(String brand) { + this.brand = brand; + } + + public String getSku_id() { + return sku_id; + } + + public void setSku_id(String sku_id) { + this.sku_id = sku_id; + } + + public String getSku() { + return sku; + } + + public void setSku(String sku) { + this.sku = sku; + } + + public String getMrp() { + return mrp; + } + + public void setMrp(String mrp) { + this.mrp = mrp; + } + + public String getSku_sequence() { + return sku_sequence; + } + + public void setSku_sequence(String sku_sequence) { + this.sku_sequence = sku_sequence; + } + + public String getStock() { + return stock; + } + + public void setStock(String stock) { + this.stock = stock; + } + + public String getFacing() { + return facing; + } + + public void setFacing(String facing) { + this.facing = facing; + } + + public String getMbq() { + return mbq; + } + + public void setMbq(String mbq) { + this.mbq = mbq; + } + + public String getCompany_id() { + return company_id; + } + + public void setCompany_id(String company_id) { + this.company_id = company_id; + } + + public String getImage1() { + return image1; + } + + public void setImage1(String image1) { + this.image1 = image1; + } + + public String getImage2() { + return image2; + } + + public void setImage2(String image2) { + this.image2 = image2; + } + + public String getCategory_id() { + return category_id; + } + + public void setCategory_id(String category_id) { + this.category_id = category_id; + } + + public String getSos_target() { + return sos_target; + } + + public void setSos_target(String sos_target) { + this.sos_target = sos_target; + } +} diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/Store_wise_camera_DataGetterSetter.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/Store_wise_camera_DataGetterSetter.java new file mode 100644 index 0000000..f5faf4e --- /dev/null +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/Store_wise_camera_DataGetterSetter.java @@ -0,0 +1,65 @@ +package cpm.com.gskmtorange.xmlGetterSetter; + +/** + * Created by gagang on 06-01-2017. + */ + +public class Store_wise_camera_DataGetterSetter { + String store_id, category_id, camera1, camera2, camera3, camera4,checkSaveStatus; + + public String getStore_id() { + return store_id; + } + + public void setStore_id(String store_id) { + this.store_id = store_id; + } + + public String getCategory_id() { + return category_id; + } + + public void setCategory_id(String category_id) { + this.category_id = category_id; + } + + public String getCamera1() { + return camera1; + } + + public void setCamera1(String camera1) { + this.camera1 = camera1; + } + + public String getCamera2() { + return camera2; + } + + public void setCamera2(String camera2) { + this.camera2 = camera2; + } + + public String getCamera3() { + return camera3; + } + + public void setCamera3(String camera3) { + this.camera3 = camera3; + } + + public String getCamera4() { + return camera4; + } + + public void setCamera4(String camera4) { + this.camera4 = camera4; + } + + public String getCheckSaveStatus() { + return checkSaveStatus; + } + + public void setCheckSaveStatus(String checkSaveStatus) { + this.checkSaveStatus = checkSaveStatus; + } +} diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/TableBean.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/TableBean.java index be5ae84..b520c85 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/TableBean.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/TableBean.java @@ -24,7 +24,7 @@ public class TableBean { public static String STORE_PERFORMANCE; public static String MAPPING_PLANOGRAM; public static String MAPPING_SOS_TARGET; - + public static String SHELF_MASTER; public static String getAdditionalDisplay() { @@ -169,5 +169,13 @@ public class TableBean { MAPPING_SOS_TARGET = mappingSosTarget; } -//Gagan end code + public static String getShelfMaster() { + return SHELF_MASTER; + } + + public static void setShelfMaster(String shelfMaster) { + SHELF_MASTER = shelfMaster; + } + + //Gagan end code } 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 40aa50c..863482c 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlHandlers/XMLHandlers.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlHandlers/XMLHandlers.java @@ -22,6 +22,7 @@ import cpm.com.gskmtorange.xmlGetterSetter.MappingPromotionGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.MappingStockGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.NonWorkingReasonGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.STORE_PERFORMANCE_MasterGetterSetter; +import cpm.com.gskmtorange.xmlGetterSetter.ShelfMasterGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.SkuMasterGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.SubCategoryMasterGetterSetter; @@ -787,5 +788,31 @@ public class XMLHandlers { return st; } + public static ShelfMasterGetterSetter shelfMasterXMLHandler(XmlPullParser xpp, int eventType) { + ShelfMasterGetterSetter st = new ShelfMasterGetterSetter(); + + try { + while (xpp.getEventType() != XmlPullParser.END_DOCUMENT) { + if (xpp.getEventType() == XmlPullParser.START_TAG) { + + if (xpp.getName().equals("META_DATA")) { + st.setTable_SHELF_MASTER(xpp.nextText()); + } + if (xpp.getName().equals("SHELF_ID")) { + st.setSHELF_ID(xpp.nextText()); + } + if (xpp.getName().equals("SHELF")) { + st.setSHELF(xpp.nextText()); + } + } + xpp.next(); + } + } catch (XmlPullParserException e) { + e.printStackTrace(); + } catch (IOException e) { + e.printStackTrace(); + } + return st; + } } diff --git a/GSKMTOrange/src/main/res/drawable/bg_boarder_orange.xml b/GSKMTOrange/src/main/res/drawable/bg_boarder_orange.xml new file mode 100644 index 0000000..5944613 --- /dev/null +++ b/GSKMTOrange/src/main/res/drawable/bg_boarder_orange.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/GSKMTOrange/src/main/res/drawable/bg_boarder_orange_transparent.xml b/GSKMTOrange/src/main/res/drawable/bg_boarder_orange_transparent.xml new file mode 100644 index 0000000..6ee88bc --- /dev/null +++ b/GSKMTOrange/src/main/res/drawable/bg_boarder_orange_transparent.xml @@ -0,0 +1,11 @@ + + + + + + + + \ No newline at end of file diff --git a/GSKMTOrange/src/main/res/drawable/layout_click_background_effect.xml b/GSKMTOrange/src/main/res/drawable/layout_click_background_effect.xml new file mode 100644 index 0000000..8a37946 --- /dev/null +++ b/GSKMTOrange/src/main/res/drawable/layout_click_background_effect.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/GSKMTOrange/src/main/res/layout/activity_stock_facing__planogram_tracker.xml b/GSKMTOrange/src/main/res/layout/activity_stock_facing__planogram_tracker.xml new file mode 100644 index 0000000..975cfcb --- /dev/null +++ b/GSKMTOrange/src/main/res/layout/activity_stock_facing__planogram_tracker.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + diff --git a/GSKMTOrange/src/main/res/layout/content_stock_facing.xml b/GSKMTOrange/src/main/res/layout/content_stock_facing.xml index 75e9fe9..7a17284 100644 --- a/GSKMTOrange/src/main/res/layout/content_stock_facing.xml +++ b/GSKMTOrange/src/main/res/layout/content_stock_facing.xml @@ -24,21 +24,123 @@ android:text="Stock Facing" android:textAppearance="?android:attr/textAppearanceMedium" android:textColor="@android:color/black" - android:visibility="gone"/> + android:visibility="gone" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + android:orientation="vertical" + android:padding="5dp"> + android:orientation="vertical" + android:padding="5dp"> + android:orientation="vertical" + android:padding="5dp"> + + + + + + + +