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 d206f93c..c488f01d 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 @@ -80,6 +80,7 @@ import es.verdnatura.presentation.view.feature.diadeventa.fragment.DayOfSaleFrag import es.verdnatura.presentation.view.feature.historicoarticulo.fragment.HistoricoArticuloFragment import es.verdnatura.presentation.view.feature.historicoshelving.fragment.ItemShelvingLogFragment import es.verdnatura.presentation.view.feature.historicoshelvinglog.fragment.ShelvingLogFragment +import es.verdnatura.presentation.view.feature.historicoshelvinglog.model.LogType import es.verdnatura.presentation.view.feature.historicovehiculo.fragment.HistoricoVehiculoFragment import es.verdnatura.presentation.view.feature.inventario.fragment.InventaryFragment import es.verdnatura.presentation.view.feature.inventario.fragment.InventaryParkingFragment @@ -109,6 +110,13 @@ 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.roadmap.fragment.RoadMapListFragment +import es.verdnatura.presentation.view.feature.roadmap.fragment.RoadMapSettingsFragment +import es.verdnatura.presentation.view.feature.roadmap.fragment.StopMapListFragment +import es.verdnatura.presentation.view.feature.roadmap.fragment.StopMapPalletListFragment +import es.verdnatura.presentation.view.feature.roadmap.model.RoadMapTruck +import es.verdnatura.presentation.view.feature.roadmap.model.RoadStopMapTruck +import es.verdnatura.presentation.view.feature.roadmap.model.TruckAction import es.verdnatura.presentation.view.feature.sacador.fragment.PickerHelperFragment import es.verdnatura.presentation.view.feature.sacador.fragment.SacadorFragment import es.verdnatura.presentation.view.feature.sacador.fragment.SacadorFragmentNew @@ -116,12 +124,6 @@ import es.verdnatura.presentation.view.feature.sacador.fragment.showticket.ShowT import es.verdnatura.presentation.view.feature.sacador.model.CollectionTicket import es.verdnatura.presentation.view.feature.sacador.model.CollectionVO import es.verdnatura.presentation.view.feature.ticket.fragment.TicketAdvanceFragment -import es.verdnatura.presentation.view.feature.truck.fragment.RoadMapListFragment -import es.verdnatura.presentation.view.feature.truck.fragment.StopMapListFragment -import es.verdnatura.presentation.view.feature.truck.fragment.StopMapPalletListFragment -import es.verdnatura.presentation.view.feature.truck.model.RoadMapTruck -import es.verdnatura.presentation.view.feature.truck.model.StopMapTruck -import es.verdnatura.presentation.view.feature.truck.model.TruckAction import es.verdnatura.presentation.view.feature.ubicador.fragment.AutomaticAddItemFragment import es.verdnatura.presentation.view.feature.ubicador.fragment.UbicadorFragmentNew import es.verdnatura.presentation.view.feature.workermistake.fragment.PackingMistakeFragment @@ -477,7 +479,7 @@ class MainActivity : BaseActivity(), OnPasillerosItemClickL } } - private fun delete_Fragments() { + fun delete_Fragments() { fm.getFragments().forEach { val fragment: Fragment? = supportFragmentManager.findFragmentByTag(it.tag.toString()) if (fragment != null) supportFragmentManager.beginTransaction().remove(fragment) @@ -632,6 +634,9 @@ class MainActivity : BaseActivity(), OnPasillerosItemClickL getString(R.string.titleHistorical) -> { addFragmentOnTop(HistoricoArticuloFragment.newInstance(entryPoint.toInt())) } + getString(R.string.roadMapSettings) -> { + addFragmentOnTop(RoadMapSettingsFragment.newInstance(param as RoadMapTruck)) + } getString(R.string.titleInventory) -> { addFragmentOnTop(InventaryFragment.newInstance()) @@ -703,7 +708,10 @@ class MainActivity : BaseActivity(), OnPasillerosItemClickL } getString(R.string.titleLogShelving) -> { - addFragmentOnTop(ShelvingLogFragment.newInstance(item.title)) + addFragmentOnTop(ShelvingLogFragment.newInstance(item.title, LogType.SHELVING)) + } + getString(R.string.titleParkingTicketPrevia) -> { + addFragmentOnTop(ShelvingLogFragment.newInstance(item.title, LogType.PREVIOUS)) } getString(R.string.titleWorkerMistake) -> { @@ -743,15 +751,15 @@ class MainActivity : BaseActivity(), OnPasillerosItemClickL } getString(R.string.titlePackaging) -> { - addFragmentOnTop(SupplierFragment.newInstance(item.title)) + addFragmentOnTop(SupplierFragment.newInstance(item.title), name = item.title) } getString(R.string.titlePackagingCount) -> { - addFragmentOnTop(PackagingCountFragment.newInstance(item.title)) + addFragmentOnTop(PackagingCountFragment.newInstance(item.title), name = item.title) } getString(R.string.titlePackagingObs) -> { - addFragmentOnTop(ObservFragment.newInstance(item.title)) + addFragmentOnTop(ObservFragment.newInstance(item.title), name = item.title) } getString(R.string.titlePackagingSummary) -> { @@ -868,6 +876,7 @@ class MainActivity : BaseActivity(), OnPasillerosItemClickL addFragmentOnTop(PickerHelperFragment.newInstance(item.title)) } + "PREITEMPICKERTEST" -> { addFragmentOnTop( CollectionFragmentPickerPreviousNew.newInstance( @@ -1172,7 +1181,10 @@ class MainActivity : BaseActivity(), OnPasillerosItemClickL } override fun onStopMapClickListener( - item: StopMapTruck, entryPoint: String, action: TruckAction + item: RoadStopMapTruck, + entryPoint: String, + action: TruckAction, + view: View? ) { println("stopMapList ${item.description}") println("stopMapList id ${item.id}")