From ca1d29bca55b3ec57c44a941fa63be79219db4ef Mon Sep 17 00:00:00 2001 From: Gagan290 Date: Wed, 22 Feb 2017 12:19:42 +0530 Subject: [PATCH 1/4] //PromoCompliance Default Toggle Changes --- .../com/gskmtorange/Database/GSKOrangeDB.java | 137 ++++++- .../StockFacing_PlanogramTrackerActivity.java | 337 ++++++++++-------- .../gsk_dailyentry/Stock_FacingActivity.java | 152 +++++--- .../upload/PreviousDataUploadActivity.java | 24 +- .../gskmtorange/upload/UploadActivity.java | 24 +- ...cing_PlanogramTrackerDataGetterSetter.java | 73 +++- .../item_stock_facing_planogram_header.xml | 2 + GSKMTOrange/src/main/res/values/strings.xml | 7 + 8 files changed, 539 insertions(+), 217 deletions(-) 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 1a694e0..907881f 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java @@ -3659,7 +3659,19 @@ public class GSKOrangeDB extends SQLiteOpenHelper { public void InsertStock_Facing_PlanogramTracker(String storeId, String categoryId, String company_id, String brand_id, String sub_category_id, List hashMapListHeaderData, - HashMap> hashMapListChildData) { + HashMap> hashMapListChildData) { + + //Delete child sku data + for (int i1 = 0; i1 < hashMapListHeaderData.size(); i1++) { + db.delete(CommonString.TABLE_INSERT_STOCK_FACING_PLANOGRAM_TRACKER_CHILD, + "common_id='" + hashMapListHeaderData.get(i1).getKey_id() + "'", null); + } + //Delete Header shelf data + db.delete(CommonString.TABLE_INSERT_STOCK_FACING_PLANOGRAM_TRACKER_HEADER, + "store_id='" + storeId + "' And category_id='" + categoryId + "' ", null); + + + //Insert the data ContentValues values = new ContentValues(); ContentValues values1 = new ContentValues(); @@ -3892,7 +3904,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper { "inner join CATEGORY_MASTER CA " + "on SB.CATEGORY_ID=CA.CATEGORY_ID " + "where CA.CATEGORY_ID='" + category_id + "' AND M.KEYACCOUNT_ID = '" + keyAccount_id + - "' AND M.STORETYPE_ID = '" + storeType_id + "' AND M.CLASS_ID = '" + class_id + "'" + + "' AND M.STORETYPE_ID = '" + storeType_id + "' AND M.CLASS_ID = '" + class_id + "' AND BR.COMPANY_ID = 1 " + "order by SB.SUB_CATEGORY,BR.COMPANY_ID,BR.BRAND", null); if (dbcursor != null) { @@ -3952,6 +3964,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper { 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.setCheckbox_sku("0"); list.add(cd); dbcursor.moveToNext(); @@ -3966,4 +3979,124 @@ public class GSKOrangeDB extends SQLiteOpenHelper { return list; } + public ArrayList getPlanogramAddShelfHeaderAfterSaveData( + String store_id, String category_id) { + + ArrayList list = new ArrayList<>(); + Cursor dbcursor = null; + + try { + dbcursor = db.rawQuery("Select * from Stock_Facing_Planogram_Header_Data " + + "where Store_id='" + store_id + "' and category_id='" + category_id + "'", null); + + if (dbcursor != null) { + dbcursor.moveToFirst(); + while (!dbcursor.isAfterLast()) { + StockFacing_PlanogramTrackerDataGetterSetter cd = new StockFacing_PlanogramTrackerDataGetterSetter(); + + cd.setKey_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("KEY_ID"))); + cd.setCategory_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("category_id"))); + cd.setSp_addShelf_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("Shelf_id"))); + cd.setSp_addShelf(dbcursor.getString(dbcursor.getColumnIndexOrThrow("Shelf"))); + cd.setSp_shelfPosition(dbcursor.getString(dbcursor.getColumnIndexOrThrow("Shelf_Position"))); + + list.add(cd); + dbcursor.moveToNext(); + } + dbcursor.close(); + return list; + } + } catch (Exception e) { + Log.d("Exception ", "get Planogram Shelf Header After Save !" + e.toString()); + return list; + } + return list; + } + + + public ArrayList getStockAndFacingPlanogramAfterSKUData( + String key_id) { + + ArrayList list = new ArrayList<>(); + Cursor dbcursor = null; + + try { + //Select * from Stock_Facing_Planogram_Child_Data where Shelf_id=1 and Shelf_Position=3 + + dbcursor = db.rawQuery("Select * from Stock_Facing_Planogram_Child_Data " + + "where common_id='" + key_id + "'", null); + + if (dbcursor != null) { + + dbcursor.moveToFirst(); + while (!dbcursor.isAfterLast()) { + StockFacing_PlanogramTrackerDataGetterSetter cd = new StockFacing_PlanogramTrackerDataGetterSetter(); + + cd.setSp_addShelf_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("Shelf_id"))); + cd.setSp_addShelf(dbcursor.getString(dbcursor.getColumnIndexOrThrow("Shelf"))); + cd.setSp_shelfPosition(dbcursor.getString(dbcursor.getColumnIndexOrThrow("Shelf_Position"))); + cd.setSku_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("sku_id"))); + cd.setSku(dbcursor.getString(dbcursor.getColumnIndexOrThrow("sku"))); + cd.setCheckbox_sku(dbcursor.getString(dbcursor.getColumnIndexOrThrow("checkbox_sku"))); + + list.add(cd); + dbcursor.moveToNext(); + } + dbcursor.close(); + return list; + } + } catch (Exception e) { + Log.d("Exception ", "get MSL_AvailabilityHeader!" + e.toString()); + return list; + } + return list; + } + + public ArrayList getStockAndFacingPlanogramAfterSKU_PerShelfData( + String shelf_id, String shelf_position) { + + ArrayList list = new ArrayList<>(); + Cursor dbcursor = null; + + try { + dbcursor = db.rawQuery("Select * from Stock_Facing_Planogram_Child_Data " + + "where Shelf_id='" + shelf_id + "' and Shelf_Position='" + shelf_position + "'", null); + + if (dbcursor != null) { + + dbcursor.moveToFirst(); + while (!dbcursor.isAfterLast()) { + StockFacing_PlanogramTrackerDataGetterSetter cd = new StockFacing_PlanogramTrackerDataGetterSetter(); + + cd.setSp_addShelf_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("Shelf_id"))); + cd.setSp_addShelf(dbcursor.getString(dbcursor.getColumnIndexOrThrow("Shelf"))); + cd.setSp_shelfPosition(dbcursor.getString(dbcursor.getColumnIndexOrThrow("Shelf_Position"))); + cd.setSku_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("sku_id"))); + cd.setSku(dbcursor.getString(dbcursor.getColumnIndexOrThrow("sku"))); + cd.setCheckbox_sku(dbcursor.getString(dbcursor.getColumnIndexOrThrow("checkbox_sku"))); + + list.add(cd); + dbcursor.moveToNext(); + } + dbcursor.close(); + return list; + } + } catch (Exception e) { + Log.d("Exception ", "get MSL_AvailabilityHeader!" + e.toString()); + return list; + } + return list; + } + + public void deletePlanogramListStoreAndCategorywise(String storeId, String categoryId, + List hashMapListHeaderData, + HashMap> hashMapListChildData) { + for (int i1 = 0; i1 < hashMapListHeaderData.size(); i1++) { + db.delete(CommonString.TABLE_INSERT_STOCK_FACING_PLANOGRAM_TRACKER_CHILD, + "common_id='" + hashMapListHeaderData.get(i1).getKey_id() + "'", null); + } + //Delete Header shelf data + db.delete(CommonString.TABLE_INSERT_STOCK_FACING_PLANOGRAM_TRACKER_HEADER, + "store_id='" + storeId + "' And category_id='" + categoryId + "' ", null); + } } 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 76f7359..97fe9f4 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 @@ -44,6 +44,7 @@ import android.widget.Toast; import java.io.File; import java.util.ArrayList; +import java.util.Collections; import java.util.HashMap; import java.util.List; @@ -68,8 +69,8 @@ public class StockFacing_PlanogramTrackerActivity extends AppCompatActivity { List checkHeaderArray = new ArrayList<>(); ArrayList shelfHeaderDataList = new ArrayList<>(); - ArrayList childDataList, tempChildDataList; - HashMap> hashMapListChildData = new HashMap<>(); + ArrayList childDataList, tempChildDataList, childDataList2; + HashMap> hashMapListChildData = new HashMap<>(); private SharedPreferences preferences; String store_id, visit_date, username, intime, date, keyAccount_id, class_id, storeType_id, camera_allow; @@ -77,7 +78,8 @@ public class StockFacing_PlanogramTrackerActivity extends AppCompatActivity { ExpandableListAdapter adapter1; ArrayList addSkuHeaderList; ArrayList addSkuChildList; - HashMap> addSkuHashMapChildData; + HashMap> addSkuHashMapChildData; + ArrayList list; @Override protected void onCreate(Bundle savedInstanceState) { @@ -136,6 +138,11 @@ public class StockFacing_PlanogramTrackerActivity extends AppCompatActivity { shelfAdapter.add(shelfList.get(j).getShelf()); } + + //DefaultList + prepareDefaultList(); + + btn_addShelf.setOnClickListener(new View.OnClickListener() { @Override public void onClick(final View view1) { @@ -197,10 +204,41 @@ public class StockFacing_PlanogramTrackerActivity extends AppCompatActivity { if (!data.getSp_addShelf_id().equals("0") && !data.getSp_shelfPosition().equals("Select")) { - shelfHeaderDataList.add(data); + //Check here the shelf and position is already exists or not + //if (shelfHeaderDataList.size() > 0) { - dialog.dismiss(); - prepareHeaderList(shelfHeaderDataList); + //Checking shelf is exists or not, if not add the shelf + boolean isContain = false; + for (int i = 0; i < shelfHeaderDataList.size(); i++) { + if (data.getSp_addShelf_id().equals(shelfHeaderDataList.get(i).getSp_addShelf_id()) + && data.getSp_shelfPosition().equals(shelfHeaderDataList.get(i).getSp_shelfPosition())) { + + isContain = true; + break; + } + } + + if (isContain) { + Snackbar.make(view, data.getSp_addShelf() + + getString(R.string.stock_planogram_shelf_position) + data.getSp_shelfPosition() + + getString(R.string.stock_planogram_already_exists) + , Snackbar.LENGTH_LONG).setAction("Action", null).show(); + } else { + shelfHeaderDataList.add(data); + dialog.dismiss(); + + //Sort Shelf wise + //Collections.sort(shelfHeaderDataList, StockFacing_PlanogramTrackerDataGetterSetter.shelfComparator); + //Sort Shelf Position wise + //Collections.sort(shelfHeaderDataList, StockFacing_PlanogramTrackerDataGetterSetter.shelfPositionComparator); + + prepareHeaderList(shelfHeaderDataList); + } + + /*shelfHeaderDataList.add(data); + dialog.dismiss(); + prepareHeaderList(shelfHeaderDataList);*/ + // } } else { Toast.makeText(StockFacing_PlanogramTrackerActivity.this, getResources().getString(R.string.empty_field), Toast.LENGTH_SHORT).show(); } @@ -216,8 +254,6 @@ public class StockFacing_PlanogramTrackerActivity extends AppCompatActivity { 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();*/ if (validateData(shelfHeaderDataList, hashMapListChildData)) { AlertDialog.Builder builder = new AlertDialog.Builder(StockFacing_PlanogramTrackerActivity.this); @@ -226,8 +262,8 @@ public class StockFacing_PlanogramTrackerActivity extends AppCompatActivity { .setPositiveButton(getResources().getString(R.string.yes), new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int id) { - /*db.InsertStock_Facing_PlanogramTracker(store_id, categoryId, company_id, brand_id, - sub_category_id, shelfHeaderDataList, hashMapListChildData);*/ + db.InsertStock_Facing_PlanogramTracker(store_id, categoryId, company_id, brand_id, + sub_category_id, shelfHeaderDataList, hashMapListChildData); finish(); overridePendingTransition(R.anim.activity_back_in, R.anim.activity_back_out); @@ -256,7 +292,6 @@ public class StockFacing_PlanogramTrackerActivity extends AppCompatActivity { } }); - expandableListView.setOnScrollListener(new AbsListView.OnScrollListener() { @Override public void onScroll(AbsListView view, int firstVisibleItem, int visibleItemCount, int totalItemCount) { @@ -290,104 +325,58 @@ public class StockFacing_PlanogramTrackerActivity extends AppCompatActivity { 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(); } } + private void prepareDefaultList() { + + //After save shelf header data + shelfHeaderDataList = db.getPlanogramAddShelfHeaderAfterSaveData(store_id, categoryId); + + + if (shelfHeaderDataList.size() > 0) { + + //Sort Shelf Position wise + Collections.sort(shelfHeaderDataList, StockFacing_PlanogramTrackerDataGetterSetter.shelfPositionComparator); + //Sort Shelf wise + Collections.sort(shelfHeaderDataList, StockFacing_PlanogramTrackerDataGetterSetter.shelfComparator); + + for (int i = 0; i < shelfHeaderDataList.size(); i++) { + childDataList = db.getStockAndFacingPlanogramAfterSKUData(shelfHeaderDataList.get(i).getKey_id()); + + //After save sku child data + if (childDataList.size() > 0) { + hashMapListChildData.put(shelfHeaderDataList.get(i), childDataList); + } + } + } + + adapter = new PlanogramExpandableListAdapter(this, shelfHeaderDataList, hashMapListChildData); + expandableListView.setAdapter(adapter); + + if (childDataList != null && childDataList.size() > 0) { + for (int j = 0; j < shelfHeaderDataList.size(); j++) { + if (hashMapListChildData.get(shelfHeaderDataList.get(j)).size() > 0) { + expandableListView.expandGroup(j); + } + } + } + } + + //New Shelf Add private void prepareHeaderList(ArrayList shelfHeaderDataList1) { try { //Header Data if (shelfHeaderDataList1.size() > 0) { - /*for (int i = 0; i < shelfHeaderDataList.size(); i++) { - hashMapListChildData.put(shelfHeaderDataList.get(i), childDataList); + adapter.notifyDataSetChanged(); - *//*if (childDataList != null && childDataList.size() > 0) { - if (shelfHeaderDataList.get(i).getSp_addShelf_id().equals(childDataList.get(i).getSp_addShelf_id())) { - hashMapListChildData.put(shelfHeaderDataList.get(i), childDataList); - } else { - hashMapListChildData.put(shelfHeaderDataList.get(i), tempChildDataList); - } - } else { - hashMapListChildData.put(shelfHeaderDataList.get(i), tempChildDataList); - }*//* - }*/ + /*adapter = new PlanogramExpandableListAdapter(this, shelfHeaderDataList1, hashMapListChildData); + expandableListView.setAdapter(adapter);*/ - adapter = new PlanogramExpandableListAdapter(this, shelfHeaderDataList1, hashMapListChildData); - expandableListView.setAdapter(adapter); - - if (childDataList != null && childDataList.size() > 0) { + if (childDataList2 != null && childDataList2.size() > 0) { for (int j = 0; j < shelfHeaderDataList.size(); j++) { if (hashMapListChildData.get(shelfHeaderDataList.get(j)).size() > 0) { expandableListView.expandGroup(j); @@ -400,29 +389,35 @@ public class StockFacing_PlanogramTrackerActivity extends AppCompatActivity { } } - private void prepareSkuList(ArrayList childDataList1, - StockFacing_PlanogramTrackerDataGetterSetter object) { + //Sku Add in Particular Shelf with position + private void prepareSkuList(StockFacing_PlanogramTrackerDataGetterSetter object, + ArrayList childDataList1, + HashMap> addSkuHashMapChildData1) { try { - if (shelfHeaderDataList.size() > 0) { + childDataList2 = new ArrayList<>(); - hashMapListChildData.put(object, childDataList1); - /*//Child Sku Data - for (int i = 0; i < shelfHeaderDataList.size(); i++) { - if (object.getSp_addShelf_id().equals(shelfHeaderDataList.get(i).getSp_addShelf_id())) { - hashMapListChildData.put(object, childDataList1); - } else { - hashMapListChildData.put(shelfHeaderDataList.get(i), childDataList); + for (int i1 = 0; i1 < childDataList1.size(); i1++) { + ArrayList tempList = + addSkuHashMapChildData1.get(childDataList1.get(i1)); + + for (int j = 0; j < tempList.size(); j++) { + StockFacing_PlanogramTrackerDataGetterSetter data = tempList.get(j); + + data.setSp_addShelf_id(object.getSp_addShelf_id()); + + if (data.getCheckbox_sku().equals("1")) { + childDataList2.add(data); } - }*/ - -/* adapter = new PlanogramExpandableListAdapter(this, shelfHeaderDataList, hashMapListChildData); - expandableListView.setAdapter(adapter);*/ + } + } + if (shelfHeaderDataList.size() > 0) { + //Child Sku Data + hashMapListChildData.put(object, childDataList2); adapter.notifyDataSetChanged(); - //expandableListView.invalidate(); - - if (childDataList != null && childDataList.size() > 0) { + if (childDataList2 != null && childDataList2.size() > 0) { for (int j = 0; j < shelfHeaderDataList.size(); j++) { if (hashMapListChildData.get(shelfHeaderDataList.get(j)).size() > 0) { expandableListView.expandGroup(j); @@ -438,10 +433,10 @@ public class StockFacing_PlanogramTrackerActivity extends AppCompatActivity { public class PlanogramExpandableListAdapter extends BaseExpandableListAdapter { private Context _context; private List _listDataHeader; - private HashMap> _listDataChild; + private HashMap> _listDataChild; public PlanogramExpandableListAdapter(Context context, List listDataHeader, - HashMap> listChildData) { + HashMap> listChildData) { this._context = context; this._listDataHeader = listDataHeader; this._listDataChild = listChildData; @@ -482,8 +477,8 @@ public class StockFacing_PlanogramTrackerActivity extends AppCompatActivity { @Override public void onClick(View view) { //Stock Facing Planogram SKU Data - tempChildDataList = db.getStockAndFacingPlanogramDefaultSKUData(categoryId, brand_id, - keyAccount_id, storeType_id, class_id); + /*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); @@ -491,7 +486,7 @@ public class StockFacing_PlanogramTrackerActivity extends AppCompatActivity { 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 addSku_Shelf = (Button) dialog1.findViewById(R.id.dialog_btn_addSku_Shelf); Button cancel = (Button) dialog1.findViewById(R.id.dialog_btn_cancel_addSku); ExpandableListView exp_addSkuListView = (ExpandableListView) dialog1.findViewById(R.id.exp_addSkuListView); @@ -502,7 +497,8 @@ public class StockFacing_PlanogramTrackerActivity extends AppCompatActivity { } }); - dialogAddSkuList(exp_addSkuListView); + //Add Sku Dailog List + dialogAddSkuList(exp_addSkuListView, headerTitle); /*childDataList = new ArrayList<>(); @@ -538,24 +534,33 @@ public class StockFacing_PlanogramTrackerActivity extends AppCompatActivity { lin_addSku.addView(view1); }*/ - addSKU.setOnClickListener(new View.OnClickListener() { + + addSku_Shelf.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - /*boolean flag = false; - for (int i = 0; i < childDataList.size(); i++) { - if (childDataList.get(i).getCheckbox_sku().equals("1")) { - flag = true; - break; + boolean flag = false; + + for (int i1 = 0; i1 < addSkuHeaderList.size(); i1++) { + ArrayList tempList = + addSkuHashMapChildData.get(addSkuHeaderList.get(i1)); + + for (int j = 0; j < tempList.size(); j++) { + StockFacing_PlanogramTrackerDataGetterSetter data = tempList.get(j); + + if (data.getCheckbox_sku().equals("1")) { + flag = true; + break; + } } } if (flag) { - prepareSkuList(childDataList, headerTitle); + prepareSkuList(headerTitle, addSkuHeaderList, addSkuHashMapChildData); dialog1.dismiss(); } else { - Snackbar.make(view, "Please select atleast one sku", Snackbar.LENGTH_LONG) + Snackbar.make(view, getString(R.string.stock_planogram_data_select_one_sku), Snackbar.LENGTH_LONG) .setAction("Action", null).show(); - }*/ + } } }); @@ -591,7 +596,9 @@ public class StockFacing_PlanogramTrackerActivity extends AppCompatActivity { } @Override - public View getChildView(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) { + StockFacing_PlanogramTrackerDataGetterSetter childData = (StockFacing_PlanogramTrackerDataGetterSetter) getChild(groupPosition, childPosition); ViewHolder holder = null; @@ -610,7 +617,7 @@ public class StockFacing_PlanogramTrackerActivity extends AppCompatActivity { holder = (ViewHolder) convertView.getTag(); } - //holder.checkBox.setVisibility(View.GONE); + holder.checkBox.setVisibility(View.GONE); holder.checkBox.setEnabled(false); holder.txt_skuChild.setText(childData.getSku()); @@ -642,7 +649,7 @@ public class StockFacing_PlanogramTrackerActivity extends AppCompatActivity { } boolean validateData(List listDataHeader, - HashMap> listDataChild) { + HashMap> listDataChild) { boolean flag = true; checkHeaderArray.clear(); @@ -654,7 +661,7 @@ public class StockFacing_PlanogramTrackerActivity extends AppCompatActivity { } checkflag = false; - Error_Message = "add sku shelf can not be empty"; + Error_Message = getString(R.string.stock_planogram_data_add_shelf); break; } else { if (listDataChild.get(listDataHeader.get(i)).size() <= 0) { @@ -663,7 +670,7 @@ public class StockFacing_PlanogramTrackerActivity extends AppCompatActivity { } flag = false; - Error_Message = "add sku shelf can not be empty"; + Error_Message = getString(R.string.stock_planogram_data_add_shelf); break; } } @@ -729,8 +736,16 @@ public class StockFacing_PlanogramTrackerActivity extends AppCompatActivity { return super.onOptionsItemSelected(item); } - private void dialogAddSkuList(ExpandableListView exp_addSkuListView) { + //Add Sku Dailog Display List + private void dialogAddSkuList(ExpandableListView exp_addSkuListView, + StockFacing_PlanogramTrackerDataGetterSetter headerObject) { try { + //By this headerObject we need to get the sku list + ArrayList tempSkuList = new ArrayList<>(); + tempSkuList = db.getStockAndFacingPlanogramAfterSKU_PerShelfData(headerObject.getSp_addShelf_id(), + headerObject.getSp_shelfPosition()); + + addSkuHeaderList = new ArrayList<>(); addSkuChildList = new ArrayList<>(); addSkuHashMapChildData = new HashMap<>(); @@ -744,10 +759,29 @@ public class StockFacing_PlanogramTrackerActivity extends AppCompatActivity { //Child Data if (addSkuHeaderList.get(i).getCompany_id().equals("1")) { - addSkuChildList = db.getPlanogramAddSkuChildData(categoryId, addSkuHeaderList.get(i).getBrand_id(), - keyAccount_id, storeType_id, class_id); + //Default Case + if (!(tempSkuList.size() > 0)) { + addSkuChildList = db.getPlanogramAddSkuChildData(categoryId, addSkuHeaderList.get(i).getBrand_id(), + keyAccount_id, storeType_id, class_id); + + addSkuHashMapChildData.put(addSkuHeaderList.get(i), addSkuChildList); + + } else { //After Save Sku Data + addSkuChildList = db.getPlanogramAddSkuChildData(categoryId, addSkuHeaderList.get(i).getBrand_id(), + keyAccount_id, storeType_id, class_id); + + for (int i1 = 0; i1 < addSkuChildList.size(); i1++) { + + for (int j = 0; j < tempSkuList.size(); j++) { + if (addSkuChildList.get(i1).getSku_id().equals(tempSkuList.get(j).getSku_id())) { + addSkuChildList.set(i1, tempSkuList.get(j)); + } + } + } + + addSkuHashMapChildData.put(addSkuHeaderList.get(i), addSkuChildList); + } - addSkuHashMapChildData.put(addSkuHeaderList.get(i), addSkuChildList); } } } @@ -759,13 +793,14 @@ public class StockFacing_PlanogramTrackerActivity extends AppCompatActivity { } } + //Add Sku Dailog Display List Adapter public class ExpandableListAdapter extends BaseExpandableListAdapter { private Context _context; private List _listDataHeader; - private HashMap> _listDataChild; + private HashMap> _listDataChild; public ExpandableListAdapter(Context context, List listDataHeader, - HashMap> listChildData) { + HashMap> listChildData) { this._context = context; this._listDataHeader = listDataHeader; this._listDataChild = listChildData; @@ -788,7 +823,8 @@ public class StockFacing_PlanogramTrackerActivity extends AppCompatActivity { @Override public View getGroupView(final int groupPosition, boolean isExpanded, View convertView, ViewGroup parent) { - final StockFacing_PlanogramTrackerDataGetterSetter headerTitle = (StockFacing_PlanogramTrackerDataGetterSetter) getGroup(groupPosition); + final StockFacing_PlanogramTrackerDataGetterSetter headerTitle = + (StockFacing_PlanogramTrackerDataGetterSetter) getGroup(groupPosition); if (convertView == null) { LayoutInflater infalInflater = (LayoutInflater) this._context.getSystemService(Context.LAYOUT_INFLATER_SERVICE); @@ -819,7 +855,8 @@ 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(final int groupPosition, final int childPosition, boolean isLastChild, + View convertView, ViewGroup parent) { final StockFacing_PlanogramTrackerDataGetterSetter childData = (StockFacing_PlanogramTrackerDataGetterSetter) getChild(groupPosition, childPosition); @@ -840,6 +877,22 @@ public class StockFacing_PlanogramTrackerActivity extends AppCompatActivity { holder.txt_skuName.setText(childData.getSku()); + holder.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"); + } + } + }); + + if (childData.getCheckbox_sku().equals("0")) { + holder.chk_sku.setChecked(false); + } else if (childData.getCheckbox_sku().equals("1")) { + holder.chk_sku.setChecked(true); + } return convertView; } diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/Stock_FacingActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/Stock_FacingActivity.java index bfe7276..ff27274 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/Stock_FacingActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/Stock_FacingActivity.java @@ -70,6 +70,7 @@ import cpm.com.gskmtorange.constant.CommonString; import cpm.com.gskmtorange.dailyentry.T2PComplianceActivity; import cpm.com.gskmtorange.xmlGetterSetter.MAPPING_PLANOGRAM_DataGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.MSL_AvailabilityGetterSetter; +import cpm.com.gskmtorange.xmlGetterSetter.StockFacing_PlanogramTrackerDataGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.Stock_FacingGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.Store_wise_camera_DataGetterSetter; @@ -100,6 +101,10 @@ public class Stock_FacingActivity extends AppCompatActivity { String img3 = "", img4 = "", img5 = "", img6 = ""; Store_wise_camera_DataGetterSetter cameraData; + ArrayList planogramShelfHeaderDataList = new ArrayList<>(); + ArrayList planogramSkuChildDataList; + HashMap> planogramHashMapListChildData = new HashMap<>(); + private static boolean updateResources(Context context, String language) { String lang; @@ -179,7 +184,6 @@ public class Stock_FacingActivity extends AppCompatActivity { //Camera cameraMethod(); - final FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab); fab.setOnClickListener(new View.OnClickListener() { @Override @@ -203,12 +207,12 @@ public class Stock_FacingActivity extends AppCompatActivity { db.open(); //Camera insert or update - if (db.isStorewiseCameraSave(store_id, categoryId)) { + /*if (db.isStorewiseCameraSave(store_id, categoryId)) { db.updateStore_wise_camera(cameraData); } else { cameraData.setCheckSaveStatus("1"); db.InsertStore_wise_camera(cameraData); - } + }*/ //Stock Facing insert or update if (db.checkStockAndFacingData(store_id, categoryId)) { @@ -338,8 +342,26 @@ public class Stock_FacingActivity extends AppCompatActivity { } + //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); + } + } + } + } + private void cameraMethod() { - cameraData = new Store_wise_camera_DataGetterSetter(); + /*cameraData = new Store_wise_camera_DataGetterSetter(); if (db.isStorewiseCameraSave(store_id, categoryId)) { cameraData = db.getStore_wise_camera(store_id, categoryId); @@ -428,7 +450,11 @@ public class Stock_FacingActivity extends AppCompatActivity { } }); - } else { + } 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); @@ -450,9 +476,11 @@ public class Stock_FacingActivity extends AppCompatActivity { intent.putExtra("categoryId", categoryId); intent.putExtra("categoryName", categoryName); - startActivity(intent); + startActivityForResult(intent, 100); } }); + } else { + findViewById(R.id.lin_camera).setVisibility(View.GONE); } } @@ -509,20 +537,20 @@ public class Stock_FacingActivity extends AppCompatActivity { if (camera_allow.equalsIgnoreCase("1")) { //Atleast Single camera is click - if (!cameraData.getCamera1().equals("") || !cameraData.getCamera2().equals("") || - !cameraData.getCamera3().equals("") || !cameraData.getCamera4().equals("")) { + /*if (!cameraData.getCamera1().equals("") || !cameraData.getCamera2().equals("") || + !cameraData.getCamera3().equals("") || !cameraData.getCamera4().equals("")) {*/ - if (!stock.equals("0")) { - //if (!imagePath.equals("") || !imagePath1.equals("")) { - if (stock.equals("") || faceup.equals("")) { - if (!checkHeaderArray.contains(i)) { - checkHeaderArray.add(i); - } - - flag = false; - Error_Message = getResources().getString(R.string.fill_data); - break; + if (!stock.equals("0")) { + //if (!imagePath.equals("") || !imagePath1.equals("")) { + if (stock.equals("") || faceup.equals("")) { + if (!checkHeaderArray.contains(i)) { + checkHeaderArray.add(i); } + + flag = false; + Error_Message = getResources().getString(R.string.fill_data); + break; + } /*} else { if (!checkHeaderArray.contains(i)) { checkHeaderArray.add(i); @@ -532,6 +560,38 @@ public class Stock_FacingActivity extends AppCompatActivity { Error_Message = getResources().getString(R.string.click_image); break; }*/ + } else { + if (stock.equals("")) { + if (!checkHeaderArray.contains(i)) { + checkHeaderArray.add(i); + } + + flag = false; + Error_Message = getResources().getString(R.string.fill_data); + break; + } + } + /*} else { + flag = false; + Error_Message = getResources().getString(R.string.click_image); + break; + }*/ + + } else { + //Camera allow disable + + //Planogram list is not empty + if (planogramShelfHeaderDataList.size() > 0) { + if (!stock.equals("0")) { + if (stock.equals("") || faceup.equals("")) { + if (!checkHeaderArray.contains(i)) { + checkHeaderArray.add(i); + } + + flag = false; + Error_Message = getResources().getString(R.string.fill_data); + break; + } } else { if (stock.equals("")) { if (!checkHeaderArray.contains(i)) { @@ -545,33 +605,9 @@ public class Stock_FacingActivity extends AppCompatActivity { } } else { flag = false; - Error_Message = getResources().getString(R.string.click_image); + Error_Message = getResources().getString(R.string.stock_planogram_data_noCamera_data); break; } - - } else { - //Camera allow disable - if (!stock.equals("0")) { - if (stock.equals("") || faceup.equals("")) { - if (!checkHeaderArray.contains(i)) { - checkHeaderArray.add(i); - } - - flag = false; - Error_Message = getResources().getString(R.string.fill_data); - break; - } - } else { - if (stock.equals("")) { - if (!checkHeaderArray.contains(i)) { - checkHeaderArray.add(i); - } - - flag = false; - Error_Message = getResources().getString(R.string.fill_data); - break; - } - } } } else { if (faceup.equals("")) { @@ -928,7 +964,7 @@ public class Stock_FacingActivity extends AppCompatActivity { }*/ switch (requestCode) { - case 1: + /*case 1: if (resultCode == -1) { if (_pathforcheck != null && !_pathforcheck.equals("")) { if (new File(str + _pathforcheck).exists()) { @@ -1049,6 +1085,15 @@ public class Stock_FacingActivity extends AppCompatActivity { } else { Log.e("Stock & Facing", "User cancelled"); } + break;*/ + + case 100: + //Planogram List for check and delete on backPress + prepareDefaultList(); + if (planogramShelfHeaderDataList.size() > 0) { + camera1.setBackgroundResource(R.mipmap.camera_grey); + } + break; } super.onActivityResult(requestCode, resultCode, data); @@ -1072,9 +1117,6 @@ public class Stock_FacingActivity extends AppCompatActivity { @Override public boolean onOptionsItemSelected(MenuItem item) { - // Handle action bar item clicks here. The action bar will - // automatically handle clicks on the Home/Up button, so long - // as you specify a parent activity in AndroidManifest.xml. int id = item.getItemId(); if (id == android.R.id.home) { @@ -1083,6 +1125,13 @@ public class Stock_FacingActivity 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, cameraData)) { + if (!camera_allow.equals("1")) { + db.deletePlanogramListStoreAndCategorywise(store_id, categoryId, + planogramShelfHeaderDataList, planogramHashMapListChildData); + } + } + finish(); } }) @@ -1188,6 +1237,13 @@ public class Stock_FacingActivity 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, cameraData)) { + if (!camera_allow.equals("1")) { + db.deletePlanogramListStoreAndCategorywise(store_id, categoryId, + planogramShelfHeaderDataList, planogramHashMapListChildData); + } + } + finish(); } }) @@ -1272,7 +1328,7 @@ public class Stock_FacingActivity extends AppCompatActivity { img_camera2.setVisibility(View.GONE); } - //img_camera1.setVisibility(View.GONE); + img_camera1.setVisibility(View.GONE); img_camera2.setVisibility(View.GONE); //Camera allow enable diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/PreviousDataUploadActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/PreviousDataUploadActivity.java index 88723dd..69798e0 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/PreviousDataUploadActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/PreviousDataUploadActivity.java @@ -424,16 +424,16 @@ public class PreviousDataUploadActivity extends AppCompatActivity { if (stock_facingHeaderList.size() > 0) { for (int i1 = 0; i1 < stock_facingHeaderList.size(); i1++) { - onXML = "[STOCK_FACING_DATA]" + onXML = "[STOCK_FACING_DATA_NEW]" + "[MID]" + mid + "[/MID]" + "[USER_ID]" + userId + "[/USER_ID]" + "[BRAND_ID]" + Integer.parseInt(stock_facingHeaderList.get(i1).getBrand_id()) + "[/BRAND_ID]" - + "[IAMGE1]" + stock_facingHeaderList.get(i1).getImage1() + "[/IAMGE1]" - + "[IAMGE2]" + stock_facingHeaderList.get(i1).getImage2() + "[/IAMGE2]" + //+ "[IAMGE1]" + stock_facingHeaderList.get(i1).getImage1() + "[/IAMGE1]" + //+ "[IAMGE2]" + stock_facingHeaderList.get(i1).getImage2() + "[/IAMGE2]" + "[SKU_ID]" + Integer.parseInt(stock_facingHeaderList.get(i1).getSku_id()) + "[/SKU_ID]" + "[STOCK]" + Integer.parseInt(stock_facingHeaderList.get(i1).getStock()) + "[/STOCK]" + "[FACEUP]" + Integer.parseInt(stock_facingHeaderList.get(i1).getFacing()) + "[/FACEUP]" - + "[/STOCK_FACING_DATA]"; + + "[/STOCK_FACING_DATA_NEW]"; stock_facing_xml = stock_facing_xml + onXML; } @@ -442,7 +442,7 @@ public class PreviousDataUploadActivity extends AppCompatActivity { request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_UPLOAD_STOCK_XML_DATA); request.addProperty("XMLDATA", sos_xml); - request.addProperty("KEYS", "STOCK_FACING_DATA"); + request.addProperty("KEYS", "STOCK_FACING_DATA_NEW"); request.addProperty("USERNAME", userId); request.addProperty("MID", mid); @@ -832,13 +832,13 @@ public class PreviousDataUploadActivity extends AppCompatActivity { + "[MID]" + mid + "[/MID]" + "[USER_ID]" + userId + "[/USER_ID]" + "[SKU_ID]" + Integer.parseInt(stockFacingPlanogramDataList.get(i1).getSku_id()) + "[/SKU_ID]" - //+ "[category_id]" + Integer.parseInt(stockFacingPlanogramDataList.get(i1).getCategory_id()) + "[/category_id]" + + "[CATEGORY_ID]" + Integer.parseInt(stockFacingPlanogramDataList.get(i1).getCategory_id()) + "[/CATEGORY_ID]" //+ "[company_id]" + Integer.parseInt(stockFacingPlanogramDataList.get(i1).getCompany_id()) + "[/company_id]" //+ "[sub_category_id]" + Integer.parseInt(stockFacingPlanogramDataList.get(i1).getSub_category_id()) + "[/sub_category_id]" - + "[BRAND_ID]" + Integer.parseInt(stockFacingPlanogramDataList.get(i1).getBrand_id()) + "[/BRAND_ID]" + //+ "[BRAND_ID]" + Integer.parseInt(stockFacingPlanogramDataList.get(i1).getBrand_id()) + "[/BRAND_ID]" + "[SHELF_ID]" + Integer.parseInt(stockFacingPlanogramDataList.get(i1).getSp_addShelf_id()) + "[/SHELF_ID]" + "[SHELF_POSITION]" + Integer.parseInt(stockFacingPlanogramDataList.get(i1).getSp_shelfPosition()) + "[/SHELF_POSITION]" - + "[CHECKBOX]" + Integer.parseInt(stockFacingPlanogramDataList.get(i1).getCheckbox_sku()) + "[/CHECKBOX]" + //+ "[CHECKBOX]" + Integer.parseInt(stockFacingPlanogramDataList.get(i1).getCheckbox_sku()) + "[/CHECKBOX]" + "[/STOCK_FACING_PLANOGRAM_DATA]"; stock_facing_planogram_xml = stock_facing_planogram_xml + onXML; @@ -879,7 +879,7 @@ public class PreviousDataUploadActivity extends AppCompatActivity { //Store Wise Camera - String store_wise_camera_xml = ""; + /*String store_wise_camera_xml = ""; onXML = ""; storeWiseCameraDataGetterSetters = db.getStoreWiseCameraServerUploadData(coverageList.get(i).getStoreId()); @@ -929,13 +929,13 @@ public class PreviousDataUploadActivity extends AppCompatActivity { } data.value = 55; data.name = getString(R.string.stock_planogram_data_uploading); - publishProgress(data); + publishProgress(data);*/ //Image Upload //Store Wise Camera Images Upload - if (storeWiseCameraDataGetterSetters.size() > 0) { + /*if (storeWiseCameraDataGetterSetters.size() > 0) { for (int i1 = 0; i1 < storeWiseCameraDataGetterSetters.size(); i1++) { if (storeWiseCameraDataGetterSetters.get(i1).getCamera1() != null && !storeWiseCameraDataGetterSetters.get(i1).getCamera1().equals("")) { @@ -1022,7 +1022,7 @@ public class PreviousDataUploadActivity extends AppCompatActivity { } } } - } + }*/ //Stock Facing Images Upload /*if (stock_facingHeaderList.size() > 0) { diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java index 369f106..f563f94 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java @@ -431,16 +431,16 @@ public class UploadActivity extends AppCompatActivity { if (stock_facingHeaderList.size() > 0) { for (int i1 = 0; i1 < stock_facingHeaderList.size(); i1++) { - onXML = "[STOCK_FACING_DATA]" + onXML = "[STOCK_FACING_DATA_NEW]" + "[MID]" + mid + "[/MID]" + "[USER_ID]" + userId + "[/USER_ID]" + "[BRAND_ID]" + Integer.parseInt(stock_facingHeaderList.get(i1).getBrand_id()) + "[/BRAND_ID]" - + "[IAMGE1]" + stock_facingHeaderList.get(i1).getImage1() + "[/IAMGE1]" - + "[IAMGE2]" + stock_facingHeaderList.get(i1).getImage2() + "[/IAMGE2]" + //+ "[IAMGE1]" + stock_facingHeaderList.get(i1).getImage1() + "[/IAMGE1]" + //+ "[IAMGE2]" + stock_facingHeaderList.get(i1).getImage2() + "[/IAMGE2]" + "[SKU_ID]" + Integer.parseInt(stock_facingHeaderList.get(i1).getSku_id()) + "[/SKU_ID]" + "[STOCK]" + Integer.parseInt(stock_facingHeaderList.get(i1).getStock()) + "[/STOCK]" + "[FACEUP]" + Integer.parseInt(stock_facingHeaderList.get(i1).getFacing()) + "[/FACEUP]" - + "[/STOCK_FACING_DATA]"; + + "[/STOCK_FACING_DATA_NEW]"; stock_facing_xml = stock_facing_xml + onXML; } @@ -449,7 +449,7 @@ public class UploadActivity extends AppCompatActivity { request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_UPLOAD_STOCK_XML_DATA); request.addProperty("XMLDATA", sos_xml); - request.addProperty("KEYS", "STOCK_FACING_DATA"); + request.addProperty("KEYS", "STOCK_FACING_DATA_NEW"); request.addProperty("USERNAME", userId); request.addProperty("MID", mid); @@ -844,13 +844,13 @@ public class UploadActivity extends AppCompatActivity { + "[MID]" + mid + "[/MID]" + "[USER_ID]" + userId + "[/USER_ID]" + "[SKU_ID]" + Integer.parseInt(stockFacingPlanogramDataList.get(i1).getSku_id()) + "[/SKU_ID]" - //+ "[category_id]" + Integer.parseInt(stockFacingPlanogramDataList.get(i1).getCategory_id()) + "[/category_id]" + + "[CATEGORY_ID]" + Integer.parseInt(stockFacingPlanogramDataList.get(i1).getCategory_id()) + "[/CATEGORY_ID]" //+ "[company_id]" + Integer.parseInt(stockFacingPlanogramDataList.get(i1).getCompany_id()) + "[/company_id]" //+ "[sub_category_id]" + Integer.parseInt(stockFacingPlanogramDataList.get(i1).getSub_category_id()) + "[/sub_category_id]" - + "[BRAND_ID]" + Integer.parseInt(stockFacingPlanogramDataList.get(i1).getBrand_id()) + "[/BRAND_ID]" + //+ "[BRAND_ID]" + Integer.parseInt(stockFacingPlanogramDataList.get(i1).getBrand_id()) + "[/BRAND_ID]" + "[SHELF_ID]" + Integer.parseInt(stockFacingPlanogramDataList.get(i1).getSp_addShelf_id()) + "[/SHELF_ID]" + "[SHELF_POSITION]" + Integer.parseInt(stockFacingPlanogramDataList.get(i1).getSp_shelfPosition()) + "[/SHELF_POSITION]" - + "[CHECKBOX]" + Integer.parseInt(stockFacingPlanogramDataList.get(i1).getCheckbox_sku()) + "[/CHECKBOX]" + //+ "[CHECKBOX]" + Integer.parseInt(stockFacingPlanogramDataList.get(i1).getCheckbox_sku()) + "[/CHECKBOX]" + "[/STOCK_FACING_PLANOGRAM_DATA]"; stock_facing_planogram_xml = stock_facing_planogram_xml + onXML; @@ -891,7 +891,7 @@ public class UploadActivity extends AppCompatActivity { //Store Wise Camera - String store_wise_camera_xml = ""; + /*String store_wise_camera_xml = ""; onXML = ""; storeWiseCameraDataGetterSetters = db.getStoreWiseCameraServerUploadData(coverageList.get(i).getStoreId()); @@ -941,13 +941,13 @@ public class UploadActivity extends AppCompatActivity { } data.value = 55; data.name = getString(R.string.stock_planogram_data_uploading); - publishProgress(data); + publishProgress(data);*/ //Image Upload //Store Wise Camera Images Upload - if (storeWiseCameraDataGetterSetters.size() > 0) { + /*if (storeWiseCameraDataGetterSetters.size() > 0) { for (int i1 = 0; i1 < storeWiseCameraDataGetterSetters.size(); i1++) { if (storeWiseCameraDataGetterSetters.get(i1).getCamera1() != null && !storeWiseCameraDataGetterSetters.get(i1).getCamera1().equals("")) { @@ -1034,7 +1034,7 @@ public class UploadActivity extends AppCompatActivity { } } } - } + }*/ //Stock Facing Images Upload /*if (stock_facingHeaderList.size() > 0) { 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 index bb0db8e..234c1f7 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/StockFacing_PlanogramTrackerDataGetterSetter.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/StockFacing_PlanogramTrackerDataGetterSetter.java @@ -1,11 +1,12 @@ package cpm.com.gskmtorange.xmlGetterSetter; import java.util.ArrayList; +import java.util.Comparator; public class StockFacing_PlanogramTrackerDataGetterSetter { 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; + sku_id, sku, mrp, sku_sequence, stock, facing, mbq, company_id, image1, image2, sos_target, key_id; public String getShelf_id() { return shelf_id; @@ -182,4 +183,74 @@ public class StockFacing_PlanogramTrackerDataGetterSetter { public void setCheckbox_sku(String checkbox_sku) { this.checkbox_sku = checkbox_sku; } + + public String getKey_id() { + return key_id; + } + + public void setKey_id(String key_id) { + this.key_id = key_id; + } + + //Comprable Interface + + /*@Override + public int compareTo(StockFacing_PlanogramTrackerDataGetterSetter compare) { + int compareShelf = Integer.parseInt(compare.getSp_addShelf_id()); + + *//* For Ascending order*//* + return Integer.parseInt(this.sp_addShelf_id) - compareShelf; + + *//* For Descending order do like this *//* + //return compareage-this.studentage; + }*/ + + //Comparator Interface + + public static Comparator shelfComparator = + new Comparator() { + + public int compare(StockFacing_PlanogramTrackerDataGetterSetter s1, StockFacing_PlanogramTrackerDataGetterSetter s2) { + String shelf1 = s1.getSp_addShelf_id(); + String shelf2 = s2.getSp_addShelf_id(); + + /*Comparator shelfPositionComparator = + new Comparator() { + + public int compare(StockFacing_PlanogramTrackerDataGetterSetter s1, + StockFacing_PlanogramTrackerDataGetterSetter s2) { + + String shelf1 = s1.getSp_shelfPosition(); + String shelf2 = s2.getSp_shelfPosition(); + + //ascending order + return shelf1.compareTo(shelf2); + + //descending order + //return StudentName2.compareTo(StudentName1); + } + };*/ + + //ascending order + return shelf1.compareTo(shelf2); + + //descending order + //return StudentName2.compareTo(StudentName1); + } + }; + + public static Comparator shelfPositionComparator = + new Comparator() { + + public int compare(StockFacing_PlanogramTrackerDataGetterSetter s1, StockFacing_PlanogramTrackerDataGetterSetter s2) { + String shelf1 = s1.getSp_shelfPosition(); + String shelf2 = s2.getSp_shelfPosition(); + + //ascending order + return shelf1.compareTo(shelf2); + + //descending order + //return StudentName2.compareTo(StudentName1); + } + }; } diff --git a/GSKMTOrange/src/main/res/layout/item_stock_facing_planogram_header.xml b/GSKMTOrange/src/main/res/layout/item_stock_facing_planogram_header.xml index 006c53f..89d8b8c 100644 --- a/GSKMTOrange/src/main/res/layout/item_stock_facing_planogram_header.xml +++ b/GSKMTOrange/src/main/res/layout/item_stock_facing_planogram_header.xml @@ -5,6 +5,8 @@ android:background="@color/white" android:orientation="vertical"> + + Stock Planogram Data Uploading + Please fill the no camera data + Shelf + Position + is already exists + Please select atleast one sku + Add sku, shelf can not be empty + From bb2dfe75943db00ef0180910615d1fa7fe16820b Mon Sep 17 00:00:00 2001 From: Gagan290 Date: Wed, 22 Feb 2017 14:00:46 +0530 Subject: [PATCH 2/4] //PromoCompliance Default Toggle Changes --- .../StockFacing_PlanogramTrackerActivity.java | 82 ++++--------------- ...cing_PlanogramTrackerDataGetterSetter.java | 30 ------- 2 files changed, 18 insertions(+), 94 deletions(-) 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 97fe9f4..b9f905c 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 @@ -69,7 +69,7 @@ public class StockFacing_PlanogramTrackerActivity extends AppCompatActivity { List checkHeaderArray = new ArrayList<>(); ArrayList shelfHeaderDataList = new ArrayList<>(); - ArrayList childDataList, tempChildDataList, childDataList2; + ArrayList childDataList, childDataList1; HashMap> hashMapListChildData = new HashMap<>(); private SharedPreferences preferences; @@ -79,7 +79,6 @@ public class StockFacing_PlanogramTrackerActivity extends AppCompatActivity { ArrayList addSkuHeaderList; ArrayList addSkuChildList; HashMap> addSkuHashMapChildData; - ArrayList list; @Override protected void onCreate(Bundle savedInstanceState) { @@ -226,19 +225,8 @@ public class StockFacing_PlanogramTrackerActivity extends AppCompatActivity { } else { shelfHeaderDataList.add(data); dialog.dismiss(); - - //Sort Shelf wise - //Collections.sort(shelfHeaderDataList, StockFacing_PlanogramTrackerDataGetterSetter.shelfComparator); - //Sort Shelf Position wise - //Collections.sort(shelfHeaderDataList, StockFacing_PlanogramTrackerDataGetterSetter.shelfPositionComparator); - prepareHeaderList(shelfHeaderDataList); } - - /*shelfHeaderDataList.add(data); - dialog.dismiss(); - prepareHeaderList(shelfHeaderDataList);*/ - // } } else { Toast.makeText(StockFacing_PlanogramTrackerActivity.this, getResources().getString(R.string.empty_field), Toast.LENGTH_SHORT).show(); } @@ -335,7 +323,6 @@ public class StockFacing_PlanogramTrackerActivity extends AppCompatActivity { //After save shelf header data shelfHeaderDataList = db.getPlanogramAddShelfHeaderAfterSaveData(store_id, categoryId); - if (shelfHeaderDataList.size() > 0) { //Sort Shelf Position wise @@ -343,6 +330,7 @@ public class StockFacing_PlanogramTrackerActivity extends AppCompatActivity { //Sort Shelf wise Collections.sort(shelfHeaderDataList, StockFacing_PlanogramTrackerDataGetterSetter.shelfComparator); + for (int i = 0; i < shelfHeaderDataList.size(); i++) { childDataList = db.getStockAndFacingPlanogramAfterSKUData(shelfHeaderDataList.get(i).getKey_id()); @@ -371,12 +359,14 @@ public class StockFacing_PlanogramTrackerActivity extends AppCompatActivity { //Header Data if (shelfHeaderDataList1.size() > 0) { + //Sort Shelf Position wise +/* Collections.sort(shelfHeaderDataList1, StockFacing_PlanogramTrackerDataGetterSetter.shelfPositionComparator); + //Sort Shelf wise + Collections.sort(shelfHeaderDataList1, StockFacing_PlanogramTrackerDataGetterSetter.shelfComparator);*/ + adapter.notifyDataSetChanged(); - /*adapter = new PlanogramExpandableListAdapter(this, shelfHeaderDataList1, hashMapListChildData); - expandableListView.setAdapter(adapter);*/ - - if (childDataList2 != null && childDataList2.size() > 0) { + if (childDataList1 != null && childDataList1.size() > 0) { for (int j = 0; j < shelfHeaderDataList.size(); j++) { if (hashMapListChildData.get(shelfHeaderDataList.get(j)).size() > 0) { expandableListView.expandGroup(j); @@ -391,15 +381,15 @@ public class StockFacing_PlanogramTrackerActivity extends AppCompatActivity { //Sku Add in Particular Shelf with position private void prepareSkuList(StockFacing_PlanogramTrackerDataGetterSetter object, - ArrayList childDataList1, + ArrayList tempAddSkuHeaderList, HashMap> addSkuHashMapChildData1) { + ArrayList> tempAddSkuHashMapChildData) { try { - childDataList2 = new ArrayList<>(); + childDataList1 = new ArrayList<>(); - for (int i1 = 0; i1 < childDataList1.size(); i1++) { + for (int i1 = 0; i1 < tempAddSkuHeaderList.size(); i1++) { ArrayList tempList = - addSkuHashMapChildData1.get(childDataList1.get(i1)); + tempAddSkuHashMapChildData.get(tempAddSkuHeaderList.get(i1)); for (int j = 0; j < tempList.size(); j++) { StockFacing_PlanogramTrackerDataGetterSetter data = tempList.get(j); @@ -407,17 +397,17 @@ public class StockFacing_PlanogramTrackerActivity extends AppCompatActivity { data.setSp_addShelf_id(object.getSp_addShelf_id()); if (data.getCheckbox_sku().equals("1")) { - childDataList2.add(data); + childDataList1.add(data); } } } if (shelfHeaderDataList.size() > 0) { //Child Sku Data - hashMapListChildData.put(object, childDataList2); + hashMapListChildData.put(object, childDataList1); adapter.notifyDataSetChanged(); - if (childDataList2 != null && childDataList2.size() > 0) { + if (childDataList1 != null && childDataList1.size() > 0) { for (int j = 0; j < shelfHeaderDataList.size(); j++) { if (hashMapListChildData.get(shelfHeaderDataList.get(j)).size() > 0) { expandableListView.expandGroup(j); @@ -425,6 +415,7 @@ public class StockFacing_PlanogramTrackerActivity extends AppCompatActivity { } } } + } catch (Exception e) { e.printStackTrace(); } @@ -476,10 +467,8 @@ 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);*/ + //Stock Facing Planogram SKU Data final Dialog dialog1 = new Dialog(StockFacing_PlanogramTrackerActivity.this); dialog1.requestWindowFeature(Window.FEATURE_NO_TITLE); dialog1.getWindow().setBackgroundDrawable(new ColorDrawable(android.graphics.Color.TRANSPARENT)); @@ -500,41 +489,6 @@ public class StockFacing_PlanogramTrackerActivity extends AppCompatActivity { //Add Sku Dailog List dialogAddSkuList(exp_addSkuListView, headerTitle); - /*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_Shelf.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { 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 index 234c1f7..1c68e5e 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/StockFacing_PlanogramTrackerDataGetterSetter.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/StockFacing_PlanogramTrackerDataGetterSetter.java @@ -192,21 +192,8 @@ public class StockFacing_PlanogramTrackerDataGetterSetter { this.key_id = key_id; } - //Comprable Interface - - /*@Override - public int compareTo(StockFacing_PlanogramTrackerDataGetterSetter compare) { - int compareShelf = Integer.parseInt(compare.getSp_addShelf_id()); - - *//* For Ascending order*//* - return Integer.parseInt(this.sp_addShelf_id) - compareShelf; - - *//* For Descending order do like this *//* - //return compareage-this.studentage; - }*/ //Comparator Interface - public static Comparator shelfComparator = new Comparator() { @@ -214,23 +201,6 @@ public class StockFacing_PlanogramTrackerDataGetterSetter { String shelf1 = s1.getSp_addShelf_id(); String shelf2 = s2.getSp_addShelf_id(); - /*Comparator shelfPositionComparator = - new Comparator() { - - public int compare(StockFacing_PlanogramTrackerDataGetterSetter s1, - StockFacing_PlanogramTrackerDataGetterSetter s2) { - - String shelf1 = s1.getSp_shelfPosition(); - String shelf2 = s2.getSp_shelfPosition(); - - //ascending order - return shelf1.compareTo(shelf2); - - //descending order - //return StudentName2.compareTo(StudentName1); - } - };*/ - //ascending order return shelf1.compareTo(shelf2); From 4eafe3c14db07fb5a6855f49a9d24564743a94cf Mon Sep 17 00:00:00 2001 From: Gagan290 Date: Wed, 22 Feb 2017 16:36:13 +0530 Subject: [PATCH 3/4] //Add language method in stock facing planogram --- .../com/gskmtorange/Database/GSKOrangeDB.java | 37 +-- .../StockFacing_PlanogramTrackerActivity.java | 35 ++- GSKMTOrange/src/main/res/values-ar/string.xml | 230 ++++++++++++++++-- GSKMTOrange/src/main/res/values-tr/string.xml | 13 + 4 files changed, 269 insertions(+), 46 deletions(-) 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 47f9b7c..7f82e14 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java @@ -3687,7 +3687,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper { BG.setBRAND_ID(dbcursor.getString(dbcursor.getColumnIndexOrThrow("BRAND_ID"))); list.add(BG); - dbcursor.moveToNext(); + dbcursor.moveToNext(); } dbcursor.close(); return list; @@ -3697,7 +3697,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper { Log.d("Exception ", "get MSL_AvailabilityHeader!" + e.toString()); } return list; - } + } //Stock Facing Planogram Tracker public void InsertSHELF_MASTER(ShelfMasterGetterSetter data) { @@ -4124,8 +4124,8 @@ public class GSKOrangeDB extends SQLiteOpenHelper { } return list; } - - // get T2P Compliance data + + // get T2P Compliance data public ArrayList getT2pCompliancedaletedata(String store_id) { ArrayList list = new ArrayList<>(); @@ -4168,7 +4168,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper { " 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 M.KEYACCOUNT_ID = '" + key_account_id + " 'AND M.STORETYPE_ID = '" + store_type_id + "' AND M.CLASS_ID = '" + class_id + "' AND CA.CATEGORY_ID = '" + categoryId+"'", null); + " WHERE M.KEYACCOUNT_ID = '" + key_account_id + " 'AND M.STORETYPE_ID = '" + store_type_id + "' AND M.CLASS_ID = '" + class_id + "' AND CA.CATEGORY_ID = '" + categoryId + "'", null); if (dbcursor != null) { @@ -4184,20 +4184,19 @@ public class GSKOrangeDB extends SQLiteOpenHelper { CPGS.setSubCategoryCamera2(""); list.add(CPGS); - dbcursor.moveToNext(); + dbcursor.moveToNext(); } dbcursor.close(); return list; } - } catch (Exception e) + } catch (Exception e) { Log.d("Exception ", "get Planogram Shelf Header After Save !" + e.toString()); - // return list; - + // return list; } return list; } - public ArrayList getPlanogramAddShelfHeaderAfterSaveData( + public ArrayList getPlanogramAddShelfHeaderAfterSaveData( String store_id, String category_id) { ArrayList list = new ArrayList<>(); @@ -4206,8 +4205,8 @@ public class GSKOrangeDB extends SQLiteOpenHelper { try { dbcursor = db.rawQuery("Select * from Stock_Facing_Planogram_Header_Data " + "where Store_id='" + store_id + "' and category_id='" + category_id + "'", null); - - if (dbcursor != null) { + + if (dbcursor != null) { dbcursor.moveToFirst(); while (!dbcursor.isAfterLast()) { StockFacing_PlanogramTrackerDataGetterSetter cd = new StockFacing_PlanogramTrackerDataGetterSetter(); @@ -4234,7 +4233,6 @@ public class GSKOrangeDB extends SQLiteOpenHelper { } - public void InsertCategoryPictureData(CategoryPictureGetterSetter gettersetter, ArrayList skulist, String categoryId) { ContentValues values = new ContentValues(); ContentValues values1 = new ContentValues(); @@ -4249,7 +4247,6 @@ public class GSKOrangeDB extends SQLiteOpenHelper { values.put("camera_allow", gettersetter.getCamera_allow()); - long key_id = db.insert(CommonString.TABLE_INSERT_CATEGORY_PICTURE, null, values); if (skulist != null) { @@ -4275,8 +4272,6 @@ public class GSKOrangeDB extends SQLiteOpenHelper { } - - public ArrayList getCategoryPictureData(String store_id, String categoryId) { Cursor cursordata = null; ArrayList productData = new ArrayList(); @@ -4327,8 +4322,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper { } - - public ArrayList getCategoryPictureListData(String store_id, String categoryId,String key_id) { + public ArrayList getCategoryPictureListData(String store_id, String categoryId, String key_id) { Cursor cursordata = null; ArrayList productData = new ArrayList(); @@ -4370,9 +4364,6 @@ public class GSKOrangeDB extends SQLiteOpenHelper { } - - - public ArrayList getCategoryPictureUpload(String store_id) { Cursor cursordata = null; ArrayList productData = new ArrayList(); @@ -4433,7 +4424,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper { try { - cursordata = db.rawQuery("Select * from Stock_CATEGORY_PICTURE_LIST " + "where COMMON_ID = '" + key_id + "'", null); + cursordata = db.rawQuery("Select * from Stock_CATEGORY_PICTURE_LIST " + "where COMMON_ID = '" + key_id + "'", null); if (cursordata != null) { cursordata.moveToFirst(); @@ -4471,8 +4462,6 @@ public class GSKOrangeDB extends SQLiteOpenHelper { } - - public boolean isCategoryPictureData(String store_id, String category_id) { boolean filled = false; Cursor dbcursor = null; 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 b9f905c..a9f4998 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 @@ -7,6 +7,7 @@ import android.content.DialogInterface; import android.content.Intent; import android.content.SharedPreferences; import android.content.pm.ActivityInfo; +import android.content.res.Configuration; import android.content.res.Resources; import android.graphics.Bitmap; import android.graphics.BitmapFactory; @@ -47,6 +48,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; import java.util.List; +import java.util.Locale; import cpm.com.gskmtorange.Database.GSKOrangeDB; import cpm.com.gskmtorange.R; @@ -80,6 +82,31 @@ public class StockFacing_PlanogramTrackerActivity extends AppCompatActivity { ArrayList addSkuChildList; HashMap> addSkuHashMapChildData; + private static boolean updateResources(Context context, String language) { + + String lang; + + if (language.equalsIgnoreCase("English")) { + lang = "EN"; + } else if (language.equalsIgnoreCase("UAE")) { + lang = "AR"; + } else { + lang = "TR"; + } + + Locale locale = new Locale(lang); + Locale.setDefault(locale); + + Resources resources = context.getResources(); + + Configuration configuration = resources.getConfiguration(); + configuration.locale = locale; + + resources.updateConfiguration(configuration, resources.getDisplayMetrics()); + + return true; + } + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -95,7 +122,7 @@ public class StockFacing_PlanogramTrackerActivity extends AppCompatActivity { db.open(); preferences = PreferenceManager.getDefaultSharedPreferences(this); - //updateResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, "")); + updateResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, "")); store_id = preferences.getString(CommonString.KEY_STORE_ID, null); visit_date = preferences.getString(CommonString.KEY_DATE, null); @@ -867,4 +894,10 @@ public class StockFacing_PlanogramTrackerActivity extends AppCompatActivity { TextView txt_skuName; CheckBox chk_sku; } + + @Override + protected void onResume() { + super.onResume(); + updateResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, "")); + } } diff --git a/GSKMTOrange/src/main/res/values-ar/string.xml b/GSKMTOrange/src/main/res/values-ar/string.xml index 36df9b1..1834fb2 100644 --- a/GSKMTOrange/src/main/res/values-ar/string.xml +++ b/GSKMTOrange/src/main/res/values-ar/string.xml @@ -1,28 +1,216 @@ - - البريد الإلكتروني - كلمة السر (اختياري) - تسجيل الدخول أو التسجيل - تسجيل الدخول - عنوان البريد الإلكتروني هذا غير صالح - هذه كلمة المرور قصيرة جدا - هذه كلمة المرور غير صحيحة - هذه الخانة مطلوبه - "هناك حاجة إلى صلات الأذونات لتوفير البريد الإلكتروني -        الاكمال." - - + هل أنت متأكد من أنك تريد الحفظ؟ + هل أنت متأكد من أنك تريد القيام بالنسخ الاحتياطي للبيانات الخاصة بك؟ + لم يتم تحميل البيانات + هل تريد حذف البيانات + هل تريد حذف البيانات + لا يوجد اتصال بشبكة الاتصال. الرجاء التحقق من اتصالك بالإنترنت + الرجاء إضافة البيانات + يرجى أخذ صورة + محل + زيارة المتجر + إضافة + إضافة + العروض الترويجية الاضافية + مساحات العرض الاضافية + مساحات العرض الاضافية + تحميل بيانات مساحات العرض الاضافية + هل أنت متأكد من أنك تريد إضافة + هل أنت متأكد من أنك تريد إضافة + هل أنت متأكد من أنك تريد الخروج + هل أنت متأكد من أنك تريد الحفظ + توافر الاصناف + توافر تحميل البيانات + العلامة التجارية + اسم العلامة التجارية + C 126, Okhla II, + الكاميرا + إلغاء الأمر + قائمة الفئات + أداء الفئة + أنشطة الخروج + نجاح الخروج + انقر فوق موافق لتمكين نظام تحديد المواقع. + انقر فوق الصورة الامامية لمخزن الصورة + انقر فوق الصورة الامامية لمخزن الصورة + انقر فوق نعم لإضافة البيانات + انقر فوق نعم للحذف! + قم بالإغلاق + Close navigation drawer + Competition Promo + Competition Visibility + تصاريح الاتصالات مطلوبة من أجل توفير دعم البريد الإلكتروني + تحميل التغطية + تنزيل البيانات اليومية + قائمة البيانات اليومية + قائمة البيانات اليومية خطة الطريق اليومية - يوميا تحميل البيانات - البيانات تحميل - الجغرافية الكلمات الدلالية + تمت تعبئة البيانات بالفعل + تم تنزيل البيانات بنجاح + تصدير البيانات + تم حفظ البيانات + تم تحديث البيانات + لم يتم العثور على البيانات + تم تصدير قاعدة البيانات بنجاح + حذف + عرض + عرض + اسم العرض + هل تريد حفظ البيانات + تنزيل البيانات + البريد الإلكتروني + فارغ + قم بإدخال القيم + خطأ في التحميل خروج - ضبط - خدمات + تصدير قاعدة البيانات + المواجهة لا يمكن أن تكون أكبر من قيمة المخزون + مواجهة + فشل + قم بتعبئة القيمة + أول زيارة للمحل + أول تعبئة لقيمة المخزون + أول تحديد لموقع المتجر الجغرافي + معرض الصور + الثغرات + العلامة الجغرافية + العلامة الجغرافية + تم تعطيل نظام تحديد المواقع... + محلات أورانج الخاصى بـ GSK + مخزن أورانج الخاصة بـ GSK MT + محلات أورانج الخاصى بـ GSK + Hello blank fragment + الصورة + في المخزون + هل هناك أي "مساحات عرض إضافية" + تسجيل الدخول + LSV ( آخر زيارة للمحل) + LTM ( آخر ثلاثة شهور) + MBQ (أقل كمية أساسية ) + MSL (قائمة المخزون الأساسية) + MSL (قائمة المخزون الأساسية) + MTD (المبيعات الشهرية حتى اليوم) + المخزون الواجب توافره + خطأ في شبكة الاتصال + تحديث جديد متوفر + لا + لا توجد بيانات متاحة + لا توجد بيانات للتحميل + سبب غير عامل + موافق + Open navigation drawer + OSS + Parinaam + كلمة المرور + الفترة + صور + بلانوجرام + الرجاء الخروج من المتجر الحالي + الرجاء انقر فوق الصورة + الرجاء انقر فوق الصورة + الرجاء تنزيل البيانات + الرجاء تنزيل البيانات الأولى + الرجاء إدخال كمية + الرجاء تعبئة جميع البيانات + يرجى ملء بيانات العلامة التجارية + يرجى ملء الفجوة في البيانات + يرجى ملء الملاحظات + يرجى ملء بيانات الصنف + يرجى ملء بيانات الصنف + الرجاء تحديد القائمة المنسدلة + الرجاء تحديد اللغة + يرجى أخذ صورة + الرجاء تحميل البيانات مرة أخرى + الرجاء تحميل بيانات الأيام السابقة أولا + الوقت الحالي + العروض الترويجية + مذيع العروض + مطابقة العروض الترويجية لقوانين الشركة + تحميل بيانات العروض الترويجية + تم إضافة العروض الترويجية + العروض الترويجية + أصناف العروض الترويجية + مطابقة العروض الترويجية لقوانين الشركة + الكمية + السبب + الصورة المرجعية + الصورة المرجعية + الصورة المرجعية + ملاحظة + قيد التشغيل على نقاط البيع + حفظ + سيتم فقدان البيانات المحفوظة--هل تريد الاستمرار؟ + حدد + حدد + حدد اللغة + حدد اللغة + حدد السبب + حدد قيمة العروض + خدمة + الخدمات + إعدادات + إعدادات + إعدادات + تسجيل الدخول + تسجيل الدخول + الصنف + الصنف + إسم الصنف + إسم الصنف + إسم الصنف + SOS (حصة المساحة من الرف ) + SOS (حصة المساحة من الرف ) + SOS (هدف حصة المساحة من الرف ) + المخزون + المخزون + المخزون والمواجهة + المخزون والمواجهة + تحميل بيانات المخزون + تم الخروج بالفعل من المتجر + تم إغلاق المتجر بالفعل + تمت اضافة علامات جغرافية لتحديد مواقع المتجرات + تم تحميل المتجر بالفعل + المتجر مغلق + تم تحميل بيانات المتجر + مخزن استقبال الصورة + تم تحميل العلامات الجغرافية للمتجر + قائمة المتجر + تم تحميل المتجر + زيارة المتجر + أداء المتجر + نجاح + مواد الدعاية في المتاجر + مطابقة مواد الدعاية لقوانين الشركة + مطابقة مواد الدعاية لقوانين الشركة + تحميل بيانات مواد الدعاية T2P + تواجد مواد الدعاية + هذا الجهاز غير معتمد. + عنوان البريد الإلكتروني هذا غير صالح + هذا الحقل مطلوب + كلمة المرور غير صحيحة + كلمة المرور قصيرة جداً + هذا اسم المستخدم غير صحيح + تحميل البيانات + تحميل البيانات + البيانات التي تم تحميلها + تحميل البيانات + تحميل بيانات جغرافية... + تحميل صور جغرافية + اسم المستخدم + هل ترغب في الاستمرار؟ سيتم حذف البيانات الغير المحفوظة + نعم + + Stock Planogram Data Uploading + Category Pictures + CategoryPicture - - - \ No newline at end of file + Please fill the no camera data + Shelf + Position + is already exists + Please select atleast one sku + Add sku, shelf can not be empty + diff --git a/GSKMTOrange/src/main/res/values-tr/string.xml b/GSKMTOrange/src/main/res/values-tr/string.xml index b6815bf..ca8ce80 100644 --- a/GSKMTOrange/src/main/res/values-tr/string.xml +++ b/GSKMTOrange/src/main/res/values-tr/string.xml @@ -238,6 +238,19 @@ Içinde bulunmayan veri Lütfen marka verilerini doldurun PLANOGRAM + + + Stok Planogram Veri Gönderimi + + Kategori Resimleri + KategoriResimleri + + Lütfen kamera yok datasını doldurun + Raf + Konum + Zaten var + En azindan 1 SKU seçmelisiniz + SKU ekleyin, raf boş olamaz From 74b4aa7589ab4bd6b3035d2a33f906abdbac9531 Mon Sep 17 00:00:00 2001 From: Gagan290 Date: Thu, 23 Feb 2017 09:40:37 +0530 Subject: [PATCH 4/4] //Add language method in stock facing planogram --- .../src/main/java/cpm/com/gskmtorange/LoginActivity.java | 2 +- .../main/java/cpm/com/gskmtorange/SelectLanguageActivity.java | 2 +- .../com/gskmtorange/gsk_dailyentry/Stock_FacingActivity.java | 4 ++-- GSKMTOrange/src/main/res/values-ar/string.xml | 3 +++ GSKMTOrange/src/main/res/values-tr/string.xml | 3 +++ GSKMTOrange/src/main/res/values/strings.xml | 3 +++ 6 files changed, 13 insertions(+), 4 deletions(-) diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/LoginActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/LoginActivity.java index a6435b6..2e51eab 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/LoginActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/LoginActivity.java @@ -694,7 +694,7 @@ public class LoginActivity extends AppCompatActivity { if (language.equalsIgnoreCase("English")) { lang = "EN"; - } else if (language.equalsIgnoreCase("UAE")) { + } else if (language.equalsIgnoreCase("ARABIC-KSA")) { lang = "AR"; } else { lang = "TR"; diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/SelectLanguageActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/SelectLanguageActivity.java index e7a92c7..1d7134d 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/SelectLanguageActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/SelectLanguageActivity.java @@ -130,7 +130,7 @@ public class SelectLanguageActivity extends AppCompatActivity implements View.On if(language.equalsIgnoreCase("English")){ lang = "EN"; } - else if(language.equalsIgnoreCase("UAE")) { + else if(language.equalsIgnoreCase("ARABIC-KSA")) { lang = "AR"; } else { diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/Stock_FacingActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/Stock_FacingActivity.java index 81488db..24e3d3d 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/Stock_FacingActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/Stock_FacingActivity.java @@ -462,7 +462,7 @@ public class Stock_FacingActivity extends AppCompatActivity { lin_camera3.setVisibility(View.GONE); lin_camera4.setVisibility(View.GONE); - camera1.setBackgroundResource(R.mipmap.camera_grey); + camera1.setBackgroundResource(R.mipmap.new_no_camera); lin_camera1.setOnClickListener(new View.OnClickListener() { @Override @@ -1093,7 +1093,7 @@ public class Stock_FacingActivity extends AppCompatActivity { //Planogram List for check and delete on backPress prepareDefaultList(); if (planogramShelfHeaderDataList.size() > 0) { - camera1.setBackgroundResource(R.mipmap.camera_grey); + camera1.setBackgroundResource(R.mipmap.new_no_camera_done_edit); } break; diff --git a/GSKMTOrange/src/main/res/values-ar/string.xml b/GSKMTOrange/src/main/res/values-ar/string.xml index 1834fb2..85e259c 100644 --- a/GSKMTOrange/src/main/res/values-ar/string.xml +++ b/GSKMTOrange/src/main/res/values-ar/string.xml @@ -213,4 +213,7 @@ is already exists Please select atleast one sku Add sku, shelf can not be empty + + ARABIC-KSA + AR diff --git a/GSKMTOrange/src/main/res/values-tr/string.xml b/GSKMTOrange/src/main/res/values-tr/string.xml index ca8ce80..fba174e 100644 --- a/GSKMTOrange/src/main/res/values-tr/string.xml +++ b/GSKMTOrange/src/main/res/values-tr/string.xml @@ -251,6 +251,9 @@ Zaten var En azindan 1 SKU seçmelisiniz SKU ekleyin, raf boş olamaz + + English + TR diff --git a/GSKMTOrange/src/main/res/values/strings.xml b/GSKMTOrange/src/main/res/values/strings.xml index 6d8cc87..b6e77c3 100644 --- a/GSKMTOrange/src/main/res/values/strings.xml +++ b/GSKMTOrange/src/main/res/values/strings.xml @@ -286,4 +286,7 @@ Please select atleast one sku Add sku, shelf can not be empty + English + EN +