From f8a17deded1b501997085fde1f258fc605e694c0 Mon Sep 17 00:00:00 2001
From: Sergio De la torre <sergiodt@verdnatura.es>
Date: Tue, 27 Feb 2024 09:37:36 +0100
Subject: [PATCH] refs #6531 feat:last tickets

---
 .../java/es/verdnatura/domain/SalixService.kt | 34 ++++++++++++++++---
 .../collection/fragment/CollectionFragment.kt |  5 ++-
 2 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/es/verdnatura/domain/SalixService.kt b/app/src/main/java/es/verdnatura/domain/SalixService.kt
index c036902c..a3453e86 100644
--- a/app/src/main/java/es/verdnatura/domain/SalixService.kt
+++ b/app/src/main/java/es/verdnatura/domain/SalixService.kt
@@ -38,6 +38,7 @@ import es.verdnatura.presentation.view.feature.login.model.RenewToken
 import es.verdnatura.presentation.view.feature.login.model.SalixGrupo
 import es.verdnatura.presentation.view.feature.login.model.accessConfigSalix
 import es.verdnatura.presentation.view.feature.login.model.versionApp
+import es.verdnatura.presentation.view.feature.main.model.WorkerActionSalix
 import es.verdnatura.presentation.view.feature.packaging.model.EntrySalix
 import es.verdnatura.presentation.view.feature.packaging.model.ItemSupplier
 import es.verdnatura.presentation.view.feature.packaging.model.Supplier
@@ -53,6 +54,7 @@ import es.verdnatura.presentation.view.feature.sacador.model.CollectionVO
 import es.verdnatura.presentation.view.feature.sacador.model.MistakeTypeVO
 import es.verdnatura.presentation.view.feature.sacador.model.PlacementSupplyVO
 import es.verdnatura.presentation.view.feature.sacador.model.TicketStateSalix
+import es.verdnatura.presentation.view.feature.ubicador.model.ItemUbicador
 import es.verdnatura.presentation.view.feature.ubicador.model.ItemUbicadorVO
 import es.verdnatura.presentation.view.feature.workermistake.model.DepartmentMistake
 import es.verdnatura.presentation.view.feature.workermistake.model.ExpeditionMistakeSalix
@@ -98,8 +100,8 @@ interface SalixService {
         @Query("filter") filter: String
     ): Call<List<BuyerVO>>
 
-    @GET("ticketStates")
-    fun lastTicketGetByWorker(
+    @GET("Tickets/myLastModified")
+    fun myLastModified(
         @Query("filter") filter: String
     ): Call<List<TicketStateSalix>>
 
@@ -189,6 +191,15 @@ interface SalixService {
         @Query("schema") schema: String = "vn"
     ): Call<Any>
 
+    @POST("workerActivities")
+    fun workerActivityAdd(
+        @Body workerActionSalix: WorkerActionSalix
+    ): Call<Any>
+
+    @GET("workerActivityTypes")
+    fun workerActivityList(
+    ): Call<Any>
+
     @POST("Applications/cmrPallet_add/execute-proc")
     fun cmrPalletAdd(
         @Query("params") params: Any? = null,
@@ -251,6 +262,7 @@ interface SalixService {
     @GET("Operators/getPrinter")//NO SALIX
     fun getprinters():
             Call<List<Printers>>
+
     @GET("Collections/getSalesFromTicketOrCollection")//REVISADA
     fun collectionGetTickets(
         @Query("collectionOrTicketFk") collectionOrTicketFk: Number,
@@ -258,7 +270,7 @@ interface SalixService {
         @Query("printFk") printFk: Number,
         @Query("source") source: String,
 
-    ):
+        ):
             Call<CollectionVO>
 
     @POST("almacennew/SaleTrackings/mark")//REVISADA
@@ -266,19 +278,21 @@ interface SalixService {
         @Body vararg params: Any?
     ):
             Call<Any>
+
     @GET("Sales/getFromSectorCollection")//NO SALIX
     fun sectorCollectionGetSale(
         @Query("sectorFk") sectorFk: Int,
         @Query("sectorCollectionFk") sectorCollectionFk: Int,
     ):
             Call<List<PreSacadorItemVO>>
+
     @POST("Collections/addItem")//REVISADA
     fun collectionAddItem(
         @Body params: Any
     ):
             Call<Any>
 
-    @POST("Collections/assignCollection")//NO SALIX
+    @POST("Collections/assignCollection")
     fun collectionAssign(
     ):
             Call<Int>
@@ -325,7 +339,6 @@ interface SalixService {
     ):
             Call<Any>
 
-
     @GET("ItemShelvings/return")
     fun itemShelvingReturn(
         @Query("shelvingFk") shelvingFk: String
@@ -567,6 +580,12 @@ interface SalixService {
         @Query("params") params: Any,
     ): Call<List<ItemUbicadorVO>>
 
+    @POST("Applications/itemShelving_get/execute-proc")
+    fun itemShelvingListNew(
+        @Query("schema") schema: String = "vn",
+        @Query("params") params: Any,
+    ): Call<List<ItemUbicador>>
+
     @POST("Applications/expedition_scan/execute-proc")
     fun expeditionScan(
         @Query("schema") schema: String = "srt",
@@ -858,6 +877,11 @@ interface SalixService {
         @Body params: Any
     ): Call<Any>
 
+    @GET("ItemShelvingSales/{id}/exists")
+    fun itemShelvingSaleExists(
+        @Path("id") id: Number,
+    ): Call<JsonObject>
+
     @PATCH("ItemShelvingSales/{id}")
     fun itemShelvingsReservedUpdate(
         @Path("id") id: Number,
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragment.kt
index 3730982f..88b8183d 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragment.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragment.kt
@@ -30,7 +30,6 @@ import androidx.recyclerview.widget.RecyclerView
 import com.google.gson.Gson
 import es.verdnatura.R
 import es.verdnatura.databinding.FragmentCollectionBinding
-import es.verdnatura.domain.ConstAndValues
 import es.verdnatura.domain.ConstAndValues.CONTROLADOR
 import es.verdnatura.domain.ConstAndValues.OK
 import es.verdnatura.domain.ConstAndValues.PRECHECKER
@@ -141,7 +140,7 @@ class CollectionFragment(
 
             )
             //tarea 6458
-           //viewModel.ticketState(collection.collectionFk)
+           viewModel.ticketState(collection.collectionFk)
             workerFkFromTicket = collection.tickets.get(0).sales.get(0).workerFk
         }
 
@@ -1264,7 +1263,7 @@ class CollectionFragment(
                             txtscan.toInt()
                         )
                         //Tarea 6458
-                        //viewModel.ticketState(txtscan.toInt())
+                        viewModel.ticketState(txtscan.toInt())
 
                     }