From 1c48f2f8ad11402ec7d29c863ab89d5ba15850f2 Mon Sep 17 00:00:00 2001 From: Gagan290 Date: Thu, 12 Jan 2017 17:04:24 +0530 Subject: [PATCH] Merge branch 'master' of https://github.com/CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GSKORANGEV1 into GG_Update_Manifest # Conflicts: # GSKMTOrange/src/main/AndroidManifest.xml --- .../com/gskmtorange/Database/GSKOrangeDB.java | 2 +- .../gsk_dailyentry/CategoryListActivity.java | 69 +- .../gsk_dailyentry/DailyDataMenuActivity.java | 61 +- .../MSL_AvailabilityActivity.java | 45 +- .../gsk_dailyentry/Stock_FacingActivity.java | 668 ++++++++++-------- .../layout/item_msl_availability_child.xml | 4 +- .../res/layout/item_stock_facing_header.xml | 40 +- .../res/layout/planogram_dialog_layout.xml | 66 ++ GSKMTOrange/src/main/res/menu/planogram.xml | 10 + .../src/main/res/mipmap-hdpi/cancel.png | Bin 0 -> 995 bytes GSKMTOrange/src/main/res/values-tr/string.xml | 6 +- GSKMTOrange/src/main/res/values/strings.xml | 4 + 12 files changed, 559 insertions(+), 416 deletions(-) create mode 100644 GSKMTOrange/src/main/res/layout/planogram_dialog_layout.xml create mode 100644 GSKMTOrange/src/main/res/menu/planogram.xml create mode 100644 GSKMTOrange/src/main/res/mipmap-hdpi/cancel.png 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 d91acb0..b38031b 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java @@ -1672,7 +1672,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper { try { dbcursor = db.rawQuery("SELECT * from JOURNEY_PLAN " + - "where VISIT_DATE ='" + date + "' AND STORE_ID'=" + store_id + "'", null); + "where VISIT_DATE ='" + date + "' AND STORE_ID='" + store_id + "'", null); if (dbcursor != null) { dbcursor.moveToFirst(); diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/CategoryListActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/CategoryListActivity.java index 0b6a11d..a4a887f 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/CategoryListActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/CategoryListActivity.java @@ -37,9 +37,8 @@ public class CategoryListActivity extends AppCompatActivity { CategoryListAdapter adapter; GSKOrangeDB db; - - private SharedPreferences preferences; String store_id, visit_date, username, intime, date, keyAccount_id, class_id, storeType_id; + private SharedPreferences preferences; @Override protected void onCreate(Bundle savedInstanceState) { @@ -93,10 +92,36 @@ public class CategoryListActivity extends AppCompatActivity { recyclerView.setLayoutManager(new GridLayoutManager(getApplicationContext(), 2)); } + @Override + public boolean onCreateOptionsMenu(Menu menu) { + // Inflate the menu; this adds items to the action bar if it is present. + getMenuInflater().inflate(R.menu.main, menu); + return true; + } + + @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) { + finish(); + } + + //noinspection SimplifiableIfStatement + if (id == R.id.action_settings) { + return true; + } + + return super.onOptionsItemSelected(item); + } + public class CategoryListAdapter extends RecyclerView.Adapter { - private LayoutInflater inflator; List list = Collections.emptyList(); Context context; + private LayoutInflater inflator; public CategoryListAdapter(CategoryListActivity context, List list) { inflator = LayoutInflater.from(context); @@ -123,19 +148,19 @@ public class CategoryListActivity extends AppCompatActivity { && db.checkStockAndFacingData(store_id, categoryData.getCategory_id()) && db.checkPromoComplianceData(store_id, categoryData.getCategory_id())) { - holder.categoryIcon.setImageResource(R.drawable.ohc_done); + holder.categoryIcon.setImageResource(R.mipmap.oralcare_tick); } else { - holder.categoryIcon.setImageResource(R.drawable.ohc); + holder.categoryIcon.setImageResource(R.mipmap.oral_care); } } else if (categoryData.getCategory().equalsIgnoreCase("Wellness")) { if (db.checkMsl_AvailabilityData(store_id, categoryData.getCategory_id()) && db.checkStockAndFacingData(store_id, categoryData.getCategory_id()) && db.checkPromoComplianceData(store_id, categoryData.getCategory_id())) { - holder.categoryIcon.setImageResource(R.drawable.pdr_done); + holder.categoryIcon.setImageResource(R.mipmap.wellness_tick); } else { - holder.categoryIcon.setImageResource(R.drawable.pdr); + holder.categoryIcon.setImageResource(R.mipmap.wellness); } } else if (categoryData.getCategory().equalsIgnoreCase("Nutritionals")) { @@ -143,9 +168,9 @@ public class CategoryListActivity extends AppCompatActivity { && db.checkStockAndFacingData(store_id, categoryData.getCategory_id()) && db.checkPromoComplianceData(store_id, categoryData.getCategory_id())) { - holder.categoryIcon.setImageResource(R.drawable.hfd_done); + holder.categoryIcon.setImageResource(R.mipmap.nutritionals_tick); } else { - holder.categoryIcon.setImageResource(R.drawable.hfd); + holder.categoryIcon.setImageResource(R.mipmap.nutritionals); } } @@ -179,30 +204,4 @@ public class CategoryListActivity extends AppCompatActivity { } } } - - @Override - public boolean onCreateOptionsMenu(Menu menu) { - // Inflate the menu; this adds items to the action bar if it is present. - getMenuInflater().inflate(R.menu.main, menu); - return true; - } - - @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) { - finish(); - } - - //noinspection SimplifiableIfStatement - if (id == R.id.action_settings) { - return true; - } - - return super.onOptionsItemSelected(item); - } } diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/DailyDataMenuActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/DailyDataMenuActivity.java index 6593bf8..b055e81 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/DailyDataMenuActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/DailyDataMenuActivity.java @@ -37,9 +37,8 @@ public class DailyDataMenuActivity extends AppCompatActivity { GSKOrangeDB db; String categoryName = "", categoryId; - - private SharedPreferences preferences; String store_id, visit_date, username, intime, date, keyAccount_id, class_id, storeType_id; + private SharedPreferences preferences; @Override protected void onCreate(Bundle savedInstanceState) { @@ -110,9 +109,9 @@ public class DailyDataMenuActivity extends AppCompatActivity { //data.setCategory_name("Stock & Facing"); data.setCategory_name(getResources().getString(R.string.daily_data_menu_stock_facing)); if (db.checkStockAndFacingData(store_id, categoryId)) { - data.setCategory_img(R.mipmap.stock_and_facing_done); + data.setCategory_img(R.mipmap.stock_facing_done); } else { - data.setCategory_img(R.mipmap.stock_and_facing); + data.setCategory_img(R.mipmap.stock_facing); } categoryList.add(data); @@ -159,10 +158,36 @@ public class DailyDataMenuActivity extends AppCompatActivity { } } + @Override + public boolean onCreateOptionsMenu(Menu menu) { + // Inflate the menu; this adds items to the action bar if it is present. + getMenuInflater().inflate(R.menu.main, menu); + return true; + } + + @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) { + finish(); + } + + //noinspection SimplifiableIfStatement + if (id == R.id.action_settings) { + return true; + } + + return super.onOptionsItemSelected(item); + } + public class DailyDataMenuAdapter extends RecyclerView.Adapter { - private LayoutInflater inflator; List list = Collections.emptyList(); Context context; + private LayoutInflater inflator; public DailyDataMenuAdapter(Context context, List list) { inflator = LayoutInflater.from(context); @@ -232,31 +257,5 @@ public class DailyDataMenuActivity extends AppCompatActivity { } } } - - @Override - public boolean onCreateOptionsMenu(Menu menu) { - // Inflate the menu; this adds items to the action bar if it is present. - getMenuInflater().inflate(R.menu.main, menu); - return true; - } - - @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) { - finish(); - } - - //noinspection SimplifiableIfStatement - if (id == R.id.action_settings) { - return true; - } - - return super.onOptionsItemSelected(item); - } } diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/MSL_AvailabilityActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/MSL_AvailabilityActivity.java index 7513fe0..02c615f 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/MSL_AvailabilityActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/MSL_AvailabilityActivity.java @@ -54,9 +54,8 @@ public class MSL_AvailabilityActivity extends AppCompatActivity { GSKOrangeDB db; String categoryName, categoryId, storeId; - - private SharedPreferences preferences; String store_id, visit_date, username, intime, date, keyAccount_id, class_id, storeType_id; + private SharedPreferences preferences; @Override protected void onCreate(Bundle savedInstanceState) { @@ -248,6 +247,25 @@ public class MSL_AvailabilityActivity 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) { + finish(); + } + + //noinspection SimplifiableIfStatement + if (id == R.id.action_settings) { + return true; + } + + return super.onOptionsItemSelected(item); + } + public class ExpandableListAdapter extends BaseExpandableListAdapter { private Context _context; private List _listDataHeader; @@ -362,8 +380,8 @@ public class MSL_AvailabilityActivity extends AppCompatActivity { holder.txt_mbq = (TextView) convertView.findViewById(R.id.txt_mbq); holder.toggle_available = (ToggleButton) convertView.findViewById(R.id.toggle_available); - holder.toggle_available.setTextOff("No"); - holder.toggle_available.setTextOn("Yes"); + /*holder.toggle_available.setTextOff("No"); + holder.toggle_available.setTextOn("Yes");*/ convertView.setTag(holder); } else { @@ -418,23 +436,4 @@ public class MSL_AvailabilityActivity extends AppCompatActivity { ToggleButton toggle_available; LinearLayout lin_category; } - - @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) { - finish(); - } - - //noinspection SimplifiableIfStatement - if (id == R.id.action_settings) { - return true; - } - - return super.onOptionsItemSelected(item); - } } 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 d83dde1..c1f991e 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 @@ -1,6 +1,7 @@ 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; @@ -8,7 +9,11 @@ import android.content.SharedPreferences; import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; import android.content.res.Resources; +import android.graphics.Bitmap; +import android.graphics.BitmapFactory; +import android.graphics.Color; import android.graphics.Typeface; +import android.graphics.drawable.ColorDrawable; import android.net.Uri; import android.os.Build; import android.os.Bundle; @@ -22,12 +27,16 @@ import android.support.v7.widget.CardView; import android.support.v7.widget.Toolbar; import android.util.Log; import android.view.LayoutInflater; +import android.view.Menu; import android.view.MenuItem; import android.view.View; import android.view.ViewGroup; +import android.view.Window; +import android.view.WindowManager; import android.view.inputmethod.InputMethodManager; import android.widget.AbsListView; import android.widget.BaseExpandableListAdapter; +import android.widget.Button; import android.widget.EditText; import android.widget.ExpandableListView; import android.widget.ImageView; @@ -48,31 +57,27 @@ import java.util.List; import cpm.com.gskmtorange.Database.GSKOrangeDB; import cpm.com.gskmtorange.R; import cpm.com.gskmtorange.constant.CommonString; +import cpm.com.gskmtorange.dailyentry.T2PComplianceActivity; import cpm.com.gskmtorange.xmlGetterSetter.MSL_AvailabilityGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.Stock_FacingGetterSetter; public class Stock_FacingActivity extends AppCompatActivity { + static int child_position = -1; ExpandableListView expandableListView; TextView txt_stockFacingName; - ArrayList headerDataList; ArrayList childDataList; List hashMapListHeaderData; HashMap> hashMapListChildData; List checkHeaderArray = new ArrayList<>(); - ExpandableListAdapter adapter; GSKOrangeDB db; - String categoryName, categoryId, Error_Message = ""; - String path = "", str = "", _pathforcheck = "", img1 = "", img2 = ""; - static int child_position = -1; boolean isDialogOpen = true; boolean checkflag = true; - - private SharedPreferences preferences; String store_id, visit_date, username, intime, date, keyAccount_id, class_id, storeType_id, camera_allow; + private SharedPreferences preferences; @Override protected void onCreate(Bundle savedInstanceState) { @@ -270,308 +275,6 @@ public class Stock_FacingActivity extends AppCompatActivity { } } - 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 Stock_FacingGetterSetter headerTitle = (Stock_FacingGetterSetter) getGroup(groupPosition); - - if (convertView == null) { - LayoutInflater infalInflater = (LayoutInflater) this._context.getSystemService(Context.LAYOUT_INFLATER_SERVICE); - convertView = infalInflater.inflate(R.layout.item_stock_facing_header, null, false); - } - - TextView txt_stockFaceupHeader = (TextView) convertView.findViewById(R.id.txt_stockFaceupHeader); - LinearLayout lin_stockFaceupHeader = (LinearLayout) convertView.findViewById(R.id.lin_stockFaceupHeader); - ImageView img_reference = (ImageView) convertView.findViewById(R.id.img_reference); - ImageView img_camera1 = (ImageView) convertView.findViewById(R.id.img_camera1); - ImageView img_camera2 = (ImageView) convertView.findViewById(R.id.img_camera2); - ImageView img_edit = (ImageView) convertView.findViewById(R.id.img_edit); - - txt_stockFaceupHeader.setTypeface(null, Typeface.BOLD); - txt_stockFaceupHeader.setText(headerTitle.getSub_category() + "-" + headerTitle.getBrand()); - - if (headerTitle.getCompany_id().equals("1")) { - txt_stockFaceupHeader.setTextColor(getResources().getColor(R.color.colorPrimaryDark)); - } else { - txt_stockFaceupHeader.setTextColor(getResources().getColor(R.color.black)); - } - - //Camera allow enable - if (camera_allow.equalsIgnoreCase("1")) { - - img_camera1.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - //String date = new Date().toLocaleString().toString(); - //String tempDate = new Date().toLocaleString().toString().replace(' ', '_').replace(',', '_').replace(':', '-'); - - _pathforcheck = "Stock_Cam1_" + store_id + "_" + headerTitle.getBrand_id() + "_" + visit_date.replace("/", "") + "_" + getCurrentTime().replace(":", "") + ".jpg"; - child_position = groupPosition; - path = str + _pathforcheck; - - startCameraActivity1(groupPosition); - } - }); - - if (!img1.equalsIgnoreCase("")) { - if (groupPosition == child_position) { - headerTitle.setImage1(img1); - img1 = ""; - } - } - - if (headerTitle.getImage1().equals("")) { - img_camera1.setBackgroundResource(R.mipmap.camera); - } else { - img_camera1.setBackgroundResource(R.mipmap.camera_done); - } - - - img_camera2.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - //String date = new Date().toLocaleString().toString(); - //String tempDate = new Date().toLocaleString().toString().replace(' ', '_').replace(',', '_').replace(':', '-'); - - _pathforcheck = "Stock_Cam2_" + store_id + "_" + headerTitle.getBrand_id() + "_" + visit_date.replace("/", "") + "_" + getCurrentTime().replace(":", "") + ".jpg"; - child_position = groupPosition; - path = str + _pathforcheck; - - startCameraActivity2(groupPosition); - } - }); - - if (!img2.equalsIgnoreCase("")) { - if (groupPosition == child_position) { - headerTitle.setImage2(img2); - img2 = ""; - } - } - - if (headerTitle.getImage2().equals("")) { - img_camera2.setBackgroundResource(R.mipmap.camera); - } else { - img_camera2.setBackgroundResource(R.mipmap.camera_done); - } - } else { - //Camera allow disable - img_camera1.setBackgroundResource(R.mipmap.camera); - img_camera2.setBackgroundResource(R.mipmap.camera); - } - - if (!checkflag) { - if (checkHeaderArray.contains(groupPosition)) { - txt_stockFaceupHeader.setTextColor(getResources().getColor(android.R.color.holo_red_dark)); - } else { - txt_stockFaceupHeader.setTextColor(getResources().getColor(R.color.black)); - } - } - - 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 Stock_FacingGetterSetter childData = (Stock_FacingGetterSetter) 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(); - } - - holder.txt_skuName.setText(childData.getSku()); - - if (childData.getCompany_id().equals("1")) { - holder.txt_skuName.setTextColor(getResources().getColor(R.color.colorPrimaryDark)); - } else { - holder.txt_skuName.setTextColor(getResources().getColor(R.color.black)); - } - - - if (childData.getStock().equals("0")) { - holder.ed_facing.setEnabled(false); - } else { - holder.ed_facing.setEnabled(true); - } - - final ViewHolder finalHolder = holder; - holder.ed_stock.setOnFocusChangeListener(new View.OnFocusChangeListener() { - @Override - public void onFocusChange(View v, boolean hasFocus) { - - final EditText caption = (EditText) v; - String edStock = caption.getText().toString(); - - if (!edStock.equals("")) { - String stock = edStock.replaceFirst("^0+(?!$)", ""); - childData.setStock(stock); - - if (edStock.equals("0")) { - childData.setFacing("0"); - - finalHolder.ed_facing.setEnabled(false); - } else { - childData.setFacing(childData.getFacing()); - finalHolder.ed_facing.setEnabled(true); - } - } else { - childData.setStock(""); - finalHolder.ed_facing.setEnabled(true); - } - } - }); - - holder.ed_stock.setText(childData.getStock()); - - holder.ed_facing.setOnFocusChangeListener(new View.OnFocusChangeListener() { - @Override - public void onFocusChange(View v, boolean hasFocus) { - final EditText caption = (EditText) v; - final String edFaceup = caption.getText().toString().replaceFirst("^0+(?!$)", ""); - - if (!childData.getStock().equals("")) { - if (!edFaceup.equals("")) { - if (Integer.parseInt(edFaceup) <= Integer.parseInt(childData.getStock())) { - childData.setFacing(edFaceup); - } else { - if (isDialogOpen) { - isDialogOpen = !isDialogOpen; - AlertDialog.Builder builder = new AlertDialog.Builder(Stock_FacingActivity.this); - builder.setMessage("Faceup can not be greater than stock value") - .setCancelable(false) - .setPositiveButton("OK", new DialogInterface.OnClickListener() { - public void onClick(DialogInterface dialog, int id) { - dialog.dismiss(); - isDialogOpen = !isDialogOpen; - } - }); - AlertDialog alert = builder.create(); - alert.show(); - } - } - } else { - childData.setFacing(""); - } - } else { - if (isDialogOpen) { - isDialogOpen = !isDialogOpen; - AlertDialog.Builder builder = new AlertDialog.Builder(Stock_FacingActivity.this); - builder.setMessage("First fill the stock value") - .setCancelable(false) - .setPositiveButton("OK", new DialogInterface.OnClickListener() { - public void onClick(DialogInterface dialog, int id) { - dialog.dismiss(); - isDialogOpen = !isDialogOpen; - } - }); - AlertDialog alert = builder.create(); - alert.show(); - } - } - } - }); - - holder.ed_facing.setText(childData.getFacing()); - - if (!checkflag) { - boolean tempflag = false; - - if (holder.ed_stock.getText().toString().equals("")) { - holder.ed_stock.setBackgroundColor(getResources().getColor(R.color.white)); - holder.ed_stock.setHintTextColor(getResources().getColor(android.R.color.holo_red_dark)); - holder.ed_stock.setHint("Empty"); - tempflag = true; - } - - if (holder.ed_facing.getText().toString().equals("")) { - holder.ed_facing.setBackgroundColor(getResources().getColor(R.color.white)); - holder.ed_facing.setHintTextColor(getResources().getColor(android.R.color.holo_red_dark)); - holder.ed_facing.setHint("Empty"); - tempflag = true; - } - - if (tempflag) { - holder.cardView.setCardBackgroundColor(getResources().getColor(android.R.color.holo_red_dark)); - } else { - holder.cardView.setCardBackgroundColor(getResources().getColor(R.color.white)); - } - } - - 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; - } - boolean validateData(List listDataHeader, HashMap> listDataChild) { boolean flag = true; @@ -812,6 +515,12 @@ public class Stock_FacingActivity extends AppCompatActivity { return cdate; } + @Override + public boolean onCreateOptionsMenu(Menu menu) { + getMenuInflater().inflate(R.menu.planogram, menu); + return true; + } + @Override public boolean onOptionsItemSelected(MenuItem item) { // Handle action bar item clicks here. The action bar will @@ -823,11 +532,348 @@ public class Stock_FacingActivity extends AppCompatActivity { finish(); } - //noinspection SimplifiableIfStatement - if (id == R.id.action_settings) { + //Planogram Dialog + if (id == R.id.action_planogram) { + //final Dialog dialog = new Dialog(Stock_FacingActivity.this, android.R.style.Theme_Black_NoTitleBar_Fullscreen); + final Dialog dialog = new Dialog(Stock_FacingActivity.this); + dialog.requestWindowFeature(Window.FEATURE_NO_TITLE); + //dialog.getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT)); + dialog.setContentView(R.layout.planogram_dialog_layout); + dialog.getWindow().setLayout(WindowManager.LayoutParams.MATCH_PARENT, WindowManager.LayoutParams.MATCH_PARENT); + + ImageView img_planogram = (ImageView) dialog.findViewById(R.id.img_planogram); + + String planogram_image = ""; + if (new File(str + planogram_image).exists()) { + Bitmap bmp = BitmapFactory.decodeFile(str + planogram_image); + img_planogram.setImageBitmap(bmp); + } else { + img_planogram.setBackgroundResource(R.drawable.sad_cloud); + } + + /*if (new File(str + "Stock_Cam1_3_9_01122017_162052.jpg").exists()) { + Bitmap bmp = BitmapFactory.decodeFile(str + "Stock_Cam1_3_9_01122017_162052.jpg"); + img_planogram.setImageBitmap(bmp); + } else { + img_planogram.setBackgroundResource(R.drawable.sad_cloud); + }*/ + + + ImageView cancel = (ImageView) dialog.findViewById(R.id.img_cancel); + cancel.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + dialog.dismiss(); + } + }); + + dialog.show(); return true; } return super.onOptionsItemSelected(item); } + + 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 Stock_FacingGetterSetter headerTitle = (Stock_FacingGetterSetter) getGroup(groupPosition); + + if (convertView == null) { + LayoutInflater infalInflater = (LayoutInflater) this._context.getSystemService(Context.LAYOUT_INFLATER_SERVICE); + convertView = infalInflater.inflate(R.layout.item_stock_facing_header, null, false); + } + + TextView txt_stockFaceupHeader = (TextView) convertView.findViewById(R.id.txt_stockFaceupHeader); + TextView txt_sosHeader = (TextView) convertView.findViewById(R.id.txt_sosHeader); + LinearLayout lin_stockFaceupHeader = (LinearLayout) convertView.findViewById(R.id.lin_stockFaceupHeader); + ImageView img_camera1 = (ImageView) convertView.findViewById(R.id.img_camera1); + ImageView img_camera2 = (ImageView) convertView.findViewById(R.id.img_camera2); + //ImageView img_reference = (ImageView) convertView.findViewById(R.id.img_reference); + //ImageView img_edit = (ImageView) convertView.findViewById(R.id.img_edit); + + txt_stockFaceupHeader.setTypeface(null, Typeface.BOLD); + txt_stockFaceupHeader.setText(headerTitle.getSub_category() + "-" + headerTitle.getBrand()); + + if (headerTitle.getCompany_id().equals("1")) { + txt_stockFaceupHeader.setTextColor(getResources().getColor(R.color.colorPrimaryDark)); + } else { + txt_stockFaceupHeader.setTextColor(getResources().getColor(R.color.black)); + } + + //Camera allow enable + if (camera_allow.equalsIgnoreCase("1")) { + + img_camera1.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + //String date = new Date().toLocaleString().toString(); + //String tempDate = new Date().toLocaleString().toString().replace(' ', '_').replace(',', '_').replace(':', '-'); + + _pathforcheck = "Stock_Cam1_" + store_id + "_" + headerTitle.getBrand_id() + "_" + visit_date.replace("/", "") + "_" + getCurrentTime().replace(":", "") + ".jpg"; + child_position = groupPosition; + path = str + _pathforcheck; + + startCameraActivity1(groupPosition); + } + }); + + if (!img1.equalsIgnoreCase("")) { + if (groupPosition == child_position) { + headerTitle.setImage1(img1); + img1 = ""; + } + } + + if (headerTitle.getImage1().equals("")) { + img_camera1.setBackgroundResource(R.mipmap.camera_orange); + } else { + img_camera1.setBackgroundResource(R.mipmap.camera_green); + } + + + img_camera2.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + //String date = new Date().toLocaleString().toString(); + //String tempDate = new Date().toLocaleString().toString().replace(' ', '_').replace(',', '_').replace(':', '-'); + + _pathforcheck = "Stock_Cam2_" + store_id + "_" + headerTitle.getBrand_id() + "_" + visit_date.replace("/", "") + "_" + getCurrentTime().replace(":", "") + ".jpg"; + child_position = groupPosition; + path = str + _pathforcheck; + + startCameraActivity2(groupPosition); + } + }); + + if (!img2.equalsIgnoreCase("")) { + if (groupPosition == child_position) { + headerTitle.setImage2(img2); + img2 = ""; + } + } + + if (headerTitle.getImage2().equals("")) { + img_camera2.setBackgroundResource(R.mipmap.camera_orange); + } else { + img_camera2.setBackgroundResource(R.mipmap.camera_green); + } + } else { + //Camera allow disable + img_camera1.setBackgroundResource(R.mipmap.camera_grey); + img_camera2.setBackgroundResource(R.mipmap.camera_grey); + } + + if (!checkflag) { + if (checkHeaderArray.contains(groupPosition)) { + txt_stockFaceupHeader.setTextColor(getResources().getColor(android.R.color.holo_red_dark)); + } else { + txt_stockFaceupHeader.setTextColor(getResources().getColor(R.color.black)); + } + } + + 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 Stock_FacingGetterSetter childData = (Stock_FacingGetterSetter) 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(); + } + + holder.txt_skuName.setText(childData.getSku()); + + if (childData.getCompany_id().equals("1")) { + holder.txt_skuName.setTextColor(getResources().getColor(R.color.colorPrimaryDark)); + } else { + holder.txt_skuName.setTextColor(getResources().getColor(R.color.black)); + } + + + if (childData.getStock().equals("0")) { + holder.ed_facing.setEnabled(false); + } else { + holder.ed_facing.setEnabled(true); + } + + final ViewHolder finalHolder = holder; + holder.ed_stock.setOnFocusChangeListener(new View.OnFocusChangeListener() { + @Override + public void onFocusChange(View v, boolean hasFocus) { + + final EditText caption = (EditText) v; + String edStock = caption.getText().toString(); + + if (!edStock.equals("")) { + String stock = edStock.replaceFirst("^0+(?!$)", ""); + childData.setStock(stock); + + if (edStock.equals("0")) { + childData.setFacing("0"); + + finalHolder.ed_facing.setEnabled(false); + } else { + childData.setFacing(childData.getFacing()); + finalHolder.ed_facing.setEnabled(true); + } + } else { + childData.setStock(""); + finalHolder.ed_facing.setEnabled(true); + } + } + }); + + holder.ed_stock.setText(childData.getStock()); + + holder.ed_facing.setOnFocusChangeListener(new View.OnFocusChangeListener() { + @Override + public void onFocusChange(View v, boolean hasFocus) { + final EditText caption = (EditText) v; + final String edFaceup = caption.getText().toString().replaceFirst("^0+(?!$)", ""); + + if (!childData.getStock().equals("")) { + if (!edFaceup.equals("")) { + if (Integer.parseInt(edFaceup) <= Integer.parseInt(childData.getStock())) { + childData.setFacing(edFaceup); + } else { + if (isDialogOpen) { + isDialogOpen = !isDialogOpen; + AlertDialog.Builder builder = new AlertDialog.Builder(Stock_FacingActivity.this); + builder.setMessage("Faceup can not be greater than stock value") + .setCancelable(false) + .setPositiveButton("OK", new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int id) { + dialog.dismiss(); + isDialogOpen = !isDialogOpen; + } + }); + AlertDialog alert = builder.create(); + alert.show(); + } + } + } else { + childData.setFacing(""); + } + } else { + if (isDialogOpen) { + isDialogOpen = !isDialogOpen; + AlertDialog.Builder builder = new AlertDialog.Builder(Stock_FacingActivity.this); + builder.setMessage("First fill the stock value") + .setCancelable(false) + .setPositiveButton("OK", new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int id) { + dialog.dismiss(); + isDialogOpen = !isDialogOpen; + } + }); + AlertDialog alert = builder.create(); + alert.show(); + } + } + } + }); + + holder.ed_facing.setText(childData.getFacing()); + + if (!checkflag) { + boolean tempflag = false; + + if (holder.ed_stock.getText().toString().equals("")) { + holder.ed_stock.setBackgroundColor(getResources().getColor(R.color.white)); + holder.ed_stock.setHintTextColor(getResources().getColor(android.R.color.holo_red_dark)); + holder.ed_stock.setHint("Empty"); + tempflag = true; + } + + if (holder.ed_facing.getText().toString().equals("")) { + holder.ed_facing.setBackgroundColor(getResources().getColor(R.color.white)); + holder.ed_facing.setHintTextColor(getResources().getColor(android.R.color.holo_red_dark)); + holder.ed_facing.setHint("Empty"); + tempflag = true; + } + + if (tempflag) { + holder.cardView.setCardBackgroundColor(getResources().getColor(android.R.color.holo_red_dark)); + } else { + holder.cardView.setCardBackgroundColor(getResources().getColor(R.color.white)); + } + } + + 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/res/layout/item_msl_availability_child.xml b/GSKMTOrange/src/main/res/layout/item_msl_availability_child.xml index 9979c83..de8f7af 100644 --- a/GSKMTOrange/src/main/res/layout/item_msl_availability_child.xml +++ b/GSKMTOrange/src/main/res/layout/item_msl_availability_child.xml @@ -93,7 +93,9 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center" - android:background="@drawable/toggle_selector_background" /> + android:background="@drawable/toggle_selector_background" + android:textOff="@string/no" + android:textOn="@string/yes" /> diff --git a/GSKMTOrange/src/main/res/layout/item_stock_facing_header.xml b/GSKMTOrange/src/main/res/layout/item_stock_facing_header.xml index de13029..d0b2ce6 100644 --- a/GSKMTOrange/src/main/res/layout/item_stock_facing_header.xml +++ b/GSKMTOrange/src/main/res/layout/item_stock_facing_header.xml @@ -23,35 +23,48 @@ + android:layout_weight="1.5" + android:orientation="horizontal" + android:paddingTop="5dp" + android:weightSum="2"> + + + + - + android:src="@mipmap/star" />--> - + android:src="@mipmap/no_camera" />--> + \ No newline at end of file diff --git a/GSKMTOrange/src/main/res/layout/planogram_dialog_layout.xml b/GSKMTOrange/src/main/res/layout/planogram_dialog_layout.xml new file mode 100644 index 0000000..7f579a1 --- /dev/null +++ b/GSKMTOrange/src/main/res/layout/planogram_dialog_layout.xml @@ -0,0 +1,66 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/GSKMTOrange/src/main/res/menu/planogram.xml b/GSKMTOrange/src/main/res/menu/planogram.xml new file mode 100644 index 0000000..a538a1b --- /dev/null +++ b/GSKMTOrange/src/main/res/menu/planogram.xml @@ -0,0 +1,10 @@ + + + + diff --git a/GSKMTOrange/src/main/res/mipmap-hdpi/cancel.png b/GSKMTOrange/src/main/res/mipmap-hdpi/cancel.png new file mode 100644 index 0000000000000000000000000000000000000000..d537bc9abbbf2fdf0d821506550da7774cc0f865 GIT binary patch literal 995 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!n2Vh}LpV4%Za?&Y0OWEOctjR6 zFbHyjFyn!zizI-8k|nMYCBgY=CFO}lsSM@i<$9TU*~Q6;1*v-ZMd`EO*+>Buoe%H{ zasB`QKae?Wz^}DD-+-QRDGBlmW?*DyVdLQD5fzt^QPecDv~hBFadmU|4GxWpPfE@# zsA%cz>h77hWW%P-+js2Vcj)kma~E&iymjyK^B1o_ef{?R$DhCdwD#=#$-uy5=IP=X z5^;F#^qXO?90Xjw9UVekX0lAJENJ3Rl$+$X>Hq)PH9H<1nxGKrx>t2>anRk`EFsPf z5eqN9_~N$u>Wb@`AzX%>sh!Ki59=GR_wP);c(JIS`GH=${M)Ftf9+y+G0d)i`a(zEkz*gV^KJ>0cMWzf{Tn=F$D-F;jC?gC+wbgy)cFfp zo1YXqdGamTy1iZ^Mn-#UH)F-Qhh=AVD)(HOYD7nDuZ+80ZFC%K8n^bY5t^d9W$MB&va5rSP5i(z(eUz%X{UtiuTQV* zIGydElPCK=x$?vOZ+Gqfo%{F2AmWRwi;(oHdGR+bzQ_I9+x)h0%_%iSrSlKY+Lxb` zJG{5~ap`Ned9F`-JAeE+ck<1?6Bc%UCtJ)X&RD2fZ}{W!(#}p##!GhY^9l<#-ELoV zePO=0v!m9IeK+kMC+w5lbWC19aC(Yupii>r?yUOOD@7)@)GF?jBwy}!)m2*h^;wXtBZ!>E*t9v`YW|D>mo*k6z5yDV@DM-{kAsb^C6HZU6nN u@iB{Xf8C2q{k7^6HoyqrYX Önyüz Raf Payı Hedefi + Raf Payi Promosyon @@ -95,6 +96,9 @@ Son Ziyaret Mağaza Performansı - + + + Planogram + \ No newline at end of file diff --git a/GSKMTOrange/src/main/res/values/strings.xml b/GSKMTOrange/src/main/res/values/strings.xml index 39a13d0..777341f 100644 --- a/GSKMTOrange/src/main/res/values/strings.xml +++ b/GSKMTOrange/src/main/res/values/strings.xml @@ -80,6 +80,7 @@ Stock Facing SOS Target + SOS @@ -147,5 +148,8 @@ Please fill GAP data Want to proceed usaved data will be deleted + + Planogram +