feat issues refs #7636
This commit is contained in:
parent
f5bc472f53
commit
d2cd21f2eb
|
@ -219,11 +219,19 @@ class AjustesFragment :
|
||||||
}
|
}
|
||||||
super.observeViewModel()
|
super.observeViewModel()
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun getUserData() {
|
private fun getUserData() {
|
||||||
|
|
||||||
|
|
||||||
loginViewModel = LoginViewModel(requireActivity().applicationContext)
|
loginViewModel = LoginViewModel(requireActivity().applicationContext)
|
||||||
|
try {
|
||||||
loginViewModel.operatorGetData(mobileApplication.userId!!)
|
loginViewModel.operatorGetData(mobileApplication.userId!!)
|
||||||
|
} catch (_: Exception) {
|
||||||
|
ma.messageWithSound(
|
||||||
|
message = getString(R.string.errorGetData),
|
||||||
|
isError = true,
|
||||||
|
isPlayed = true
|
||||||
|
)
|
||||||
|
}
|
||||||
loginViewModel.workerOperator.observe(this@AjustesFragment) { iti ->
|
loginViewModel.workerOperator.observe(this@AjustesFragment) { iti ->
|
||||||
if (!iti.isError) {
|
if (!iti.isError) {
|
||||||
runBlocking { mobileApplication.dataStoreApp.saveDataOperator(iti) }
|
runBlocking { mobileApplication.dataStoreApp.saveDataOperator(iti) }
|
||||||
|
@ -234,6 +242,7 @@ class AjustesFragment :
|
||||||
|
|
||||||
setSettings()
|
setSettings()
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun showMenuByDefault() {
|
private fun showMenuByDefault() {
|
||||||
pasilleroViewModel = PasilleroViewModel(mobileApplication)
|
pasilleroViewModel = PasilleroViewModel(mobileApplication)
|
||||||
pasilleroViewModel.inititializeDefaultDataInit()
|
pasilleroViewModel.inititializeDefaultDataInit()
|
||||||
|
|
|
@ -9,7 +9,6 @@ import android.net.Uri
|
||||||
import android.os.Build
|
import android.os.Build
|
||||||
import android.os.Bundle
|
import android.os.Bundle
|
||||||
import android.os.Parcelable
|
import android.os.Parcelable
|
||||||
import android.text.InputType
|
|
||||||
import android.text.InputType.TYPE_CLASS_NUMBER
|
import android.text.InputType.TYPE_CLASS_NUMBER
|
||||||
import android.text.InputType.TYPE_CLASS_TEXT
|
import android.text.InputType.TYPE_CLASS_TEXT
|
||||||
import android.util.Log.d
|
import android.util.Log.d
|
||||||
|
@ -334,6 +333,7 @@ class CollectionFragment(
|
||||||
if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0 || actionId == 5 || actionId == 6) {
|
if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0 || actionId == 5 || actionId == 6) {
|
||||||
if (customDialogList.getValue().isNotEmpty()) {
|
if (customDialogList.getValue().isNotEmpty()) {
|
||||||
ma.hideKeyboard(customDialogList.getEditText())
|
ma.hideKeyboard(customDialogList.getEditText())
|
||||||
|
try {
|
||||||
val saleGroupScanned = itemScanValue(
|
val saleGroupScanned = itemScanValue(
|
||||||
customDialogList.getValue(),
|
customDialogList.getValue(),
|
||||||
arrayOf("saleGroup"),
|
arrayOf("saleGroup"),
|
||||||
|
@ -343,6 +343,15 @@ class CollectionFragment(
|
||||||
event != null && event.action == ACTION_DOWN && event.keyCode == KeyEvent.KEYCODE_ENTER
|
event != null && event.action == ACTION_DOWN && event.keyCode == KeyEvent.KEYCODE_ENTER
|
||||||
markPrevia(saleGroupScanned)
|
markPrevia(saleGroupScanned)
|
||||||
customDialogList.dismiss()
|
customDialogList.dismiss()
|
||||||
|
} catch (ex: Exception) {
|
||||||
|
ma.messageWithSound(
|
||||||
|
message = ex.message.toString(),
|
||||||
|
isError = true,
|
||||||
|
isPlayed = true,
|
||||||
|
isToasted = true
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
customDialogList.setValue("")
|
customDialogList.setValue("")
|
||||||
ma.hideKeyboard(customDialogList.getEditText())
|
ma.hideKeyboard(customDialogList.getEditText())
|
||||||
|
@ -2146,10 +2155,14 @@ class CollectionFragment(
|
||||||
scanRequest()
|
scanRequest()
|
||||||
customDialogThreeButtons.dismiss()
|
customDialogThreeButtons.dismiss()
|
||||||
} catch (ex: Exception) {
|
} catch (ex: Exception) {
|
||||||
ma.messageWithSound(message = getString(R.string.errorInputQuantity), isPlayed = true, isError = true, isToasted = true)
|
ma.messageWithSound(
|
||||||
|
message = getString(R.string.errorInputQuantity),
|
||||||
|
isPlayed = true,
|
||||||
|
isError = true,
|
||||||
|
isToasted = true
|
||||||
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
}.setKoButton(getString(R.string.cancel)) {
|
}.setKoButton(getString(R.string.cancel)) {
|
||||||
scanRequest()
|
scanRequest()
|
||||||
customDialogThreeButtons.dismiss()
|
customDialogThreeButtons.dismiss()
|
||||||
|
|
|
@ -179,7 +179,7 @@ class SectorCollectionReserveFragment(
|
||||||
).toString()
|
).toString()
|
||||||
)
|
)
|
||||||
if (listSalesGroup.firstOrNull { it.code == customDialogList.getValue() } == null) {
|
if (listSalesGroup.firstOrNull { it.code == customDialogList.getValue() } == null) {
|
||||||
listSalesGroup.add(0, BarcodeVO(code = customDialogList.getValue()))
|
listSalesGroup.add(BarcodeVO(code = customDialogList.getValue()))
|
||||||
viewModel.sectorCollectionSaleGroupAdd(
|
viewModel.sectorCollectionSaleGroupAdd(
|
||||||
customDialogList.getValue().toInt(), collectionFk
|
customDialogList.getValue().toInt(), collectionFk
|
||||||
)
|
)
|
||||||
|
|
|
@ -303,7 +303,7 @@
|
||||||
<string name="wagoonNoSaleToday">No hay nada vendido para el carro escaneado. </string>
|
<string name="wagoonNoSaleToday">No hay nada vendido para el carro escaneado. </string>
|
||||||
<string name="parkingOk">Parking ok</string>
|
<string name="parkingOk">Parking ok</string>
|
||||||
<string name="showParking">Escanea el parking</string>
|
<string name="showParking">Escanea el parking</string>
|
||||||
<string name="lineNotExist">La línea de compra de la etiqueta escaneada no existe o el valor escaneado se utiliza para un id de compra y de item y no están relacionados.</string>
|
<string name="lineNotExist">El código de barras no existe. Revisar para reetiquetar etiqueta amarilla</string>
|
||||||
<string name="pendingReview">Pendiente de revisar : </string>
|
<string name="pendingReview">Pendiente de revisar : </string>
|
||||||
<string name="review">Revisar</string>
|
<string name="review">Revisar</string>
|
||||||
<string name="splitSent">Se ha enviado a Split el articulo </string>
|
<string name="splitSent">Se ha enviado a Split el articulo </string>
|
||||||
|
@ -843,5 +843,10 @@
|
||||||
<string name="messageTwoFactorTitle">Verificación doble factor</string>
|
<string name="messageTwoFactorTitle">Verificación doble factor</string>
|
||||||
<string name="validate">Validar</string>
|
<string name="validate">Validar</string>
|
||||||
<string name="showClaimObservation">Muestra las observaciones de reclamaciones</string>
|
<string name="showClaimObservation">Muestra las observaciones de reclamaciones</string>
|
||||||
|
<string name="rename">Renombrar</string>
|
||||||
|
<string name="itemNew">Nuevo artículo</string>
|
||||||
|
<string name="locate">Ubicar</string>
|
||||||
|
<string name="scanShelvingsLocate">Escanea carros para ubicar el artículo</string>
|
||||||
|
<string name="shelvingsLocate">Carros a ubicar</string>
|
||||||
|
|
||||||
</resources>
|
</resources>
|
||||||
|
|
|
@ -303,7 +303,7 @@
|
||||||
<string name="wagoonNoSaleToday">No hay nada vendido para el carro escaneado. </string>
|
<string name="wagoonNoSaleToday">No hay nada vendido para el carro escaneado. </string>
|
||||||
<string name="parkingOk">Parking ok</string>
|
<string name="parkingOk">Parking ok</string>
|
||||||
<string name="showParking">Escanea el parking</string>
|
<string name="showParking">Escanea el parking</string>
|
||||||
<string name="lineNotExist">La línea de compra de la etiqueta escaneada no existe.</string>
|
<string name="lineNotExist">El código de barras no existe. Revisar para reetiquetar etiqueta amarilla</string>
|
||||||
<string name="pendingReview">Pendiente de revisar : </string>
|
<string name="pendingReview">Pendiente de revisar : </string>
|
||||||
<string name="review">Revisar</string>
|
<string name="review">Revisar</string>
|
||||||
<string name="splitSent">Se ha enviado a Split el articulo </string>
|
<string name="splitSent">Se ha enviado a Split el articulo </string>
|
||||||
|
@ -843,5 +843,12 @@
|
||||||
<string name="messageTwoFactorTitle">Verificación doble factor</string>
|
<string name="messageTwoFactorTitle">Verificación doble factor</string>
|
||||||
<string name="validate">Validar</string>
|
<string name="validate">Validar</string>
|
||||||
<string name="showClaimObservation">Muestra las observaciones de reclamaciones</string>
|
<string name="showClaimObservation">Muestra las observaciones de reclamaciones</string>
|
||||||
|
<string name="rename">Renombrar</string>
|
||||||
|
<string name="itemNew">Nuevo artículo</string>
|
||||||
|
<string name="errorRepeatedShelving">Carro ya introducido</string>
|
||||||
|
<string name="locate">Ubicar</string>
|
||||||
|
<string name="scanShelvingsLocate">Escanea carros para ubicar el artículo</string>
|
||||||
|
<string name="shelvingsLocate">Carros a ubicar</string>
|
||||||
|
<string name="errorGetData">Fallo al intentar obtener datos. Avise a Informática</string>
|
||||||
|
|
||||||
</resources>
|
</resources>
|
||||||
|
|
|
@ -303,7 +303,7 @@
|
||||||
<string name="wagoonNoSaleToday">No hay nada vendido para el carro escaneado. </string>
|
<string name="wagoonNoSaleToday">No hay nada vendido para el carro escaneado. </string>
|
||||||
<string name="parkingOk">Parking ok</string>
|
<string name="parkingOk">Parking ok</string>
|
||||||
<string name="showParking">Escanea el parking</string>
|
<string name="showParking">Escanea el parking</string>
|
||||||
<string name="lineNotExist">La línea de compra de la etiqueta escaneada no existe.</string>
|
<string name="lineNotExist">El código de barras no existe. Revisar para reetiquetar etiqueta amarilla</string>
|
||||||
<string name="pendingReview">Pendiente de revisar : </string>
|
<string name="pendingReview">Pendiente de revisar : </string>
|
||||||
<string name="review">Revisar</string>
|
<string name="review">Revisar</string>
|
||||||
<string name="splitSent">Se ha enviado a Split el articulo </string>
|
<string name="splitSent">Se ha enviado a Split el articulo </string>
|
||||||
|
@ -843,5 +843,12 @@
|
||||||
<string name="messageTwoFactorTitle">Verificación doble factor</string>
|
<string name="messageTwoFactorTitle">Verificación doble factor</string>
|
||||||
<string name="validate">Validar</string>
|
<string name="validate">Validar</string>
|
||||||
<string name="showClaimObservation">Muestra las observaciones de reclamaciones</string>
|
<string name="showClaimObservation">Muestra las observaciones de reclamaciones</string>
|
||||||
|
<string name="rename">Renombrar</string>
|
||||||
|
<string name="itemNew">Nuevo artículo</string>
|
||||||
|
<string name="errorRepeatedShelving">Carro ya introducido</string>
|
||||||
|
<string name="locate">Ubicar</string>
|
||||||
|
<string name="scanShelvingsLocate">Escanea carros para ubicar el artículo</string>
|
||||||
|
<string name="shelvingsLocate">Carros a ubicar</string>
|
||||||
|
<string name="errorGetData">Fallo al intentar obtener datos. Avise a Informática</string>
|
||||||
|
|
||||||
</resources>
|
</resources>
|
||||||
|
|
|
@ -845,5 +845,12 @@
|
||||||
<string name="messageTwoFactorTitle">Verificación doble factor</string>
|
<string name="messageTwoFactorTitle">Verificación doble factor</string>
|
||||||
<string name="validate">Validar</string>
|
<string name="validate">Validar</string>
|
||||||
<string name="showClaimObservation">Muestra las observaciones de reclamaciones</string>
|
<string name="showClaimObservation">Muestra las observaciones de reclamaciones</string>
|
||||||
|
<string name="rename">Renombrar</string>
|
||||||
|
<string name="itemNew">Nuevo artículo</string>
|
||||||
|
<string name="errorRepeatedShelving">Carro ya introducido</string>
|
||||||
|
<string name="locate">Ubicar</string>
|
||||||
|
<string name="scanShelvingsLocate">Escanea carros para ubicar el artículo</string>
|
||||||
|
<string name="shelvingsLocate">Carros a ubicar</string>
|
||||||
|
<string name="errorGetData">Fallo al intentar obtener datos. Avise a Informática</string>
|
||||||
|
|
||||||
</resources>
|
</resources>
|
||||||
|
|
Loading…
Reference in New Issue