diff --git a/app/src/main/java/es/verdnatura/domain/VerdnaturaService.kt b/app/src/main/java/es/verdnatura/domain/VerdnaturaService.kt index 40a75a73..26f6463f 100644 --- a/app/src/main/java/es/verdnatura/domain/VerdnaturaService.kt +++ b/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> - +/* @POST("almacennew/worker_updatePrinter")//NO SALIX fun worker_updatePrinter( @Body vararg params: Any ): - Call - + Call*/ +/* @POST("almacennew/worker_updateSector")//NO SALIX fun worker_updateSector( @Body vararg params: Any ): - Call + Call*/ @POST("almacennew/operator_updateItemPackingType")//NO SALIX fun operator_updateItemPackingType( @@ -317,7 +317,7 @@ interface VerdnaturaService { ): Call - @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 - @POST("almacennew/collectionIncreaseQuantity")//REVISADA - fun collectionIncreaseQuantity( - @Body vararg params: Any - ): - Call @POST("almacennew/saleMistakeAdd")//REVISADA fun saleMistakeAdd( @@ -352,13 +347,13 @@ interface VerdnaturaService { ): Call - @POST("almacennew/workerMistake_Add")//REVISADA + @POST("almacennew/workerMistake_Add")//A BORRAR fun workerMistake_Add( @Body vararg params: Any ): Call - @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> - @POST("almacennew/workerMistakeType_get")//REVISADA + @POST("almacennew/workerMistakeType_get")//A BORRAR fun workerMistakeType_get( ): - Call> + Call> - @POST("almacennew/expeditionMistakeType_get")//REVISADA + @POST("almacennew/expeditionMistakeType_get")//A BORRAR fun expeditionMistakeType_get( ): - Call> + Call> - @POST("almacennew/department_getHasMistake")//REVISADA + @POST("almacennew/department_getHasMistake")//A BORRAR fun department_getHasMistake( ): Call> @@ -418,7 +413,7 @@ interface VerdnaturaService { ): Call> - @POST("almacennew/get_ItemPackingType")//REVISADA + @POST("almacennew/get_ItemPackingType")//A BORRAR fun getItemPackingType( @Body vararg params: Any @@ -447,14 +442,14 @@ interface VerdnaturaService { Call - @POST("almacennew/item_saveStems")//REVISADA + @POST("almacennew/item_saveStems")//A BORRAR fun item_saveStems( @Body vararg params: Any ): Call - @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> - @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 + Call // Qr reader ========================================================================== @@ -807,11 +802,6 @@ interface VerdnaturaService { ): Call> - @POST("almacennew/itemShelvingBuyerTask")//REVISADA - fun itemShelvingBuyerTask( - @Body vararg params: Any - ): - Call> @POST("almacennew/itemShelvingStarsUpdate")//REVISADA fun itemShelvingStarsUpdate( diff --git a/app/src/main/java/es/verdnatura/domain/model/Filter.kt b/app/src/main/java/es/verdnatura/domain/model/Filter.kt new file mode 100644 index 00000000..bdba7c01 --- /dev/null +++ b/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, + val where: Map> +) \ No newline at end of file diff --git a/app/src/main/java/es/verdnatura/presentation/common/SalixBackItems.kt b/app/src/main/java/es/verdnatura/presentation/common/SalixBackItems.kt index 253ff3dc..53987ec0 100644 --- a/app/src/main/java/es/verdnatura/presentation/common/SalixBackItems.kt +++ b/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 , diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/controlvehiculo/fragment/model/DeviceId.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/controlvehiculo/fragment/model/DeviceId.kt new file mode 100644 index 00000000..bf7e071f --- /dev/null +++ b/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 +) diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/historicoshelvinglog/model/ShelvingLog.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/historicoshelvinglog/model/ShelvingLog.kt index bc6b8d5e..21c5cd1b 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/historicoshelvinglog/model/ShelvingLog.kt +++ b/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?, ) \ No newline at end of file diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/sacador/model/TicketItemVO.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/sacador/model/TicketItemVO.kt index b583329a..df8d78ce 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/sacador/model/TicketItemVO.kt +++ b/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( diff --git a/app/src/main/res/layout/fragment_ajustes.xml b/app/src/main/res/layout/fragment_ajustes.xml index cfe56de3..ce3737ef 100644 --- a/app/src/main/res/layout/fragment_ajustes.xml +++ b/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"/> @@ -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" diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index 767812b3..2ae69fe6 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -87,6 +87,7 @@ 200dp 24dp 12dp + 8dp 149dp 3dp