feat reservas #refs 6861

app/src/main/java/es/verdnatura/domain/SalixService.kt

@@ -646,7 +646,7 @@ interface SalixService {
         @Query("schema") schema: String = "vn"
     ): Call<Any>
 
-    @POST("Applications/itemShelvingTransfer/execute-proc")
+    @POST("Applications/itemShelving_transfer/execute-proc")
     fun itemShelvingTransfer(
         @Query("params") params: Any,
         @Query("schema") schema: String = "vn"
@@ -683,7 +683,7 @@ interface SalixService {
     ): Call<List<ItemShelvingLog>>
 
     //Tarea 7168
-    @GET("Applications/itemShelvingLogs")
+    @GET("ItemShelvingLogs")
     fun itemShelvingLogGet(
         @Query("filter") filter: String,
     ): Call<List<ItemShelvingLog>>

app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragmentPickerPreviousNew.kt

@@ -116,9 +116,8 @@ class CollectionFragmentPickerPreviousNew(
 
         mperror = MediaPlayer.create((activity as MainActivity), R.raw.error)
         mpok = MediaPlayer.create((activity as MainActivity), R.raw.ok)
-        viewModel.collectionTicketGetSalix(
-            collection.collectionFk, print = false
-        )
+        println("create onRunning")
+
         super.onCreate(savedInstanceState)
     }
 
@@ -137,6 +136,9 @@ class CollectionFragmentPickerPreviousNew(
 
         setEvents()
         setToolBar()
+        viewModel.collectionTicketGetSalix(
+            collection.collectionFk, print = false
+        )
 
         super.init()
     }
@@ -406,15 +408,15 @@ class CollectionFragmentPickerPreviousNew(
                     )
                     setTotalLines()
                 }
-                if (!it.isError) {
+                else{
                     myGroupList[positionConfirm].isPicked = 1
                     saleAdapter!!.notifyItemChanged(positionConfirm)
                     lm!!.scrollToPositionWithOffset(storedBackPosition + 1, 0)
 
                     setTotalLines()
-                    /*viewModel.collectionTicketGetSalix(
+                    viewModel.collectionTicketGetSalix(
                          collection.collectionFk, print = false
-                     )*/
+                     )
                 }
 
             }
@@ -433,7 +435,8 @@ class CollectionFragmentPickerPreviousNew(
                     "Confirmada acción", it.isError, !it.isError
                 )
             }
-            responseItemShelvingSaleUnPicked.observe(viewLifecycleOwner) {
+            loadUnpicked.observe(viewLifecycleOwner) { event ->
+                event.getContentIfNotHandled().notNull {
 
                 myGroupList[positionUnmarked].isPicked = 1
                 myGroupList[positionUnmarked].reservedQuantity = quantityConfirm
@@ -444,7 +447,7 @@ class CollectionFragmentPickerPreviousNew(
                 //saleAdapter!!.notifyDataSetChanged()
                 ma.messageWithSound(
                     "Confirmada acción", it.isError, !it.isError
-                )
+                )}
             }
             responseItemShelvingSaleGroup.observe(viewLifecycleOwner) {
 

app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionViewModel.kt

@@ -108,6 +108,9 @@ class CollectionViewModel(val context: Context) : BaseViewModel(context) {
     val responseItemShelvingSaleUnPicked: LiveData<ResponseItemVO>
         get() = _responseItemShelvingSaleUnPicked
 
+    val loadUnpicked: LiveData<Event<ResponseItemVO>> =
+        _responseItemShelvingSaleUnPicked.map { Event(it) }
+
     private val _responseCollectionAddItem by lazy { MutableLiveData<ResponseItemVO>() }
     val responseCollectionAddItem: LiveData<ResponseItemVO>
         get() = _responseCollectionAddItem
@@ -435,6 +438,7 @@ class CollectionViewModel(val context: Context) : BaseViewModel(context) {
                 } else {
                     _responseConfirmReservedItemShelvingSale.value =
                         ResponseItemVO(isError = false, response = "")
+
                 }
             }
         })

app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/SectorCollectionReserveFragment.kt

@@ -54,7 +54,7 @@ class SectorCollectionReserveFragment(
     }
 
     override fun onPause() {
-        onBack = true
+      //  onBack = true
         super.onPause()
     }
 
@@ -67,7 +67,8 @@ class SectorCollectionReserveFragment(
         setToolBar()
 
         println("reserve collec $collectionFk")
-        super.init()
+        println("reserve collec  onBack$onBack")
+
         if (!onBack) {
             println("check parkings  $collectionFk")
             checkParkingsToPicker()
@@ -81,6 +82,7 @@ class SectorCollectionReserveFragment(
                 )
             }
         }
+        super.init()
     }
 
     private fun checkParkingsToPicker() {