From 734ddee5911ad43d3809f68f3a59c465e9893d8e Mon Sep 17 00:00:00 2001 From: Gagan290 Date: Fri, 3 Feb 2017 18:05:52 +0530 Subject: [PATCH] //PromoCompliance Default Toggle Changes --- .../com/gskmtorange/Database/GSKOrangeDB.java | 52 +++ .../download/DownloadActivity.java | 97 +++-- .../StockFacing_PlanogramTrackerActivity.java | 344 ++++++++++++++---- .../ShelfMasterGetterSetter.java | 34 ++ ...cing_PlanogramTrackerDataGetterSetter.java | 47 +++ .../xmlGetterSetter/TableBean.java | 12 +- .../gskmtorange/xmlHandlers/XMLHandlers.java | 27 ++ ...ontent_stock_facing__planogram_tracker.xml | 17 +- .../dialog_stock_facing_planogram_tracker.xml | 77 +++- .../item_stock_facing_planogram_header.xml | 64 ++++ GSKMTOrange/src/main/res/values/colors.xml | 2 +- 11 files changed, 642 insertions(+), 131 deletions(-) create mode 100644 GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/ShelfMasterGetterSetter.java create mode 100644 GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/StockFacing_PlanogramTrackerDataGetterSetter.java create mode 100644 GSKMTOrange/src/main/res/layout/item_stock_facing_planogram_header.xml diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java index b49eea9..cfe703e 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java @@ -42,6 +42,8 @@ import cpm.com.gskmtorange.xmlGetterSetter.MappingPromotionGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.MappingStockGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.Promo_Compliance_DataGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.STORE_PERFORMANCE_MasterGetterSetter; +import cpm.com.gskmtorange.xmlGetterSetter.StockFacing_PlanogramTrackerDataGetterSetter; +import cpm.com.gskmtorange.xmlGetterSetter.ShelfMasterGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.SkuGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.SkuMasterGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.Stock_FacingGetterSetter; @@ -128,6 +130,8 @@ public class GSKOrangeDB extends SQLiteOpenHelper { db.execSQL(TableBean.getAdditionalDisplay()); db.execSQL(TableBean.getMappingSosTarget()); + + db.execSQL(TableBean.getShelfMaster()); } catch (SQLException e) { e.printStackTrace(); Toast.makeText(context, "Error -" + e.toString(), Toast.LENGTH_SHORT).show(); @@ -3546,4 +3550,52 @@ public class GSKOrangeDB extends SQLiteOpenHelper { } } + public void InsertSHELF_MASTER(ShelfMasterGetterSetter data) { + db.delete("SHELF_MASTER", null, null); + + ContentValues values = new ContentValues(); + try { + for (int i = 0; i < data.getSHELF_ID().size(); i++) { + + values.put("SHELF_ID", data.getSHELF_ID().get(i)); + values.put("SHELF", data.getSHELF().get(i)); + + db.insert("SHELF_MASTER", null, values); + } + } catch (Exception ex) { + Log.d("Exception ", " SHELF_MASTER " + ex.toString()); + } + } + + public ArrayList getSHELF_MASTERData() { + Cursor cursordata = null; + ArrayList Data = new ArrayList<>(); + + try { + StockFacing_PlanogramTrackerDataGetterSetter sb1 = new StockFacing_PlanogramTrackerDataGetterSetter(); + sb1.setShelf_id("0"); + sb1.setShelf("Select"); + + Data.add(sb1); + + cursordata = db.rawQuery("SELECT * FROM SHELF_MASTER ", null); + + if (cursordata != null) { + cursordata.moveToFirst(); + while (!cursordata.isAfterLast()) { + StockFacing_PlanogramTrackerDataGetterSetter sb = new StockFacing_PlanogramTrackerDataGetterSetter(); + sb.setShelf_id(cursordata.getString(cursordata.getColumnIndexOrThrow("SHELF_ID"))); + sb.setShelf(cursordata.getString(cursordata.getColumnIndexOrThrow("SHELF"))); + + Data.add(sb); + cursordata.moveToNext(); + } + cursordata.close(); + } + } catch (Exception ex) { + Log.d("Exception ", " Get SHELF_MASTER " + ex.toString()); + } + return Data; + } + } diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/download/DownloadActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/download/DownloadActivity.java index 2be485f..9b68dcd 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/download/DownloadActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/download/DownloadActivity.java @@ -59,6 +59,7 @@ import cpm.com.gskmtorange.xmlGetterSetter.MappingPromotionGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.MappingStockGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.NonWorkingReasonGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.STORE_PERFORMANCE_MasterGetterSetter; +import cpm.com.gskmtorange.xmlGetterSetter.ShelfMasterGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.SkuMasterGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.SubCategoryMasterGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.TableBean; @@ -86,15 +87,16 @@ public class DownloadActivity extends AppCompatActivity { STORE_PERFORMANCE_MasterGetterSetter store_performance_masterGetterSetter; ADDITIONAL_DISPLAY_MASTERGetterSetter additional_display_getter_setter; MAPPING_SOS_TARGET_MasterGetterSetter mapping_sos_target_masterGetterSetter; - MAPPING_PLANOGRAM_MasterGetterSetter mapping_planogram_masterGetterSetter; + ShelfMasterGetterSetter shelfMasterGetterSetter; + private Dialog dialog; private ProgressBar pb; private TextView percentage, message; private SharedPreferences preferences = null; Toolbar toolbar; String str; - boolean ResultFlag=true; + boolean ResultFlag = true; @Override protected void onCreate(Bundle savedInstanceState) { @@ -776,6 +778,43 @@ public class DownloadActivity extends AppCompatActivity { publishProgress(data); + //SHELF_MASTER + request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_NAME_UNIVERSAL_DOWNLOAD); + request.addProperty("UserName", userId); + request.addProperty("Type", "SHELF_MASTER"); + request.addProperty("cultureid", culture_id); + + envelope = new SoapSerializationEnvelope(SoapEnvelope.VER11); + envelope.dotNet = true; + envelope.setOutputSoapObject(request); + + androidHttpTransport = new HttpTransportSE(CommonString.URL); + androidHttpTransport.call(CommonString.SOAP_ACTION_UNIVERSAL, envelope); + + result = envelope.getResponse(); + + if (result.toString() != null) { + xpp.setInput(new StringReader(result.toString())); + xpp.next(); + eventType = xpp.getEventType(); + shelfMasterGetterSetter = XMLHandlers.shelfMasterXMLHandler(xpp, eventType); + + String table_ShelfMaster = shelfMasterGetterSetter.getTable_SHELF_MASTER(); + if (table_ShelfMaster != null) { + resultHttp = CommonString.KEY_SUCCESS; + TableBean.setShelfMaster(table_ShelfMaster); + } + + if (shelfMasterGetterSetter.getSHELF_ID().size() > 0) { + data.value = 96; + data.name = "SHELF_MASTER " + getResources().getString(R.string.download_data); + } + } + publishProgress(data); + + + //Images DownLoads + //MAPPING_PLANOGRAM Image save into folder if (mapping_planogram_masterGetterSetter != null) { @@ -912,55 +951,45 @@ public class DownloadActivity extends AppCompatActivity { db.InsertMAPPING_PLANOGRAM(mapping_planogram_masterGetterSetter); db.InsertADDITIONAL_DISPLAY(additional_display_getter_setter); db.InsertMAPPING_SOS_TARGET(mapping_sos_target_masterGetterSetter); + db.InsertSHELF_MASTER(shelfMasterGetterSetter); } catch (MalformedURLException e) { - ResultFlag=false; - str=CommonString.MESSAGE_EXCEPTION; + ResultFlag = false; + str = CommonString.MESSAGE_EXCEPTION; return CommonString.MESSAGE_EXCEPTION; - } - catch (SocketTimeoutException e) { - ResultFlag=false; - str=CommonString.MESSAGE_SOCKETEXCEPTION; + } catch (SocketTimeoutException e) { + ResultFlag = false; + str = CommonString.MESSAGE_SOCKETEXCEPTION; return CommonString.MESSAGE_SOCKETEXCEPTION; - } - catch (InterruptedIOException e){ + } catch (InterruptedIOException e) { - ResultFlag=false; - str=CommonString.MESSAGE_EXCEPTION; + ResultFlag = false; + str = CommonString.MESSAGE_EXCEPTION; return CommonString.MESSAGE_EXCEPTION; } catch (IOException e) { - ResultFlag=false; - str=CommonString.MESSAGE_SOCKETEXCEPTION; + ResultFlag = false; + str = CommonString.MESSAGE_SOCKETEXCEPTION; return CommonString.MESSAGE_SOCKETEXCEPTION; - } - catch (XmlPullParserException e) { - ResultFlag=false; - str=CommonString.MESSAGE_XmlPull; + } catch (XmlPullParserException e) { + ResultFlag = false; + str = CommonString.MESSAGE_XmlPull; return CommonString.MESSAGE_XmlPull; } catch (Exception e) { - ResultFlag=false; - str=CommonString.MESSAGE_EXCEPTION; + ResultFlag = false; + str = CommonString.MESSAGE_EXCEPTION; return CommonString.MESSAGE_EXCEPTION; } - if(ResultFlag) - { + if (ResultFlag) { return ""; - } - else - { + } else { return str; } - - - - - } @Override @@ -976,15 +1005,13 @@ public class DownloadActivity extends AppCompatActivity { protected void onPostExecute(String s) { super.onPostExecute(s); - if(s.equalsIgnoreCase("")){ + if (s.equalsIgnoreCase("")) { dialog.dismiss(); showAlert(getString(R.string.data_downloaded_successfully)); - } - else - { + } else { dialog.dismiss(); - showAlert(getString(R.string.datanotfound)+" "+s); + showAlert(getString(R.string.datanotfound) + " " + s); } } diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/StockFacing_PlanogramTrackerActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/StockFacing_PlanogramTrackerActivity.java index 58288b0..7a9cde5 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/StockFacing_PlanogramTrackerActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/StockFacing_PlanogramTrackerActivity.java @@ -1,47 +1,173 @@ package cpm.com.gskmtorange.gsk_dailyentry; +import android.app.AlertDialog; import android.app.Dialog; +import android.content.Context; +import android.content.DialogInterface; import android.content.Intent; +import android.content.res.Resources; import android.graphics.drawable.ColorDrawable; import android.os.Bundle; -import android.support.design.widget.FloatingActionButton; -import android.support.design.widget.Snackbar; import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.RecyclerView; +import android.support.v7.widget.CardView; import android.support.v7.widget.Toolbar; -import android.text.Editable; -import android.text.TextWatcher; +import android.view.LayoutInflater; import android.view.View; +import android.view.ViewGroup; import android.view.Window; +import android.widget.AdapterView; +import android.widget.ArrayAdapter; +import android.widget.BaseExpandableListAdapter; import android.widget.Button; import android.widget.EditText; +import android.widget.ExpandableListView; +import android.widget.LinearLayout; +import android.widget.Spinner; +import android.widget.TextView; import android.widget.Toast; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; + +import cpm.com.gskmtorange.Database.GSKOrangeDB; import cpm.com.gskmtorange.R; +import cpm.com.gskmtorange.xmlGetterSetter.StockFacing_PlanogramTrackerDataGetterSetter; +import cpm.com.gskmtorange.xmlGetterSetter.Stock_FacingGetterSetter; public class StockFacing_PlanogramTrackerActivity extends AppCompatActivity { Button btn_addShelf, btn_addSKU; - RecyclerView recyclerView; + ExpandableListView expandableListView; String brand, brand_id, company_id, sub_category, sub_category_id; String addShelfPosition = ""; + ArrayAdapter shelfPositionAdapter, shelfAdapter; + ArrayList shelfList; + GSKOrangeDB db; + ExpandableListAdapter adapter; + + ArrayList headerDataList = new ArrayList<>(); + ArrayList childDataList; + List hashMapListHeaderData; + HashMap> hashMapListChildData; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_stock_facing__planogram_tracker); - Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar); - setSupportActionBar(toolbar); - btn_addShelf = (Button) findViewById(R.id.btn_addShelf); - btn_addSKU = (Button) findViewById(R.id.btn_addSKU); - recyclerView = (RecyclerView) findViewById(R.id.recyclerView_stockFacingPlanogramTracker); + try { + Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar); + setSupportActionBar(toolbar); + + db = new GSKOrangeDB(this); + db.open(); + + btn_addShelf = (Button) findViewById(R.id.btn_addShelf); + expandableListView = (ExpandableListView) findViewById(R.id.exp_stockFacing_PlanogramTrackerListView); + + Intent intent = getIntent(); + brand = intent.getStringExtra("brand"); + brand_id = intent.getStringExtra("brand_id"); + company_id = intent.getStringExtra("company_id"); + sub_category = intent.getStringExtra("sub_category"); + sub_category_id = intent.getStringExtra("sub_category_id"); + + + //Shelf Position Adapter + shelfPositionAdapter = new ArrayAdapter(StockFacing_PlanogramTrackerActivity.this, android.R.layout.simple_list_item_1); + shelfPositionAdapter.add(getResources().getString(R.string.select)); //Select + for (int i = 7; i >= 1; i--) { + shelfPositionAdapter.add(String.valueOf(i)); + } + + //Shelf List + shelfList = new ArrayList<>(); + shelfList = db.getSHELF_MASTERData(); + + shelfAdapter = new ArrayAdapter(StockFacing_PlanogramTrackerActivity.this, android.R.layout.simple_list_item_1); + for (int j = 0; j < shelfList.size(); j++) { + shelfAdapter.add(shelfList.get(j).getShelf()); + } + + //Add Shelf Header Data + prepareHeaderList(headerDataList); + + btn_addShelf.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(final View view1) { + final Dialog dialog = new Dialog(StockFacing_PlanogramTrackerActivity.this); + dialog.requestWindowFeature(Window.FEATURE_NO_TITLE); + dialog.getWindow().setBackgroundDrawable(new ColorDrawable(android.graphics.Color.TRANSPARENT)); + dialog.setContentView(R.layout.dialog_stock_facing_planogram_tracker); + + Button addShelf = (Button) dialog.findViewById(R.id.dialog_btn_addShelf); + Button cancel = (Button) dialog.findViewById(R.id.dialog_btn_cancel); + Spinner sp_addShelf = (Spinner) dialog.findViewById(R.id.sp_addShelf); + Spinner sp_shelfPosition = (Spinner) dialog.findViewById(R.id.sp_shelfPosition); + + sp_addShelf.setAdapter(shelfAdapter); + sp_shelfPosition.setAdapter(shelfPositionAdapter); + + final StockFacing_PlanogramTrackerDataGetterSetter data = new StockFacing_PlanogramTrackerDataGetterSetter(); + + sp_addShelf.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() { + @Override + public void onItemSelected(AdapterView adapterView, View view, int position, long l) { + for (int i1 = 0; i1 < shelfList.size(); i1++) { + if (position == i1) { + //Selected spinner position value + data.setSp_addShelf_id(shelfList.get(i1).getShelf_id()); + data.setSp_addShelf(shelfList.get(i1).getShelf()); + } + } + } + + @Override + public void onNothingSelected(AdapterView adapterView) { + + } + }); + + sp_shelfPosition.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() { + @Override + public void onItemSelected(AdapterView parent, View view, int position, long l) { + data.setSp_shelfPosition(parent.getItemAtPosition(position).toString()); + } + + @Override + public void onNothingSelected(AdapterView adapterView) { + + } + }); + + cancel.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + dialog.dismiss(); + } + }); + + addShelf.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + + if (!data.getSp_addShelf_id().equals("0") && !data.getSp_shelfPosition().equals("Select")) { + + headerDataList.add(data); + dialog.dismiss(); + prepareHeaderList(headerDataList); + } else { + /*Snackbar.make(view1, getResources().getString(R.string.empty_field), Snackbar.LENGTH_LONG) + .setAction("Action", null).show();*/ + Toast.makeText(StockFacing_PlanogramTrackerActivity.this, getResources().getString(R.string.empty_field), Toast.LENGTH_SHORT).show(); + } + } + }); + + dialog.show(); + } + }); - Intent intent = getIntent(); - brand = intent.getStringExtra("brand"); - brand_id = intent.getStringExtra("brand_id"); - company_id = intent.getStringExtra("company_id"); - sub_category = intent.getStringExtra("sub_category"); - sub_category_id = intent.getStringExtra("sub_category_id"); /*FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab); fab.setOnClickListener(new View.OnClickListener() { @@ -51,58 +177,138 @@ public class StockFacing_PlanogramTrackerActivity extends AppCompatActivity { .setAction("Action", null).show(); } });*/ - - btn_addSKU.setEnabled(false); - - btn_addShelf.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(final View view1) { - final Dialog dialog = new Dialog(StockFacing_PlanogramTrackerActivity.this); - dialog.requestWindowFeature(Window.FEATURE_NO_TITLE); - dialog.getWindow().setBackgroundDrawable(new ColorDrawable(android.graphics.Color.TRANSPARENT)); - dialog.setContentView(R.layout.dialog_stock_facing_planogram_tracker); - - final EditText ed_shelf_position = (EditText) dialog.findViewById(R.id.ed_shelf_position); - Button addShelf = (Button) dialog.findViewById(R.id.dialog_btn_addShelf); - Button cancel = (Button) dialog.findViewById(R.id.dialog_btn_cancel); - - cancel.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View view) { - dialog.dismiss(); - } - }); - - addShelf.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View view) { - addShelfPosition = ed_shelf_position.getText().toString().trim(); - - if (!addShelfPosition.equals("")) { - dialog.dismiss(); - - btn_addSKU.setEnabled(true); - } else { - /*Snackbar.make(view1, getResources().getString(R.string.empty_field), Snackbar.LENGTH_LONG) - .setAction("Action", null).show();*/ - Toast.makeText(StockFacing_PlanogramTrackerActivity.this, - getResources().getString(R.string.empty_field), Toast.LENGTH_SHORT).show(); - } - } - }); - - dialog.show(); - } - }); - - String s = addShelfPosition; - - btn_addSKU.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View view) { - Toast.makeText(StockFacing_PlanogramTrackerActivity.this, "Add SKU", Toast.LENGTH_SHORT).show(); - } - }); + } catch (Resources.NotFoundException e) { + e.printStackTrace(); + } } + private void prepareHeaderList(ArrayList 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); + expandableListView.setAdapter(adapter); + } catch (Exception e) { + e.printStackTrace(); + } + } + + public class ExpandableListAdapter extends BaseExpandableListAdapter { + private Context _context; + private List _listDataHeader; + private HashMap> _listDataChild; + + public ExpandableListAdapter(Context context, List listDataHeader, + HashMap> listChildData) { + this._context = context; + this._listDataHeader = listDataHeader; + this._listDataChild = listChildData; + } + + @Override + public Object getGroup(int groupPosition) { + return this._listDataHeader.get(groupPosition); + } + + @Override + public int getGroupCount() { + return this._listDataHeader.size(); + } + + @Override + public long getGroupId(int groupPosition) { + return groupPosition; + } + + @Override + public View getGroupView(final 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); + convertView = infalInflater.inflate(R.layout.item_stock_facing_planogram_header, null, false); + + TextView txt_shelfHeader = (TextView) convertView.findViewById(R.id.txt_shelfHeader); + Button btn_addSku = (Button) convertView.findViewById(R.id.btn_addSku); + + txt_shelfHeader.setText(headerTitle.getSp_addShelf() + " (Position : " + headerTitle.getSp_shelfPosition() + ")"); + + btn_addSku.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + + } + }); + } + } + + return convertView; + } + + @Override + public Object getChild(int groupPosition, int childPosititon) { + return this._listDataChild.get(this._listDataHeader.get(groupPosition)).get(childPosititon); + } + + @Override + public int getChildrenCount(int groupPosition) { + return this._listDataChild.get(this._listDataHeader.get(groupPosition)).size(); + } + + @Override + public long getChildId(int groupPosition, int childPosition) { + return childPosition; + } + + @Override + public View getChildView(final int groupPosition, final int childPosition, boolean isLastChild, View convertView, ViewGroup parent) { + final StockFacing_PlanogramTrackerDataGetterSetter childData = + (StockFacing_PlanogramTrackerDataGetterSetter) getChild(groupPosition, childPosition); + ViewHolder holder = null; + + if (convertView == null) { + LayoutInflater infalInflater = (LayoutInflater) this._context.getSystemService(Context.LAYOUT_INFLATER_SERVICE); + convertView = infalInflater.inflate(R.layout.item_stock_facing_child, null, false); + + holder = new ViewHolder(); + holder.cardView = (CardView) convertView.findViewById(R.id.card_view); + holder.lin_category = (LinearLayout) convertView.findViewById(R.id.lin_category); + + holder.txt_skuName = (TextView) convertView.findViewById(R.id.txt_skuName); + holder.ed_stock = (EditText) convertView.findViewById(R.id.ed_stock); + holder.ed_facing = (EditText) convertView.findViewById(R.id.ed_facing); + convertView.setTag(holder); + } else { + holder = (ViewHolder) convertView.getTag(); + } + + return convertView; + } + + @Override + public boolean hasStableIds() { + return false; + } + + @Override + public boolean isChildSelectable(int groupPosition, int childPosition) { + return true; + } + } + + public class ViewHolder { + EditText ed_stock, ed_facing; + CardView cardView; + TextView txt_skuName; + LinearLayout lin_category; + } } diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/ShelfMasterGetterSetter.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/ShelfMasterGetterSetter.java new file mode 100644 index 0000000..0761aa1 --- /dev/null +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/ShelfMasterGetterSetter.java @@ -0,0 +1,34 @@ +package cpm.com.gskmtorange.xmlGetterSetter; + +import java.util.ArrayList; + +public class ShelfMasterGetterSetter { + String table_SHELF_MASTER; + + ArrayList SHELF_ID = new ArrayList<>(); + ArrayList SHELF = new ArrayList<>(); + + public String getTable_SHELF_MASTER() { + return table_SHELF_MASTER; + } + + public void setTable_SHELF_MASTER(String table_SHELF_MASTER) { + this.table_SHELF_MASTER = table_SHELF_MASTER; + } + + public ArrayList getSHELF_ID() { + return SHELF_ID; + } + + public void setSHELF_ID(String SHELF_ID) { + this.SHELF_ID.add(SHELF_ID); + } + + public ArrayList getSHELF() { + return SHELF; + } + + public void setSHELF(String SHELF) { + this.SHELF.add(SHELF); + } +} diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/StockFacing_PlanogramTrackerDataGetterSetter.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/StockFacing_PlanogramTrackerDataGetterSetter.java new file mode 100644 index 0000000..6358497 --- /dev/null +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/StockFacing_PlanogramTrackerDataGetterSetter.java @@ -0,0 +1,47 @@ +package cpm.com.gskmtorange.xmlGetterSetter; + +import java.util.ArrayList; + +public class StockFacing_PlanogramTrackerDataGetterSetter { + String shelf_id, shelf, sp_addShelf_id, sp_addShelf, sp_shelfPosition; + + public String getShelf_id() { + return shelf_id; + } + + public void setShelf_id(String shelf_id) { + this.shelf_id = shelf_id; + } + + public String getShelf() { + return shelf; + } + + public void setShelf(String shelf) { + this.shelf = shelf; + } + + public String getSp_addShelf_id() { + return sp_addShelf_id; + } + + public void setSp_addShelf_id(String sp_addShelf_id) { + this.sp_addShelf_id = sp_addShelf_id; + } + + public String getSp_addShelf() { + return sp_addShelf; + } + + public void setSp_addShelf(String sp_addShelf) { + this.sp_addShelf = sp_addShelf; + } + + public String getSp_shelfPosition() { + return sp_shelfPosition; + } + + public void setSp_shelfPosition(String sp_shelfPosition) { + this.sp_shelfPosition = sp_shelfPosition; + } +} diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/TableBean.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/TableBean.java index be5ae84..b520c85 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/TableBean.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/TableBean.java @@ -24,7 +24,7 @@ public class TableBean { public static String STORE_PERFORMANCE; public static String MAPPING_PLANOGRAM; public static String MAPPING_SOS_TARGET; - + public static String SHELF_MASTER; public static String getAdditionalDisplay() { @@ -169,5 +169,13 @@ public class TableBean { MAPPING_SOS_TARGET = mappingSosTarget; } -//Gagan end code + public static String getShelfMaster() { + return SHELF_MASTER; + } + + public static void setShelfMaster(String shelfMaster) { + SHELF_MASTER = shelfMaster; + } + + //Gagan end code } diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlHandlers/XMLHandlers.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlHandlers/XMLHandlers.java index 2ebe7ea..d94c953 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlHandlers/XMLHandlers.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlHandlers/XMLHandlers.java @@ -22,6 +22,7 @@ import cpm.com.gskmtorange.xmlGetterSetter.MappingPromotionGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.MappingStockGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.NonWorkingReasonGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.STORE_PERFORMANCE_MasterGetterSetter; +import cpm.com.gskmtorange.xmlGetterSetter.ShelfMasterGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.SkuMasterGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.SubCategoryMasterGetterSetter; @@ -783,5 +784,31 @@ public class XMLHandlers { return st; } + public static ShelfMasterGetterSetter shelfMasterXMLHandler(XmlPullParser xpp, int eventType) { + ShelfMasterGetterSetter st = new ShelfMasterGetterSetter(); + + try { + while (xpp.getEventType() != XmlPullParser.END_DOCUMENT) { + if (xpp.getEventType() == XmlPullParser.START_TAG) { + + if (xpp.getName().equals("META_DATA")) { + st.setTable_SHELF_MASTER(xpp.nextText()); + } + if (xpp.getName().equals("SHELF_ID")) { + st.setSHELF_ID(xpp.nextText()); + } + if (xpp.getName().equals("SHELF")) { + st.setSHELF(xpp.nextText()); + } + } + xpp.next(); + } + } catch (XmlPullParserException e) { + e.printStackTrace(); + } catch (IOException e) { + e.printStackTrace(); + } + return st; + } } diff --git a/GSKMTOrange/src/main/res/layout/content_stock_facing__planogram_tracker.xml b/GSKMTOrange/src/main/res/layout/content_stock_facing__planogram_tracker.xml index 3428b76..536cfda 100644 --- a/GSKMTOrange/src/main/res/layout/content_stock_facing__planogram_tracker.xml +++ b/GSKMTOrange/src/main/res/layout/content_stock_facing__planogram_tracker.xml @@ -31,7 +31,7 @@ android:textAppearance="?android:attr/textAppearanceSmall" android:textColor="@color/white" /> -