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:44:07 +02:00
parent 9e2d2f167e
commit 99ec7c7fc3
3 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/PackagingCountFragment.kt
View File

@ -40,7 +40,7 @@ class PackagingCountFragment(
override fun init() { override fun init() {
// binding.splashProgress.visibility = View.VISIBLE
viewModel.getItemsPackaging( viewModel.getItemsPackaging(
mobileApplication.dataStoreApp.readDataStoreKey("SUPPLIERID"), mobileApplication.dataStoreApp.readDataStoreKey("ENTRYID") mobileApplication.dataStoreApp.readDataStoreKey("SUPPLIERID"), mobileApplication.dataStoreApp.readDataStoreKey("ENTRYID")
) )
@ -101,19 +101,16 @@ class PackagingCountFragment(
entryAdd.observe(viewLifecycleOwner) { entryAdd.observe(viewLifecycleOwner) {
if (it.isError) { if (it.isError) {
//binding.splashProgress.visibility = View.INVISIBLE
ma.messageWithSound(it.errorMessage, true, true) ma.messageWithSound(it.errorMessage, true, true)
} else { } else {
ma.messageWithSound(it.errorMessage, false, true) ma.messageWithSound(it.errorMessage, false, true)
//binding.splashProgress.visibility = View.VISIBLE
viewModel.getItemsPackaging( viewModel.getItemsPackaging(
mobileApplication.dataStoreApp.readDataStoreKey("SUPPLIERID"), mobileApplication.dataStoreApp.readDataStoreKey("ENTRYID")) mobileApplication.dataStoreApp.readDataStoreKey("SUPPLIERID"), mobileApplication.dataStoreApp.readDataStoreKey("ENTRYID"))
} }
} }
itemSupplierList.observe(viewLifecycleOwner) { itemSupplierList.observe(viewLifecycleOwner) {
//binding.splashProgress.visibility = View.GONE
adapteritemsupplier = adapteritemsupplier =
ItemSupplierAdapter(it.list, object : OnImageUpdateClickListener { ItemSupplierAdapter(it.list, object : OnImageUpdateClickListener {
@ -155,8 +152,6 @@ class PackagingCountFragment(
if (customDialogInput.getValue().isNotEmpty()) { if (customDialogInput.getValue().isNotEmpty()) {
requireActivity().hideKeyboard() requireActivity().hideKeyboard()
} }
//binding.splashProgress.visibility = View.VISIBLE
viewModel.entry_addFromBuy( viewModel.entry_addFromBuy(
mobileApplication.dataStoreApp.readDataStoreKey<Int>("ENTRYID"), item = item.id!!.toInt(), mobileApplication.dataStoreApp.readDataStoreKey<Int>("ENTRYID"), item = item.id!!.toInt(),
(if (mobileApplication.dataStoreApp.readDataStoreKey<String>("ENTRYTYPE") == "Rec") { (if (mobileApplication.dataStoreApp.readDataStoreKey<String>("ENTRYTYPE") == "Rec") {
@ -190,7 +185,6 @@ class PackagingCountFragment(
) { ) {
customDialog.cancel() customDialog.cancel()
customDialog.dismiss() customDialog.dismiss()
//binding.splashProgress.visibility = View.VISIBLE
viewModel.entry_addFromBuy( viewModel.entry_addFromBuy(
mobileApplication.dataStoreApp.readDataStoreKey("ENTRYID"), item = item.id!!.toInt(), mobileApplication.dataStoreApp.readDataStoreKey("ENTRYID"), item = item.id!!.toInt(),
0 0

6
app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/PackagingSummaryFragment.kt
View File

@ -43,13 +43,13 @@ class PackagingSummaryFragment(
binding.totalImages.text = mobileApplication.dataStoreApp.readDataStoreKey<Int>(ENTRYNUMBERIMAGES).toString() binding.totalImages.text = mobileApplication.dataStoreApp.readDataStoreKey<Int>(ENTRYNUMBERIMAGES).toString()
binding.observations.text = mobileApplication.dataStoreApp.readDataStoreKey<String>(ENTRYOBSERVATIONS) binding.observations.text = mobileApplication.dataStoreApp.readDataStoreKey<String>(ENTRYOBSERVATIONS)
binding.splashProgress.visibility = View.VISIBLE
viewModel.getItemsPackaging( viewModel.getItemsPackaging(
mobileApplication.dataStoreApp.readDataStoreKey(SUPPLIERID), mobileApplication.dataStoreApp.readDataStoreKey(ENTRYID) mobileApplication.dataStoreApp.readDataStoreKey(SUPPLIERID), mobileApplication.dataStoreApp.readDataStoreKey(ENTRYID)
) )
ma.hideBottomNavigation(View.GONE) ma.hideBottomNavigation(View.GONE)
binding.splashProgress.visibility = View.GONE
setToolBar() setToolBar()
setEvents() setEvents()
super.init() super.init()
@ -101,7 +101,7 @@ class PackagingSummaryFragment(
with(viewModel) { with(viewModel) {
itemSupplierList.observe(viewLifecycleOwner) { itemSupplierList.observe(viewLifecycleOwner) {
binding.splashProgress.visibility = View.GONE
var mySummaryList = it.list.filter { it.quantity > 0 } var mySummaryList = it.list.filter { it.quantity > 0 }
adapteritemsupplier = adapteritemsupplier =
ItemSupplierAdapter(mySummaryList, null, null, null, showItems = false) ItemSupplierAdapter(mySummaryList, null, null, null, showItems = false)

4
app/src/main/java/es/verdnatura/presentation/view/feature/precontrol/PreControladorFragment.kt
View File

@ -62,7 +62,7 @@ class PreControladorFragment :
if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0 || actionId == 5) { if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0 || actionId == 5) {
goBack = false goBack = false
if (!binding.scanInput.text.isNullOrEmpty()) { if (!binding.scanInput.text.isNullOrEmpty()) {
binding.splashProgress.visibility = VISIBLE
try { try {
//Tara 6276 //Tara 6276
@ -92,7 +92,7 @@ class PreControladorFragment :
override fun observeViewModel() { override fun observeViewModel() {
with(viewModel) { with(viewModel) {
collectionTicketList.observe(viewLifecycleOwner, Observer { collectionTicketList.observe(viewLifecycleOwner, Observer {
binding.splashProgress.visibility = View.GONE
if (it.isError) { if (it.isError) {
ma.messageWithSound(it.errorMessage, true, false) ma.messageWithSound(it.errorMessage, true, false)