From ad42096eca48b4d1c3da36f69c1cb2c411dc1f1f Mon Sep 17 00:00:00 2001 From: Sergio De la torre Date: Fri, 28 Feb 2025 09:02:05 +0100 Subject: [PATCH] feat: refs#6861 reservas --- ...ctionFragmentPickerPreviousNewInterface.kt | 14 ++++++--- ...agmentPickerPreviousNewInterfaceSacador.kt | 1 + .../feature/sacador/model/TicketItemVO.kt | 2 +- .../main/res/layout/fragment_buscar_item.xml | 2 +- .../fragment_expedition_log_delivery.xml | 19 ++++++------ .../main/res/layout/fragment_historico.xml | 12 ++++---- .../res/layout/fragment_salary_complement.xml | 2 +- .../main/res/layout/fragment_shelvinglog.xml | 29 +++++++++---------- .../sale_row_fragment_reserve_sacador.xml | 9 +++--- app/src/main/res/values-es/strings.xml | 6 +++- app/src/main/res/values-fr/strings.xml | 6 +++- app/src/main/res/values-pt/strings.xml | 6 +++- app/src/main/res/values/strings.xml | 7 +++-- 13 files changed, 67 insertions(+), 48 deletions(-) diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragmentPickerPreviousNewInterface.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragmentPickerPreviousNewInterface.kt index 89d8bab1..0c253666 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragmentPickerPreviousNewInterface.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragmentPickerPreviousNewInterface.kt @@ -342,6 +342,7 @@ class CollectionFragmentPickerPreviousNewInterface( lm!!.scrollToPositionWithOffset(positionConfirm, 0) //lm!!.scrollToPositionWithOffset(storedBackPosition + 1, 0) setTotalLines() + saleAdapter!!.notifyItemChanged(positionConfirm) } else { updateScreen() } @@ -1101,10 +1102,15 @@ class CollectionFragmentPickerPreviousNewInterface( println("No hay salegroup") } } - if (distinctSaleGroups.isNotEmpty()) - distinctSaleGroups.forEach { saleGroup -> - setStateSaleGroup(saleGroup, stateCodeId!!) - } + try { + if (distinctSaleGroups.isNotEmpty()) + distinctSaleGroups.forEach { saleGroup -> + setStateSaleGroup(saleGroup, stateCodeId!!) + } + } catch (ex: Exception) { + + } + } } diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragmentPickerPreviousNewInterfaceSacador.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragmentPickerPreviousNewInterfaceSacador.kt index 887ca4ec..a068b8ea 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragmentPickerPreviousNewInterfaceSacador.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragmentPickerPreviousNewInterfaceSacador.kt @@ -344,6 +344,7 @@ class CollectionFragmentPickerPreviousNewInterfaceSacador( lm!!.scrollToPositionWithOffset(positionConfirm, 0) //lm!!.scrollToPositionWithOffset(storedBackPosition + 1, 0) setTotalLines() + saleAdapter!!.notifyItemChanged(positionConfirm) } else { updateScreen() } 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 f35864cd..3b86d10f 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 @@ -36,7 +36,7 @@ data class Sale( val saleFk: Int, val itemFk: Int, val longName: String, - val size: Int, + val size: Int? = null, var semaphore: String?, var color: String = "", val productor: String? = "", diff --git a/app/src/main/res/layout/fragment_buscar_item.xml b/app/src/main/res/layout/fragment_buscar_item.xml index e5a0bb2a..749d3fa3 100644 --- a/app/src/main/res/layout/fragment_buscar_item.xml +++ b/app/src/main/res/layout/fragment_buscar_item.xml @@ -86,7 +86,7 @@ android:layout_height="wrap_content" android:layout_weight="1" android:gravity="center" - android:text="@string/Fecha" + android:text="@string/date" android:textColor="@color/verdnatura_white" android:textSize="@dimen/body2" /> diff --git a/app/src/main/res/layout/fragment_expedition_log_delivery.xml b/app/src/main/res/layout/fragment_expedition_log_delivery.xml index 2d4747ce..d3b49b20 100644 --- a/app/src/main/res/layout/fragment_expedition_log_delivery.xml +++ b/app/src/main/res/layout/fragment_expedition_log_delivery.xml @@ -69,7 +69,7 @@ android:layout_height="wrap_content" android:layout_weight="1.25" android:gravity="end" - android:text="@string/Fecha" + android:text="@string/date" android:textColor="@color/verdnatura_white" android:textSize="@dimen/body2" /> @@ -89,7 +89,7 @@ android:layout_height="wrap_content" android:layout_weight="1" android:gravity="start" - android:text="@string/Fecha" + android:text="@string/date" android:textColor="@color/verdnatura_white" android:textSize="@dimen/body2" /> @@ -121,13 +121,14 @@ android:orientation="vertical" android:padding="10dp" tools:ignore="ExtraText"> - + + diff --git a/app/src/main/res/layout/fragment_historico.xml b/app/src/main/res/layout/fragment_historico.xml index 30a472cc..edc7fed9 100644 --- a/app/src/main/res/layout/fragment_historico.xml +++ b/app/src/main/res/layout/fragment_historico.xml @@ -47,35 +47,33 @@ android:layout_marginBottom="@dimen/layout_margin_1" android:orientation="horizontal" android:paddingStart="@dimen/layout_margin_min" - android:paddingEnd="@dimen/layout_margin_min" - > + android:paddingEnd="@dimen/layout_margin_min"> + android:textSize="@dimen/body2" /> - + - + + - - - - - + android:clipToPadding="false" + android:visibility="visible" + tools:listitem="@layout/shelvinglog_row" /> + + diff --git a/app/src/main/res/layout/sale_row_fragment_reserve_sacador.xml b/app/src/main/res/layout/sale_row_fragment_reserve_sacador.xml index 3215660b..65228bc5 100644 --- a/app/src/main/res/layout/sale_row_fragment_reserve_sacador.xml +++ b/app/src/main/res/layout/sale_row_fragment_reserve_sacador.xml @@ -53,7 +53,7 @@ android:layout_marginEnd="@dimen/layout_margin_minest" android:text="@{sale.level}" android:textColor="@color/verdnatura_black" - android:textSize="@dimen/h9" + android:textSize="@dimen/h7" android:textStyle="bold" tool:text="2" /> @@ -62,7 +62,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginEnd="@dimen/layout_margin_minest" - android:text="@string/ticketAbb" + android:text="-" android:textColor="@color/verdnatura_black" android:textSize="@dimen/h9" /> @@ -82,7 +82,6 @@ android:id="@+id/ticketOrder" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_gravity="center" android:text='@{"(" + sale.ticketOrder + ")"}' android:textColor="@color/verdnatura_black" android:textSize="@dimen/h8" @@ -224,9 +223,9 @@ android:ellipsize="end" android:gravity="center" android:maxLines="2" - android:text="@{sale.longName}" + android:text="@{sale.size != 0 ? (sale.longName + ' ' + String.valueOf(sale.size)) : sale.longName}" android:textColor="#FFFFFF" - tool:text="Set de 3 unidades Cesta pie" /> + tool:text="Set de 3 unidades Cesta pie 70" /> diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 2085bfce..6ccdb885 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -1,7 +1,7 @@ Gestor Almacén - Fecha + Fecha Cliente Entrada Salida @@ -923,6 +923,10 @@ Reserva No hay artículos en el carro para cambiar su matrícula No se puede obterner el tipo DMS. Póngase en contacto con dpto Informática + Ordenar carro + Ordenar + Escanea carro que vas a ordenar.\nAcuérdate de volver a pulsar el icono cuando termines de ordenar + Al pulsar tu actividad será : Ordenar carro diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 5c370d76..9282e12b 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -1,7 +1,7 @@ Gestionnaire entrepôt - Date + Date Cliente Entrada Salida @@ -923,5 +923,9 @@ Reserva No hay artículos en el carro para cambiar su matrícula No se puede obterner el tipo DMS. Póngase en contacto con dpto Informática + Ordenar carro + Ordenar + Escanea carro que vas a ordenar.\nAcuérdate de volver a pulsar el icono cuando termines de ordenar + Al pulsar tu actividad será : Ordenar carro diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 0c7ece94..3e9f2c6a 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -1,7 +1,7 @@ gestor armazém - Data + Data Cliente Entrada Salida @@ -923,5 +923,9 @@ Reserva No hay artículos en el carro para cambiar su matrícula No se puede obterner el tipo DMS. Póngase en contacto con dpto Informática + Ordenar carro + Ordenar + Escanea carro que vas a ordenar.\nAcuérdate de volver a pulsar el icono cuando termines de ordenar + Al pulsar tu actividad será : Ordenar carro diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index d8f8931e..8de6e85f 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,7 +1,7 @@ Camera needs permission Warehouse Manager - Date + Date Client Entry Departure @@ -402,7 +402,6 @@ Pre puncher Day of sale Show ticket - Vehicle history Replacement Consult item Ubicator @@ -927,5 +926,9 @@ Reserva No hay artículos en el carro para cambiar su matrícula No se puede obterner el tipo DMS. Póngase en contacto con dpto Informática + Ordenar carro + Ordenar + Escanea carro que vas a ordenar.\nAcuérdate de volver a pulsar el icono cuando termines de ordenar + Al pulsar tu actividad será : Ordenar carro