From f86dc34a1ddd723a28c84f83863aa3da416268e5 Mon Sep 17 00:00:00 2001 From: Sergio De la torre Date: Mon, 21 Oct 2024 12:07:43 +0200 Subject: [PATCH] feat: refs #8085 restaurant --- .../feature/main/activity/MainActivity.kt | 83 +++++++++++++++---- 1 file changed, 67 insertions(+), 16 deletions(-) diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/main/activity/MainActivity.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/main/activity/MainActivity.kt index 9760681a..70a074de 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/main/activity/MainActivity.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/main/activity/MainActivity.kt @@ -20,13 +20,16 @@ import com.google.android.material.navigation.NavigationBarView import es.verdnatura.MobileApplication import es.verdnatura.R import es.verdnatura.databinding.ActivityMainBinding +import es.verdnatura.domain.ConstAndValues.CONTROLADOR import es.verdnatura.domain.ConstAndValues.MAINACTIVITY import es.verdnatura.domain.ConstAndValues.MENUBYDEFAULTSELECTED import es.verdnatura.domain.ConstAndValues.PREITEMPICKER +import es.verdnatura.domain.ConstAndValues.PREITEMPICKERTEST import es.verdnatura.domain.ConstAndValues.PRINTERFK import es.verdnatura.domain.ConstAndValues.PRINTERFKDEFAULT import es.verdnatura.domain.ConstAndValues.RENEWINTERVAL import es.verdnatura.domain.ConstAndValues.RENEWPERIOD +import es.verdnatura.domain.ConstAndValues.SACADOR import es.verdnatura.domain.ConstAndValues.SECTORFK import es.verdnatura.domain.ConstAndValues.SECTORFKDEFAULT import es.verdnatura.domain.ConstAndValues.TOKEN @@ -62,12 +65,12 @@ import es.verdnatura.presentation.view.feature.claim.fragment.reubication.fragme import es.verdnatura.presentation.view.feature.claim.fragment.reubication.model.Reubication import es.verdnatura.presentation.view.feature.claim.fragment.ubication.ClaimUbicationFragment import es.verdnatura.presentation.view.feature.collection.fragment.CollectionFragment +import es.verdnatura.presentation.view.feature.collection.fragment.CollectionFragmentChecker +import es.verdnatura.presentation.view.feature.collection.fragment.CollectionFragmentCheckerPreviousNew import es.verdnatura.presentation.view.feature.collection.fragment.CollectionFragmentPicker -import es.verdnatura.presentation.view.feature.collection.fragment.CollectionFragmentPickerNew import es.verdnatura.presentation.view.feature.collection.fragment.CollectionFragmentPickerPreviousNew import es.verdnatura.presentation.view.feature.collection.fragment.CollectionFragmentPreChecker import es.verdnatura.presentation.view.feature.collection.fragment.CollectionShowTicketFragment -import es.verdnatura.presentation.view.feature.controlador.fragment.ControladorFragment import es.verdnatura.presentation.view.feature.controlvehiculo.fragment.ControlVehiculoFragment import es.verdnatura.presentation.view.feature.controlvehiculo.fragment.ControlVehiculoUsuarioFragment import es.verdnatura.presentation.view.feature.delivery.fragments.InfoFragment @@ -94,6 +97,7 @@ import es.verdnatura.presentation.view.feature.packaging.fragment.PackagingSumma import es.verdnatura.presentation.view.feature.packaging.fragment.SupplierFragment import es.verdnatura.presentation.view.feature.packingHolland.fragment.PackingHollandFragment import es.verdnatura.presentation.view.feature.paletizador.fragment.CmrExpeditionPalletFragment +import es.verdnatura.presentation.view.feature.paletizador.fragment.ExpeditionDeleteFragment import es.verdnatura.presentation.view.feature.paletizador.fragment.ExpeditionPalletDetailFragment import es.verdnatura.presentation.view.feature.paletizador.fragment.ExpeditionPalletFragment import es.verdnatura.presentation.view.feature.paletizador.fragment.ExpeditionPreparedStateFragment @@ -114,6 +118,7 @@ import es.verdnatura.presentation.view.feature.precontrol.PreControladorFragment import es.verdnatura.presentation.view.feature.presacador.fragment.EndSacadorFragment import es.verdnatura.presentation.view.feature.presacador.fragment.SectorCollectionReserveFragment import es.verdnatura.presentation.view.feature.qr.QrFragment +import es.verdnatura.presentation.view.feature.restaurant.RestaurantActivity import es.verdnatura.presentation.view.feature.roadmap.fragment.RoadMapListFragment import es.verdnatura.presentation.view.feature.roadmap.fragment.RoadMapSettingsFragment import es.verdnatura.presentation.view.feature.roadmap.fragment.StopMapListFragment @@ -535,19 +540,36 @@ class MainActivity : BaseActivity(), OnPasillerosItemClickL ) } - getString(R.string.titleChecker) -> {/* mainActivityViewmodel.workerActivityAdd( - WorkerActionSalix( - workerFk = mobileApplication!!.userId!!, - workerActivityTypeFk = "ON_CHECKING", - inTimed = (LocalDate.now()).toString() - ) - )*/ + getString(R.string.titleChecker) -> { - addFragmentOnTop(ControladorFragment.newInstance()) + // Ya no se utiliza : addFragmentOnTop(ControladorFragment.newInstance()) + + if (mobileApplication.userId == 19591) { + println("Revisando nueva") + addFragmentOnTop( + CollectionFragmentChecker.newInstance( + CollectionVO(collectionFk = 0), + type = CONTROLADOR + ) + ) + } else { + println("Revisando vieja") + addFragmentOnTop( + CollectionFragment.newInstance( + CollectionVO(collectionFk = 0), + type = CONTROLADOR + ) + ) + } + /* addFragmentOnTop( + CollectionFragment.newInstance( + CollectionVO(collectionFk = 0), + type = CONTROLADOR + ) + )*/ } getString(R.string.titleCorridors) -> { - mainActivityPasilleroViewModel.workerActivityAdd(CodeWorkerAction.ON_PREPARATION) addFragmentOnTop( PasilleroFragment.newInstance(itemTitle, isInitMenu = false), ) @@ -678,11 +700,13 @@ class MainActivity : BaseActivity(), OnPasillerosItemClickL }*/ getString(R.string.titlePickers) -> { + mainActivityPasilleroViewModel.workerActivityAdd(CodeWorkerAction.ON_PREPARATION) addFragmentOnTop(SacadorFragment.newInstance("PREPARED")) //addFragmentOnTop(ControlVehiculoFragment.newInstance("")) } "Sacador Test" -> { + mainActivityPasilleroViewModel.workerActivityAdd(CodeWorkerAction.ON_PREPARATION) addFragmentOnTop(SacadorFragmentNew.newInstance("PREPARED")) } @@ -725,6 +749,10 @@ class MainActivity : BaseActivity(), OnPasillerosItemClickL addFragmentOnTop(PreControladorFragment.newInstance()) } + getString(R.string.preControlNew) -> { + addFragmentOnTop(CollectionFragmentCheckerPreviousNew.newInstance()) + } + getString(R.string.titleShelvingHistorical) -> { addFragmentOnTop(ItemShelvingLogFragment.newInstance(itemTitle)) @@ -742,6 +770,10 @@ class MainActivity : BaseActivity(), OnPasillerosItemClickL addFragmentOnTop(WorkermistakeFragment.newInstance(itemTitle)) } + getString(R.string.deleteExpedition) -> { + addFragmentOnTop(ExpeditionDeleteFragment.newInstance(itemTitle)) + } + getString(R.string.titlePackingMistake) -> { addFragmentOnTop(PackingMistakeFragment.newInstance(itemTitle)) } @@ -798,6 +830,11 @@ class MainActivity : BaseActivity(), OnPasillerosItemClickL addFragmentOnTop(PackingHollandFragment.newInstance(itemTitle)) } + getString(R.string.titleRestaurant) -> { + val i = Intent(this, RestaurantActivity::class.java) + startActivity(i) + } + getString(R.string.titleDelivery) -> { mainActivityPasilleroViewModel.workerActivityAdd(CodeWorkerAction.DELIVERY) addFragmentOnTop( @@ -1010,23 +1047,28 @@ class MainActivity : BaseActivity(), OnPasillerosItemClickL collection: CollectionTicket, type: String, hasPicking: Boolean, hasToAdd: Boolean ) { when (type) { - "PREITEMPICKERTEST" -> { + PREITEMPICKERTEST -> { println("test presacador") //addFragmentOnTop(EndSacadorFragment.newInstance(collection, type)) addFragmentOnTop( SectorCollectionReserveFragment.newInstance( - "PREITEMPICKERTEST", collection.collectionFk, hasToAdd + type, collection.collectionFk, hasToAdd ) ) } - - else -> { + //Misma pantalla para los dos scador y prescador + SACADOR -> { addFragmentOnTop( - CollectionFragmentPickerNew.newInstance( + CollectionFragmentPickerPreviousNew.newInstance( collection, type, hasPicking ) ) + /* addFragmentOnTop( + CollectionFragmentPickerNew.newInstance( + collection, type, hasPicking + ) + )*/ } } @@ -1055,6 +1097,15 @@ class MainActivity : BaseActivity(), OnPasillerosItemClickL addFragmentOnTop(CollectionFragmentPicker.newInstance(collection, type)) } + // Ya no pasa por aquí el revisar se ha quitado la pantalla intermedia ControladorFragment para ver si así va mejor. + CONTROLADOR -> { + /* addFragmentOnTop( + CollectionFragmentChecker.newInstance(collection, type), + name = "CollectionFragmentChecker" + )*/ + addFragmentOnTop(CollectionFragment.newInstance(collection, type)) + } + else -> { addFragmentOnTop(CollectionFragment.newInstance(collection, type)) }