diff --git a/app/src/main/java/es/verdnatura/presentation/common/UICallbacks.kt b/app/src/main/java/es/verdnatura/presentation/common/UICallbacks.kt index 293531fb..493d5bd9 100644 --- a/app/src/main/java/es/verdnatura/presentation/common/UICallbacks.kt +++ b/app/src/main/java/es/verdnatura/presentation/common/UICallbacks.kt @@ -14,7 +14,7 @@ interface OnOptionsSelectedListener { } interface OnPasillerosItemClickListener { - fun onPasillerosItemClickListener(item: PasillerosItemVO) + fun onPasillerosItemClickListener(item: PasillerosItemVO,entryPoint:String) } interface OnAjustesItemClickListener { diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/fragment/ItemCardFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/fragment/ItemCardFragment.kt index ded9a93e..17733686 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/fragment/ItemCardFragment.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/fragment/ItemCardFragment.kt @@ -29,21 +29,22 @@ import kotlinx.android.synthetic.main.activity_main.* import kotlinx.android.synthetic.main.fragment_item_card.* import kotlinx.android.synthetic.main.toolbar.* -class ItemCardFragment : BaseFragment(ItemCardViewModel::class) { +class ItemCardFragment( + var itemFk:String = "" +) : BaseFragment(ItemCardViewModel::class) { private var urlLarge:String = "" private var titleImage:String = "" private var user = "" private var password = "" private var warehouseFk = "" - private var itemFk = "" private var adapter : ItemCardAdapter? = null private var barcodeAdapter : BarcodeAdapter? = null private var listItemsRow:ArrayList = ArrayList() private var listBarcodes:ArrayList = ArrayList() companion object { - fun newInstance() = ItemCardFragment() + fun newInstance(entryPoint:String) = ItemCardFragment(entryPoint) } private lateinit var customDialog: CustomDialog private lateinit var customDialogInput: CustomDialogInput @@ -61,6 +62,9 @@ class ItemCardFragment : BaseFragment customDialogInput = CustomDialogInput(requireContext()) customDialogList = CustomDialogList(requireContext()) customDialogTwo = CustomDialogTwoButtons(requireContext()) + if (!itemFk.isNullOrEmpty()){ + getItemCard(itemFk) + } super.init() } diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/buscaritem/fragment/BuscarItemFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/buscaritem/fragment/BuscarItemFragment.kt index 617e9c14..653b6a58 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/buscaritem/fragment/BuscarItemFragment.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/buscaritem/fragment/BuscarItemFragment.kt @@ -18,17 +18,18 @@ import kotlinx.android.synthetic.main.activity_main.* import kotlinx.android.synthetic.main.fragment_buscar_item.* import kotlinx.android.synthetic.main.toolbar.* -class BuscarItemFragment : BaseFragment(BuscarItemViewModel::class) { +class BuscarItemFragment( + var itemFk:String = "" +) : BaseFragment(BuscarItemViewModel::class) { private var user = "" private var password = "" private var warehouseFk = "" - private var itemFk = "" private var adapter : LocationAdapter? = null private lateinit var customDialog: CustomDialog companion object { - fun newInstance() = BuscarItemFragment() + fun newInstance(entryPoint:String) = BuscarItemFragment(entryPoint) } override fun getLayoutId(): Int = R.layout.fragment_buscar_item @@ -38,6 +39,9 @@ class BuscarItemFragment : BaseFragment, private val onFaltasNichoClickListener: OnFaltasNichoClickListener, - private val onFaltasReviewClickListener:OnFaltasReviewClickListener + private val onFaltasReviewClickListener:OnFaltasReviewClickListener, + private val onPasillerosItemClickListener: OnPasillerosItemClickListener ): RecyclerView.Adapter () { @@ -46,6 +49,15 @@ class FaltasAdapter ( itemFaltas.setOnClickListener { onFaltasReviewClickListener.onFaltasReviewClickListener(item) } + itemFk.setOnClickListener { + onPasillerosItemClickListener.onPasillerosItemClickListener(PasillerosItemVO(title = "Consultar artículo"),item.itemFk) + } + itemUp.setOnClickListener { + onPasillerosItemClickListener.onPasillerosItemClickListener(PasillerosItemVO(title = "Buscar item"),item.itemFk) + } + itemDown.setOnClickListener { + onPasillerosItemClickListener.onPasillerosItemClickListener(PasillerosItemVO(title = "Buscar item"),item.itemFk) + } } } } diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/faltas/fragment/FaltasFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/faltas/fragment/FaltasFragment.kt index d868d075..59653b9d 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/faltas/fragment/FaltasFragment.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/faltas/fragment/FaltasFragment.kt @@ -1,5 +1,6 @@ package es.verdnatura.presentation.view.feature.faltas.fragment +import android.content.Context import android.content.SharedPreferences import android.graphics.drawable.Drawable import android.view.View @@ -14,6 +15,7 @@ import es.verdnatura.presentation.common.OnFaltasNichoClickListener import es.verdnatura.presentation.common.OnFaltasReviewClickListener import es.verdnatura.presentation.common.OnOptionsSelectedListener +import es.verdnatura.presentation.common.OnPasillerosItemClickListener import es.verdnatura.presentation.view.component.CustomDialog import es.verdnatura.presentation.view.component.CustomDialogInput import es.verdnatura.presentation.view.feature.faltas.adapter.FaltasAdapter @@ -36,16 +38,23 @@ class FaltasFragment : BaseFragment(Falt private var listInvetory:ArrayList = ArrayList() private var listInvetoryAux:ArrayList = ArrayList() private lateinit var customDialog: CustomDialog + private var pasillerosItemClickListener: OnPasillerosItemClickListener? = null companion object { fun newInstance() = FaltasFragment() } + override fun onAttach(context: Context) { + if (context is OnPasillerosItemClickListener) pasillerosItemClickListener = context + super.onAttach(context) + } + override fun getLayoutId(): Int = R.layout.fragment_faltas override fun init() { + splash_progress.visibility = View.VISIBLE activity!!.main_bottom_navigation.visibility = View.GONE - toolbar_title.text = "itemShelvingRadar" + toolbar_title.text = "faultsReview" setToolBar() val prefs: SharedPreferences = activity!!.getSharedPreferences(PREFS_USER,0) user = prefs.getString(USER,"").toString() @@ -109,8 +118,9 @@ class FaltasFragment : BaseFragment(Falt override fun observeViewModel() { with(viewModel){ loadFaltasList.observe(viewLifecycleOwner, Observer { event -> - splash_progress.visibility = View.GONE + event.getContentIfNotHandled().notNull { + splash_progress.visibility = View.GONE listInvetory = ArrayList() listInvetoryAux = ArrayList() it.list.forEach { @@ -150,7 +160,7 @@ class FaltasFragment : BaseFragment(Falt changeOfflineValue(item) } - }) + },pasillerosItemClickListener!!) location_recyclerview.adapter = adapter location_recyclerview.layoutManager = LinearLayoutManager(requireContext(), LinearLayoutManager.VERTICAL, false) } diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/inventario/adapter/InventoryAdapter.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/inventario/adapter/InventoryAdapter.kt index 283c172a..b9bdf6ca 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/inventario/adapter/InventoryAdapter.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/inventario/adapter/InventoryAdapter.kt @@ -6,11 +6,14 @@ import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView import es.verdnatura.databinding.ItemInventaryRowBinding import es.verdnatura.presentation.common.OnInvetoryNichoClickListener +import es.verdnatura.presentation.common.OnPasillerosItemClickListener import es.verdnatura.presentation.view.feature.inventario.model.ItemInventaryVO +import es.verdnatura.presentation.view.feature.pasillero.model.PasillerosItemVO class InventoryAdapter ( private val items: List, - private val onInvetoryNichoClickListener: OnInvetoryNichoClickListener + private val onInvetoryNichoClickListener: OnInvetoryNichoClickListener, + private val onPasillerosItemClickListener: OnPasillerosItemClickListener ): RecyclerView.Adapter () { @@ -41,6 +44,15 @@ class InventoryAdapter ( itemNicho.setOnClickListener { onInvetoryNichoClickListener.onInvetoryNichoClickListener(item) } + itemFk.setOnClickListener { + onPasillerosItemClickListener.onPasillerosItemClickListener(PasillerosItemVO(title = "Consultar artículo"),item.itemFk) + } + itemUp.setOnClickListener { + onPasillerosItemClickListener.onPasillerosItemClickListener(PasillerosItemVO(title = "Buscar item"),item.itemFk) + } + itemDown.setOnClickListener { + onPasillerosItemClickListener.onPasillerosItemClickListener(PasillerosItemVO(title = "Buscar item"),item.itemFk) + } } } } diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/inventario/fragment/InventaryFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/inventario/fragment/InventaryFragment.kt index 61ca58ad..5ca39275 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/inventario/fragment/InventaryFragment.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/inventario/fragment/InventaryFragment.kt @@ -1,7 +1,9 @@ package es.verdnatura.presentation.view.feature.inventario.fragment +import android.content.Context import android.content.SharedPreferences import android.graphics.drawable.Drawable +import android.os.Bundle import android.view.View import android.view.inputmethod.EditorInfo import androidx.lifecycle.Observer @@ -12,6 +14,7 @@ import es.verdnatura.domain.notNull import es.verdnatura.presentation.base.BaseFragment import es.verdnatura.presentation.common.OnInvetoryNichoClickListener import es.verdnatura.presentation.common.OnOptionsSelectedListener +import es.verdnatura.presentation.common.OnPasillerosItemClickListener import es.verdnatura.presentation.view.component.CustomDialog import es.verdnatura.presentation.view.component.CustomDialogInput import es.verdnatura.presentation.view.feature.inventario.adapter.InventoryAdapter @@ -35,6 +38,7 @@ class InventaryFragment : BaseFragment = ArrayList() private var listInvetoryAux:ArrayList = ArrayList() private lateinit var customDialog: CustomDialog + private var pasillerosItemClickListener: OnPasillerosItemClickListener? = null companion object { fun newInstance() = InventaryFragment() @@ -42,10 +46,13 @@ class InventaryFragment : BaseFragment = ArrayList() val iconReload : Drawable = resources.getDrawable(R.drawable.ic_autorenew_black_24dp,resources.newTheme()) @@ -108,8 +123,9 @@ class InventaryFragment : BaseFragment - splash_progress.visibility = View.GONE + event.getContentIfNotHandled().notNull { + splash_progress.visibility = View.GONE listInvetory = ArrayList() listInvetoryAux = ArrayList() it.list.forEach { @@ -145,7 +161,7 @@ class InventaryFragment : BaseFragment() , OnPasillerosItemClick } } - override fun onPasillerosItemClickListener(item: PasillerosItemVO) { + override fun onPasillerosItemClickListener(item: PasillerosItemVO, entryPoint: String) { when (item.title){ "Consultar artículo" -> { - addFragmentOnTop(ItemCardFragment.newInstance()) + addFragmentOnTop(ItemCardFragment.newInstance(entryPoint)) } "Buscar item" -> { - addFragmentOnTop(BuscarItemFragment.newInstance()) + addFragmentOnTop(BuscarItemFragment.newInstance(entryPoint)) } "Inventario" -> { addFragmentOnTop(InventaryFragment.newInstance()) diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/pasillero/adapter/PasillerosAdapter.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/pasillero/adapter/PasillerosAdapter.kt index fe4d0830..fea89719 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/pasillero/adapter/PasillerosAdapter.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/pasillero/adapter/PasillerosAdapter.kt @@ -24,7 +24,7 @@ class PasillerosAdapter ( override fun onBindViewHolder(holder: PasillerosItemHolder, position: Int) { holder.bind(items[position]) holder.binding.root.setOnClickListener { - onPasillerosItemClickListener.onPasillerosItemClickListener(items[position]) + onPasillerosItemClickListener.onPasillerosItemClickListener(items[position],"") } } diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/pasillero/model/PasillerosItemVO.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/pasillero/model/PasillerosItemVO.kt index e16e17b0..e5d85f1c 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/pasillero/model/PasillerosItemVO.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/pasillero/model/PasillerosItemVO.kt @@ -1,7 +1,7 @@ package es.verdnatura.presentation.view.feature.pasillero.model class PasillerosItemVO ( - var id: Int, - var iconResource: Int, + var id: Int = 0, + var iconResource: Int = 0, val title: String = "" ) \ No newline at end of file