From e8c6e713c28bb0dab8efd2ccdfaab908456a2e1f Mon Sep 17 00:00:00 2001
From: Sergio De la torre <sergiodt@verdnatura.es>
Date: Fri, 30 Jun 2023 07:57:02 +0200
Subject: [PATCH] refs #5891 inventory

---
 .idea/workspace.xml                           |   63 +-
 .../es/verdnatura/domain/VerdnaturaService.kt |    6 +
 .../fragment/InventaryParkingFragment.kt      | 1046 +++++++++++++++++
 .../inventario/fragment/InventaryViewModel.kt |   26 +
 .../feature/login/fragment/LoginFragment.kt   |    5 +-
 .../pasillero/fragment/PasilleroViewModel.kt  |   16 +-
 .../res/drawable/ic_inventory_parking.xml     |   10 +
 7 files changed, 1140 insertions(+), 32 deletions(-)
 create mode 100644 app/src/main/java/es/verdnatura/presentation/view/feature/inventario/fragment/InventaryParkingFragment.kt
 create mode 100644 app/src/main/res/drawable/ic_inventory_parking.xml

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 87853109..a068a289 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -82,14 +82,15 @@
     </select>
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="fa688d1c-dbee-4864-9e33-4d84ef9afca8" name="Default Changelist" comment="version 23.24.1Beta">
-      <change beforePath="$PROJECT_DIR$/.idea/deploymentTargetDropDown.xml" beforeDir="false" />
+    <list default="true" id="fa688d1c-dbee-4864-9e33-4d84ef9afca8" name="Default Changelist" comment="refs #5613 renew token">
+      <change afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/inventario/fragment/InventaryParkingFragment.kt" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/app/src/main/res/drawable/ic_inventory_parking.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/ApiSalixUtils.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/ApiSalixUtils.kt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/SalixService.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/SalixService.kt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/ajustes/fragment/AjustesFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/ajustes/fragment/AjustesFragment.kt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/ajustes/fragment/AjustesViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/ajustes/fragment/AjustesViewModel.kt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/login/model/LoginItemVO.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/login/model/LoginItemVO.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/VerdnaturaService.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/VerdnaturaService.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/inventario/fragment/InventaryViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/inventario/fragment/InventaryViewModel.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/login/fragment/LoginFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/login/fragment/LoginFragment.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/main/activity/MainActivity.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/main/activity/MainActivity.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/pasillero/fragment/PasilleroViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/pasillero/fragment/PasilleroViewModel.kt" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -100,7 +101,7 @@
   <component name="CodeInsightWorkspaceSettings">
     <option name="optimizeImportsOnTheFly" value="true" />
   </component>
-  <component name="ExecutionTargetManager" SELECTED_TARGET="device_and_snapshot_combo_box_target[G65TY9DQN7X4BIE6]" />
+  <component name="ExecutionTargetManager" SELECTED_TARGET="device_and_snapshot_combo_box_target[21114523025303]" />
   <component name="ExportToHTMLSettings">
     <option name="OPEN_IN_BROWSER" value="true" />
     <option name="OUTPUT_DIRECTORY" value="C:\Program Files\Android\Android Studio\inspections" />
@@ -259,6 +260,7 @@
     &quot;cidr.known.project.marker&quot;: &quot;true&quot;,
     &quot;com.developerphil.adbidea.selecteddevices&quot;: &quot;21114523025303&quot;,
     &quot;com.google.services.firebase.aqiPopupShown&quot;: &quot;true&quot;,
+    &quot;last_directory_selection&quot;: &quot;C:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable&quot;,
     &quot;last_opened_file_path&quot;: &quot;C:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable&quot;,
     &quot;project.structure.last.edited&quot;: &quot;Project&quot;,
     &quot;project.structure.proportion&quot;: &quot;0.17&quot;,
@@ -307,11 +309,11 @@
       <recent name="es.verdnatura.presentation.view.feature.buffer.fragment" />
     </key>
     <key name="CopyKotlinDeclarationDialog.RECENTS_KEY">
+      <recent name="es.verdnatura.presentation.view.feature.inventario.fragment" />
       <recent name="es.verdnatura.presentation.view.feature.delivery.adapters" />
       <recent name="es.verdnatura.presentation.view.feature.delivery.fragments" />
       <recent name="es.verdnatura.presentation.view.feature.packingHolland" />
       <recent name="es.verdnatura.domain" />
-      <recent name="es.verdnatura.presentation.view.feature.packaging.fragment" />
     </key>
   </component>
   <component name="RunManager" selected="Android App.app">
@@ -421,20 +423,6 @@
       <option name="presentableId" value="Default" />
       <updated>1618825571576</updated>
     </task>
-    <task id="LOCAL-00117" summary="refs #4755 añadirTickets">
-      <created>1679389331215</created>
-      <option name="number" value="00117" />
-      <option name="presentableId" value="LOCAL-00117" />
-      <option name="project" value="LOCAL" />
-      <updated>1679389331215</updated>
-    </task>
-    <task id="LOCAL-00118" summary="refs #4923 previas">
-      <created>1679477988938</created>
-      <option name="number" value="00118" />
-      <option name="presentableId" value="LOCAL-00118" />
-      <option name="project" value="LOCAL" />
-      <updated>1679477988939</updated>
-    </task>
     <task id="LOCAL-00119" summary="EntrySalix">
       <created>1679575710293</created>
       <option name="number" value="00119" />
@@ -764,7 +752,21 @@
       <option name="project" value="LOCAL" />
       <updated>1687175742657</updated>
     </task>
-    <option name="localTasksCounter" value="166" />
+    <task id="LOCAL-00166" summary="version 23.26 refs #4678">
+      <created>1687877123851</created>
+      <option name="number" value="00166" />
+      <option name="presentableId" value="LOCAL-00166" />
+      <option name="project" value="LOCAL" />
+      <updated>1687877123851</updated>
+    </task>
+    <task id="LOCAL-00167" summary="refs #5613 renew token">
+      <created>1688103597824</created>
+      <option name="number" value="00167" />
+      <option name="presentableId" value="LOCAL-00167" />
+      <option name="project" value="LOCAL" />
+      <updated>1688103597825</updated>
+    </task>
+    <option name="localTasksCounter" value="168" />
     <servers />
   </component>
   <component name="Vcs.Log.History.Properties">
@@ -865,8 +867,6 @@
   </component>
   <component name="VcsManagerConfiguration">
     <option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
-    <MESSAGE value="refs #4902 retrocompatibilidad etd-eta" />
-    <MESSAGE value="refs #5071 summaryFragment" />
     <MESSAGE value="refs #4678 Carga/descarga" />
     <MESSAGE value="refs #5675 fallo parking" />
     <MESSAGE value="refs #5618 traducciones" />
@@ -890,14 +890,16 @@
     <MESSAGE value="Actualizaciones" />
     <MESSAGE value="refs #5339" />
     <MESSAGE value="refs #4678" />
-    <option name="LAST_COMMIT_MESSAGE" value="refs #4678" />
+    <MESSAGE value="version 23.26 refs #4678" />
+    <MESSAGE value="refs #5613 renew token" />
+    <option name="LAST_COMMIT_MESSAGE" value="refs #5613 renew token" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
       <breakpoints>
         <line-breakpoint type="kotlin-function">
           <url>file://$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/VerdnaturaService.kt</url>
-          <line>865</line>
+          <line>871</line>
           <properties class="es.verdnatura.domain.VerdnaturaService" method="route_getExpeditionSummary">
             <option name="WATCH_EXIT" value="false" />
           </properties>
@@ -908,6 +910,11 @@
           <line>457</line>
           <option name="timeStamp" value="3" />
         </line-breakpoint>
+        <line-breakpoint enabled="true" type="kotlin-line">
+          <url>file://$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/login/fragment/LoginViewModel.kt</url>
+          <line>525</line>
+          <option name="timeStamp" value="6" />
+        </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
     <pin-to-top-manager>
diff --git a/app/src/main/java/es/verdnatura/domain/VerdnaturaService.kt b/app/src/main/java/es/verdnatura/domain/VerdnaturaService.kt
index 3b93b9eb..0a442d68 100644
--- a/app/src/main/java/es/verdnatura/domain/VerdnaturaService.kt
+++ b/app/src/main/java/es/verdnatura/domain/VerdnaturaService.kt
@@ -33,6 +33,7 @@ import es.verdnatura.presentation.view.feature.workermistake.model.MistakeWorker
 import es.verdnatura.presentation.view.feature.workermistake.model.WorkerFromMistake
 import retrofit2.Call
 import retrofit2.http.Body
+import retrofit2.http.GET
 import retrofit2.http.Header
 import retrofit2.http.POST
 
@@ -363,6 +364,11 @@ interface VerdnaturaService {
     ):
             Call<Any>
 
+    @GET("almacennew/itemShelving_inventory")//REVISADA
+    fun itemShelving_inventory(
+        @Body vararg params: Any
+    ):
+            Call<Any>
     @POST("almacennew/mistakeType")//REVISADA
     fun mistakeType(
     ):
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/inventario/fragment/InventaryParkingFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/inventario/fragment/InventaryParkingFragment.kt
new file mode 100644
index 00000000..5eca2342
--- /dev/null
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/inventario/fragment/InventaryParkingFragment.kt
@@ -0,0 +1,1046 @@
+package es.verdnatura.presentation.view.feature.inventario.fragment
+
+import android.annotation.SuppressLint
+import android.content.Context
+import android.graphics.drawable.Drawable
+import android.media.MediaPlayer
+import android.os.Build
+import android.os.Bundle
+import android.view.View
+import android.view.View.GONE
+import android.view.View.VISIBLE
+import android.view.inputmethod.EditorInfo
+import android.widget.ImageView
+import android.widget.Toast
+import androidx.annotation.RequiresApi
+import androidx.lifecycle.Observer
+import androidx.recyclerview.widget.LinearLayoutManager
+import es.verdnatura.R
+import es.verdnatura.databinding.FragmentUbicadorBinding
+import es.verdnatura.domain.notNull
+import es.verdnatura.domain.toInt
+import es.verdnatura.domain.toast
+import es.verdnatura.presentation.base.BaseFragment
+import es.verdnatura.presentation.common.*
+import es.verdnatura.presentation.view.component.*
+import es.verdnatura.presentation.view.feature.main.activity.MainActivity
+import es.verdnatura.presentation.view.feature.pasillero.model.PasillerosItemVO
+import es.verdnatura.presentation.view.feature.ubicador.adapter.UbicadorAdapter
+import es.verdnatura.presentation.view.feature.ubicador.fragment.UbicadorViewModel
+import es.verdnatura.presentation.view.feature.ubicador.model.ItemUbicadorVO
+import java.lang.Boolean.TRUE
+
+
+@Suppress("UNUSED_ANONYMOUS_PARAMETER")
+class InventaryParkingFragment(
+    var shelvingFk: String = "",
+    var isAutoSelf: Boolean
+) : BaseFragment<FragmentUbicadorBinding, UbicadorViewModel>(
+    UbicadorViewModel::class
+) {
+
+    private var adapter: UbicadorAdapter? = null
+    private lateinit var customDialogInput: CustomDialogInput
+    private lateinit var customDialogUbicador: CustomDialogUbicador
+    private lateinit var customDialogTwoButtons: CustomDialogTwoButtons
+    private lateinit var customDialogThreeButtons: CustomDialogThreeButtons
+    private var listItems: MutableList<ItemUbicadorVO> = mutableListOf()
+    private var listLocalItems: ArrayList<ItemUbicadorVO> = ArrayList()
+    private lateinit var customDialog: CustomDialog
+    private var deep: Int = 1
+    private var parking: String = ""
+    private var etiquetas: String = "0"
+    private var pasillerosItemClickListener: OnPasillerosItemClickListener? = null
+    private var isShelvinLogfromMainScreen = false
+    private var modeCheckUbication = false
+    private var itemScannedScreen = 0
+    var mperror: MediaPlayer? = null
+    var mpok: MediaPlayer? = null
+    var isBack = false
+
+
+    companion object {
+        fun newInstance(entryPoint: String, autoSelf: Boolean = false) =
+            InventaryParkingFragment(entryPoint, autoSelf)
+    }
+
+    override fun getLayoutId(): Int = R.layout.fragment_ubicador
+    override fun onPause() {
+        super.onPause()
+        isBack = true
+    }
+
+    override fun onAttach(context: Context) {
+        if (context is OnPasillerosItemClickListener) pasillerosItemClickListener = context
+        super.onAttach(context)
+    }
+
+    @RequiresApi(Build.VERSION_CODES.O)
+    override fun init() {
+
+        customDialogInput = CustomDialogInput(requireContext())
+        customDialog = CustomDialog(requireContext())
+        customDialogUbicador = CustomDialogUbicador(requireContext())
+        customDialogTwoButtons = CustomDialogTwoButtons(requireContext())
+
+        ma.hideBottomNavigation(GONE)
+        binding.mainToolbar.toolbarTitle.text = if (!isAutoSelf) {
+            getString(R.string.locator)
+        } else {
+            getString(R.string.selfConsumption)
+        }
+        setEvents()
+        setToolBar()
+        if (!shelvingFk.isNullOrEmpty()) {
+            isShelvinLogfromMainScreen = false
+            binding.splashProgress.visibility = VISIBLE
+            binding.mainToolbar.toolbarTitle.text = shelvingFk
+            viewModel.itemShelvingList(shelvingFk)
+        } else {
+            isShelvinLogfromMainScreen = true
+
+        }
+
+        super.init()
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        mperror = MediaPlayer.create((activity as MainActivity), R.raw.error)
+        mpok = MediaPlayer.create((activity as MainActivity), R.raw.ok)
+        super.onCreate(savedInstanceState)
+    }
+
+    @RequiresApi(Build.VERSION_CODES.O)
+    private fun setToolBar() {
+
+        val listIcons: ArrayList<ImageView> = ArrayList()
+        val iconAdd = ImageView(context)
+        iconAdd.setImageResource(R.drawable.ic_add_black_24dp)
+        val iconReload = ImageView(context)
+        iconReload.setImageResource(R.drawable.ic_autorenew_black_24dp)
+        //Tarea#5052
+        val iconReset = ImageView(context)
+        iconReset.setImageResource(R.drawable.ic_remove_checks)
+
+        //Tarea#5052
+        binding.mainToolbar.switchButton.visibility = VISIBLE
+        binding.mainToolbar.switchButton.setOnCheckedChangeListener { buttonView, isChecked ->
+            if (binding.mainToolbar.toolbarTitle.text == getString(R.string.titleUbicator)) {
+                ma.messageWithSound(getString(R.string.scanShelving), false, false)
+                binding.mainToolbar.switchButton.isChecked = false
+            } else {
+                modeCheckUbication = isChecked
+                binding.mainToolbar.switchButton.tooltipText = if (isChecked)
+                    getString(R.string.activateModoChecking) else
+                    getString(R.string.allowCheckingMode)
+                binding.textinputlayoutMatricula.hint =
+                    if (isChecked) getString(R.string.scanItem) else {
+                        getString(R.string.scanPlate)
+                    }
+                if (!isChecked) {
+                    listLocalItems.clear()
+                }
+            }
+        }
+
+        val iconChecker = ImageView(context)
+        iconChecker.setImageResource(R.drawable.ic_ubicator_check)
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            iconReload.tooltipText = getTooltip(R.drawable.ic_autorenew_black_24dp)
+            iconAdd.tooltipText = getString(R.string.addItemShelving)
+            iconChecker.tooltipText = getTooltip(R.drawable.ic_ubicator_check)
+
+        }
+        listIcons.add(iconAdd)
+        listIcons.add(iconReload)
+        //listIcons.add(iconChecker)
+        //tarea 5713
+        //listIcons.add(iconReset)
+
+
+        binding.mainToolbar.toolbarIcons.adapter =
+            ToolBarAdapterTooltip(listIcons, object : OnOptionsSelectedListener {
+                override fun onOptionsItemSelected(item: Drawable) {
+
+                    when (item) {
+                        iconAdd.drawable -> showAddItem(
+                            "",
+                            "",
+                            "",
+                            "",
+                            false,
+                            ItemUbicadorVO(0),
+                            ""
+                        )
+                        iconReload.drawable -> {
+
+                            if (!shelvingFk.isNullOrEmpty()) {
+                                binding.editPrioridad.setText("")
+                                binding.splashProgress.visibility = VISIBLE
+                                viewModel.itemShelvingList(
+                                    shelvingFk
+                                )
+                            } else {
+                                getString(R.string.scanShelving).toast(
+                                    requireActivity(),
+                                    Toast.LENGTH_SHORT
+                                )
+                            }
+                        }
+                        iconChecker.drawable -> {
+                            if (!shelvingFk.isNullOrEmpty()) {
+                                ma.onPasillerosItemClickListener(
+                                    PasillerosItemVO(title = getString(R.string.titleChecker)),
+                                    entryPoint = shelvingFk
+                                )
+                            } else {
+                                getString(R.string.scanShelving).toast(
+                                    requireActivity(),
+                                    Toast.LENGTH_SHORT
+                                )
+                            }
+                        }
+                        iconReset.drawable->{
+                            customDialog.setTitle(getString(R.string.checkItemShelvingDescrip))
+                                .setDescription(getString(R.string.checkItemShelving))
+                                .setOkButton(getString(R.string.cancel)) {
+                                    customDialog.dismiss()
+                                }
+                                .setKoButton(getString(R.string.ok)) {
+                                    customDialog.dismiss()
+
+                                }
+                                .show()
+                        }
+                    }
+
+                }
+
+            })
+        binding.mainToolbar.toolbarIcons.layoutManager =
+            LinearLayoutManager(requireContext(), LinearLayoutManager.HORIZONTAL, false)
+    }
+
+    @RequiresApi(Build.VERSION_CODES.O)
+    @SuppressLint("SetTextI18n")
+    private fun setEvents() {
+        binding.mainToolbar.backButton.setOnClickListener {
+            requireActivity().onBackPressed()
+        }
+
+        setTooltips()
+        binding.editMatricula.requestFocus()
+        binding.editMatricula.setOnEditorActionListener { v, actionId, event ->
+            if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0 || actionId == 5) {
+                if (!binding.editMatricula.text.toString().isNullOrEmpty()) {
+
+
+                    /*Tarea 5336 */
+                    if (!modeCheckUbication || (modeCheckUbication && binding.editMatricula.text.toString().length == 3 && !binding.editMatricula.text!![0].isDigit())) {
+                        binding.mainToolbar.toolbarTitle.text =
+                            binding.editMatricula.text.toString()
+                        shelvingFk = binding.editMatricula.text.toString()
+                        parking = ""
+                        binding.editPrioridad.setText("")
+                        binding.splashProgress.visibility = VISIBLE
+                        isShelvinLogfromMainScreen = true
+                        viewModel.itemShelvingList(
+                            binding.editMatricula.text.toString()
+                        )
+                    } else {
+
+                        /*Tarea#5109*/
+                        /*viewModel.getIdFromCode(
+                            code = binding.editMatricula.text.toString()
+                        )*/
+                        try {
+                            binding.splashProgress.visibility = VISIBLE
+                            viewModel.getIdFromCode(
+                                code = itemScanValue(
+                                    binding.editMatricula.text.toString(),
+                                    "buy",
+                                    "more"
+                                ).toString()
+                            )
+                        } catch (Ex: Exception) {
+                            ma.messageWithSound(Ex.message.toString(), true, true)
+                        }
+
+                    }
+                }
+                binding.editMatricula.setText("")
+                ma.hideKeyboard(binding.editMatricula)
+                return@setOnEditorActionListener true
+            }
+
+            return@setOnEditorActionListener false
+        }
+
+        binding.editPrioridad.setOnEditorActionListener { v, actionId, event ->
+            if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0 || actionId == 5) {
+                if (!binding.editPrioridad.text.toString().isNullOrEmpty()) {
+                    binding.splashProgress.visibility = VISIBLE
+                    viewModel.shelvingPriorityUpdate(
+                        binding.editPrioridad.toInt(),
+                        shelvingFk
+                    )
+
+                }
+                ma.hideKeyboard(binding.editPrioridad)
+            }
+
+            binding.editMatricula.requestFocus()
+            return@setOnEditorActionListener false
+        }
+
+
+        binding.automaticImg.setOnClickListener {
+            if (!shelvingFk.isNullOrEmpty())
+
+                ma.onPasillerosItemClickListener(
+                    PasillerosItemVO(title = getString(R.string.titleAuto)),
+                    //PasillerosItemVO(title = getString(R.string.titleChecker)),
+                    entryPoint = shelvingFk
+                )
+            else
+                getString(R.string.scanShelving).toast(requireActivity(), Toast.LENGTH_SHORT)
+        }
+
+        binding.parkingImg.setOnClickListener {
+            customDialogInput.setTitle(getString(R.string.parkingShelving)).setValue("")
+                .setOkButton(
+                    getString(
+                        R.string.parking
+                    )
+                ) {
+                    viewModel.shelvingPark(
+                        shelvingFk,
+                        customDialogInput.getValue()
+                    )
+                    parking = customDialogInput.getValue()
+                    binding.mainToolbar.toolbarTitle.text =
+                        shelvingFk.uppercase() + getString(R.string.pUppercase) + parking + getString(
+                            R.string.label
+                        ) + etiquetas
+                    customDialogInput.dismiss()
+                }.setKoButton(getString(R.string.cancel)) {
+                    customDialogInput.dismiss()
+                }.show()
+
+            customDialogInput.getEditText().requestFocus()
+            ma.hideKeyboard(customDialogInput.getEditText())
+
+            customDialogInput.getEditText().setOnEditorActionListener { v, actionId, event ->
+                if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0) {
+                    viewModel.shelvingPark(
+                        shelvingFk,
+                        customDialogInput.getValue()
+                    )
+                    customDialogInput.dismiss()
+                    parking = customDialogInput.getValue()
+                    binding.mainToolbar.toolbarTitle.text =
+                        shelvingFk.uppercase() + getString(R.string.pUppercase) + parking + getString(
+                            R.string.label
+                        ) + etiquetas
+
+
+                    return@setOnEditorActionListener true
+                }
+                false
+            }
+
+        }
+
+        binding.editImg.setOnClickListener {
+            customDialogInput.setTitle(getString(R.string.changeShelving)).setValue("")
+                .setOkButton(getString(R.string.save)) {
+                    viewModel.shelvingChange(
+                        shelvingFk,
+                        customDialogInput.getValue()
+                    )
+                    shelvingFk = customDialogInput.getValue()
+                    binding.mainToolbar.toolbarTitle.text =
+                        shelvingFk.uppercase() + getString(R.string.pUppercase) + parking + getString(
+                            R.string.label
+                        ) + etiquetas
+                    if (mpok != null) mpok!!.start()
+                    customDialogInput.dismiss()
+                }.setKoButton(getString(R.string.cancel)) {
+                    customDialogInput.dismiss()
+                }.show()
+
+            customDialogInput.getEditText().requestFocus()
+            ma.hideKeyboard(customDialogInput.getEditText())
+
+            customDialogInput.getEditText().setOnEditorActionListener { v, actionId, event ->
+                if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0) {
+                    viewModel.shelvingChange(
+                        shelvingFk,
+                        customDialogInput.getValue()
+                    )
+                    shelvingFk = customDialogInput.getValue()
+                    binding.mainToolbar.toolbarTitle.text =
+                        shelvingFk.uppercase() + getString(R.string.pUppercase) + parking + getString(
+                            R.string.label
+                        ) + etiquetas
+                    if (mpok != null) mpok!!.start()
+                    customDialogInput.dismiss()
+                    return@setOnEditorActionListener true
+                }
+                false
+            }
+
+        }
+
+        binding.deleteImg.setOnClickListener {
+            customDialog.setTitle(getString(R.string.empty))
+                .setDescription(getString(R.string.operationNoReturn))
+                .setOkButton(getString(R.string.empty)) {
+                    viewModel.clearShelvingList(
+                        shelvingFk
+                    )
+                    listItems.forEach {
+                        it.stickers = "0"
+                        it.visible = "0"
+                    }
+                    if (adapter != null) {
+                        adapter!!.notifyDataSetChanged()
+                    }
+                    customDialog.dismiss()
+                }.setKoButton(getString(R.string.cancel)) {
+                    customDialog.dismiss()
+                }.show()
+
+
+        }
+
+    }
+
+    private fun checkUbications(itemScanned: Int) {
+        itemScannedScreen = itemScanned
+        val listInt: ArrayList<Int> = ArrayList()
+
+        if (listItems.filter { it.item == itemScanned }.isEmpty()) {
+            listInt.add(itemScanned)
+        } else {
+            listItems.sortedBy { it.isChecked }.forEachIndexed { index, item ->
+                if (item.item == itemScanned) {
+                    item.checked = true
+                    listInt.add(item.item)
+                    ma.messageWithSound("", false, true, "", false)
+                }
+            }
+
+        }
+        viewModel.itemShelving_addList(
+            shelvingFk,
+            "" + listInt + "",
+            TRUE,
+            getDataInt(WAREHOUSEFK)
+        )
+
+        adapter!!.notifyDataSetChanged()
+    }
+
+    private fun setTooltips() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            binding.editImg.tooltipText = getTooltip(R.drawable.ic_mode_edit_black_24dp)
+            binding.deleteImg.tooltipText = getTooltip(R.drawable.ic_delete_forever_black_24dp)
+            binding.editPrioridad.tooltipText =
+                getString(R.string.changePriority)
+            binding.parkingImg.tooltipText = getTooltip(R.drawable.ic_local_parking_black_24dp)
+            binding.automaticImg.tooltipText = getTooltip(R.drawable.ic_flash_auto_black_24dp)
+
+
+        }
+    }
+
+    @SuppressLint("SetTextI18n")
+    override fun observeViewModel() {
+
+        with(viewModel) {
+
+            loadShelvingList.observe(viewLifecycleOwner, Observer { event ->
+                event.getContentIfNotHandled().notNull {
+
+                    deep = it.list.size
+                    if (it.list.isNotEmpty() && it.list.get(0).isError) {
+                        binding.splashProgress.visibility = View.GONE
+                        ma.messageWithSound(
+                            it.list.get(0).errorMessage,
+                            it.list.get(0).isError,
+                            isPlayed = false
+                        )
+                    } else {
+                        listItems = ArrayList()
+                        var contEtiquetas = 0
+                        it.list.forEach { item ->
+                            try {
+                                contEtiquetas += item.stickers.toInt()
+                                parking = item.code.uppercase()
+                            } catch (e: Exception) {
+                            }
+
+
+                            listItems.add(item)
+
+
+                        }
+                        etiquetas = contEtiquetas.toString()
+                        binding.mainToolbar.toolbarTitle.text =
+                            shelvingFk.uppercase() + getString(R.string.pUppercase) + parking + getString(
+                                R.string.label
+                            ) + etiquetas
+                        if (it.list.size > 0)
+                            binding.editPrioridad.setText(it.list[0].priority)
+                        binding.splashProgress.visibility = View.GONE
+
+
+                        for (item in listItems) {
+                            for (localItem in listLocalItems) {
+                                if (item.item == localItem.item) {
+                                    item.isNew = localItem.isNew
+                                    item.checked = localItem.checked
+                                    if (item.isNew && item.visible != "0") {
+                                        item.isNew = false
+                                        item.checked = true
+                                    }
+
+                                    binding.locationRecyclerview.postInvalidate()
+                                }
+
+                            }
+                        }
+
+                        if (!binding.mainToolbar.switchButton.isChecked && listItems.isNotEmpty()) {
+
+                            listItems = listItems.asReversed()
+                        }
+                        adapter = UbicadorAdapter(
+                            listItems.sortedBy { it.isChecked },
+                            onPasillerosItemClickListener = pasillerosItemClickListener!!,
+                            onVisibleClickListener = object : OnVisibleClickListener {
+                                override fun onVisibleClickListener(item: ItemUbicadorVO) {
+
+                                    if (!isAutoSelf) {
+                                        showAddItem(
+                                            item.item.toString(),
+                                            item.packing,
+                                            item.stickers,
+                                            item.visible,
+                                            true,
+                                            item,
+                                            grouping = if (item.grouping.isNullOrEmpty()) {
+                                                ""
+                                            } else item.grouping
+                                        )
+
+                                    } else {
+
+                                        showAutoSelfConsumption(item)
+                                    }
+
+                                }
+
+                            },
+                            onMoreClickListener = object : OnMoreClickListener {
+                                override fun onMoreClickListener(item: ItemUbicadorVO) {
+                                    showMoreOptions(item)
+                                }
+
+                            })
+
+                        binding.locationRecyclerview.adapter = adapter
+                        binding.locationRecyclerview.layoutManager =
+                            LinearLayoutManager(
+                                requireContext(),
+                                LinearLayoutManager.VERTICAL,
+                                false
+                            )
+
+                        if (isShelvinLogfromMainScreen) {
+                            viewModel.shelvinLog_add(shelvingFk)
+
+                        }
+                        if (modeCheckUbication) {
+                            listItems.sortedBy { it.isChecked }.forEachIndexed { index, item ->
+                                if (item.item == itemScannedScreen) {
+                                    binding.locationRecyclerview.scrollToPosition(index)
+                                }
+                            }
+
+                        } else {
+                            (binding.locationRecyclerview.layoutManager as LinearLayoutManager).scrollToPosition(
+                                0
+                            )
+                        }
+                    }
+                }
+            })
+            loadAddList.observe(viewLifecycleOwner) { event ->
+                event.getContentIfNotHandled().notNull {
+                    binding.splashProgress.visibility = GONE
+                    if (it.isError) {
+                        ma.messageWithSound(it.errorMessage, it.isError, false)
+
+                    } else {
+                        binding.splashProgress.visibility = VISIBLE
+                        viewModel.itemShelvingList(shelvingFk)
+
+                    }
+                }
+            }
+            /* responseAddList.observe(viewLifecycleOwner, Observer {
+                 binding.splashProgress.visibility = GONE
+                 if (it.isError) {
+                     ma.messageWithSound(it.errorMessage, it.isError, false)
+
+                 } else {
+                     binding.splashProgress.visibility = VISIBLE
+                     viewModel.itemShelvingList(shelvingFk)
+
+                 }
+             })*/
+            response.observe(viewLifecycleOwner, Observer {
+
+                if (it.isError) {
+                    binding.splashProgress.visibility = GONE
+                    ma.messageWithSound(it.errorMessage, it.isError, true)
+
+
+                } else {
+                    viewModel.itemShelvingList(shelvingFk)
+                    ma.messageWithSound("", it.isError, true, isToasted = false)
+
+                }
+            })
+            responseLog.observe(viewLifecycleOwner, Observer {
+
+                if (it.isError) {
+                    ma.messageWithSound(it.errorMessage, it.isError, false)
+
+
+                } else {
+                    isShelvinLogfromMainScreen = false
+
+                }
+            })
+            loadResponseCode.observe(viewLifecycleOwner) { event ->
+                event.getContentIfNotHandled().notNull {
+                    binding.splashProgress.visibility = GONE
+                    if (it.isError) {
+                        ma.messageWithSound(it.errorMessage, it.isError, false)
+
+                    } else {
+                        if (it.response != "0") {
+                            checkUbications(it.response.toInt())
+                        } else {
+                            ma.messageWithSound(getString(R.string.labelNovalid), true, true)
+                        }
+                    }
+                }
+            }
+            /* responseCode.observe(viewLifecycleOwner, Observer {
+                 binding.splashProgress.visibility = GONE
+                 if (it.isError) {
+                     ma.messageWithSound(it.errorMessage, true, true)
+                 } else {
+                     if (it.response!="0") {checkUbications(it.response.toInt())}else{
+                         ma.messageWithSound(getString(R.string.labelNovalid), true, true)
+                     }
+                 }
+
+
+             })*/
+            responsepriority.observe(viewLifecycleOwner, Observer {
+                if (!isBack) {
+                    binding.splashProgress.visibility = GONE
+                    ma.messageWithSound(
+                        if (it.isError) it.errorMessage else {
+                            getString(R.string.priorityChanged)
+                        }, it.isError, true
+                    )
+                }
+                isBack = false
+
+            })
+
+            responseMake.observe(viewLifecycleOwner, Observer {
+                binding.splashProgress.visibility = GONE
+                if (it.isError) {
+                    ma.messageWithSound(it.errorMessage, true, true, isToasted = true)
+                } else {
+                    if (!shelvingFk.isNullOrEmpty()) {
+
+                        binding.mainToolbar.toolbarTitle.text = shelvingFk
+                        binding.splashProgress.visibility = VISIBLE
+                        viewModel.itemShelvingList(
+                            shelvingFk
+                        )
+
+                    }
+                }
+            })
+        }
+
+    }
+
+    private fun showAutoSelfConsumption(item: ItemUbicadorVO) {
+
+        customDialogInput.setInputText()
+        customDialogInput.setTitle(getString(R.string.selfConsumption))
+        customDialogInput.setDescription(getString(R.string.quantityTake))
+            .setValue("")
+            .setOkButton(getString(R.string.take)) {
+                try {
+                    if (customDialogInput.getValue().toInt() > 0) {
+                        binding.splashProgress.visibility = VISIBLE
+                        var quantity =
+                            if (item.visible.toInt() - customDialogInput.getValue().toInt() > 0) {
+                                item.visible.toInt() - customDialogInput.getValue().toInt()
+                            } else {
+                                0
+                            }
+                        viewModel.itemShelving_selfConsumption(
+                            shelvingFk,
+                            item.item,
+                            quantity
+                        )
+                    } else {
+                        throw Exception("")
+                    }
+                } catch (err: Exception) {
+                    (getString(R.string.errorQuantity).toast(requireContext()))
+                }
+                customDialogInput.dismiss()
+
+            }.setKoButton(getString(R.string.cancel)) {
+                customDialogInput.dismiss()
+            }.show()
+        customDialogInput.setFocusText()
+    }
+
+
+    private fun showAddItem(
+        itemFk: String,
+        packing: String,
+        etiquetas: String,
+        visible: String,
+        delete: Boolean,
+        itemUbicador: ItemUbicadorVO,
+        grouping: String
+    ) {
+        var title = getString(R.string.newItem)
+        if (delete) title = getString(R.string.editItem) + itemFk
+        customDialogUbicador.setTitle(title).setItemValue(itemFk).setPackingValue(packing)
+            .setGroupingValue(grouping).setEtiquetaValue(etiquetas).setVisibleValue(visible)
+            .setOkButton(getString(R.string.save)) {
+                var packingUpdate = false
+                if (packing != customDialogUbicador.getPackingValue() || etiquetas != customDialogUbicador.getEtiquetaValue()) {
+                    packingUpdate = true
+                }
+                saveNewItem(
+                    customDialogUbicador.getItemValue().toInt(),
+                    if (customDialogUbicador.getEtiquetaValue().isNullOrEmpty()) {
+                        1
+                    } else {
+                        customDialogUbicador.getEtiquetaValue().toInt()
+                    },
+                    if (customDialogUbicador.getPackingValue().isNullOrEmpty()) {
+                        null
+                    } else {
+                        customDialogUbicador.getPackingValue().toInt()
+                    },
+                    if (customDialogUbicador.getVisibleValue().isNullOrEmpty()) {
+                        null
+                    } else {
+                        customDialogUbicador.getVisibleValue().toInt()
+                    },
+                    if (delete) packingUpdate else null,
+                    itemUbicador.id,
+                    if (customDialogUbicador.getGroupingValue().isNullOrEmpty()) {
+                        null
+                    } else {
+                        customDialogUbicador.getGroupingValue().toInt()
+                    }
+                )
+            }.setKoButton(getString(R.string.close)) {
+                customDialogUbicador.dismiss()
+            }.show()
+
+        customDialogUbicador.getEditItem().requestFocus()
+        ma.hideKeyboard(customDialogUbicador.getEditItem())
+
+        customDialogUbicador.getVisibleItem().setOnEditorActionListener { v, actionId, event ->
+            if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0) {
+                var packingUpdate = false
+                if (packing != customDialogUbicador.getPackingValue() || etiquetas != customDialogUbicador.getEtiquetaValue()) {
+                    packingUpdate = true
+                }
+                saveNewItem(
+                    customDialogUbicador.getItemValue().toInt(),
+                    customDialogUbicador.getEtiquetaValue().toInt(),
+                    if (customDialogUbicador.getPackingValue().isNullOrEmpty()) {
+                        null
+                    } else {
+                        customDialogUbicador.getPackingValue().toInt()
+                    },
+                    if (customDialogUbicador.getVisibleValue().isNullOrEmpty()) {
+                        null
+                    } else {
+                        customDialogUbicador.getVisibleValue().toInt()
+                    },
+                    if (delete) packingUpdate else null,
+                    itemUbicador.id,
+                    customDialogUbicador.getGroupingValue().toInt()
+                )
+                return@setOnEditorActionListener true
+            }
+            false
+        }
+
+        customDialogUbicador.getEditItem().setOnEditorActionListener { v, actionId, event ->
+            if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0) {
+
+                if (!customDialogUbicador.getItemValue().isNullOrEmpty()) {
+                    try {
+
+                        customDialogUbicador.setItemValue(
+                            itemScanValue(
+                                customDialogUbicador.getItemValue(),
+                                "buy",
+                                "more"
+                            ).toString()
+                        )
+
+                    } catch (ex: Exception) {
+                        ma.messageWithSound(ex.message.toString(), true, true)
+                        customDialogUbicador.setItemValue("")
+                    }
+                }
+
+                return@setOnEditorActionListener true
+            }
+
+            customDialogUbicador.getPackingItem().requestFocus()
+        }
+
+        customDialogUbicador.getEtiquetaItem().setOnEditorActionListener { v, actionId, event ->
+            if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0) {
+                var packingUpdate = false
+                if (packing != customDialogUbicador.getPackingValue() || etiquetas != customDialogUbicador.getEtiquetaValue()) {
+                    packingUpdate = true
+                }
+                saveNewItem(
+                    customDialogUbicador.getItemValue().toInt(),
+                    customDialogUbicador.getEtiquetaValue().toInt(),
+                    if (customDialogUbicador.getPackingValue().isNullOrEmpty()) {
+                        null
+                    } else {
+                        customDialogUbicador.getPackingValue().toInt()
+                    },
+                    if (customDialogUbicador.getVisibleValue().isNullOrEmpty()) {
+                        null
+                    } else {
+                        customDialogUbicador.getVisibleValue().toInt()
+                    },
+                    if (delete) packingUpdate else null,
+                    itemUbicador.id,
+                    if (customDialogUbicador.getGroupingValue().isNullOrEmpty()) {
+                        null
+                    } else {
+                        customDialogUbicador.getGroupingValue().toInt()
+                    }
+                )
+                return@setOnEditorActionListener true
+            }
+            false
+        }
+
+    }
+
+    private fun saveNewItem(
+        itemFk: Int?,
+        etiquetas: Int,
+        packing: Int?,
+        visible: Int?,
+        updatePacking: Boolean? = null,
+        itemShelvingFk: Int,
+        groupingPack: Int?
+    ) {
+        if (packing != null) {
+            if (updatePacking == null) {
+                if (itemFk != null && visible != null) {
+
+                    binding.splashProgress.visibility = VISIBLE
+                    viewModel.itemShelvingMake(
+                        shelvingFk,
+                        itemFk,
+                        visible,
+                        packing,
+                        getDataInt(WAREHOUSEFK),
+                        groupingPack
+                    )
+
+                    customDialogUbicador.setItemValue("").setPackingValue("")
+                        .setGroupingValue("")
+                        .setEtiquetaValue("").setVisibleValue("")
+                    customDialogUbicador.getEditItem().requestFocus()
+                    ma.hideKeyboard(customDialogUbicador.getEditItem())
+                    customDialogUbicador.dismiss()
+
+                } else if (itemFk != null && etiquetas != null) {
+                    val visible_calc = (etiquetas * packing!!.toInt())
+                    binding.splashProgress.visibility = VISIBLE
+                    viewModel.itemShelvingMake(
+                        shelving = shelvingFk,
+                        item = itemFk,
+                        quantity = visible_calc,
+                        packing = packing,
+                        warehouse = getDataInt(WAREHOUSEFK),
+                        grouping = groupingPack
+                    )
+
+                    customDialogUbicador.setItemValue("").setPackingValue("")
+                        .setGroupingValue("")
+                        .setEtiquetaValue("").setVisibleValue("")
+                    customDialogUbicador.getEditItem().requestFocus()
+                    ma.hideKeyboard(customDialogUbicador.getEditItem())
+                    customDialogUbicador.dismiss()
+
+                } else {
+                    getString(R.string.fillFields).toast(
+                        (activity as MainActivity),
+                        Toast.LENGTH_LONG
+                    )
+                }
+            } else {
+                if (itemFk != null && visible != null && !updatePacking) {
+                    binding.splashProgress.visibility = VISIBLE
+                    viewModel.itemShelvingMakeEdit(
+                        visible,
+                        packing!!.toInt(),
+                        itemShelvingFk,
+                        groupingPack
+
+                    )
+
+                    customDialogUbicador.setItemValue("").setPackingValue("")
+                        .setGroupingValue("")
+                        .setEtiquetaValue("").setVisibleValue("")
+                    customDialogUbicador.getEditItem().requestFocus()
+                    ma.hideKeyboard(customDialogUbicador.getEditItem())
+                    customDialogUbicador.dismiss()
+
+                } else if (itemFk != null && etiquetas != null && updatePacking) {
+                    var visible_calc = 0
+                    try {
+                        visible_calc = (etiquetas * packing.toInt())
+                    } catch (e: Exception) {
+                    }
+                    binding.splashProgress.visibility = VISIBLE
+                    viewModel.itemShelvingMakeEdit(
+                        visible_calc,
+                        packing.toInt(),
+                        itemShelvingFk,
+                        groupingPack
+
+                    )
+
+                    customDialogUbicador.setItemValue("").setPackingValue("")
+                        .setGroupingValue("")
+                        .setEtiquetaValue("").setVisibleValue("")
+                    customDialogUbicador.getEditItem().requestFocus()
+                    ma.hideKeyboard(customDialogUbicador.getEditItem())
+                    customDialogUbicador.dismiss()
+
+                } else {
+                    getString(R.string.fillFields).toast(
+                        (activity as MainActivity),
+                        Toast.LENGTH_LONG
+                    )
+                }
+            }
+
+        } else {
+            getString(R.string.mandatoryPacking).toast(
+                (activity as MainActivity),
+                Toast.LENGTH_LONG
+            )
+        }
+    }
+
+    private fun showMoreOptions(item: ItemUbicadorVO) {
+        customDialogTwoButtons.setTitle(item.item.toString())
+            .setDescription(getString(R.string.selectAction))
+            .setOkButton(getString(R.string.transfer)) {
+                customDialogInput.setTitle(getString(R.string.shelvingNew))
+                    .setDescription(getString(R.string.selectDestiny) + item.item).setValue("")
+                    .setOkButton(getString(R.string.transfer)) {
+                        if (customDialogInput.getValue().isNotEmpty()) {
+                            binding.splashProgress.visibility = VISIBLE
+                            viewModel.itemShelvingTransfer(
+                                item.id,
+                                customDialogInput.getValue()
+                            )
+                            listItems.remove(item)
+                            adapter!!.notifyDataSetChanged()
+                            customDialogInput.dismiss()
+                        } else {
+                            getString(R.string.wagonIncorrect).toast(requireContext())
+
+                        }
+
+                    }.setKoButton(getString(R.string.cancel)) {
+                        customDialogInput.dismiss()
+                    }.show()
+                customDialogInput.getEditText().requestFocus()
+                ma.hideKeyboard(customDialogInput.getEditText())
+                customDialogInput.getEditText()
+                    .setOnEditorActionListener { v, actionId, event ->
+                        if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0) {
+                            viewModel.itemShelvingTransfer(
+                                item.id,
+                                customDialogInput.getValue()
+                            )
+                            listItems.remove(item)
+                            adapter!!.notifyDataSetChanged()
+                            customDialogInput.dismiss()
+                            return@setOnEditorActionListener true
+                        }
+                        false
+                    }
+                customDialogTwoButtons.dismiss()
+            }.setOkButtonTwo(getString(R.string.delete)) {
+                customDialog.setTitle(getString(R.string.confirm))
+                    .setDescription(
+                        if (!isAutoSelf) {
+                            getString(R.string.itemDeleteConfirm) + item.item + "?"
+                        } else {
+                            getString(R.string.deleteQuantity) + item.item
+                        }
+                    )
+                    .setOkButton(getString(R.string.delete)) {
+                        if (!isAutoSelf) {
+                            listItems.remove(item)
+                            adapter!!.notifyDataSetChanged()
+                            viewModel.itemShelvingDelete(
+                                item.id
+                            )
+                            customDialogTwoButtons.dismiss()
+                            customDialog.dismiss()
+                        } else {
+                            viewModel.itemShelving_selfConsumption(shelvingFk, item.item, 0)
+                        }
+                    }.setKoButton(getString(R.string.cancel)) {
+                        customDialog.dismiss()
+                        customDialogTwoButtons.dismiss()
+                    }.show()
+
+            }.setKoButton(getString(R.string.cancel)) {
+                customDialogTwoButtons.dismiss()
+            }.show()
+    }
+}
+
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/inventario/fragment/InventaryViewModel.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/inventario/fragment/InventaryViewModel.kt
index d3c41183..78cd014a 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/inventario/fragment/InventaryViewModel.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/inventario/fragment/InventaryViewModel.kt
@@ -362,6 +362,32 @@ class InventaryViewModel(val context: Context) : BaseViewModel(context) {
             })
     }
 
+    fun inventoryParking(
+        vParkingFromFk: Int,
+        vParkingToFk: Int
+    ) {
+        silex.itemShelving_inventory(vParkingFromFk, vParkingToFk)
+            .enqueue(object :
+                SilexCallback<Any>(context) {
+                override fun onError(t: Throwable) {
+                    _responseAddMistake.value = ResponseItemVO(
+                        isError = true,
+                        errorMessage = getMessageFromAllResponse(nameofFunction(this), t.message!!)
+                    )
+                }
+
+                override fun onSuccess(response: Response<Any>) {
+
+                    // sergio:refactor:solo debería haber un mensaje no un response o errorMessage
+                    _responseAddMistake.value =
+                        ResponseItemVO(
+                            isError = false,
+                            response = response.message()
+                        )
+                }
+            })
+    }
+
     fun expeditionMistakeType_get() {
        silex.expeditionMistakeType_get()
             .enqueue(object : SilexCallback<List<MistakeWorkerType>>(context) {
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/login/fragment/LoginFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/login/fragment/LoginFragment.kt
index 7eae2836..f1a0d954 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/login/fragment/LoginFragment.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/login/fragment/LoginFragment.kt
@@ -520,10 +520,11 @@ class LoginFragment(var imageUri: Uri?) :
                     //saveTokenPref("RTymwJzRuVchAMY5u8xG2wpgcjPf7t0DQImLvMsTdNFmbFwDiVsa8lA6fr1XSaBo","2026-29-06")
                     // local
                     //saveTokenPref("rpG3yNMdViFYDh1sZfeYRCUmuHZYmKW5EqzwHkckj0zFbszSZGTWbs8xNETHyvuw","2026-29-06")
-                    /* saveUserAccesPref(
+                    //Tarea 5613 borrar que se guarde
+                   saveUserAccesPref(
                          binding.edittextUsername.text.toString(),
                          binding.edittextPassword.text.toString()
-                     )*/
+                     )
                     app.userName = binding.edittextUsername.text.toString()
                     app.userPassword = binding.edittextPassword.text.toString()
                     setupFirebase(app.userName!!)
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/pasillero/fragment/PasilleroViewModel.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/pasillero/fragment/PasilleroViewModel.kt
index 10deec55..452dfc40 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/pasillero/fragment/PasilleroViewModel.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/pasillero/fragment/PasilleroViewModel.kt
@@ -133,7 +133,7 @@ class PasilleroViewModel(context: Context) : BaseViewModel(context) {
 
 
         //Tarea 5651
-    /*  _pasillerositem.add(
+     _pasillerositem.add(
             PasillerosItemVO(
                 1,
                 R.drawable.ic_advance_ticket,
@@ -143,7 +143,7 @@ class PasilleroViewModel(context: Context) : BaseViewModel(context) {
                     R.string.ticketAdvanceDescrip
                 )
             )
-        )*/
+        )
 
 
         _pasillerositem.add(
@@ -169,6 +169,18 @@ class PasilleroViewModel(context: Context) : BaseViewModel(context) {
                 )
             )
         )
+        //Tarea 5891
+       /* _pasillerositem.add(
+            PasillerosItemVO(
+                3,
+                R.drawable.ic_inventory_parking,
+                contextApp.getString(R.string.titleInventoryParking),
+                R.string.titleInventoryParking,
+                contextApp.getString(
+                    R.string.titleInventoryParkingDescrip
+                )
+            )
+        )*/
 
         _pasillerositem.add(
             PasillerosItemVO(
diff --git a/app/src/main/res/drawable/ic_inventory_parking.xml b/app/src/main/res/drawable/ic_inventory_parking.xml
new file mode 100644
index 00000000..dfea5f57
--- /dev/null
+++ b/app/src/main/res/drawable/ic_inventory_parking.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960"
+    android:tint="#F7931E">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M620,801L460,641L503,598L620,715L859,476L902,519L620,801ZM840,387L780,387L780,180Q780,180 780,180Q780,180 780,180L720,180L720,270L240,270L240,180L180,180Q180,180 180,180Q180,180 180,180L180,780Q180,780 180,780Q180,780 180,780L431,780L431,840L180,840Q154,840 137,823Q120,806 120,780L120,180Q120,154 137,137Q154,120 180,120L382,120Q389,85 416.5,62.5Q444,40 480,40Q516,40 543.5,62.5Q571,85 578,120L780,120Q806,120 823,137Q840,154 840,180L840,387ZM480,180Q497,180 508.5,168.5Q520,157 520,140Q520,123 508.5,111.5Q497,100 480,100Q463,100 451.5,111.5Q440,123 440,140Q440,157 451.5,168.5Q463,180 480,180Z"/>
+</vector>