diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index a921d5b5..0e385646 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -44,7 +44,7 @@
-
+
@@ -83,58 +83,22 @@
-
-
-
-
-
+
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -145,7 +109,7 @@
-
+
@@ -274,7 +238,7 @@
-
+
@@ -453,13 +417,6 @@
1618825571576
-
- 1651647601790
-
-
-
- 1651647601790
-
1651648056868
@@ -796,7 +753,14 @@
1669975009872
-
+
+ 1670580001733
+
+
+
+ 1670580001733
+
+
@@ -898,8 +862,6 @@
-
-
@@ -923,7 +885,9 @@
-
+
+
+
diff --git a/app/build.gradle b/app/build.gradle
index 34eb12a7..b8b60933 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -11,7 +11,7 @@ android {
defaultConfig {
applicationId "es.verdnatura"
- minSdkVersion 21 //21
+ minSdkVersion 24 //21
targetSdkVersion 30
versionCode 144
//versionName = "9.4" versionCode 143
diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json
index e09140f7..1fb93291 100644
--- a/app/release/output-metadata.json
+++ b/app/release/output-metadata.json
@@ -4,7 +4,7 @@
"type": "APK",
"kind": "Directory"
},
- "applicationId": "es.verdnatura.releasex",
+ "applicationId": "es.verdnatura",
"variantName": "release",
"elements": [
{
diff --git a/app/src/main/java/es/verdnatura/domain/Extensions.kt b/app/src/main/java/es/verdnatura/domain/Extensions.kt
index 51071753..88b50459 100644
--- a/app/src/main/java/es/verdnatura/domain/Extensions.kt
+++ b/app/src/main/java/es/verdnatura/domain/Extensions.kt
@@ -1,11 +1,32 @@
package es.verdnatura.domain
import android.content.Context
+import android.graphics.Color
+import android.os.Build
+import android.text.Html
import android.widget.EditText
import android.widget.Toast
+import androidx.annotation.RequiresApi
-fun Any.toast(context: Context?, duration: Int = Toast.LENGTH_SHORT): Toast {
+
+/*fun Any.toast(context: Context?, duration: Int = Toast.LENGTH_SHORT): Toast {
return Toast.makeText(context, this.toString(), duration).apply { show() }
+}*/
+@RequiresApi(Build.VERSION_CODES.N)
+fun Any.toast(
+ context: Context?,
+ duration: Int = Toast.LENGTH_SHORT,
+ color: Int = Color.WHITE
+): Toast {
+ val toast = Toast.makeText(
+ context,
+ Html.fromHtml("$this", 0),
+ duration
+ )
+ //toast2.setGravity(Gravity.TOP, 0, 0)
+ toast.show()
+ return toast.apply { show() }
+
}
fun T?.notNull(f: (it: T) -> Unit) {
diff --git a/app/src/main/java/es/verdnatura/domain/SilexCallback.kt b/app/src/main/java/es/verdnatura/domain/SilexCallback.kt
index 9a924284..f2aad918 100644
--- a/app/src/main/java/es/verdnatura/domain/SilexCallback.kt
+++ b/app/src/main/java/es/verdnatura/domain/SilexCallback.kt
@@ -1,7 +1,7 @@
package es.verdnatura.domain
import android.content.Context
-import es.verdnatura.MobileApplication
+import android.graphics.Color
import es.verdnatura.R
import es.verdnatura.presentation.base.nameofFunction
import org.json.JSONObject
@@ -55,7 +55,7 @@ abstract class SilexCallback(val context: Context) : Callback {
}
open fun onSuccess(response: Response) {
- context.getString(R.string.operationSuccessful).toast(context)
+ (nameofFunction((this))+ context.getString(R.string.operationSuccessful)).toast(context)
//(context as MobileApplication).playSoundIsOK(true)
}
diff --git a/app/src/main/java/es/verdnatura/presentation/base/BaseFragment.kt b/app/src/main/java/es/verdnatura/presentation/base/BaseFragment.kt
index 52b0478e..fb4be179 100644
--- a/app/src/main/java/es/verdnatura/presentation/base/BaseFragment.kt
+++ b/app/src/main/java/es/verdnatura/presentation/base/BaseFragment.kt
@@ -709,7 +709,7 @@ abstract class BaseFragment(viewModelCla
editor.putInt(name,value as Int)
}
"SUPPLIERID"->{
- editor.putInt(name,value as Int)
+ editor.putString(name,value.toString())
}
else -> {
editor.putString(name, value.toString())
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/ajustes/fragment/AjustesFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/ajustes/fragment/AjustesFragment.kt
index 335c466f..2366a1f4 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/ajustes/fragment/AjustesFragment.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/ajustes/fragment/AjustesFragment.kt
@@ -84,6 +84,7 @@ class AjustesFragment :
override fun observeViewModel() {
with(viewModel) {
+
ajustesAdapter = AjustesAdapter(ajustesitem, object : OnAjustesItemClickListener {
override fun onAjustesItemClickListener(item: AjustesItemVO) {
@@ -205,12 +206,6 @@ class AjustesFragment :
loadUpdatePacking.observe(viewLifecycleOwner) { event ->
event.getContentIfNotHandled().notNull {
binding.splashProgress.visibility=View.GONE
- /* ma.messageWithSound(
- if (it.isError) it.errorMessage else {
- getString(R.string.itemUpdated)
- }, it.isError, false
- )*/
-
}
}
@@ -228,11 +223,15 @@ class AjustesFragment :
workerupdatePrinter.observe(viewLifecycleOwner) {
binding.splashProgress.visibility = View.GONE
- ma.messageWithSound(
+ /* ma.messageWithSound(
if (it.isError) it.errorMessage else {
getString(R.string.printerUpdated)
}, it.isError, false
- )
+ )*/
+ }
+ isLoadingProgress.observe(viewLifecycleOwner) {
+ binding.splashProgress.visibility = it
+
}
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 04b8d2aa..9f7fd8e6 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
@@ -2,6 +2,8 @@ package es.verdnatura.presentation.view.feature.ajustes.fragment
import android.content.Context
+import android.view.View.GONE
+import android.view.View.VISIBLE
import androidx.lifecycle.LiveData
import androidx.lifecycle.MutableLiveData
import androidx.lifecycle.Transformations
@@ -17,16 +19,11 @@ import es.verdnatura.presentation.view.feature.ajustes.model.*
import es.verdnatura.presentation.view.feature.articulo.model.ItemPackingType
import es.verdnatura.presentation.view.feature.articulo.model.ItemPackingTypeList
import retrofit2.Call
-import retrofit2.Callback
import retrofit2.Response
class AjustesViewModel(val context: Context) : BaseViewModel(context) {
- // private val getAjustesUserCase: GetAjustesUserCase = GetAjustesUserCase(context)
- // private val getLoginUserCase: GetLoginUserCase = GetLoginUserCase(context)
- //private val getItemCardUserCase: GetItemCardUserCase = GetItemCardUserCase(context)
-
private val _ajustesitem by lazy { ArrayList() }
val ajustesitem: List
get() = _ajustesitem
@@ -90,6 +87,15 @@ class AjustesViewModel(val context: Context) : BaseViewModel(context) {
val loadTrainList = Transformations.map(_trainList) { Event(it) }
val loadUpdatePacking = Transformations.map(_actionUpdatePackingTicket) { Event(it) }
+ private val _isLoadingProgress by lazy { MutableLiveData() }
+ val isLoadingProgress: LiveData
+ get() = _isLoadingProgress
+
+ fun ProgressLoading(visibility: Int) {
+ _isLoadingProgress.value = visibility
+ }
+
+
fun inititializeDefaultAjusts(
sectorDescrip: String,
sectorFk: Int,
@@ -161,16 +167,7 @@ class AjustesViewModel(val context: Context) : BaseViewModel(context) {
action = actionIsAllowed
)
)
- /* _ajustesitem.add(
- AjustesItemVO(
- 3,
- contextApp.getString(R.string.labelType),
- TypeTags,
- 0,
- 0,
- 0, contextApp.getString(R.string.printerWithout)
- )
- )*/
+
_ajustesitem.add(
AjustesItemVO(
4,
@@ -199,8 +196,9 @@ class AjustesViewModel(val context: Context) : BaseViewModel(context) {
fun getItemPackingTypeSalix() {
salix.get_ItemPackingType().enqueue(object :
- Callback> {
- override fun onFailure(call: Call>, t: Throwable) {
+ SilexCallback>(context) {
+ override fun onError(t: Throwable) {
+
val listError: ArrayList = ArrayList()
listError.add(
ItemPackingType(
@@ -211,10 +209,8 @@ class AjustesViewModel(val context: Context) : BaseViewModel(context) {
_itemspackinglist.value = ItemPackingTypeList(listError)
}
- override fun onResponse(
- call: Call>,
- response: Response>
- ) {
+ override fun onSuccess(response: Response>) {
+
if (response.body() != null) {
_itemspackinglist.value = response.body()?.let { ItemPackingTypeList(it) }
@@ -237,18 +233,15 @@ class AjustesViewModel(val context: Context) : BaseViewModel(context) {
}
fun getSectorsSalix() {
- salix.getSectorsSalix().enqueue(object : Callback> {
- override fun onFailure(call: Call>, t: Throwable) {
+ salix.getSectorsSalix().enqueue(object : SilexCallback>(context) {
+ override fun onError(t: Throwable) {
+
val listError: ArrayList = ArrayList()
listError.add(SectorItemVO(0, "", 0, true, t.message!!))
_sectorList.value = SectorListVO(listError)
}
- override fun onResponse(
- call: Call>,
- response: Response>
- ) {
-
+ override fun onSuccess(response: Response>) {
if (response.body() != null) {
_sectorList.value = response.body()?.let { SectorListVO(it) }
@@ -268,18 +261,16 @@ class AjustesViewModel(val context: Context) : BaseViewModel(context) {
}
fun printer_get() {
- silex.printer_get().enqueue(object : Callback> {
- override fun onFailure(call: Call>, t: Throwable) {
+ silex.printer_get().enqueue(object : SilexCallback>(context) {
+ override fun onError(t: Throwable) {
+
val listError: ArrayList = ArrayList()
listError.add(Printers(0, "", true, t.message!!))
_printerList.value = PrintersList(listError)
}
- override fun onResponse(
- call: Call>,
- response: Response>
- ) {
+ override fun onSuccess(response: Response>) {
if (response.body() != null) {
@@ -300,19 +291,16 @@ class AjustesViewModel(val context: Context) : BaseViewModel(context) {
}
fun train_get() {
- silex.train_get().enqueue(object : Callback> {
- override fun onFailure(call: Call>, t: Throwable) {
+ silex.train_get().enqueue(object : SilexCallback>(context) {
+ override fun onError(t: Throwable) {
+
val listError: ArrayList = ArrayList()
listError.add(Train(0, "", true, t.message!!))
_trainList.value = TrainList(listError)
}
- override fun onResponse(
- call: Call>,
- response: Response>
- ) {
-
+ override fun onSuccess(response: Response>) {
if (response.body() != null) {
_trainList.value = response.body()?.let { TrainList(it) }
@@ -334,8 +322,8 @@ class AjustesViewModel(val context: Context) : BaseViewModel(context) {
fun worker_updateSector(sectorFk: Int) {
silex.worker_updateSector(sectorFk)
- .enqueue(object : Callback {
- override fun onFailure(call: Call, t: Throwable) {
+ .enqueue(object : SilexCallback(context) {
+ override fun onError(t: Throwable) {
_actionUpdate.value = ResponseItemVO(
isError = true,
@@ -343,27 +331,13 @@ class AjustesViewModel(val context: Context) : BaseViewModel(context) {
)
}
- override fun onResponse(
- call: Call,
- response: Response
- ) {
+ override fun onSuccess(response: Response) {
+ _actionUpdate.value = ResponseItemVO(
+ response = response.message(),
+ isError = false,
+ errorMessage = ""
- if (!response.isSuccessful) {
- _actionUpdate.value = ResponseItemVO(
- isError = true,
- errorMessage = getMessageFromAllResponse(
- nameofFunction(this),
- response.message()
- )
- )
- } else {
- _actionUpdate.value = ResponseItemVO(
- response = response.message(),
- isError = false,
- errorMessage = ""
-
- )
- }
+ )
}
@@ -374,8 +348,8 @@ class AjustesViewModel(val context: Context) : BaseViewModel(context) {
fun operator_updateItemPackingType(itemPackingTypeFk: String) {
silex.operator_updateItemPackingType(itemPackingTypeFk)
- .enqueue(object : Callback {
- override fun onFailure(call: Call, t: Throwable) {
+ .enqueue(object : SilexCallback(context) {
+ override fun onError(t: Throwable) {
_actionUpdatePacking.value = ResponseItemVO(
isError = true,
@@ -383,28 +357,14 @@ class AjustesViewModel(val context: Context) : BaseViewModel(context) {
)
}
- override fun onResponse(
- call: Call,
- response: Response
- ) {
+ override fun onSuccess(response: Response) {
- if (!response.isSuccessful) {
- _actionUpdatePacking.value = ResponseItemVO(
- isError = true,
- errorMessage = getMessageFromAllResponse(
- nameofFunction(this),
- response.message()
- )
- )
- } else {
- _actionUpdatePacking.value = ResponseItemVO(
- response = response.message(),
- isError = false,
- errorMessage = ""
-
- )
- }
+ _actionUpdatePacking.value = ResponseItemVO(
+ response = response.message(),
+ isError = false,
+ errorMessage = ""
+ )
}
@@ -414,8 +374,9 @@ class AjustesViewModel(val context: Context) : BaseViewModel(context) {
fun operator_getNumberOfWagons() {
silex.operator_getNumberOfWagons()
- .enqueue(object : Callback {
- override fun onFailure(call: Call, t: Throwable) {
+ .enqueue(object : SilexCallback(context) {
+
+ override fun onError(t: Throwable) {
_operatorGetNumberOfWagons.value = ResponseItemNumber(
null,
@@ -424,27 +385,10 @@ class AjustesViewModel(val context: Context) : BaseViewModel(context) {
)
}
- override fun onResponse(
- call: Call,
- response: Response
- ) {
-
- if (!response.isSuccessful) {
- _operatorGetNumberOfWagons.value = ResponseItemNumber(
- null, true,
- errorMessage = getMessageFromAllResponse(
- nameofFunction(this),
- response.message()
- )
- )
- } else {
-
- if (response.body() != null)
- _operatorGetNumberOfWagons.value =
- ResponseItemNumber(response.body(), isError = false)
-
-
- }
+ override fun onSuccess(response: Response) {
+ if (response.body() != null)
+ _operatorGetNumberOfWagons.value =
+ ResponseItemNumber(response.body(), isError = false)
}
@@ -454,40 +398,22 @@ class AjustesViewModel(val context: Context) : BaseViewModel(context) {
fun operator_getTrain() {
silex.operator_getTrain()
- .enqueue(object : Callback {
- override fun onFailure(call: Call, t: Throwable) {
+ .enqueue(object : SilexCallback(context) {
+ override fun onError(t: Throwable) {
_operatorGetTrainResponse.value = ResponseItemVO(
isError = true,
errorMessage = getMessageFromAllResponse(nameofFunction(this), t.message!!)
)
}
- override fun onResponse(
- call: Call,
- response: Response
- ) {
-
- if (!response.isSuccessful) {
- _operatorGetTrainResponse.value = ResponseItemVO(
- isError = true,
- errorMessage = getMessageFromAllResponse(
- nameofFunction(this),
- response.message()
- )
+ override fun onSuccess(response: Response) {
+ _operatorGetTrainResponse.value =
+ ResponseItemVO(
+ if (response.body().toString() == "false") "" else {
+ response.body().toString()
+ }, false
)
- } else {
-
- _operatorGetTrainResponse.value =
- ResponseItemVO(
- if (response.body().toString() == "false") "" else {
- response.body().toString()
- }, false
- )
-
- }
-
-
}
})
}
@@ -495,9 +421,8 @@ class AjustesViewModel(val context: Context) : BaseViewModel(context) {
fun operator_getItemPackingType() {
silex.operator_getItemPackingType()
- .enqueue(object : Callback {
- override fun onFailure(call: Call, t: Throwable) {
-
+ .enqueue(object : SilexCallback(context) {
+ override fun onError(t: Throwable) {
_operatorGetItemPackingType.value = ResponseItemVO(
isError = true,
errorMessage = getMessageFromAllResponse(nameofFunction(this), t.message!!)
@@ -534,10 +459,9 @@ class AjustesViewModel(val context: Context) : BaseViewModel(context) {
}
fun worker_isF11Allowed() {
-
silex.worker_isF11Allowed()
- .enqueue(object : Callback {
- override fun onFailure(call: Call, t: Throwable) {
+ .enqueue(object : SilexCallback(context) {
+ override fun onError(t: Throwable) {
_workerAllowedResponse.value = ResponseItemVO(
isError = true,
@@ -545,126 +469,46 @@ class AjustesViewModel(val context: Context) : BaseViewModel(context) {
)
}
- override fun onResponse(
- call: Call,
- response: Response
- ) {
-
- if (!response.isSuccessful) {
- _workerAllowedResponse.value = ResponseItemVO(
- isError = true,
- errorMessage = getMessageFromAllResponse(
- nameofFunction(this),
- response.message()
- )
- )
- } else {
-
- _workerAllowedResponse.value =
- ResponseItemVO(response.body().toString(), false)
-
- }
-
-
+ override fun onSuccess(response: Response) {
+ _workerAllowedResponse.value = ResponseItemVO(
+ response = response.body().toString(),
+ isError = false,
+ )
}
+
})
}
fun worker_updatePrinter(printerFk: Int) {
+ ProgressLoading(VISIBLE)
silex.worker_updatePrinter(printerFk)
- .enqueue(object : Callback {
- override fun onFailure(call: Call, t: Throwable) {
-
- _workerupdatePrinter.value = ResponseItemVO(
- isError = true,
- errorMessage = getMessageFromAllResponse(nameofFunction(this), t.message!!)
- )
+ .enqueue(object : SilexCallback(context) {
+ override fun onError(t: Throwable) {
+ ProgressLoading(GONE)
+ throw t
}
- override fun onResponse(
- call: Call,
- response: Response
- ) {
-
- if (!response.isSuccessful) {
- _workerupdatePrinter.value = ResponseItemVO(
- isError = true,
- errorMessage = getMessageFromAllResponse(
- nameofFunction(this),
- response.message()
- )
- )
- } else {
- _workerupdatePrinter.value = ResponseItemVO(
- response = response.message(),
- isError = false,
- errorMessage = ""
- )
-
- }
-
+ override fun onSuccess(response: Response) {
+ ProgressLoading(GONE)
+ super.onSuccess(response)
}
})
}
fun operator_updateTrain(trainFk: Int) {
-
+ ProgressLoading(VISIBLE)
silex.operator_updateTrain(trainFk)
.enqueue(object : SilexCallback(context) {
- /* override fun onFailure(call: Call, t: Throwable) {
- _actionUpdatePacking.value = ResponseItemVO(
- isError = true,
- errorMessage = getMessageFromAllResponse(nameofFunction(this), t.message!!)
- )
- }
-
- override fun onResponse(
- call: Call,
- response: Response
- ) {
-
- if (!response.isSuccessful) {
- _actionUpdatePacking.value = ResponseItemVO(
- isError = true,
- errorMessage = getMessageFromAllResponse(
- nameofFunction(this),
- response.message()
- )
- )
- } else {
- _actionUpdatePacking.value = ResponseItemVO(
- response = response.message(),
- isError = false,
- errorMessage = ""
-
- )
- }
-
-
- }*/
override fun onError(t: Throwable) {
- //throw Error(nameofFunction((this)) + t.message)
- _actionUpdatePackingTicket.value = ResponseItemVO(
- isError = true,
- errorMessage = getMessageFromAllResponse(
- nameofFunction(this),
- t.message!!
- )
- )
+ ProgressLoading(GONE)
throw t
}
override fun onSuccess(response: Response) {
- _actionUpdatePackingTicket.value = ResponseItemVO(
- isError = false,
- errorMessage = getMessageFromAllResponse(
- nameofFunction(this),
- response.message()
- )
- )
- super.onSuccess(response)
+ ProgressLoading(GONE)
+ //super.onSuccess(response)
}
})
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 cd485970..295fe53a 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
@@ -2506,15 +2506,14 @@ class CollectionFragment(
}
private fun showMistakeList(list: List) {
+
+ customDialogInput.dismiss()
binding.splashProgress.visibility = GONE
listPlacementSupply = ArrayList()
list.forEach {
listPlacementSupply.add(BarcodeVO(code = it.description))
}
-
-
-
customDialogList.setTitle(getString(R.string.errorCause))
.setKoButton(getString(R.string.cancel)) {
scanRequest()
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/ShowTicketFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/ShowTicketFragment.kt
index 8ffcd59d..9e53f907 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/ShowTicketFragment.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/ShowTicketFragment.kt
@@ -5,7 +5,6 @@ import android.content.Context
import android.graphics.drawable.Drawable
import android.os.Build
import android.os.Bundle
-import android.util.Log
import android.view.View
import android.view.View.GONE
import android.view.View.VISIBLE
@@ -22,7 +21,6 @@ import es.verdnatura.presentation.base.BaseFragment
import es.verdnatura.presentation.common.*
import es.verdnatura.presentation.view.component.CustomDialog
import es.verdnatura.presentation.view.feature.collection.adapter.SaleAdapter
-import es.verdnatura.presentation.view.feature.main.activity.MainActivity
import es.verdnatura.presentation.view.feature.sacador.model.CollectionVO
import es.verdnatura.presentation.view.feature.sacador.model.SaleVO
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 e07e3726..057ff0ef 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
@@ -3,7 +3,6 @@ package es.verdnatura.presentation.view.feature.controlvehiculo.fragment
import android.content.Context
import android.graphics.drawable.Drawable
import android.os.Build
-import android.util.Log
import android.util.TypedValue
import android.view.View.GONE
import android.view.View.VISIBLE
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 b94823a5..de775c9c 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
@@ -500,7 +500,7 @@ class PasilleroViewModel(context: Context) : BaseViewModel(context) {
//#tarea4021
- /* _pasillerositem.add(
+ /* _pasillerositem.add(
PasillerosItemVO(
6,
R.drawable.ic_packaging,
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/EndSacadorFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/EndSacadorFragment.kt
index b57ae73c..b0cf4d94 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/EndSacadorFragment.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/EndSacadorFragment.kt
@@ -5,7 +5,6 @@ import android.graphics.drawable.Drawable
import android.media.MediaPlayer
import android.os.Build
import android.os.Bundle
-import android.util.Log.d
import android.view.View
import android.view.View.GONE
import android.view.View.VISIBLE
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/reposicion/fragment/ReposicionFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/reposicion/fragment/ReposicionFragment.kt
index 9f532afd..c7ebafdb 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/reposicion/fragment/ReposicionFragment.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/reposicion/fragment/ReposicionFragment.kt
@@ -7,7 +7,6 @@ import android.os.Build
import android.os.Bundle
import android.view.View
import android.view.inputmethod.EditorInfo
-import android.view.inputmethod.InputMethodManager
import android.widget.ImageView
import androidx.lifecycle.Observer
import androidx.recyclerview.widget.LinearLayoutManager
@@ -25,7 +24,6 @@ import es.verdnatura.presentation.view.feature.main.activity.MainActivity
import es.verdnatura.presentation.view.feature.pasillero.model.PasillerosItemVO
import es.verdnatura.presentation.view.feature.presacador.model.PreSacadorItemVO
import es.verdnatura.presentation.view.feature.reposicion.adapter.ReposicionAdapter
-import es.verdnatura.presentation.view.feature.sacador.model.PlacementSupplyListVO
import es.verdnatura.presentation.view.feature.sacador.model.SaleVO
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorFragment.kt
index 057f6f9c..c7acd8eb 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorFragment.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorFragment.kt
@@ -497,7 +497,6 @@ class UbicadorFragment(
onVisibleClickListener = object : OnVisibleClickListener {
override fun onVisibleClickListener(item: ItemUbicadorVO) {
- "el item es ${item.item}".toast(context)
showAddItem(
item.item.toString(),
item.packing,
@@ -724,12 +723,12 @@ class UbicadorFragment(
val visible_calc = (etiquetas * packing!!.toInt())
binding.splashProgress.visibility = VISIBLE
viewModel.itemShelvingMake(
- shelvingFk,
- itemFk,
- visible_calc,
- packing,
- getDataInt(WAREHOUSEFK),
- groupingPack
+ shelving = shelvingFk,
+ item = itemFk,
+ quantity = visible_calc,
+ packing = packing,
+ warehouse = getDataInt(WAREHOUSEFK),
+ grouping = groupingPack
)
customDialogUbicador.setItemValue("").setPackingValue("")