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 50c98df..5005ef1 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java @@ -1885,21 +1885,23 @@ public class GSKOrangeDB extends SQLiteOpenHelper { Cursor dbcursor = null; try { - dbcursor = db.rawQuery("Select * from Stock_Facing_Header_Data " + - "where Store_Id='" + store_id + "'", null); + dbcursor = db.rawQuery("Select H.BRAND_ID, H.IMAGE1, H.IMAGE2, C.SKU_ID, C.STOCK_VALUE, C.FACEUP_VALUE " + + "from Stock_Facing_Header_Data H " + + "INNER JOIN Stock_Facing_Child_Data C " + + "ON H.STORE_ID = C.STORE_ID AND H.CATEGORY_ID = C.CATEGORY_ID AND H.BRAND_ID = C.BRAND_ID " + + "WHERE H.STORE_ID = '" + store_id + "'", null); if (dbcursor != null) { dbcursor.moveToFirst(); while (!dbcursor.isAfterLast()) { Stock_FacingGetterSetter cd = new Stock_FacingGetterSetter(); - cd.setCategory_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("Category_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"))); cd.setImage1(dbcursor.getString(dbcursor.getColumnIndexOrThrow("IMAGE1"))); cd.setImage2(dbcursor.getString(dbcursor.getColumnIndexOrThrow("IMAGE2"))); + cd.setSku_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SKU_ID"))); + cd.setStock(dbcursor.getString(dbcursor.getColumnIndexOrThrow("STOCK_VALUE"))); + cd.setFacing(dbcursor.getString(dbcursor.getColumnIndexOrThrow("FACEUP_VALUE"))); list.add(cd); dbcursor.moveToNext(); @@ -1914,7 +1916,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper { return list; } - public ArrayList getStockAndFacingSKUServerUploadData(String category_id, String brand_id) { + /*public ArrayList getStockAndFacingSKUServerUploadData(String category_id, String brand_id) { ArrayList list = new ArrayList<>(); Cursor dbcursor = null; @@ -1948,7 +1950,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper { return list; } return list; - } + }*/ //Promo Compliance Promotion Data public ArrayList getPromoComplianceSkuServerUploadData(String store_id) { @@ -2250,10 +2252,6 @@ public class GSKOrangeDB extends SQLiteOpenHelper { } - - - - public void deleteStockEntryMainTable(String storeid, String categoryid) { try { @@ -2268,14 +2266,6 @@ public class GSKOrangeDB extends SQLiteOpenHelper { } - - - - - - - - public ArrayList getBrandMasterData(String store_id) { Cursor cursordata = null; ArrayList Data = new ArrayList(); @@ -2871,6 +2861,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper { values.put("KEYACCOUNT_ID", data.getKEYACCOUNT_ID().get(i)); values.put("STORETYPE_ID", data.getSTORETYPE_ID().get(i)); values.put("CLASS_ID", data.getCLASS_ID().get(i)); + values.put("CATEGORY_ID", data.getCATEGORY_ID().get(i)); values.put("PLANOGRAM_IMAGE", data.getPLANOGRAM_IMAGE().get(i)); values.put("IMAGE_PATH", data.getIMAGE_PATH().get(i)); @@ -2885,7 +2876,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper { ArrayList list = new ArrayList<>(); Cursor dbcursor = null; try { - dbcursor = db.rawQuery("SELECT * FROM MAPPING_PLANOGRAM", null); + dbcursor = db.rawQuery("SELECT * FROM MAPPING_PLANOGRAM where CATEGORY_ID='" + category_id + "'", null); if (dbcursor != null) { dbcursor.moveToFirst(); @@ -2895,6 +2886,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper { mp.setKEYACCOUNT_ID(dbcursor.getString(dbcursor.getColumnIndexOrThrow("KEYACCOUNT_ID"))); mp.setSTORETYPE_ID(dbcursor.getString(dbcursor.getColumnIndexOrThrow("STORETYPE_ID"))); mp.setCLASS_ID(dbcursor.getString(dbcursor.getColumnIndexOrThrow("CLASS_ID"))); + mp.setCATEGORY_ID(dbcursor.getString(dbcursor.getColumnIndexOrThrow("CATEGORY_ID"))); mp.setPLANOGRAM_IMAGE(dbcursor.getString(dbcursor.getColumnIndexOrThrow("PLANOGRAM_IMAGE"))); mp.setIMAGE_PATH(dbcursor.getString(dbcursor.getColumnIndexOrThrow("IMAGE_PATH"))); 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 45584f5..ed5352b 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 @@ -716,11 +716,9 @@ public class Stock_FacingActivity extends AppCompatActivity { dialog.getWindow().setLayout(WindowManager.LayoutParams.MATCH_PARENT, WindowManager.LayoutParams.MATCH_PARENT); dialog.setCancelable(false); - ArrayList mp = db.getMappingPlanogramData(""); + ArrayList mappingPlanogramList = db.getMappingPlanogramData(categoryId); //ImageView img_planogram = (ImageView) dialog.findViewById(R.id.img_planogram); - setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE); - WebView webView = (WebView) dialog.findViewById(R.id.webview); webView.setWebViewClient(new MyWebViewClient()); @@ -728,22 +726,28 @@ public class Stock_FacingActivity extends AppCompatActivity { webView.getSettings().setJavaScriptEnabled(true); webView.getSettings().setBuiltInZoomControls(true); - String planogram_image = mp.get(0).getPLANOGRAM_IMAGE(); - if (new File(str + planogram_image).exists()) { - Bitmap bmp = BitmapFactory.decodeFile(str + planogram_image); - // img_planogram.setRotation(90); - //img_planogram.setImageBitmap(bmp); + String planogram_image = ""; + if (mappingPlanogramList.size() > 0) { + planogram_image = mappingPlanogramList.get(0).getPLANOGRAM_IMAGE(); + } + if (!planogram_image.equals("")) { + if (new File(str + planogram_image).exists()) { + Bitmap bmp = BitmapFactory.decodeFile(str + planogram_image); + // img_planogram.setRotation(90); + //img_planogram.setImageBitmap(bmp); + setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE); - String imagePath = "file://" + CommonString.FILE_PATH + "/" + planogram_image; - String html = ""; - webView.loadDataWithBaseURL("", html, "text/html", "utf-8", ""); + String imagePath = "file://" + CommonString.FILE_PATH + "/" + planogram_image; + String html = ""; + webView.loadDataWithBaseURL("", html, "text/html", "utf-8", ""); - dialog.show(); - } /*else { + dialog.show(); + } /*else { //webView.loadUrl(String.valueOf(R.drawable.sad_cloud)); //img_planogram.setBackgroundResource(R.drawable.sad_cloud); }*/ + } ImageView cancel = (ImageView) dialog.findViewById(R.id.img_cancel); 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 f5eef55..3d1cd91 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java @@ -262,7 +262,7 @@ public class UploadActivity extends AppCompatActivity { SoapSerializationEnvelope envelope = new SoapSerializationEnvelope(SoapEnvelope.VER11); envelope.dotNet = true; envelope.setOutputSoapObject(request); - + HttpTransportSE androidHttpTransport = new HttpTransportSE(CommonString.URL); androidHttpTransport.call(CommonString.SOAP_ACTION_UPLOAD_STORE_COVERAGE, envelope); @@ -342,21 +342,23 @@ public class UploadActivity extends AppCompatActivity { //Stock and Facing - String stock_facing_xml = ""; + /*String stock_facing_xml = ""; onXML = ""; stock_facingHeaderList = db.getStockAndFacingHeaderServerUploadData(coverageList.get(i).getStoreId()); if (stock_facingHeaderList.size() > 0) { for (int i1 = 0; i1 < stock_facingHeaderList.size(); i1++) { + String stockChildXML = ""; + if (!stock_facingHeaderList.get(i1).getCategory_id().equals("0")) { stock_facingChildList = db.getStockAndFacingSKUServerUploadData( stock_facingHeaderList.get(i1).getCategory_id(), stock_facingHeaderList.get(i1).getBrand_id()); - String stockChildXML = ""; + String onXML1 = ""; for (int j = 0; j < stock_facingChildList.size(); j++) { - stockChildXML = "[STOCK_FACING_DATA]" + onXML1 = "[STOCK_FACING_DATA]" + "[MID]" + mid + "[/MID]" + "[USER_ID]" + userId + "[/USER_ID]" + "[CATEGORY_ID]" + Integer.parseInt(stock_facingHeaderList.get(i1).getCategory_id()) + "[/CATEGORY_ID]" @@ -370,10 +372,64 @@ public class UploadActivity extends AppCompatActivity { + "[FACEUP]" + Integer.parseInt(stock_facingChildList.get(j).getFacing()) + "[/FACEUP]" + "[/STOCK_FACING_DATA]"; - onXML = onXML + stockChildXML; + stockChildXML = stockChildXML + onXML1; } - stock_facing_xml = stock_facing_xml + onXML; } + stock_facing_xml = stock_facing_xml + stockChildXML; + } + + final String sos_xml = "[DATA]" + stock_facing_xml + "[/DATA]"; + + request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_UPLOAD_STOCK_XML_DATA); + request.addProperty("XMLDATA", sos_xml); + request.addProperty("KEYS", "STOCK_FACING_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 = 20; + data.name = "Stock Facing Uploading"; + publishProgress(data);*/ + + String stock_facing_xml = ""; + onXML = ""; + stock_facingHeaderList = db.getStockAndFacingHeaderServerUploadData(coverageList.get(i).getStoreId()); + + if (stock_facingHeaderList.size() > 0) { + + for (int i1 = 0; i1 < stock_facingHeaderList.size(); i1++) { + onXML = "[STOCK_FACING_DATA]" + + "[MID]" + mid + "[/MID]" + + "[USER_ID]" + userId + "[/USER_ID]" + + "[BRAND_ID]" + Integer.parseInt(stock_facingHeaderList.get(i1).getBrand_id()) + "[/BRAND_ID]" + + "[IAMGE1]" + stock_facingHeaderList.get(i1).getImage1() + "[/IAMGE1]" + + "[IAMGE2]" + stock_facingHeaderList.get(i1).getImage2() + "[/IAMGE2]" + + "[SKU_ID]" + Integer.parseInt(stock_facingHeaderList.get(i1).getSku_id()) + "[/SKU_ID]" + + "[STOCK]" + Integer.parseInt(stock_facingHeaderList.get(i1).getStock()) + "[/STOCK]" + + "[FACEUP]" + Integer.parseInt(stock_facingHeaderList.get(i1).getFacing()) + "[/FACEUP]" + + "[/STOCK_FACING_DATA]"; + + stock_facing_xml = stock_facing_xml + onXML; } final String sos_xml = "[DATA]" + stock_facing_xml + "[/DATA]"; @@ -548,24 +604,24 @@ public class UploadActivity extends AppCompatActivity { for (int k = 0; k < additionalVisibilitySkuList.size(); k++) { - onXMLdIALOG = "[VISIBILITY_DAILOG]" - + "[MID]" + mid + "[/MID]" - + "[USER_ID]" - + userId - + "[/USER_ID]" - + "[KEY_ID]" - + additionalVisibilitySkuList.get(k).getCOMMON_ID() - + "[/KEY_ID]" - + "[CATEGORY_ID]" - + additionalVisibilitySkuList.get(k).getCategoryId() - + "[/CATEGORY_ID]" - + "[SKU_ID]" - + additionalVisibilitySkuList.get(k).getSku_id() - + "[/SKU_ID]" - + "[QUANTITY]" - + additionalVisibilitySkuList.get(k).getQuantity() - + "[/QUANTITY]" - + "[/VISIBILITY_DAILOG]"; + onXMLdIALOG = "[VISIBILITY_DAILOG]" + + "[MID]" + mid + "[/MID]" + + "[USER_ID]" + + userId + + "[/USER_ID]" + + "[KEY_ID]" + + additionalVisibilitySkuList.get(k).getCOMMON_ID() + + "[/KEY_ID]" + + "[CATEGORY_ID]" + + additionalVisibilitySkuList.get(k).getCategoryId() + + "[/CATEGORY_ID]" + + "[SKU_ID]" + + additionalVisibilitySkuList.get(k).getSku_id() + + "[/SKU_ID]" + + "[QUANTITY]" + + additionalVisibilitySkuList.get(k).getQuantity() + + "[/QUANTITY]" + + "[/VISIBILITY_DAILOG]"; additional_visibility_dialog_xml = additional_visibility_dialog_xml + onXMLdIALOG; @@ -601,11 +657,11 @@ public class UploadActivity extends AppCompatActivity { + "[/ADDITIONAL_VISIBILITY_DATA]"; - additional_visibility_data_xml = additional_visibility_data_xml + onXML; - KeyID=""; - additionalVisibilitySkuList.clear(); + additional_visibility_data_xml = additional_visibility_data_xml + onXML; + KeyID = ""; + additionalVisibilitySkuList.clear(); - additional_visibility_dialog_xml=""; + additional_visibility_dialog_xml = ""; } diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/MAPPING_PLANOGRAM_DataGetterSetter.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/MAPPING_PLANOGRAM_DataGetterSetter.java index e6c0b90..99581ea 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/MAPPING_PLANOGRAM_DataGetterSetter.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/MAPPING_PLANOGRAM_DataGetterSetter.java @@ -7,7 +7,7 @@ import java.util.ArrayList; */ public class MAPPING_PLANOGRAM_DataGetterSetter { - String KEYACCOUNT_ID, STORETYPE_ID, CLASS_ID, PLANOGRAM_IMAGE, IMAGE_PATH; + String KEYACCOUNT_ID, STORETYPE_ID, CLASS_ID, PLANOGRAM_IMAGE, IMAGE_PATH,CATEGORY_ID; public String getKEYACCOUNT_ID() { return KEYACCOUNT_ID; @@ -48,4 +48,12 @@ public class MAPPING_PLANOGRAM_DataGetterSetter { public void setIMAGE_PATH(String IMAGE_PATH) { this.IMAGE_PATH = IMAGE_PATH; } + + public String getCATEGORY_ID() { + return CATEGORY_ID; + } + + public void setCATEGORY_ID(String CATEGORY_ID) { + this.CATEGORY_ID = CATEGORY_ID; + } } diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/MAPPING_PLANOGRAM_MasterGetterSetter.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/MAPPING_PLANOGRAM_MasterGetterSetter.java index a68788d..12671d3 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/MAPPING_PLANOGRAM_MasterGetterSetter.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/MAPPING_PLANOGRAM_MasterGetterSetter.java @@ -11,6 +11,7 @@ public class MAPPING_PLANOGRAM_MasterGetterSetter { ArrayList KEYACCOUNT_ID = new ArrayList<>(); ArrayList STORETYPE_ID = new ArrayList<>(); + ArrayList CATEGORY_ID = new ArrayList<>(); ArrayList CLASS_ID = new ArrayList<>(); ArrayList PLANOGRAM_IMAGE = new ArrayList<>(); ArrayList IMAGE_PATH = new ArrayList<>(); @@ -62,4 +63,12 @@ public class MAPPING_PLANOGRAM_MasterGetterSetter { public void setIMAGE_PATH(String IMAGE_PATH) { this.IMAGE_PATH.add(IMAGE_PATH); } + + public ArrayList getCATEGORY_ID() { + return CATEGORY_ID; + } + + public void setCATEGORY_ID(String CATEGORY_ID) { + this.CATEGORY_ID.add(CATEGORY_ID); + } } diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlHandlers/XMLHandlers.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlHandlers/XMLHandlers.java index a92fe34..8839e95 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlHandlers/XMLHandlers.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlHandlers/XMLHandlers.java @@ -696,6 +696,9 @@ public class XMLHandlers { if (xpp.getName().equals("CLASS_ID")) { st.setCLASS_ID(xpp.nextText()); } + if (xpp.getName().equals("CATEGORY_ID")) { + st.setCATEGORY_ID(xpp.nextText()); + } if (xpp.getName().equals("PLANOGRAM_IMAGE")) { st.setPLANOGRAM_IMAGE(xpp.nextText()); }