diff --git a/app/src/main/java/es/verdnatura/domain/userCases/UserCases.kt b/app/src/main/java/es/verdnatura/domain/userCases/UserCases.kt index ef29c45a..f9cc291d 100644 --- a/app/src/main/java/es/verdnatura/domain/userCases/UserCases.kt +++ b/app/src/main/java/es/verdnatura/domain/userCases/UserCases.kt @@ -1,6 +1,7 @@ package es.verdnatura.domain.userCases import es.verdnatura.domain.SalixService +import es.verdnatura.presentation.view.feature.packaging.model.NotificationQueue import retrofit2.Call class GetItemFromBarcodeUseCase(private val salixService: SalixService) { @@ -18,3 +19,9 @@ class GetItemPrintItemUseCase(private val salixService: SalixService) { return salixService.buyGetLastWithoutInventory(params) } } + +class NotiticationUseCase(private val salixService: SalixService) { + fun executeSendNotification(notificationQueue: NotificationQueue): Call { + return salixService.notificationQueues(notificationQueue) + } +} diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorFragment.kt index 72ebf54f..5de17c31 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorFragment.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorFragment.kt @@ -710,6 +710,28 @@ class UbicadorFragment : BaseFragment d("", "no action") } + /* tarea 7412 + viewModel.notificationQueues( + notification = "misallocation-warehouse", + workerfk = mobileApplication.userId!!, + body = if (it.originalAction == Action.PARKINEAR) { + getString( + R.string.actionParking, + it.originalAction, + it.originalShelvingFk, + it.originalParking, + mobileApplication.userName!! + ) + } else { + getString( + R.string.tansferItem, + it.originalAction, + it.originalItem, + it.originalParking, + mobileApplication.userName!! + ) + } + )*/ customDialogOlder.dismiss() }.setKoButton(getString(R.string.cancel)) { @@ -1197,30 +1219,7 @@ class UbicadorFragment : BaseFragment - if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0 || actionId == 5) { - - actionRename(item, customDialogInput.getValue()) - return@setOnEditorActionListener true - } - false - } - customDialogInput.getEditText().requestFocus() - } - */ customDialogTwoButtons.setKoButton(getString(R.string.cancel)) { customDialogTwoButtons.dismiss() } diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorViewModel.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorViewModel.kt index d7ec4a02..5b739ec7 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorViewModel.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorViewModel.kt @@ -11,6 +11,7 @@ import es.verdnatura.domain.SalixCallback import es.verdnatura.domain.formatWithQuotes import es.verdnatura.domain.userCases.GetItemFromBarcodeUseCase import es.verdnatura.domain.userCases.GetItemPrintItemUseCase +import es.verdnatura.domain.userCases.NotiticationUseCase import es.verdnatura.presentation.base.BaseViewModel import es.verdnatura.presentation.common.Action import es.verdnatura.presentation.common.Event @@ -18,6 +19,7 @@ import es.verdnatura.presentation.common.ItemShelvingSalix import es.verdnatura.presentation.common.ResponseHasOlder import es.verdnatura.presentation.view.feature.claim.fragment.reubication.model.Reubication import es.verdnatura.presentation.view.feature.claim.fragment.reubication.model.ReubicationList +import es.verdnatura.presentation.view.feature.packaging.model.NotificationQueue import es.verdnatura.presentation.view.feature.sacador.model.ItemShelvingSale import es.verdnatura.presentation.view.feature.ubicador.model.ItemBuy import es.verdnatura.presentation.view.feature.ubicador.model.ItemShelvingNewer @@ -36,6 +38,7 @@ import java.util.Locale class UbicadorViewModel(val context: Context) : BaseViewModel(context) { private val getItemFromBarcodeUseCase = GetItemFromBarcodeUseCase(salix) private val printItemUseCase = GetItemPrintItemUseCase(salix) + private val notificationUseCase = NotiticationUseCase(salix) private val _responseUbicator by lazy { MutableLiveData() } val responseUbicator: LiveData @@ -368,10 +371,8 @@ class UbicadorViewModel(val context: Context) : BaseViewModel(context) { override fun onSuccess(response: Response) { val itemShelving = response.body() if (itemShelving?.parking == null) { - println("No hay parking sin problema") itemShelvingTransfer(itemShelvingFk, shelvingFkTo) } else { - println("Tiene parking ${itemShelving}") getItemsByReviewOrder( shelving = shelvingFkTo, itemFk = itemFk, @@ -635,6 +636,18 @@ class UbicadorViewModel(val context: Context) : BaseViewModel(context) { }) } + fun notificationQueues(notification: String, workerfk: Int, body: String) { + notificationUseCase.executeSendNotification( + NotificationQueue( + notification, + workerfk, + body + ) + ) + .enqueue(object : SalixCallback(context) { + }) + } + fun printItem( reportName: String, printerFk: Int,