refs #6413 feat:ubicador
This commit is contained in:
parent
abf1dfd37b
commit
388081d10e
|
@ -22,8 +22,16 @@ import es.verdnatura.domain.notNull
|
||||||
import es.verdnatura.domain.toInt
|
import es.verdnatura.domain.toInt
|
||||||
import es.verdnatura.domain.toast
|
import es.verdnatura.domain.toast
|
||||||
import es.verdnatura.presentation.base.BaseFragment
|
import es.verdnatura.presentation.base.BaseFragment
|
||||||
import es.verdnatura.presentation.common.*
|
import es.verdnatura.presentation.common.OnMoreClickListenerNew
|
||||||
import es.verdnatura.presentation.view.component.*
|
import es.verdnatura.presentation.common.OnOptionsSelectedListener
|
||||||
|
import es.verdnatura.presentation.common.OnPasillerosItemClickListener
|
||||||
|
import es.verdnatura.presentation.common.OnVisibleClickListenerNew
|
||||||
|
import es.verdnatura.presentation.common.ToolBarAdapterTooltip
|
||||||
|
import es.verdnatura.presentation.common.itemScanValue
|
||||||
|
import es.verdnatura.presentation.view.component.CustomDialog
|
||||||
|
import es.verdnatura.presentation.view.component.CustomDialogInput
|
||||||
|
import es.verdnatura.presentation.view.component.CustomDialogTwoButtons
|
||||||
|
import es.verdnatura.presentation.view.component.CustomDialogUbicadorNew
|
||||||
import es.verdnatura.presentation.view.feature.pasillero.model.PasillerosItemVO
|
import es.verdnatura.presentation.view.feature.pasillero.model.PasillerosItemVO
|
||||||
import es.verdnatura.presentation.view.feature.ubicador.adapter.UbicadorAdapterNew
|
import es.verdnatura.presentation.view.feature.ubicador.adapter.UbicadorAdapterNew
|
||||||
import es.verdnatura.presentation.view.feature.ubicador.model.ItemUbicador
|
import es.verdnatura.presentation.view.feature.ubicador.model.ItemUbicador
|
||||||
|
@ -191,13 +199,14 @@ class UbicadorFragmentNew(
|
||||||
|
|
||||||
iconReset.drawable -> {
|
iconReset.drawable -> {
|
||||||
if (!shelvingFk.isNullOrBlank()) {
|
if (!shelvingFk.isNullOrBlank()) {
|
||||||
customDialog.setTitle(getString(R.string.checkItemShelvingDescrip))
|
var customDialogReset = CustomDialog(requireContext())
|
||||||
|
customDialogReset.setTitle(getString(R.string.checkItemShelvingDescrip))
|
||||||
.setDescription(getString(R.string.checkItemShelving))
|
.setDescription(getString(R.string.checkItemShelving))
|
||||||
.setOkButton(getString(R.string.ok)) {
|
.setOkButton(getString(R.string.ok)) {
|
||||||
viewModel.itemShelvingDeleteChecked(shelvingFk)
|
viewModel.itemShelvingDeleteChecked(shelvingFk)
|
||||||
customDialog.dismiss()
|
customDialogReset.dismiss()
|
||||||
}.setKoButton(getString(R.string.cancel)) {
|
}.setKoButton(getString(R.string.cancel)) {
|
||||||
customDialog.dismiss()
|
customDialogReset.dismiss()
|
||||||
|
|
||||||
}.show()
|
}.show()
|
||||||
} else {
|
} else {
|
||||||
|
@ -359,33 +368,34 @@ class UbicadorFragmentNew(
|
||||||
}
|
}
|
||||||
|
|
||||||
binding.deleteImg.setOnClickListener {
|
binding.deleteImg.setOnClickListener {
|
||||||
if (!shelvingFk.isNullOrBlank()) {
|
if (!shelvingFk.isNullOrBlank()) {
|
||||||
customDialog.setTitle(getString(R.string.empty))
|
var customDialogDelete = CustomDialog(requireContext())
|
||||||
.setDescription(getString(R.string.operationNoReturn))
|
customDialogDelete.setTitle(getString(R.string.empty))
|
||||||
.setOkButton(getString(R.string.empty)) {
|
.setDescription(getString(R.string.operationNoReturn))
|
||||||
|
.setOkButton(getString(R.string.empty)) {
|
||||||
|
|
||||||
viewModel.clearShelvingList(
|
viewModel.clearShelvingList(
|
||||||
shelvingFk
|
shelvingFk
|
||||||
)
|
)
|
||||||
listItems.forEach {
|
listItems.forEach {
|
||||||
it.stickers = 0
|
it.stickers = 0
|
||||||
it.visible = 0
|
it.visible = 0
|
||||||
}
|
|
||||||
if (adapter != null) {
|
|
||||||
adapter!!.notifyDataSetChanged()
|
|
||||||
}
|
|
||||||
customDialog.dismiss()
|
|
||||||
}
|
}
|
||||||
|
if (adapter != null) {
|
||||||
|
adapter!!.notifyDataSetChanged()
|
||||||
|
}
|
||||||
|
customDialogDelete.dismiss()
|
||||||
|
}
|
||||||
|
|
||||||
customDialog.setKoButton(getString(R.string.cancel)) {
|
customDialogDelete.setKoButton(getString(R.string.cancel)) {
|
||||||
customDialog.dismiss()
|
customDialogDelete.dismiss()
|
||||||
}.show()
|
}.show()
|
||||||
} else {
|
} else {
|
||||||
getString(R.string.errorShelving).toast(
|
getString(R.string.errorShelving).toast(
|
||||||
requireContext()
|
requireContext()
|
||||||
)
|
)
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -394,9 +404,9 @@ class UbicadorFragmentNew(
|
||||||
parking = customDialogInput.getValue()
|
parking = customDialogInput.getValue()
|
||||||
//Tarea 6964
|
//Tarea 6964
|
||||||
/* viewModel.hasItemOlder(shelvingFk,customDialogInput.getValue())*/
|
/* viewModel.hasItemOlder(shelvingFk,customDialogInput.getValue())*/
|
||||||
viewModel.setParking(
|
viewModel.setParking(
|
||||||
shelvingFk, customDialogInput.getValue()
|
shelvingFk, customDialogInput.getValue()
|
||||||
)
|
)
|
||||||
|
|
||||||
customDialogInput.dismiss()
|
customDialogInput.dismiss()
|
||||||
}
|
}
|
||||||
|
@ -522,16 +532,17 @@ class UbicadorFragmentNew(
|
||||||
|
|
||||||
responseHasOlder.observe(viewLifecycleOwner, Observer {
|
responseHasOlder.observe(viewLifecycleOwner, Observer {
|
||||||
|
|
||||||
ma.messageWithSound("",true,true,"",false)
|
ma.messageWithSound("", true, true, "", false)
|
||||||
customDialogOlder.setTitle(getString(R.string.info))
|
customDialogOlder.setTitle(getString(R.string.info))
|
||||||
.setDescription(getString(R.string.itemOlderInfo, shelvingFk))
|
.setDescription(getString(R.string.itemOlderInfo, shelvingFk))
|
||||||
.setOkButton(
|
.setOkButton(
|
||||||
getString(R.string.ok)
|
getString(R.string.ok)
|
||||||
) {
|
) {
|
||||||
customDialogOlder.dismiss()
|
customDialogOlder.dismiss()
|
||||||
//customDialogActionParking()
|
//customDialogActionParking()
|
||||||
viewModel.setParking(
|
viewModel.setParking(
|
||||||
shelvingFk, parking)
|
shelvingFk, parking
|
||||||
|
)
|
||||||
|
|
||||||
}.setKoButton(getString(R.string.cancel)) {
|
}.setKoButton(getString(R.string.cancel)) {
|
||||||
customDialogOlder.dismiss()
|
customDialogOlder.dismiss()
|
||||||
|
@ -691,13 +702,18 @@ class UbicadorFragmentNew(
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun setShowAddItemAction(itemUbicador: ItemUbicador?) {
|
private fun setShowAddItemAction(itemUbicador: ItemUbicador?) {
|
||||||
if (customDialogUbicador.getItemValue()
|
try {
|
||||||
.isNullOrEmpty() || customDialogUbicador.getPackingValue().isNullOrBlank()
|
|
||||||
) {
|
if (customDialogUbicador.getItemValue()
|
||||||
getString(R.string.itemAndPackingMandatory).toast(context)
|
.isNullOrEmpty() || customDialogUbicador.getPackingValue().isNullOrBlank()
|
||||||
} else {
|
) {
|
||||||
saveItemCall(customDialogUbicador, itemUbicador)
|
getString(R.string.itemAndPackingMandatory).toast(context)
|
||||||
customDialogUbicador.dismiss()
|
} else {
|
||||||
|
saveItemCall(customDialogUbicador, itemUbicador)
|
||||||
|
customDialogUbicador.dismiss()
|
||||||
|
}
|
||||||
|
} catch(ex:Exception){
|
||||||
|
ex.message!!.toast(requireContext())
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -777,7 +793,8 @@ class UbicadorFragmentNew(
|
||||||
}
|
}
|
||||||
customDialogTwoButtons.dismiss()
|
customDialogTwoButtons.dismiss()
|
||||||
}.setOkButtonTwo(getString(R.string.delete)) {
|
}.setOkButtonTwo(getString(R.string.delete)) {
|
||||||
customDialog.setTitle(getString(R.string.confirm)).setDescription(
|
var customDialogConfirm = CustomDialog(requireContext())
|
||||||
|
customDialogConfirm.setTitle(getString(R.string.confirm)).setDescription(
|
||||||
if (!isAutoSelf) {
|
if (!isAutoSelf) {
|
||||||
getString(R.string.itemDeleteConfirm) + item.item + "?"
|
getString(R.string.itemDeleteConfirm) + item.item + "?"
|
||||||
} else {
|
} else {
|
||||||
|
@ -791,22 +808,26 @@ class UbicadorFragmentNew(
|
||||||
item.id
|
item.id
|
||||||
)
|
)
|
||||||
customDialogTwoButtons.dismiss()
|
customDialogTwoButtons.dismiss()
|
||||||
customDialog.dismiss()
|
customDialogConfirm.dismiss()
|
||||||
} else {
|
} else {
|
||||||
viewModel.itemShelvingSelfConsumption(
|
viewModel.itemShelvingSelfConsumption(
|
||||||
shelvingFk, item.item.toInt(), 0
|
shelvingFk, item.item.toInt(), 0
|
||||||
)
|
)
|
||||||
customDialog.dismiss()
|
customDialogConfirm.dismiss()
|
||||||
customDialogTwoButtons.dismiss()
|
customDialogTwoButtons.dismiss()
|
||||||
}
|
}
|
||||||
}.setKoButton(getString(R.string.cancel)) {
|
}.setKoButton(getString(R.string.cancel)) {
|
||||||
customDialog.dismiss()
|
customDialogConfirm.dismiss()
|
||||||
customDialogTwoButtons.dismiss()
|
customDialogTwoButtons.dismiss()
|
||||||
}.show()
|
}
|
||||||
|
customDialogConfirm.show()
|
||||||
|
}
|
||||||
|
|
||||||
}.setKoButton(getString(R.string.cancel)) {
|
customDialogTwoButtons.setKoButton(getString(R.string.cancel)) {
|
||||||
customDialogTwoButtons.dismiss()
|
customDialogTwoButtons.dismiss()
|
||||||
}.show()
|
}
|
||||||
|
|
||||||
|
customDialogTwoButtons.show()
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun customDialogInputAction(item: ItemUbicador) {
|
private fun customDialogInputAction(item: ItemUbicador) {
|
||||||
|
|
Loading…
Reference in New Issue