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 49f0e7c..70637a7 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java @@ -296,14 +296,14 @@ public class UploadActivity extends AppCompatActivity { db.updateStoreStatusOnLeave(coverageList.get(i).getStoreId(), date, CommonString.KEY_P); } else { - return CommonString.METHOD_UPLOAD_COVERAGE; + continue; + //return CommonString.METHOD_UPLOAD_COVERAGE; } - mid = Integer.parseInt((words[1])); //MSL_Availability - String mslAvailability_xml = ""; + /*String mslAvailability_xml = ""; onXML = ""; msl_availabilityList = db.getMSL_AvailabilityUploadServerData(coverageList.get(i).getStoreId()); @@ -357,72 +357,7 @@ public class UploadActivity extends AppCompatActivity { } data.value = 10; data.name = getString(R.string.availability_data_uploading); - publishProgress(data); - - - //MSL_Availability_StockFacing - String mslAvailability_stockFacing_xml = ""; - onXML = ""; - msl_availabilityStockFacingList = db.getMSL_Availability_StockFacing_UploadServerData(coverageList.get(i).getStoreId()); - - if (msl_availabilityStockFacingList.size() > 0) { - for (int j = 0; j < msl_availabilityStockFacingList.size(); j++) { - if (!msl_availabilityStockFacingList.get(j).getSku_id().equals("0")) { - - String stock; - if (!msl_availabilityStockFacingList.get(j).getStock().equals("")) { - stock = msl_availabilityStockFacingList.get(j).getStock(); - } else { - stock = "0"; - } - onXML = "[MSL_AVAILABILITY_STOCK_FACING_DATA]" - + "[MID]" + mid + "[/MID]" - + "[USER_ID]" + userId + "[/USER_ID]" - //+ "[CATEGORY_ID]" + Integer.parseInt(msl_availabilityStockFacingList.get(j).getCategory_id()) + "[/CATEGORY_ID]" - //+ "[BRAND_ID]" + Integer.parseInt(msl_availabilityStockFacingList.get(j).getBrand_id()) + "[/BRAND_ID]" - + "[SKU_ID]" + Integer.parseInt(msl_availabilityStockFacingList.get(j).getSku_id()) + "[/SKU_ID]" - + "[MBQ]" + Integer.parseInt(msl_availabilityStockFacingList.get(j).getMbq()) + "[/MBQ]" - + "[AVAILABILITY]" + Integer.parseInt(msl_availabilityStockFacingList.get(j).getToggleValue()) + "[/AVAILABILITY]" - + "[FACING]" + Integer.parseInt(msl_availabilityStockFacingList.get(j).getFacing()) + "[/FACING]" - + "[STOCK]" + Integer.parseInt(stock) + "[/STOCK]" + - "[/MSL_AVAILABILITY_STOCK_FACING_DATA]"; - - mslAvailability_stockFacing_xml = mslAvailability_stockFacing_xml + onXML; - } - } - - final String sos_xml = "[DATA]" + mslAvailability_stockFacing_xml + "[/DATA]"; - - request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_UPLOAD_STOCK_XML_DATA); - request.addProperty("XMLDATA", sos_xml); - request.addProperty("KEYS", "MSL_AVAILABILITY_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 = 15; - data.name = getString(R.string.availability_data_uploading); - publishProgress(data); + publishProgress(data);*/ //Stock and Facing @@ -430,75 +365,6 @@ public class UploadActivity extends AppCompatActivity { 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 onXML1 = ""; - for (int j = 0; j < stock_facingChildList.size(); j++) { - - onXML1 = "[STOCK_FACING_DATA]" - + "[MID]" + mid + "[/MID]" - + "[USER_ID]" + userId + "[/USER_ID]" - + "[CATEGORY_ID]" + Integer.parseInt(stock_facingHeaderList.get(i1).getCategory_id()) + "[/CATEGORY_ID]" - + "[SUB_CATEGORY_ID]" + Integer.parseInt(stock_facingHeaderList.get(i1).getSub_category_id()) + "[/SUB_CATEGORY_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_facingChildList.get(j).getSku_id()) + "[/SKU_ID]" - //+ "[SKU]" + stock_facingChildList.get(j).getSku() + "[/SKU]" - + "[STOCK]" + Integer.parseInt(stock_facingChildList.get(j).getStock()) + "[/STOCK]" - + "[FACEUP]" + Integer.parseInt(stock_facingChildList.get(j).getFacing()) + "[/FACEUP]" - + "[/STOCK_FACING_DATA]"; - - stockChildXML = stockChildXML + onXML1; - } - } - 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++) { @@ -547,6 +413,61 @@ public class UploadActivity extends AppCompatActivity { } data.value = 20; data.name = getString(R.string.stock_data_uploading); + publishProgress(data);*/ + + + //MSL_Availability_StockFacing + String mslAvailability_stockFacing_xml = ""; + onXML = ""; + msl_availabilityStockFacingList = db.getMSL_Availability_StockFacing_UploadServerData(coverageList.get(i).getStoreId()); + + if (msl_availabilityStockFacingList.size() > 0) { + for (int j = 0; j < msl_availabilityStockFacingList.size(); j++) { + if (!msl_availabilityStockFacingList.get(j).getSku_id().equals("0")) { + + String stock; + if (!msl_availabilityStockFacingList.get(j).getStock().equals("")) { + stock = msl_availabilityStockFacingList.get(j).getStock(); + } else { + stock = "0"; + } + onXML = "[MSL_AVAILABILITY_STOCK_FACING_DATA]" + + "[MID]" + mid + "[/MID]" + + "[USER_ID]" + userId + "[/USER_ID]" + + "[SKU_ID]" + Integer.parseInt(msl_availabilityStockFacingList.get(j).getSku_id()) + "[/SKU_ID]" + + "[MBQ]" + Integer.parseInt(msl_availabilityStockFacingList.get(j).getMbq()) + "[/MBQ]" + + "[AVAILABILITY]" + Integer.parseInt(msl_availabilityStockFacingList.get(j).getToggleValue()) + "[/AVAILABILITY]" + + "[FACING]" + Integer.parseInt(msl_availabilityStockFacingList.get(j).getFacing()) + "[/FACING]" + + "[STOCK]" + Integer.parseInt(stock) + "[/STOCK]" + + "[/MSL_AVAILABILITY_STOCK_FACING_DATA]"; + + mslAvailability_stockFacing_xml = mslAvailability_stockFacing_xml + onXML; + } + } + + final String sos_xml = "[DATA]" + mslAvailability_stockFacing_xml + "[/DATA]"; + + request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_UPLOAD_STOCK_XML_DATA); + request.addProperty("XMLDATA", sos_xml); + request.addProperty("KEYS", "MSL_AVAILABILITY_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; + }*/ + } + data.value = 15; + data.name = getString(R.string.availability_data_uploading); publishProgress(data); @@ -592,17 +513,9 @@ public class UploadActivity extends AppCompatActivity { result = envelope.getResponse(); - if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { + /*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 = 30; data.name = getString(R.string.promo_data_uploading); @@ -651,25 +564,15 @@ public class UploadActivity extends AppCompatActivity { result = envelope.getResponse(); - if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { + /*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 = 35; data.name = getString(R.string.additional_data_uploading); publishProgress(data); - ////ashish open - //Additional Visibility Data String additional_visibility_data_xml = ""; String additional_visibility_dialog_xml = ""; @@ -707,20 +610,6 @@ public class UploadActivity extends AppCompatActivity { if (additionalVisibilitySkuList.size() > 0) { for (int k = 0; k < additionalVisibilitySkuList.size(); k++) { - /*String sku_id = ""; - if (!additionalVisibilitySkuList.get(k).getSku_id().equals("")) { - sku_id = additionalVisibilitySkuList.get(k).getSku_id(); - } - - 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]" + sku_id + "[/SKU_ID]" - + "[QUANTITY]" + additionalVisibilitySkuList.get(k).getQuantity() + "[/QUANTITY]" - + "[/VISIBILITY_DAILOG]";*/ - onXMLdIALOG = "[VISIBILITY_DAILOG]" + "[MID]" + mid + "[/MID]" + "[USER_ID]" + userId + "[/USER_ID]" @@ -740,7 +629,7 @@ public class UploadActivity extends AppCompatActivity { + "[KEY_ID]" + additionalVisibilityList.get(J).getKey_id() + "[/KEY_ID]" + "[CATEGORY_ID]" + additionalVisibilityList.get(J).getCategoryId() + "[/CATEGORY_ID]" + "[ADDITIONAL_DISPLAY]" + additionalVisibilityList.get(J).getBtn_toogle() + "[/ADDITIONAL_DISPLAY]" - /* + "[BRAND_ID]"+ additionalVisibilityList.get(J).getBrand_id()+ "[/BRAND_ID]"*/ + //+ "[BRAND_ID]"+ additionalVisibilityList.get(J).getBrand_id()+ "[/BRAND_ID]" + "[IMAGE_URL]" + imageV1 /*additionalVisibilityList.get(J).getImage()*/ + "[/IMAGE_URL]" + "[IMAGE_URL1]" + imageV2 /*additionalVisibilityList.get(J).getImage2()*/ + "[/IMAGE_URL1]" + "[IMAGE_URL2]" + imageV3 /*additionalVisibilityList.get(J).getImage3()*/ + "[/IMAGE_URL2]" @@ -757,6 +646,7 @@ public class UploadActivity extends AppCompatActivity { } final String sos_xml = "[DATA]" + additional_visibility_data_xml + "[/DATA]"; + request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_UPLOAD_STOCK_XML_DATA); request.addProperty("XMLDATA", sos_xml); request.addProperty("KEYS", "ADDITIONAL_VISIBILITY_NEW"); @@ -772,27 +662,16 @@ public class UploadActivity extends AppCompatActivity { result = envelope.getResponse(); - if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { + /*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 = 35; + data.value = 45; data.name = getString(R.string.additional_data_uploading); publishProgress(data); - /////ashish close //T2p Upload Data - String t2p_data_xml = ""; onXML = ""; t2PGetterSetters = db.getT2pComplianceData(coverageList.get(i).getStoreId(), null); @@ -807,14 +686,12 @@ public class UploadActivity extends AppCompatActivity { String gaps_child; for (int l = 0; l < gapsList.size(); l++) { - String present = ""; if (gapsList.get(l).isPresent()) { present = "1"; } else { present = "0"; } - gaps_child = "[GAPS]" + "[MID]" + mid + "[/MID]" + "[USER_ID]" + userId + "[/USER_ID]" @@ -830,7 +707,6 @@ public class UploadActivity extends AppCompatActivity { String sku_child; for (int k = 0; k < skuList.size(); k++) { - sku_child = "[SKU]" + "[MID]" + mid + "[/MID]" + "[USER_ID]" + userId + "[/USER_ID]" @@ -849,12 +725,11 @@ public class UploadActivity extends AppCompatActivity { if (brandList.size() > 0) { for (int M = 0; M < brandList.size(); M++) { - brandchild = "[BRAND]" + "[MID]" + mid + "[/MID]" + "[USER_ID]" + userId + "[/USER_ID]" + "[BRAND_ID]" + brandList.get(M).getBRAND_ID() + "[/BRAND_ID]" - /* + "[BRAND]" + brandList.get(M).getBRAND() + "[/BRAND]"*/ + // + "[BRAND]" + brandList.get(M).getBRAND() + "[/BRAND]" + "[COMMON_ID]" + Integer.parseInt(t2PGetterSetters.get(i1).getKey_id()) + "[/COMMON_ID]" + "[/BRAND]"; brandxml = brandxml + brandchild; @@ -881,11 +756,9 @@ public class UploadActivity extends AppCompatActivity { + "[GAPS_DATA]" + gaps_xml + "[/GAPS_DATA]" + "[SKU_DATA]" + sku_xml + "[/SKU_DATA]" + "[BRAND_DATA]" + brandxml + "[/BRAND_DATA]" - + "[/T2P_DATA]"; t2p_data_xml = t2p_data_xml + onXML; - } final String t2p_final_xml = "[DATA]" + t2p_data_xml + "[/DATA]"; @@ -905,20 +778,11 @@ public class UploadActivity extends AppCompatActivity { result = envelope.getResponse(); - if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { + /*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 = 40; + data.value = 50; data.name = getString(R.string.t2p_data_uploading); publishProgress(data); @@ -964,232 +828,26 @@ public class UploadActivity extends AppCompatActivity { result = envelope.getResponse(); - if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { + /*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.value = 55; 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) { - for (int i1 = 0; i1 < stock_facingHeaderList.size(); i1++) { - - if (stock_facingHeaderList.get(i1).getImage1() != null && !stock_facingHeaderList.get(i1).getImage1().equals("")) { - if (new File(CommonString.FILE_PATH + stock_facingHeaderList.get(i1).getImage1()).exists()) { - - try { - result = UploadImage(stock_facingHeaderList.get(i1).getImage1(), "StockImages"); - - if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { - return "StockImages"; - } - - runOnUiThread(new Runnable() { - public void run() { - message.setText("StockFacing Images Uploaded"); - } - }); - } catch (Exception e) { - e.printStackTrace(); - } - } - } - - if (stock_facingHeaderList.get(i1).getImage2() != null && !stock_facingHeaderList.get(i1).getImage2().equals("")) { - if (new File(CommonString.FILE_PATH + stock_facingHeaderList.get(i1).getImage2()).exists()) { - - try { - result = UploadImage(stock_facingHeaderList.get(i1).getImage2(), "StockImages"); - if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { - return "StockImages"; - } - - runOnUiThread(new Runnable() { - public void run() { - message.setText("StockFacing Images Uploaded"); - } - }); - } catch (Exception e) { - e.printStackTrace(); - } - } - } - } - }*/ - - //Category Picture Data String Category_xml = ""; - onXML = ""; String onCategoryList = ""; String CategoryLISTDATA = ""; String image1, image2, image3, image4; - adddata = db.getCategoryPictureUpload(coverageList.get(i).getStoreId()); if (adddata.size() > 0) { for (int J = 0; J < adddata.size(); J++) { - - if (adddata.get(J).getCategoryImage1() == null) { image1 = ""; } else { @@ -1214,77 +872,40 @@ public class UploadActivity extends AppCompatActivity { image4 = adddata.get(J).getCategoryImage4(); } - String KeyID = adddata.get(J).getKEY_ID(); - listdat = db.getCategoryPictureListUploaded(KeyID); if (listdat.size() > 0) { - for (int k = 0; k < listdat.size(); k++) { - onCategoryList = "[SUB_CATEGORY_LIST]" + "[MID]" + mid + "[/MID]" - + "[USER_ID]" - + userId - + "[/USER_ID]" - + "[KEY_ID]" - + listdat.get(k).getCOMMON_ID() - + "[/KEY_ID]" - + "[SUB_CATEGORY_ID]" - + listdat.get(k).getSUB_CATEGORY_ID() - + "[/SUB_CATEGORY_ID]" - + "[SUB_CategoryImage1]" - + listdat.get(k).getSubCategoryCamera1() - + "[/SUB_CategoryImage1]" - + "[SUB_CategoryImage2]" - + listdat.get(k).getSubCategoryCamera2() - + "[/SUB_CategoryImage2]" + + "[USER_ID]" + userId + "[/USER_ID]" + + "[KEY_ID]" + listdat.get(k).getCOMMON_ID() + "[/KEY_ID]" + + "[SUB_CATEGORY_ID]" + listdat.get(k).getSUB_CATEGORY_ID() + "[/SUB_CATEGORY_ID]" + + "[SUB_CategoryImage1]" + listdat.get(k).getSubCategoryCamera1() + "[/SUB_CategoryImage1]" + + "[SUB_CategoryImage2]" + listdat.get(k).getSubCategoryCamera2() + "[/SUB_CategoryImage2]" + "[/SUB_CATEGORY_LIST]"; CategoryLISTDATA = CategoryLISTDATA + onCategoryList; - } } onXML = "[CATEGORY_LIST]" + "[MID]" + mid + "[/MID]" - + "[USER_ID]" - + userId - + "[/USER_ID]" - + "[KEY_ID]" - + adddata.get(J).getKEY_ID() - + "[/KEY_ID]" - + "[CATEGORY_ID]" - + adddata.get(J).getCategoryId() - + "[/CATEGORY_ID]" - + "[CAMERA_ALLOW]" - + adddata.get(J).getCamera_allow() - + "[/CAMERA_ALLOW]" - - + "[IMAGE_URL_1]" - + image1 /*adddata.get(J).getCategoryImage1()*/ - + "[/IMAGE_URL_1]" - + "[IMAGE_URL_2]" - + image2 /*adddata.get(J).getCategoryImage2()*/ - + "[/IMAGE_URL_2]" - + "[IMAGE_URL_3]" - + image3 /*adddata.get(J).getCategoryImage3()*/ - + "[/IMAGE_URL_3]" - + "[IMAGE_URL_4]" - + image4 /*adddata.get(J).getCategoryImage4()*/ - + "[/IMAGE_URL_4]" - + "[SUB_LIST]" - + CategoryLISTDATA - + "[/SUB_LIST]" + + "[USER_ID]" + userId + "[/USER_ID]" + + "[KEY_ID]" + adddata.get(J).getKEY_ID() + "[/KEY_ID]" + + "[CATEGORY_ID]" + adddata.get(J).getCategoryId() + "[/CATEGORY_ID]" + + "[CAMERA_ALLOW]" + adddata.get(J).getCamera_allow() + "[/CAMERA_ALLOW]" + + "[IMAGE_URL_1]" + image1 /*adddata.get(J).getCategoryImage1()*/ + "[/IMAGE_URL_1]" + + "[IMAGE_URL_2]" + image2 /*adddata.get(J).getCategoryImage2()*/ + "[/IMAGE_URL_2]" + + "[IMAGE_URL_3]" + image3 /*adddata.get(J).getCategoryImage3()*/ + "[/IMAGE_URL_3]" + + "[IMAGE_URL_4]" + image4 /*adddata.get(J).getCategoryImage4()*/ + "[/IMAGE_URL_4]" + + "[SUB_LIST]" + CategoryLISTDATA + "[/SUB_LIST]" + "[/CATEGORY_LIST]"; - Category_xml = Category_xml + onXML; - CategoryLISTDATA = ""; - } final String sos_xml = "[DATA]" + Category_xml + "[/DATA]"; @@ -1304,24 +925,17 @@ public class UploadActivity extends AppCompatActivity { result = envelope.getResponse(); - if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { + /*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 = 35; + data.value = 60; data.name = getString(R.string.additional_data_uploading); publishProgress(data); + // Images Upload + // ashish visibility image start if (additionalVisibilityList.size() > 0) { for (int i1 = 0; i1 < additionalVisibilityList.size(); i1++) { @@ -1331,10 +945,9 @@ public class UploadActivity extends AppCompatActivity { try { result = UploadImage(additionalVisibilityList.get(i1).getImage(), "AdditionalVisibilityImages"); - - if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { + /*if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { return "AdditionalVisibilityImages"; - } + }*/ runOnUiThread(new Runnable() { public void run() { @@ -1352,10 +965,9 @@ public class UploadActivity extends AppCompatActivity { try { result = UploadImage(additionalVisibilityList.get(i1).getImage2(), "AdditionalVisibilityImages"); - - if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { + /*if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { return "AdditionalVisibilityImages"; - } + }*/ runOnUiThread(new Runnable() { public void run() { @@ -1374,10 +986,9 @@ public class UploadActivity extends AppCompatActivity { try { result = UploadImage(additionalVisibilityList.get(i1).getImage3(), "AdditionalVisibilityImages"); - - if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { + /*if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { return "AdditionalVisibilityImages"; - } + }*/ runOnUiThread(new Runnable() { public void run() { @@ -1392,9 +1003,9 @@ public class UploadActivity extends AppCompatActivity { } } - - - //// ashish close image + data.value = 60; + publishProgress(data); + // ashish close image // ashish SUB_CATEGORY_PICTURE start @@ -1413,10 +1024,9 @@ public class UploadActivity extends AppCompatActivity { try { result = UploadImage(listdat.get(i1).getSubCategoryCamera1(), "CategoryImages"); - - if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { + /*if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { return "CategoryImages"; - } + }*/ runOnUiThread(new Runnable() { public void run() { @@ -1434,10 +1044,9 @@ public class UploadActivity extends AppCompatActivity { try { result = UploadImage(listdat.get(i1).getSubCategoryCamera2(), "CategoryImages"); - - if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { + /*if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { return "CategoryImages"; - } + }*/ runOnUiThread(new Runnable() { public void run() { @@ -1454,6 +1063,8 @@ public class UploadActivity extends AppCompatActivity { } } } + data.value = 70; + publishProgress(data); // ashish CATEGORY_PICTURE start @@ -1465,10 +1076,9 @@ public class UploadActivity extends AppCompatActivity { try { result = UploadImage(adddata.get(i1).getCategoryImage1(), "CategoryImages"); - - if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { + /*if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { return "CategoryImages"; - } + }*/ runOnUiThread(new Runnable() { public void run() { @@ -1486,10 +1096,9 @@ public class UploadActivity extends AppCompatActivity { try { result = UploadImage(adddata.get(i1).getCategoryImage2(), "CategoryImages"); - - if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { + /*if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { return "CategoryImages"; - } + }*/ runOnUiThread(new Runnable() { public void run() { @@ -1507,10 +1116,9 @@ public class UploadActivity extends AppCompatActivity { try { result = UploadImage(adddata.get(i1).getCategoryImage3(), "CategoryImages"); - - if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { + /*if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { return "CategoryImages"; - } + }*/ runOnUiThread(new Runnable() { public void run() { @@ -1527,10 +1135,9 @@ public class UploadActivity extends AppCompatActivity { try { result = UploadImage(adddata.get(i1).getCategoryImage4(), "CategoryImages"); - - if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { + /*if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { return "CategoryImages"; - } + }*/ runOnUiThread(new Runnable() { public void run() { @@ -1545,10 +1152,10 @@ public class UploadActivity extends AppCompatActivity { } } + data.value = 75; + publishProgress(data); - - ///////Start store images - + //Start store images if (coverageList.size() > 0) { for (int i1 = 0; i1 < coverageList.size(); i1++) { @@ -1557,10 +1164,9 @@ public class UploadActivity extends AppCompatActivity { try { result = UploadImage(coverageList.get(i1).getImage(), "StoreImages"); - - if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { + /*if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { return "StoreImages"; - } + }*/ runOnUiThread(new Runnable() { public void run() { @@ -1574,6 +1180,8 @@ public class UploadActivity extends AppCompatActivity { } } } + data.value = 80; + publishProgress(data); //CheckOut Store Image @@ -1585,10 +1193,9 @@ public class UploadActivity extends AppCompatActivity { try { result = UploadImage(coverageList.get(i1).getCheckOut_Image(), "StoreImages"); - - if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { + /*if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { return "StoreImages"; - } + }*/ runOnUiThread(new Runnable() { public void run() { @@ -1602,10 +1209,11 @@ public class UploadActivity extends AppCompatActivity { } } } + data.value = 85; + publishProgress(data); //T2p Images - for (int m = 0; m < t2PGetterSetters.size(); m++) { if (t2PGetterSetters.get(m).getImage() != null && !t2PGetterSetters.get(m).getImage().equals("")) { @@ -1613,9 +1221,9 @@ public class UploadActivity extends AppCompatActivity { try { result = UploadImage(t2PGetterSetters.get(m).getImage(), "T2PImages"); - if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { + /*if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { return "T2PImages"; - } + }*/ runOnUiThread(new Runnable() { public void run() { @@ -1633,9 +1241,9 @@ public class UploadActivity extends AppCompatActivity { try { result = UploadImage(t2PGetterSetters.get(m).getImage1(), "T2PImages"); - if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { + /*if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { return "T2PImages"; - } + }*/ runOnUiThread(new Runnable() { public void run() { @@ -1653,9 +1261,9 @@ public class UploadActivity extends AppCompatActivity { try { result = UploadImage(t2PGetterSetters.get(m).getImage2(), "T2PImages"); - if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { + /*if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { return "T2PImages"; - } + }*/ runOnUiThread(new Runnable() { public void run() { @@ -1667,8 +1275,9 @@ public class UploadActivity extends AppCompatActivity { } } } - } + data.value = 90; + publishProgress(data); // SET COVERAGE STATUS @@ -1697,25 +1306,22 @@ public class UploadActivity extends AppCompatActivity { result = envelope.getResponse(); - if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { - return CommonString.METHOD_UPLOAD_COVERAGE_STATUS; - } - if (result.toString().equalsIgnoreCase(CommonString.KEY_NO_DATA)) { - return CommonString.METHOD_UPLOAD_COVERAGE_STATUS; - } - if (result.toString().equalsIgnoreCase(CommonString.KEY_FAILURE)) { - return CommonString.METHOD_UPLOAD_COVERAGE_STATUS; - } + //If Result is success then status of that store is update + if (result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { + k = k + factor; + data.value = k; + data.name = "Uploading"; + publishProgress(data); - k = k + factor; - data.value = k; - data.name = "Uploading"; + db.open(); + db.updateCoverageStatus(coverageList.get(i).getStoreId(), CommonString.KEY_U); + db.updateStoreStatusOnLeave(coverageList.get(i).getStoreId(), coverageList.get(i) + .getVisitDate(), CommonString.KEY_U); + + db.deleteTableWithStoreID(coverageList.get(i).getStoreId()); + } + data.value = 100; publishProgress(data); - - db.open(); - db.updateCoverageStatus(coverageList.get(i).getStoreId(), CommonString.KEY_U); - db.updateStoreStatusOnLeave(coverageList.get(i).getStoreId(), coverageList.get(i) - .getVisitDate(), CommonString.KEY_U); } } } @@ -1740,17 +1346,13 @@ public class UploadActivity extends AppCompatActivity { super.onPostExecute(result); dialog.dismiss(); - if (result.contains(CommonString.KEY_SUCCESS)) { - db.deleteAllTables(); + //db.deleteAllTables(); showAlert(getString(R.string.menu_upload_data)); - //showAlert(getString(R.string.menu_upload_data)); - } else { showAlert(getString(R.string.error) + result.toString()); } - } } diff --git a/GSKMTOrange/src/main/res/values-ar/string.xml b/GSKMTOrange/src/main/res/values-ar/string.xml index 3af77db..9a0a782 100644 --- a/GSKMTOrange/src/main/res/values-ar/string.xml +++ b/GSKMTOrange/src/main/res/values-ar/string.xml @@ -222,4 +222,12 @@ صورة مقطعية المقتفي موقف بشأن الجرف + + صوره الخروج من المتجر + انقر فوق الصورة الامامية لمخزن الصورة + -برجاء تعبئه عدد الكميات المواجهه بقيمه عدد او صفر + -برجاء تعبئه المخزون بقيمه عدد او صفر + أول تعبئة لقيمة المخزون + المخزون لا يمكن ان يكون مساوي او اكثر من الكميات التي يجب توافرها من الصنف MBQ +