Merge branch 'master' of https://github.com/CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GSKORANGEV1 into GG_Update_Manifest

# Conflicts:
#	GSKMTOrange/src/main/AndroidManifest.xml

GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java

@@ -1438,6 +1438,8 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
                 while (!dbcursor.isAfterLast()) {
                     Promo_Compliance_DataGetterSetter cd = new Promo_Compliance_DataGetterSetter();
 
+                    cd.setSku_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SKU_ID")));
+                    cd.setSku(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SKU")));
                     cd.setPromo_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("PROMO_ID")));
                     cd.setPromo(dbcursor.getString(dbcursor.getColumnIndexOrThrow("PROMO")));
 
@@ -1454,11 +1456,14 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
         return list;
     }
 
-    public void InsertAdditionalPromoData(Promo_Compliance_DataGetterSetter data) {
+    public void InsertAdditionalPromoData(Promo_Compliance_DataGetterSetter data, String category_id) {
         try {
             ContentValues values = new ContentValues();
 
             values.put("STORE_ID", Integer.parseInt(data.getStore_id()));
+            values.put("CATEGORY_ID", Integer.parseInt(category_id));
+            values.put("SKU_ID", Integer.parseInt(data.getSku_id()));
+            values.put("SKU", data.getSku());
             values.put("PROMO_ID", Integer.parseInt(data.getPromo_id()));
             values.put("PROMO", data.getPromo());
             values.put("IN_STOCK_VALUE", Integer.parseInt(data.getIn_stock()));
@@ -1471,12 +1476,13 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
         }
     }
 
-    public ArrayList<Promo_Compliance_DataGetterSetter> getAdditionalPromoData() {
+    public ArrayList<Promo_Compliance_DataGetterSetter> getAdditionalPromoData(String store_id, String category_id) {
         ArrayList<Promo_Compliance_DataGetterSetter> list = new ArrayList<>();
         Cursor dbcursor = null;
 
         try {
-            dbcursor = db.rawQuery("Select * from Additional_Promo_Compliance_Data ", null);
+            dbcursor = db.rawQuery("Select * from Additional_Promo_Compliance_Data " +
+                    "where STORE_ID='" + store_id + "' AND CATEGORY_ID='" + category_id + "'", null);
 
             if (dbcursor != null) {
                 dbcursor.moveToFirst();
@@ -1484,6 +1490,9 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
                     Promo_Compliance_DataGetterSetter cd = new Promo_Compliance_DataGetterSetter();
 
                     cd.setStore_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("STORE_ID")));
+                    cd.setCategory_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("CATEGORY_ID")));
+                    cd.setSku_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SKU_ID")));
+                    cd.setSku(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SKU")));
                     cd.setPromo_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("PROMO_ID")));
                     cd.setPromo(dbcursor.getString(dbcursor.getColumnIndexOrThrow("PROMO")));
                     cd.setIn_stock(dbcursor.getString(dbcursor.getColumnIndexOrThrow("IN_STOCK_VALUE")));
@@ -1650,9 +1659,8 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
         Cursor dbcursor = null;
 
         try {
-
             dbcursor = db.rawQuery("SELECT * from JOURNEY_PLAN  " +
-                    "where VISIT_DATE ='" + date + "' AND STORE_ID'=" + store_id + "'", null);
+                    "where VISIT_DATE ='" + date + "' AND STORE_ID='" + store_id + "'", null);
 
             if (dbcursor != null) {
                 dbcursor.moveToFirst();
@@ -1704,7 +1712,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
                     sb.setGEO_TAG(dbcursor.getString(dbcursor
                             .getColumnIndexOrThrow("GEO_TAG")));
 
-                    //dbcursor.moveToNext();
+                    dbcursor.moveToNext();
                 }
                 dbcursor.close();
                 return sb;
@@ -1836,7 +1844,149 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
         return list;
     }
 
+    //Stock Facing Server Upload Data
+    public ArrayList<Stock_FacingGetterSetter> getStockAndFacingHeaderServerUploadData(String store_id) {
+        ArrayList<Stock_FacingGetterSetter> list = new ArrayList<>();
+        Cursor dbcursor = null;
 
+        try {
+            dbcursor = db.rawQuery("Select * from Stock_Facing_Header_Data " +
+                    "where 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")));
+
+                    list.add(cd);
+                    dbcursor.moveToNext();
+                }
+                dbcursor.close();
+                return list;
+            }
+        } catch (Exception e) {
+            Log.d("Exception ", "get Stock_FacingHeader server upload !" + e.toString());
+            return list;
+        }
+        return list;
+    }
+
+    public ArrayList<Stock_FacingGetterSetter> getStockAndFacingSKUServerUploadData(String category_id, String brand_id) {
+        ArrayList<Stock_FacingGetterSetter> list = new ArrayList<>();
+        Cursor dbcursor = null;
+
+        try {
+            dbcursor = db.rawQuery("Select * from Stock_Facing_Child_Data " +
+                    "where category_id='" + category_id + "' and Brand_Id='" + brand_id + "'", null);
+
+            if (dbcursor != null) {
+                dbcursor.moveToFirst();
+                while (!dbcursor.isAfterLast()) {
+                    Stock_FacingGetterSetter cd = new Stock_FacingGetterSetter();
+
+                    cd.setSku_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SKU_ID")));
+                    cd.setSku(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SKU")));
+                    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(dbcursor.getString(dbcursor.getColumnIndexOrThrow("STOCK_VALUE")));
+                    cd.setFacing(dbcursor.getString(dbcursor.getColumnIndexOrThrow("FACEUP_VALUE")));
+
+                    list.add(cd);
+
+                    dbcursor.moveToNext();
+                }
+                dbcursor.close();
+                return list;
+            }
+
+        } catch (Exception e) {
+            Log.d("Exception ", "get Stock_Facing Sku After Save Data!" + e.toString());
+            return list;
+        }
+        return list;
+    }
+
+    //Promo Compliance Promotion Data
+    public ArrayList<Promo_Compliance_DataGetterSetter> getPromoComplianceSkuServerUploadData(String store_id) {
+        ArrayList<Promo_Compliance_DataGetterSetter> list = new ArrayList<>();
+        Cursor dbcursor = null;
+
+        try {
+            dbcursor = db.rawQuery("Select * from Promo_SKU_Data " +
+                    "where STORE_ID='" + store_id + "'", null);
+
+            if (dbcursor != null) {
+                dbcursor.moveToFirst();
+                while (!dbcursor.isAfterLast()) {
+                    Promo_Compliance_DataGetterSetter cd = new Promo_Compliance_DataGetterSetter();
+
+                    cd.setStore_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("STORE_ID")));
+                    cd.setCategory_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("CATEGORY_ID")));
+                    cd.setSku_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SKU_ID")));
+                    cd.setSku(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SKU")));
+                    cd.setPromo_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("PROMO_ID")));
+                    cd.setPromo(dbcursor.getString(dbcursor.getColumnIndexOrThrow("PROMO")));
+                    cd.setIn_stock(dbcursor.getString(dbcursor.getColumnIndexOrThrow("IN_STOCK_VALUE")));
+                    cd.setPromo_announcer(dbcursor.getString(dbcursor.getColumnIndexOrThrow("PROMO_ANNOUNCER_VALUE")));
+                    cd.setRunning_pos(dbcursor.getString(dbcursor.getColumnIndexOrThrow("RUNNING_POS_VALUE")));
+
+                    list.add(cd);
+                    dbcursor.moveToNext();
+                }
+                dbcursor.close();
+                return list;
+            }
+        } catch (Exception e) {
+            Log.d("Exception ", "getPromoComplianceSkuAfterData!" + e.toString());
+            return list;
+        }
+        return list;
+    }
+
+    public ArrayList<Promo_Compliance_DataGetterSetter> getAdditionalPromotionServerUploadData(String store_id) {
+        ArrayList<Promo_Compliance_DataGetterSetter> list = new ArrayList<>();
+        Cursor dbcursor = null;
+
+        try {
+            dbcursor = db.rawQuery("Select * from Additional_Promo_Compliance_Data " +
+                    "where STORE_ID='" + store_id + "'", null);
+
+            if (dbcursor != null) {
+                dbcursor.moveToFirst();
+                while (!dbcursor.isAfterLast()) {
+                    Promo_Compliance_DataGetterSetter cd = new Promo_Compliance_DataGetterSetter();
+
+                    cd.setStore_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("STORE_ID")));
+                    cd.setCategory_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("CATEGORY_ID")));
+                    cd.setSku_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SKU_ID")));
+                    cd.setSku(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SKU")));
+                    cd.setPromo_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("PROMO_ID")));
+                    cd.setPromo(dbcursor.getString(dbcursor.getColumnIndexOrThrow("PROMO")));
+                    cd.setIn_stock(dbcursor.getString(dbcursor.getColumnIndexOrThrow("IN_STOCK_VALUE")));
+                    cd.setPromo_announcer(dbcursor.getString(dbcursor.getColumnIndexOrThrow("PROMO_ANNOUNCER_VALUE")));
+                    cd.setRunning_pos(dbcursor.getString(dbcursor.getColumnIndexOrThrow("RUNNING_POS_VALUE")));
+
+                    list.add(cd);
+                    dbcursor.moveToNext();
+                }
+                dbcursor.close();
+                return list;
+            }
+        } catch (Exception e) {
+            Log.d("Exception ", "getPromoComplianceSkuData!" + e.toString());
+            return list;
+        }
+        return list;
+    }
     //Gagan end new code 1
 
 }

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

@@ -194,19 +194,18 @@ public class MainActivity extends AppCompatActivity
                                 .setAction("Action", null).show();
 
                     } else {
-                        if (isStoreCheckedIn()&& isValid()) {
+                        //if (isStoreCheckedIn()&& isValid()) {
 
-                            Intent i = new Intent(getBaseContext(),
+                        Intent i = new Intent(getBaseContext(), UploadActivity.class);
-                                    UploadActivity.class);
                         startActivity(i);
 
-                            finish();
+                        //finish();
 
-                        } else {
+                        /*} else {
 
                             Snackbar.make(webView, error_msg, Snackbar.LENGTH_SHORT)
                                     .setAction("Action", null).show();
-                        }
+                        }*/
 
                     }
 

GSKMTOrange/src/main/java/cpm/com/gskmtorange/constant/CommonString.java

@@ -278,11 +278,14 @@ public class CommonString {
             + "STORE_ID"
             + " INTEGER,"
 
-            /*+ "SKU_ID"
+            + "CATEGORY_ID"
+            + " INTEGER,"
+
+            + "SKU_ID"
             + " INTEGER,"
 
             + "SKU"
-            + " VARCHAR,"*/
+            + " VARCHAR,"
 
             + "PROMO_ID"
             + " INTEGER,"

GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/PromoComplianceActivity.java

@@ -96,6 +96,8 @@ public class PromoComplianceActivity extends AppCompatActivity {
             cd.setStore_id(store_id);
             cd.setPromo_id("");
             cd.setPromo("");
+            cd.setSku_id("");
+            cd.setSku("");
             cd.setIn_stock("1");
             cd.setPromo_announcer("1");
             cd.setRunning_pos("1");
@@ -161,6 +163,8 @@ public class PromoComplianceActivity extends AppCompatActivity {
 
                     for (int i = 0; i < promoSpinnerListData.size(); i++) {
                         if (position == i) {
+                            cd.setSku_id(promoSpinnerListData.get(i).getSku_id());
+                            cd.setSku(promoSpinnerListData.get(i).getSku());
                             cd.setSp_promo(promoSpinnerListData.get(i).getPromo_id());
                             cd.setPromo(promoSpinnerListData.get(i).getPromo());
                             cd.setPromo_id(promoSpinnerListData.get(i).getPromo_id());
@@ -189,7 +193,7 @@ public class PromoComplianceActivity extends AppCompatActivity {
                             .setPositiveButton("Yes", new DialogInterface.OnClickListener() {
                                 public void onClick(DialogInterface dialog, int id) {
 
-                                    db.InsertAdditionalPromoData(cd);
+                                    db.InsertAdditionalPromoData(cd, categoryId);
                                     AdditionalPromoListView();
 
                                     sp_promo.setSelection(0);
@@ -360,7 +364,7 @@ public class PromoComplianceActivity extends AppCompatActivity {
             lin_addtional_promo.removeAllViews();
 
             //Additional Promo List
-            additionalPromoListData = db.getAdditionalPromoData();
+            additionalPromoListData = db.getAdditionalPromoData(store_id, categoryId);
 
             View view;
 

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

@@ -3,10 +3,13 @@ package cpm.com.gskmtorange.upload;
 import android.app.Dialog;
 import android.content.Context;
 import android.content.SharedPreferences;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
 import android.os.AsyncTask;
 import android.preference.PreferenceManager;
 import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
+import android.view.WindowManager;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 
@@ -14,17 +17,29 @@ import org.ksoap2.SoapEnvelope;
 import org.ksoap2.serialization.SoapObject;
 import org.ksoap2.serialization.SoapSerializationEnvelope;
 import org.ksoap2.transport.HttpTransportSE;
+import org.xml.sax.InputSource;
+import org.xml.sax.XMLReader;
 import org.xmlpull.v1.XmlPullParserException;
 
+import java.io.ByteArrayOutputStream;
+import java.io.File;
 import java.io.IOException;
+import java.io.StringReader;
 import java.util.ArrayList;
 
+import javax.xml.parsers.SAXParser;
+import javax.xml.parsers.SAXParserFactory;
+
 import cpm.com.gskmtorange.Database.GSKOrangeDB;
 import cpm.com.gskmtorange.GetterSetter.CoverageBean;
 import cpm.com.gskmtorange.GetterSetter.StoreBean;
 import cpm.com.gskmtorange.R;
 import cpm.com.gskmtorange.constant.CommonString;
+import cpm.com.gskmtorange.xmlGetterSetter.FailureGetterSetter;
 import cpm.com.gskmtorange.xmlGetterSetter.MSL_AvailabilityGetterSetter;
+import cpm.com.gskmtorange.xmlGetterSetter.Promo_Compliance_DataGetterSetter;
+import cpm.com.gskmtorange.xmlGetterSetter.Stock_FacingGetterSetter;
+import cpm.com.gskmtorange.xmlHandlers.FailureXMLHandler;
 
 public class UploadActivity extends AppCompatActivity {
 
@@ -34,6 +49,7 @@ public class UploadActivity extends AppCompatActivity {
     GSKOrangeDB db;
     ArrayList<CoverageBean> coverageList;
 
+    private FailureGetterSetter failureGetterSetter = null;
     private SharedPreferences preferences;
     String date, userId, app_version;
 
@@ -43,26 +59,33 @@ public class UploadActivity extends AppCompatActivity {
     String validity;
     int mid;
     private int factor, k = 0;
+    String errormsg = "", Path;
 
     Data data;
 
     ArrayList<MSL_AvailabilityGetterSetter> msl_availabilityList;
+    ArrayList<Stock_FacingGetterSetter> stock_facingHeaderList, stock_facingChildList;
+    ArrayList<Promo_Compliance_DataGetterSetter> promotionSkuList, additionalPromotionList;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_upload);
 
+        getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
+
         preferences = PreferenceManager.getDefaultSharedPreferences(this);
         date = preferences.getString(CommonString.KEY_DATE, null);
         userId = preferences.getString(CommonString.KEY_USERNAME, null);
         app_version = preferences.getString(CommonString.KEY_VERSION, null);
 
-        db = new GSKOrangeDB(getApplicationContext());
+        db = new GSKOrangeDB(this);
+        db.open();
+
+        Path = CommonString.FILE_PATH;
 
         //start upload
-        new UploadTask(getApplicationContext()).execute();
+        new UploadTask(this).execute();
-
     }
 
     class Data {
@@ -80,12 +103,12 @@ public class UploadActivity extends AppCompatActivity {
         @Override
         protected void onPreExecute() {
             super.onPreExecute();
-
             dialog = new Dialog(context);
             dialog.setContentView(R.layout.custom);
             dialog.setTitle("Uploading Data");
             dialog.setCancelable(false);
             dialog.show();
+
             pb = (ProgressBar) dialog.findViewById(R.id.progressBar1);
             percentage = (TextView) dialog.findViewById(R.id.percentage);
             message = (TextView) dialog.findViewById(R.id.message);
@@ -119,37 +142,29 @@ public class UploadActivity extends AppCompatActivity {
                     storeData = db.getSpecificStoreData(date, coverageList.get(i).getStoreId());
                     if (storeData.getSTORE_ID() != null) {
 
-                        if (storeData.getCHECKOUT_STATUS().equals(CommonString.KEY_C) || storeData.getCHECKOUT_STATUS().equals(CommonString.KEY_L) ||
+                        /*if (storeData.getCHECKOUT_STATUS().equals(CommonString.KEY_C) || storeData.getCHECKOUT_STATUS().equals(CommonString.KEY_L) ||
-                                !storeData.getUPLOAD_STATUS().equals(CommonString.KEY_U)) {
+                                !storeData.getUPLOAD_STATUS().equals(CommonString.KEY_U)) {*/
 
                         String camera_allow = storeData.getCAMERA_ALLOW();
 
-                            String onXML =
+                        String onXML = "[DATA]"
-                                    "[DATA][USER_DATA][STORE_CD]"
+                                + "[USER_DATA]"
-                                            + coverageList.get(i).getStoreId()
+                                + "[STORE_CD]" + coverageList.get(i).getStoreId() + "[/STORE_CD]"
-                                            + "[/STORE_CD]" + "[VISIT_DATE]"
+                                + "[VISIT_DATE]" + coverageList.get(i).getVisitDate() + "[/VISIT_DATE]"
-                                            + coverageList.get(i).getVisitDate()
+                                + "[LATITUDE]" + coverageList.get(i).getLatitude() + "[/LATITUDE]"
-                                            + "[/VISIT_DATE][LATITUDE]"
+                                + "[APP_VERSION]" + app_version + "[/APP_VERSION]"
-                                            + coverageList.get(i).getLatitude()
+                                + "[LONGITUDE]" + coverageList.get(i).getLongitude() + "[/LONGITUDE]"
-                                            + "[/LATITUDE][APP_VERSION]"
+                                + "[IN_TIME]" + coverageList.get(i).getInTime() + "[/IN_TIME]"
-                                            + app_version
+                                //+ "[OUT_TIME]" + coverageList.get(i).getOutTime() + "[/OUT_TIME]"
-                                            + "[/APP_VERSION][LONGITUDE]"
+                                + "[OUT_TIME]" + "00:00" + "[/OUT_TIME]"
-                                            + coverageList.get(i).getLongitude()
+                                + "[UPLOAD_STATUS]" + "N" + "[/UPLOAD_STATUS]"
-                                            + "[/LONGITUDE][IN_TIME]"
+                                + "[USER_ID]" + userId + "[/USER_ID]"
-                                            + coverageList.get(i).getInTime()
+                                + "[IMAGE_URL]" + coverageList.get(i).getImage() + "[/IMAGE_URL]"
-                                            + "[/IN_TIME][OUT_TIME]"
+                                + "[REASON_ID]" + coverageList.get(i).getReasonid() + "[/REASON_ID]"
-                                            + coverageList.get(i).getOutTime()
+                                + "[REASON_REMARK]" + coverageList.get(i).getRemark() + "[/REASON_REMARK]"
-                                            + "[/OUT_TIME][UPLOAD_STATUS]"
+                                + "[CAMERA_ALLOWED]" + camera_allow + "[/CAMERA_ALLOWED]"
-                                            + "N"
+                                + "[/USER_DATA]"
-                                            + "[/UPLOAD_STATUS][USER_ID]" + userId
+                                + "[/DATA]";
-                                            + "[/USER_ID][IMAGE_URL]" + coverageList.get(i).getImage()
-                                            + "[/IMAGE_URL][REASON_ID]"
-                                            + coverageList.get(i).getReasonid()
-                                            + "[/REASON_ID][REASON_REMARK]"
-                                            + coverageList.get(i).getRemark()
-                                            + "[/REASON_REMARK][CAMERA_ALLOWED]"
-                                            + camera_allow
-                                            + "[/CAMERA_ALLOWED][/USER_DATA][/DATA]";
 
                         SoapObject request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_UPLOAD_COVERAGE);
                         request.addProperty("onXML", onXML);
@@ -175,15 +190,8 @@ public class UploadActivity extends AppCompatActivity {
                             return CommonString.METHOD_UPLOAD_COVERAGE;
                         }
 
-
                         mid = Integer.parseInt((words[1]));
 
-                            k = k + factor;
-                            data.value = k;
-                            data.name = "Uploading";
-
-                            publishProgress(data);
-
 
                         //MSL_Availability
                         String mslAvailability_xml = "";
@@ -200,7 +208,7 @@ public class UploadActivity extends AppCompatActivity {
                                             + "[CATEGORY_ID]" + Integer.parseInt(msl_availabilityList.get(j).getCategory_id()) + "[/CATEGORY_ID]"
                                             + "[BRAND_ID]" + Integer.parseInt(msl_availabilityList.get(j).getBrand_id()) + "[/BRAND_ID]"
                                             + "[SKU_ID]" + Integer.parseInt(msl_availabilityList.get(j).getSku_id()) + "[/SKU_ID]"
-                                                + "[SKU]" + msl_availabilityList.get(j).getSku() + "[/SKU]"
+                                            //+ "[SKU]" + msl_availabilityList.get(j).getSku() + "[/SKU]"
                                             + "[TOGGLE_VALUE]" + Integer.parseInt(msl_availabilityList.get(j).getToggleValue()) + "[/TOGGLE_VALUE]"
                                             + "[/MSL_AVAILABILITY_DATA]";
 
@@ -243,25 +251,250 @@ public class UploadActivity extends AppCompatActivity {
 
 
                         //Stock and Facing
+                        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++) {
+                                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 = "";
+                                    for (int j = 0; j < stock_facingChildList.size(); j++) {
+
+                                        stockChildXML = "[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]";
+
+                                        onXML = onXML + stockChildXML;
+                                    }
+                                    stock_facing_xml = stock_facing_xml + onXML;
+                                }
+                            }
+
+                            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 = (Object) 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);
 
 
+                        //Promo Compliance - Promotion Data
+                        String promoition_data_xml = "";
+                        onXML = "";
+                        promotionSkuList = db.getPromoComplianceSkuServerUploadData(coverageList.get(i).getStoreId());
+
+                        if (promotionSkuList.size() > 0) {
+                            for (int i1 = 0; i1 < promotionSkuList.size(); i1++) {
+                                if (!promotionSkuList.get(i1).getCategory_id().equals("0")) {
+
+                                    onXML = "[PROMOTION_DATA]"
+                                            + "[MID]" + mid + "[/MID]"
+                                            + "[USER_ID]" + userId + "[/USER_ID]"
+                                            + "[CATEGORY_ID]" + Integer.parseInt(promotionSkuList.get(i1).getCategory_id()) + "[/CATEGORY_ID]"
+                                            + "[PROMO_ID]" + Integer.parseInt(promotionSkuList.get(i1).getPromo_id()) + "[/PROMO_ID]"
+                                            //+ "[SKU]" + promotionSkuList.get(i1).getSku() + "[/SKU]"
+                                            + "[SKU_ID]" + Integer.parseInt(promotionSkuList.get(i1).getSku_id()) + "[/SKU_ID]"
+                                            + "[IN_STOCK]" + Integer.parseInt(promotionSkuList.get(i1).getIn_stock()) + "[/IN_STOCK]"
+                                            + "[PROMO_ANNOUNCER]" + Integer.parseInt(promotionSkuList.get(i1).getPromo_announcer()) + "[/PROMO_ANNOUNCER]"
+                                            + "[RUNNING_POS]" + Integer.parseInt(promotionSkuList.get(i1).getRunning_pos()) + "[/RUNNING_POS]"
+                                            + "[/PROMOTION_DATA]";
+
+                                    promoition_data_xml = promoition_data_xml + onXML;
+                                }
+                            }
+
+                            final String sos_xml = "[DATA]" + promoition_data_xml + "[/DATA]";
+
+                            request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_UPLOAD_STOCK_XML_DATA);
+                            request.addProperty("XMLDATA", sos_xml);
+                            request.addProperty("KEYS", "PROMOTION_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 = (Object) 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 = 30;
+                        data.name = "Promotion Data Uploading";
+                        publishProgress(data);
+
+
+                        //Promo Compliance -Additional Promotion Data
+                        String additional_promoition_data_xml = "";
+                        onXML = "";
+                        additionalPromotionList = db.getAdditionalPromotionServerUploadData(coverageList.get(i).getStoreId());
+
+                        if (additionalPromotionList.size() > 0) {
+                            for (int i1 = 0; i1 < additionalPromotionList.size(); i1++) {
+                                if (!additionalPromotionList.get(i1).getCategory_id().equals("0")) {
+
+                                    onXML = "[ADDITIONAL_PROMOTION_DATA]"
+                                            + "[MID]" + mid + "[/MID]"
+                                            + "[USER_ID]" + userId + "[/USER_ID]"
+                                            + "[CATEGORY_ID]" + Integer.parseInt(additionalPromotionList.get(i1).getCategory_id()) + "[/CATEGORY_ID]"
+                                            + "[PROMO_ID]" + Integer.parseInt(additionalPromotionList.get(i1).getPromo_id()) + "[/PROMO_ID]"
+                                            + "[SKU_ID]" + Integer.parseInt(additionalPromotionList.get(i1).getSku_id()) + "[/SKU_ID]"
+                                            //+ "[SKU]" + additionalPromotionList.get(i1).getSku() + "[/SKU]"
+                                            + "[IN_STOCK]" + Integer.parseInt(additionalPromotionList.get(i1).getIn_stock()) + "[/IN_STOCK]"
+                                            + "[PROMO_ANNOUNCER]" + Integer.parseInt(additionalPromotionList.get(i1).getPromo_announcer()) + "[/PROMO_ANNOUNCER]"
+                                            + "[RUNNING_POS]" + Integer.parseInt(additionalPromotionList.get(i1).getRunning_pos()) + "[/RUNNING_POS]"
+                                            + "[/ADDITIONAL_PROMOTION_DATA]";
+
+                                    additional_promoition_data_xml = additional_promoition_data_xml + onXML;
+                                }
+                            }
+
+                            final String sos_xml = "[DATA]" + additional_promoition_data_xml + "[/DATA]";
+
+                            request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_UPLOAD_STOCK_XML_DATA);
+                            request.addProperty("XMLDATA", sos_xml);
+                            request.addProperty("KEYS", "ADDITIONAL_PROMOTION_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 = (Object) 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 = 35;
+                        data.name = "Additional Promotion Data Uploading";
+                        publishProgress(data);
+
+
+                        //Image Upload
+
+                        //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();
+                                        }
+                                    }
+                                }
+                            }
+                        }*/
 
 
                         // SET COVERAGE STATUS
                         String final_xml = "";
                         onXML = "";
-                            onXML = "[COVERAGE_STATUS][STORE_ID]"
+                        onXML = "[COVERAGE_STATUS]"
-                                    + coverageList.get(i).getStoreId()
+                                + "[STORE_ID]" + coverageList.get(i).getStoreId() + "[/STORE_ID]"
-                                    + "[/STORE_ID]"
+                                + "[VISIT_DATE]" + coverageList.get(i).getVisitDate() + "[/VISIT_DATE]"
-                                    + "[VISIT_DATE]"
+                                + "[USER_ID]" + coverageList.get(i).getUserId() + "[/USER_ID]"
-                                    + coverageList.get(i).getVisitDate()
+                                + "[STATUS]" + CommonString.KEY_U + "[/STATUS]"
-                                    + "[/VISIT_DATE]"
-                                    + "[USER_ID]"
-                                    + coverageList.get(i).getUserId()
-                                    + "[/USER_ID]"
-                                    + "[STATUS]"
-                                    + CommonString.KEY_U
-                                    + "[/STATUS]"
                                 + "[/COVERAGE_STATUS]";
 
                         final_xml = final_xml + onXML;
@@ -290,11 +523,16 @@ public class UploadActivity extends AppCompatActivity {
                             return CommonString.METHOD_UPLOAD_COVERAGE_STATUS;
                         }
 
+                        k = k + factor;
+                        data.value = k;
+                        data.name = "Uploading";
+                        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);
-                        }
+                        // }
                     }
                 }
             } catch (IOException e) {
@@ -310,9 +548,90 @@ public class UploadActivity extends AppCompatActivity {
         protected void onPostExecute(String result) {
             super.onPostExecute(result);
 
+            dialog.dismiss();
             if (result.equals("")) {
                 finish();
             }
         }
     }
+
+    public String UploadImage(String path, String folder_name) throws Exception {
+        errormsg = "";
+        BitmapFactory.Options o = new BitmapFactory.Options();
+        o.inJustDecodeBounds = true;
+        BitmapFactory.decodeFile(Path + path, o);
+
+        // The new size we want to scale to
+        final int REQUIRED_SIZE = 1639;
+
+        // Find the correct scale value. It should be the power of 2.
+        int width_tmp = o.outWidth, height_tmp = o.outHeight;
+        int scale = 1;
+
+        while (true) {
+            if (width_tmp < REQUIRED_SIZE && height_tmp < REQUIRED_SIZE)
+                break;
+            width_tmp /= 2;
+            height_tmp /= 2;
+            scale *= 2;
+        }
+
+        // Decode with inSampleSize
+        BitmapFactory.Options o2 = new BitmapFactory.Options();
+        o2.inSampleSize = scale;
+        Bitmap bitmap = BitmapFactory.decodeFile(Path + path, o2);
+
+        ByteArrayOutputStream bao = new ByteArrayOutputStream();
+        bitmap.compress(Bitmap.CompressFormat.JPEG, 90, bao);
+        byte[] ba = bao.toByteArray();
+        String ba1 = Base64.encodeBytes(ba);
+
+        SoapObject request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_UPLOAD_STOCK_XML_DATA);
+
+        String[] split = path.split("/");
+        String path1 = split[split.length - 1];
+
+        request.addProperty("img", ba1);
+        request.addProperty("name", path1);
+        request.addProperty("FolderName", folder_name);
+
+        SoapSerializationEnvelope envelope = new SoapSerializationEnvelope(SoapEnvelope.VER11);
+        envelope.dotNet = true;
+        envelope.setOutputSoapObject(request);
+
+        HttpTransportSE androidHttpTransport = new HttpTransportSE(CommonString.URL);
+        androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_STOCK_XML_DATA, envelope);
+        //androidHttpTransport.call(CommonString.SOAP_ACTION_UPLOAD_IMAGE, envelope);
+
+        Object result = (Object) envelope.getResponse();
+
+        if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) {
+            if (result.toString().equalsIgnoreCase(CommonString.KEY_FALSE)) {
+                return CommonString.KEY_FALSE;
+            }
+
+            SAXParserFactory saxPF = SAXParserFactory.newInstance();
+            SAXParser saxP = saxPF.newSAXParser();
+            XMLReader xmlR = saxP.getXMLReader();
+
+            // for failure
+            FailureXMLHandler failureXMLHandler = new FailureXMLHandler();
+            xmlR.setContentHandler(failureXMLHandler);
+
+            InputSource is = new InputSource();
+            is.setCharacterStream(new StringReader(result.toString()));
+            xmlR.parse(is);
+
+            failureGetterSetter = failureXMLHandler.getFailureGetterSetter();
+
+            if (failureGetterSetter.getStatus().equalsIgnoreCase(CommonString.KEY_FAILURE)) {
+                errormsg = failureGetterSetter.getErrorMsg();
+                return CommonString.KEY_FAILURE;
+            }
+        } else {
+            new File(Path + path).delete();
+        }
+
+        return result.toString();
+    }
 }

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

@@ -7,7 +7,7 @@ import java.util.ArrayList;
  */
 
 public class Promo_Compliance_DataGetterSetter {
-    String store_id, sku_id, sku, promo_id, promo, in_stock, promo_announcer, running_pos, sp_promo;
+    String store_id, sku_id, sku, promo_id, promo, in_stock, promo_announcer, running_pos, sp_promo, category_id;
 
     public String getStore_id() {
         return store_id;
@@ -80,4 +80,12 @@ public class Promo_Compliance_DataGetterSetter {
     public void setSp_promo(String sp_promo) {
         this.sp_promo = sp_promo;
     }
+
+    public String getCategory_id() {
+        return category_id;
+    }
+
+    public void setCategory_id(String category_id) {
+        this.category_id = category_id;
+    }
 }

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

@@ -5,7 +5,7 @@ package cpm.com.gskmtorange.xmlGetterSetter;
  */
 
 public class Stock_FacingGetterSetter {
-    String sub_category_id, sub_category, brand_id, brand,
+    String category_id, sub_category_id, sub_category, brand_id, brand,
             sku_id, sku, mrp, sku_sequence, stock, facing, mbq, company_id, image1, image2;
 
     public String getSub_category_id() {
@@ -119,4 +119,12 @@ public class Stock_FacingGetterSetter {
     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;
+    }
 }

GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlHandlers/FailureXMLHandler.java

@@ -1,7 +1,5 @@
 package cpm.com.gskmtorange.xmlHandlers;
 
-
-
 import org.xml.sax.SAXException;
 import org.xml.sax.helpers.DefaultHandler;
 
@@ -13,8 +11,7 @@ public class FailureXMLHandler extends DefaultHandler{
     private FailureGetterSetter failureGetterSetter = null;
 
 
-	public FailureGetterSetter getFailureGetterSetter()
+    public FailureGetterSetter getFailureGetterSetter() {
-	{
         return failureGetterSetter;
     }
 
@@ -41,12 +38,9 @@ public class FailureXMLHandler extends DefaultHandler{
         // TODO Auto-generated method stub
         super.endElement(uri, localName, qName);
 
-		if(qName.equals("STATUS"))
+        if (qName.equals("STATUS")) {
-		{
             failureGetterSetter.setStatus(elementValue);
-		}
+        } else if (qName.equals("ERRORMSG")) {
-		else if(qName.equals("ERRORMSG"))
-		{
             failureGetterSetter.setErrorMsg(elementValue);
         }
     }

GSKMTOrange/src/main/res/layout/custom.xml

@@ -3,7 +3,7 @@
     android:layout_width="fill_parent"
     android:layout_height="fill_parent">
 
-    <ProgressBar
+    <!--<ProgressBar
         android:id="@+id/progressBar1"
         style="?android:attr/progressBarStyleHorizontal"
         android:layout_width="match_parent"
@@ -25,6 +25,54 @@
         android:layout_height="wrap_content"
         android:layout_below="@+id/progressBar1"
         android:layout_marginTop="10dp"
-        android:layout_centerHorizontal="true" />
+        android:layout_centerHorizontal="true" />-->
 
+    <TextView
+        android:id="@+id/tv_title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentLeft="true"
+        android:layout_marginTop="15dp"
+        android:paddingBottom="20dp"
+        android:paddingLeft="5dp"
+        android:text="Uploading Data"
+        android:textSize="@dimen/text_size_small" />
+
+    <ProgressBar
+        android:id="@+id/progressBar1"
+        style="?android:attr/progressBarStyleHorizontal"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentRight="true"
+        android:layout_below="@+id/tv_title"
+        android:paddingLeft="5dp"
+        android:paddingRight="5dp" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/progressBar1"
+        android:orientation="horizontal"
+        android:weightSum="2">
+
+        <TextView
+            android:id="@+id/percentage"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10dp"
+            android:layout_weight="1"
+            android:paddingBottom="10dp"
+            android:paddingLeft="5dp" />
+
+        <TextView
+            android:id="@+id/message"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10dp"
+            android:layout_weight="1"
+            android:gravity="right"
+            android:paddingBottom="10dp"
+            android:paddingRight="5dp" />
+    </LinearLayout>
 </RelativeLayout>