diff --git a/.idea/workspace.xml b/.idea/workspace.xml index ac59fd71..4be7b487 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -44,8 +44,8 @@ - @@ -83,30 +83,19 @@ - + - - - - + - - - - - - - - - - - - - - - - + + + + + + + + @@ -870,6 +859,7 @@ - - file://$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/login/fragment/LoginFragment.kt - 351 - - - file://$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/PreSacadorViewModel.kt - 694 - - - file://$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/PreSacadorViewModel.kt - 695 - - - file://$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/PreSacadorViewModel.kt - 699 - file://$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/SilexCallback.kt 34 diff --git a/app/src/main/java/es/verdnatura/domain/GetInventaryUserCase.kt b/app/src/main/java/es/verdnatura/domain/GetInventaryUserCase.kt index 1a3d5636..90996296 100644 --- a/app/src/main/java/es/verdnatura/domain/GetInventaryUserCase.kt +++ b/app/src/main/java/es/verdnatura/domain/GetInventaryUserCase.kt @@ -28,12 +28,12 @@ class GetInventaryUserCase(context: Context) : RestClient(context) { val params: ArrayList = ArrayList() params.add(warehouseFk) return restClient!!.faultsReview( - "json", + /* "json", "1", usuario, password, "application/json", - params = params + params = params*/ ) } @@ -47,12 +47,12 @@ class GetInventaryUserCase(context: Context) : RestClient(context) { params.add(itemFk) params.add(warehouseFk) return restClient!!.faultsReview_isChecked( - "json", + /* "json", "1", usuario, password, "application/json", - params = params + params = params*/ ) } diff --git a/app/src/main/java/es/verdnatura/domain/VerdnaturaService.kt b/app/src/main/java/es/verdnatura/domain/VerdnaturaService.kt index c5963788..d71f69cb 100644 --- a/app/src/main/java/es/verdnatura/domain/VerdnaturaService.kt +++ b/app/src/main/java/es/verdnatura/domain/VerdnaturaService.kt @@ -579,23 +579,14 @@ interface VerdnaturaService { @POST("almacennew/faultsReview")//REVISADA fun faultsReview( - @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/faultsReview_isChecked")//REVISADA fun faultsReview_isChecked( - @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 @@ -681,8 +672,7 @@ interface VerdnaturaService { @POST("almacennew/itemShelvingMake_multi")//REVISADA fun itemShelvingMake_multi( - - @Body params: List + @Body vararg params: Any ): Call 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 4aa69f4d..532eeb5b 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 @@ -59,11 +59,10 @@ class ControlVehiculoViewModel(val context: Context) : BaseViewModel(context) { } else { _responseinsert.value = ResponseItemVO( - isError = true, + isError = false, errorMessage = getMessageFromAllResponse( - nameofFunction(this), - response.message() - ) + nameofFunction(this),response.message()), + response=response.body().toString() ) } diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/diadeventa/fragment/DayOfSaleViewModel.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/diadeventa/fragment/DayOfSaleViewModel.kt index c3b53296..346cadda 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/diadeventa/fragment/DayOfSaleViewModel.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/diadeventa/fragment/DayOfSaleViewModel.kt @@ -4,7 +4,7 @@ import android.content.Context import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import androidx.lifecycle.Transformations -import es.verdnatura.domain.GetDayOfSaleUSerCase +import es.verdnatura.domain.SilexCallback import es.verdnatura.presentation.base.BaseViewModel import es.verdnatura.presentation.base.getMessageFromAllResponse import es.verdnatura.presentation.base.nameofFunction @@ -13,14 +13,9 @@ import es.verdnatura.presentation.common.ResponseItemVO import es.verdnatura.presentation.view.feature.diadeventa.model.ItemShelvingSaleDate import es.verdnatura.presentation.view.feature.diadeventa.model.ItemShelvingSaleDateList import retrofit2.Call -import retrofit2.Callback import retrofit2.Response -import timber.log.Timber.i - -class DayOfSaleViewModel(context: Context) : BaseViewModel(context) { - private val GetDayOfSaleUSerCase: GetDayOfSaleUSerCase = - GetDayOfSaleUSerCase(context) +class DayOfSaleViewModel(val context: Context) : BaseViewModel(context) { private val _response by lazy { MutableLiveData() } val response: LiveData @@ -34,9 +29,9 @@ class DayOfSaleViewModel(context: Context) : BaseViewModel(context) { val loadItemShelvingSaleDateList = Transformations.map(_itemShelvingSaleDateList) { Event(it) } fun itemShelving_getSaleDate(vShelvingFK: String) { - silex.itemShelving_getSaleDate(vShelvingFK).enqueue(object : - Callback> { - override fun onFailure(call: Call>, t: Throwable) { + silex.itemShelving_getSaleDate(vShelvingFK).enqueue(object : + SilexCallback>(context) { + override fun onError(t: Throwable) { val listError: ArrayList = ArrayList() listError.add( ItemShelvingSaleDate( @@ -47,25 +42,17 @@ class DayOfSaleViewModel(context: Context) : BaseViewModel(context) { _itemShelvingSaleDateList.value = ItemShelvingSaleDateList(listError) } - override fun onResponse( - call: Call>, - response: Response> - ) { + override fun onSuccess(response: Response>) { - if (!response.isSuccessful) { - - } if (response.body() != null) { _itemShelvingSaleDateList.value = response.body()?.let { ItemShelvingSaleDateList(it) } - i("finalizada la lista ${response.body()}") } else { if (!response.isSuccessful) { - val listError: ArrayList = ArrayList() listError.add( ItemShelvingSaleDate( @@ -84,23 +71,21 @@ class DayOfSaleViewModel(context: Context) : BaseViewModel(context) { }) } - /* fun getListFromJSON(json: JsonObject): MutableList { val gson = Gson() var list = mutableListOf() var expeditionState: Map = gson.fromJson(json, object : TypeToken>() {}.type) expeditionState.forEach { - list.add(itemsExpeditionDynamics(key=it.key,value=it.value.toString())) - } return list }*/ - fun parking( scanItem: String, parking: String) { - GetDayOfSaleUSerCase.shelvingPark(scanItem, parking).enqueue(object : - Callback { - override fun onFailure(call: Call, t: Throwable) { + fun parking(scanItem: String, parking: String) { + silex.shelvingPark(scanItem, parking).enqueue(object : + SilexCallback(context) { + override fun onError(t: Throwable) { + _response.value = ResponseItemVO( isError = true, errorMessage = getMessageFromAllResponse(nameofFunction(this), t.message!!) @@ -108,21 +93,7 @@ class DayOfSaleViewModel(context: Context) : BaseViewModel(context) { } override fun onResponse(call: Call, response: Response) { - - /* - if (response.isSuccessful == null){ - _response.value = ResponseItemVO(isError = true,errorMessage = getMessageFromAllResponse(nameofFunction(this),response.message())) - }else{*/ - if (response.isSuccessful) - _response.value = ResponseItemVO(isError = false, response = response.message()) - else - _response.value = ResponseItemVO( - isError = true, - errorMessage = getMessageFromAllResponse( - nameofFunction(this), - response.message() - ) - ) + _response.value = ResponseItemVO(isError = false, response = response.message()) } }) diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/faltas/fragment/FaltasViewModel.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/faltas/fragment/FaltasViewModel.kt index 69ce9594..bdb59826 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/faltas/fragment/FaltasViewModel.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/faltas/fragment/FaltasViewModel.kt @@ -3,8 +3,7 @@ package es.verdnatura.presentation.view.feature.faltas.fragment import android.content.Context import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData -import es.verdnatura.domain.GetInventaryUserCase -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 @@ -12,15 +11,9 @@ import es.verdnatura.presentation.common.ResponseItemVO import es.verdnatura.presentation.view.feature.faltas.model.ItemFaltasListVO import es.verdnatura.presentation.view.feature.faltas.model.ItemFaltasVO import retrofit2.Call -import retrofit2.Callback import retrofit2.Response -class FaltasViewModel(context: Context) : BaseViewModel(context) { - - - private val getInventaryUserCase: GetInventaryUserCase = GetInventaryUserCase(context) - private val getItemCardUserCase: GetItemCardUserCase = GetItemCardUserCase(context) - +class FaltasViewModel(val context: Context) : BaseViewModel(context) { private val _faltasList by lazy { MutableLiveData() } val faltasList: LiveData @@ -35,9 +28,9 @@ class FaltasViewModel(context: Context) : BaseViewModel(context) { fun getFaltas(user: String, password: String, warehouseFk: String) { - getInventaryUserCase.faultsReview(user, password, warehouseFk).enqueue(object : - Callback> { - override fun onFailure(call: Call>, t: Throwable) { + silex.faultsReview(user, password, warehouseFk).enqueue(object : + SilexCallback>(context) { + override fun onError(t: Throwable) { val listError: ArrayList = ArrayList() listError.add( ItemFaltasVO( @@ -48,10 +41,7 @@ class FaltasViewModel(context: Context) : BaseViewModel(context) { _faltasList.value = ItemFaltasListVO(listError) } - override fun onResponse( - call: Call>, - response: Response> - ) { + override fun onSuccess(response: Response>) { if (response.body() != null) { _faltasList.value = response.body()?.let { ItemFaltasListVO(it) } } else { @@ -78,10 +68,10 @@ class FaltasViewModel(context: Context) : BaseViewModel(context) { newValue: String, isTrash: String ) { - getItemCardUserCase.itemStockUpdate( itemFk, warehouseFk, newValue, isTrash) + silex.itemTrash(itemFk, warehouseFk, newValue, isTrash) .enqueue(object : - Callback { - override fun onFailure(call: Call, t: Throwable) { + SilexCallback(context) { + override fun onError(t: Throwable) { _response.value = ResponseItemVO( isError = true, errorMessage = getMessageFromAllResponse(nameofFunction(this), t.message!!) @@ -113,29 +103,21 @@ class FaltasViewModel(context: Context) : BaseViewModel(context) { itemFk: String, warehouseFk: String ) { - getInventaryUserCase.faultsReview_isChecked(user, password, itemFk, warehouseFk) + silex.faultsReview_isChecked(user, password, itemFk, warehouseFk) .enqueue(object : - Callback { - override fun onFailure(call: Call, t: Throwable) { + 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/historicoarticulo/fragment/HistoricoArticuloViewModel.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/historicoarticulo/fragment/HistoricoArticuloViewModel.kt index ee68dd8f..8afb1202 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/historicoarticulo/fragment/HistoricoArticuloViewModel.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/historicoarticulo/fragment/HistoricoArticuloViewModel.kt @@ -4,21 +4,16 @@ import android.content.Context import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import androidx.lifecycle.Transformations -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.Event import es.verdnatura.presentation.view.feature.historicoarticulo.model.ItemHistoricoListVO import es.verdnatura.presentation.view.feature.historicoarticulo.model.ItemHistoricoVO -import retrofit2.Call -import retrofit2.Callback import retrofit2.Response -class HistoricoArticuloViewModel(context: Context) : BaseViewModel(context) { - private val getItemCardUserCase: GetItemCardUserCase = GetItemCardUserCase(context) - - +class HistoricoArticuloViewModel(val context: Context) : BaseViewModel(context) { private val _historicoList by lazy { MutableLiveData() } val historicoList: LiveData @@ -28,24 +23,34 @@ class HistoricoArticuloViewModel(context: Context) : BaseViewModel(context) { val loadHistoricoList = Transformations.map(_historicoList) { Event(it) } - fun itemDiary(itemFk:Int,vWarehouseFk:Int){ - silex.itemDiary(itemFk,vWarehouseFk).enqueue(object : - Callback> { - override fun onFailure(call: Call>, t: Throwable) { - val listError:ArrayList = ArrayList() - listError.add(ItemHistoricoVO(isError = true,errorMessage =getMessageFromAllResponse(nameofFunction(this),t.message!!))) + fun itemDiary(itemFk: Int, vWarehouseFk: Int) { + silex.itemDiary(itemFk, vWarehouseFk).enqueue(object : + SilexCallback>(context) { + override fun onError(t: Throwable) { + val listError: ArrayList = ArrayList() + listError.add( + ItemHistoricoVO( + isError = true, + errorMessage = getMessageFromAllResponse(nameofFunction(this), t.message!!) + ) + ) _historicoList.value = ItemHistoricoListVO(listError) } - override fun onResponse( - call: Call>, - response: Response> - ) { - if (response.body() != null){ + override fun onSuccess(response: Response>) { + if (response.body() != null) { _historicoList.value = response.body()?.let { ItemHistoricoListVO(it) } - }else{ - val listError:ArrayList = ArrayList() - listError.add(ItemHistoricoVO(isError = true,errorMessage = getMessageFromAllResponse(nameofFunction(this),response.message()))) + } else { + val listError: ArrayList = ArrayList() + listError.add( + ItemHistoricoVO( + isError = true, + errorMessage = getMessageFromAllResponse( + nameofFunction(this), + response.message() + ) + ) + ) _historicoList.value = ItemHistoricoListVO(listError) } } diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/historicoshelving/fragment/ItemShelvingLogViewModel.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/historicoshelving/fragment/ItemShelvingLogViewModel.kt index aa546395..ac6e64f0 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/historicoshelving/fragment/ItemShelvingLogViewModel.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/historicoshelving/fragment/ItemShelvingLogViewModel.kt @@ -2,29 +2,18 @@ package es.verdnatura.presentation.view.feature.historicoshelving.fragment import android.content.Context -import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import androidx.lifecycle.Transformations -import es.verdnatura.domain.itemShelvingLogUSerCase +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.common.ResponseItemVO - -import es.verdnatura.presentation.view.feature.diadeventa.model.ItemShelvingSaleDateList -import es.verdnatura.presentation.view.feature.historicoshelving.model.ItemShelvingLogList import es.verdnatura.presentation.view.feature.historicoshelving.model.ItemShelvingLog -import retrofit2.Call -import retrofit2.Callback +import es.verdnatura.presentation.view.feature.historicoshelving.model.ItemShelvingLogList import retrofit2.Response -import timber.log.Timber.i - -class itemShelvingLogViewModel(context: Context) : BaseViewModel(context) { - private val itemShelvingLogUSerCase: itemShelvingLogUSerCase = - itemShelvingLogUSerCase(context) - +class itemShelvingLogViewModel(val context: Context) : BaseViewModel(context) { private val _itemShelvingLogList by lazy { MutableLiveData() } @@ -32,35 +21,25 @@ class itemShelvingLogViewModel(context: Context) : BaseViewModel(context) { val loadItemShelvingLogList = Transformations.map(_itemShelvingLogList) { Event(it) } - - fun itemShelvingLog_get(vShelvingFK: String){ + fun itemShelvingLog_get(vShelvingFK: String) { silex.itemShelvingLog_get(vShelvingFK).enqueue(object : - Callback> { - override fun onFailure(call: Call>, t: Throwable) { - val listError:ArrayList = ArrayList() - listError.add(ItemShelvingLog(isError = true,errorMessage = getMessageFromAllResponse(nameofFunction(this),t.message!!))) + SilexCallback>(context) { + override fun onError(t: Throwable) { + val listError: ArrayList = ArrayList() + listError.add( + ItemShelvingLog( + isError = true, + errorMessage = getMessageFromAllResponse(nameofFunction(this), t.message!!) + ) + ) _itemShelvingLogList.value = ItemShelvingLogList(listError) } - override fun onResponse( - call: Call>, - response: Response> - ) { - - if (!response.isSuccessful){ - val listError:ArrayList = ArrayList() - listError.add(ItemShelvingLog(isError = true,errorMessage = getMessageFromAllResponse(nameofFunction(this),response.message()))) - _itemShelvingLogList.value = ItemShelvingLogList(listError) - }else{ - - if (response.body() != null) - { - i("crea la lista %s", response.body()) - _itemShelvingLogList.value = response.body()?.let { - ItemShelvingLogList(it) - } - + override fun onSuccess(response: Response>) { + if (response.body() != null) { + _itemShelvingLogList.value = response.body()?.let { + ItemShelvingLogList(it) } } @@ -71,7 +50,6 @@ class itemShelvingLogViewModel(context: Context) : BaseViewModel(context) { } - } diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/historicoshelvinglog/fragment/shelvingLogViewModel.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/historicoshelvinglog/fragment/shelvingLogViewModel.kt index 35669edd..fe2e7ee1 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/historicoshelvinglog/fragment/shelvingLogViewModel.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/historicoshelvinglog/fragment/shelvingLogViewModel.kt @@ -4,83 +4,26 @@ package es.verdnatura.presentation.view.feature.historicoshelvinglog.fragment import android.content.Context import androidx.lifecycle.MutableLiveData import androidx.lifecycle.Transformations +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.historicoshelvinglog.model.ShelvingLogSalix import es.verdnatura.presentation.view.feature.historicoshelvinglog.model.ShelvingLogSalixList -import retrofit2.Call -import retrofit2.Callback import retrofit2.Response -class shelvingLogViewModel(context: Context) : BaseViewModel(context) { - /* private val itemShelvingLogUSerCase: itemShelvingLogUSerCase = - itemShelvingLogUSerCase(context)*/ - - /*private val _itemShelvingLogList by lazy { MutableLiveData() } - val loadShelvingLogList = Transformations.map(_itemShelvingLogList) { Event(it) }*/ +class shelvingLogViewModel(val context: Context) : BaseViewModel(context) { private val _itemShelvingLogSalixList by lazy { MutableLiveData() } val loadShelvingLogSalixList = Transformations.map(_itemShelvingLogSalixList) { Event(it) } - /* private val _shelvingResponse by lazy { MutableLiveData() } - val shelvingResponse: LiveData - get() = _shelvingResponse*/ - - /*fun shelvingLog_get(usuario: String, password: String, vShelvingFK: String) { - itemShelvingLogUSerCase.shelvingLog_get(usuario, password, vShelvingFK).enqueue(object : - Callback> { - override fun onFailure(call: Call>, t: Throwable) { - val listError: ArrayList = ArrayList() - listError.add( - ShelvingLog( - isError = true, - errorMessage = getMessageFromAllResponse(nameofFunction(this), t.message!!) - ) - ) - _itemShelvingLogList.value = ShelvingLogList(listError) - } - - override fun onResponse( - call: Call>, - response: Response> - ) { - - if (!response.isSuccessful) { - val listError: ArrayList = ArrayList() - listError.add( - ShelvingLog( - isError = true, - errorMessage = getMessageFromAllResponse( - nameofFunction(this), - response.message() - ) - ) - ) - _itemShelvingLogList.value = ShelvingLogList(listError) - } else { - - if (response.body() != null) { - _itemShelvingLogList.value = response.body()?.let { - ShelvingLogList(it) - } - - - } - - } - - } - - }) - }*/ - fun Shelvings(vShelvingFK: String) { salix.Shelvings(vShelvingFK).enqueue(object : - Callback> { - override fun onFailure(call: Call>, t: Throwable) { + SilexCallback>(context) { + override fun onError(t: Throwable) { + val listError: ArrayList = ArrayList() listError.add( ShelvingLogSalix( @@ -91,12 +34,13 @@ class shelvingLogViewModel(context: Context) : BaseViewModel(context) { _itemShelvingLogSalixList.value = ShelvingLogSalixList(listError) } - override fun onResponse( - call: Call>, - response: Response> - ) { + override fun onSuccess(response: Response>) { - if (!response.isSuccessful) { + if (response.body() != null) { + _itemShelvingLogSalixList.value = response.body()?.let { + ShelvingLogSalixList(it) + } + } else { val listError: ArrayList = ArrayList() listError.add( ShelvingLogSalix( @@ -109,16 +53,6 @@ class shelvingLogViewModel(context: Context) : BaseViewModel(context) { ) _itemShelvingLogSalixList.value = ShelvingLogSalixList(listError) - } else { - - if (response.body() != null) { - _itemShelvingLogSalixList.value = response.body()?.let { - ShelvingLogSalixList(it) - } - - - } - } } diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/historicovehiculo/fragment/HistoricoVehiculoViewModel.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/historicovehiculo/fragment/HistoricoVehiculoViewModel.kt index 6ebc6ed0..b0534576 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/historicovehiculo/fragment/HistoricoVehiculoViewModel.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/historicovehiculo/fragment/HistoricoVehiculoViewModel.kt @@ -3,50 +3,49 @@ package es.verdnatura.presentation.view.feature.historicovehiculo.fragment import android.content.Context import androidx.lifecycle.MutableLiveData import androidx.lifecycle.Transformations -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.Event import es.verdnatura.presentation.view.feature.historicovehiculo.model.ItemHistoricoVehiculo import es.verdnatura.presentation.view.feature.historicovehiculo.model.ItemHistoricoVehiculoList -import retrofit2.Call -import retrofit2.Callback import retrofit2.Response -import timber.log.Timber.d -import timber.log.Timber.i - -class HistoricoVehiculoViewModel (context: Context) : BaseViewModel(context) { - private val GetVehicleControlTimeUserCase: GetVehicleControlTimeUserCase = GetVehicleControlTimeUserCase(context) +class HistoricoVehiculoViewModel(var context: Context) : BaseViewModel(context) { private val _historicovehiculoList by lazy { MutableLiveData() } - - val loadHistoricoVehiculoList = Transformations.map(_historicovehiculoList) { Event(it) } - - fun machineWorker_getHistorical(plateNumber:String){ + fun machineWorker_getHistorical(plateNumber: String) { silex.machineWorker_getHistorical(plateNumber).enqueue(object : - Callback> { - override fun onFailure(call: Call>, t: Throwable) { - val listError:ArrayList = ArrayList() - listError.add(ItemHistoricoVehiculo(isError = true,errorMessage =getMessageFromAllResponse(nameofFunction(this),t.message!!))) + SilexCallback>(context) { + override fun onError(t: Throwable) { + val listError: ArrayList = ArrayList() + listError.add( + ItemHistoricoVehiculo( + isError = true, + errorMessage = getMessageFromAllResponse(nameofFunction(this), t.message!!) + ) + ) _historicovehiculoList.value = ItemHistoricoVehiculoList(listError) - } - override fun onResponse( - call: Call>, - response: Response> - ) { - if (response.body() != null){ - - _historicovehiculoList.value = response.body()?.let { ItemHistoricoVehiculoList(it) } - - }else{ - val listError:ArrayList = ArrayList() - listError.add(ItemHistoricoVehiculo(isError = true,errorMessage = getMessageFromAllResponse(nameofFunction(this),response.message()))) + override fun onSuccess(response: Response>) { + if (response.body() != null) { + _historicovehiculoList.value = + response.body()?.let { ItemHistoricoVehiculoList(it) } + } else { + val listError: ArrayList = ArrayList() + listError.add( + ItemHistoricoVehiculo( + isError = true, + errorMessage = getMessageFromAllResponse( + nameofFunction(this), + response.message() + ) + ) + ) _historicovehiculoList.value = ItemHistoricoVehiculoList(listError) } diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/showticket/ShowTicketViewModel.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/showticket/ShowTicketViewModel.kt index e00471e4..c836af96 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/showticket/ShowTicketViewModel.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/showticket/ShowTicketViewModel.kt @@ -3,44 +3,43 @@ package es.verdnatura.presentation.view.feature.precontrol import android.content.Context import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData +import es.verdnatura.domain.SilexCallback import es.verdnatura.presentation.base.BaseViewModel -import es.verdnatura.domain.GetPreControladorUserCase 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 ShowTicketViewModel(context: Context) : BaseViewModel(context) { - private val contextApp=context - - private val getPreControladorUserCase: GetPreControladorUserCase = GetPreControladorUserCase(context) +class ShowTicketViewModel(val context: Context) : BaseViewModel(context) { private val _collectionTicketList by lazy { MutableLiveData() } val collectionTicketList: LiveData get() = _collectionTicketList - private val _responseTicket by lazy { MutableLiveData() } - val responseTicket: LiveData - get() = _responseTicket - - 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) { - _collectionTicketList.value = CollectionVO(0,isError = true,errorMessage =getMessageFromAllResponse(nameofFunction(this),t.message!!)) + fun collectionTicketGet(collectionFk: Int, sectorFk: Int, print: String, type: String) { + silex.collection_getTickets(collectionFk, sectorFk, print, type).enqueue(object : + SilexCallback(context) { + override fun onError(t: Throwable) { + _collectionTicketList.value = CollectionVO( + 0, + isError = true, + errorMessage = getMessageFromAllResponse(nameofFunction(this), t.message!!) + ) } - override fun onResponse( - call: Call, - response: Response - ) { - if (response.body() != null){ - _collectionTicketList.value = response.body()?.let { it.map(contextApp) } - }else{ - _collectionTicketList.value = CollectionVO(0,isError = true,errorMessage = getMessageFromAllResponse(nameofFunction(this),response.message())) + + override fun onSuccess(response: Response) { + if (response.body() != null) { + _collectionTicketList.value = response.body()?.let { it.map(context) } + } else { + _collectionTicketList.value = CollectionVO( + 0, + isError = true, + errorMessage = getMessageFromAllResponse( + nameofFunction(this), + response.message() + ) + ) } } }) diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/AutomaticAddItemViewModel.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/AutomaticAddItemViewModel.kt index dca0272f..e69acae5 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/AutomaticAddItemViewModel.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/AutomaticAddItemViewModel.kt @@ -3,19 +3,15 @@ package es.verdnatura.presentation.view.feature.ubicador.fragment import android.content.Context import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData -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 retrofit2.Call -import retrofit2.Callback import retrofit2.Response -class AutomaticAddItemViewModel(context: Context) : BaseViewModel(context) { +class AutomaticAddItemViewModel(val context: Context) : BaseViewModel(context) { - - private val getUbicadorUserCase: GetUbicadorUserCase = GetUbicadorUserCase(context) private val _response by lazy { MutableLiveData() } val response: LiveData get() = _response @@ -26,10 +22,10 @@ class AutomaticAddItemViewModel(context: Context) : BaseViewModel(context) { items: List, warehouse: Int ) { - getUbicadorUserCase.itemShelvingMake_multi(shelving, items, warehouse) + silex.itemShelvingMake_multi(shelving, items, warehouse) .enqueue(object : - Callback { - override fun onFailure(call: Call, t: Throwable) { + SilexCallback(context) { + override fun onError(t: Throwable) { _response.value = ResponseItemVO( isError = true, errorMessage = getMessageFromAllResponse( nameofFunction(this), t.message!! @@ -37,19 +33,10 @@ class AutomaticAddItemViewModel(context: Context) : BaseViewModel(context) { ) } - 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()!!) } }) @@ -67,8 +54,8 @@ class AutomaticAddItemViewModel(context: Context) : BaseViewModel(context) { isChecking, warehouse ).enqueue(object : - Callback { - override fun onFailure(call: Call, t: Throwable) { + SilexCallback(context) { + override fun onError(t: Throwable) { _response.value = ResponseItemVO( isError = true, errorMessage = getMessageFromAllResponse( nameofFunction(this), t.message!! @@ -76,19 +63,9 @@ class AutomaticAddItemViewModel(context: Context) : BaseViewModel(context) { ) } - 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()!!) } })