Merge pull request #7 from CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GG_Planogram_Insert_Upload_PreviousUpload
//PromoCompliance Default Toggle Changes
This commit is contained in:
@@ -47,6 +47,7 @@ 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.T2PGetterSetter;
|
||||
import cpm.com.gskmtorange.xmlHandlers.FailureXMLHandler;
|
||||
@@ -76,6 +77,8 @@ public class PreviousDataUploadActivity extends AppCompatActivity {
|
||||
private SharedPreferences preferences;
|
||||
private int factor, k = 0;
|
||||
|
||||
ArrayList<StockFacing_PlanogramTrackerDataGetterSetter> stockFacingPlanogramDataList;
|
||||
|
||||
@Override
|
||||
protected void onCreate(Bundle savedInstanceState) {
|
||||
super.onCreate(savedInstanceState);
|
||||
@@ -814,6 +817,65 @@ public class PreviousDataUploadActivity extends AppCompatActivity {
|
||||
data.name = "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);
|
||||
|
||||
|
||||
//Image Upload
|
||||
|
||||
//Stock Facing Images Upload
|
||||
|
||||
@@ -829,6 +829,7 @@ public class UploadActivity extends AppCompatActivity {
|
||||
publishProgress(data);
|
||||
|
||||
|
||||
//Stock Facing Planogram Tracker
|
||||
String stock_facing_planogram_xml = "";
|
||||
onXML = "";
|
||||
stockFacingPlanogramDataList = db.getStockAndFacingPlanogramServerUploadData(coverageList.get(i).getStoreId());
|
||||
|
||||
Reference in New Issue
Block a user