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

refs #6458 feat:showDialogChecker

This commit is contained in:
Sergio De la torre 2024-02-07 11:56:09 +01:00
parent 4240c5ab51
commit 24d1ccdd9b
2 changed files with 33 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/src/main/java/es/verdnatura/presentation/view/feature/controlador/fragment/ControladorFragment.kt
View File

@ -10,7 +10,6 @@ import es.verdnatura.databinding.FragmentGeneralBlackBinding
import es.verdnatura.domain.ConstAndValues import es.verdnatura.domain.ConstAndValues
import es.verdnatura.presentation.base.BaseFragment import es.verdnatura.presentation.base.BaseFragment
import es.verdnatura.presentation.common.OnCollectionSelectedListener import es.verdnatura.presentation.common.OnCollectionSelectedListener
import es.verdnatura.presentation.view.component.CustomDialog
import es.verdnatura.presentation.view.feature.collection.fragment.CollectionViewModel import es.verdnatura.presentation.view.feature.collection.fragment.CollectionViewModel
import es.verdnatura.presentation.view.feature.sacador.model.CollectionVO import es.verdnatura.presentation.view.feature.sacador.model.CollectionVO
@ -60,10 +59,12 @@ class ControladorFragment :
if (!binding.scanInput.text.isNullOrEmpty()) { if (!binding.scanInput.text.isNullOrEmpty()) {
binding.splashProgress.visibility = VISIBLE binding.splashProgress.visibility = VISIBLE
binding.scanInput.setText(textScanned_filterDouble(binding.scanInput.text!!.toString())) binding.scanInput.setText(textScanned_filterDouble(binding.scanInput.text!!.toString()))
//Tarea 6458 //Tarea 6458 descomentar si ok
collectionViewModel = CollectionViewModel(mobileApplication) /* collectionViewModel = CollectionViewModel(mobileApplication)
collectionViewModel!!.ticketState(binding.scanInput.text.toString().toInt()) collectionViewModel!!.ticketState(binding.scanInput.text.toString().toInt())
collectionViewModel!!.responseTicketState.observe(viewLifecycleOwner, Observer { it -> collectionViewModel!!.responseTicketState.observe(
viewLifecycleOwner,
Observer { it ->
binding.splashProgress.visibility = View.GONE binding.splashProgress.visibility = View.GONE
if ((it.code == "ON_CHECKING" || it.code == "CHECKED") && it.user.id != mobileApplication.userId) { if ((it.code == "ON_CHECKING" || it.code == "CHECKED") && it.user.id != mobileApplication.userId) {
var customDialogWarning = CustomDialog(requireContext()) var customDialogWarning = CustomDialog(requireContext())
@ -88,7 +89,7 @@ class ControladorFragment :
) )
}.show() }.show()
customDialogWarning.currentFocus customDialogWarning.currentFocus
} else { } else {*/
viewModel.collectionTicketGet( viewModel.collectionTicketGet(
sectorFk = mobileApplication.dataStoreApp.readDataStoreKey( sectorFk = mobileApplication.dataStoreApp.readDataStoreKey(
ConstAndValues.SECTORFK ConstAndValues.SECTORFK
@ -97,8 +98,8 @@ class ControladorFragment :
print = "0", print = "0",
type = ConstAndValues.CONTROLADOR type = ConstAndValues.CONTROLADOR
) )
} // }
}) //})
} }

1
app/src/main/res/values/dimens.xml
View File

@ -48,6 +48,7 @@
<dimen name="h6">20sp</dimen> <dimen name="h6">20sp</dimen>
<dimen name="h7">18sp</dimen> <dimen name="h7">18sp</dimen>
<dimen name="h8">16sp</dimen> <dimen name="h8">16sp</dimen>
<dimen name="h9">14sp</dimen>
<dimen name="subtitle1">16sp</dimen> <dimen name="subtitle1">16sp</dimen>
<dimen name="subtitle2">14sp</dimen> <dimen name="subtitle2">14sp</dimen>