diff --git a/.idea/workspace.xml b/.idea/workspace.xml index e0b59e16..ac59fd71 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -44,8 +44,8 @@ - @@ -83,16 +83,30 @@ - + - - + + + + + + + + + + + + - - + + + + + + @@ -796,7 +810,7 @@ - @@ -856,7 +870,6 @@ - - file://$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/fragment/ItemCardViewModel.kt - 62 - file://$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/login/fragment/LoginFragment.kt - 347 + 351 file://$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/PreSacadorViewModel.kt - 697 + 694 file://$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/PreSacadorViewModel.kt - 698 + 695 file://$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/PreSacadorViewModel.kt - 702 + 699 + + file://$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/SilexCallback.kt + 34 + diff --git a/app/src/main/java/es/verdnatura/domain/GetItemCardUserCase.kt b/app/src/main/java/es/verdnatura/domain/GetItemCardUserCase.kt index 64c5f530..f422a995 100644 --- a/app/src/main/java/es/verdnatura/domain/GetItemCardUserCase.kt +++ b/app/src/main/java/es/verdnatura/domain/GetItemCardUserCase.kt @@ -21,12 +21,12 @@ class GetItemCardUserCase(context: Context) : RestClient(context) { params.add(itemFk) params.add(warehouseFk) return restClient!!.getItemCard( - "json", + /* "json", "1", usuario, password, "application/json", - params = params + params = params*/ ) } @@ -57,12 +57,12 @@ class GetItemCardUserCase(context: Context) : RestClient(context) { fun getItemPackingType(usuario: String, password: String): Call> { val params: ArrayList = ArrayList() return restClient!!.getItemPackingType( - "json", + /* "json", "1", usuario, password, "application/json", - params = params + params = params*/ ) } @@ -107,12 +107,12 @@ class GetItemCardUserCase(context: Context) : RestClient(context) { params.add(value) params.add(warehouseFk) return restClient!!.updateGrouping( - "json", + /* "json", "1", usuario, password, "application/json", - params = params + params = params*/ ) } @@ -128,12 +128,12 @@ class GetItemCardUserCase(context: Context) : RestClient(context) { params.add(value) params.add(warehouseFk) return restClient!!.updatePacking( - "json", + /* "json", "1", usuario, password, "application/json", - params = params + params = params*/ ) } @@ -157,12 +157,12 @@ class GetItemCardUserCase(context: Context) : RestClient(context) { params.add(itemFk) params.add(value) return restClient!!.item_saveStems( - "json", + /* "json", "1", usuario, password, "application/json", - params = params + params = params*/ ) } @@ -171,17 +171,17 @@ class GetItemCardUserCase(context: Context) : RestClient(context) { password: String, itemFk: Int, value: Int - ): Call { + ): Call { val params: ArrayList = ArrayList() params.add(itemFk) params.add(value) return restClient!!.item_saveReference( - "json", + /* "json", "1", usuario, password, "application/json", - params = params + params = params*/ ) } diff --git a/app/src/main/java/es/verdnatura/domain/GetPaletizadoresUserCase.kt b/app/src/main/java/es/verdnatura/domain/GetPaletizadoresUserCase.kt index 50b2a6a8..ae578714 100644 --- a/app/src/main/java/es/verdnatura/domain/GetPaletizadoresUserCase.kt +++ b/app/src/main/java/es/verdnatura/domain/GetPaletizadoresUserCase.kt @@ -13,17 +13,17 @@ class GetPaletizadoresUserCase(context: Context) : RestClient(context) { password: String, vBufferFk: Int, vType: String - ): Call { + ): Call { val params: ArrayList = ArrayList() params.add(vBufferFk) params.add(vType) return restClient!!.buffer_setTypeByName( - "json", + /* "json", "1", usuario, password, "application/json", - params = params + params = params*/ ) } @@ -313,7 +313,7 @@ class GetPaletizadoresUserCase(context: Context) : RestClient(context) { password: String, vExpeditionFk: String, vBufferFk: String - ): Call { + ): Call { val params: ArrayList = ArrayList() params.add(vExpeditionFk) params.add(vBufferFk) diff --git a/app/src/main/java/es/verdnatura/domain/GetSacadorControladorUserCase.kt b/app/src/main/java/es/verdnatura/domain/GetSacadorControladorUserCase.kt index b787ddab..a9036b89 100644 --- a/app/src/main/java/es/verdnatura/domain/GetSacadorControladorUserCase.kt +++ b/app/src/main/java/es/verdnatura/domain/GetSacadorControladorUserCase.kt @@ -3,7 +3,6 @@ package es.verdnatura.domain import android.content.Context import es.verdnatura.presentation.view.feature.collection.SalixSaleQuantity 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 retrofit2.Call @@ -50,7 +49,7 @@ class GetSacadorControladorUserCase(context: Context) : RestClient(context) { usuario: String, password: String, collectionFk: String - ): Call { + ): Call { val params: ArrayList = ArrayList() params.add(collectionFk) return restClient!!.ticket_checkFullyControlled( @@ -67,7 +66,7 @@ class GetSacadorControladorUserCase(context: Context) : RestClient(context) { usuario: String, password: String, ticketFk: String - ): Call { + ): Call { val params: ArrayList = ArrayList() params.add(ticketFk) return restClient!!.ticket_isOutClosureZone( @@ -378,7 +377,7 @@ class GetSacadorControladorUserCase(context: Context) : RestClient(context) { ) } - fun itemShelving_updateFromSale(usuario: String, password: String, saleFk: String): Call { + fun itemShelving_updateFromSale(usuario: String, password: String, saleFk: String): Call { val params: ArrayList = ArrayList() params.add(saleFk) return restClient!!.itemShelving_updateFromSale( @@ -394,7 +393,7 @@ class GetSacadorControladorUserCase(context: Context) : RestClient(context) { fun ticket_setState( ticketFk: Int, state: String - ): Call { + ): Call { return restClient!!.ticket_setState( ticketFk, state @@ -405,7 +404,7 @@ class GetSacadorControladorUserCase(context: Context) : RestClient(context) { fun debug_add( buyFk: String, message: String - ): Call { + ): Call { val params: ArrayList = ArrayList() params.add(buyFk) params.add(message) @@ -515,9 +514,9 @@ class GetSacadorControladorUserCase(context: Context) : RestClient(context) { ) } - /* fun mistakeType(usuario: String, password: String): Call> { - // val params:ArrayList = ArrayList() - return restClient!!.mistakeType("json", "1", usuario, password, "application/json") - }*/ + /* 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 7446d51d..53ba8239 100644 --- a/app/src/main/java/es/verdnatura/domain/GetVehicleControlTimeUserCase.kt +++ b/app/src/main/java/es/verdnatura/domain/GetVehicleControlTimeUserCase.kt @@ -10,15 +10,15 @@ class GetVehicleControlTimeUserCase(context: Context) : RestClient(context) { usuario: String, password: String, plateNumber: String - ): Call { + ): Call { val params: ArrayList = ArrayList() params.add(plateNumber) return restClient!!.machineWorker_add( - "json", + /*"json", "1", usuario, password, - "application/json", + "application/json",*/ params ) } @@ -27,7 +27,7 @@ class GetVehicleControlTimeUserCase(context: Context) : RestClient(context) { usuario: String, password: String, plateNumber: String - ): Call { + ): Call { val params: ArrayList = ArrayList() params.add(plateNumber) return restClient!!.machineWorker_update( @@ -63,7 +63,7 @@ class GetVehicleControlTimeUserCase(context: Context) : RestClient(context) { */ fun deviceProductionUser_getWorker( android_id: String - ): Call { + ): Call { val params: ArrayList = ArrayList() params.add(android_id) return restClient!!.deviceProductionUser_getWorker( @@ -73,7 +73,7 @@ class GetVehicleControlTimeUserCase(context: Context) : RestClient(context) { fun deviceProduction_getnameDevice( android_id: String - ): Call { + ): Call { val params: ArrayList = ArrayList() params.add(android_id) return restClient!!.deviceProduction_getnameDevice( diff --git a/app/src/main/java/es/verdnatura/domain/VerdnaturaService.kt b/app/src/main/java/es/verdnatura/domain/VerdnaturaService.kt index 6e6e18e4..c5963788 100644 --- a/app/src/main/java/es/verdnatura/domain/VerdnaturaService.kt +++ b/app/src/main/java/es/verdnatura/domain/VerdnaturaService.kt @@ -258,25 +258,15 @@ interface VerdnaturaService { @POST("almacennew/ticket_checkFullyControlled")//NO SALIX fun ticket_checkFullyControlled( - @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 + Call @POST("almacennew/ticket_isOutClosureZone")//NO SALIX fun ticket_isOutClosureZone( - @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 + Call @POST("almacennew/collection_getUncheckedTicket")//NO SALIX fun collection_getUncheckedTicket( @@ -413,19 +403,19 @@ interface VerdnaturaService { fun itemShelving_updateFromSale( @Body vararg params: Any ): - Call + Call @POST("almacennew/ticket_setState")//REVISADA fun ticket_setState( @Body vararg params: Any ): - Call + Call @POST("almacennew/debug_add")//REVISADA fun debug_add( - @Body params: List + @Body vararg params: Any ): - Call + Call @POST("almacennew/get_salesModifiedFromTicket")//REVISADA fun get_salesModifiedFromTicket( @@ -440,12 +430,7 @@ interface VerdnaturaService { @POST("almacennew/barcodeToItem")//REVISADA fun getIdFromCode( - @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 @@ -516,12 +501,8 @@ interface VerdnaturaService { @POST("almacennew/item_card")//REVISADA fun getItemCard( - @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 @@ -533,12 +514,8 @@ interface VerdnaturaService { @POST("almacennew/get_ItemPackingType")//REVISADA fun getItemPackingType( - @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> @@ -552,48 +529,31 @@ interface VerdnaturaService { @POST("almacennew/buy_updateGrouping")//REVISADA fun updateGrouping( - @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/buy_updatePacking")//REVISADA fun updatePacking( - @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/item_saveStems")//REVISADA fun item_saveStems( - @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/item_saveReference")//REVISADA fun item_saveReference( - @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 + Call @POST("almacennew/barcodes_edit")//REVISADA fun barcodes_edit( @@ -656,13 +616,13 @@ interface VerdnaturaService { fun machineWorker_add( @Body vararg params: Any ): - Call + Call @POST("almacennew/machineWorker_update")//REVISADA fun machineWorker_update( @Body vararg params: Any ): - Call + Call @POST("almacennew/workerMachinery_isRegistered")//REVISADA @@ -672,21 +632,21 @@ interface VerdnaturaService { @POST("almacennew/deviceProduction_getnameDevice")//REVISADA fun deviceProduction_getnameDevice( - @Body params: List + @Body vararg params: Any ): - Call + Call @POST("almacennew/deviceProductionUser_getWorker")//REVISADA fun deviceProductionUser_getWorker( - @Body params: List + @Body vararg params: Any ): - Call + Call @POST("almacennew/machine_getWorkerPlate")//REVISADA fun machine_getWorkerPlate( ): - Call + Call @POST("almacennew/machineWorker_getHistorical")//REVISADA fun machineWorker_getHistorical( @@ -792,14 +752,9 @@ interface VerdnaturaService { @POST("almacennew/buffer_setTypeByName")//REVISADA fun buffer_setTypeByName( - @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 + Call // Qr reader ========================================================================== @@ -979,7 +934,7 @@ interface VerdnaturaService { fun expeditionLoading_add( @Body vararg params: Any ): - Call + Call //CALIDAD @POST("almacennew/itemShelvingBuyerGet")//REVISADA diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/ajustes/fragment/AjustesViewModel.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/ajustes/fragment/AjustesViewModel.kt index 140b51ee..1caf7bde 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/ajustes/fragment/AjustesViewModel.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/ajustes/fragment/AjustesViewModel.kt @@ -271,7 +271,6 @@ class AjustesViewModel(val context: Context) : BaseViewModel(context) { override fun onSuccess(response: Response>) { - if (response.body() != null) { _printerList.value = response.body()?.let { PrintersList(it) } } else { diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/fragment/ItemCardFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/fragment/ItemCardFragment.kt index 0a7636a3..261783a7 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/fragment/ItemCardFragment.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/fragment/ItemCardFragment.kt @@ -4,6 +4,7 @@ import android.app.AlertDialog import android.content.Intent import android.graphics.drawable.Drawable import android.os.Build +import android.util.Log.d import android.view.View import android.view.View.GONE import android.view.inputmethod.EditorInfo @@ -111,7 +112,6 @@ class ItemCardFragment( when (item) { iconReload.drawable -> { - binding.splashProgress.visibility = View.VISIBLE getItemCard(itemFk) } iconHistory.drawable -> { @@ -185,21 +185,12 @@ class ItemCardFragment( user = getData(USER) password = getData(PASSWORD) warehouseFk = getDataInt(WAREHOUSEFK) - - this.itemFk = itemFk.toString() + this.itemFk = itemFk binding.splashProgressTwo.visibility = View.VISIBLE - viewModel.getItemCard(itemFk, warehouseFk!!, user, password) - binding.splashProgress.visibility = View.VISIBLE + viewModel.getItemCard(itemFk, warehouseFk!!) + //binding.splashProgress.visibility = View.VISIBLE - - var working_in_test = false //sergio:No posar a true fins que Salix puje versió 8.3 - - if (working_in_test) { - viewModel.getItemPackingTypeSalix() - } else { - viewModel.getItemPackingType(getData(USER), getData(PASSWORD)) - } } override fun observeViewModel() { @@ -570,28 +561,20 @@ class ItemCardFragment( )*/ "updateGrouping" -> viewModel.updateGrouping( itemFk = itemFk.toInt(), - user = user, - password = password, value = value, warehouseFk = warehouseFk!! ) "updatePacking" -> viewModel.updatePacking( itemFk = itemFk.toInt(), - user = user, - password = password, value = value, warehouseFk = warehouseFk!! ) "itemSaveStem" -> viewModel.item_saveStems( itemFk = itemFk.toInt(), - user = user, - password = password, value = value ) "item_saveReference" -> viewModel.item_saveReference( itemFk = itemFk.toInt(), - user = user, - password = password, value = value ) @@ -702,6 +685,7 @@ class ItemCardFragment( } private fun updateBarcode(code: String, delete: Boolean) { + d("VERDNATURA::","El bacode se va actualizar"+code+delete) if (delete) { var i = 0 var posDelete = 0 @@ -724,10 +708,7 @@ class ItemCardFragment( } - // var working_in_test=false //sergio:Revisar como borrar directamente en Salix o crear proc en back para borrar. - barcodeAdapter!!.notifyDataSetChanged() - showProgress() } 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 e406f817..021f1b03 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 @@ -1,23 +1,22 @@ package es.verdnatura.presentation.view.feature.articulo.fragment - import android.content.Context import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData -import es.verdnatura.domain.GetItemCardUserCase +import es.verdnatura.domain.SilexCallback 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.common.itemBarCodeSalix import es.verdnatura.presentation.common.itemPackingTypeSalix -import es.verdnatura.presentation.view.feature.articulo.model.* -import retrofit2.Call -import retrofit2.Callback +import es.verdnatura.presentation.view.feature.articulo.model.ItemCardVO +import es.verdnatura.presentation.view.feature.articulo.model.ItemPackingTypeList +import es.verdnatura.presentation.view.feature.articulo.model.ItemProposal +import es.verdnatura.presentation.view.feature.articulo.model.ItemProposalList import retrofit2.Response -class ItemCardViewModel(context: Context) : BaseViewModel(context) { - private val getItemCardUserCase: GetItemCardUserCase = GetItemCardUserCase(context) +class ItemCardViewModel(var context: Context) : BaseViewModel(context) { private val _itemcard by lazy { MutableLiveData() } val itemcard: LiveData @@ -40,14 +39,13 @@ class ItemCardViewModel(context: Context) : BaseViewModel(context) { fun getItemCard( itemFk: String, warehouseFk: Int, - user: String, - password: String - ) { - getItemCardUserCase.getItemCard(user, password, itemFk, warehouseFk) - .enqueue(object : Callback { - override fun onFailure(call: Call, t: Throwable) { - _itemcard.value = ItemCardVO(0, + ) { + silex.getItemCard(itemFk, warehouseFk) + .enqueue(object : SilexCallback(context) { + override fun onError(t: Throwable) { + _itemcard.value = ItemCardVO( + 0, isError = true, errorMessage = getMessageFromAllResponse(nameofFunction(this), t.message!!), stems = "", itemCost = "" @@ -55,14 +53,13 @@ class ItemCardViewModel(context: Context) : BaseViewModel(context) { } - override fun onResponse(call: Call, response: Response) { - - + override fun onSuccess(response: Response) { if (response.body() != null) { _itemcard.value = response.body()!! } else { - _itemcard.value = ItemCardVO(0, + _itemcard.value = ItemCardVO( + 0, isError = true, errorMessage = getMessageFromAllResponse( nameofFunction(this), @@ -89,8 +86,8 @@ class ItemCardViewModel(context: Context) : BaseViewModel(context) { warehouseFk, vShipped, vIsShowedByType - ).enqueue(object : Callback> { - override fun onFailure(call: Call>, t: Throwable) { + ).enqueue(object : SilexCallback>(context) { + override fun onError(t: Throwable) { val listError: ArrayList = ArrayList() listError.add( ItemProposal( @@ -101,10 +98,8 @@ class ItemCardViewModel(context: Context) : BaseViewModel(context) { _itemProposallist.value = ItemProposalList(listError) } - override fun onResponse( - call: Call>, - response: Response> - ) { + override fun onSuccess(response: Response>) { + if (response.body() != null) { _itemProposallist.value = response.body()?.let { ItemProposalList(it) @@ -130,83 +125,83 @@ class ItemCardViewModel(context: Context) : BaseViewModel(context) { } - fun getItemPackingType(user: String, password: String) { - getItemCardUserCase.getItemPackingType(user, password).enqueue(object : - Callback> { - override fun onFailure(call: Call>, t: Throwable) { - val listError: ArrayList = ArrayList() - listError.add( - ItemPackingType( - isError = true, - errorMessage = getMessageFromAllResponse(nameofFunction(this), t.message!!) - ) - ) - _itemspackinglist.value = ItemPackingTypeList(listError) - } + /* fun getItemPackingType() { + silex.getItemPackingType().enqueue(object : + Callback> { + override fun onFailure(call: Call>, t: Throwable) { + val listError: ArrayList = ArrayList() + listError.add( + ItemPackingType( + isError = true, + errorMessage = getMessageFromAllResponse(nameofFunction(this), t.message!!) + ) + ) + _itemspackinglist.value = ItemPackingTypeList(listError) + } - override fun onResponse( - call: Call>, - response: Response> - ) { - if (response.body() != null) { - _itemspackinglist.value = response.body()?.let { ItemPackingTypeList(it) } + override fun onResponse( + call: Call>, + response: Response> + ) { + if (response.body() != null) { + _itemspackinglist.value = response.body()?.let { ItemPackingTypeList(it) } - } else { - val listError: ArrayList = ArrayList() - listError.add( - ItemPackingType( - isError = true, - errorMessage = getMessageFromAllResponse( - nameofFunction(this), - response.message() - ) - ) - ) - _itemspackinglist.value = ItemPackingTypeList(listError) - } - } + } else { + val listError: ArrayList = ArrayList() + listError.add( + ItemPackingType( + isError = true, + errorMessage = getMessageFromAllResponse( + nameofFunction(this), + response.message() + ) + ) + ) + _itemspackinglist.value = ItemPackingTypeList(listError) + } + } - }) - } + }) + }*/ - fun getItemPackingTypeSalix() { - getItemCardUserCase.getItemPackingTypeSalix().enqueue(object : - Callback> { - override fun onFailure(call: Call>, t: Throwable) { - val listError: ArrayList = ArrayList() - listError.add( - ItemPackingType( - isError = true, - errorMessage = getMessageFromAllResponse(nameofFunction(this), t.message!!) - ) - ) - _itemspackinglist.value = ItemPackingTypeList(listError) - } + /* fun getItemPackingTypeSalix() { + salix.get_ItemPackingType().enqueue(object : + Callback> { + override fun onFailure(call: Call>, t: Throwable) { + val listError: ArrayList = ArrayList() + listError.add( + ItemPackingType( + isError = true, + errorMessage = getMessageFromAllResponse(nameofFunction(this), t.message!!) + ) + ) + _itemspackinglist.value = ItemPackingTypeList(listError) + } - override fun onResponse( - call: Call>, - response: Response> - ) { - if (response.body() != null) { - _itemspackinglist.value = response.body()?.let { ItemPackingTypeList(it) } + override fun onResponse( + call: Call>, + response: Response> + ) { + if (response.body() != null) { + _itemspackinglist.value = response.body()?.let { ItemPackingTypeList(it) } - } else { - val listError: ArrayList = ArrayList() - listError.add( - ItemPackingType( - isError = true, - errorMessage = getMessageFromAllResponse( - nameofFunction(this), - response.message() - ) - ) - ) - _itemspackinglist.value = ItemPackingTypeList(listError) - } - } + } else { + val listError: ArrayList = ArrayList() + listError.add( + ItemPackingType( + isError = true, + errorMessage = getMessageFromAllResponse( + nameofFunction(this), + response.message() + ) + ) + ) + _itemspackinglist.value = ItemPackingTypeList(listError) + } + } - }) - } + }) + }*/ fun itemTrash( @@ -216,101 +211,63 @@ class ItemCardViewModel(context: Context) : BaseViewModel(context) { isTrash: Boolean ) { silex.itemTrash(itemFk, warehouseFk, newValue, isTrash) - .enqueue(object : Callback { - override fun onFailure(call: Call, t: Throwable) { + .enqueue(object : SilexCallback(context) { + override fun onError(t: Throwable) { _response.value = ResponseItemVO( isError = true, errorMessage = getMessageFromAllResponse(nameofFunction(this), t.message!!) ) } - override fun onResponse(call: Call, response: Response) { - if (!response.isSuccessful) { - _response.value = ResponseItemVO( - isError = true, - errorMessage = getMessageFromAllResponse( - nameofFunction(this), - response.message() - ) - ) - } else { - _response.value = - ResponseItemVO(isError = false, response = response.message()) - } - + override fun onSuccess(response: Response) { + _response.value = + ResponseItemVO(isError = false, response = response.message()) } - }) } - fun updateGrouping( itemFk: Int, - user: String, - password: String, value: Int, warehouseFk: Int ) { - getItemCardUserCase.updateGrouping(user, password, itemFk, value, warehouseFk) - .enqueue(object : Callback { - override fun onFailure(call: Call, t: Throwable) { + silex.updateGrouping(itemFk, value, warehouseFk) + .enqueue(object : SilexCallback(context) { + override fun onError(t: Throwable) { + super.onError(t) _response.value = ResponseItemVO( isError = true, errorMessage = getMessageFromAllResponse(nameofFunction(this), t.message!!) ) } - override fun onResponse(call: Call, response: Response) { - if (!response.isSuccessful) { - _response.value = ResponseItemVO( - isError = true, - errorMessage = getMessageFromAllResponse( - nameofFunction(this), - response.message() - ) - ) - } else { - _response.value = - ResponseItemVO(isError = false, response = response.message()) - } - + override fun onSuccess(response: Response) { + _response.value = + ResponseItemVO(isError = false, response = response.message()) } - }) } fun updatePacking( itemFk: Int, - user: String, - password: String, value: Int, warehouseFk: Int ) { - getItemCardUserCase.updatePacking(user, password, itemFk, value, warehouseFk) - .enqueue(object : Callback { - override fun onFailure(call: Call, t: Throwable) { + silex.updatePacking(itemFk, value, warehouseFk) + .enqueue(object : SilexCallback(context) { + override fun onError(t: Throwable) { _response.value = ResponseItemVO( isError = true, errorMessage = getMessageFromAllResponse(nameofFunction(this), t.message!!) ) } - override fun onResponse(call: Call, response: Response) { - if (!response.isSuccessful) { - _response.value = ResponseItemVO( - isError = true, - errorMessage = getMessageFromAllResponse( - nameofFunction(this), - response.message() - ) - ) - } else { - _response.value = - ResponseItemVO(isError = false, response = response.message()) - } + override fun onSuccess(response: Response) { + _response.value = + ResponseItemVO(isError = false, response = response.message()) } }) @@ -318,27 +275,17 @@ class ItemCardViewModel(context: Context) : BaseViewModel(context) { fun updatePackingTypeSalix(itemFk: String, itemPackingType: itemPackingTypeSalix) { salix.update_ItemPackingType(itemFk, itemPackingType) - .enqueue(object : Callback { - override fun onFailure(call: Call, t: Throwable) { + .enqueue(object : SilexCallback(context) { + override fun onError(t: Throwable) { _response.value = ResponseItemVO( isError = true, errorMessage = getMessageFromAllResponse(nameofFunction(this), t.message!!) ) } - override fun onResponse(call: Call, response: Response) { - if (!response.isSuccessful) { - _response.value = ResponseItemVO( - isError = true, - errorMessage = getMessageFromAllResponse( - nameofFunction(this), - response.message() - ) - ) - } else { - _response.value = - ResponseItemVO(isError = false, response = response.body()!!.toString()) - } + override fun onSuccess(response: Response) { + _response.value = + ResponseItemVO(isError = false, response = response.body()!!.toString()) } @@ -347,69 +294,41 @@ class ItemCardViewModel(context: Context) : BaseViewModel(context) { fun item_saveStems( itemFk: Int, - user: String, - password: String, value: Int ) { - getItemCardUserCase.item_saveStems(user, password, itemFk, value) - .enqueue(object : Callback { - override fun onFailure(call: Call, t: Throwable) { + silex.item_saveStems(itemFk, value) + .enqueue(object : SilexCallback(context) { + override fun onError(t: Throwable) { _response.value = ResponseItemVO( isError = true, errorMessage = getMessageFromAllResponse(nameofFunction(this), t.message!!) ) } - override fun onResponse(call: Call, response: Response) { - if (!response.isSuccessful) { - _response.value = ResponseItemVO( - isError = true, - errorMessage = getMessageFromAllResponse( - nameofFunction(this), - response.message() - ) - ) - } else { - _response.value = - ResponseItemVO(isError = false, response = response.message()) - } - + override fun onSuccess(response: Response) { + _response.value = + ResponseItemVO(isError = false, response = response.message()) } - }) } fun item_saveReference( itemFk: Int, - user: String, - password: String, value: Int ) { - getItemCardUserCase.item_saveReference(user, password, itemFk, value) - .enqueue(object : Callback { - override fun onFailure(call: Call, t: Throwable) { + silex.item_saveReference(itemFk, value) + .enqueue(object : SilexCallback(context) { + override fun onError(t: Throwable) { _response.value = ResponseItemVO( isError = true, errorMessage = getMessageFromAllResponse(nameofFunction(this), t.message!!) ) } - override fun onResponse(call: Call, response: Response) { - - if (!response.isSuccessful) { - _response.value = ResponseItemVO( - isError = true, - errorMessage = getMessageFromAllResponse( - nameofFunction(this), - response.message() - ) - ) - } else { - _response.value = ResponseItemVO(isError = false) - } - + override fun onSuccess(response: Response) { + _response.value = ResponseItemVO(isError = false) } }) @@ -420,29 +339,23 @@ class ItemCardViewModel(context: Context) : BaseViewModel(context) { value: String, delete: Boolean ) { - silex.barcodes_edit( value,itemFk, delete) - .enqueue(object : Callback { - override fun onFailure(call: Call, t: Throwable) { + silex.barcodes_edit(value, itemFk, delete) + .enqueue(object : SilexCallback(context) { + override fun onError(t: Throwable) { _response.value = ResponseItemVO( isError = true, errorMessage = getMessageFromAllResponse(nameofFunction(this), t.message!!) ) } - override fun onResponse(call: Call, response: Response) { - if (response.isSuccessful) { - _response.value = ResponseItemVO( - isError = false, - errorMessage = getMessageFromAllResponse( - nameofFunction(this), - response.message() - ) + override fun onSuccess(response: Response) { + _response.value = ResponseItemVO( + isError = false, + errorMessage = getMessageFromAllResponse( + nameofFunction(this), + response.message() ) - } else { - _response.value = - ResponseItemVO(isError = false, response = response.message()) - } - + ) } }) @@ -451,29 +364,19 @@ class ItemCardViewModel(context: Context) : BaseViewModel(context) { fun barcodesEditSalix(itemFk: Int, barCodeValue: String) { salix.barcodes_edit( - itemBarCodeSalix(itemFk, barCodeValue)) - .enqueue(object : Callback { - override fun onFailure(call: Call, t: Throwable) { + itemBarCodeSalix(itemFk, barCodeValue) + ) + .enqueue(object : SilexCallback(context) { + override fun onError(t: Throwable) { _response.value = ResponseItemVO( isError = true, errorMessage = getMessageFromAllResponse(nameofFunction(this), t.message!!) ) } - override fun onResponse(call: Call, response: Response) { - if (!response.isSuccessful) { - _response.value = ResponseItemVO( - isError = true, - errorMessage = getMessageFromAllResponse( - nameofFunction(this), - response.message() - ) - ) - } else { - _response.value = - ResponseItemVO(isError = false, response = response.message()!!) - } - + override fun onSuccess(response: Response) { + _response.value = + ResponseItemVO(isError = false, response = response.message()!!) } }) diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/buffer/fragment/BufferFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/buffer/fragment/BufferFragment.kt index 69df637f..3e6ec1be 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/buffer/fragment/BufferFragment.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/buffer/fragment/BufferFragment.kt @@ -5,6 +5,7 @@ import android.view.inputmethod.EditorInfo import androidx.lifecycle.Observer import es.verdnatura.R import es.verdnatura.databinding.FragmentBufferBinding +import es.verdnatura.domain.toInt import es.verdnatura.presentation.base.BaseFragment class BufferFragment( @@ -52,9 +53,7 @@ class BufferFragment( } viewModel.buffer_setTypeByName( - getData(USER), - getData(PASSWORD), - binding.scanInput.text.toString().toInt(), + binding.scanInput.toInt(), entryPoint ) diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/buffer/fragment/BufferFragmentViewModel.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/buffer/fragment/BufferFragmentViewModel.kt index ad44323f..cf5055d2 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/buffer/fragment/BufferFragmentViewModel.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/buffer/fragment/BufferFragmentViewModel.kt @@ -3,18 +3,16 @@ package es.verdnatura.presentation.view.feature.buffer.fragment import android.content.Context import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData -import es.verdnatura.domain.GetPaletizadoresUserCase +import es.verdnatura.domain.SilexCallback 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 retrofit2.Call -import retrofit2.Callback import retrofit2.Response -class BufferFragmentViewModel(context: Context) : BaseViewModel(context) { - private val GetPaletizadoresUserCase: GetPaletizadoresUserCase = - GetPaletizadoresUserCase(context) +class BufferFragmentViewModel(val context: Context) : BaseViewModel(context) { + /* private val GetPaletizadoresUserCase: GetPaletizadoresUserCase = + GetPaletizadoresUserCase(context)*/ private val _itembuffertype by lazy { MutableLiveData() } @@ -22,31 +20,23 @@ class BufferFragmentViewModel(context: Context) : BaseViewModel(context) { get() = _itembuffertype - /*private val _bufferresponse by lazy { MutableLiveData() } - val bufferresponse: LiveData - get() = _bufferresponse*/ - private val _bufferloadresponse by lazy { MutableLiveData() } val bufferloadresponse: LiveData get() = _bufferloadresponse - - fun buffer_setTypeByName(user: String, password: String, vBufferFk: Int, vType: String){ - GetPaletizadoresUserCase.buffer_setTypeByName(user, password, vBufferFk, vType) - .enqueue(object : Callback { - override fun onFailure(call: Call, t: Throwable) { - - + fun buffer_setTypeByName(vBufferFk: Int, vType: String) { + silex.buffer_setTypeByName(vBufferFk, vType) + .enqueue(object : SilexCallback(context) { + override fun onError(t: Throwable) { _itembuffertype.value = ResponseItemVO( isError = true, - errorMessage = getMessageFromAllResponse(nameofFunction(this),t.message!!)) - + errorMessage = getMessageFromAllResponse(nameofFunction(this), t.message!!) + ) } - override fun onResponse(call: Call, response: Response) { - //sergio: espera respuesta en el body - if (response.body() == true) { + override fun onSuccess(response: Response) { + if (response.body() as Boolean) { _itembuffertype.value = ResponseItemVO( isError = false, @@ -54,54 +44,40 @@ class BufferFragmentViewModel(context: Context) : BaseViewModel(context) { ) } else { - //_bufferresponse.value = false _itembuffertype.value = ResponseItemVO( isError = true, - errorMessage = getMessageFromAllResponse(nameofFunction(this),response.message())) - + errorMessage = getMessageFromAllResponse( + nameofFunction(this), + response.message() + ) + ) } + } + + }) + } + + fun expeditionLoading_add(vExpeditionFk: Int, vBufferFk: Int) { + silex.expeditionLoading_add(vExpeditionFk, vBufferFk) + .enqueue(object : SilexCallback(context) { + override fun onError(t: Throwable) { + _bufferloadresponse.value = ResponseItemVO( + isError = true, + errorMessage = getMessageFromAllResponse(nameofFunction(this), t.message!!) + ) + } + + override fun onSuccess(response: Response) { + _bufferloadresponse.value = ResponseItemVO( + isError = false, + response = response.body().toString()!! + ) } }) } - - fun expeditionLoading_add(vExpeditionFk:Int, vBufferFk:Int){ - silex.expeditionLoading_add(vExpeditionFk, vBufferFk).enqueue(object : Callback{ - override fun onFailure(call: Call, t: Throwable) { - _bufferloadresponse.value = ResponseItemVO( - isError = true, - errorMessage = getMessageFromAllResponse(nameofFunction(this),t.message!!)) - } - - override fun onResponse(call: Call, response: Response) { - - if (!response.isSuccessful){ - _bufferloadresponse.value = ResponseItemVO( - isError = true, - errorMessage = getMessageFromAllResponse(nameofFunction(this),response.message()!!)) - }else { - - if (response.body()!!.isNullOrEmpty()) { - _bufferloadresponse.value = ResponseItemVO( - isError = true, - errorMessage = - getMessageFromAllResponse(nameofFunction(this),response.message()!!) - ) - } else { - _bufferloadresponse.value = ResponseItemVO( - isError = false, - response = response.body()!! - ) - - } - } - } - - - }) - } } diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/buscaritem/fragment/BuscarItemViewModel.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/buscaritem/fragment/BuscarItemViewModel.kt index b8ce6b0d..e0503133 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/buscaritem/fragment/BuscarItemViewModel.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/buscaritem/fragment/BuscarItemViewModel.kt @@ -4,19 +4,17 @@ import android.content.Context import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import androidx.lifecycle.Transformations -import es.verdnatura.domain.GetBuscarItemUserCase +import es.verdnatura.domain.SilexCallback import es.verdnatura.presentation.base.BaseViewModel import es.verdnatura.presentation.base.getMessageFromAllResponse import es.verdnatura.presentation.base.nameofFunction import es.verdnatura.presentation.common.Event import es.verdnatura.presentation.view.feature.buscaritem.model.ItemLocationVO import es.verdnatura.presentation.view.feature.buscaritem.model.LocationListVO -import retrofit2.Call -import retrofit2.Callback import retrofit2.Response -class BuscarItemViewModel(context: Context) : BaseViewModel(context) { - private val getBuscarItemUserCase: GetBuscarItemUserCase = GetBuscarItemUserCase(context) +class BuscarItemViewModel(val context: Context) : BaseViewModel(context) { + //private val getBuscarItemUserCase: GetBuscarItemUserCase = GetBuscarItemUserCase(context) private val _locationList by lazy { MutableLiveData() } @@ -27,28 +25,42 @@ class BuscarItemViewModel(context: Context) : BaseViewModel(context) { val loadLocationList = Transformations.map(_locationList) { Event(it) } - fun getLocations(itemFk:Int){ - silex.searchItemsUbicador(itemFk).enqueue(object : Callback> { - override fun onFailure(call: Call>, t: Throwable) { - val listError:ArrayList = ArrayList() - listError.add(ItemLocationVO(isError = true,errorMessage =getMessageFromAllResponse(nameofFunction(this),t.message!!))) - _locationList.value = LocationListVO(listError) - } - - override fun onResponse( - call: Call>, - response: Response> - ) { - if (response.body() != null){ - _locationList.value = response.body()?.let { LocationListVO(it) } - }else{ - val listError:ArrayList = ArrayList() - listError.add(ItemLocationVO(isError = true,errorMessage = getMessageFromAllResponse(nameofFunction(this),response.message()))) + fun getLocations(itemFk: Int) { + silex.searchItemsUbicador(itemFk) + .enqueue(object : SilexCallback>(context) { + override fun onError(t: Throwable) { + val listError: ArrayList = ArrayList() + listError.add( + ItemLocationVO( + isError = true, + errorMessage = getMessageFromAllResponse( + nameofFunction(this), + t.message!! + ) + ) + ) _locationList.value = LocationListVO(listError) } - } - }) + override fun onSuccess(response: Response>) { + if (response.body() != null) { + _locationList.value = response.body()?.let { LocationListVO(it) } + } else { + val listError: ArrayList = ArrayList() + listError.add( + ItemLocationVO( + isError = true, + errorMessage = getMessageFromAllResponse( + nameofFunction(this), + response.message() + ) + ) + ) + _locationList.value = LocationListVO(listError) + } + } + + }) } } diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/calidad/fragment/BuyersViewModel.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/calidad/fragment/BuyersViewModel.kt index 19039d7a..9ce27b03 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/calidad/fragment/BuyersViewModel.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/calidad/fragment/BuyersViewModel.kt @@ -3,42 +3,51 @@ package es.verdnatura.presentation.view.feature.calidad.fragment import android.content.Context import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData -import es.verdnatura.domain.GetQualityUserCase +import es.verdnatura.domain.SilexCallback import es.verdnatura.presentation.base.BaseViewModel import es.verdnatura.presentation.base.getMessageFromAllResponse import es.verdnatura.presentation.base.nameofFunction import es.verdnatura.presentation.view.feature.calidad.model.BuyerListVO import es.verdnatura.presentation.view.feature.calidad.model.BuyerVO -import retrofit2.Call -import retrofit2.Callback import retrofit2.Response -class BuyersViewModel(context: Context) : BaseViewModel(context) { +class BuyersViewModel(val context: Context) : BaseViewModel(context) { - private val getQualityUserCase: GetQualityUserCase = GetQualityUserCase(context) + // private val getQualityUserCase: GetQualityUserCase = GetQualityUserCase(context) private val _buyersList by lazy { MutableLiveData() } val buyersList: LiveData get() = _buyersList - fun itemShelvingBuyerGet(){ - silex.itemShelvingBuyerGet().enqueue(object : - Callback> { - override fun onFailure(call: Call>, t: Throwable) { - val listError:ArrayList = ArrayList() - listError.add(BuyerVO(isError = true,errorMessage =getMessageFromAllResponse(nameofFunction(this),t.message!!))) + fun itemShelvingBuyerGet() { + silex.itemShelvingBuyerGet().enqueue(object : + SilexCallback>(context) { + override fun onError(t: Throwable) { + val listError: ArrayList = ArrayList() + listError.add( + BuyerVO( + isError = true, + errorMessage = getMessageFromAllResponse(nameofFunction(this), t.message!!) + ) + ) _buyersList.value = BuyerListVO(listError) } - override fun onResponse( - call: Call>, - response: Response> - ) { - if (response.body() != null){ + override fun onSuccess(response: Response>) { + + if (response.body() != null) { _buyersList.value = response.body()?.let { BuyerListVO(it) } - }else{ - val listError:ArrayList = ArrayList() - listError.add(BuyerVO(isError = true,errorMessage =getMessageFromAllResponse(nameofFunction(this),response.message()))) + } else { + val listError: ArrayList = ArrayList() + listError.add( + BuyerVO( + isError = true, + errorMessage = getMessageFromAllResponse( + nameofFunction(this), + response.message() + ) + ) + ) _buyersList.value = BuyerListVO(listError) } } diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/calidad/fragment/QaualityViewModel.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/calidad/fragment/QaualityViewModel.kt index 71683898..9fe6d961 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/calidad/fragment/QaualityViewModel.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/calidad/fragment/QaualityViewModel.kt @@ -3,20 +3,18 @@ package es.verdnatura.presentation.view.feature.calidad.fragment import android.content.Context import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData -import es.verdnatura.domain.GetQualityUserCase +import es.verdnatura.domain.SilexCallback 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.calidad.model.ItemBuyerListVO import es.verdnatura.presentation.view.feature.calidad.model.ItemBuyerVO -import retrofit2.Call -import retrofit2.Callback import retrofit2.Response -class QaualityViewModel(context: Context) : BaseViewModel(context) { +class QaualityViewModel(val context: Context) : BaseViewModel(context) { - private val getQualityUserCase: GetQualityUserCase = GetQualityUserCase(context) + //private val getQualityUserCase: GetQualityUserCase = GetQualityUserCase(context) private val _buyersList by lazy { MutableLiveData() } val buyersList: LiveData @@ -28,24 +26,35 @@ class QaualityViewModel(context: Context) : BaseViewModel(context) { get() = _response - fun itemShelvingBuyerTask(userFk:String){ + fun itemShelvingBuyerTask(userFk: String) { silex.itemShelvingBuyerTask(userFk).enqueue(object : - Callback> { - override fun onFailure(call: Call>, t: Throwable) { - val listError:ArrayList = ArrayList() - listError.add(ItemBuyerVO(isError = true,errorMessage =getMessageFromAllResponse(nameofFunction(this),t.message!!))) + SilexCallback>(context) { + override fun onError(t: Throwable) { + val listError: ArrayList = ArrayList() + listError.add( + ItemBuyerVO( + isError = true, + errorMessage = getMessageFromAllResponse(nameofFunction(this), t.message!!) + ) + ) _buyersList.value = ItemBuyerListVO(listError) } - override fun onResponse( - call: Call>, - response: Response> - ) { - if (response.body() != null){ + override fun onSuccess(response: Response>) { + super.onSuccess(response) + if (response.body() != null) { _buyersList.value = response.body()?.let { ItemBuyerListVO(it) } - }else{ - val listError:ArrayList = ArrayList() - listError.add(ItemBuyerVO(isError = true,errorMessage = getMessageFromAllResponse(nameofFunction(this),response.message()))) + } else { + val listError: ArrayList = ArrayList() + listError.add( + ItemBuyerVO( + isError = true, + errorMessage = getMessageFromAllResponse( + nameofFunction(this), + response.message() + ) + ) + ) _buyersList.value = ItemBuyerListVO(listError) } } @@ -53,19 +62,17 @@ class QaualityViewModel(context: Context) : BaseViewModel(context) { }) } - fun itemShelvingStarsUpdate(vId: String,vStars: String) { - silex.itemShelvingStarsUpdate(vId,vStars).enqueue(object : Callback{ - override fun onFailure(call: Call, t: Throwable) { - _response.value = ResponseItemVO(isError = true,errorMessage = getMessageFromAllResponse(nameofFunction(this),t.message!!)) + fun itemShelvingStarsUpdate(vId: String, vStars: String) { + silex.itemShelvingStarsUpdate(vId, vStars).enqueue(object : SilexCallback(context) { + override fun onError(t: Throwable) { + _response.value = ResponseItemVO( + isError = true, + errorMessage = getMessageFromAllResponse(nameofFunction(this), t.message!!) + ) } - override fun onResponse(call: Call, response: Response) { - - if (!response.isSuccessful){ - _response.value = ResponseItemVO(isError = true,errorMessage = getMessageFromAllResponse(nameofFunction(this),response.message())) - }else{ - _response.value = ResponseItemVO(isError = false,response = response.message()) - } + override fun onSuccess(response: Response) { + _response.value = ResponseItemVO(isError = false, response = response.message()) } }) } diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/claim/fragment/ClaimViewModel.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/claim/fragment/ClaimViewModel.kt index d47ebbcd..e010ec77 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/claim/fragment/ClaimViewModel.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/claim/fragment/ClaimViewModel.kt @@ -4,19 +4,16 @@ package es.verdnatura.presentation.view.feature.claim.fragment import android.content.Context import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData -import es.verdnatura.domain.GetClaimUserCase +import es.verdnatura.domain.SilexCallback 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 retrofit2.Call -import retrofit2.Callback import retrofit2.Response -class ClaimViewModel(context: Context) : BaseViewModel(context) { - - private val GetClaimUserCase: GetClaimUserCase = GetClaimUserCase(context) +class ClaimViewModel(val context: Context) : BaseViewModel(context) { + //private val GetClaimUserCase: GetClaimUserCase = GetClaimUserCase(context) private val _responseadd by lazy { MutableLiveData() } val responseadd: LiveData @@ -24,27 +21,17 @@ class ClaimViewModel(context: Context) : BaseViewModel(context) { fun itemShelving_addByClaim(claimFK: Int, shelvingFK: String) { - silex.itemShelving_addByClaim(claimFK, shelvingFK).enqueue(object : Callback { - override fun onFailure(call: Call, t: Throwable) { - - _responseadd.value = ResponseItemVO( - isError = true, errorMessage = getMessageFromAllResponse( - nameofFunction(this), t.message!! - ) - ) - } - - override fun onResponse(call: Call, response: Response) { - - if (!response.isSuccessful) { + silex.itemShelving_addByClaim(claimFK, shelvingFK) + .enqueue(object : SilexCallback(context) { + override fun onError(t: Throwable) { _responseadd.value = ResponseItemVO( - isError = true, - errorMessage = getMessageFromAllResponse( - nameofFunction(this), - response.message() + isError = true, errorMessage = getMessageFromAllResponse( + nameofFunction(this), t.message!! ) ) - } else { + } + + override fun onSuccess(response: Response) { _responseadd.value = ResponseItemVO( isError = false, errorMessage = getMessageFromAllResponse( @@ -52,21 +39,11 @@ class ClaimViewModel(context: Context) : BaseViewModel(context) { response.message() ) ) + } - } - - - }) + }) } - /* fun messageError(message: String,call: String ): ResponseItemVO? { - return ResponseItemVO( - isError = true, - errorMessage = "Error al llamar a " + call + " . Descripción del error:" + message - ) - }*/ - - } diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/collection/adapter/SaleAdapter.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/collection/adapter/SaleAdapter.kt index f08be810..ca2a7861 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/collection/adapter/SaleAdapter.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/collection/adapter/SaleAdapter.kt @@ -121,7 +121,7 @@ class SaleAdapter( sale.pickedQuantity = sale.quantity } } - d("VERDNATURA::","La quantity de ${sale.saleFk} es ${sale.pickedQuantity} y está ${sale.isPrepared}") + // d("VERDNATURA::","La quantity de ${sale.saleFk} es ${sale.pickedQuantity} y está ${sale.isPrepared}") if (sale.isNew) { layoutError.visibility = View.VISIBLE 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 4294fd9c..db39e269 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 @@ -587,12 +587,11 @@ class CollectionFragment( } else { var value = customDialogList.getValueTwo() customDialogList.setValueTwo("") - if (it.response.isBlank() || it.response.isEmpty()) { showErrorMessage(getString(R.string.codeNotExist)) viewModel.debug_add( "buy_deletedFromApp", - value + "-" + sales[storedPosition].itemFk + "-" + getData( + value + "-" + sales[storedPosition].itemFk + "-" + getDataInt( USERFK ) ) @@ -855,9 +854,9 @@ class CollectionFragment( binding.splashProgress.visibility = GONE if (it.isError) { //TEST3 - if (getDataInt(USERFK) == 18890 || getDataInt(USERFK) == 19591) { + /* if (getDataInt(USERFK) == 18890 || getDataInt(USERFK) == 19591) { "La línea NO se ha marcado correctamente".toast(context) - } + }*/ if (!goBack) { ma.messageWithSound(it.errorMessage, it.isError, true) @@ -980,7 +979,6 @@ class CollectionFragment( getString(R.string.itemAdded) + item + getString(R.string.with) + quantity + getString(R.string.unityTicket) + ticket viewModel.sendChekingPresence( - token = getData(TOKEN), workerId = salePerson, message = message ) @@ -1715,7 +1713,7 @@ class CollectionFragment( private fun checkItemScan(valueToCheck: String): Boolean { - + d("VERDNATURA::","Entramos a ver el checkItem") if (storedPosition >= 0 && sales.size > storedPosition) { val saleToCheck = sales[storedPosition] @@ -1728,6 +1726,7 @@ class CollectionFragment( } } } + d("VERDNATURA::","SAlimos de ver el checkItem") return false } @@ -2383,7 +2382,6 @@ class CollectionFragment( private fun sendSalixMessageNew(message: String, workerId: String) { viewModel.sendChekingPresence( - token = getData(TOKEN), workerId = workerId, message = message 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 687158d5..a29d3953 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 @@ -3,31 +3,30 @@ package es.verdnatura.presentation.view.feature.collection.fragment import android.content.Context import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData -import es.verdnatura.domain.GetLoginUserCase -import es.verdnatura.domain.GetSacadorControladorUserCase -import es.verdnatura.domain.GetUbicadorUserCase +import es.verdnatura.domain.SilexCallback 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.collection.* import es.verdnatura.presentation.view.feature.collection.mapper.map +import es.verdnatura.presentation.view.feature.login.model.SalixMessageVO import es.verdnatura.presentation.view.feature.sacador.model.* import retrofit2.Call import retrofit2.Callback import retrofit2.Response -class CollectionViewModel(context: Context) : BaseViewModel(context) { +class CollectionViewModel(val context: Context) : BaseViewModel(context) { // val emptyMessage = context.getString(R.string.collectionNoTickets) private val contextApp = context - private val getSacadorControladorUserCase: GetSacadorControladorUserCase = - GetSacadorControladorUserCase(context) - private val getUbicadorUserCase: GetUbicadorUserCase = GetUbicadorUserCase(context) - private val getLoginUserCase: GetLoginUserCase = GetLoginUserCase(context) - + /* private val getSacadorControladorUserCase: GetSacadorControladorUserCase = + GetSacadorControladorUserCase(context) + private val getUbicadorUserCase: GetUbicadorUserCase = GetUbicadorUserCase(context) + private val getLoginUserCase: GetLoginUserCase = GetLoginUserCase(context) + */ private val _collectionTicketList by lazy { MutableLiveData() } val collectionTicketList: LiveData get() = _collectionTicketList @@ -156,8 +155,8 @@ class CollectionViewModel(context: Context) : BaseViewModel(context) { print, type ).enqueue(object : - Callback { - override fun onFailure(call: Call, t: Throwable) { + SilexCallback(context) { + override fun onError(t: Throwable) { _collectionTicketList.value = CollectionVO( 0, isError = true, @@ -165,10 +164,8 @@ class CollectionViewModel(context: Context) : BaseViewModel(context) { ) } - override fun onResponse( - call: Call, - response: Response - ) { + override fun onSuccess(response: Response) { + if (response.body() != null) { _collectionTicketList.value = response.body()?.let { it.map(contextApp) } } else { @@ -197,8 +194,8 @@ class CollectionViewModel(context: Context) : BaseViewModel(context) { print, type ).enqueue(object : - Callback { - override fun onFailure(call: Call, t: Throwable) { + SilexCallback(context) { + override fun onError(t: Throwable) { _collectionTicketList.value = CollectionVO( 0, isError = true, @@ -206,10 +203,8 @@ class CollectionViewModel(context: Context) : BaseViewModel(context) { ) } - override fun onResponse( - call: Call, - response: Response - ) { + override fun onSuccess(response: Response) { + if (response.body() != null) { _collectionTicketList.value = response.body()?.let { it.map(contextApp) } } else { @@ -239,26 +234,16 @@ class CollectionViewModel(context: Context) : BaseViewModel(context) { vStateFk, vIsChecked != "0", vBuyFk - ).enqueue(object : Callback { - override fun onFailure(call: Call, t: Throwable) { + ).enqueue(object : SilexCallback(context) { + override fun onError(t: Throwable) { _responseSaleReplace.value = ResponseItemVO( isError = true, errorMessage = getMessageFromAllResponse(nameofFunction(this), t.message!!) ) } - override fun onResponse(call: Call, response: Response) { - if (!response.isSuccessful) { - _responseSaleReplace.value = ResponseItemVO( - isError = true, - errorMessage = getMessageFromAllResponse( - nameofFunction(this), - response.message() - ) - ) - } else { - _responseSaleReplace.value = ResponseItemVO(isError = false, response = "") - } + override fun onSuccess(response: Response) { + _responseSaleReplace.value = ResponseItemVO(isError = false, response = "") } }) } @@ -280,15 +265,15 @@ class CollectionViewModel(context: Context) : BaseViewModel(context) { vBuyFk, vItemShelvingFk, vQuantity - ).enqueue(object : Callback { - override fun onFailure(call: Call, t: Throwable) { + ).enqueue(object : SilexCallback(context) { + override fun onError(t: Throwable) { _responseSaleTracking_mark.value = ResponseItemVO( isError = true, errorMessage = getMessageFromAllResponse(nameofFunction(this), t.message!!) ) } - override fun onResponse(call: Call, response: Response) { + override fun onSuccess(response: Response) { if (!response.isSuccessful) { _responseSaleTracking_mark.value = ResponseItemVO( isError = true, @@ -360,33 +345,24 @@ class CollectionViewModel(context: Context) : BaseViewModel(context) { saleFk: String, quantity: String ) { - getSacadorControladorUserCase.itemShelvingSaleSupplyAdd( + silex.itemShelvingSaleSupplyAdd( usuario, password, itemShelvingFk, saleFk, quantity - ).enqueue(object : Callback { - override fun onFailure(call: Call, t: Throwable) { + ).enqueue(object : SilexCallback(context) { + override fun onError(t: Throwable) { _responseItemShelvingSaleSupplyAdd.value = ResponseItemVO( isError = true, errorMessage = getMessageFromAllResponse(nameofFunction(this), t.message!!) ) } - override fun onResponse(call: Call, response: Response) { - if (!response.isSuccessful) { - _responseItemShelvingSaleSupplyAdd.value = ResponseItemVO( - isError = true, - errorMessage = getMessageFromAllResponse( - nameofFunction(this), - response.message() - ) - ) - } else { - _responseItemShelvingSaleSupplyAdd.value = - ResponseItemVO(isError = false, response = response.message()) - } + override fun onSuccess(response: Response) { + _responseItemShelvingSaleSupplyAdd.value = + ResponseItemVO(isError = false, response = response.message()) + } }) } @@ -399,27 +375,19 @@ class CollectionViewModel(context: Context) : BaseViewModel(context) { silex.collectionStickerPrint( collectionFk, labelCount - ).enqueue(object : Callback { - override fun onFailure(call: Call, t: Throwable) { + ).enqueue(object : SilexCallback(context) { + override fun onError(t: Throwable) { _responsePrint.value = ResponseItemVO( isError = true, errorMessage = getMessageFromAllResponse(nameofFunction(this), t.message!!) ) } - override fun onResponse(call: Call, response: Response) { - if (!response.isSuccessful) { - _responsePrint.value = ResponseItemVO( - isError = true, - errorMessage = getMessageFromAllResponse( - nameofFunction(this), - response.message() - ) - ) - } else { - _responsePrint.value = - ResponseItemVO(isError = false, response = response.message()) - } + override fun onSuccess(response: Response) { + + _responsePrint.value = + ResponseItemVO(isError = false, response = response.message()) + } }) } @@ -432,26 +400,18 @@ class CollectionViewModel(context: Context) : BaseViewModel(context) { silex.ticketCollection_setUsedShelves( ticketFk, usedShelves - ).enqueue(object : Callback { - override fun onFailure(call: Call, t: Throwable) { + ).enqueue(object : SilexCallback(context) { + override fun onError(t: Throwable) { + _responseUsedShelves.value = ResponseItemVO( isError = true, errorMessage = getMessageFromAllResponse(nameofFunction(this), t.message!!) ) } - override fun onResponse(call: Call, response: Response) { - if (!response.isSuccessful) { - _responseUsedShelves.value = ResponseItemVO( - isError = true, - errorMessage = getMessageFromAllResponse( - nameofFunction(this), - response.message() - ) - ) - } else { - _responseUsedShelves.value = ResponseItemVO(isError = false) - } + override fun onSuccess(response: Response) { + _responseUsedShelves.value = ResponseItemVO(isError = false) + } }) } @@ -463,26 +423,16 @@ class CollectionViewModel(context: Context) : BaseViewModel(context) { silex.item_updatePackingShelve( vSelf, vPacking - ).enqueue(object : Callback { - override fun onFailure(call: Call, t: Throwable) { + ).enqueue(object : SilexCallback(context) { + override fun onError(t: Throwable) { _responseItem_updatePackingShelve.value = ResponseItemVO( isError = true, errorMessage = getMessageFromAllResponse(nameofFunction(this), t.message!!) ) } - override fun onResponse(call: Call, response: Response) { - if (!response.isSuccessful) { - _responseItem_updatePackingShelve.value = ResponseItemVO( - isError = true, - errorMessage = getMessageFromAllResponse( - nameofFunction(this), - response.message() - ) - ) - } else { - _responseItem_updatePackingShelve.value = ResponseItemVO(isError = false) - } + override fun onSuccess(response: Response) { + _responseItem_updatePackingShelve.value = ResponseItemVO(isError = false) } }) } @@ -493,26 +443,16 @@ class CollectionViewModel(context: Context) : BaseViewModel(context) { ) { silex.saleTracking_add( saleGroupFk - ).enqueue(object : Callback { - override fun onFailure(call: Call, t: Throwable) { + ).enqueue(object : SilexCallback(context) { + override fun onError(t: Throwable) { _responseSaleGroup.value = ResponseItemVO( isError = true, errorMessage = getMessageFromAllResponse(nameofFunction(this), t.message!!) ) } - override fun onResponse(call: Call, response: Response) { - if (!response.isSuccessful) { - _responseSaleGroup.value = ResponseItemVO( - isError = true, - errorMessage = getMessageFromAllResponse( - nameofFunction(this), - response.message() - ) - ) - } else { - _responseSaleGroup.value = ResponseItemVO(isError = false) - } + override fun onSuccess(response: Response) { + _responseSaleGroup.value = ResponseItemVO(isError = false) } }) } @@ -528,43 +468,32 @@ class CollectionViewModel(context: Context) : BaseViewModel(context) { quantityFk, ticketFk, warehouseFk - ).enqueue(object : Callback { - override fun onFailure(call: Call, t: Throwable) { + ).enqueue(object : SilexCallback(context) { + override fun onError(t: Throwable) { + _responseNew.value = ResponseItemVO( isError = true, errorMessage = getMessageFromAllResponse(nameofFunction(this), t.message!!) ) } - override fun onResponse(call: Call, response: Response) { - - if (!response.isSuccessful) { - _responseNew.value = ResponseItemVO( - isError = true, - errorMessage = getMessageFromAllResponse( - nameofFunction(this), - response.message() - ) - ) - } else { - _responseNew.value = - ResponseItemVO(isError = false, response = response.message()!!) - } - + override fun onSuccess(response: Response) { + _responseNew.value = + ResponseItemVO(isError = false, response = response.message()!!) } }) } - fun saleMove( +/* fun saleMove( usuario: String, password: String, saleFk: String, quantity: String, originalQuantity: String ) { - getSacadorControladorUserCase.saleMove( + silex.saleMove( usuario, password, saleFk, @@ -594,7 +523,7 @@ class CollectionViewModel(context: Context) : BaseViewModel(context) { } } }) - } + }*/ fun transferSalesSalix( ticketFk: String, @@ -608,15 +537,16 @@ class CollectionViewModel(context: Context) : BaseViewModel(context) { ticketFk, saleTransfer - ).enqueue(object : Callback { - override fun onFailure(call: Call, t: Throwable) { + ).enqueue(object : SilexCallback(context) { + override fun onError(t: Throwable) { _responseSplit.value = ResponseItemVO( isError = true, errorMessage = getMessageFromAllResponse(nameofFunction(this), t.message!!) ) } - override fun onResponse(call: Call, response: Response) { + override fun onSuccess(response: Response) { + //sergio: salix devuelve id if (response.body() == null) { _responseSplit.value = ResponseItemVO( @@ -647,27 +577,17 @@ class CollectionViewModel(context: Context) : BaseViewModel(context) { type, warehouseFk, originalQuantity - ).enqueue(object : Callback { - override fun onFailure(call: Call, t: Throwable) { + ).enqueue(object : SilexCallback(context) { + override fun onError(t: Throwable) { _responseMissingTrash.value = ResponseItemVO( isError = true, errorMessage = getMessageFromAllResponse(nameofFunction(this), t.message!!) ) } - override fun onResponse(call: Call, response: Response) { - if (!response.isSuccessful) { - _responseMissingTrash.value = ResponseItemVO( - isError = true, - errorMessage = getMessageFromAllResponse( - nameofFunction(this), - response.message() - ) - ) - } else { - _responseMissingTrash.value = - ResponseItemVO(isError = false, response = response.message()) - } + override fun onSuccess(response: Response) { + _responseMissingTrash.value = + ResponseItemVO(isError = false, response = response.message()) } }) } @@ -675,27 +595,17 @@ class CollectionViewModel(context: Context) : BaseViewModel(context) { fun saleTrackingDel(saleFk: Int) { silex.saleTrackingDel(saleFk) - .enqueue(object : Callback { - override fun onFailure(call: Call, t: Throwable) { + .enqueue(object : SilexCallback(context) { + override fun onError(t: Throwable) { _responseDel.value = ResponseItemVO( isError = true, errorMessage = getMessageFromAllResponse(nameofFunction(this), t.message!!) ) } - override fun onResponse(call: Call, response: Response) { - if (!response.isSuccessful) { - _responseDel.value = ResponseItemVO( - isError = true, - errorMessage = getMessageFromAllResponse( - nameofFunction(this), - response.message() - ) - ) - } else { - _responseDel.value = - ResponseItemVO(isError = false, response = response.message()) - } + override fun onSuccess(response: Response) { + _responseDel.value = + ResponseItemVO(isError = false, response = response.message()) } }) } @@ -707,27 +617,18 @@ class CollectionViewModel(context: Context) : BaseViewModel(context) { itemShelvingFk ) - .enqueue(object : Callback { - override fun onFailure(call: Call, t: Throwable) { + .enqueue(object : SilexCallback(context) { + override fun onError(t: Throwable) { _responseItemShelvingUpdate.value = ResponseItemVO( isError = true, errorMessage = getMessageFromAllResponse(nameofFunction(this), t.message!!) ) } - override fun onResponse(call: Call, response: Response) { - if (!response.isSuccessful) { - _responseItemShelvingUpdate.value = ResponseItemVO( - isError = true, - errorMessage = getMessageFromAllResponse( - nameofFunction(this), - response.message() - ) - ) - } else { - _responseItemShelvingUpdate.value = - ResponseItemVO(isError = false, response = response.message()!!) - } + override fun onSuccess(response: Response) { + + _responseItemShelvingUpdate.value = + ResponseItemVO(isError = false, response = response.message()!!) } }) } @@ -737,28 +638,18 @@ class CollectionViewModel(context: Context) : BaseViewModel(context) { parking: String ) { silex.shelvingPark(ticketFk, parking) - .enqueue(object : Callback { - override fun onFailure(call: Call, t: Throwable) { + .enqueue(object : SilexCallback(context) { + override fun onError(t: Throwable) { + _responseParking.value = ResponseItemVO( isError = true, errorMessage = getMessageFromAllResponse(nameofFunction(this), t.message!!) ) } - override fun onResponse(call: Call, response: Response) { - - if (!response.isSuccessful) { - _responseParking.value = ResponseItemVO( - isError = true, - errorMessage = getMessageFromAllResponse( - nameofFunction(this), - response.message() - ) - ) - } else { - _responseParking.value = - ResponseItemVO(isError = false, response = response.message()) - } + override fun onSuccess(response: Response) { + _responseParking.value = + ResponseItemVO(isError = false, response = response.message()) } }) } @@ -768,27 +659,19 @@ class CollectionViewModel(context: Context) : BaseViewModel(context) { state: String ) { silex.ticket_setState(ticketFk, state) - .enqueue(object : Callback { - override fun onFailure(call: Call, t: Throwable) { + .enqueue(object : SilexCallback(context) { + override fun onError(t: Throwable) { + _response.value = ResponseItemVO( isError = true, errorMessage = getMessageFromAllResponse(nameofFunction(this), t.message!!) ) } - override fun onResponse(call: Call, response: Response) { - if (!response.isSuccessful) { - _response.value = ResponseItemVO( - isError = true, - errorMessage = getMessageFromAllResponse( - nameofFunction(this), - response.message() - ) - ) - } else { - _response.value = - ResponseItemVO(isError = false, response = "") - } + override fun onSuccess(response: Response) { + + _response.value = + ResponseItemVO(isError = false, response = "") } }) } @@ -798,175 +681,108 @@ class CollectionViewModel(context: Context) : BaseViewModel(context) { buyFk: String, message: String ) { - getSacadorControladorUserCase.debug_add(buyFk, message) - .enqueue(object : Callback { - override fun onFailure(call: Call, t: Throwable) { + silex.debug_add(buyFk, message) + .enqueue(object : SilexCallback(context) { + override fun onError(t: Throwable) { _response.value = ResponseItemVO( isError = true, errorMessage = getMessageFromAllResponse(nameofFunction(this), t.message!!) ) } - override fun onResponse(call: Call, response: Response) { - if (!response.isSuccessful) { - _response.value = ResponseItemVO( - isError = true, - errorMessage = getMessageFromAllResponse( - nameofFunction(this), - response.message() - ) - ) - } else { - _response.value = - ResponseItemVO(isError = false, response = "") - } + override fun onSuccess(response: Response) { + _response.value = + ResponseItemVO(isError = false, response = "") } }) } - fun getIdFromCode(usuario: String, password: String, code: String) { - getSacadorControladorUserCase.getIdFromCode(usuario, password, code) - .enqueue(object : Callback { - override fun onFailure(call: Call, t: Throwable) { - _responseCode.value = ResponseItemVO( - isError = true, - errorMessage = getMessageFromAllResponse(nameofFunction(this), t.message!!) - ) - } + /* fun getIdFromCode(usuario: String, password: String, code: String) { + silex.getIdFromCode(usuario, password, code) + .enqueue(object : Callback { + override fun onFailure(call: Call, t: Throwable) { + _responseCode.value = ResponseItemVO( + isError = true, + errorMessage = getMessageFromAllResponse(nameofFunction(this), t.message!!) + ) + } - override fun onResponse(call: Call, response: Response) { - //sergio:devuelve item - if (response.body() == null) { - _responseCode.value = ResponseItemVO( - isError = true, - errorMessage = getMessageFromAllResponse( - nameofFunction(this), - response.message() - ) - ) - } else { - _responseCode.value = - ResponseItemVO(isError = false, response = response.body()!!) - } - } - }) - } + override fun onResponse(call: Call, response: Response) { + //sergio:devuelve item + if (response.body() == null) { + _responseCode.value = ResponseItemVO( + isError = true, + errorMessage = getMessageFromAllResponse( + nameofFunction(this), + response.message() + ) + ) + } else { + _responseCode.value = + ResponseItemVO(isError = false, response = response.body()!!) + } + } + }) + }*/ fun getIdFromCodeSalix(code: String) { salix.barcodes_toitem(code) - .enqueue(object : Callback { - override fun onFailure(call: Call, t: Throwable) { + .enqueue(object : SilexCallback(context) { + override fun onError(t: Throwable) { _responseCode.value = ResponseItemVO( isError = true, errorMessage = getMessageFromAllResponse(nameofFunction(this), t.message!!) ) } - override fun onResponse(call: Call, response: Response) { - if (!response.isSuccessful) { - _responseCode.value = ResponseItemVO( - isError = true, - errorMessage = getMessageFromAllResponse( - nameofFunction(this), - response.message() - ) + override fun onSuccess(response: Response) { + _responseCode.value = + ResponseItemVO( + isError = false, + response = if (response.body() == null) "" else { + response.body()!! + } ) - } else { - _responseCode.value = - ResponseItemVO( - isError = false, - response = if (response.body() == null) "" else { - response.body()!! - } - ) - } } }) } -/* fun collectionIncreaseQuantity( - usuario: String, - password: String, - saleFk: String, - quantity: String,callFunction:String - ) - { - getSacadorControladorUserCase.collectionIncreaseQuantity( - usuario, - password, - saleFk, - quantity, - - ).enqueue(object : Callback - { - override fun onFailure(call: Call, t: Throwable) - { - _responseIncQuantity.value = ResponseItemVO( - isError = true, - errorMessage = getMessageFromAllResponse(nameofFunction(this),t.message!!) - ) - } - - override fun onResponse(call: Call, response: Response) - { - - if (!response.isSuccessful) ) - { - _responseIncQuantity.value = ResponseItemVO( - isError = true, - errorMessage = getMessageFromAllResponse(nameofFunction(this),response.message()) - ) - } else - { - _responseIncQuantity.value = - ResponseItemVO(isError = false, response = response.body()!!) - } - } - }) - }*/ fun collectionIncreaseQuantitySalix( - saleFk: Int, quantity: String ) { salix.collectionIncreaseQuantitySalix( SalixSaleQuantity(saleId = saleFk, quantity = quantity.toInt()) - ).enqueue(object : Callback { - override fun onFailure(call: Call, t: Throwable) { + ).enqueue(object : SilexCallback(context) { + override fun onError(t: Throwable) { _responseIncQuantity.value = ResponseItemVO( isError = true, errorMessage = getMessageFromAllResponse(nameofFunction(this), t.message!!) ) } - override fun onResponse(call: Call, response: Response) { - - if (!response.isSuccessful) { - _responseIncQuantity.value = ResponseItemVO( - isError = true, - errorMessage = getMessageFromAllResponse( - nameofFunction(this), - response.message() - ) - ) - } else { - _responseIncQuantity.value = - ResponseItemVO(isError = false, response = response.message().toString()) - } + override fun onSuccess(response: Response) { + super.onSuccess(response) + _responseIncQuantity.value = + ResponseItemVO(isError = false, response = response.message().toString()) } }) } fun sendChekingPresence( - token: String, workerId: String, message: String ) { try { - getLoginUserCase.sendChekingPresence(token, workerId.toInt(), message) + salix.sendChekingPresence( + SalixMessageVO( + workerId = workerId.toInt(), + message = message + ) + ) .enqueue(object : Callback { override fun onResponse(call: Call, response: Response) { @@ -1004,47 +820,33 @@ class CollectionViewModel(context: Context) : BaseViewModel(context) { ) { silex.saleMistakeAdd(vSaleFk, vUserFk, vTypeFk) .enqueue(object : - Callback { - override fun onFailure(call: Call, t: Throwable) { + SilexCallback(context) { + override fun onError(t: Throwable) { _responseSaleMistakeAdd.value = ResponseItemVO( isError = true, errorMessage = getMessageFromAllResponse(nameofFunction(this), t.message!!) ) } - override fun onResponse( - call: Call, - response: Response - ) { - if (!response.isSuccessful) { - _responseSaleMistakeAdd.value = ResponseItemVO( - isError = true, - errorMessage = getMessageFromAllResponse( - nameofFunction(this), - response.message() - ) - ) - } else { - _responseSaleMistakeAdd.value = - ResponseItemVO(isError = false, response = response.message()) - } + override fun onSuccess(response: Response) { + super.onSuccess(response) + _responseSaleMistakeAdd.value = + ResponseItemVO(isError = false, response = response.message()) } }) } fun mistakeType() { silex.mistakeType() - .enqueue(object : Callback> { - override fun onFailure(call: Call>, t: Throwable) { + .enqueue(object : SilexCallback>(context) { + override fun onError(t: Throwable) { val listError: ArrayList = ArrayList() listError.add(MistakeTypeVO(0, "")) _mistakeList.value = MistakeTypeListVO(listError) } - override fun onResponse( - call: Call>, - response: Response> - ) { + override fun onSuccess(response: Response>) { + if (response.body() != null) { _mistakeList.value = response.body()?.let { MistakeTypeListVO(it) } } else { @@ -1058,166 +860,56 @@ class CollectionViewModel(context: Context) : BaseViewModel(context) { } - /* fun sip_getExtension( - usuario: String, - password: String, - workerId: String - ) { - getSacadorControladorUserCase.sip_getExtension( - usuario, - password, - workerId - ).enqueue(object : - Callback { - override fun onFailure(call: Call, t: Throwable) { - _responseGetExtensionFromUserId.value = ResponseItemVO( - isError = true, - errorMessage = getMessageFromAllResponse(nameofFunction(this), t.message!!) - ) - } - - override fun onResponse( - call: Call, - response: Response - ) { - - if (response.body() != "false") { - _responseGetExtensionFromUserId.value = ResponseItemVO( - isError = false, - response = response.body()!!, - errorMessage = "" - ) - } else { - _responseGetExtensionFromUserId.value = ResponseItemVO( - isError = true, - response = response.body()!!, - errorMessage = "" - ) - } - } - }) - } - - fun sip_getExtensionSalix( - token: String, - workerId: String - ) { - getSacadorControladorUserCase.sip_getExtensionSalix( - token, - workerId - ).enqueue(object : - Callback { - override fun onFailure(call: Call, t: Throwable) { - _responseGetExtensionFromUserId.value = ResponseItemVO( - isError = true, - errorMessage = getMessageFromAllResponse(nameofFunction(this), t.message!!) - ) - } - - override fun onResponse( - call: Call, - response: Response - ) { - // No se ajusta ya que la response is Successful pero el valor retornado es un error y por lo tanto response.body nulo y tira error - /* if (response.isSuccessful ){ - _responseGetExtensionFromUserId.value = ResponseItemVO( - isError = false, - response = JSONObject(response.body()!!.toString()).get("extension").toString(), - errorMessage = "") - }else{ - _responseGetExtensionFromUserId.value = ResponseItemVO( - isError = true, - response = response.message()!!, - errorMessage = "No se puede realizar la llamada. El usuario no tiene la extensión configurada. Solicítelo a informática.") - - }*/ - if (response.body() != null) { - _responseGetExtensionFromUserId.value = ResponseItemVO( - isError = false, - response = JSONObject(response.body()!!.toString()).get("extension") - .toString(), - errorMessage = "" - ) - // Se prueba el call como JSONOBJECT pero no da resultado porque el sevidor puede devolver un null directamente y salta error MAlformed - // Se deja Any para obtener cualquier tipo de objeto y si no es nulo se parsea a Json - - // Per al cas que el CAll siga Any enlloc de JsonObject: - //var answerError=(JSONObject(response.body().toString()).get("extension").toString()) - //var messageFromError = answerError.get("extension").toString() - //Log.d("VERDNATURA::","Message ext"+messageFromError) - } else { - _responseGetExtensionFromUserId.value = ResponseItemVO( - isError = true, - response = "", - errorMessage = response.message()!! - ) - } - } - }) - }*/ - fun ticket_isOutClosureZone( usuario: String, password: String, ticketFk: String ) { - getSacadorControladorUserCase.ticket_isOutClosureZone( + silex.ticket_isOutClosureZone( usuario, password, ticketFk ).enqueue(object : - Callback { - override fun onFailure(call: Call, t: Throwable) { + SilexCallback(context) { + override fun onError(t: Throwable) { _responseTicketClosure.value = ResponseItemVO( isError = true, errorMessage = getMessageFromAllResponse(nameofFunction(this), t.message!!) ) } - override fun onResponse( - call: Call, - response: Response - ) { + override fun onSuccess(response: Response) { + _responseTicketClosure.value = ResponseItemVO( + isError = false, + response = response.body()!!.toString(), + errorMessage = "" + ) - if (response.isSuccessful) { - _responseTicketClosure.value = ResponseItemVO( - isError = false, - response = response.body()!!.toString(), - errorMessage = "" - ) - } } }) } fun ticket_checkFullyControlled( - usuario: String, - password: String, collectionFk: String ) { - getSacadorControladorUserCase.ticket_checkFullyControlled( - usuario, - password, + silex.ticket_checkFullyControlled( collectionFk ).enqueue(object : - Callback { - override fun onFailure(call: Call, t: Throwable) { + SilexCallback(context) { + override fun onFailure(call: Call, t: Throwable) { _responsecheckfully.value = ResponseItemVO( isError = true, errorMessage = getMessageFromAllResponse(nameofFunction(this), t.message!!) ) } - override fun onResponse( - call: Call, - response: Response - ) { + override fun onSuccess(response: Response) { - if (response.body() != "false") { + if (response.body().toString() != "false") { //sergio: _responsecheckfully.value = ResponseItemVO( isError = false, - response = response.body()!!, + response = response.body()!!.toString(), errorMessage = "" ) } @@ -1231,19 +923,15 @@ class CollectionViewModel(context: Context) : BaseViewModel(context) { silex.collection_getUncheckedTicket( collectionFk ).enqueue(object : - Callback { - override fun onFailure(call: Call, t: Throwable) { + SilexCallback(context) { + override fun onError(t: Throwable) { _responseCollectionUnchecked.value = ResponseItemVO( isError = true, errorMessage = getMessageFromAllResponse(nameofFunction(this), t.message!!) ) } - override fun onResponse( - call: Call, - response: Response - ) { - + override fun onSuccess(response: Response) { if (response.body() != null) { _responseCollectionUnchecked.value = ResponseItemVO( diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/controlador/fragment/ControladorViewModel.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/controlador/fragment/ControladorViewModel.kt index fcd66b83..da4ba1a7 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/controlador/fragment/ControladorViewModel.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/controlador/fragment/ControladorViewModel.kt @@ -3,24 +3,23 @@ package es.verdnatura.presentation.view.feature.controlador.fragment import android.content.Context import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData -import es.verdnatura.domain.GetSacadorControladorUserCase +import es.verdnatura.domain.SilexCallback 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.collection.mapper.map import es.verdnatura.presentation.view.feature.sacador.model.CollectionVO -import retrofit2.Call -import retrofit2.Callback import retrofit2.Response -class ControladorViewModel(context: Context) : BaseViewModel(context) { +class ControladorViewModel(var context: Context) : BaseViewModel(context) { private val contextApp = context private val _collectionTicketList by lazy { MutableLiveData() } - private val getSacadorControladorUserCase: GetSacadorControladorUserCase = - GetSacadorControladorUserCase(context) + /* private val getSacadorControladorUserCase: GetSacadorControladorUserCase = + GetSacadorControladorUserCase(context) + */ private val _response by lazy { MutableLiveData() } val response: LiveData get() = _response @@ -31,8 +30,8 @@ class ControladorViewModel(context: Context) : BaseViewModel(context) { fun collectionTicketGet(collectionFk: Int, sectorFk: Int, print: String, type: String) { silex.collection_getTickets(collectionFk, sectorFk, print, type).enqueue(object : - Callback { - override fun onFailure(call: Call, t: Throwable) { + SilexCallback(context) { + override fun onError(t: Throwable) { _collectionTicketList.value = CollectionVO( 0, isError = true, @@ -40,19 +39,13 @@ class ControladorViewModel(context: Context) : BaseViewModel(context) { ) } - override fun onResponse( - call: Call, - response: Response - ) { + override fun onSuccess(response: Response) { + if (response.body() != null) { _collectionTicketList.value = response.body()?.let { it.map(contextApp) } - /* response.body()?.let { - Log.d("VERDNTURA::","el itempacking es "+it.tickets.get(0).itemPackingTypeFk) - }.also { }*/ - } else { _collectionTicketList.value = CollectionVO( 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 057ff0ef..1b74f384 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 @@ -317,7 +317,7 @@ class ControlVehiculoFragment( with(viewModel) { binding.splashProgress.visibility = GONE - responseinsert.observe(viewLifecycleOwner, { + responseinsert.observe(viewLifecycleOwner) { if (it.isError) { ma.messageWithSound(it.errorMessage, true, false) @@ -341,16 +341,16 @@ class ControlVehiculoFragment( } } binding.splashProgress.visibility = GONE - }) + } - responsecontrol.observe(viewLifecycleOwner, { + responsecontrol.observe(viewLifecycleOwner) { binding.splashProgress.visibility = GONE if (it.isError) { ma.messageWithSound(it.errorMessage, true, false) } else { - if (it.response.equals("1")) { + if (it.response == "1") { isWorkedTimed = "REGISTERED" setToolBar("OUT") @@ -360,7 +360,7 @@ class ControlVehiculoFragment( } else { - if (it.response.equals("0")) { + if (it.response == "0") { setToolBar("IN") customDialogInput.setTitle(getString(R.string.vehiclecontrol)) @@ -390,7 +390,7 @@ class ControlVehiculoFragment( } } } - }) + } } 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 ab7d17e7..4aa69f4d 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 @@ -3,21 +3,19 @@ package es.verdnatura.presentation.view.feature.controlvehiculo.fragment import android.content.Context import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData -import es.verdnatura.domain.GetVehicleControlTimeUserCase +import es.verdnatura.domain.SilexCallback import es.verdnatura.presentation.base.BaseViewModel import es.verdnatura.presentation.base.getMessageFromAllResponse import es.verdnatura.presentation.base.nameofFunction import es.verdnatura.presentation.common.ResponseItemMachineControl import es.verdnatura.presentation.common.ResponseItemVO import org.json.JSONObject -import retrofit2.Call -import retrofit2.Callback import retrofit2.Response -class ControlVehiculoViewModel(context: Context) : BaseViewModel(context) { +class ControlVehiculoViewModel(val context: Context) : BaseViewModel(context) { - private val getVehicleControlTimeUserCase: GetVehicleControlTimeUserCase = - GetVehicleControlTimeUserCase(context) + /* private val getVehicleControlTimeUserCase: GetVehicleControlTimeUserCase = + GetVehicleControlTimeUserCase(context)*/ private val _responseinsert by lazy { MutableLiveData() } val responseinsert: LiveData @@ -39,34 +37,35 @@ class ControlVehiculoViewModel(context: Context) : BaseViewModel(context) { PlateNumber: String ) { silex.machineWorker_add(PlateNumber) - .enqueue(object : Callback { - override fun onFailure(call: Call, t: Throwable) { + .enqueue(object : SilexCallback(context) { + override fun onError(t: Throwable) { _responseinsert.value = ResponseItemVO( isError = true, - errorMessage = getMessageFromAllResponse(nameofFunction(this),t.message!!) + errorMessage = getMessageFromAllResponse(nameofFunction(this), t.message!!) ) } - override fun onResponse(call: Call, response: Response) { + override fun onSuccess(response: Response) { //sergio_devuelve true o false - if (response.isSuccessful){ - if (response.body().toString() == "false") { - _responseinsert.value = ResponseItemVO( - isError = true, - errorMessage = getMessageFromAllResponse(nameofFunction(this),response.message()) - ) - } else { - _responseinsert.value = - ResponseItemVO(isError = false, response = response.body()!!.toString()) + if (response.body().toString() == "false") { + _responseinsert.value = ResponseItemVO( + isError = true, + errorMessage = getMessageFromAllResponse( + nameofFunction(this), + response.message() + ) + ) - } - }else{ - _responseinsert.value = ResponseItemVO( - isError = true, - errorMessage = getMessageFromAllResponse(nameofFunction(this),response.message()) - ) - } + } else { + _responseinsert.value = ResponseItemVO( + isError = true, + errorMessage = getMessageFromAllResponse( + nameofFunction(this), + response.message() + ) + ) + } } @@ -78,22 +77,25 @@ class ControlVehiculoViewModel(context: Context) : BaseViewModel(context) { PlateNumber: String ) { silex.machineWorker_update(PlateNumber) - .enqueue(object : Callback { - override fun onFailure(call: Call, t: Throwable) { + .enqueue(object : SilexCallback(context) { + override fun onError(t: Throwable) { _responseinsert.value = ResponseItemVO( isError = true, - errorMessage = getMessageFromAllResponse(nameofFunction(this),t.message!!) + errorMessage = getMessageFromAllResponse(nameofFunction(this), t.message!!) ) } - override fun onResponse(call: Call, response: Response) { + override fun onSuccess(response: Response) { + //sergio devuelve true o false - if (response.isSuccessful){ if (response.body().toString() == "false") { _responseinsert.value = ResponseItemVO( isError = true, - errorMessage = getMessageFromAllResponse(nameofFunction(this),response.message()) + errorMessage = getMessageFromAllResponse( + nameofFunction(this), + response.message() + ) ) } else { @@ -102,67 +104,81 @@ class ControlVehiculoViewModel(context: Context) : BaseViewModel(context) { } - }else{ - _responseinsert.value = ResponseItemVO( - isError = true, - errorMessage = getMessageFromAllResponse(nameofFunction(this),response.message()) - ) - } + } }) } fun workerMachinery_isRegistered() { - silex.workerMachinery_isRegistered( - ).enqueue(object : Callback { - override fun onFailure(call: Call, t: Throwable) { - _responsecontrol.value = ResponseItemVO( - isError = true, - errorMessage = getMessageFromAllResponse(nameofFunction(this),t.message!!) - ) - } - - override fun onResponse(call: Call, response: Response) { - - if (!response.isSuccessful) { + silex.workerMachinery_isRegistered() + .enqueue(object : SilexCallback(context) { + override fun onError(t: Throwable) { _responsecontrol.value = ResponseItemVO( isError = true, - errorMessage = getMessageFromAllResponse(nameofFunction(this),response.message()) + errorMessage = getMessageFromAllResponse(nameofFunction(this), t.message!!) ) - } else { + } + + override fun onSuccess(response: Response) { _responsecontrol.value = ResponseItemVO(isError = false, response = response.body()!!) - } - } + } - - }) + }) } - fun deviceProduction_getnameDevice(android_id: String) { - getVehicleControlTimeUserCase.deviceProduction_getnameDevice( + silex.deviceProduction_getnameDevice( android_id - ).enqueue(object : Callback { - override fun onFailure(call: Call, t: Throwable) { + ) + .enqueue(object : SilexCallback(context) { + override fun onError(t: Throwable) { + _responsemachine.value = ResponseItemMachineControl( + isError = true, + errorMessage = getMessageFromAllResponse(nameofFunction(this), t.message!!), + type = "" + ) + } + + override fun onSuccess(response: Response) { + if (response.body() != null) { + + _responsemachine.value = + ResponseItemMachineControl( + isError = false, + response = response.body()!!.toString(), + type = "getnameDevice" + ) + } + + } + + }) + } + + fun deviceProductionUser_getWorker(android_id: String) { + silex.deviceProductionUser_getWorker( + android_id + ).enqueue(object : SilexCallback(context) { + override fun onError(t: Throwable) { _responsemachine.value = ResponseItemMachineControl( isError = true, - errorMessage = getMessageFromAllResponse(nameofFunction(this),t.message!!), + errorMessage = getMessageFromAllResponse(nameofFunction(this), t.message!!), type = "" ) } - override fun onResponse(call: Call, response: Response) { + override fun onSuccess(response: Response) { if (response.body() != null) { _responsemachine.value = ResponseItemMachineControl( isError = false, - response = response.body()!!, - type = "getnameDevice" + response = response.body()!!.toString(), + type = "getWorker" ) } @@ -171,60 +187,27 @@ class ControlVehiculoViewModel(context: Context) : BaseViewModel(context) { }) } - fun deviceProductionUser_getWorker(android_id: String) { - getVehicleControlTimeUserCase.deviceProductionUser_getWorker( - android_id - ).enqueue(object : Callback { - override fun onFailure(call: Call, t: Throwable) { - _responsemachine.value = ResponseItemMachineControl( - isError = true, - errorMessage = getMessageFromAllResponse(nameofFunction(this),t.message!!), - type = "" - ) - } - - override fun onResponse(call: Call, response: Response) { - if (response.body() != null) { - /* _responsemachine.value = ResponseItemMachineControl( - isError = true, - errorMessage = "Error al comprobar usuario del dispositivo", - type = "" - )*/ - - _responsemachine.value = - ResponseItemMachineControl( - isError = false, - response = response.body()!!, - type = "getWorker" - )} - - } - - }) - } - - fun machine_getWorkerPlate() { silex.machine_getWorkerPlate( - ).enqueue(object : Callback { - override fun onFailure(call: Call, t: Throwable) { + ).enqueue(object : SilexCallback(context) { + override fun onError(t: Throwable) { _responsemachine.value = ResponseItemMachineControl( isError = true, - errorMessage = getMessageFromAllResponse(nameofFunction(this),t.message!!), + errorMessage = getMessageFromAllResponse(nameofFunction(this), t.message!!), type = "" ) } - override fun onResponse(call: Call, response: Response) { + override fun onSuccess(response: Response) { //sergio: devuelve en el body if (response.body() == null) { ResponseItemMachineControl( isError = false, - response = response.body()!!, + response = response.body()!!.toString(), type = "getWorkerPlate" ) @@ -232,7 +215,7 @@ class ControlVehiculoViewModel(context: Context) : BaseViewModel(context) { _responsemachine.value = ResponseItemMachineControl( isError = false, - response = response.body()!!, + response = response.body()!!.toString(), type = "getWorkerPlate" ) } @@ -241,24 +224,21 @@ class ControlVehiculoViewModel(context: Context) : BaseViewModel(context) { }) } + fun sip_getExtensionSalix( workerId: Int ) { salix.sip_getExtension( workerId - ).enqueue(object : - Callback { - override fun onFailure(call: Call, t: Throwable) { + ).enqueue(object : SilexCallback(context) { + override fun onError(t: Throwable) { _responseGetExtensionFromUserId.value = ResponseItemVO( isError = true, errorMessage = getMessageFromAllResponse(nameofFunction(this), t.message!!) ) } - override fun onResponse( - call: Call, - response: Response - ) { + override fun onSuccess(response: Response) { if (response.body() != null) { _responseGetExtensionFromUserId.value = ResponseItemVO( 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 55bd7c2e..66ad74ba 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 @@ -9,6 +9,7 @@ import android.content.pm.PackageInfo import android.content.pm.PackageManager import android.net.Uri import android.provider.Settings +import android.system.Os.kill import android.view.View import androidx.lifecycle.Observer import androidx.recyclerview.widget.LinearLayoutManager @@ -25,6 +26,7 @@ import es.verdnatura.presentation.view.component.CustomDialogList import es.verdnatura.presentation.view.feature.login.adapter.WorkFormAdapter import es.verdnatura.presentation.view.feature.login.model.WorkForms import es.verdnatura.presentation.view.feature.main.activity.MainActivity +import kotlin.system.exitProcess class LoginFragment : BaseFragment(LoginViewModel::class) { @@ -100,7 +102,8 @@ class LoginFragment : BaseFragment(LoginVi saveData("base_urlSalix", item.urlSalix) saveData(WORKFORMSELECTED, item.name) customDialogList.dismiss() - requireActivity().recreate() + exitProcess(1) + } } @@ -120,7 +123,8 @@ class LoginFragment : BaseFragment(LoginVi customDialog.dismiss() customDialogList.dismiss() saveData(WORKFORMSELECTED, "Producción") - requireActivity().recreate() + exitProcess(1) + } .show() @@ -188,7 +192,7 @@ class LoginFragment : BaseFragment(LoginVi saveData(WORKFORMSELECTED, customNewForm.getValue()) customNewForm.dismiss() customDialogList.dismiss() - requireActivity().recreate() + exitProcess(1) }.setKoButton(getString(R.string.cancel)) { customNewForm.dismiss() 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 21bb993b..55dc6c6b 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 @@ -5,10 +5,7 @@ import android.util.Log import android.util.Log.d import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData -import es.verdnatura.domain.GetLoginUserCase -import es.verdnatura.domain.GetPreSacadorUseCase -import es.verdnatura.domain.GetSacadorControladorUserCase -import es.verdnatura.domain.GetUbicadorUserCase +import es.verdnatura.domain.* import es.verdnatura.presentation.base.BaseViewModel import es.verdnatura.presentation.base.getMessageFromAllResponse import es.verdnatura.presentation.base.nameofFunction @@ -26,7 +23,7 @@ import retrofit2.Call import retrofit2.Callback import retrofit2.Response -class PreSacadorViewModel(context: Context) : BaseViewModel(context) { +class PreSacadorViewModel(val context: Context) : BaseViewModel(context) { private val contextApp=context private val getPreSacadorUseCase: GetPreSacadorUseCase = GetPreSacadorUseCase(context) @@ -868,27 +865,19 @@ class PreSacadorViewModel(context: Context) : BaseViewModel(context) { silex.itemShelving_updateFromSale( saleFk ) - .enqueue(object : Callback { - override fun onFailure(call: Call, t: Throwable) { + .enqueue(object : SilexCallback(context) { + override fun onError(t: Throwable) { + _responseItemShelvingUpdate.value = ResponseItemVO( isError = true, errorMessage = getMessageFromAllResponse(nameofFunction(this), t.message!!) ) } - override fun onResponse(call: Call, response: Response) { - if (!response.isSuccessful) { - _responseItemShelvingUpdate.value = ResponseItemVO( - isError = true, - errorMessage = getMessageFromAllResponse( - nameofFunction(this), - response.message() - ) - ) - } else { + override fun onSuccess(response: Response) { + _responseItemShelvingUpdate.value = ResponseItemVO(isError = false, response = response.message()!!) - } } }) }