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 1539ec9..5fee03d 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java @@ -1581,8 +1581,8 @@ public class GSKOrangeDB extends SQLiteOpenHelper { cd.setSku(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SKU"))); cd.setPromo_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("PROMO_ID"))); cd.setPromo(dbcursor.getString(dbcursor.getColumnIndexOrThrow("PROMO"))); - cd.setIn_stock("0"); - cd.setPromo_announcer("0"); + cd.setIn_stock("-1"); + cd.setPromo_announcer("-1"); cd.setRunning_pos("0"); cd.setImage_promotion(""); @@ -2651,7 +2651,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper { values.put(CommonString.KEY_IMAGE1, data.get(i).getImage1()); values.put(CommonString.KEY_IMAGE2, data.get(i).getImage2()); values.put(CommonString.KEY_REMARK, data.get(i).getRemark()); - values.put(CommonString.KEY_PRESENT, data.get(i).isPresent()); + values.put(CommonString.KEY_PRESENT, data.get(i).getPresent()); values.put(CommonString.KEY_CATEGORY_FIXTURE, data.get(i).getCategory_fixture()); l = db.insert(CommonString.TABLE_INSERT_T2P_COMPLIANCE, null, values); @@ -2972,7 +2972,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper { tp.setImage2(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_IMAGE2))); tp.setRemark(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_REMARK))); tp.setCategory_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_CATEGORY_ID))); - tp.setPresent((dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_PRESENT)).equalsIgnoreCase("1"))); + tp.setPresent(Integer.parseInt(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_PRESENT)))); tp.setCategory_fixture(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_CATEGORY_FIXTURE))); list.add(tp); diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CategoryPicture.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CategoryPicture.java index 5fc11e2..304f78f 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CategoryPicture.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CategoryPicture.java @@ -22,6 +22,7 @@ import android.support.v7.app.AppCompatActivity; import android.support.v7.widget.Toolbar; import android.util.Log; import android.view.LayoutInflater; +import android.view.MenuItem; import android.view.View; import android.view.ViewGroup; import android.widget.BaseAdapter; @@ -65,7 +66,7 @@ public class CategoryPicture extends AppCompatActivity { setContentView(R.layout.activity_category_picture); Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar); setSupportActionBar(toolbar); - + getSupportActionBar().setDisplayHomeAsUpEnabled(true); preferences = PreferenceManager.getDefaultSharedPreferences(this); store_id = preferences.getString(CommonString.KEY_STORE_ID, null); @@ -595,5 +596,64 @@ public class CategoryPicture extends AppCompatActivity { return flag; } + @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) { + + android.app.AlertDialog.Builder builder = new android.app.AlertDialog.Builder(CategoryPicture.this); + builder.setTitle("Parinaam"); + builder.setMessage(getResources().getString(R.string.data_will_be_lost)).setCancelable(false) + .setPositiveButton(getString(R.string.ok), new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int id) { + + finish(); + overridePendingTransition(R.anim.activity_back_in, R.anim.activity_back_out); + } + }) + .setNegativeButton(getString(R.string.cancel), new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + + } + }); + android.app.AlertDialog alert = builder.create(); + alert.show(); + } + + //noinspection SimplifiableIfStatement + if (id == R.id.action_settings) { + return true; + } + + return super.onOptionsItemSelected(item); + } + + @Override + public void onBackPressed() { + //super.onBackPressed(); + + android.app.AlertDialog.Builder builder = new android.app.AlertDialog.Builder(CategoryPicture.this); + builder.setTitle("Parinaam"); + builder.setMessage(getResources().getString(R.string.data_will_be_lost)).setCancelable(false) + .setPositiveButton(getString(R.string.ok), new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int id) { + + finish(); + overridePendingTransition(R.anim.activity_back_in, R.anim.activity_back_out); + } + }) + .setNegativeButton(getString(R.string.cancel), new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + + } + }); + android.app.AlertDialog alert = builder.create(); + alert.show(); + } } diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2PComplianceActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2PComplianceActivity.java index 998d13c..89dffa7 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2PComplianceActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2PComplianceActivity.java @@ -30,6 +30,7 @@ import android.support.v7.widget.Toolbar; import android.util.Log; import android.view.LayoutInflater; import android.view.MenuItem; +import android.view.MotionEvent; import android.view.View; import android.view.ViewGroup; import android.view.Window; @@ -61,6 +62,7 @@ import cpm.com.gskmtorange.R; import cpm.com.gskmtorange.constant.CommonString; import cpm.com.gskmtorange.xmlGetterSetter.BrandMasterGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.GapsChecklistGetterSetter; +import cpm.com.gskmtorange.xmlGetterSetter.SelectGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.SkuGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.T2PGetterSetter; @@ -91,6 +93,7 @@ public class T2PComplianceActivity extends AppCompatActivity { String brand_name = "", brand_id = ""; ArrayList brand_new_list = new ArrayList(); ArrayList brandList; + ArrayList select = new ArrayList<>(); @Override protected void onCreate(Bundle savedInstanceState) { @@ -209,6 +212,8 @@ public class T2PComplianceActivity extends AppCompatActivity { } + + @Override protected void onResume() { super.onResume(); @@ -234,16 +239,147 @@ public class T2PComplianceActivity extends AppCompatActivity { @Override public void onBindViewHolder(final ViewHolder holder, final int position) { + final boolean[] userSelect = {false}; final T2PGetterSetter mItem = list.get(position); holder.tv_brand.setText(mItem.getBrand()); holder.tv_display.setText(mItem.getDisplay().trim()); + ArrayList ans_list = new ArrayList<>(); + SelectGetterSetter select = new SelectGetterSetter(); + select.setAns(getString(R.string.select)); + select.setAns_id(0); + ans_list.clear(); + ans_list.add(select); + + select = new SelectGetterSetter(); + select.setAns(getString(R.string.yes)); + select.setAns_id(1); + ans_list.add(select); + + select = new SelectGetterSetter(); + select.setAns(getString(R.string.no)); + select.setAns_id(2); + ans_list.add(select); + + CustomSpinnerAdapter skuadapter = new CustomSpinnerAdapter(T2PComplianceActivity.this, R.layout.custom_t2p_spinner_item, ans_list); + holder.spinner.setAdapter(skuadapter); + + holder.spinner.setSelection(0); + //holder.tv_display.setTypeface(FontManager.getTypeface(getApplicationContext(),FontManager.FONTAWESOME)); /* Typeface iconFont = FontManager.getTypeface(getApplicationContext(), FontManager.FONTAWESOME); FontManager.markAsIconContainer(findViewById(R.id.icons_container), iconFont); -*/ +*/ holder.spinner.setOnTouchListener(new View.OnTouchListener() { + @Override + public boolean onTouch(View view, MotionEvent motionEvent) { + userSelect[0] = true; + return false; + } + }); + holder.spinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() { + @Override + public void onItemSelected(AdapterView adapterView, View view, int position, long l) { + if(userSelect[0]){ + userSelect[0] = false; + + boolean flag_clear = false; + int present =-1; + + switch (position) { + + case 0: + if(mItem.getPresent()==1){ + flag_clear = true; + } + else{ + mItem.setPresent(-1); + t2PAdapter.notifyDataSetChanged(); + } + + + break; + case 1: + mItem.setPresent(1); + t2PAdapter.notifyDataSetChanged(); + break; + case 2: + + if(mItem.getPresent()==1){ + flag_clear = true; + present = 0; + } + else{ + mItem.setPresent(0); + t2PAdapter.notifyDataSetChanged(); + } + + if(mItem.getPresent()==1) + + + break; + } + + if(flag_clear){ + + AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(T2PComplianceActivity.this); + alertDialogBuilder.setTitle(getResources().getString(R.string.dialog_title)); + + // set dialog message + final int finalPresent = present; + alertDialogBuilder + .setMessage(getResources().getString(R.string.data_will_be_lost)) + .setCancelable(false) + .setPositiveButton(getResources().getString(R.string.yes), new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int id) { + //mItem.setPresent(false); + mItem.setPresent(finalPresent); + mItem.getGapsChecklist().clear(); + mItem.getSkulist().clear(); + + //Camera + if (!mItem.getImage().equals("")) { + new File(str + mItem.getImage()).delete(); + mItem.setImage(""); + } + + //Camera 1 + if (!mItem.getImage1().equals("")) { + new File(str + mItem.getImage1()).delete(); + mItem.setImage1(""); + } + + //Camera 2 + if (!mItem.getImage2().equals("")) { + new File(str + mItem.getImage2()).delete(); + mItem.setImage2(""); + } + + t2PAdapter.notifyDataSetChanged(); + } + }) + .setNegativeButton(getResources().getString(R.string.no), new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int id) { + + dialog.cancel(); + //mItem.setPresent(true); + t2PAdapter.notifyDataSetChanged(); + } + }); + + AlertDialog alertDialog = alertDialogBuilder.create(); + alertDialog.show(); + } + } + + } + + @Override + public void onNothingSelected(AdapterView adapterView) { + + } + }); holder.btn_gaps.setOnClickListener(new View.OnClickListener() { @Override @@ -252,14 +388,14 @@ public class T2PComplianceActivity extends AppCompatActivity { } }); - holder.toggle_btn.setOnClickListener(new View.OnClickListener() { + /* holder.toggle_btn.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { if (((ToggleButton) v).getText().toString().equalsIgnoreCase(getResources().getString(R.string.yes))) { mItem.setPresent(true); } else { - /* mItem.setPresent(false); + *//* mItem.setPresent(false); mItem.getGapsChecklist().clear(); mItem.getSkulist().clear(); @@ -280,7 +416,7 @@ public class T2PComplianceActivity extends AppCompatActivity { new File(str + mItem.getImage2()).delete(); mItem.setImage2(""); } -*/ +*//* AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(T2PComplianceActivity.this); alertDialogBuilder.setTitle(getResources().getString(R.string.dialog_title)); @@ -330,7 +466,7 @@ public class T2PComplianceActivity extends AppCompatActivity { } t2PAdapter.notifyDataSetChanged(); } - }); + });*/ holder.btn_sku.setOnClickListener(new View.OnClickListener() { @@ -391,8 +527,8 @@ public class T2PComplianceActivity extends AppCompatActivity { if (mItem.getImage().equals("")) { - if (mItem.isPresent()) { - + //if (mItem.isPresent()) { + if (mItem.getPresent()==1) { holder.img_cam.setBackgroundResource(R.mipmap.camera_orange); } else { //if not present camera disabled @@ -418,7 +554,8 @@ public class T2PComplianceActivity extends AppCompatActivity { }); if (mItem.getImage1().equals("")) { - if (mItem.isPresent()) { + //if (mItem.isPresent()) { + if (mItem.getPresent()==1) { holder.img_cam1.setVisibility(View.VISIBLE); holder.img_cam1.setBackgroundResource(R.mipmap.camera_orange); @@ -446,7 +583,8 @@ public class T2PComplianceActivity extends AppCompatActivity { }); if (mItem.getImage2().equals("")) { - if (mItem.isPresent()) { + //if (mItem.isPresent()) { + if (mItem.getPresent()==1) { holder.img_cam2.setVisibility(View.VISIBLE); holder.img_cam2.setBackgroundResource(R.mipmap.camera_orange); @@ -481,7 +619,8 @@ public class T2PComplianceActivity extends AppCompatActivity { holder.img_cam.setBackgroundResource(R.mipmap.new_no_camera_done_edit); } else { - if (mItem.isPresent()) { + //if (mItem.isPresent()) { + if (mItem.getPresent()==1) { holder.img_cam.setBackgroundResource(R.mipmap.new_no_camera_edit); } else { //if not present camera disabled @@ -490,7 +629,14 @@ public class T2PComplianceActivity extends AppCompatActivity { } } - boolean is_enabled = mItem.isPresent(); + boolean is_enabled; + //if (mItem.isPresent()) { + if (mItem.getPresent()==1) { + is_enabled = true; + } + else { + is_enabled = false; + } holder.toggle_btn.setChecked(is_enabled); holder.img_cam.setEnabled(is_enabled); @@ -498,19 +644,17 @@ public class T2PComplianceActivity extends AppCompatActivity { holder.img_cam2.setEnabled(is_enabled); holder.btn_gaps.setEnabled(is_enabled); - if(is_enabled && mItem.getCategory_fixture().equals("0")){ + if (is_enabled && mItem.getCategory_fixture().equals("0")) { holder.btn_sku.setEnabled(true); - } - else{ + } else { holder.btn_sku.setEnabled(false); } - if (mItem.getGapsChecklist().size() > 0) { holder.btn_gaps.setBackgroundColor(getResources().getColor(R.color.green)); } else { - if (mItem.isPresent()) { + if (mItem.getPresent()==1) { holder.btn_gaps.setBackgroundColor(getResources().getColor(R.color.colorPrimary)); } else { holder.btn_gaps.setBackgroundColor(getResources().getColor(R.color.grey_background)); @@ -520,12 +664,24 @@ public class T2PComplianceActivity extends AppCompatActivity { if (mItem.getSkulist().size() > 0) { holder.btn_sku.setBackgroundColor(getResources().getColor(R.color.green)); } else { - if (mItem.isPresent() && mItem.getCategory_fixture().equals("0")) { + if (mItem.getPresent()==1 && mItem.getCategory_fixture().equals("0")) { holder.btn_sku.setBackgroundColor(getResources().getColor(R.color.colorPrimary)); } else { holder.btn_sku.setBackgroundColor(getResources().getColor(R.color.grey_background)); } } + + switch (mItem.getPresent()){ + case -1: + holder.spinner.setSelection(0); + break; + case 0: + holder.spinner.setSelection(2); + break; + case 1: + holder.spinner.setSelection(1); + break; + } } @Override @@ -542,6 +698,7 @@ public class T2PComplianceActivity extends AppCompatActivity { //public ImageView img_remark; public final Button btn_gaps, btn_sku, btn_ref_img; public final ToggleButton toggle_btn; + public final Spinner spinner; public ViewHolder(View view) { super(view); @@ -558,6 +715,7 @@ public class T2PComplianceActivity extends AppCompatActivity { btn_ref_img = (Button) mView.findViewById(R.id.btn_ref_image); parentLayout = (LinearLayout) mView.findViewById(R.id.parent_layout); toggle_btn = (ToggleButton) mView.findViewById(R.id.toggle_btn); + spinner = (Spinner) mView.findViewById(R.id.spinner); } } } @@ -814,7 +972,7 @@ public class T2PComplianceActivity extends AppCompatActivity { if (preferences.getString(CommonString.KEY_LANGUAGE, "").equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_KSA)) { cdate = arabicToenglish(cdate); - }else if (preferences.getString(CommonString.KEY_LANGUAGE, "").equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_UAE)) { + } else if (preferences.getString(CommonString.KEY_LANGUAGE, "").equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_UAE)) { cdate = arabicToenglish(cdate); } @@ -949,7 +1107,7 @@ public class T2PComplianceActivity extends AppCompatActivity { for (int i = 0; i < t2PGetterSetters.size(); i++) { - if (t2PGetterSetters.get(i).isPresent()) { + if (t2PGetterSetters.get(i).getPresent()==1) { //if (camera_allow.equals("1") && t2PGetterSetters.get(i).getImage().equals("")) { if (t2PGetterSetters.get(i).getGapsChecklist().size() == 0) { flag = false; @@ -965,13 +1123,18 @@ public class T2PComplianceActivity extends AppCompatActivity { flag = false; error_msg = getResources().getString(R.string.title_activity_fill_brand); break; - }else if (t2PGetterSetters.get(i).getCategory_fixture().equals("0") && t2PGetterSetters.get(i).getSkulist().size() == 0) { + } else if (t2PGetterSetters.get(i).getCategory_fixture().equals("0") && t2PGetterSetters.get(i).getSkulist().size() == 0) { flag = false; error_msg = getResources().getString(R.string.title_activity_fill_sku); break; } } + else if(t2PGetterSetters.get(i).getPresent()==-1){ + flag = false; + error_msg = getResources().getString(R.string.msg_select_present); + break; + } } @@ -1125,6 +1288,68 @@ public class T2PComplianceActivity extends AppCompatActivity { } } + public class CustomSpinnerAdapter extends ArrayAdapter { + + SelectGetterSetter tempValues = null; + LayoutInflater inflater; + private Activity activity; + private ArrayList data; + + /************* + * CustomAdapter Constructor + *****************/ + public CustomSpinnerAdapter( + T2PComplianceActivity activitySpinner, + int textViewResourceId, + ArrayList objects + + ) { + super(activitySpinner, textViewResourceId, objects); + + /********** Take passed values **********/ + activity = activitySpinner; + data = objects; + /*********** Layout inflator to call external xml layout () **********************/ + inflater = (LayoutInflater) activity.getSystemService(Context.LAYOUT_INFLATER_SERVICE); + + } + + @Override + public View getDropDownView(int position, View convertView, ViewGroup parent) { + return getCustomView(position, convertView, parent); + } + + @Override + public View getView(int position, View convertView, ViewGroup parent) { + return getCustomView(position, convertView, parent); + } + + // This funtion called for each row ( Called data.size() times ) + public View getCustomView(int position, View convertView, ViewGroup parent) { + + /********** Inflate spinner_rows.xml file for each row ( Defined below ) ************/ + View row = inflater.inflate(R.layout.custom_spinner_item, parent, false); + + /***** Get each Model object from Arraylist ********/ + tempValues = null; + tempValues = (SelectGetterSetter) data.get(position); + + TextView label = (TextView) row.findViewById(R.id.tv_text); + + if (position == 0) { + + // Default selected Spinner item + label.setText(getString(R.string.select)); + //sub.setText(""); + } else { + // Set values for spinner each row + label.setText(tempValues.getAns()); + } + + return row; + } + } + public class CustomSkuAdapter extends ArrayAdapter { SkuGetterSetter tempValues = null; @@ -1139,7 +1364,6 @@ public class T2PComplianceActivity extends AppCompatActivity { T2PComplianceActivity activitySpinner, int textViewResourceId, ArrayList objects - ) { super(activitySpinner, textViewResourceId, objects); @@ -1262,9 +1486,9 @@ public class T2PComplianceActivity extends AppCompatActivity { } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_UAE)) { lang = CommonString.KEY_RETURE_LANGUAGE_UAE_ARABIC; - }else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_OMAN)) { + } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_OMAN)) { lang = CommonString.KEY_RETURE_LANGUAGE_OMAN; - }else{ + } else { lang = CommonString.KEY_RETURN_LANGUAGE_DEFAULT; } diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/PromoComplianceActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/PromoComplianceActivity.java index c8577bc..caa09b1 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/PromoComplianceActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/PromoComplianceActivity.java @@ -1,5 +1,6 @@ package cpm.com.gskmtorange.gsk_dailyentry; +import android.app.Activity; import android.app.AlertDialog; import android.content.ActivityNotFoundException; import android.content.Context; @@ -20,9 +21,12 @@ import android.support.design.widget.Snackbar; import android.support.v7.app.AppCompatActivity; 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.MotionEvent; import android.view.View; +import android.view.ViewGroup; import android.widget.AdapterView; import android.widget.ArrayAdapter; import android.widget.Button; @@ -44,7 +48,9 @@ import java.util.logging.StreamHandler; 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.Promo_Compliance_DataGetterSetter; +import cpm.com.gskmtorange.xmlGetterSetter.SelectGetterSetter; public class PromoComplianceActivity extends AppCompatActivity { LinearLayout lin_promo_sku, lin_addtional_promo; @@ -432,11 +438,17 @@ public class PromoComplianceActivity extends AppCompatActivity { } for (int i = 0; i < promoSkuListData.size(); i++) { + + final boolean[] userSelect = {false}; + final boolean[] userSelect2 = {false}; + view = getLayoutInflater().inflate(R.layout.item_promo_sku_list, null, false); final Promo_Compliance_DataGetterSetter data = promoSkuListData.get(i); TextView txt_promoSkuName = (TextView) view.findViewById(R.id.txt_promoSkuName); + Spinner spinner_inStock = (Spinner) view.findViewById(R.id.spinner_inStock); + Spinner spinner_promoAnnouncer = (Spinner) view.findViewById(R.id.spinner_promoAnnouncer); ToggleButton toggle_inStock = (ToggleButton) view.findViewById(R.id.toggle_inStock); ToggleButton toggle_promoAnnouncer = (ToggleButton) view.findViewById(R.id.toggle_promoAnnouncer); ToggleButton toggle_runningPos = (ToggleButton) view.findViewById(R.id.toggle_runningPos); @@ -444,9 +456,129 @@ public class PromoComplianceActivity extends AppCompatActivity { txt_promoSkuName.setText(data.getPromo()); + ArrayList ans_list = new ArrayList<>(); + SelectGetterSetter select = new SelectGetterSetter(); + select.setAns(getString(R.string.select)); + select.setAns_id(0); + ans_list.clear(); + ans_list.add(select); + + select = new SelectGetterSetter(); + select.setAns(getString(R.string.yes)); + select.setAns_id(1); + ans_list.add(select); + + select = new SelectGetterSetter(); + select.setAns(getString(R.string.no)); + select.setAns_id(2); + ans_list.add(select); + + CustomSpinnerAdapter skuadapter = new CustomSpinnerAdapter(PromoComplianceActivity.this, R.layout.custom_t2p_spinner_item, ans_list); + spinner_inStock.setAdapter(skuadapter); + + spinner_inStock.setSelection(0); + + ArrayList ans_list2 = new ArrayList<>(); + SelectGetterSetter select2 = new SelectGetterSetter(); + select2.setAns(getString(R.string.select)); + select2.setAns_id(0); + ans_list2.clear(); + ans_list2.add(select2); + + select2 = new SelectGetterSetter(); + select2.setAns(getString(R.string.yes)); + select2.setAns_id(1); + ans_list2.add(select2); + + select2 = new SelectGetterSetter(); + select2.setAns(getString(R.string.no)); + select2.setAns_id(2); + ans_list2.add(select2); + + CustomSpinnerAdapter skuadapter2 = new CustomSpinnerAdapter(PromoComplianceActivity.this, R.layout.custom_t2p_spinner_item, ans_list2); + spinner_promoAnnouncer.setAdapter(skuadapter2); + + spinner_promoAnnouncer.setSelection(0); + + spinner_inStock.setOnTouchListener(new View.OnTouchListener() { + @Override + public boolean onTouch(View view, MotionEvent motionEvent) { + userSelect[0] = true; + return false; + } + }); + //In Stock final int finalI = i; - toggle_inStock.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() { + + spinner_inStock.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() { + @Override + public void onItemSelected(AdapterView adapterView, View view, int position, long l) { + + if(userSelect[0]){ + userSelect[0] = false; + + switch (position) { + + case 0: + data.setIn_stock("-1"); + img_promotion.setClickable(false); + img_promotion.setBackgroundResource(R.mipmap.camera_grey); + + //Camera + if (!data.getImage_promotion().equals("")) { + new File(str + data.getImage_promotion()).delete(); + data.setImage_promotion(""); + } + + + break; + case 1: + img_promotion.setBackgroundResource(R.mipmap.camera_orange); + + if (camera_allow.equals("1")) { + img_promotion.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + _pathforcheck = "Promo_Image_" + store_id + categoryId + "_" + data.getSku_id() + + data.getPromo_id() + visit_date.replace("/", "") + "_" + + getCurrentTime().replace(":", "") + ".jpg"; + //child_position = position; + child_position = finalI; + path = str + _pathforcheck; + + startCameraActivity(1); + } + }); + } + break; + case 2: + + data.setIn_stock("0"); + img_promotion.setClickable(false); + img_promotion.setBackgroundResource(R.mipmap.camera_grey); + + //Camera + if (!data.getImage_promotion().equals("")) { + new File(str + data.getImage_promotion()).delete(); + data.setImage_promotion(""); + } + + break; + } + + } + + } + + @Override + public void onNothingSelected(AdapterView adapterView) { + + } + }); + + + /* toggle_inStock.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() { @Override public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { if (isChecked) { @@ -472,18 +604,79 @@ public class PromoComplianceActivity extends AppCompatActivity { data.setIn_stock("0"); img_promotion.setClickable(false); img_promotion.setBackgroundResource(R.mipmap.camera_grey); - data.setImage_promotion(""); + + //Camera + if (!data.getImage_promotion().equals("")) { + new File(str + data.getImage_promotion()).delete(); + data.setImage_promotion(""); + } } } - }); + });*/ - if (data.getIn_stock().equals("1")) { + /* if (data.getIn_stock().equals("1")) { toggle_inStock.setChecked(true); } else { toggle_inStock.setChecked(false); + }*/ + + switch (data.getIn_stock()){ + case "-1": + spinner_inStock.setSelection(0); + break; + case "0": + spinner_inStock.setSelection(2); + break; + case "1": + spinner_inStock.setSelection(1); + break; } - //Promo Announcer + + spinner_promoAnnouncer.setOnTouchListener(new View.OnTouchListener() { + @Override + public boolean onTouch(View view, MotionEvent motionEvent) { + userSelect2[0] = true; + return false; + } + }); + + + spinner_promoAnnouncer.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() { + @Override + public void onItemSelected(AdapterView adapterView, View view, int position, long l) { + + if(userSelect2[0]){ + userSelect2[0] = false; + + switch (position) { + + case 0: + data.setPromo_announcer("-1"); + + break; + case 1: + data.setPromo_announcer("1"); + break; + case 2: + + data.setPromo_announcer("0"); + + break; + } + + } + + } + + @Override + public void onNothingSelected(AdapterView adapterView) { + + } + }); + + + /* //Promo Announcer toggle_promoAnnouncer.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() { @Override public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { @@ -499,10 +692,10 @@ public class PromoComplianceActivity extends AppCompatActivity { toggle_promoAnnouncer.setChecked(true); } else { toggle_promoAnnouncer.setChecked(false); - } + }*/ //Running on POS - toggle_runningPos.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() { + /* toggle_runningPos.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() { @Override public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { if (isChecked) { @@ -517,6 +710,18 @@ public class PromoComplianceActivity extends AppCompatActivity { toggle_runningPos.setChecked(true); } else { toggle_runningPos.setChecked(false); + }*/ + + switch (data.getPromo_announcer()){ + case "-1": + spinner_promoAnnouncer.setSelection(0); + break; + case "0": + spinner_promoAnnouncer.setSelection(2); + break; + case "1": + spinner_promoAnnouncer.setSelection(1); + break; } @@ -787,4 +992,66 @@ public class PromoComplianceActivity extends AppCompatActivity { return cdate; } + + public class CustomSpinnerAdapter extends ArrayAdapter { + + SelectGetterSetter tempValues = null; + LayoutInflater inflater; + private Activity activity; + private ArrayList data; + + /************* + * CustomAdapter Constructor + *****************/ + public CustomSpinnerAdapter( + PromoComplianceActivity activitySpinner, + int textViewResourceId, + ArrayList objects + + ) { + super(activitySpinner, textViewResourceId, objects); + + /********** Take passed values **********/ + activity = activitySpinner; + data = objects; + /*********** Layout inflator to call external xml layout () **********************/ + inflater = (LayoutInflater) activity.getSystemService(Context.LAYOUT_INFLATER_SERVICE); + + } + + @Override + public View getDropDownView(int position, View convertView, ViewGroup parent) { + return getCustomView(position, convertView, parent); + } + + @Override + public View getView(int position, View convertView, ViewGroup parent) { + return getCustomView(position, convertView, parent); + } + + // This funtion called for each row ( Called data.size() times ) + public View getCustomView(int position, View convertView, ViewGroup parent) { + + /********** Inflate spinner_rows.xml file for each row ( Defined below ) ************/ + View row = inflater.inflate(R.layout.custom_spinner_item, parent, false); + + /***** Get each Model object from Arraylist ********/ + tempValues = null; + tempValues = (SelectGetterSetter) data.get(position); + + TextView label = (TextView) row.findViewById(R.id.tv_text); + + if (position == 0) { + + // Default selected Spinner item + label.setText(getString(R.string.select)); + //sub.setText(""); + } else { + // Set values for spinner each row + label.setText(tempValues.getAns()); + } + + return row; + } + } } 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 103f594..428fee4 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java @@ -740,12 +740,12 @@ public class UploadActivity extends AppCompatActivity { } } - String present = ""; + /* String present = ""; if (t2PGetterSetters.get(i1).isPresent()) { present = "1"; } else { present = "0"; - } + }*/ onXML = "[T2P_DATA]" + "[MID]" + mid + "[/MID]" @@ -757,7 +757,7 @@ public class UploadActivity extends AppCompatActivity { + "[IMAGE]" + t2PGetterSetters.get(i1).getImage() + "[/IMAGE]" + "[IMAGE1]" + t2PGetterSetters.get(i1).getImage1() + "[/IMAGE1]" + "[IMAGE2]" + t2PGetterSetters.get(i1).getImage2() + "[/IMAGE2]" - + "[PRESENT]" + present + "[/PRESENT]" + + "[PRESENT]" + t2PGetterSetters.get(i1).getPresent() + "[/PRESENT]" + "[GAPS_DATA]" + gaps_xml + "[/GAPS_DATA]" + "[SKU_DATA]" + sku_xml + "[/SKU_DATA]" + "[CATEGORY_FIXTURE]" + t2PGetterSetters.get(i1).getCategory_fixture() + "[/CATEGORY_FIXTURE]" diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/Promo_Compliance_DataGetterSetter.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/Promo_Compliance_DataGetterSetter.java index 11640d7..65d30e0 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/Promo_Compliance_DataGetterSetter.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/Promo_Compliance_DataGetterSetter.java @@ -7,7 +7,7 @@ import java.util.ArrayList; */ public class Promo_Compliance_DataGetterSetter { - String store_id, sku_id, sku, promo_id, promo, in_stock, promo_announcer, + String store_id, sku_id, sku, promo_id, promo, in_stock = "-1", promo_announcer = "-1", running_pos, sp_promo, category_id,image_promotion; public String getStore_id() { diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/SelectGetterSetter.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/SelectGetterSetter.java new file mode 100644 index 0000000..430943c --- /dev/null +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/SelectGetterSetter.java @@ -0,0 +1,27 @@ +package cpm.com.gskmtorange.xmlGetterSetter; + +/** + * Created by yadavendras on 31-05-2017. + */ + +public class SelectGetterSetter { + + int ans_id; + String ans; + + public int getAns_id() { + return ans_id; + } + + public void setAns_id(int ans_id) { + this.ans_id = ans_id; + } + + public String getAns() { + return ans; + } + + public void setAns(String ans) { + this.ans = ans; + } +} diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/T2PGetterSetter.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/T2PGetterSetter.java index e6abf07..68fad20 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/T2PGetterSetter.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/T2PGetterSetter.java @@ -12,6 +12,8 @@ public class T2PGetterSetter { String brand_id, display_id, brand, display, image, remark, key_id, category_id, ref_image_url, ref_image_path, image1, image2, category_fixture; boolean isPresent; + int present = -1; + ArrayList gapsChecklist = new ArrayList<>(); ArrayList skulist = new ArrayList<>(); @@ -153,4 +155,12 @@ public class T2PGetterSetter { public void setCategory_fixture(String category_fixture) { this.category_fixture = category_fixture; } + + public int getPresent() { + return present; + } + + public void setPresent(int present) { + this.present = present; + } } diff --git a/GSKMTOrange/src/main/res/drawable/spinner_bg.xml b/GSKMTOrange/src/main/res/drawable/spinner_bg.xml new file mode 100644 index 0000000..0368ac7 --- /dev/null +++ b/GSKMTOrange/src/main/res/drawable/spinner_bg.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/GSKMTOrange/src/main/res/layout/custom_spinner_item.xml b/GSKMTOrange/src/main/res/layout/custom_spinner_item.xml index e8785d1..0f15c06 100644 --- a/GSKMTOrange/src/main/res/layout/custom_spinner_item.xml +++ b/GSKMTOrange/src/main/res/layout/custom_spinner_item.xml @@ -4,12 +4,12 @@ android:layout_height="wrap_content" xmlns:card_view="http://schemas.android.com/apk/res-auto" android:orientation="horizontal" + android:background="@android:color/transparent" > diff --git a/GSKMTOrange/src/main/res/layout/custom_t2p_spinner_item.xml b/GSKMTOrange/src/main/res/layout/custom_t2p_spinner_item.xml new file mode 100644 index 0000000..23c3ff9 --- /dev/null +++ b/GSKMTOrange/src/main/res/layout/custom_t2p_spinner_item.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + diff --git a/GSKMTOrange/src/main/res/layout/item_promo_sku_list.xml b/GSKMTOrange/src/main/res/layout/item_promo_sku_list.xml index d290113..0022ffd 100644 --- a/GSKMTOrange/src/main/res/layout/item_promo_sku_list.xml +++ b/GSKMTOrange/src/main/res/layout/item_promo_sku_list.xml @@ -115,7 +115,17 @@ android:gravity="center_horizontal" android:orientation="vertical"> + + + + + - @@ -90,7 +90,32 @@ android:background="@drawable/toggle_selector_background" android:textOff="@string/no" android:textOn="@string/yes" /> + --> + + + + + + + + + Select Date No Route Plan for the day + Please select present +