refs #5134 silex→salix

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

@@ -29,7 +29,7 @@ import es.verdnatura.presentation.view.feature.sacador.model.PlacementSupplyVO
 import es.verdnatura.presentation.view.feature.shelvingparking.model.ItemShelvingParkingVO
 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.MistakeWorkerType
+import es.verdnatura.presentation.view.feature.workermistake.model.MistakeType
 import es.verdnatura.presentation.view.feature.workermistake.model.WorkerFromMistake
 import retrofit2.Call
 import retrofit2.http.Body
@@ -83,18 +83,18 @@ interface VerdnaturaService {
     fun worker_getPrinter(
     ):
             Call<List<Printers>>
-
+/*
     @POST("almacennew/worker_updatePrinter")//NO SALIX
     fun worker_updatePrinter(
         @Body vararg params: Any
     ):
-            Call<Unit>
-
+            Call<Unit>*/
+/*
     @POST("almacennew/worker_updateSector")//NO SALIX
     fun worker_updateSector(
         @Body vararg params: Any
     ):
-            Call<Unit>
+            Call<Unit>*/
 
     @POST("almacennew/operator_updateItemPackingType")//NO SALIX
     fun operator_updateItemPackingType(
@@ -317,7 +317,7 @@ interface VerdnaturaService {
     ):
             Call<Any>
 
-    @POST("almacennew/debug_add")//REVISADA
+    @POST("almacennew/debug_add")//A BORRAR
     fun debug_add(
         @Body vararg params: Any
     ):
@@ -340,11 +340,6 @@ interface VerdnaturaService {
     ):
             Call<String>
 
-    @POST("almacennew/collectionIncreaseQuantity")//REVISADA
-    fun collectionIncreaseQuantity(
-        @Body vararg params: Any
-    ):
-            Call<Any>
 
     @POST("almacennew/saleMistakeAdd")//REVISADA
     fun saleMistakeAdd(
@@ -352,13 +347,13 @@ interface VerdnaturaService {
     ):
             Call<Any>
 
-    @POST("almacennew/workerMistake_Add")//REVISADA
+    @POST("almacennew/workerMistake_Add")//A BORRAR
     fun workerMistake_Add(
         @Body vararg params: Any
     ):
             Call<Any>
 
-    @POST("almacennew/expeditionMistake_add")//REVISADA
+    @POST("almacennew/expeditionMistake_add")// A BORRAR
     fun expeditionMistake_add(
         @Body vararg params: Any
     ):
@@ -375,17 +370,17 @@ interface VerdnaturaService {
             Call<List<MistakeTypeVO>>
 
 
-    @POST("almacennew/workerMistakeType_get")//REVISADA
+    @POST("almacennew/workerMistakeType_get")//A BORRAR
     fun workerMistakeType_get(
     ):
-            Call<List<MistakeWorkerType>>
+            Call<List<MistakeType>>
 
-    @POST("almacennew/expeditionMistakeType_get")//REVISADA
+    @POST("almacennew/expeditionMistakeType_get")//A BORRAR
     fun expeditionMistakeType_get(
     ):
-            Call<List<MistakeWorkerType>>
+            Call<List<MistakeType>>
 
-    @POST("almacennew/department_getHasMistake")//REVISADA
+    @POST("almacennew/department_getHasMistake")//A BORRAR
     fun department_getHasMistake(
     ):
             Call<List<DepartmentMistake>>
@@ -418,7 +413,7 @@ interface VerdnaturaService {
     ):
             Call<List<ItemProposal>>
 
-    @POST("almacennew/get_ItemPackingType")//REVISADA
+    @POST("almacennew/get_ItemPackingType")//A BORRAR
     fun getItemPackingType(
 
         @Body vararg params: Any
@@ -447,14 +442,14 @@ interface VerdnaturaService {
             Call<Any>
 
 
-    @POST("almacennew/item_saveStems")//REVISADA
+    @POST("almacennew/item_saveStems")//A BORRAR
     fun item_saveStems(
 
         @Body vararg params: Any
     ):
             Call<Any>
 
-    @POST("almacennew/item_saveReference")//REVISADA
+    @POST("almacennew/item_saveReference")//A BORRAR
     fun item_saveReference(
 
         @Body vararg params: Any
@@ -541,7 +536,7 @@ interface VerdnaturaService {
     ):
             Call<List<ItemUbicadorVO>>
 
-    @POST("almacennew/shelvingPriorityUpdate")//REVISADA
+    @POST("almacennew/shelvingPriorityUpdate")//A BORRAR
     fun shelvingPriorityUpdate(
         @Body vararg params: Any
     ):
@@ -640,7 +635,7 @@ interface VerdnaturaService {
     fun buffer_setTypeByName(
         @Body vararg params: Any
     ):
-            Call<Any>
+            Call<Boolean>
 
     // Qr reader ==========================================================================
 
@@ -807,11 +802,6 @@ interface VerdnaturaService {
     ):
             Call<List<BuyerVO>>
 
-    @POST("almacennew/itemShelvingBuyerTask")//REVISADA
-    fun itemShelvingBuyerTask(
-        @Body vararg params: Any
-    ):
-            Call<List<ItemBuyerVO>>
 
     @POST("almacennew/itemShelvingStarsUpdate")//REVISADA
     fun itemShelvingStarsUpdate(

app/src/main/java/es/verdnatura/domain/model/Filter.kt

@@ -0,0 +1,6 @@
+package es.verdnatura.domain.model
+
+data class Filter(
+    val fields: Map<String, Boolean>,
+    val where: Map<String, Map<String, String>>
+)

app/src/main/java/es/verdnatura/presentation/common/SalixBackItems.kt

@@ -1,8 +1,5 @@
 package es.verdnatura.presentation.common
 
-class itemPackingTypeSalix(
-    var itemPackingTypeFk: String = ""
-)
 
 class itemBarCodeSalix(
     var itemFk: Int ,

app/src/main/java/es/verdnatura/presentation/view/feature/controlvehiculo/fragment/model/DeviceId.kt

@@ -0,0 +1,5 @@
+package es.verdnatura.presentation.view.feature.controlvehiculo.fragment.model
+
+data class DeviceId(
+    var id: Int
+)

app/src/main/java/es/verdnatura/presentation/view/feature/historicoshelvinglog/model/ShelvingLog.kt

@@ -29,4 +29,11 @@ class ShelvingLogSalix(
     var isRecyclable: Boolean?=null,
     var isError:Boolean?=null,
     var errorMessage: String?=null
+)
+
+data class DeviceLogSalix(
+    val androidId: String,
+    val userFk: Int?,
+    val nameApp: String?,
+    val versionApp: String?,
 )

app/src/main/java/es/verdnatura/presentation/view/feature/sacador/model/TicketItemVO.kt

@@ -119,7 +119,7 @@ class PlacementSupplyListVO(
 
 class MistakeTypeVO(
     var id: Int,
-    var description: String = ""
+    var description: String
 )
 
 class MistakeTypeListVO(

app/src/main/res/layout/fragment_ajustes.xml

@@ -33,7 +33,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/divider"
             android:layout_marginLeft="@dimen/pasilleros_margin_main_menu"
-            android:padding="@dimen/navigation_row_limit_padding"
+            android:padding="@dimen/navigation_row_min_padding"
             >
 
 
@@ -111,7 +111,7 @@
                     android:textSize="@dimen/body1"/>
             </LinearLayout>
             <LinearLayout
-                android:visibility="gone"
+                android:visibility="visible"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
 
@@ -182,7 +182,6 @@
             android:id="@+id/ajustess_items"
             android:layout_width="0dp"
             android:layout_height="0dp"
-            android:layout_marginTop="8dp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0.6"

app/src/main/res/values/dimens.xml

@@ -87,6 +87,7 @@
     <dimen name="navigation_item_width">200dp</dimen>
     <dimen name="navigation_item_title_height">24dp</dimen>
     <dimen name="navigation_row_limit_padding">12dp</dimen>
+    <dimen name="navigation_row_min_padding">8dp</dimen>
     <dimen name="navigation_item_height_plus">149dp</dimen>
     <dimen name="parental_border_radius">3dp</dimen>