//PromoCompliance Default Toggle Changes

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

@@ -3598,4 +3598,53 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
         return Data;
     }
 
+    public ArrayList<StockFacing_PlanogramTrackerDataGetterSetter> getStockAndFacingPlanogramDefaultSKUData(
+            String category_id, String brand_id, String keyAccount_id, String storeType_id, String class_id) {
+
+        ArrayList<StockFacing_PlanogramTrackerDataGetterSetter> list = new ArrayList<>();
+        Cursor dbcursor = null;
+
+        try {
+            dbcursor = db.rawQuery("Select DISTINCT SK.SKU_ID,SK.SKU,SK.MRP,SK.SKU_SEQUENCE,M.MBQ,BR.COMPANY_ID " +
+                    "from MAPPING_STOCK M " +
+                    "inner join SKU_MASTER SK " +
+                    "on M.SKU_ID=SK.SKU_ID " +
+                    "inner join BRAND_MASTER BR " +
+                    "on SK.BRAND_ID=BR.BRAND_ID " +
+                    "inner join SUB_CATEGORY_MASTER SB " +
+                    "on BR.SUB_CATEGORY_ID=SB.SUB_CATEGORY_ID " +
+                    "inner join CATEGORY_MASTER CA " +
+                    "on SB.CATEGORY_ID=CA.CATEGORY_ID " +
+                    "where CA.CATEGORY_ID='" + category_id + "' AND BR.BRAND_ID='" + brand_id +
+                    "' AND M.KEYACCOUNT_ID = '" + keyAccount_id + "' AND M.STORETYPE_ID = '" + storeType_id +
+                    "' AND M.CLASS_ID = '" + class_id + "'", null);
+
+            if (dbcursor != null) {
+
+                dbcursor.moveToFirst();
+                while (!dbcursor.isAfterLast()) {
+                    StockFacing_PlanogramTrackerDataGetterSetter cd = new StockFacing_PlanogramTrackerDataGetterSetter();
+
+                    cd.setSku_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SKU_ID")));
+                    cd.setSku(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SKU")));
+                    cd.setMrp(dbcursor.getString(dbcursor.getColumnIndexOrThrow("MRP")));
+                    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("");
+                    cd.setFacing("");*/
+                    cd.setCheckbox_sku("0");
+
+                    list.add(cd);
+                    dbcursor.moveToNext();
+                }
+                dbcursor.close();
+                return list;
+            }
+        } catch (Exception e) {
+            Log.d("Exception ", "get MSL_AvailabilityHeader!" + e.toString());
+            return list;
+        }
+        return list;
+    }
 }

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

@@ -5,9 +5,14 @@ import android.app.Dialog;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
+import android.content.SharedPreferences;
 import android.content.res.Resources;
+import android.graphics.Typeface;
 import android.graphics.drawable.ColorDrawable;
 import android.os.Bundle;
+import android.preference.PreferenceManager;
+import android.support.design.widget.FloatingActionButton;
+import android.support.design.widget.Snackbar;
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.CardView;
 import android.support.v7.widget.Toolbar;
@@ -15,12 +20,17 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.Window;
+import android.view.inputmethod.InputMethodManager;
+import android.widget.AbsListView;
 import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
 import android.widget.BaseExpandableListAdapter;
 import android.widget.Button;
+import android.widget.CheckBox;
+import android.widget.CompoundButton;
 import android.widget.EditText;
 import android.widget.ExpandableListView;
+import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.Spinner;
 import android.widget.TextView;
@@ -32,6 +42,7 @@ import java.util.List;
 
 import cpm.com.gskmtorange.Database.GSKOrangeDB;
 import cpm.com.gskmtorange.R;
+import cpm.com.gskmtorange.constant.CommonString;
 import cpm.com.gskmtorange.xmlGetterSetter.StockFacing_PlanogramTrackerDataGetterSetter;
 import cpm.com.gskmtorange.xmlGetterSetter.Stock_FacingGetterSetter;
 
@@ -43,12 +54,15 @@ public class StockFacing_PlanogramTrackerActivity extends AppCompatActivity {
     ArrayAdapter<String> shelfPositionAdapter, shelfAdapter;
     ArrayList<StockFacing_PlanogramTrackerDataGetterSetter> shelfList;
     GSKOrangeDB db;
-    ExpandableListAdapter adapter;
+    PlanogramExpandableListAdapter adapter;
+    String categoryName, categoryId, Error_Message = "";
 
     ArrayList<StockFacing_PlanogramTrackerDataGetterSetter> headerDataList = new ArrayList<>();
-    ArrayList<StockFacing_PlanogramTrackerDataGetterSetter> childDataList;
+    ArrayList<StockFacing_PlanogramTrackerDataGetterSetter> childDataList, tempChildDataList;
-    List<StockFacing_PlanogramTrackerDataGetterSetter> hashMapListHeaderData;
+    HashMap<StockFacing_PlanogramTrackerDataGetterSetter, List<StockFacing_PlanogramTrackerDataGetterSetter>> hashMapListChildData = new HashMap<>();
-    HashMap<StockFacing_PlanogramTrackerDataGetterSetter, List<StockFacing_PlanogramTrackerDataGetterSetter>> hashMapListChildData;
+
+    private SharedPreferences preferences;
+    String store_id, visit_date, username, intime, date, keyAccount_id, class_id, storeType_id, camera_allow;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -62,8 +76,24 @@ public class StockFacing_PlanogramTrackerActivity extends AppCompatActivity {
             db = new GSKOrangeDB(this);
             db.open();
 
+            preferences = PreferenceManager.getDefaultSharedPreferences(this);
+            //updateResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, ""));
+
+            store_id = preferences.getString(CommonString.KEY_STORE_ID, null);
+            visit_date = preferences.getString(CommonString.KEY_DATE, null);
+            date = preferences.getString(CommonString.KEY_DATE, null);
+            username = preferences.getString(CommonString.KEY_USERNAME, null);
+            intime = preferences.getString(CommonString.KEY_STORE_IN_TIME, "");
+            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, "");
+
+            categoryName = getIntent().getStringExtra("categoryName");
+            categoryId = getIntent().getStringExtra("categoryId");
+
             btn_addShelf = (Button) findViewById(R.id.btn_addShelf);
-            expandableListView = (ExpandableListView) findViewById(R.id.exp_stockFacing_PlanogramTrackerListView);
+            expandableListView = (ExpandableListView) findViewById(R.id.exp_PlanogramListView);
 
             Intent intent = getIntent();
             brand = intent.getStringExtra("brand");
@@ -90,7 +120,15 @@ public class StockFacing_PlanogramTrackerActivity extends AppCompatActivity {
             }
 
             //Add Shelf Header Data
-            prepareHeaderList(headerDataList);
+            //prepareHeaderList(headerDataList);
+
+            /*StockFacing_PlanogramTrackerDataGetterSetter sb = new StockFacing_PlanogramTrackerDataGetterSetter();
+            sb.setSp_addShelf_id("1");
+            sb.setSp_addShelf("Shelf1");
+            sb.setSp_shelfPosition("1");
+
+            headerDataList.add(sb);
+            prepareHeaderList(headerDataList);*/
 
             btn_addShelf.setOnClickListener(new View.OnClickListener() {
                 @Override
@@ -169,13 +207,117 @@ public class StockFacing_PlanogramTrackerActivity extends AppCompatActivity {
             });
 
 
-        /*FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab);
+            final FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab_stockFacing_PlanogramTracker);
             fab.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View view) {
                     Snackbar.make(view, "Replace with your own action", Snackbar.LENGTH_LONG)
                             .setAction("Action", null).show();
                 }
+            });
+
+            expandableListView.setOnScrollListener(new AbsListView.OnScrollListener() {
+                @Override
+                public void onScroll(AbsListView view, int firstVisibleItem, int visibleItemCount, int totalItemCount) {
+                    int lastItem = firstVisibleItem + visibleItemCount;
+
+                    if (firstVisibleItem == 0) {
+                        fab.setVisibility(View.VISIBLE);
+                    } else if (lastItem == totalItemCount) {
+                        fab.setVisibility(View.INVISIBLE);
+                    } else {
+                        fab.setVisibility(View.VISIBLE);
+                    }
+                }
+
+                @Override
+                public void onScrollStateChanged(AbsListView arg0, int arg1) {
+                    InputMethodManager inputManager = (InputMethodManager) getApplicationContext()
+                            .getSystemService(Context.INPUT_METHOD_SERVICE);
+                    if (getCurrentFocus() != null) {
+                        inputManager.hideSoftInputFromWindow(getCurrentFocus().getWindowToken(), 0);
+                        getCurrentFocus().clearFocus();
+                    }
+
+                    //expandableListView.invalidateViews();
+                }
+            });
+
+            expandableListView.setOnGroupClickListener(new ExpandableListView.OnGroupClickListener() {
+                @Override
+                public boolean onGroupClick(ExpandableListView parent, View v, int groupPosition, long id) {
+                    return true;
+                }
+            });
+
+            /*expandableListView.setOnScrollListener(new AbsListView.OnScrollListener() {
+                @Override
+                public void onScroll(AbsListView view, int firstVisibleItem, int visibleItemCount, int totalItemCount) {
+                    int lastItem = firstVisibleItem + visibleItemCount;
+
+                    *//*if (firstVisibleItem == 0) {
+                        fab.setVisibility(View.VISIBLE);
+                    } else if (lastItem == totalItemCount) {
+                        fab.setVisibility(View.INVISIBLE);
+                    } else {
+                        fab.setVisibility(View.VISIBLE);
+                    }*//*
+                }
+
+                @Override
+                public void onScrollStateChanged(AbsListView arg0, int arg1) {
+                    InputMethodManager inputManager = (InputMethodManager) getApplicationContext()
+                            .getSystemService(Context.INPUT_METHOD_SERVICE);
+                    if (getCurrentFocus() != null) {
+                        inputManager.hideSoftInputFromWindow(getCurrentFocus().getWindowToken(), 0);
+                        getCurrentFocus().clearFocus();
+                    }
+
+                    //expandableListView.invalidateViews();
+                }
+            });
+
+            // Listview Group click listener
+            expandableListView.setOnGroupClickListener(new ExpandableListView.OnGroupClickListener() {
+                @Override
+                public boolean onGroupClick(ExpandableListView parent, View v, int groupPosition, long id) {
+                    return false;
+                }
+            });
+
+            // Listview Group expanded listener
+            expandableListView.setOnGroupExpandListener(new ExpandableListView.OnGroupExpandListener() {
+                @Override
+                public void onGroupExpand(int groupPosition) {
+                    InputMethodManager inputManager = (InputMethodManager) getApplicationContext()
+                            .getSystemService(Context.INPUT_METHOD_SERVICE);
+                    if (getWindow().getCurrentFocus() != null) {
+                        inputManager.hideSoftInputFromWindow(getCurrentFocus().getWindowToken(), 0);
+                        getCurrentFocus().clearFocus();
+                    }
+                }
+            });
+
+            // Listview Group collasped listener
+            expandableListView.setOnGroupCollapseListener(new ExpandableListView.OnGroupCollapseListener() {
+                @Override
+                public void onGroupCollapse(int groupPosition) {
+                    InputMethodManager inputManager = (InputMethodManager) getApplicationContext()
+                            .getSystemService(Context.INPUT_METHOD_SERVICE);
+                    if (getWindow().getCurrentFocus() != null) {
+                        inputManager.hideSoftInputFromWindow(getCurrentFocus().getWindowToken(), 0);
+                        getCurrentFocus().clearFocus();
+                    }
+                }
+            });
+
+            // Listview on child click listener
+            expandableListView.setOnChildClickListener(new ExpandableListView.OnChildClickListener() {
+                @Override
+                public boolean onChildClick(ExpandableListView parent, View v, int groupPosition,
+                                            int childPosition, long id) {
+                    return false;
+                }
             });*/
         } catch (Resources.NotFoundException e) {
             e.printStackTrace();
@@ -184,28 +326,78 @@ public class StockFacing_PlanogramTrackerActivity extends AppCompatActivity {
 
     private void prepareHeaderList(ArrayList<StockFacing_PlanogramTrackerDataGetterSetter> headerDataList) {
         try {
-            hashMapListHeaderData = new ArrayList<>();
-            hashMapListChildData = new HashMap<>();
-
             //Header Data
             if (headerDataList.size() > 0) {
-                hashMapListHeaderData.addAll(headerDataList);
-            //    adapter.notifyDataSetChanged();
-            }
 
-            adapter = new ExpandableListAdapter(this, hashMapListHeaderData, hashMapListChildData);
+                /*for (int i = 0; i < headerDataList.size(); i++) {
+                    hashMapListChildData.put(headerDataList.get(i), childDataList);
+
+                    *//*if (childDataList != null && childDataList.size() > 0) {
+                        if (headerDataList.get(i).getSp_addShelf_id().equals(childDataList.get(i).getSp_addShelf_id())) {
+                            hashMapListChildData.put(headerDataList.get(i), childDataList);
+                        } else {
+                            hashMapListChildData.put(headerDataList.get(i), tempChildDataList);
+                        }
+                    } else {
+                        hashMapListChildData.put(headerDataList.get(i), tempChildDataList);
+                    }*//*
+                }*/
+
+                adapter = new PlanogramExpandableListAdapter(this, headerDataList, hashMapListChildData);
                 expandableListView.setAdapter(adapter);
+
+                if (childDataList != null && childDataList.size() > 0) {
+                    for (int j = 0; j < headerDataList.size(); j++) {
+                        if (hashMapListChildData.get(headerDataList.get(j)).size() > 0) {
+                            expandableListView.expandGroup(j);
+                        }
+                    }
+                }
+            }
         } catch (Exception e) {
             e.printStackTrace();
         }
     }
 
-    public class ExpandableListAdapter extends BaseExpandableListAdapter {
+    private void prepareSkuList(ArrayList<StockFacing_PlanogramTrackerDataGetterSetter> childDataList1,
+                                StockFacing_PlanogramTrackerDataGetterSetter object) {
+        try {
+            if (headerDataList.size() > 0) {
+
+                hashMapListChildData.put(object, childDataList1);
+                /*//Child Sku Data
+                for (int i = 0; i < headerDataList.size(); i++) {
+                    if (object.getSp_addShelf_id().equals(headerDataList.get(i).getSp_addShelf_id())) {
+                        hashMapListChildData.put(object, childDataList1);
+                    } else {
+                        hashMapListChildData.put(headerDataList.get(i), childDataList);
+                    }
+                }*/
+
+/*                adapter = new PlanogramExpandableListAdapter(this, headerDataList, hashMapListChildData);
+                expandableListView.setAdapter(adapter);*/
+                expandableListView.invalidate();
+
+
+                if (childDataList != null && childDataList.size() > 0) {
+                    for (int j = 0; j < headerDataList.size(); j++) {
+                        if (hashMapListChildData.get(headerDataList.get(j)).size() > 0) {
+                            expandableListView.expandGroup(j);
+                        }
+                    }
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    public class PlanogramExpandableListAdapter extends BaseExpandableListAdapter {
         private Context _context;
         private List<StockFacing_PlanogramTrackerDataGetterSetter> _listDataHeader;
         private HashMap<StockFacing_PlanogramTrackerDataGetterSetter, List<StockFacing_PlanogramTrackerDataGetterSetter>> _listDataChild;
 
-        public ExpandableListAdapter(Context context, List<StockFacing_PlanogramTrackerDataGetterSetter> listDataHeader,
+        public PlanogramExpandableListAdapter(Context context, List<StockFacing_PlanogramTrackerDataGetterSetter> listDataHeader,
                                               HashMap<StockFacing_PlanogramTrackerDataGetterSetter, List<StockFacing_PlanogramTrackerDataGetterSetter>> listChildData) {
             this._context = context;
             this._listDataHeader = listDataHeader;
@@ -228,13 +420,13 @@ public class StockFacing_PlanogramTrackerActivity extends AppCompatActivity {
         }
 
         @Override
-        public View getGroupView(final int groupPosition, boolean isExpanded, View convertView, ViewGroup parent) {
+        public View getGroupView(int groupPosition, boolean isExpanded, View convertView, ViewGroup parent) {
             final StockFacing_PlanogramTrackerDataGetterSetter headerTitle =
                     (StockFacing_PlanogramTrackerDataGetterSetter) getGroup(groupPosition);
 
             if (headerTitle != null) {
                 if (convertView == null) {
-                    LayoutInflater infalInflater = (LayoutInflater) this._context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+                    LayoutInflater infalInflater = (LayoutInflater) _context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
                     convertView = infalInflater.inflate(R.layout.item_stock_facing_planogram_header, null, false);
 
                     TextView txt_shelfHeader = (TextView) convertView.findViewById(R.id.txt_shelfHeader);
@@ -245,7 +437,71 @@ public class StockFacing_PlanogramTrackerActivity extends AppCompatActivity {
                     btn_addSku.setOnClickListener(new View.OnClickListener() {
                         @Override
                         public void onClick(View view) {
+                            //Stock Facing Planogram SKU Data
+                            tempChildDataList = db.getStockAndFacingPlanogramDefaultSKUData(categoryId, brand_id,
+                                    keyAccount_id, storeType_id, class_id);
 
+                            final Dialog dialog1 = new Dialog(StockFacing_PlanogramTrackerActivity.this);
+                            dialog1.requestWindowFeature(Window.FEATURE_NO_TITLE);
+                            dialog1.getWindow().setBackgroundDrawable(new ColorDrawable(android.graphics.Color.TRANSPARENT));
+                            dialog1.setContentView(R.layout.dialog_stock_facing_planogram_tracker_add_sku);
+
+                            LinearLayout lin_addSku = (LinearLayout) dialog1.findViewById(R.id.lin_addSku);
+                            Button addSKU = (Button) dialog1.findViewById(R.id.dialog_btn_addSku_Shelf);
+                            Button cancel = (Button) dialog1.findViewById(R.id.dialog_btn_cancel_addSku);
+
+                            cancel.setOnClickListener(new View.OnClickListener() {
+                                @Override
+                                public void onClick(View view) {
+                                    dialog1.dismiss();
+                                }
+                            });
+
+                            childDataList = new ArrayList<>();
+
+                            for (int i = 0; i < tempChildDataList.size(); i++) {
+                                View view1 = getLayoutInflater().inflate(R.layout.item_stock_facing_planogram_child, null);
+
+                                TextView txt_skuChild = (TextView) view1.findViewById(R.id.txt_skuChild);
+                                CheckBox chk_sku = (CheckBox) view1.findViewById(R.id.chk_sku);
+
+                                final StockFacing_PlanogramTrackerDataGetterSetter childData = tempChildDataList.get(i);
+                                txt_skuChild.setText(childData.getSku());
+
+                                childData.setSp_addShelf_id(headerTitle.getSp_addShelf_id());
+
+                                if (childData.getCheckbox_sku().equals("0")) {
+                                    chk_sku.setChecked(false);
+                                } else if (childData.getCheckbox_sku().equals("1")) {
+                                    chk_sku.setChecked(true);
+                                }
+
+                                chk_sku.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
+                                    @Override
+                                    public void onCheckedChanged(CompoundButton compoundButton, boolean isCheck) {
+                                        if (isCheck) {
+                                            childData.setCheckbox_sku("1");
+                                        } else {
+                                            childData.setCheckbox_sku("0");
+                                        }
+                                    }
+                                });
+
+                                childDataList.add(childData);
+                                lin_addSku.addView(view1);
+                            }
+
+                            addSKU.setOnClickListener(new View.OnClickListener() {
+                                @Override
+                                public void onClick(View view) {
+                                    /*headerTitle.getShelf_id();
+                                    childDataList.size();*/
+
+                                    prepareSkuList(childDataList, headerTitle);
+                                    dialog1.dismiss();
+                                }
+                            });
+                            dialog1.show();
                         }
                     });
                 }
@@ -270,27 +526,34 @@ public class StockFacing_PlanogramTrackerActivity extends AppCompatActivity {
         }
 
         @Override
-        public View getChildView(final int groupPosition, final int childPosition, boolean isLastChild, View convertView, ViewGroup parent) {
+        public View getChildView(int groupPosition, final int childPosition, boolean isLastChild, View convertView, ViewGroup parent) {
-            final StockFacing_PlanogramTrackerDataGetterSetter childData =
+            StockFacing_PlanogramTrackerDataGetterSetter childData =
                     (StockFacing_PlanogramTrackerDataGetterSetter) getChild(groupPosition, childPosition);
-            ViewHolder holder = null;
+            //ViewHolder holder = null;
 
             if (convertView == null) {
-                LayoutInflater infalInflater = (LayoutInflater) this._context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+                LayoutInflater infalInflater = (LayoutInflater) _context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-                convertView = infalInflater.inflate(R.layout.item_stock_facing_child, null, false);
+                convertView = infalInflater.inflate(R.layout.item_stock_facing_planogram_child, null, false);
 
-                holder = new ViewHolder();
+                //holder = new ViewHolder();
-                holder.cardView = (CardView) convertView.findViewById(R.id.card_view);
+                TextView txt_skuChild = (TextView) convertView.findViewById(R.id.txt_skuChild);
-                holder.lin_category = (LinearLayout) convertView.findViewById(R.id.lin_category);
+                CheckBox checkBox = (CheckBox) convertView.findViewById(R.id.chk_sku);
+                //checkBox.setVisibility(View.GONE);
+                checkBox.setEnabled(false);
 
-                holder.txt_skuName = (TextView) convertView.findViewById(R.id.txt_skuName);
+                txt_skuChild.setText(childData.getSku());
-                holder.ed_stock = (EditText) convertView.findViewById(R.id.ed_stock);
+
-                holder.ed_facing = (EditText) convertView.findViewById(R.id.ed_facing);
+                if (childData.getCheckbox_sku().equals("1")) {
-                convertView.setTag(holder);
+                    checkBox.setChecked(true);
-            } else {
-                holder = (ViewHolder) convertView.getTag();
                 }
 
+
+                //convertView.setTag(holder);
+            } /*else {
+                holder = (ViewHolder) convertView.getTag();
+            }*/
+
+
             return convertView;
         }
 
@@ -306,9 +569,7 @@ public class StockFacing_PlanogramTrackerActivity extends AppCompatActivity {
     }
 
     public class ViewHolder {
-        EditText ed_stock, ed_facing;
+        TextView txt_skuChild;
-        CardView cardView;
+        CheckBox checkBox;
-        TextView txt_skuName;
-        LinearLayout lin_category;
     }
 }

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

@@ -958,6 +958,8 @@ public class Stock_FacingActivity extends AppCompatActivity {
                         intent.putExtra("company_id", headerTitle.getCompany_id());
                         intent.putExtra("sub_category", headerTitle.getSub_category());
                         intent.putExtra("sub_category_id", headerTitle.getSub_category_id());
+                        intent.putExtra("categoryName", categoryName);
+                        intent.putExtra("categoryId", categoryId);
 
                         startActivity(intent);
                     }

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

@@ -3,7 +3,9 @@ package cpm.com.gskmtorange.xmlGetterSetter;
 import java.util.ArrayList;
 
 public class StockFacing_PlanogramTrackerDataGetterSetter {
-    String shelf_id, shelf, sp_addShelf_id, sp_addShelf, sp_shelfPosition;
+    String shelf_id, shelf, sp_addShelf_id, sp_addShelf, sp_shelfPosition, checkbox_sku;
+    String category_id, sub_category_id, sub_category, brand_id, brand,
+            sku_id, sku, mrp, sku_sequence, stock, facing, mbq, company_id, image1, image2, sos_target;
 
     public String getShelf_id() {
         return shelf_id;
@@ -44,4 +46,140 @@ public class StockFacing_PlanogramTrackerDataGetterSetter {
     public void setSp_shelfPosition(String sp_shelfPosition) {
         this.sp_shelfPosition = sp_shelfPosition;
     }
+
+    public String getCategory_id() {
+        return category_id;
+    }
+
+    public void setCategory_id(String category_id) {
+        this.category_id = category_id;
+    }
+
+    public String getSub_category_id() {
+        return sub_category_id;
+    }
+
+    public void setSub_category_id(String sub_category_id) {
+        this.sub_category_id = sub_category_id;
+    }
+
+    public String getSub_category() {
+        return sub_category;
+    }
+
+    public void setSub_category(String sub_category) {
+        this.sub_category = sub_category;
+    }
+
+    public String getBrand_id() {
+        return brand_id;
+    }
+
+    public void setBrand_id(String brand_id) {
+        this.brand_id = brand_id;
+    }
+
+    public String getBrand() {
+        return brand;
+    }
+
+    public void setBrand(String brand) {
+        this.brand = brand;
+    }
+
+    public String getSku_id() {
+        return sku_id;
+    }
+
+    public void setSku_id(String sku_id) {
+        this.sku_id = sku_id;
+    }
+
+    public String getSku() {
+        return sku;
+    }
+
+    public void setSku(String sku) {
+        this.sku = sku;
+    }
+
+    public String getMrp() {
+        return mrp;
+    }
+
+    public void setMrp(String mrp) {
+        this.mrp = mrp;
+    }
+
+    public String getSku_sequence() {
+        return sku_sequence;
+    }
+
+    public void setSku_sequence(String sku_sequence) {
+        this.sku_sequence = sku_sequence;
+    }
+
+    public String getStock() {
+        return stock;
+    }
+
+    public void setStock(String stock) {
+        this.stock = stock;
+    }
+
+    public String getFacing() {
+        return facing;
+    }
+
+    public void setFacing(String facing) {
+        this.facing = facing;
+    }
+
+    public String getMbq() {
+        return mbq;
+    }
+
+    public void setMbq(String mbq) {
+        this.mbq = mbq;
+    }
+
+    public String getCompany_id() {
+        return company_id;
+    }
+
+    public void setCompany_id(String company_id) {
+        this.company_id = company_id;
+    }
+
+    public String getImage1() {
+        return image1;
+    }
+
+    public void setImage1(String image1) {
+        this.image1 = image1;
+    }
+
+    public String getImage2() {
+        return image2;
+    }
+
+    public void setImage2(String image2) {
+        this.image2 = image2;
+    }
+
+    public String getSos_target() {
+        return sos_target;
+    }
+
+    public void setSos_target(String sos_target) {
+        this.sos_target = sos_target;
+    }
+
+    public String getCheckbox_sku() {
+        return checkbox_sku;
+    }
+
+    public void setCheckbox_sku(String checkbox_sku) {
+        this.checkbox_sku = checkbox_sku;
+    }
 }

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

@@ -24,7 +24,7 @@
     <include layout="@layout/content_stock_facing__planogram_tracker" />
 
     <android.support.design.widget.FloatingActionButton
-        android:id="@+id/fab"
+        android:id="@+id/fab_stockFacing_PlanogramTracker"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="bottom|end"

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

@@ -55,7 +55,7 @@
             android:layout_height="match_parent" />-->
 
         <ExpandableListView
-            android:id="@+id/exp_stockFacing_PlanogramTrackerListView"
+            android:id="@+id/exp_PlanogramListView"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:cacheColorHint="#00000000"

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

@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:card_view="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/card_view"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="10dp"
+        card_view:cardBackgroundColor="@color/light_orange_background"
+        card_view:cardCornerRadius="20dp">
+        <!--android:background="@drawable/bg_boarder_orange_transparent"-->
+
+        <ScrollView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:background="@color/light_orange_background"
+                android:orientation="vertical">
+
+                <!--Add Shelf View-->
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:gravity="center_horizontal"
+                    android:orientation="horizontal"
+                    android:padding="10dp">
+
+                    <LinearLayout
+                        android:id="@+id/lin_addSku"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="vertical" />
+                </LinearLayout>
+
+                <!--Bottom Buttom-->
+                <RelativeLayout
+                    android:id="@+id/rel_addSku_Cancel"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:paddingBottom="10dp">
+
+                    <Button
+                        android:id="@+id/dialog_btn_addSku_Shelf"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_alignParentLeft="true"
+                        android:layout_marginLeft="10dp"
+                        android:background="@color/colorPrimary"
+                        android:padding="5dp"
+                        android:text="Add SKU to Shelf"
+                        android:textAppearance="?android:attr/textAppearanceSmall"
+                        android:textColor="@color/white" />
+
+                    <Button
+                        android:id="@+id/dialog_btn_cancel_addSku"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_alignParentRight="true"
+                        android:layout_marginRight="10dp"
+                        android:background="@color/colorPrimary"
+                        android:padding="5dp"
+                        android:text="Cancel"
+                        android:textAppearance="?android:attr/textAppearanceSmall"
+                        android:textColor="@color/white" />
+                </RelativeLayout>
+
+            </LinearLayout>
+        </ScrollView>
+    </android.support.v7.widget.CardView>
+</LinearLayout>

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

@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@color/white"
+    android:orientation="vertical">
+
+    <!--<android.support.v7.widget.CardView xmlns:card_view="http://schemas.android.com/apk/res-auto"
+        android:id="@+id/card_view"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_margin="5dp"
+        card_view:cardBackgroundColor="@color/light_orange_background"
+        card_view:cardCornerRadius="10dp">-->
+
+    <LinearLayout
+        android:id="@+id/lin_stockFaceupHeader"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:weightSum="2">
+
+        <LinearLayout
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1.6"
+            android:orientation="horizontal">
+
+            <TextView
+                android:id="@+id/txt_skuChild"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:gravity="center_vertical"
+                android:paddingBottom="10dp"
+                android:paddingLeft="20dp"
+                android:paddingRight="5dp"
+                android:paddingTop="10dp"
+                android:text="Brand Name"
+                android:textAppearance="?android:attr/textAppearanceSmall"
+                android:textColor="@color/colorPrimaryDark" />
+        </LinearLayout>
+
+        <!--Camera Images-->
+        <LinearLayout
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight=".4"
+            android:gravity="center_vertical|center_horizontal"
+            android:orientation="horizontal"
+            android:padding="5dp">
+
+            <CheckBox
+                android:id="@+id/chk_sku"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content" />
+        </LinearLayout>
+
+    </LinearLayout>
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:background="@color/colorPrimary" />
+    <!--</android.support.v7.widget.CardView>-->
+</LinearLayout>

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

@@ -45,18 +45,16 @@
                 android:layout_height="match_parent"
                 android:layout_weight=".8"
                 android:gravity="center_vertical|right"
-                android:orientation="horizontal"
+                android:orientation="horizontal">
-                android:padding="2dp">
 
                 <Button
                     android:id="@+id/btn_addSku"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginRight="10dp"
+                    android:layout_marginRight="15dp"
-                    android:background="@color/colorPrimary"
                     android:text="Add SKU"
                     android:textAppearance="?android:attr/textAppearanceSmall"
-                    android:textColor="@color/white" />
+                    android:textColor="@color/black" />
             </LinearLayout>
 
         </LinearLayout>