From 298e17210a795e35b210003c58004b6793d5e176 Mon Sep 17 00:00:00 2001 From: Sergio De la torre Date: Mon, 13 Jan 2025 16:38:45 +0100 Subject: [PATCH] feat: refs#6861 reservas --- .../view/component/CustomDialogList.kt | 11 +++++++ .../feature/collection/adapter/SaleAdapter.kt | 6 ++-- .../collection/adapter/SaleAdapterNew.kt | 10 +++++- .../CollectionFragmentPickerPreviousNew.kt | 32 ++++++++++++++++--- .../feature/sacador/model/TicketItemVO.kt | 3 +- app/src/main/res/layout/sale_row_fragment.xml | 12 ++++++- app/src/main/res/values-es/strings.xml | 2 +- app/src/main/res/values-fr/strings.xml | 2 +- app/src/main/res/values-pt/strings.xml | 2 +- app/src/main/res/values/strings.xml | 2 +- 10 files changed, 68 insertions(+), 14 deletions(-) diff --git a/app/src/main/java/es/verdnatura/presentation/view/component/CustomDialogList.kt b/app/src/main/java/es/verdnatura/presentation/view/component/CustomDialogList.kt index aaeaa032..94b41569 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/component/CustomDialogList.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/component/CustomDialogList.kt @@ -69,6 +69,12 @@ class CustomDialogList(context: Context) : Dialog(context, R.style.DialogTheme) return this } + fun setTitleSpannable(title: CharSequence): CustomDialogList { + binding.customDialogTitle.visibility = View.VISIBLE + binding.customDialogTitle.text = title + return this + } + fun setDescription(title: String): CustomDialogList { binding.customDialogDescription.visibility = View.VISIBLE binding.customDialogDescription.text = title @@ -148,4 +154,9 @@ class CustomDialogList(context: Context) : Dialog(context, R.style.DialogTheme) fun getFocusThree() { binding.customDialogValueThree.requestFocus() } + + fun setTextSize(size: Float): CustomDialogList { + binding.customDialogValue.textSize = size + return this + } } \ No newline at end of file diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/collection/adapter/SaleAdapter.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/collection/adapter/SaleAdapter.kt index 5002a4a1..27a7d528 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/collection/adapter/SaleAdapter.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/collection/adapter/SaleAdapter.kt @@ -278,10 +278,10 @@ class SaleAdapter( )*/ } else if (sale.isPreviousPrepared == "1") { contentLayout.setBackgroundColor( - getColor( + if (sale.picked == null) getColor( context!!, - R.color.verdnatura_dark_sky_blue - ) + R.color.verdnatura_black + ) else getColor(context!!, R.color.verdnatura_dark_sky_blue) ) } else { contentLayout.setBackgroundColor(getColor(context!!, R.color.verdnatura_black)) diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/collection/adapter/SaleAdapterNew.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/collection/adapter/SaleAdapterNew.kt index bf0f30e6..3d57c353 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/collection/adapter/SaleAdapterNew.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/collection/adapter/SaleAdapterNew.kt @@ -354,7 +354,15 @@ class SaleAdapterNew( println("parkingCodePrevia ${sale.parkingCodePrevia}") println("parkingCode ${sale.parkingCode}") - + if (type == PREITEMPICKERTEST) { + binding.level.visibility = GONE + binding.levelTxt.visibility = GONE + binding.ticketOrder.visibility = VISIBLE + } else { + binding.level.visibility = VISIBLE + binding.levelTxt.visibility = VISIBLE + binding.ticketOrder.visibility = GONE + } this.sale = sale } diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragmentPickerPreviousNew.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragmentPickerPreviousNew.kt index e8281925..eb2e295b 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragmentPickerPreviousNew.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragmentPickerPreviousNew.kt @@ -7,7 +7,11 @@ import android.os.Bundle import android.os.Handler import android.os.Looper import android.text.InputType +import android.text.Spannable +import android.text.SpannableString +import android.text.style.AbsoluteSizeSpan import android.util.Log.d +import android.util.TypedValue import android.view.KeyEvent import android.view.View import android.view.View.VISIBLE @@ -708,8 +712,21 @@ class CollectionFragmentPickerPreviousNew( val longName = myGroupList[pos].longName val totalReserved = myGroupList[pos].reservedQuantity + val spannable = SpannableString("$item\n$longName") + + spannable.setSpan( + AbsoluteSizeSpan( + TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_SP, 16f, resources.displayMetrics) + .toInt(), true + ), + 0, + item.toString().length, + Spannable.SPAN_EXCLUSIVE_EXCLUSIVE + ) + try { - customDialogList.setTitle("$shelving($item) $totalReserved de $longName").setOkButton( + customDialogList.setTitleSpannable(spannable) + customDialogList.setOkButton( getString( R.string.take ) @@ -721,7 +738,9 @@ class CollectionFragmentPickerPreviousNew( customDialogList.dismiss() scanRequest() - }.setHintValue(getString(R.string.quantitySelect)).setValue(totalReserved.toString()) + }.setHintValue(getString(R.string.quantitySelect)) + .setTextSize(20f) + .setValue(totalReserved.toString()) .setHintValueTwo(getString(R.string.scanItem)).setValueTwo("").show() customDialogList.getEditTextTwo().setOnEditorActionListener { v, actionId, event -> @@ -784,7 +803,11 @@ class CollectionFragmentPickerPreviousNew( mpok?.start() ma.hideKeyboard(customDialogList.getEditTextTwo()) customDialogList.dismiss() - requireContext().showToastCenterWithBackground(myGroupList[position].ticketFk.toString()) + requireContext().showToastCenterWithBackground( + if (type == PREITEMPICKERTEST) "(" + myGroupList[position].ticketOrder + ")" + myGroupList[position].ticketFk.toString() else { + myGroupList[position].ticketFk.toString() + } + ) scanRequest() } else { @@ -1144,7 +1167,8 @@ class CollectionFragmentPickerPreviousNew( size = value[0].size, itemShelvingSaleFk = value[0].itemShelvingSaleFk, longName = value[0].parkingCode ?: "", - itemShelvingFk = 0 + itemShelvingFk = 0, + ticketOrder = value[0].ticketOrder ?: null ) //prime elemento//hay que hacer una copia si no queda la referencia 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 2ed5f732..c859e692 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 @@ -69,7 +69,8 @@ data class Sale( var accumulatedQuantity: Int = 0, var totalItemShelving: Int = 0, var currentItemShelving: Int = 0, - var stateCode: String? = "" + var stateCode: String? = "", + var ticketOrder: Int? = null ) diff --git a/app/src/main/res/layout/sale_row_fragment.xml b/app/src/main/res/layout/sale_row_fragment.xml index 2ce1cc86..c42f4b77 100644 --- a/app/src/main/res/layout/sale_row_fragment.xml +++ b/app/src/main/res/layout/sale_row_fragment.xml @@ -72,12 +72,22 @@ android:layout_height="wrap_content" android:text="@{Integer.toString(sale.ticketFk)}" android:textColor="@color/verdnatura_black" - android:textSize="@dimen/h8" + android:textSize="@dimen/h7" android:textStyle="bold" tool:text="123456789" /> + + %1$d:%2$d %1$02d-%2$02d-%3$04d Nivel: - -T: + T: Firma: Observaciones: Imágenes adjuntas: diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index d8948307..4f8a62d5 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -730,7 +730,7 @@ %1$d:%2$d %1$02d-%2$02d-%3$04d Nivel: - -T: + T: Firma: Observaciones: Imágenes adjuntas: diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 1323bab0..736d1de2 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -730,7 +730,7 @@ %1$d:%2$d %1$02d-%2$02d-%3$04d Nivel: - -T: + T: Firma: Observaciones: Imágenes adjuntas: diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 9ef3eb13..8bb05574 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -731,7 +731,7 @@ %1$d:%2$d %1$02d-%2$02d-%3$04d Nivel: - -T: + T: Firma: Observaciones: Imágenes adjuntas: