feat: refs #6861 reservas

This commit is contained in:
Sergio De la torre 2024-12-12 17:01:46 +01:00
parent b0dea86050
commit 64f2b9582e
4 changed files with 31 additions and 26 deletions

View File

@ -311,9 +311,22 @@ class SaleAdapterNew(
if (sale.isPicked == 1) { if (sale.isPicked == 1) {
if (type == PREPARED) { if (type == PREPARED) {
contentLayout.setBackgroundColor( 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 { } else {
contentLayout.setBackgroundColor( contentLayout.setBackgroundColor(

View File

@ -73,15 +73,15 @@ class PasilleroViewModel(context: Context) : BaseViewModel(context) {
) )
) )
if (userId == 19591) /* if (userId == 19591)
_pasillerositem.add( _pasillerositem.add(
PasillerosItemVO( PasillerosItemVO(
R.drawable.ic_dashboard_black_24dp, R.drawable.ic_dashboard_black_24dp,
R.string.ubicatorNew, R.string.ubicatorNew,
R.string.titleUbicatorDescrip R.string.titleUbicatorDescrip
) )
) )*/
//tarea 7855 //tarea 7855
_pasillerositem.add( _pasillerositem.add(
@ -542,13 +542,13 @@ class PasilleroViewModel(context: Context) : BaseViewModel(context) {
) )
) )
_pasillerositem.add( /* _pasillerositem.add(
PasillerosItemVO( PasillerosItemVO(
R.drawable.revision_icon, R.drawable.revision_icon,
R.string.titleShelvingHistorical, R.string.titleShelvingHistorical,
R.string.titleShelvingHistDescrip R.string.titleShelvingHistDescrip
) )
) )*/
_pasillerositem.add( _pasillerositem.add(
PasillerosItemVO( PasillerosItemVO(

View File

@ -60,19 +60,12 @@ class SectorCollectionReserveFragment(
} }
override fun init() { override fun init() {
println("hasToAdd $hasToAdd")
customDialogList = CustomDialogList(requireContext()) customDialogList = CustomDialogList(requireContext())
ma.hideBottomNavigation(View.GONE) ma.hideBottomNavigation(View.GONE)
binding.mainToolbar.toolbarTitle.text = title binding.mainToolbar.toolbarTitle.text = title
setEvents() setEvents()
setToolBar() setToolBar()
println("reserve collec $collectionFk")
println("reserve collec onBack$onBack")
if (!onBack) { if (!onBack) {
println("check parkings $collectionFk")
checkParkingsToPicker() checkParkingsToPicker()
} else { } else {
if (onBack) { if (onBack) {

View File

@ -264,7 +264,6 @@ class SacadorFragmentNew(
} }
"PREITEMPICKERTEST" -> { "PREITEMPICKERTEST" -> {
println("SacadorFragmentNew sectorCollectionGET")
// viewModel.sectorCollectionGet() // viewModel.sectorCollectionGet()
viewModel.sectorCollectionPartial() viewModel.sectorCollectionPartial()
} }