From b8d0f76adfdb90a3b3e9e8c29e65b7a3428fcc44 Mon Sep 17 00:00:00 2001 From: Sergio De la torre Date: Thu, 24 Nov 2022 08:41:10 +0100 Subject: [PATCH] Version 9.6Beta en test --- .idea/misc.xml | 1 + .idea/workspace.xml | 82 ++++------ .../java/es/verdnatura/domain/Extensions.kt | 5 + .../verdnatura/domain/GetItemCardUserCase.kt | 4 +- .../es/verdnatura/domain/GetLoginUserCase.kt | 4 +- .../verdnatura/domain/GetPackagingUserCase.kt | 54 ------- .../verdnatura/domain/GetPreSacadorUseCase.kt | 4 +- .../verdnatura/domain/GetQrReaderUserCase.kt | 26 ---- .../domain/GetSacadorControladorUserCase.kt | 51 ++++--- .../domain/GetVehicleControlTimeUserCase.kt | 4 +- .../java/es/verdnatura/domain/SalixService.kt | 4 - .../es/verdnatura/domain/VerdnaturaService.kt | 144 ++++-------------- .../presentation/base/BaseFragment.kt | 7 +- .../presentation/testing/testPrint.kt | 2 - .../articulo/fragment/ItemCardViewModel.kt | 11 +- .../articulo/fragment/ItemProposalFragment.kt | 10 +- .../view/feature/collection/CollectionVO.kt | 2 +- .../collection/fragment/CollectionFragment.kt | 11 +- .../fragment/CollectionViewModel.kt | 24 ++- .../fragment/ControlVehiculoFragment.kt | 4 +- .../ControlVehiculoUsuarioFragment.kt | 4 +- .../fragment/ControlVehiculoViewModel.kt | 16 +- .../fragment/HistoricoVehiculoFragment.kt | 2 +- .../fragment/HistoricoVehiculoViewModel.kt | 4 +- .../feature/login/fragment/LoginFragment.kt | 2 +- .../feature/login/fragment/LoginViewModel.kt | 4 +- .../fragment/PackagingCountFragment.kt | 4 +- .../PackagingViewModel/SupplierViewModel.kt | 22 +-- .../packaging/fragment/SupplierFragment.kt | 8 +- .../pasillero/fragment/PasilleroViewModel.kt | 82 +++++----- .../presacador/fragment/EndSacadorFragment.kt | 117 +++----------- .../fragment/InitPreSacadorFragment.kt | 15 +- .../fragment/PreSacadorViewModel.kt | 48 +++--- .../view/feature/qr/QrFragment.kt | 17 ++- .../view/feature/qr/QrFragmentViewModel.kt | 8 +- .../fragment/ReubicationCollectionFragment.kt | 57 ------- .../fragment/ReubicationFragment.kt | 3 - .../feature/reubication/model/Reubication.kt | 2 +- .../sacador/fragment/SacadorFragment.kt | 2 +- .../ubicador/fragment/UbicadorFragment.kt | 41 +++-- .../ubicador/fragment/UbicadorViewModel.kt | 26 +--- .../main/res/drawable/ic_ubicator_check.xml | 8 + 42 files changed, 285 insertions(+), 661 deletions(-) delete mode 100644 app/src/main/java/es/verdnatura/domain/GetPackagingUserCase.kt delete mode 100644 app/src/main/java/es/verdnatura/domain/GetQrReaderUserCase.kt create mode 100644 app/src/main/res/drawable/ic_ubicator_check.xml diff --git a/.idea/misc.xml b/.idea/misc.xml index aa4aa967..e06efca3 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -129,6 +129,7 @@ + diff --git a/.idea/workspace.xml b/.idea/workspace.xml index d3844bd9..c43b0e2b 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -82,70 +82,50 @@ - + + + - - - + - + + + - - - - - + - - + + - - - + - - + + + - - - - - - + - - - - - + + + + + - - - - - - - - - + - - - - @@ -849,7 +829,7 @@ - diff --git a/app/src/main/java/es/verdnatura/domain/Extensions.kt b/app/src/main/java/es/verdnatura/domain/Extensions.kt index f2772bcd..51071753 100644 --- a/app/src/main/java/es/verdnatura/domain/Extensions.kt +++ b/app/src/main/java/es/verdnatura/domain/Extensions.kt @@ -1,6 +1,7 @@ package es.verdnatura.domain import android.content.Context +import android.widget.EditText import android.widget.Toast fun Any.toast(context: Context?, duration: Int = Toast.LENGTH_SHORT): Toast { @@ -10,3 +11,7 @@ fun Any.toast(context: Context?, duration: Int = Toast.LENGTH_SHORT): Toast { fun T?.notNull(f: (it: T) -> Unit) { if (this != null) f(this) } + +fun EditText.toInt(): Int { + return this.text.toString().toInt() +} \ No newline at end of file diff --git a/app/src/main/java/es/verdnatura/domain/GetItemCardUserCase.kt b/app/src/main/java/es/verdnatura/domain/GetItemCardUserCase.kt index ba3000a8..bd899bbf 100644 --- a/app/src/main/java/es/verdnatura/domain/GetItemCardUserCase.kt +++ b/app/src/main/java/es/verdnatura/domain/GetItemCardUserCase.kt @@ -30,7 +30,7 @@ class GetItemCardUserCase(context: Context) : RestClient(context) { ) } - fun item_getSimilar( + /* fun item_getSimilar( usuario: String, password: String, itemFk: String, @@ -52,7 +52,7 @@ class GetItemCardUserCase(context: Context) : RestClient(context) { "application/json", params = params ) - } + }*/ fun getItemPackingType(usuario: String, password: String): Call> { val params: ArrayList = ArrayList() diff --git a/app/src/main/java/es/verdnatura/domain/GetLoginUserCase.kt b/app/src/main/java/es/verdnatura/domain/GetLoginUserCase.kt index fc44ff1f..b4cfa32d 100644 --- a/app/src/main/java/es/verdnatura/domain/GetLoginUserCase.kt +++ b/app/src/main/java/es/verdnatura/domain/GetLoginUserCase.kt @@ -97,10 +97,10 @@ class GetLoginUserCase(context: Context) : RestClient(context) { ) } - fun operator_add(usuario: String, password: String): Call { + /*fun operator_add(usuario: String, password: String): Call { return restClient!!.operator_add("json", "1", usuario, password, "application/json") - } + }*/ fun worker_getPrinter(usuario: String, password: String): Call> { diff --git a/app/src/main/java/es/verdnatura/domain/GetPackagingUserCase.kt b/app/src/main/java/es/verdnatura/domain/GetPackagingUserCase.kt deleted file mode 100644 index 29ec7a13..00000000 --- a/app/src/main/java/es/verdnatura/domain/GetPackagingUserCase.kt +++ /dev/null @@ -1,54 +0,0 @@ -package es.verdnatura.domain - -import android.content.Context -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 -import retrofit2.Call - -class GetPackagingUserCase(context: Context) : RestClient(context) { - - fun getSuppliers(token: String): Call> { - return salixClient!!.getSuppliers() - } - - fun Entries(token: String, entry: EntrySalix): Call { - return salixClient!!.Entries(entry = entry) - } - - fun faultsReview_isChecked( - usuario: String, - password: String, - itemFk: String, - warehouseFk: String - ): Call { - val params: ArrayList = ArrayList() - params.add(itemFk) - params.add(warehouseFk) - return restClient!!.faultsReview_isChecked( - "json", - "1", - usuario, - password, - "application/json", - params = params - ) - } - - /* fun itemShelvingBuyerGet(): Call> { - return restClient!!.itemShelvingBuyerGet() - }*/ - - fun supplier_getItems( - usuario: String, - password: String, - supplierFk: String - ): Call> { - val params: ArrayList = ArrayList() - params.add(supplierFk) - return restClient!!.supplier_getItems( - supplierFk - - ) - } -} \ No newline at end of file diff --git a/app/src/main/java/es/verdnatura/domain/GetPreSacadorUseCase.kt b/app/src/main/java/es/verdnatura/domain/GetPreSacadorUseCase.kt index 19e4f800..4535092f 100644 --- a/app/src/main/java/es/verdnatura/domain/GetPreSacadorUseCase.kt +++ b/app/src/main/java/es/verdnatura/domain/GetPreSacadorUseCase.kt @@ -120,9 +120,9 @@ class GetPreSacadorUseCase(context: Context) : RestClient(context) { } - fun sectorCollection_get(usuario: String, password: String): Call> { + /* fun sectorCollection_get(usuario: String, password: String): Call> { return restClient!!.sectorCollection_get("json", "1", usuario, password, "application/json") - } + }*/ fun sectorCollection_getSale( sectorCollectionFK: Int, diff --git a/app/src/main/java/es/verdnatura/domain/GetQrReaderUserCase.kt b/app/src/main/java/es/verdnatura/domain/GetQrReaderUserCase.kt deleted file mode 100644 index 69f1f4b5..00000000 --- a/app/src/main/java/es/verdnatura/domain/GetQrReaderUserCase.kt +++ /dev/null @@ -1,26 +0,0 @@ -package es.verdnatura.domain - -import android.content.Context -import retrofit2.Call - -class GetQrReaderUserCase(context: Context) : RestClient(context) { - - fun qr_getCall( - usuario: String, - password: String, - call: String - - ): Call { - val params: ArrayList = ArrayList() - params.add(call) - return restClient!!.qr_getCall( - "json", - "1", - usuario, - password, - "application/json", - params = params - ) - } - -} diff --git a/app/src/main/java/es/verdnatura/domain/GetSacadorControladorUserCase.kt b/app/src/main/java/es/verdnatura/domain/GetSacadorControladorUserCase.kt index 72910aac..01a07fbf 100644 --- a/app/src/main/java/es/verdnatura/domain/GetSacadorControladorUserCase.kt +++ b/app/src/main/java/es/verdnatura/domain/GetSacadorControladorUserCase.kt @@ -2,8 +2,6 @@ package es.verdnatura.domain import android.content.Context import es.verdnatura.presentation.view.feature.collection.SalixSaleQuantity -import es.verdnatura.presentation.view.feature.collection.listSaleSalix -import es.verdnatura.presentation.view.feature.collection.saleSalix 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 @@ -29,7 +27,8 @@ class GetSacadorControladorUserCase(context: Context) : RestClient(context) { type: String ): Call { - return restClient!!.collection_getTickets(collectionFk,sectorFk,print,type + return restClient!!.collection_getTickets( + collectionFk, sectorFk, print, type ) } @@ -41,7 +40,8 @@ class GetSacadorControladorUserCase(context: Context) : RestClient(context) { type: String ): Call { - return restClient!!.collection_get(collectionFk,sectorFk,print,type + return restClient!!.collection_get( + collectionFk, sectorFk, print, type ) } @@ -286,7 +286,7 @@ class GetSacadorControladorUserCase(context: Context) : RestClient(context) { val params: ArrayList = ArrayList() params.add(collectionFk) labelCount?.let { - params.add(labelCount) + params.add(labelCount) } return restClient!!.collectionStickerPrint( @@ -449,7 +449,8 @@ class GetSacadorControladorUserCase(context: Context) : RestClient(context) { state: String ): Call { - return restClient!!.ticket_setState( ticketFk, state + return restClient!!.ticket_setState( + ticketFk, state ) } @@ -510,29 +511,29 @@ class GetSacadorControladorUserCase(context: Context) : RestClient(context) { ) } - fun transferSalesSalix( + /* fun transferSalesSalix( - token: String, - ticketFk: String, - saleFk: String, - quantity: String, + token: String, + ticketFk: String, + saleFk: String, + quantity: String, - ): Call { + ): Call { - var saleTransfer = listSaleSalix(mutableListOf()) - saleTransfer.sales.add(saleSalix(id = saleFk.toInt(), quantity = quantity.toInt())) + var saleTransfer = listSaleSalix(arrayListOf()) + saleTransfer.sales.add(saleSalix(id = saleFk.toInt(), quantity = quantity.toInt())) - return salixClient!!.transferSalesSalix( - "json", - "1", - token, - "application/json", - ticketFk, - saleTransfer + return salixClient!!.transferSalesSalix( + "json", + "1", + token, + "application/json", + ticketFk, + saleTransfer - ) - } + ) + }*/ fun collectionIncreaseQuantitySalix( @@ -574,9 +575,9 @@ class GetSacadorControladorUserCase(context: Context) : RestClient(context) { ) } - fun mistakeType(usuario: String, password: String): Call> { + /* fun mistakeType(usuario: String, password: String): Call> { // val params:ArrayList = ArrayList() return restClient!!.mistakeType("json", "1", usuario, password, "application/json") - } + }*/ } diff --git a/app/src/main/java/es/verdnatura/domain/GetVehicleControlTimeUserCase.kt b/app/src/main/java/es/verdnatura/domain/GetVehicleControlTimeUserCase.kt index 92644e86..3931a4cd 100644 --- a/app/src/main/java/es/verdnatura/domain/GetVehicleControlTimeUserCase.kt +++ b/app/src/main/java/es/verdnatura/domain/GetVehicleControlTimeUserCase.kt @@ -49,7 +49,7 @@ class GetVehicleControlTimeUserCase(context: Context) : RestClient(context) { } - fun machine_getWorkerPlate(usuario: String, password: String): Call { + /* fun machine_getWorkerPlate(usuario: String, password: String): Call { val params: ArrayList = ArrayList() return restClient!!.machine_getWorkerPlate( "json", @@ -60,7 +60,7 @@ class GetVehicleControlTimeUserCase(context: Context) : RestClient(context) { params ) } - +*/ fun deviceProductionUser_getWorker( android_id: String ): Call { diff --git a/app/src/main/java/es/verdnatura/domain/SalixService.kt b/app/src/main/java/es/verdnatura/domain/SalixService.kt index 028a3007..5cc2b1dd 100644 --- a/app/src/main/java/es/verdnatura/domain/SalixService.kt +++ b/app/src/main/java/es/verdnatura/domain/SalixService.kt @@ -77,10 +77,6 @@ interface SalixService { @POST("tickets/{idTicket}/transferSales") //-->saleMove en Silex fun transferSalesSalix( - @Header("aplicacion") aplicacion: String, - @Header("version") version: String, - @Header("Authorization") authorization: String, - @Header("Content-Type") content_type: String, @Path("idTicket") idTicket: String, @Body params: listSaleSalix ): diff --git a/app/src/main/java/es/verdnatura/domain/VerdnaturaService.kt b/app/src/main/java/es/verdnatura/domain/VerdnaturaService.kt index ebdc2d81..ab5eb392 100644 --- a/app/src/main/java/es/verdnatura/domain/VerdnaturaService.kt +++ b/app/src/main/java/es/verdnatura/domain/VerdnaturaService.kt @@ -149,11 +149,6 @@ interface VerdnaturaService { @POST("almacennew/operator_add")//NO SALIX fun operator_add( - @Header("aplicacion") aplicacion: String, - @Header("version") version: String, - @Header("user") user: String, - @Header("pass") pass: String, - @Header("Content-Type") content_type: String ): Call @@ -208,11 +203,6 @@ interface VerdnaturaService { @POST("almacennew/sectorCollection_get") //NO SALIX fun sectorCollection_get( - @Header("aplicacion") aplicacion: String, - @Header("version") version: String, - @Header("user") user: String, - @Header("pass") pass: String, - @Header("Content-Type") content_type: String ): Call> @@ -249,12 +239,7 @@ interface VerdnaturaService { @POST("almacennew/sectorCollection_new")//NO SALIX fun sectorCollection_new( - @Header("aplicacion") aplicacion: String, - @Header("version") version: String, - @Header("user") user: String, - @Header("pass") pass: String, - @Header("Content-Type") content_type: String, - @Body params: List + @Body vararg params: Any ): Call @@ -266,19 +251,13 @@ interface VerdnaturaService { @POST("almacennew/saleTracking_addPrevOK")//NO SALIX fun saleTracking_addPrevOK( - @Body vararg params: Any ): Call @POST("almacennew/saleTracking_updateIsChecked")//NO SALIX fun saleTracking_updateIsChecked( - @Header("aplicacion") aplicacion: String, - @Header("version") version: String, - @Header("user") user: String, - @Header("pass") pass: String, - @Header("Content-Type") content_type: String, - @Body params: List + @Body vararg params: Any ): Call @@ -340,13 +319,13 @@ interface VerdnaturaService { //sergio: de momento se separa para ir viendo como funciona. El precontrol llamara a collectionTicketGet con otro parametro. @POST("almacennew/collection_getTickets")//REVISADA fun collection_getTickets( - @Body vararg params: Any + @Body vararg params: Any ): Call @POST("almacennew/collection_get")//REVISADA fun collection_get( - @Body vararg params: Any + @Body vararg params: Any ): Call @@ -386,12 +365,7 @@ interface VerdnaturaService { @POST("almacennew/itemShelvingSaleSupplyAdd")//REVISADA fun itemShelvingSaleSupplyAdd( - @Header("aplicacion") aplicacion: String, - @Header("version") version: String, - @Header("user") user: String, - @Header("pass") pass: String, - @Header("Content-Type") content_type: String, - @Body params: List + @Body vararg params: Any ): Call @@ -438,12 +412,7 @@ interface VerdnaturaService { @POST("almacennew/saleTracking_add")//REVISADA fun saleTracking_add( - @Header("aplicacion") aplicacion: String, - @Header("version") version: String, - @Header("user") user: String, - @Header("pass") pass: String, - @Header("Content-Type") content_type: String, - @Body params: List + @Body vararg params: Any ): Call @@ -493,12 +462,7 @@ interface VerdnaturaService { @POST("almacennew/itemShelving_updateFromSale")//REVISADA fun itemShelving_updateFromSale( - @Header("aplicacion") aplicacion: String, - @Header("version") version: String, - @Header("user") user: String, - @Header("pass") pass: String, - @Header("Content-Type") content_type: String, - @Body params: List + @Body vararg params: Any ): Call @@ -572,11 +536,6 @@ interface VerdnaturaService { @POST("almacennew/mistakeType")//REVISADA fun mistakeType( - @Header("aplicacion") aplicacion: String, - @Header("version") version: String, - @Header("user") user: String, - @Header("pass") pass: String, - @Header("Content-Type") content_type: String ): Call> @@ -629,12 +588,7 @@ interface VerdnaturaService { @POST("almacennew/item_getSimilar")//REVISADA fun item_getSimilar( - @Header("aplicacion") aplicacion: String, - @Header("version") version: String, - @Header("user") user: String, - @Header("pass") pass: String, - @Header("Content-Type") content_type: String, - @Body params: List + @Body vararg params: Any ): Call> @@ -771,23 +725,13 @@ interface VerdnaturaService { //CONTROL DE VEHICULOS @POST("almacennew/machineWorker_add")//REVISADA fun machineWorker_add( - @Header("aplicacion") aplicacion: String, - @Header("version") version: String, - @Header("user") user: String, - @Header("pass") pass: String, - @Header("Content-Type") content_type: String, - @Body params: List + @Body vararg params: Any ): Call @POST("almacennew/machineWorker_update")//REVISADA fun machineWorker_update( - @Header("aplicacion") aplicacion: String, - @Header("version") version: String, - @Header("user") user: String, - @Header("pass") pass: String, - @Header("Content-Type") content_type: String, - @Body params: List + @Body vararg params: Any ): Call @@ -812,23 +756,12 @@ interface VerdnaturaService { @POST("almacennew/machine_getWorkerPlate")//REVISADA fun machine_getWorkerPlate( - @Header("aplicacion") aplicacion: String, - @Header("version") version: String, - @Header("user") user: String, - @Header("pass") pass: String, - @Header("Content-Type") content_type: String, - @Body params: List ): Call @POST("almacennew/machineWorker_getHistorical")//REVISADA fun machineWorker_getHistorical( - @Header("aplicacion") aplicacion: String, - @Header("version") version: String, - @Header("user") user: String, - @Header("pass") pass: String, - @Header("Content-Type") content_type: String, - @Body params: List + @Body vararg params: Any ): Call> @@ -903,23 +836,13 @@ interface VerdnaturaService { @POST("almacennew/shelvingChange")//REVISADA fun shelvingChange( - @Header("aplicacion") aplicacion: String, - @Header("version") version: String, - @Header("user") user: String, - @Header("pass") pass: String, - @Header("Content-Type") content_type: String, - @Body params: List + @Body vararg params: Any ): Call @POST("almacennew/itemShelving_return") fun itemShelving_return( - @Header("aplicacion") aplicacion: String, - @Header("version") version: String, - @Header("user") user: String, - @Header("pass") pass: String, - @Header("Content-Type") content_type: String, - @Body params: List + @Body vararg params: Any ): Call> @@ -948,24 +871,14 @@ interface VerdnaturaService { @POST("almacennew/itemShelving_merge")//REVISADA fun itemShelving_merge( - @Header("aplicacion") aplicacion: String, - @Header("version") version: String, - @Header("user") user: String, - @Header("pass") pass: String, - @Header("Content-Type") content_type: String, - @Body params: List + @Body vararg params: Any ): Call @POST("almacennew/shelvingLog_add")//REVISADA fun shelvingLog_add( - @Header("aplicacion") aplicacion: String, - @Header("version") version: String, - @Header("user") user: String, - @Header("pass") pass: String, - @Header("Content-Type") content_type: String, - @Body params: List + @Body vararg params: Any ): Call @@ -997,12 +910,7 @@ interface VerdnaturaService { @POST("almacennew/qr_getCall")//REVISADA fun qr_getCall( - @Header("aplicacion") aplicacion: String, - @Header("version") version: String, - @Header("user") user: String, - @Header("pass") pass: String, - @Header("Content-Type") content_type: String, - @Body params: List + @Body vararg params: Any ): Call @@ -1309,16 +1217,16 @@ interface VerdnaturaService { ): Call - /* @POST("almacennew/workerShelving_delete")//REVISADA - fun workerShelving_delete( - @Header("aplicacion") aplicacion: String, - @Header("version") version: String, - @Header("user") user: String, - @Header("pass") pass: String, - @Header("Content-Type") content_type: String, - @Body params: List - ): - Call*/ + /* @POST("almacennew/workerShelving_delete")//REVISADA + fun workerShelving_delete( + @Header("aplicacion") aplicacion: String, + @Header("version") version: String, + @Header("user") user: String, + @Header("pass") pass: String, + @Header("Content-Type") content_type: String, + @Body params: List + ): + Call*/ //SUPPLIERS @POST("almacennew/supplier_getItems")//REVISADA diff --git a/app/src/main/java/es/verdnatura/presentation/base/BaseFragment.kt b/app/src/main/java/es/verdnatura/presentation/base/BaseFragment.kt index dd7c6280..9ab61045 100644 --- a/app/src/main/java/es/verdnatura/presentation/base/BaseFragment.kt +++ b/app/src/main/java/es/verdnatura/presentation/base/BaseFragment.kt @@ -227,7 +227,7 @@ abstract class BaseFragment(viewModelCla R.drawable.ic_logo_salix -> getString(R.string.accessSalix) R.drawable.ic_eye_ui -> getString(R.string.icViewCollection) R.drawable.ic_collection -> getString(R.string.icViewCollection) - R.drawable.ic_controller_ui -> getString(R.string.checkerUbication) + R.drawable.ic_ubicator_check-> getString(R.string.checkerUbication) else -> { "" } @@ -521,7 +521,7 @@ abstract class BaseFragment(viewModelCla ITEMPACKINGFK -> prefs.getString(name, "").toString() WORKFORMSELECTED -> prefs.getString(name, "Producción").toString() "SUPPLIERNAME" -> prefs.getString(name, "").toString() - "SUPPLIERID" -> prefs.getString(name, "").toString() + "SUPPLIERID" -> prefs.getInt(name, 0).toString() "ENTRYTYPE" -> prefs.getString(name, "").toString() "ENTRYNUMBERIMAGES" -> prefs.getString(name, "0").toString() "ENTRYOBSERVATIONS" -> prefs.getString(name, "").toString() @@ -686,6 +686,9 @@ abstract class BaseFragment(viewModelCla DEPARTMENTMISTAKEID->{ editor.putInt(name,value as Int) } + "SUPPLIERID"->{ + editor.putInt(name,value as Int) + } else -> { editor.putString(name, value.toString()) } diff --git a/app/src/main/java/es/verdnatura/presentation/testing/testPrint.kt b/app/src/main/java/es/verdnatura/presentation/testing/testPrint.kt index 8f894078..9b946cf9 100644 --- a/app/src/main/java/es/verdnatura/presentation/testing/testPrint.kt +++ b/app/src/main/java/es/verdnatura/presentation/testing/testPrint.kt @@ -106,8 +106,6 @@ class testPrint( if (!binding.scanInput.text.isNullOrEmpty()) { binding.splashProgress.visibility = View.VISIBLE viewModel.qr_getCall( - getData(USER), - getData(PASSWORD), binding.scanInput.text.toString() ) itemscaned = binding.scanInput.text.toString() diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/fragment/ItemCardViewModel.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/fragment/ItemCardViewModel.kt index b5e8419c..3149e20c 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/fragment/ItemCardViewModel.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/fragment/ItemCardViewModel.kt @@ -80,13 +80,10 @@ class ItemCardViewModel(context: Context) : BaseViewModel(context) { itemFk: String, warehouseFk: String, vShipped: String, - vIsShowedByType: String, - user: String, - password: String + vIsShowedByType: Boolean, + ) { - getItemCardUserCase.item_getSimilar( - user, - password, + silex.item_getSimilar( itemFk, warehouseFk, vShipped, @@ -319,7 +316,7 @@ class ItemCardViewModel(context: Context) : BaseViewModel(context) { } fun updatePackingTypeSalix(itemFk: String, itemPackingType: itemPackingTypeSalix) { - salix!!.update_ItemPackingType( itemFk,itemPackingType ) + salix.update_ItemPackingType( itemFk,itemPackingType ) .enqueue(object : Callback { override fun onFailure(call: Call, t: Throwable) { _response.value = ResponseItemVO( diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/fragment/ItemProposalFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/fragment/ItemProposalFragment.kt index 86cb1023..e25758a6 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/fragment/ItemProposalFragment.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/fragment/ItemProposalFragment.kt @@ -33,7 +33,7 @@ class ItemProposalFragment( private var pasillerosItemClickListener: OnPasillerosItemClickListener? = null private var hideLoad = true private var layoutManager: LinearLayoutManager? = null - private var filter = "1" + private var filter = true companion object { fun newInstance(entryPoint: String) = ItemProposalFragment(entryPoint) @@ -52,8 +52,6 @@ class ItemProposalFragment( getData(WAREHOUSEFK), vShipped = currentDay(), vIsShowedByType = filter, - user = getData(USER), - password = getData(PASSWORD) ) super.onCreate(savedInstanceState) } @@ -95,17 +93,15 @@ class ItemProposalFragment( iconFilter.drawable-> { binding.splashProgress.visibility = View.VISIBLE iconFilter.drawable.setTint(ContextCompat.getColor( - context!!,if (filter=="1") R.color.verdnatura_white else R.color.verdnatura_pumpkin_orange + context!!,if (filter) R.color.verdnatura_white else R.color.verdnatura_pumpkin_orange )) - filter = if (filter=="1") "0" else "1" + filter = if (filter) false else true viewModel.item_getSimilar( itemFk, getData(WAREHOUSEFK), vIsShowedByType = filter, vShipped = currentDay(), - user = getData(USER), - password = getData(PASSWORD) ) diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/collection/CollectionVO.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/collection/CollectionVO.kt index d603f661..ae0c8a10 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/collection/CollectionVO.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/collection/CollectionVO.kt @@ -16,7 +16,7 @@ class SalixSaleQuantity( ) class listSaleSalix( - var sales: MutableList + var sales: ArrayList ) class saleSalix( var id : Int =0, 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 87f20483..f92cec4e 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 @@ -335,7 +335,6 @@ class CollectionFragment( if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0 || actionId == 5) {//ID=0 ACTION_NEXT ID=5 ACTION_UNESPECEFIED) if (!binding.scanInput.text.toString().isNullOrEmpty()) { - //sergio:para ver si ha marcado dos veces el mismo ticket binding.scanInput.setText(textScanned_filterDouble(binding.scanInput.text!!.toString())) @@ -810,7 +809,7 @@ class CollectionFragment( viewModel.saleTrackingDel( getData(USER), getData(PASSWORD), - saleFk = sales[positionUnmarked].saleFk + saleFk = sales[positionUnmarked].saleFk.toString() ) goBack = false @@ -1057,8 +1056,6 @@ class CollectionFragment( mistakeSale = sale goMistakeBack = false viewModel.mistakeType( - usuario = getData(USER), - getData(PASSWORD) ) } } @@ -1128,7 +1125,6 @@ class CollectionFragment( goBack = false goBack2 = false - if (type == SACADOR) { for (saleVO in sales) { //sergio: pinta si encuentra ticket o el saleGroupFk @@ -1136,9 +1132,7 @@ class CollectionFragment( // if (saleVO.ticketFk == txtscan ) { isOk = true viewModel.saleTracking_add( - getData(USER), - getData(PASSWORD), - txtscan + txtscan.toInt() ) if ((isOk) && mpok != null) { mpok!!.start() @@ -2266,7 +2260,6 @@ class CollectionFragment( viewModel.transferSalesSalix( - getData(TOKEN), ticketFk = sales[position].ticketFk, saleFk = sales[position].saleFk, quantity = totalQuantity.toString() diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionViewModel.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionViewModel.kt index 03bf1fb8..6431270b 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionViewModel.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionViewModel.kt @@ -12,7 +12,9 @@ import es.verdnatura.presentation.base.nameofFunction import es.verdnatura.presentation.common.ResponseItemVO import es.verdnatura.presentation.view.feature.collection.ItemVO import es.verdnatura.presentation.view.feature.collection.SalesModifiedList +import es.verdnatura.presentation.view.feature.collection.listSaleSalix import es.verdnatura.presentation.view.feature.collection.mapper.map +import es.verdnatura.presentation.view.feature.collection.saleSalix import es.verdnatura.presentation.view.feature.sacador.model.* import retrofit2.Call import retrofit2.Callback @@ -494,13 +496,9 @@ class CollectionViewModel(context: Context) : BaseViewModel(context) { fun saleTracking_add( - usuario: String, - password: String, - saleGroupFk: String + saleGroupFk: Int ) { - getSacadorControladorUserCase.saleTracking_add( - usuario, - password, + silex.saleTracking_add( saleGroupFk ).enqueue(object : Callback { override fun onFailure(call: Call, t: Throwable) { @@ -610,17 +608,15 @@ class CollectionViewModel(context: Context) : BaseViewModel(context) { } fun transferSalesSalix( - token: String, ticketFk: String, saleFk: String, quantity: String, ) { - getSacadorControladorUserCase.transferSalesSalix( - token, - ticketFk, - saleFk, - quantity + var saleTransfer = listSaleSalix(arrayListOf(saleSalix(id = saleFk.toInt(), quantity = quantity.toInt()))) + salix.transferSalesSalix( + ticketFk,saleTransfer + ).enqueue(object : Callback { override fun onFailure(call: Call, t: Throwable) { @@ -1059,8 +1055,8 @@ class CollectionViewModel(context: Context) : BaseViewModel(context) { }) } - fun mistakeType(usuario: String, password: String) { - getSacadorControladorUserCase.mistakeType(usuario, password) + fun mistakeType() { + silex.mistakeType() .enqueue(object : Callback> { override fun onFailure(call: Call>, t: Throwable) { val listError: ArrayList = ArrayList() diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/controlvehiculo/fragment/ControlVehiculoFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/controlvehiculo/fragment/ControlVehiculoFragment.kt index 999c36be..e07e3726 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/controlvehiculo/fragment/ControlVehiculoFragment.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/controlvehiculo/fragment/ControlVehiculoFragment.kt @@ -196,10 +196,10 @@ class ControlVehiculoFragment( ) } else if (direction.equals("IN")) { binding.splashProgress.visibility = VISIBLE - viewModel.machineWorker_add(getData(USER), getData(PASSWORD), plateNumber) + viewModel.machineWorker_add(plateNumber) } else if (direction.equals("OUT")) { - viewModel.machineWorker_update(getData(USER), getData(PASSWORD), plateNumber) + viewModel.machineWorker_update(plateNumber) } else if (direction.equals("")) { ma.openFragmentPickers(true) diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/controlvehiculo/fragment/ControlVehiculoUsuarioFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/controlvehiculo/fragment/ControlVehiculoUsuarioFragment.kt index da60ede1..87e2e272 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/controlvehiculo/fragment/ControlVehiculoUsuarioFragment.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/controlvehiculo/fragment/ControlVehiculoUsuarioFragment.kt @@ -91,7 +91,7 @@ class ControlVehiculoUsuarioFragment( if (userFk.equals(vUserFK)) { binding.splashProgress.visibility = VISIBLE - viewModel.machine_getWorkerPlate(getData(USER), getData(PASSWORD)) + viewModel.machine_getWorkerPlate() viewModel.deviceProduction_getnameDevice( getData(ANDROID_ID) ) @@ -105,7 +105,7 @@ class ControlVehiculoUsuarioFragment( binding.userInformation.visibility = INVISIBLE binding.nameVehiclecontrol.visibility = INVISIBLE binding.userInformation.setOnClickListener({ binding.mainToolbar.backButton.performClick() }) - viewModel.machine_getWorkerPlate(getData(USER), getData(PASSWORD)) + viewModel.machine_getWorkerPlate() } binding.userImage.loadUrl( diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/controlvehiculo/fragment/ControlVehiculoViewModel.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/controlvehiculo/fragment/ControlVehiculoViewModel.kt index a5a95fa7..6acfd2c0 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/controlvehiculo/fragment/ControlVehiculoViewModel.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/controlvehiculo/fragment/ControlVehiculoViewModel.kt @@ -36,11 +36,9 @@ class ControlVehiculoViewModel(context: Context) : BaseViewModel(context) { get() = _responseGetExtensionFromUserId fun machineWorker_add( - usuario: String, - password: String, PlateNumber: String ) { - getVehicleControlTimeUserCase.machineWorker_add(usuario, password, PlateNumber) + silex.machineWorker_add(PlateNumber) .enqueue(object : Callback { override fun onFailure(call: Call, t: Throwable) { _responseinsert.value = ResponseItemVO( @@ -76,11 +74,10 @@ class ControlVehiculoViewModel(context: Context) : BaseViewModel(context) { } fun machineWorker_update( - usuario: String, - password: String, + PlateNumber: String ) { - getVehicleControlTimeUserCase.machineWorker_update(usuario, password, PlateNumber) + silex.machineWorker_update(PlateNumber) .enqueue(object : Callback { override fun onFailure(call: Call, t: Throwable) { _responseinsert.value = ResponseItemVO( @@ -208,10 +205,9 @@ class ControlVehiculoViewModel(context: Context) : BaseViewModel(context) { - fun machine_getWorkerPlate(usuario: String, password: String) { - getVehicleControlTimeUserCase.machine_getWorkerPlate( - usuario, - password + fun machine_getWorkerPlate() { + silex.machine_getWorkerPlate( + ).enqueue(object : Callback { override fun onFailure(call: Call, t: Throwable) { diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/historicovehiculo/fragment/HistoricoVehiculoFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/historicovehiculo/fragment/HistoricoVehiculoFragment.kt index 62a5fb6a..49625d00 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/historicovehiculo/fragment/HistoricoVehiculoFragment.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/historicovehiculo/fragment/HistoricoVehiculoFragment.kt @@ -33,7 +33,7 @@ class HistoricoVehiculoFragment( ma.hideBottomNavigation(View.GONE) - viewModel.machineWorker_getHistorical(getData(USER), getData(PASSWORD), numberPlate) + viewModel.machineWorker_getHistorical(numberPlate) binding.mainToolbar.toolbarTitle.text = getString(R.string.vehiclediary) setEvents() super.init() diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/historicovehiculo/fragment/HistoricoVehiculoViewModel.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/historicovehiculo/fragment/HistoricoVehiculoViewModel.kt index 170afb9d..6ebc6ed0 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/historicovehiculo/fragment/HistoricoVehiculoViewModel.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/historicovehiculo/fragment/HistoricoVehiculoViewModel.kt @@ -26,8 +26,8 @@ class HistoricoVehiculoViewModel (context: Context) : BaseViewModel(context) { val loadHistoricoVehiculoList = Transformations.map(_historicovehiculoList) { Event(it) } - fun machineWorker_getHistorical(usuario:String,password:String,plateNumber:String){ - GetVehicleControlTimeUserCase.machineWorker_getHistorical(usuario,password,plateNumber).enqueue(object : + fun machineWorker_getHistorical(plateNumber:String){ + silex.machineWorker_getHistorical(plateNumber).enqueue(object : Callback> { override fun onFailure(call: Call>, t: Throwable) { val listError:ArrayList = ArrayList() 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 68eb5c65..343eb227 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 @@ -512,7 +512,7 @@ class LoginFragment : BaseFragment(LoginVi ) //Tarea 4351 quitar el if y poner e device_checkLogin a continuación del response de operator_add - viewModel.operator_add(getData(USER), getData(PASSWORD)) + viewModel.operator_add() } } diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/login/fragment/LoginViewModel.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/login/fragment/LoginViewModel.kt index 4c9cd5aa..979fdb14 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/login/fragment/LoginViewModel.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/login/fragment/LoginViewModel.kt @@ -449,9 +449,9 @@ class LoginViewModel(var context: Context) : BaseViewModel(context) { }) } - fun operator_add(user: String, password: String) { + fun operator_add() { - getLoginUserCase.operator_add(user, password).enqueue(object : Callback { + silex.operator_add().enqueue(object : Callback { override fun onFailure(call: Call, t: Throwable) { _operatorAdd.value = ResponseItemVO( isError = true, diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/PackagingCountFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/PackagingCountFragment.kt index cf66df4a..488e53c5 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/PackagingCountFragment.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/PackagingCountFragment.kt @@ -42,9 +42,7 @@ class PackagingCountFragment( override fun onCreate(savedInstanceState: Bundle?) { viewModel.supplier_getItems( - usuario = getData(USER), - password = getData(PASSWORD), - getData("SUPPLIERID") + getData("SUPPLIERID") as Int ) super.onCreate(savedInstanceState) diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/PackagingViewModel/SupplierViewModel.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/PackagingViewModel/SupplierViewModel.kt index c111679f..4e26c456 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/PackagingViewModel/SupplierViewModel.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/PackagingViewModel/SupplierViewModel.kt @@ -3,13 +3,10 @@ package es.verdnatura.presentation.view.feature.packaging.fragment.PackagingView import android.content.Context import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData -import es.verdnatura.domain.GetInventaryUserCase -import es.verdnatura.domain.GetPackagingUserCase import es.verdnatura.presentation.base.BaseViewModel import es.verdnatura.presentation.base.getMessageFromAllResponse import es.verdnatura.presentation.base.nameofFunction import es.verdnatura.presentation.common.ResponseItemVO -import es.verdnatura.presentation.view.feature.inventario.model.InventaryListVO import es.verdnatura.presentation.view.feature.packaging.model.* import retrofit2.Call import retrofit2.Callback @@ -17,13 +14,6 @@ import retrofit2.Response class PackagingViewModel(context: Context) : BaseViewModel(context) { - private val getInventaryUserCase: GetInventaryUserCase = GetInventaryUserCase(context) - private val getPackagingUserCase: GetPackagingUserCase = GetPackagingUserCase(context) - - - private val _inventaryList by lazy { MutableLiveData() } - val inventaryList: LiveData - get() = _inventaryList private val _itemSupplierList by lazy { MutableLiveData() } val itemSupplierList: LiveData @@ -41,8 +31,8 @@ class PackagingViewModel(context: Context) : BaseViewModel(context) { val response: LiveData get() = _response - fun getSuppliers(token: String) { - getPackagingUserCase.getSuppliers(token) + fun getSuppliers() { + salix.getSuppliers() .enqueue(object : Callback> { override fun onFailure(call: Call>, t: Throwable) { @@ -84,9 +74,9 @@ class PackagingViewModel(context: Context) : BaseViewModel(context) { }) } - fun supplier_getItems(usuario: String, password: String, supplierFk: String) { + fun supplier_getItems(supplierFk: Int) { - getPackagingUserCase.supplier_getItems(usuario, password, supplierFk) + silex.supplier_getItems(supplierFk) .enqueue(object : Callback> { override fun onFailure(call: Call>, t: Throwable) { val listError: ArrayList = ArrayList() @@ -119,8 +109,8 @@ class PackagingViewModel(context: Context) : BaseViewModel(context) { }) } - fun entry_addSalix(token: String, entry: EntrySalix) { - getPackagingUserCase.Entries(token, entry = entry) + fun entry_addSalix(entry: EntrySalix) { + salix.Entries(entry = entry) .enqueue(object : Callback { override fun onFailure(call: Call, t: Throwable) { diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/SupplierFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/SupplierFragment.kt index 38818903..254d4b5b 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/SupplierFragment.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/SupplierFragment.kt @@ -2,7 +2,6 @@ package es.verdnatura.presentation.view.feature.packaging.fragment import android.content.Context import android.os.Bundle -import android.util.Log.d import android.view.View import androidx.recyclerview.widget.LinearLayoutManager import es.verdnatura.R @@ -45,7 +44,6 @@ class SupplierFragment( override fun onCreate(savedInstanceState: Bundle?) { viewModel.getSuppliers( - getData(TOKEN), ) super.onCreate(savedInstanceState) @@ -80,8 +78,8 @@ class SupplierFragment( setToolBar() setEvents() - var entrada = EntrySalix(supplierFk = "591", travelFk = "186025", companyFk = "442") - viewModel.entry_addSalix(getData(TOKEN), entrada) + val entry = EntrySalix(supplierFk = "591", travelFk = "186025", companyFk = "442") + viewModel.entry_addSalix(entry) super.init() } @@ -102,7 +100,7 @@ class SupplierFragment( saveData("ENTRYTYPE", "Rec") } R.id.radioButtonDev -> { - d("VERDNATURA::", "dev") + saveData("ENTRYTYPE", "Dev") } 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 192a25d5..b94823a5 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 @@ -213,54 +213,54 @@ class PasilleroViewModel(context: Context) : BaseViewModel(context) { ) ) ) - _pasillerositem.add( - PasillerosItemVO( - 7, - R.drawable.ic_baseline_all_inbox_24, - contextApp.getString(R.string.titleReplacement), - R.string.titleReplacement, - contextApp.getString( - R.string.titleReplacDescrip + /* _pasillerositem.add( + PasillerosItemVO( + 7, + R.drawable.ic_baseline_all_inbox_24, + contextApp.getString(R.string.titleReplacement), + R.string.titleReplacement, + contextApp.getString( + R.string.titleReplacDescrip + ) ) ) - ) - _pasillerositem.add( - PasillerosItemVO( - 4, - R.drawable.ic_move_to_inbox_black_24dp, - contextApp.getString(R.string.titleFaults), - R.string.titleFaults, - contextApp.getString(R.string.titleFaultsDescrip) - ) - ) + _pasillerositem.add( + PasillerosItemVO( + 4, + R.drawable.ic_move_to_inbox_black_24dp, + contextApp.getString(R.string.titleFaults), + R.string.titleFaults, + contextApp.getString(R.string.titleFaultsDescrip) + ) + ) - _pasillerositem.add( - PasillerosItemVO( - 5, - R.drawable.ic_send_black_24dp, - contextApp.getString(R.string.titleShelvingParking), - R.string.titleShelvingParking, - contextApp.getString( - R.string.titleShelParkDescrip - ) - ) - ) + _pasillerositem.add( + PasillerosItemVO( + 5, + R.drawable.ic_send_black_24dp, + contextApp.getString(R.string.titleShelvingParking), + R.string.titleShelvingParking, + contextApp.getString( + R.string.titleShelParkDescrip + ) + ) + ) - //Tarea 3335 Borrat proced(Carles) -/* _pasillerositem.add( - PasillerosItemVO( - 8, - R.drawable.ic_baseline_star_24, - contextApp.getString(R.string.titleQuality), - R.string.titleQuality, - contextApp.getString( - R.string.titleQualityDescrip - ) - ) - )*/ + //Tarea 3335 Borrat proced(Carles) + _pasillerositem.add( + PasillerosItemVO( + 8, + R.drawable.ic_baseline_star_24, + contextApp.getString(R.string.titleQuality), + R.string.titleQuality, + contextApp.getString( + R.string.titleQualityDescrip + ) + ) + )*/ } diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/EndSacadorFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/EndSacadorFragment.kt index 30f44d2b..e71b630d 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/EndSacadorFragment.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/EndSacadorFragment.kt @@ -17,6 +17,7 @@ import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import es.verdnatura.R import es.verdnatura.databinding.FragmentPreSacadorBinding +import es.verdnatura.domain.toInt import es.verdnatura.domain.toast import es.verdnatura.presentation.base.BaseFragment import es.verdnatura.presentation.common.* @@ -48,7 +49,7 @@ class EndSacadorFragment( private lateinit var customDialog: CustomDialog private lateinit var customDialogList: CustomDialogList private var saleAdapter: PreSacadorAdapter? = null - private var ticket: String = "" + private var ticket: Int =0 private var lm: LinearLayoutManager? = null private var pasillerosItemClickListener: OnPasillerosItemClickListener? = null private var storedPosition: Int = 0 @@ -142,7 +143,7 @@ class EndSacadorFragment( if (binding.scanInput.text.first().isDigit()) { //es ticket ticketFk = binding.scanInput.text.toString() - searchTicket(binding.scanInput.text.toString()) + searchTicket(binding.scanInput.toInt()) } else { //es sale findSale(binding.scanInput.text.toString()) @@ -314,7 +315,7 @@ class EndSacadorFragment( } else { viewModel.sectorCollection_getSale( collection.collectionFk, - getData(SECTORFK) + getData(SECTORFK).toInt() ) } } @@ -562,28 +563,19 @@ class EndSacadorFragment( //CREATE LIST private fun searchSaleCollection() { - binding.splashProgress.visibility = View.VISIBLE + binding.splashProgress.visibility = VISIBLE viewModel.sectorCollection_getSale( collection.collectionFk, - vSectorFk = getData(SECTORFK) + vSectorFk = getData(SECTORFK).toInt() ) } - private fun searchTicket(ticketFk: String) { + private fun searchTicket(ticketFk: Int) { //Log.i(TAG, "Escaneamos ticket en previa" + ticketFk) ticket = ticketFk - - /* viewModel.ticketToPrePrepare( - usuario = getData(USER), - getData(PASSWORD), - ticketFk = ticketFk, - sectorFk = getData(SECTORFK) - )*/ - - - if (!ticketFk.isNullOrEmpty()) - binding.splashProgress.visibility = View.VISIBLE + if (ticketFk!=0) + binding.splashProgress.visibility = VISIBLE viewModel.sectorCollectionSaleGroup_add( ticketFk, collection.collectionFk @@ -602,7 +594,7 @@ class EndSacadorFragment( ) } else { - if (ticket.isNullOrBlank()) { + if (ticket==0) { binding.mainToolbar.toolbarTitle.text = collection.collectionFk.toString() } sales = ArrayList() @@ -687,7 +679,7 @@ class EndSacadorFragment( if (it.saldo == it.picked) totalMark += 1 } - if (ticket.isNullOrBlank()) { + if (ticket==0) { binding.mainToolbar.toolbarTitle.text = collection.collectionFk.toString() } @@ -805,19 +797,15 @@ class EndSacadorFragment( if (sales[position].picked == sales[position].quantity) { viewModel.saleTracking_updateIsChecked( - usuario = getData(USER), - password = getData(PASSWORD), - vSaleFk = sales[position].idMovimiento, - vIsChecked = if (sales[position].picked == sales[position].quantity) "1" else "0" + vSaleFk = sales[position].idMovimiento.toInt(), + vIsChecked = sales[position].picked == sales[position].quantity ) } if (sales[position].picked == 0) { viewModel.saleTracking_updateIsChecked( - usuario = getData(USER), - password = getData(PASSWORD), - vSaleFk = sales[position].idMovimiento, - vIsChecked = if (sales[position].picked == sales[position].quantity) "1" else "0" + vSaleFk = sales[position].idMovimiento.toInt(), + vIsChecked = sales[position].picked == sales[position].quantity ) } @@ -835,8 +823,6 @@ class EndSacadorFragment( setListPosition(position) viewModel.itemShelving_updateFromSale( - usuario = getData(USER), - password = getData(PASSWORD), saleFk = sales[position].idMovimiento ) positionUnmarked = position @@ -1017,8 +1003,6 @@ class EndSacadorFragment( viewModel.itemShelvingSaleSupplyAdd( - usuario = getData(USER), - password = getData(PASSWORD), itemShelvingFk = itemShelvingFk, saleFk = sales[storedPosition].idMovimiento, quantity = customDialogList.getValue() @@ -1045,72 +1029,6 @@ class EndSacadorFragment( return saleToCheck.itemFk == valueToCheck.toInt() } - /* private fun showScannerParking(ticket: String) { - - customDialogInputParking.setTitle("Parking").setDescription("Escanea el parking") - .setOkButton(getString(R.string.accept)) { - if (!customDialogInputParking.getValue().isNullOrEmpty()) { - //findSale(customDialogInput.getValue(),index) - parkingTicket(ticket, customDialogInputParking.getValue()) - - } - customDialogInputParking.setValue("") - scanRequest() - customDialogInputParking.dismiss() - hideKeyboards() - }.setKoButton(getString(R.string.cancel)) { - customDialogInputParking.dismiss() - }.setValue("").show() - customDialogInputParking.getEditText().requestFocus() - customDialogInputParking.getEditText().setOnEditorActionListener { v, actionId, event -> - if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0) { - if (!customDialogInputParking.getValue().isNullOrEmpty()) { - parkingTicket(ticket, customDialogInputParking.getValue()) - } - customDialogInputParking.setValue("") - scanRequest() - customDialogInputParking.dismiss() - hideKeyboards() - return@setOnEditorActionListener true - } - false - } - - }*/ - - /*private fun showScannerTicket() { - - customDialogInput.setTitle("Ticket a aparcar").setDescription("Escanea el ticket a aparcar") - .setOkButton(getString(R.string.accept)) { - if (!customDialogInput.getValue().isNullOrEmpty()) { - showScannerParking(customDialogInput.getValue()) - - } - customDialogInput.setValue("") - scanRequest() - customDialogInput.dismiss() - hideKeyboards() - }.setKoButton(getString(R.string.cancel)) { - customDialogInput.dismiss() - }.setValue("").show() - customDialogInput.getEditText().requestFocus() - customDialogInput.getEditText().setOnEditorActionListener { v, actionId, event -> - if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0) { - if (!customDialogInput.getValue().isNullOrEmpty()) { - // findSale(customDialogInput.getValue(),index) - showScannerParking(customDialogInput.getValue()) - } - customDialogInput.setValue("") - scanRequest() - customDialogInput.dismiss() - hideKeyboards() - return@setOnEditorActionListener true - } - false - } - - }*/ - private fun showScanner(index: Int, sale: PreSacadorItemVO) { customDialogInput.setTitle("" + sale.itemFk) @@ -1324,7 +1242,7 @@ class EndSacadorFragment( viewModel.collectionMissingTrash( usuario = getData(USER), password = getData(PASSWORD), - saleFk = sales[position].idMovimiento, + saleFk = sales[position].idMovimiento.toString(), quantity = totalQuantity.toString(), warehouseFk = getData(WAREHOUSEFK), type = "FALSE", @@ -1347,7 +1265,6 @@ class EndSacadorFragment( binding.splashProgress.visibility = VISIBLE viewModel.transferSalesSalix( - getData(TOKEN), ticketFk = sales[position].id, saleFk = sales[position].idMovimiento, quantity = totalQuantity.toString() @@ -1363,7 +1280,7 @@ class EndSacadorFragment( viewModel.collectionIncreaseQuantity( token = getData(TOKEN), - saleFk = sales[position].idMovimiento, + saleFk = sales[position].idMovimiento.toString(), quantity = quantity ) diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/InitPreSacadorFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/InitPreSacadorFragment.kt index c4c5ee5b..4834b398 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/InitPreSacadorFragment.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/InitPreSacadorFragment.kt @@ -41,8 +41,7 @@ class InitPreSacadorFragment ( } override fun getLayoutId(): Int = R.layout.fragment_sacador - - + override fun init() { customDialog = CustomDialog(requireContext()) @@ -50,10 +49,9 @@ class InitPreSacadorFragment ( binding.splashProgressTwo.visibility = View.GONE setToolBar() setEvents() - viewModel.sectorCollection_get(getData(USER),getData(PASSWORD)) + viewModel.sectorCollection_get() super.init() - } override fun onPause() { @@ -91,12 +89,9 @@ class InitPreSacadorFragment ( iconAdd.drawable -> { binding.splashProgress.visibility = View.VISIBLE - viewModel.sectorCollection_new(getData(USER), - getData(PASSWORD),getData(SECTORFK)) + viewModel.sectorCollection_new(getData(SECTORFK).toInt()) } - } - } }) binding.mainToolbar.toolbarIcons.layoutManager = @@ -105,7 +100,7 @@ class InitPreSacadorFragment ( private fun setEvents() { binding.sacadorSwipe.setOnRefreshListener { - viewModel.sectorCollection_get(getData(USER),getData(PASSWORD)) + viewModel.sectorCollection_get() binding.sacadorSwipe.isRefreshing = false } } @@ -144,7 +139,7 @@ class InitPreSacadorFragment ( } else { //if (goBack) - viewModel.sectorCollection_get(getData(USER),getData(PASSWORD)) + viewModel.sectorCollection_get() } goBack = false //sergio:para asegurarnos que aparece en pantalla. En mi movil personal y trabajo no hacia falta. diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/PreSacadorViewModel.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/PreSacadorViewModel.kt index 4e232195..147145fd 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/PreSacadorViewModel.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/PreSacadorViewModel.kt @@ -275,15 +275,11 @@ class PreSacadorViewModel(context: Context) : BaseViewModel(context) { } fun itemShelvingSaleSupplyAdd( - usuario: String, - password: String, itemShelvingFk: String, saleFk: String, quantity: String ) { - getSacadorControladorUserCase.itemShelvingSaleSupplyAdd( - usuario, - password, + silex.itemShelvingSaleSupplyAdd( itemShelvingFk, saleFk, quantity @@ -600,9 +596,9 @@ class PreSacadorViewModel(context: Context) : BaseViewModel(context) { } - fun sectorCollection_get(usuario: String, password: String) { + fun sectorCollection_get() { - getPreSacadorUseCase.sectorCollection_get(usuario, password).enqueue(object : + silex.sectorCollection_get().enqueue(object : Callback> { override fun onFailure(call: Call>, t: Throwable) { val listError: ArrayList = ArrayList() @@ -643,11 +639,9 @@ class PreSacadorViewModel(context: Context) : BaseViewModel(context) { } fun sectorCollection_new( - usuario: String, - password: String, - sectorFk: String + sectorFk: Int ) { - getPreSacadorUseCase.sectorCollection_new(usuario, password, sectorFk).enqueue( + silex.sectorCollection_new(sectorFk).enqueue( object : Callback { override fun onFailure(call: Call, t: Throwable) { @@ -706,9 +700,9 @@ class PreSacadorViewModel(context: Context) : BaseViewModel(context) { fun sectorCollection_getSale( sectorCollectionFK: Int, - vSectorFk: String + vSectorFk: Int ) { - getPreSacadorUseCase.sectorCollection_getSale( + silex.sectorCollection_getSale( sectorCollectionFK, vSectorFk ) @@ -734,10 +728,10 @@ class PreSacadorViewModel(context: Context) : BaseViewModel(context) { fun sectorCollectionSaleGroup_add( - vSaleGroupFk: String, + vSaleGroupFk: Int, vSectorCollectionFk: Int ) { - getPreSacadorUseCase.sectorCollectionSaleGroup_add( + silex.sectorCollectionSaleGroup_add( vSaleGroupFk, vSectorCollectionFk ).enqueue( @@ -831,12 +825,10 @@ class PreSacadorViewModel(context: Context) : BaseViewModel(context) { } fun saleTracking_updateIsChecked( - usuario: String, - password: String, - vSaleFk: String, - vIsChecked: String + vSaleFk: Int, + vIsChecked: Boolean ) { - getPreSacadorUseCase.saleTracking_updateIsChecked(usuario, password, vSaleFk, vIsChecked) + silex.saleTracking_updateIsChecked(vSaleFk, vIsChecked) .enqueue( object : Callback { @@ -883,13 +875,9 @@ class PreSacadorViewModel(context: Context) : BaseViewModel(context) { fun itemShelving_updateFromSale( - usuario: String, - password: String, saleFk: String ) { - getSacadorControladorUserCase.itemShelving_updateFromSale( - usuario, - password, + silex.itemShelving_updateFromSale( saleFk ) .enqueue(object : Callback { @@ -918,17 +906,15 @@ class PreSacadorViewModel(context: Context) : BaseViewModel(context) { } fun transferSalesSalix( - token:String, ticketFk:String, saleFk: String, quantity: String, ) { - getSacadorControladorUserCase.transferSalesSalix( - token, - ticketFk, - saleFk, - quantity + var saleTransfer = listSaleSalix(arrayListOf(saleSalix(id = saleFk.toInt(), quantity = quantity.toInt()))) + //saleTransfer.sales.add(saleSalix(id = saleFk.toInt(), quantity = quantity.toInt())) + salix.transferSalesSalix( + ticketFk,saleTransfer ).enqueue(object : Callback { override fun onFailure(call: Call, t: Throwable) { diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/qr/QrFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/qr/QrFragment.kt index 7cd19631..081cd0ae 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/qr/QrFragment.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/qr/QrFragment.kt @@ -1,7 +1,6 @@ package es.verdnatura.presentation.view.feature.qr -import android.view.KeyEvent.* import android.view.View import android.view.inputmethod.EditorInfo import androidx.lifecycle.Observer @@ -9,7 +8,6 @@ import es.verdnatura.R import es.verdnatura.databinding.FragmentQrBinding import es.verdnatura.presentation.base.BaseFragment import es.verdnatura.presentation.view.component.CustomDialog -import es.verdnatura.presentation.view.feature.main.activity.MainActivity @Suppress("UNUSED_ANONYMOUS_PARAMETER") @@ -63,7 +61,9 @@ class QrFragment( goBack = false if (!binding.scanInput.text.isNullOrEmpty()) { binding.splashProgress.visibility = View.VISIBLE - viewModel.qr_getCall(getData(USER), getData(PASSWORD), binding.scanInput.text.toString()) + viewModel.qr_getCall( + binding.scanInput.text.toString() + ) itemscaned = binding.scanInput.text.toString() } @@ -72,7 +72,7 @@ class QrFragment( ma.hideKeyboard(binding.scanInput) return@setOnEditorActionListener true } - // false + // false } @@ -83,13 +83,16 @@ class QrFragment( binding.splashProgress.visibility = View.GONE if (it.isError) { - ma.messageWithSound(it.errorMessage+ " "+itemscaned,true,false) + ma.messageWithSound(it.errorMessage + " " + itemscaned, true, false) } else { customDialog.setTitle(getString(R.string.info)) - .setDescription(getString(R.string.operation) + itemscaned + "." + getString( - R.string.answer) +it.response) + .setDescription( + getString(R.string.operation) + itemscaned + "." + getString( + R.string.answer + ) + it.response + ) .setOkButton(getString(R.string.accept)) { customDialog.dismiss() binding.mainToolbar.backButton.performClick() diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/qr/QrFragmentViewModel.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/qr/QrFragmentViewModel.kt index 0dc4ecb7..06a1520f 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/qr/QrFragmentViewModel.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/qr/QrFragmentViewModel.kt @@ -5,7 +5,6 @@ import android.content.Context import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import es.verdnatura.R -import es.verdnatura.domain.GetQrReaderUserCase import es.verdnatura.presentation.base.BaseViewModel import es.verdnatura.presentation.base.getMessageFromAllResponse import es.verdnatura.presentation.base.nameofFunction @@ -16,17 +15,14 @@ import retrofit2.Response class QrFragmentViewModel(context: Context) : BaseViewModel(context) { private val contextApp =context - private val GetQrReaderUserCase: GetQrReaderUserCase = - GetQrReaderUserCase(context) - private val _qrresponse by lazy { MutableLiveData() } val qrresponse: LiveData get() = _qrresponse - fun qr_getCall(user: String, password: String, vStatement: String){ - GetQrReaderUserCase.qr_getCall(user, password, vStatement) + fun qr_getCall(vStatement: String){ + silex.qr_getCall(vStatement) .enqueue(object : Callback { override fun onFailure(call: Call, t: Throwable) { diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/reubication/fragment/ReubicationCollectionFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/reubication/fragment/ReubicationCollectionFragment.kt index 6860cf4e..2d8cd929 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/reubication/fragment/ReubicationCollectionFragment.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/reubication/fragment/ReubicationCollectionFragment.kt @@ -179,8 +179,6 @@ class ReubicationCollectionFragment( if (customDialogInputTwoValues.getValueTwo().isNotEmpty()) { binding.splashProgress.visibility = VISIBLE viewModel.itemShelving_merge( - getData(USER), - getData(PASSWORD), itemReubication.id, customDialogInputTwoValues.getValueTwo().uppercase() ) @@ -210,8 +208,6 @@ class ReubicationCollectionFragment( binding.splashProgress.visibility = VISIBLE viewModel.itemShelving_merge( - getData(USER), - getData(PASSWORD), itemReubication.id, customDialogInputTwoValues.getValueTwo().uppercase() ) @@ -290,62 +286,9 @@ class ReubicationCollectionFragment( binding.splashProgress.visibility = VISIBLE viewModel.itemShelving_return( - usuario = getData(USER), - password = getData(PASSWORD), shelvingFk = shelving, - ) } - /* private fun createReubications(list: MutableList) { - - *//* val listItems = mutableListOf() - val reubication = mutableListOf() - - for (item in list) { - if (!listItems.contains(item.itemFk)) { - listItems.add(item.itemFk) - reubication.add( - Reubication( - itemFk = item.itemFk, - longName = item.longName, - visible = item.visible, - shelvingFk = item.shelvingFk - ) - ) - } - } - - for (item in list) { - for (r in reubication) { - if (item.itemFk == r.itemFk) { - - if (item.shelvingFk.uppercase() != shelving.uppercase()) - r.carros.add( - PlacementReubication( - code = item.code, - plate = item.shelvingFk, - visible = "(" + item.visible + ")", - idItemShelving = item.id - ) - ) - } - } - } - - for (item in list) { - Log.d("VERDNATURA::", "el item es " + item.itemFk + "-" + item.id + "-" + item.visible) - for (r in item.carros) { - Log.d( - "VERDNATURA::", - "la reubic es" + r.idItemShelving + "-" + r.plate + "-" + r.code - ) - } - } - //ma.openFragmentReubications(reubication,shelving) - *//* - showList(list) - }*/ - } \ No newline at end of file diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/reubication/fragment/ReubicationFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/reubication/fragment/ReubicationFragment.kt index a9d4d239..302a1c5d 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/reubication/fragment/ReubicationFragment.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/reubication/fragment/ReubicationFragment.kt @@ -62,10 +62,7 @@ class ReubicationFragment(var entrypoint: String) : binding.splashProgress.visibility = VISIBLE shelvingScaned = binding.scanInput.text.toString() viewModel.itemShelving_return( - usuario = getData(USER), - password = getData(PASSWORD), shelvingFk = binding.scanInput.text.toString(), - ) } diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/reubication/model/Reubication.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/reubication/model/Reubication.kt index a2dd0c2f..140dda4d 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/reubication/model/Reubication.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/reubication/model/Reubication.kt @@ -6,7 +6,7 @@ class ReubicationList( ) class Reubication( - var id: String = "", //ok + var id: Int, //ok var shelvingFk: String = "", //ok var code: String = "", // no var itemFk: String = "",//ok diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/sacador/fragment/SacadorFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/sacador/fragment/SacadorFragment.kt index 070af711..668d9974 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/sacador/fragment/SacadorFragment.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/sacador/fragment/SacadorFragment.kt @@ -227,7 +227,7 @@ class SacadorFragment : goBack = false //sergio:para asegurarnos que aparece en pantalla. - val working_in_test = false //sergio: ok en app SACADOR + val working_in_test = true //sergio: ok en app SACADOR if (!working_in_test) { viewModel.collectionGetSalix(token = getData(TOKEN)) } else { diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorFragment.kt index e32ed0a1..3544cbb7 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorFragment.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorFragment.kt @@ -7,6 +7,7 @@ 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 @@ -17,6 +18,7 @@ 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.* @@ -52,6 +54,7 @@ class UbicadorFragment( private var modeCheckUbication = false var mperror: MediaPlayer? = null var mpok: MediaPlayer? = null + var isBack=false companion object { @@ -59,7 +62,10 @@ class UbicadorFragment( } 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) @@ -127,16 +133,17 @@ class UbicadorFragment( } val iconChecker = ImageView(context) - iconChecker.setImageResource(R.drawable.ic_controller_ui) + 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) + //listIcons.add(iconChecker) binding.mainToolbar.toolbarIcons.adapter = @@ -229,16 +236,20 @@ class UbicadorFragment( 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.text.toString(), + binding.editPrioridad.toInt(), shelvingFk ) + } ma.hideKeyboard(binding.editPrioridad) - return@setOnEditorActionListener true + //return@setOnEditorActionListener false } + //return@setOnEditorActionListener false + binding.editMatricula.requestFocus() return@setOnEditorActionListener false } @@ -308,8 +319,6 @@ class UbicadorFragment( customDialogInput.setTitle(getString(R.string.changeShelving)).setValue("") .setOkButton(getString(R.string.save)) { viewModel.shelvingChange( - getData(USER), - getData(PASSWORD), shelvingFk, customDialogInput.getValue() ) @@ -330,8 +339,6 @@ class UbicadorFragment( customDialogInput.getEditText().setOnEditorActionListener { v, actionId, event -> if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0) { viewModel.shelvingChange( - getData(USER), - getData(PASSWORD), shelvingFk, customDialogInput.getValue() ) @@ -426,7 +433,9 @@ class UbicadorFragment( @SuppressLint("SetTextI18n") override fun observeViewModel() { + with(viewModel) { + loadShelvingList.observe(viewLifecycleOwner, Observer { event -> event.getContentIfNotHandled().notNull { @@ -517,7 +526,7 @@ class UbicadorFragment( if (isShelvinLogfromMainScreen) { //tarea 4454 - viewModel.shelvinLog_add(getData(USER), getData(PASSWORD), shelvingFk) + viewModel.shelvinLog_add(shelvingFk) } } @@ -546,12 +555,14 @@ class UbicadorFragment( }) responsepriority.observe(viewLifecycleOwner, Observer { - - ma.messageWithSound( + if (!isBack){ + binding.splashProgress.visibility=GONE + ma.messageWithSound( if (it.isError) it.errorMessage else { getString(R.string.priorityChanged) }, it.isError, true - ) + )} + isBack=false }) @@ -568,6 +579,7 @@ class UbicadorFragment( } }) } + } private fun showAddItem( @@ -858,4 +870,5 @@ class UbicadorFragment( customDialogTwoButtons.dismiss() }.show() } -} \ No newline at end of file +} + diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorViewModel.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorViewModel.kt index 2e6c5fb3..6c643e1a 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorViewModel.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorViewModel.kt @@ -92,7 +92,7 @@ class UbicadorViewModel(context: Context) : BaseViewModel(context) { } fun shelvingPriorityUpdate( - priority: String, + priority: Int, shelving: String ) { @@ -256,12 +256,10 @@ class UbicadorViewModel(context: Context) : BaseViewModel(context) { } fun shelvingChange( - usuario: String, - password: String, origen: String, destino: String ) { - getUbicadorUserCase.shelvingChange(usuario, password, origen, destino) + silex.shelvingChange(origen, destino) .enqueue(object : Callback { override fun onFailure(call: Call, t: Throwable) { _response.value = ResponseItemVO( @@ -288,13 +286,11 @@ class UbicadorViewModel(context: Context) : BaseViewModel(context) { } fun itemShelving_merge( - usuario: String, - password: String, - vShelf: String, + vShelf: Int, vShelvingFk: String ) { - getUbicadorUserCase.itemShelving_merge(usuario, password, vShelf, vShelvingFk) + silex.itemShelving_merge( vShelf, vShelvingFk) .enqueue(object : Callback { override fun onFailure(call: Call, t: Throwable) { _response.value = ResponseItemVO( @@ -322,13 +318,9 @@ class UbicadorViewModel(context: Context) : BaseViewModel(context) { fun shelvinLog_add( - usuario: String, - password: String, code: String - - ) { - getUbicadorUserCase.shelvinLog_add(usuario, password, code) + silex.shelvingLog_add(code) .enqueue(object : Callback { override fun onFailure(call: Call, t: Throwable) { _response.value = ResponseItemVO( @@ -352,17 +344,15 @@ class UbicadorViewModel(context: Context) : BaseViewModel(context) { } fun itemShelving_return( - usuario: String, - password: String, shelvingFk: String, ) { - getUbicadorUserCase.itemShelving_return(usuario, password, shelvingFk) + silex.itemShelving_return(shelvingFk) .enqueue(object : Callback> { override fun onFailure(call: Call>, t: Throwable) { val listError: ArrayList = ArrayList() listError.add( - Reubication( + Reubication(0, isError = true, errorMessage = getMessageFromAllResponse( nameofFunction(this), @@ -381,7 +371,7 @@ class UbicadorViewModel(context: Context) : BaseViewModel(context) { if (response.body() == null) { val listError: ArrayList = ArrayList() listError.add( - Reubication( + Reubication(0, isError = true, errorMessage = getMessageFromAllResponse( nameofFunction(this), diff --git a/app/src/main/res/drawable/ic_ubicator_check.xml b/app/src/main/res/drawable/ic_ubicator_check.xml new file mode 100644 index 00000000..4bf1e897 --- /dev/null +++ b/app/src/main/res/drawable/ic_ubicator_check.xml @@ -0,0 +1,8 @@ + + + + \ No newline at end of file