verdnatura/vn-warehouse
verdnatura
/
vn-warehouse
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

refs #3520 feat:silex→salix

This commit is contained in:
Sergio De la torre 2024-04-19 09:51:53 +02:00
parent f86ae72cdb
commit 940db0ae30
2 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
app/src/main/java/es/verdnatura/presentation/view/feature/articulo/fragment/ItemCardFragment.kt
View File

@ -130,7 +130,7 @@ class ItemCardFragment(
} }
iconSalix.drawable -> { iconSalix.drawable -> {
binding.splashProgress.visibility = View.VISIBLE
val itemId = itemInfoG!!.id val itemId = itemInfoG!!.id
val entryPoint = Gson().toJson( val entryPoint = Gson().toJson(
mutableMapOf( mutableMapOf(
@ -202,7 +202,7 @@ class ItemCardFragment(
private fun getItemCard(itemFk: String) { private fun getItemCard(itemFk: String) {
warehouseFk = mobileApplication.dataStoreApp.readDataStoreKey(WAREHOUSEFK) as Int warehouseFk = mobileApplication.dataStoreApp.readDataStoreKey(WAREHOUSEFK) as Int
binding.splashProgressTwo.visibility = View.VISIBLE
viewModel.getItemCard(itemFk.toLong(), warehouseFk!!) viewModel.getItemCard(itemFk.toLong(), warehouseFk!!)
this.itemFk = itemFk this.itemFk = itemFk
@ -214,7 +214,7 @@ class ItemCardFragment(
if (it.isError) { if (it.isError) {
binding.itemcardLayout.visibility = GONE binding.itemcardLayout.visibility = GONE
binding.splashProgressTwo.visibility = GONE
binding.mainToolbar.toolbarTitle.text = getString(R.string.itemCard) binding.mainToolbar.toolbarTitle.text = getString(R.string.itemCard)
ma.messageWithSound(it.errorMessage, true, false) ma.messageWithSound(it.errorMessage, true, false)
@ -224,7 +224,7 @@ class ItemCardFragment(
setItemCard(it) setItemCard(it)
binding.mainToolbar.toolbarIcons.visibility = View.VISIBLE binding.mainToolbar.toolbarIcons.visibility = View.VISIBLE
} else { } else {
binding.splashProgressTwo.visibility = GONE
binding.itemcardLayout.visibility = GONE binding.itemcardLayout.visibility = GONE
binding.mainToolbar.toolbarTitle.text = getString(R.string.itemCard) binding.mainToolbar.toolbarTitle.text = getString(R.string.itemCard)
ma.messageWithSound( ma.messageWithSound(
@ -240,18 +240,18 @@ class ItemCardFragment(
}) })
itemspackinglist.observe(viewLifecycleOwner, Observer { itemspackinglist.observe(viewLifecycleOwner, Observer {
binding.splashProgress.visibility = GONE
createItemTypeTypeList(it.list) createItemTypeTypeList(it.list)
}) })
response.observe(viewLifecycleOwner, Observer { response.observe(viewLifecycleOwner, Observer {
binding.splashProgress.visibility = GONE
getItemCard(itemInfoG!!.id.toString()) getItemCard(itemInfoG!!.id.toString())
}) })
addressLosesList.observe(viewLifecycleOwner, Observer { addressLosesList.observe(viewLifecycleOwner, Observer {
binding.splashProgress.visibility = GONE
if (it.list.isEmpty()) { if (it.list.isEmpty()) {
ma.messageWithSound(getString(R.string.NotAddress), true, false) ma.messageWithSound(getString(R.string.NotAddress), true, false)
} else { } else {
@ -462,7 +462,7 @@ class ItemCardFragment(
binding.itemcardImage.getLocationInWindow(position) binding.itemcardImage.getLocationInWindow(position)
binding.scrollView.scrollTo(0, position[1]) binding.scrollView.scrollTo(0, position[1])
} }
binding.splashProgressTwo.visibility = GONE
} }
private fun showCustomDialog(item: ItemCardRowVO, textDescrip: String) { private fun showCustomDialog(item: ItemCardRowVO, textDescrip: String) {
@ -562,7 +562,7 @@ class ItemCardFragment(
} }
private fun showProgress() { private fun showProgress() {
binding.splashProgress.visibility = View.VISIBLE
} }
private fun prepareItemStockUpdate2(itemB: ItemCardRowVO, value: Int) { private fun prepareItemStockUpdate2(itemB: ItemCardRowVO, value: Int) {
@ -670,7 +670,7 @@ class ItemCardFragment(
} }
private fun updateItemPackingType(itemPackingType: String) { private fun updateItemPackingType(itemPackingType: String) {
binding.splashProgress.visibility = View.VISIBLE
viewModel.updatePackingTypeSalix( viewModel.updatePackingTypeSalix(
itemInfoG!!.id, itemInfoG!!.id,
itemPackingType itemPackingType
@ -679,7 +679,7 @@ class ItemCardFragment(
override fun onClickDynamic(addressFK: Int) { override fun onClickDynamic(addressFK: Int) {
binding.splashProgress.visibility = View.VISIBLE
viewModel.setVisibleDiscard(itemInfoG!!.id, warehouseFk!!, quantityToDiscard, addressFK) viewModel.setVisibleDiscard(itemInfoG!!.id, warehouseFk!!, quantityToDiscard, addressFK)
customDynamic.dismiss() customDynamic.dismiss()
customDynamic.cancel() customDynamic.cancel()

1
app/src/main/java/es/verdnatura/presentation/view/feature/articulo/fragment/ItemCardViewModel.kt
View File

@ -132,7 +132,6 @@ class ItemCardViewModel(var context: Context) : BaseViewModel(context) {
addressFk: Int?, addressFk: Int?,
) { ) {
1
salix.setVisibleDiscard( salix.setVisibleDiscard(
ItemDiscardSalixShortage(itemFk, warehouseFk, quantity, addressFk) ItemDiscardSalixShortage(itemFk, warehouseFk, quantity, addressFk)