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

@@ -1239,7 +1239,6 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
         return list;
     }
 
-
     public long InsertCoverageData(CoverageBean data) {
 
         //db.delete(CommonString1.TABLE_COVERAGE_DATA, "STORE_ID" + "='" + data.getStoreId() + "'", null);
@@ -1272,7 +1271,6 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
         return 0;
     }
 
-
     public boolean checkStockAndFacingData(String store_id, String category_id) {
         Log.d("Stock_Facing ", "Stock data--------------->Start<------------");
         ArrayList<Stock_FacingGetterSetter> list = new ArrayList<>();
@@ -1654,7 +1652,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
         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();
@@ -1742,6 +1740,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
 
     //Gagan start new code 1
 
+    //Promo Compliance update data
     public void updatePromoComplianceSKU(ArrayList<Promo_Compliance_DataGetterSetter> promoSkuListData,
                                          String categoryId, String storeId) {
         ContentValues values = new ContentValues();
@@ -1801,6 +1800,43 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
         }
         return list;
     }
+
+    //MSL_Availability Server Upload Data
+    public ArrayList<MSL_AvailabilityGetterSetter> getMSL_AvailabilityUploadServerData(String store_id) {
+        ArrayList<MSL_AvailabilityGetterSetter> list = new ArrayList<>();
+        Cursor dbcursor = null;
+
+        try {
+            dbcursor = db.rawQuery("Select * from Msl_Availability_Data " +
+                    "where Store_Id='" + store_id + "'", null);
+
+            if (dbcursor != null) {
+                dbcursor.moveToFirst();
+                while (!dbcursor.isAfterLast()) {
+                    MSL_AvailabilityGetterSetter cd = new MSL_AvailabilityGetterSetter();
+
+                    cd.setCategory_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("Category_Id")));
+                    cd.setBrand_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("Brand_Id")));
+                    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.setToggleValue(dbcursor.getString(dbcursor.getColumnIndexOrThrow("TOGGLE_VALUE")));
+
+                    list.add(cd);
+                    dbcursor.moveToNext();
+                }
+                dbcursor.close();
+                return list;
+            }
+        } catch (Exception e) {
+            Log.d("Exception ", "get MSL_Availability server upload Data!" + e.toString());
+            return list;
+        }
+        return list;
+    }
+
+
     //Gagan end new code 1
 
 }

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

@@ -24,6 +24,7 @@ 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.MSL_AvailabilityGetterSetter;
 
 public class UploadActivity extends AppCompatActivity {
 
@@ -41,10 +42,12 @@ public class UploadActivity extends AppCompatActivity {
     String[] words;
     String validity;
     int mid;
-    private int factor, k=0;
+    private int factor, k = 0;
 
     Data data;
 
+    ArrayList<MSL_AvailabilityGetterSetter> msl_availabilityList;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -68,7 +71,6 @@ public class UploadActivity extends AppCompatActivity {
     }
 
     private class UploadTask extends AsyncTask<Void, Data, String> {
-
         private Context context;
 
         UploadTask(Context context) {
@@ -96,24 +98,18 @@ public class UploadActivity extends AppCompatActivity {
             pb.setProgress(values[0].value);
             percentage.setText(values[0].value + "%");
             message.setText(values[0].name);
-
         }
 
         @Override
         protected String doInBackground(Void... params) {
-
             try {
-
                 data = new Data();
-
                 coverageList = db.getCoverageData(date);
 
                 if (coverageList.size() > 0) {
-
                     if (coverageList.size() == 1) {
                         factor = 50;
                     } else {
-
                         factor = 100 / (coverageList.size());
                     }
                 }
@@ -128,160 +124,185 @@ public class UploadActivity extends AppCompatActivity {
 
                             String camera_allow = storeData.getCAMERA_ALLOW();
 
-                            String onXML = "[DATA][USER_DATA][STORE_CD]"
+                            String onXML =
-                                    + coverageList.get(i).getStoreId()
+                                    "[DATA][USER_DATA][STORE_CD]"
-                                    + "[/STORE_CD]" + "[VISIT_DATE]"
+                                            + coverageList.get(i).getStoreId()
-                                    + coverageList.get(i).getVisitDate()
+                                            + "[/STORE_CD]" + "[VISIT_DATE]"
-                                    + "[/VISIT_DATE][LATITUDE]"
+                                            + coverageList.get(i).getVisitDate()
-                                    + coverageList.get(i).getLatitude()
+                                            + "[/VISIT_DATE][LATITUDE]"
-                                    + "[/LATITUDE][APP_VERSION]"
+                                            + coverageList.get(i).getLatitude()
-                                    + app_version
+                                            + "[/LATITUDE][APP_VERSION]"
-                                    + "[/APP_VERSION][LONGITUDE]"
+                                            + app_version
-                                    + coverageList.get(i).getLongitude()
+                                            + "[/APP_VERSION][LONGITUDE]"
-                                    + "[/LONGITUDE][IN_TIME]"
+                                            + coverageList.get(i).getLongitude()
-                                    + coverageList.get(i).getInTime()
+                                            + "[/LONGITUDE][IN_TIME]"
-                                    + "[/IN_TIME][OUT_TIME]"
+                                            + coverageList.get(i).getInTime()
-                                    + coverageList.get(i).getOutTime()
+                                            + "[/IN_TIME][OUT_TIME]"
-                                    + "[/OUT_TIME][UPLOAD_STATUS]"
+                                            + coverageList.get(i).getOutTime()
-                                    + "N"
+                                            + "[/OUT_TIME][UPLOAD_STATUS]"
-                                    + "[/UPLOAD_STATUS][USER_ID]" + userId
+                                            + "N"
-                                    + "[/USER_ID][IMAGE_URL]" + coverageList.get(i).getImage()
+                                            + "[/UPLOAD_STATUS][USER_ID]" + userId
-                                    + "[/IMAGE_URL][REASON_ID]"
+                                            + "[/USER_ID][IMAGE_URL]" + coverageList.get(i).getImage()
-                                    + coverageList.get(i).getReasonid()
+                                            + "[/IMAGE_URL][REASON_ID]"
-                                    + "[/REASON_ID][REASON_REMARK]"
+                                            + coverageList.get(i).getReasonid()
-                                    + coverageList.get(i).getRemark()
+                                            + "[/REASON_ID][REASON_REMARK]"
-                                    + "[/REASON_REMARK][CAMERA_ALLOWED]"
+                                            + coverageList.get(i).getRemark()
-                                    + camera_allow
+                                            + "[/REASON_REMARK][CAMERA_ALLOWED]"
-                                    + "[/CAMERA_ALLOWED][/USER_DATA][/DATA]";
+                                            + camera_allow
+                                            + "[/CAMERA_ALLOWED][/USER_DATA][/DATA]";
 
-
+                            SoapObject request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_UPLOAD_COVERAGE);
-
-                            SoapObject request = new SoapObject(
-                                    CommonString.NAMESPACE,
-                                    CommonString.METHOD_UPLOAD_COVERAGE);
                             request.addProperty("onXML", onXML);
 
-                            SoapSerializationEnvelope envelope = new SoapSerializationEnvelope(
+                            SoapSerializationEnvelope envelope = new SoapSerializationEnvelope(SoapEnvelope.VER11);
-                                    SoapEnvelope.VER11);
                             envelope.dotNet = true;
                             envelope.setOutputSoapObject(request);
 
-                            HttpTransportSE androidHttpTransport = new HttpTransportSE(
+                            HttpTransportSE androidHttpTransport = new HttpTransportSE(CommonString.URL);
-                                    CommonString.URL);
+                            androidHttpTransport.call(CommonString.SOAP_ACTION_UPLOAD_STORE_COVERAGE, envelope);
-
-
-                            androidHttpTransport
-                                    .call(CommonString.SOAP_ACTION_UPLOAD_STORE_COVERAGE,
-                                            envelope);
 
                             Object result = (Object) envelope.getResponse();
 
-
                             datacheck = result.toString();
                             words = datacheck.split("\\;");
                             validity = (words[0]);
 
-                            if (validity
+                            if (validity.equalsIgnoreCase(CommonString.KEY_SUCCESS)) {
-                                    .equalsIgnoreCase(CommonString.KEY_SUCCESS)) {
+                                db.updateCoverageStatus(coverageList.get(i).getStoreId(), CommonString.KEY_P);
-                                db.updateCoverageStatus(coverageList
-                                        .get(i).getStoreId(), CommonString.KEY_P);
 
-                                db.updateStoreStatusOnLeave(
+                                db.updateStoreStatusOnLeave(coverageList.get(i).getStoreId(), date, CommonString.KEY_P);
-                                        coverageList.get(i).getStoreId(),
-                                        date, CommonString.KEY_P);
                             } else {
-
                                 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 = "";
+                            onXML = "";
+                            msl_availabilityList = db.getMSL_AvailabilityUploadServerData(coverageList.get(i).getStoreId());
+
+                            if (msl_availabilityList.size() > 0) {
+                                for (int j = 0; j < msl_availabilityList.size(); j++) {
+                                    if (!msl_availabilityList.get(j).getSku_id().equals("0")) {
+
+                                        onXML = "[MSL_AVAILABILITY_DATA]"
+                                                + "[MID]" + mid + "[/MID]"
+                                                + "[USER_ID]" + userId + "[/USER_ID]"
+                                                + "[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]"
+                                                + "[TOGGLE_VALUE]" + Integer.parseInt(msl_availabilityList.get(j).getToggleValue()) + "[/TOGGLE_VALUE]"
+                                                + "[/MSL_AVAILABILITY_DATA]";
+
+                                        mslAvailability_xml = mslAvailability_xml + onXML;
+                                    }
+                                }
+
+                                final String sos_xml = "[DATA]" + mslAvailability_xml + "[/DATA]";
+
+                                request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_UPLOAD_STOCK_XML_DATA);
+                                request.addProperty("XMLDATA", sos_xml);
+                                request.addProperty("KEYS", "MSL_AVAILABILITY_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 = 10;
+                            data.name = "MSL_Availability Uploading";
+                            publishProgress(data);
+
+
+                            //Stock and Facing
+
+
+                            
+
+                            // SET COVERAGE STATUS
+                            String final_xml = "";
+                            onXML = "";
+                            onXML = "[COVERAGE_STATUS][STORE_ID]"
+                                    + coverageList.get(i).getStoreId()
+                                    + "[/STORE_ID]"
+                                    + "[VISIT_DATE]"
+                                    + coverageList.get(i).getVisitDate()
+                                    + "[/VISIT_DATE]"
+                                    + "[USER_ID]"
+                                    + coverageList.get(i).getUserId()
+                                    + "[/USER_ID]"
+                                    + "[STATUS]"
+                                    + CommonString.KEY_U
+                                    + "[/STATUS]"
+                                    + "[/COVERAGE_STATUS]";
+
+                            final_xml = final_xml + onXML;
+
+                            final String sos_xml = "[DATA]" + final_xml + "[/DATA]";
+
+                            request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_UPLOAD_COVERAGE_STATUS);
+                            request.addProperty("onXML", sos_xml);
+
+                            envelope = new SoapSerializationEnvelope(SoapEnvelope.VER11);
+                            envelope.dotNet = true;
+                            envelope.setOutputSoapObject(request);
+
+                            androidHttpTransport = new HttpTransportSE(CommonString.URL);
+                            androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_COVERAGE_STATUS, envelope);
+
+                            result = (Object) 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;
+                            }
+
+                            db.open();
+                            db.updateCoverageStatus(coverageList.get(i).getStoreId(), CommonString.KEY_U);
+                            db.updateStoreStatusOnLeave(coverageList.get(i).getStoreId(), coverageList.get(i)
+                                    .getVisitDate(), CommonString.KEY_U);
                         }
-
-                        mid = Integer.parseInt((words[1]));
-
-                        k = k + factor;
-                        data.value = k;
-                        data.name = "Uploading";
-
-                        publishProgress(data);
-
-                        String final_xml = "";
-                        // Add below------------------
-
-
-                        // SET COVERAGE STATUS
-
-                         final_xml = "";
-                        String onXML = "";
-                        onXML = "[COVERAGE_STATUS][STORE_ID]"
-                                + coverageList.get(i).getStoreId()
-                                + "[/STORE_ID]"
-                                + "[VISIT_DATE]"
-                                + coverageList.get(i).getVisitDate()
-                                + "[/VISIT_DATE]"
-                                + "[USER_ID]"
-                                + coverageList.get(i).getUserId()
-                                + "[/USER_ID]"
-                                + "[STATUS]"
-                                + CommonString.KEY_U
-                                + "[/STATUS]"
-                                + "[/COVERAGE_STATUS]";
-
-                        final_xml = final_xml + onXML;
-
-                        final String sos_xml = "[DATA]" + final_xml
-                                + "[/DATA]";
-
-                        SoapObject request = new SoapObject(
-                                CommonString.NAMESPACE,
-                                CommonString.METHOD_UPLOAD_COVERAGE_STATUS);
-                        request.addProperty("onXML", sos_xml);
-
-                        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_COVERAGE_STATUS,
-                                envelope);
-                        Object result = (Object) 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;
-                        }
-
-                        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) {
                 e.printStackTrace();
             } catch (XmlPullParserException e) {
                 e.printStackTrace();
             }
 
-
             return "";
         }
 
@@ -289,7 +310,7 @@ public class UploadActivity extends AppCompatActivity {
         protected void onPostExecute(String result) {
             super.onPostExecute(result);
 
-            if(result.equals("")){
+            if (result.equals("")) {
                 finish();
             }
         }

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

@@ -6,7 +6,7 @@ package cpm.com.gskmtorange.xmlGetterSetter;
 
 public class MSL_AvailabilityGetterSetter {
     String sub_category_id, sub_category, brand_id, brand,
-            sku_id, sku, mrp, sku_sequence, toggleValue,mbq;
+            sku_id, sku, mrp, sku_sequence, toggleValue,mbq,category_id;
 
     public String getSub_category_id() {
         return sub_category_id;
@@ -87,4 +87,12 @@ public class MSL_AvailabilityGetterSetter {
     public void setMbq(String mbq) {
         this.mbq = mbq;
     }
+
+    public String getCategory_id() {
+        return category_id;
+    }
+
+    public void setCategory_id(String category_id) {
+        this.category_id = category_id;
+    }
 }

GSKMTOrange/src/main/res/values/strings.xml

@@ -101,9 +101,6 @@
     <string name="title_store_list_download_data">Please Download Data First</string>
     <string name="enter_the_values">Enter the values</string>
 
-    <string name="yes">Yes</string>
-    <string name="no">No</string>
-
     <string name="title_activity_upload">Upload Data</string>
     <string name="no_data_for_upload">No Data For Upload</string>
     <string name="first_checkout_store">First checkout of store</string>