feat: refs #6861 reservas
This commit is contained in:
parent
b0dea86050
commit
64f2b9582e
app/src/main/java/es/verdnatura/presentation/view/feature
collection/adapter
pasillero/fragment
presacador/fragment
sacador/fragment
|
@ -311,9 +311,22 @@ class SaleAdapterNew(
|
|||
if (sale.isPicked == 1) {
|
||||
if (type == PREPARED) {
|
||||
contentLayout.setBackgroundColor(
|
||||
getColor(
|
||||
context!!, R.color.verdnatura_orange_salix
|
||||
)
|
||||
|
||||
if (sale.saleGroupFk == null) {
|
||||
getColor(
|
||||
context!!, R.color.verdnatura_orange_salix
|
||||
)
|
||||
} else {
|
||||
if (sale.stateCode != null && sale.stateCode == "PREPARED") {
|
||||
getColor(
|
||||
context!!, R.color.verdnatura_orange_salix
|
||||
)
|
||||
} else {
|
||||
getColor(
|
||||
context!!, R.color.verdnatura_dark_sky_blue
|
||||
)
|
||||
}
|
||||
}
|
||||
)
|
||||
} else {
|
||||
contentLayout.setBackgroundColor(
|
||||
|
|
|
@ -73,15 +73,15 @@ class PasilleroViewModel(context: Context) : BaseViewModel(context) {
|
|||
|
||||
)
|
||||
)
|
||||
if (userId == 19591)
|
||||
_pasillerositem.add(
|
||||
PasillerosItemVO(
|
||||
R.drawable.ic_dashboard_black_24dp,
|
||||
R.string.ubicatorNew,
|
||||
R.string.titleUbicatorDescrip
|
||||
/* if (userId == 19591)
|
||||
_pasillerositem.add(
|
||||
PasillerosItemVO(
|
||||
R.drawable.ic_dashboard_black_24dp,
|
||||
R.string.ubicatorNew,
|
||||
R.string.titleUbicatorDescrip
|
||||
|
||||
)
|
||||
)
|
||||
)
|
||||
)*/
|
||||
|
||||
//tarea 7855
|
||||
_pasillerositem.add(
|
||||
|
@ -542,13 +542,13 @@ class PasilleroViewModel(context: Context) : BaseViewModel(context) {
|
|||
)
|
||||
)
|
||||
|
||||
_pasillerositem.add(
|
||||
PasillerosItemVO(
|
||||
R.drawable.revision_icon,
|
||||
R.string.titleShelvingHistorical,
|
||||
R.string.titleShelvingHistDescrip
|
||||
)
|
||||
)
|
||||
/* _pasillerositem.add(
|
||||
PasillerosItemVO(
|
||||
R.drawable.revision_icon,
|
||||
R.string.titleShelvingHistorical,
|
||||
R.string.titleShelvingHistDescrip
|
||||
)
|
||||
)*/
|
||||
|
||||
_pasillerositem.add(
|
||||
PasillerosItemVO(
|
||||
|
|
|
@ -60,19 +60,12 @@ class SectorCollectionReserveFragment(
|
|||
}
|
||||
|
||||
override fun init() {
|
||||
println("hasToAdd $hasToAdd")
|
||||
|
||||
customDialogList = CustomDialogList(requireContext())
|
||||
ma.hideBottomNavigation(View.GONE)
|
||||
binding.mainToolbar.toolbarTitle.text = title
|
||||
setEvents()
|
||||
setToolBar()
|
||||
|
||||
println("reserve collec $collectionFk")
|
||||
println("reserve collec onBack$onBack")
|
||||
|
||||
if (!onBack) {
|
||||
println("check parkings $collectionFk")
|
||||
checkParkingsToPicker()
|
||||
} else {
|
||||
if (onBack) {
|
||||
|
|
|
@ -264,7 +264,6 @@ class SacadorFragmentNew(
|
|||
}
|
||||
|
||||
"PREITEMPICKERTEST" -> {
|
||||
println("SacadorFragmentNew sectorCollectionGET")
|
||||
// viewModel.sectorCollectionGet()
|
||||
viewModel.sectorCollectionPartial()
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue