From 6a876e010fb8dff0970689059e02f7654eaa2ef4 Mon Sep 17 00:00:00 2001 From: Sergio De la torre Date: Thu, 22 Sep 2022 10:27:26 +0200 Subject: [PATCH] Version 9.1Beta- Filtro inventario --- app/build.gradle | 5 +++-- .../collection/mapper/CollectionMapper.kt | 2 +- .../inventario/fragment/InventaryFragment.kt | 6 ++++- .../inventario/model/ItemInventaryVO.kt | 22 +++++++++---------- .../feature/presacador/mapper/SaleMapper.kt | 4 ++-- .../sacador/fragment/SacadorFragment.kt | 9 ++++---- .../feature/sacador/model/TicketItemVO.kt | 4 ++-- 7 files changed, 29 insertions(+), 23 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 5e1c6646..e96e12d5 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -13,9 +13,10 @@ android { applicationId "es.verdnatura" minSdkVersion 21 //21 targetSdkVersion 30 - versionCode 131 + versionCode 132 + versionName = "9.1Beta" + //versionName = "9Beta"// versionCode 131 //versionName = "8.9" versionCode 130 - versionName = "9Beta" //versionName = "8.9Beta" versionCode 129 //versionName = "8.8Beta" versioncode 128 //versionName = "8.7Beta" versionCode 127 diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/collection/mapper/CollectionMapper.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/collection/mapper/CollectionMapper.kt index e239307d..fe0a8ea9 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/collection/mapper/CollectionMapper.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/collection/mapper/CollectionMapper.kt @@ -15,7 +15,7 @@ fun CollectionVO.map(context: Context): CollectionVO { ticket.sales.forEach { it.ticketFk = ticket.ticketFk it.level = ticket.level - it.rgb = it.rgb + it.rgb = ticket.rgb it.salePersonFk = ticket.salesPersonFk it.agencyName = ticket.agencyName it.isNew = it.isAdded == "1" diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/inventario/fragment/InventaryFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/inventario/fragment/InventaryFragment.kt index 3834731a..103b8fec 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/inventario/fragment/InventaryFragment.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/inventario/fragment/InventaryFragment.kt @@ -162,6 +162,7 @@ class InventaryFragment : } else { listInvetory.removeAll(listInvetoryAux) + listInvetory.addAll(listInvetoryAux.filter { it.itemFk.contains( binding.filterItemFk.text.toString(), @@ -169,7 +170,10 @@ class InventaryFragment : ) || it.producer.contains( binding.filterItemFk.text.toString(), true - ) || it.longName.contains(binding.filterItemFk.text.toString(),ignoreCase = true) + ) || it.longName?.contains( + binding.filterItemFk.text.toString(), + ignoreCase = true + ) == true }) } diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/inventario/model/ItemInventaryVO.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/inventario/model/ItemInventaryVO.kt index b9cb88d8..f0c46078 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/inventario/model/ItemInventaryVO.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/inventario/model/ItemInventaryVO.kt @@ -1,18 +1,18 @@ package es.verdnatura.presentation.view.feature.inventario.model -class ItemInventaryVO ( - var itemFk:String = "", - var longName:String= "", - var size:String= "", - var producer:String= "", - var downstairs:String= "", - var upstairs:String= "", - var nicho:String= "", - var isError:Boolean = false, - var errorMessage:String = "" +class ItemInventaryVO( + var itemFk: String = "", + var longName: String? = "", + var size: String = "", + var producer: String = "", + var downstairs: String = "", + var upstairs: String = "", + var nicho: String = "", + var isError: Boolean = false, + var errorMessage: String = "" ) -class InventaryListVO ( +class InventaryListVO( var list: List = listOf() ) diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/mapper/SaleMapper.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/mapper/SaleMapper.kt index 34c1dd20..3e9ee21b 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/mapper/SaleMapper.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/mapper/SaleMapper.kt @@ -21,7 +21,7 @@ fun PreSacadorItemVO.toSale() : SaleVO { agencyName = if (trabajador.isNullOrEmpty()) { "" } else trabajador, packingType=packingType, salePersonFk=if (salesPersonFk.isNullOrEmpty()){""}else salesPersonFk, - rgb= "" + rgb= null ) @@ -44,7 +44,7 @@ fun PreSacadorItemVO.toSaleReposicion() : SaleVO { originalQuantity = quantity.toString(), placements = carros, agencyName = if (trabajador.isNullOrEmpty()) { "" } else trabajador, - rgb="" + rgb=null ) } diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/sacador/fragment/SacadorFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/sacador/fragment/SacadorFragment.kt index 68864171..8ea001b0 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/sacador/fragment/SacadorFragment.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/sacador/fragment/SacadorFragment.kt @@ -141,16 +141,17 @@ class SacadorFragment : //Tarea 4351 cambiar getData(WAGON) por getData(NUMBEROFWAGONS) //Tarea 4130 - viewModel.collectionNew( + /* viewModel.collectionNew( getData(USER), getData(PASSWORD), getData(SECTORFK), getData(NUMBEROFWAGONS) - ) - /* viewModel.collection_assign( + )*/ + //Tarea 4520 + viewModel.collection_assign( getData(USER), getData(PASSWORD), - )*/ + ) } iconVehicleIn.drawable -> ma.onVehicleSelected(SacadorFragment.TAG) diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/sacador/model/TicketItemVO.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/sacador/model/TicketItemVO.kt index 3e20258a..616487ed 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/sacador/model/TicketItemVO.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/sacador/model/TicketItemVO.kt @@ -17,7 +17,7 @@ class CollectionVO( class TicketVO( var ticketFk: String = "", var level: String = "", - var rgb: String = "", + var rgb: String?, var agencyName: String = "", var salesPersonFk: String = "", var sales: List = listOf(), @@ -28,7 +28,7 @@ class TicketVO( class SaleVO( var ticketFk: String = "", var level: String = "", - var rgb: String = "", + var rgb: String?, var agencyName: String = "", var saleOrder: Int = 9999, var saleFk: String = "",