From 2cf223ff8bbe1288918bdabe1bc3f99128fbb93e Mon Sep 17 00:00:00 2001 From: Sergio De la torre Date: Thu, 22 Sep 2022 14:48:01 +0200 Subject: [PATCH] Version 9.1Beta-CMR quitado, rgb quitado --- .../view/feature/ajustes/fragment/AjustesViewModel.kt | 4 ++-- .../view/feature/pasillero/fragment/PasilleroViewModel.kt | 4 ++-- .../view/feature/sacador/fragment/SacadorFragment.kt | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) 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 af999604..8d518f5b 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 @@ -504,7 +504,7 @@ class AjustesViewModel(context: Context) : BaseViewModel() { } else { _operatorGetTrainResponse.value = - ResponseItemVO(response.body().toString(), false) + ResponseItemVO(if (response.body().toString()=="false")"" else{response.body().toString()}, false) } @@ -541,7 +541,7 @@ class AjustesViewModel(context: Context) : BaseViewModel() { } else { _operatorGetItemPackingType.value = - ResponseItemVO(response.body().toString(), false) + ResponseItemVO(if (response.body().toString()=="false")"" else{response.body().toString()}, false) } diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/pasillero/fragment/PasilleroViewModel.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/pasillero/fragment/PasilleroViewModel.kt index 9a8c5a7e..cbdc44e2 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/pasillero/fragment/PasilleroViewModel.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/pasillero/fragment/PasilleroViewModel.kt @@ -301,7 +301,7 @@ class PasilleroViewModel(context: Context) : BaseViewModel() { ) //Tarea #3986 - _pasillerositem.add( + /* _pasillerositem.add( PasillerosItemVO( 31, R.drawable.ic_cmr, @@ -309,7 +309,7 @@ class PasilleroViewModel(context: Context) : BaseViewModel() { R.string.titleCMRState, contextApp.getString(R.string.titleCMRDescrip) ) - ) + )*/ _pasillerositem.add( PasillerosItemVO( 40, diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/sacador/fragment/SacadorFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/sacador/fragment/SacadorFragment.kt index 8ea001b0..df0d5dce 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/sacador/fragment/SacadorFragment.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/sacador/fragment/SacadorFragment.kt @@ -65,7 +65,7 @@ class SacadorFragment : ) } else { - val working_in_test = true //sergio: Ok en app + val working_in_test = false //sergio: Ok en app if (!working_in_test) { viewModel.collectionGetSalix(token = getData(TOKEN)) } else { @@ -242,7 +242,7 @@ class SacadorFragment : goBack = false //sergio:para asegurarnos que aparece en pantalla. - val working_in_test = true //sergio: ok en app SACADOR + val working_in_test = false //sergio: ok en app SACADOR if (!working_in_test) { viewModel.collectionGetSalix(token = getData(TOKEN)) } else {