Msl_Availability_StockFacing_New Merge into Main Project

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

@@ -228,6 +228,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
 
         db.delete(CommonString.TABLE_INSERT_CATEGORY_PICTURE, null, null);
         db.delete(CommonString.TABLE_INSERT_CATEGORY_PICTURE_LIST, null, null);
+        db.delete(CommonString.TABLE_INSERT_MSL_AVAILABILITY_STOCK_FACING, null, null);
     }
 
     public void InsertJCP(JourneyPlanGetterSetter data) {
@@ -5005,6 +5006,8 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
                     cd.setSku_sequence(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SKU_SEQUENCE")));
                     cd.setMbq(dbcursor.getString(dbcursor.getColumnIndexOrThrow("MBQ")));
                     cd.setToggleValue(dbcursor.getString(dbcursor.getColumnIndexOrThrow("TOGGLE_VALUE")));
+                    cd.setFacing(dbcursor.getString(dbcursor.getColumnIndexOrThrow("FACING")));
+                    cd.setStock(dbcursor.getString(dbcursor.getColumnIndexOrThrow("STOCK")));
 
                     list.add(cd);
                     dbcursor.moveToNext();

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

@@ -107,7 +107,7 @@ public class CategoryListActivity extends AppCompatActivity {
                     boolean flag = true;
 
                     //MSL_Availability
-                    if (db.isMappingStockDataMSL_Availability(category_id, keyAccount_id, storeType_id, class_id)) {
+                    /*if (db.isMappingStockDataMSL_Availability(category_id, keyAccount_id, storeType_id, class_id)) {
                         if (!db.checkMsl_AvailabilityData(store_id, category_id)) {
                             flag = false;
                         }
@@ -120,15 +120,15 @@ public class CategoryListActivity extends AppCompatActivity {
                                 flag = false;
                             }
                         }
-                    }
+                    }*/
 
                     //New MSL_Availability_StockFacing
-                /*if (db.isMappingStockDataStockFacing(category_id, keyAccount_id, storeType_id, class_id)) {
+                    if (db.isMappingStockDataStockFacing(category_id, keyAccount_id, storeType_id, class_id)) {
                         if (!db.checkMsl_Availability_StockFacingData(store_id, category_id)) {
-                        flag_filled = false;
+                            flag = false;
                             break;
                         }
-                }*/
+                    }
 
                     //Promo Compliance
                     if (flag) {
@@ -326,7 +326,7 @@ public class CategoryListActivity extends AppCompatActivity {
             if (db.additionalVisibilitydata(store_id, category_id)) {
                 //boolean flag = true;
 
-                if (db.isMappingStockDataMSL_Availability(category_id, keyAccount_id, storeType_id, class_id)) {
+                /*if (db.isMappingStockDataMSL_Availability(category_id, keyAccount_id, storeType_id, class_id)) {
                     if (!db.checkMsl_AvailabilityData(store_id, category_id)) {
                         flag_filled = false;
                         break;
@@ -339,15 +339,15 @@ public class CategoryListActivity extends AppCompatActivity {
                         flag_filled = false;
                         break;
                     }
-                }
+                }*/
 
                 //New MSL_Availability_StockFacing
-                /*if (db.isMappingStockDataStockFacing(category_id, keyAccount_id, storeType_id, class_id)) {
+                if (db.isMappingStockDataStockFacing(category_id, keyAccount_id, storeType_id, class_id)) {
                     if (!db.checkMsl_Availability_StockFacingData(store_id, category_id)) {
                         flag_filled = false;
                         break;
                     }
-                }*/
+                }
 
                 if (db.isMappingPromotionData(store_id, category_id)) {
                     if (!db.checkPromoComplianceData(store_id, category_id)) {

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

@@ -105,8 +105,21 @@ public class DailyDataMenuActivity extends AppCompatActivity {
             categoryList = new ArrayList<>();
 
             DailyDataMenuGetterSetter data = new DailyDataMenuGetterSetter();
-            //data.setCategory_name("MSL Availability");
+            data = new DailyDataMenuGetterSetter();
             data.setCategory_name(getResources().getString(R.string.daily_data_menu_msl_availability));
+            if (db.isMappingStockDataStockFacing(categoryId, keyAccount_id, storeType_id, class_id)) {
+                if (db.checkMsl_Availability_StockFacingData(store_id, categoryId)) {
+                    data.setCategory_img(R.mipmap.msl_availability_done);
+                } else {
+                    data.setCategory_img(R.mipmap.msl_availability);
+                }
+            } else {
+                data.setCategory_img(R.mipmap.msl_availability_grey);
+            }
+            categoryList.add(data);
+
+
+            /*data.setCategory_name(getResources().getString(R.string.daily_data_menu_msl_availability));
             if (db.isMappingStockDataMSL_Availability(categoryId, keyAccount_id, storeType_id, class_id)) {
                 if (db.checkMsl_AvailabilityData(store_id, categoryId)) {
                     data.setCategory_img(R.mipmap.msl_availability_done);
@@ -131,12 +144,11 @@ public class DailyDataMenuActivity extends AppCompatActivity {
             } else {
                 data.setCategory_img(R.mipmap.stockandfacing_grey);
             }
-            categoryList.add(data);
+            categoryList.add(data);*/
 
             //T2p
             data = new DailyDataMenuGetterSetter();
             data.setCategory_name(getResources().getString(R.string.daily_data_menu_t2p));
-
             if (db.isMappingT2PData(store_id, categoryId)) {
                 if (db.isFilledT2P(store_id, categoryId)) {
                     data.setCategory_img(R.mipmap.t2p_compliance_done);
@@ -151,7 +163,6 @@ public class DailyDataMenuActivity extends AppCompatActivity {
 
             //T2p added
             data = new DailyDataMenuGetterSetter();
-            //data.setCategory_name("Additional Visibility");
             data.setCategory_name(getResources().getString(R.string.daily_data_menu_additional_visibility));
             if (db.additionalVisibilitydata(store_id, categoryId)) {
                 data.setCategory_img(R.mipmap.additional_visibility_done);
@@ -162,9 +173,7 @@ public class DailyDataMenuActivity extends AppCompatActivity {
 
 
             data = new DailyDataMenuGetterSetter();
-            //data.setCategory_name("Promo Compliance");
             data.setCategory_name(getResources().getString(R.string.daily_data_menu_promo_compliance));
-
             if (db.isMappingPromotionData(store_id, categoryId) || db.isMappingAdditionalPromotionData(store_id, categoryId)) {
                 if (db.checkPromoComplianceData(store_id, categoryId) ||
                         db.checkAdditionalPromoComplianceData(store_id, categoryId)) {
@@ -180,11 +189,8 @@ public class DailyDataMenuActivity extends AppCompatActivity {
 
             //Category Pictures
             data = new DailyDataMenuGetterSetter();
-            //data.setCategory_name("Additional Visibility");
             data.setCategory_name(getResources().getString(R.string.daily_data_menu_category_picture));
-
             if (camera_allow.equalsIgnoreCase("1")) {
-
                 if (db.isCategoryPictureData(store_id, categoryId)) {
                     data.setCategory_img(R.mipmap.picturecatogory_done);
                 } else {
@@ -196,19 +202,6 @@ public class DailyDataMenuActivity extends AppCompatActivity {
             categoryList.add(data);
 
 
-            //Temperory Add
-            data = new DailyDataMenuGetterSetter();
-            data.setCategory_name("MSL and Stock Facing");
-            if (db.isMappingStockDataStockFacing(categoryId, keyAccount_id, storeType_id, class_id)) {
-                if (db.checkMsl_Availability_StockFacingData(store_id, categoryId)) {
-                    data.setCategory_img(R.mipmap.msl_availability_done);
-                } else {
-                    data.setCategory_img(R.mipmap.msl_availability);
-                }
-            } else {
-                data.setCategory_img(R.mipmap.msl_availability_grey);
-            }
-            categoryList.add(data);
 
 
             /*data = new DailyDataMenuGetterSetter();
@@ -283,7 +276,7 @@ public class DailyDataMenuActivity extends AppCompatActivity {
             holder.categoryName.setText(dailyData.getCategory_name());
             holder.categoryIcon.setImageResource(dailyData.getCategory_img());
 
-            if (dailyData.getCategory_name().equalsIgnoreCase(getResources().getString(R.string.daily_data_menu_msl_availability))) {
+            /*if (dailyData.getCategory_name().equalsIgnoreCase(getResources().getString(R.string.daily_data_menu_msl_availability))) {
                 if (db.isMappingStockDataMSL_Availability(categoryId, keyAccount_id, storeType_id, class_id)) {
                     holder.categoryName.setTextColor(getResources().getColor(R.color.colorPrimaryDark));
                 } else {
@@ -295,7 +288,8 @@ public class DailyDataMenuActivity extends AppCompatActivity {
                 } else {
                     holder.categoryName.setTextColor(getResources().getColor(R.color.grey_background));
                 }
-            } else if (dailyData.getCategory_name().equalsIgnoreCase(getResources().getString(R.string.daily_data_menu_promo_compliance))) {
+            } else*/
+            if (dailyData.getCategory_name().equalsIgnoreCase(getResources().getString(R.string.daily_data_menu_promo_compliance))) {
                 if (db.isMappingPromotionData(store_id, categoryId) || db.isMappingAdditionalPromotionData(store_id, categoryId)) {
                     holder.categoryName.setTextColor(getResources().getColor(R.color.colorPrimaryDark));
                 } else {
@@ -307,21 +301,25 @@ public class DailyDataMenuActivity extends AppCompatActivity {
                 } else {
                     holder.categoryName.setTextColor(getResources().getColor(R.color.grey_background));
                 }
-
             } else if (dailyData.getCategory_name().equalsIgnoreCase((getResources().getString(R.string.daily_data_menu_category_picture)))) {
                 if (camera_allow.equalsIgnoreCase("1")) {
                     holder.categoryName.setTextColor(getResources().getColor(R.color.colorPrimaryDark));
                 } else {
                     holder.categoryName.setTextColor(getResources().getColor(R.color.grey_background));
                 }
-
+            }else if (dailyData.getCategory_name().equalsIgnoreCase(getResources().getString(R.string.daily_data_menu_msl_availability))) {
+                if (db.isMappingStockDataStockFacing(categoryId, keyAccount_id, storeType_id, class_id)) {
+                    holder.categoryName.setTextColor(getResources().getColor(R.color.colorPrimaryDark));
+                } else {
+                    holder.categoryName.setTextColor(getResources().getColor(R.color.grey_background));
+                }
             }
 
 
             holder.lay_menu.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View view) {
-                    if (dailyData.getCategory_name().equalsIgnoreCase(getResources().getString(R.string.daily_data_menu_msl_availability))) {
+                    /*if (dailyData.getCategory_name().equalsIgnoreCase(getResources().getString(R.string.daily_data_menu_msl_availability))) {
                         if (db.isMappingStockDataMSL_Availability(categoryId, keyAccount_id, storeType_id, class_id)) {
                             Intent intent = new Intent(DailyDataMenuActivity.this, MSL_AvailabilityActivity.class);
                             intent.putExtra("categoryName", dailyData.getCategory_name());
@@ -337,7 +335,8 @@ public class DailyDataMenuActivity extends AppCompatActivity {
                             startActivity(intent);
                         }
 
-                    } else if (dailyData.getCategory_name().equalsIgnoreCase(getResources().getString(R.string.daily_data_menu_promo_compliance))) {
+                    } else */
+                    if (dailyData.getCategory_name().equalsIgnoreCase(getResources().getString(R.string.daily_data_menu_promo_compliance))) {
                         if (db.isMappingPromotionData(store_id, categoryId) || db.isMappingAdditionalPromotionData(store_id, categoryId)) {
                             Intent intent = new Intent(DailyDataMenuActivity.this, PromoComplianceActivity.class);
                             intent.putExtra("categoryName", dailyData.getCategory_name());
@@ -371,8 +370,8 @@ public class DailyDataMenuActivity extends AppCompatActivity {
                         } /*else {
                         }*/
 
-                    } else if (dailyData.getCategory_name().equalsIgnoreCase("MSL and Stock Facing")) {
+                    } else if (dailyData.getCategory_name().equalsIgnoreCase(getResources().getString(R.string.daily_data_menu_msl_availability))) {
-                        if (db.isMappingStockDataMSL_Availability(categoryId, keyAccount_id, storeType_id, class_id)) {
+                        if (db.isMappingStockDataStockFacing(categoryId, keyAccount_id, storeType_id, class_id)) {
                             Intent intent = new Intent(DailyDataMenuActivity.this, MSL_Availability_StockFacingActivity.class);
                             intent.putExtra("categoryName", dailyData.getCategory_name());
                             intent.putExtra("categoryId", categoryId);

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

@@ -1,8 +1,10 @@
 package cpm.com.gskmtorange.gsk_dailyentry;
 
+import android.annotation.SuppressLint;
 import android.app.AlertDialog;
 import android.content.Context;
 import android.content.DialogInterface;
+import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.res.Configuration;
 import android.content.res.Resources;
@@ -14,6 +16,7 @@ import android.support.design.widget.Snackbar;
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.CardView;
 import android.support.v7.widget.Toolbar;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.MenuItem;
 import android.view.View;
@@ -39,6 +42,7 @@ import cpm.com.gskmtorange.Database.GSKOrangeDB;
 import cpm.com.gskmtorange.R;
 import cpm.com.gskmtorange.constant.CommonString;
 import cpm.com.gskmtorange.xmlGetterSetter.MSL_AvailabilityStockFacingGetterSetter;
+import cpm.com.gskmtorange.xmlGetterSetter.StockFacing_PlanogramTrackerDataGetterSetter;
 
 public class MSL_Availability_StockFacingActivity extends AppCompatActivity {
     ExpandableListView expandableListView;
@@ -53,14 +57,20 @@ public class MSL_Availability_StockFacingActivity extends AppCompatActivity {
     boolean checkflag = true;
 
     ExpandableListAdapter adapter;
+    ImageView camera1, camera2, camera3, camera4;
+    LinearLayout lin_camera1, lin_camera2, lin_camera3, lin_camera4;
 
     GSKOrangeDB db;
 
     String categoryName, categoryId, storeId, Error_Message = "";
-    String store_id, visit_date, username, intime, date, keyAccount_id, class_id, storeType_id;
+    String store_id, visit_date, username, intime, date, keyAccount_id, class_id, storeType_id, camera_allow;
     boolean isDialogOpen = true;
     private SharedPreferences preferences;
 
+    ArrayList<StockFacing_PlanogramTrackerDataGetterSetter> planogramShelfHeaderDataList = new ArrayList<>();
+    ArrayList<StockFacing_PlanogramTrackerDataGetterSetter> planogramSkuChildDataList;
+    HashMap<StockFacing_PlanogramTrackerDataGetterSetter, ArrayList<StockFacing_PlanogramTrackerDataGetterSetter>> planogramHashMapListChildData = new HashMap<>();
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -72,6 +82,16 @@ public class MSL_Availability_StockFacingActivity extends AppCompatActivity {
             expandableListView = (ExpandableListView) findViewById(R.id.expandableListView);
             txt_mslAvailabilityName = (TextView) findViewById(R.id.txt_mslAvailabilityName);
 
+            camera1 = (ImageView) findViewById(R.id.img_camera1);
+            camera2 = (ImageView) findViewById(R.id.img_camera2);
+            camera3 = (ImageView) findViewById(R.id.img_camera3);
+            camera4 = (ImageView) findViewById(R.id.img_camera4);
+
+            lin_camera1 = (LinearLayout) findViewById(R.id.lin_camera1);
+            lin_camera2 = (LinearLayout) findViewById(R.id.lin_camera2);
+            lin_camera3 = (LinearLayout) findViewById(R.id.lin_camera3);
+            lin_camera4 = (LinearLayout) findViewById(R.id.lin_camera4);
+
             db = new GSKOrangeDB(this);
             db.open();
 
@@ -87,6 +107,7 @@ public class MSL_Availability_StockFacingActivity extends AppCompatActivity {
             keyAccount_id = preferences.getString(CommonString.KEY_KEYACCOUNT_ID, "");
             class_id = preferences.getString(CommonString.KEY_CLASS_ID, "");
             storeType_id = preferences.getString(CommonString.KEY_STORETYPE_ID, "");
+            camera_allow = preferences.getString(CommonString.KEY_CAMERA_ALLOW, "");
 
             //Intent data
             categoryName = getIntent().getStringExtra("categoryName");
@@ -100,6 +121,11 @@ public class MSL_Availability_StockFacingActivity extends AppCompatActivity {
 
             prepareList();
 
+            //Camera
+            prepareDefaultList();
+
+            cameraMethod();
+
             final FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab);
             fab.setOnClickListener(new View.OnClickListener() {
                 @Override
@@ -133,7 +159,7 @@ public class MSL_Availability_StockFacingActivity extends AppCompatActivity {
                         alert.show();
                     } else {
                         AlertDialog.Builder builder = new AlertDialog.Builder(MSL_Availability_StockFacingActivity.this);
-                        builder.setMessage("Fill the value or fill 0 ")
+                        builder.setMessage(Error_Message)
                                 .setCancelable(false)
                                 .setPositiveButton("OK", new DialogInterface.OnClickListener() {
                                     public void onClick(DialogInterface dialog, int id) {
@@ -221,6 +247,154 @@ public class MSL_Availability_StockFacingActivity extends AppCompatActivity {
         }
     }
 
+    private void cameraMethod() {
+        /*cameraData = new Store_wise_camera_DataGetterSetter();
+
+        if (db.isStorewiseCameraSave(store_id, categoryId)) {
+            cameraData = db.getStore_wise_camera(store_id, categoryId);
+        } else {
+            cameraData.setStore_id(store_id);
+            cameraData.setCategory_id(categoryId);
+            cameraData.setCamera1("");
+            cameraData.setCamera2("");
+            cameraData.setCamera3("");
+            cameraData.setCamera4("");
+            cameraData.setCheckSaveStatus("0");
+        }
+
+
+        if (camera_allow.equals("1")) {
+
+            findViewById(R.id.view_camera2).setVisibility(View.VISIBLE);
+            findViewById(R.id.view_camera3).setVisibility(View.VISIBLE);
+
+            if (cameraData.getCamera1().equals("")) {
+                camera1.setBackgroundResource(R.mipmap.camera_orange);
+            } else {
+                camera1.setBackgroundResource(R.mipmap.camera_green);
+            }
+
+            if (cameraData.getCamera2().equals("")) {
+                camera2.setBackgroundResource(R.mipmap.camera_orange);
+            } else {
+                camera2.setBackgroundResource(R.mipmap.camera_green);
+            }
+
+            if (cameraData.getCamera3().equals("")) {
+                camera3.setBackgroundResource(R.mipmap.camera_orange);
+            } else {
+                camera3.setBackgroundResource(R.mipmap.camera_green);
+            }
+
+            if (cameraData.getCamera4().equals("")) {
+                camera4.setBackgroundResource(R.mipmap.camera_orange);
+            } else {
+                camera4.setBackgroundResource(R.mipmap.camera_green);
+            }
+
+
+            lin_camera1.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View view) {
+                    _pathforcheck = "Stock_Camera1_" + store_id + "_" + categoryId
+                            + "_" + visit_date.replace("/", "") + "_" + getCurrentTime().replace(":", "") + ".jpg";
+                    path = str + _pathforcheck;
+
+                    startCameraActivity(3);
+                }
+            });
+
+            lin_camera2.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View view) {
+                    _pathforcheck = "Stock_Camera2_" + store_id + "_" + categoryId
+                            + "_" + visit_date.replace("/", "") + "_" + getCurrentTime().replace(":", "") + ".jpg";
+                    path = str + _pathforcheck;
+
+                    startCameraActivity(4);
+                }
+            });
+
+            lin_camera3.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View view) {
+                    _pathforcheck = "Stock_Camera3_" + store_id + "_" + categoryId
+                            + "_" + visit_date.replace("/", "") + "_" + getCurrentTime().replace(":", "") + ".jpg";
+                    path = str + _pathforcheck;
+
+                    startCameraActivity(5);
+                }
+            });
+
+            lin_camera4.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View view) {
+                    _pathforcheck = "Stock_Camera4_" + store_id + "_" + categoryId
+                            + "_" + visit_date.replace("/", "") + "_" + getCurrentTime().replace(":", "") + ".jpg";
+                    path = str + _pathforcheck;
+
+                    startCameraActivity(6);
+                }
+            });
+
+        } else {*/
+
+        if (!camera_allow.equals("1")) {
+            findViewById(R.id.lin_camera).setVisibility(View.VISIBLE);
+
+            findViewById(R.id.view_camera2).setVisibility(View.GONE);
+            findViewById(R.id.view_camera3).setVisibility(View.GONE);
+
+            lin_camera2.setVisibility(View.GONE);
+            lin_camera3.setVisibility(View.GONE);
+            lin_camera4.setVisibility(View.GONE);
+
+            if (db.isPlanogramAddShelfSaveData(store_id, categoryId)) {
+                camera1.setBackgroundResource(R.mipmap.new_no_camera_done_edit);
+            } else {
+                camera1.setBackgroundResource(R.mipmap.new_no_camera);
+            }
+
+            lin_camera1.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View view) {
+                    Intent intent = new Intent(MSL_Availability_StockFacingActivity.this,
+                            StockFacing_PlanogramTrackerActivity.class);
+
+                    intent.putExtra("storeId", store_id);
+                    intent.putExtra("keyAccount_id", keyAccount_id);
+                    intent.putExtra("class_id", class_id);
+                    intent.putExtra("storeType_id", storeType_id);
+                    intent.putExtra("categoryId", categoryId);
+                    intent.putExtra("categoryName", categoryName);
+
+                    startActivityForResult(intent, 100);
+                }
+
+            });
+        } else {
+            findViewById(R.id.lin_camera).setVisibility(View.GONE);
+        }
+    }
+
+    //Planogram List for check and delete on backPress
+    private void prepareDefaultList() {
+        // Planogram After save shelf header data
+        planogramShelfHeaderDataList = db.getPlanogramAddShelfHeaderAfterSaveData(store_id, categoryId);
+
+        if (planogramShelfHeaderDataList.size() > 0) {
+
+            for (int i = 0; i < planogramShelfHeaderDataList.size(); i++) {
+                planogramSkuChildDataList = db.getStockAndFacingPlanogramAfterSKUData(planogramShelfHeaderDataList.get(i).getKey_id());
+
+                //After save sku child data
+                if (planogramSkuChildDataList.size() > 0) {
+                    planogramHashMapListChildData.put(planogramShelfHeaderDataList.get(i), planogramSkuChildDataList);
+                }
+            }
+        }
+    }
+
     @Override
     protected void onResume() {
         super.onResume();
@@ -271,6 +445,15 @@ public class MSL_Availability_StockFacingActivity extends AppCompatActivity {
 
                 //Company_id
                 if (listDataChild.get(listDataHeader.get(i)).get(j).getCompany_id().equals("1")) {
+
+                    if (!camera_allow.equalsIgnoreCase("1")) {
+                        if (!(planogramShelfHeaderDataList.size() > 0)) {
+                            flag = false;
+                            Error_Message = getResources().getString(R.string.stock_planogram_data_noCamera_data);
+                            break;
+                        }
+                    }
+
                     if (faceup.equals("")) {
                         if (!checkHeaderArray.contains(i)) {
                             checkHeaderArray.add(i);
@@ -330,6 +513,13 @@ public class MSL_Availability_StockFacingActivity extends AppCompatActivity {
             builder.setMessage(getResources().getString(R.string.data_will_be_lost)).setCancelable(false)
                     .setPositiveButton(getResources().getString(R.string.ok), new DialogInterface.OnClickListener() {
                         public void onClick(DialogInterface dialog, int id) {
+
+                            if (!validateData(hashMapListHeaderData, hashMapListChildData)) {
+                                if (!camera_allow.equals("1")) {
+                                    db.deletePlanogramListStoreAndCategorywise(store_id, categoryId,
+                                            planogramShelfHeaderDataList, planogramHashMapListChildData);
+                                }
+                            }
                             finish();
                         }
                     })
@@ -361,6 +551,13 @@ public class MSL_Availability_StockFacingActivity extends AppCompatActivity {
         builder.setMessage(getResources().getString(R.string.data_will_be_lost)).setCancelable(false)
                 .setPositiveButton(getResources().getString(R.string.ok), new DialogInterface.OnClickListener() {
                     public void onClick(DialogInterface dialog, int id) {
+                        if (!validateData(hashMapListHeaderData, hashMapListChildData)) {
+
+                            if (!camera_allow.equals("1")) {
+                                db.deletePlanogramListStoreAndCategorywise(store_id, categoryId,
+                                        planogramShelfHeaderDataList, planogramHashMapListChildData);
+                            }
+                        }
                         finish();
                     }
                 })
@@ -703,4 +900,23 @@ public class MSL_Availability_StockFacingActivity extends AppCompatActivity {
         return true;
     }
 
+    @SuppressLint("LongLogTag")
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        Log.e("MSL_AVailability_StockFacing", "resultCode: " + resultCode);
+
+        switch (requestCode) {
+            case 100:
+                //Planogram List for check and delete on backPress
+                prepareDefaultList();
+                if (db.isPlanogramAddShelfSaveData(store_id, categoryId)) {
+                    camera1.setBackgroundResource(R.mipmap.new_no_camera_done_edit);
+                } else {
+                    camera1.setBackgroundResource(R.mipmap.new_no_camera);
+                }
+
+                break;
+        }
+        super.onActivityResult(requestCode, resultCode, data);
+    }
 }

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

@@ -359,7 +359,7 @@ public class PreviousDataUploadActivity extends AppCompatActivity {
 
 
                             //MSL_Availability_StockFacing
-                            /*String mslAvailability_stockFacing_xml = "";
+                            String mslAvailability_stockFacing_xml = "";
                             onXML = "";
                             msl_availabilityStockFacingList = db.getMSL_Availability_StockFacing_UploadServerData(coverageList.get(i).getStoreId());
 
@@ -367,17 +367,23 @@ public class PreviousDataUploadActivity extends AppCompatActivity {
                                 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]"
+                                                //+ "[CATEGORY_ID]" + Integer.parseInt(msl_availabilityStockFacingList.get(j).getCategory_id()) + "[/CATEGORY_ID]"
-                                                + "[BRAND_ID]" + Integer.parseInt(msl_availabilityStockFacingList.get(j).getBrand_id()) + "[/BRAND_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]"
-                                                + "[TOGGLE_VALUE]" + Integer.parseInt(msl_availabilityStockFacingList.get(j).getToggleValue()) + "[/TOGGLE_VALUE]"
+                                                + "[AVAILABILITY]" + Integer.parseInt(msl_availabilityStockFacingList.get(j).getToggleValue()) + "[/AVAILABILITY]"
                                                 + "[FACING]" + Integer.parseInt(msl_availabilityStockFacingList.get(j).getFacing()) + "[/FACING]"
-                                                + "[STOCK]" + Integer.parseInt(msl_availabilityStockFacingList.get(j).getStock()) + "[/STOCK]"
+                                                + "[STOCK]" + Integer.parseInt(stock) + "[/STOCK]" +
-                                                + "[/MSL_AVAILABILITY_STOCK_FACING_DATA]";
+                                                "[/MSL_AVAILABILITY_STOCK_FACING_DATA]";
 
                                         mslAvailability_stockFacing_xml = mslAvailability_stockFacing_xml + onXML;
                                     }
@@ -414,7 +420,7 @@ public class PreviousDataUploadActivity extends AppCompatActivity {
                             }
                             data.value = 15;
                             data.name = getString(R.string.availability_data_uploading);
-                            publishProgress(data);*/
+                            publishProgress(data);
 
 
 

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

@@ -361,7 +361,7 @@ public class UploadActivity extends AppCompatActivity {
 
 
                             //MSL_Availability_StockFacing
-                            /*String mslAvailability_stockFacing_xml = "";
+                            String mslAvailability_stockFacing_xml = "";
                             onXML = "";
                             msl_availabilityStockFacingList = db.getMSL_Availability_StockFacing_UploadServerData(coverageList.get(i).getStoreId());
 
@@ -369,17 +369,23 @@ public class UploadActivity extends AppCompatActivity {
                                 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]"
+                                                //+ "[CATEGORY_ID]" + Integer.parseInt(msl_availabilityStockFacingList.get(j).getCategory_id()) + "[/CATEGORY_ID]"
-                                                + "[BRAND_ID]" + Integer.parseInt(msl_availabilityStockFacingList.get(j).getBrand_id()) + "[/BRAND_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]"
-                                                + "[TOGGLE_VALUE]" + Integer.parseInt(msl_availabilityStockFacingList.get(j).getToggleValue()) + "[/TOGGLE_VALUE]"
+                                                + "[AVAILABILITY]" + Integer.parseInt(msl_availabilityStockFacingList.get(j).getToggleValue()) + "[/AVAILABILITY]"
                                                 + "[FACING]" + Integer.parseInt(msl_availabilityStockFacingList.get(j).getFacing()) + "[/FACING]"
-                                                + "[STOCK]" + Integer.parseInt(msl_availabilityStockFacingList.get(j).getStock()) + "[/STOCK]"
+                                                + "[STOCK]" + Integer.parseInt(stock) + "[/STOCK]" +
-                                                + "[/MSL_AVAILABILITY_STOCK_FACING_DATA]";
+                                                "[/MSL_AVAILABILITY_STOCK_FACING_DATA]";
 
                                         mslAvailability_stockFacing_xml = mslAvailability_stockFacing_xml + onXML;
                                     }
@@ -416,7 +422,7 @@ public class UploadActivity extends AppCompatActivity {
                             }
                             data.value = 15;
                             data.name = getString(R.string.availability_data_uploading);
-                            publishProgress(data);*/
+                            publishProgress(data);
 
 
                             //Stock and Facing
@@ -1770,7 +1776,6 @@ public class UploadActivity extends AppCompatActivity {
         }
     }
 
-
     @Override
     protected void onResume() {
         super.onResume();

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

@@ -27,6 +27,107 @@
             android:textColor="@android:color/black"
             android:visibility="gone" />
 
+        <!--Camera Layout-->
+        <LinearLayout
+            android:id="@+id/lin_camera"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:weightSum="4">
+
+            <!--camera 1-->
+            <LinearLayout
+                android:id="@+id/lin_camera1"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:background="@drawable/layout_click_background_effect"
+                android:gravity="center_horizontal"
+                android:padding="5dp">
+
+                <ImageView
+                    android:id="@+id/img_camera1"
+                    android:layout_width="30dp"
+                    android:layout_height="30dp"
+                    android:layout_marginRight="10dp" />
+                <!--android:src="@mipmap/camera_orange"-->
+            </LinearLayout>
+
+            <View
+                android:layout_width="1dp"
+                android:layout_height="match_parent"
+                android:background="@color/grey_dark_background" />
+
+            <!--camera 2-->
+            <LinearLayout
+                android:id="@+id/lin_camera2"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:background="@drawable/layout_click_background_effect"
+                android:gravity="center_horizontal"
+                android:padding="5dp">
+
+                <ImageView
+                    android:id="@+id/img_camera2"
+                    android:layout_width="30dp"
+                    android:layout_height="30dp"
+                    android:layout_marginRight="10dp" />
+            </LinearLayout>
+
+            <View
+                android:id="@+id/view_camera2"
+                android:layout_width="1dp"
+                android:layout_height="match_parent"
+                android:background="@color/grey_dark_background" />
+
+            <!--camera 3-->
+            <LinearLayout
+                android:id="@+id/lin_camera3"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:background="@drawable/layout_click_background_effect"
+                android:gravity="center_horizontal"
+                android:padding="5dp">
+
+                <ImageView
+                    android:id="@+id/img_camera3"
+                    android:layout_width="30dp"
+                    android:layout_height="30dp"
+                    android:layout_marginRight="10dp" />
+            </LinearLayout>
+
+            <View
+                android:id="@+id/view_camera3"
+                android:layout_width="1dp"
+                android:layout_height="match_parent"
+                android:background="@color/grey_dark_background" />
+
+            <!--camera 4-->
+            <LinearLayout
+                android:id="@+id/lin_camera4"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:background="@drawable/layout_click_background_effect"
+                android:gravity="center_horizontal"
+                android:padding="5dp">
+
+                <ImageView
+                    android:id="@+id/img_camera4"
+                    android:layout_width="30dp"
+                    android:layout_height="30dp"
+                    android:layout_marginRight="10dp" />
+            </LinearLayout>
+
+        </LinearLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:background="@color/grey_dark_background" />
+
         <LinearLayout
             android:id="@+id/lin_category"
             android:layout_width="match_parent"