verdnatura/vn-warehouse
verdnatura
/
vn-warehouse
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

feat: boxPickingPrepared refs #7855

This commit is contained in:
Sergio De la torre 2024-09-24 10:27:05 +02:00
parent 9ce0349f41
commit 50beca0cf3
2 changed files with 12 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/es/verdnatura/presentation/view/feature/pasillero/fragment/PasilleroFragment.kt
View File

@ -39,7 +39,6 @@ class PasilleroFragment(
override fun init() { override fun init() {
ma.hideBottomNavigation(View.VISIBLE) ma.hideBottomNavigation(View.VISIBLE)
if (getString(R.string.main) == tagName) { if (getString(R.string.main) == tagName) {
val myWorkSelected: String = mobileApplication.dataStoreApp.readDataStoreKey( val myWorkSelected: String = mobileApplication.dataStoreApp.readDataStoreKey(
@ -47,7 +46,7 @@ class PasilleroFragment(
) )
binding.mainToolbarDesign.layoutTool.visibility = View.GONE binding.mainToolbarDesign.layoutTool.visibility = View.GONE
if ( myWorkSelected != "Producción" && myWorkSelected != "") { if (myWorkSelected != "Producción" && myWorkSelected != "") {
binding.pasillerosItems.setBackgroundColor(Color.RED) binding.pasillerosItems.setBackgroundColor(Color.RED)
binding.mainToolbarDesign.toolbarTitle.setBackgroundColor(Color.RED) binding.mainToolbarDesign.toolbarTitle.setBackgroundColor(Color.RED)
binding.mainToolbarDesign.toolbarTitle.text = binding.mainToolbarDesign.toolbarTitle.text =
@ -88,9 +87,8 @@ class PasilleroFragment(
).ifBlank { tagName } ).ifBlank { tagName }
when (showMenu) { when (showMenu) {
getString(R.string.titleCorridors) -> { getString(R.string.titleCorridors) ->
viewModel.inititializeDefaultData() viewModel.inititializeDefaultData()
}
getString(R.string.titlePalletizers) -> viewModel.inititializeDefaultPallet() getString(R.string.titlePalletizers) -> viewModel.inititializeDefaultPallet()
getString(R.string.titleBufferManegement) -> viewModel.inititializeDefaultBuffer() getString(R.string.titleBufferManegement) -> viewModel.inititializeDefaultBuffer()
@ -117,7 +115,7 @@ class PasilleroFragment(
PasillerosItemVO( PasillerosItemVO(
R.drawable.ic_picker_ui, R.drawable.ic_picker_ui,
R.string.titlePickers, R.string.titlePickers,
R.string.titlePickersDescrip R.string.titlePickersDescrip
) )
) )
@ -127,7 +125,7 @@ class PasilleroFragment(
viewModel.inititializeDefaultDataInit() viewModel.inititializeDefaultDataInit()
} }
} }
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
} }

26
app/src/main/java/es/verdnatura/presentation/view/feature/pasillero/fragment/PasilleroViewModel.kt
View File

@ -21,7 +21,7 @@ class PasilleroViewModel(context: Context) : BaseViewModel(context) {
val userId = (contextApp as MobileApplication).userId val userId = (contextApp as MobileApplication).userId
private val isOnReservationMode = private val isOnReservationMode =
(contextApp as MobileApplication).dataStoreApp.readDataStoreKey<Boolean>(RESERVATIONMODE) (contextApp as MobileApplication).dataStoreApp.readDataStoreKey<Boolean>(RESERVATIONMODE)
fun inititializeDefaultData() { fun inititializeDefaultData() {
workerActivityAdd(CodeWorkerAction.STORAGE) workerActivityAdd(CodeWorkerAction.STORAGE)
_pasillerositem.add( _pasillerositem.add(
@ -61,13 +61,13 @@ class PasilleroViewModel(context: Context) : BaseViewModel(context) {
) )
//tarea 7855 //tarea 7855
/* _pasillerositem.add( _pasillerositem.add(
PasillerosItemVO( PasillerosItemVO(
R.drawable.ic_scan_prepared, R.drawable.ic_scan_prepared,
R.string.scanPreparedExpedition), R.string.scanPreparedExpedition,
R.string.scanPreparedExpedition) R.string.scanPreparedExpedition
) )
)*/ )
_pasillerositem.add( _pasillerositem.add(
@ -423,16 +423,6 @@ class PasilleroViewModel(context: Context) : BaseViewModel(context) {
) )
) )
if (userId == 19591) {
_pasillerositem.add(
PasillerosItemVO(
R.drawable.ic_previous_precontrol,
R.string.titlePreControlTest,
R.string.titlePreControlDescrip
)
)
}
_pasillerositem.add( _pasillerositem.add(
PasillerosItemVO( PasillerosItemVO(
R.drawable.ic_ticket, R.string.titleShowTicket, R.string.titleShowTicketDescrip R.drawable.ic_ticket, R.string.titleShowTicket, R.string.titleShowTicketDescrip