From 32edc951f22b8eb04610c83b403435247fe0f5e2 Mon Sep 17 00:00:00 2001 From: Sergio De la torre Date: Tue, 10 Dec 2024 07:55:33 +0100 Subject: [PATCH] feat: refs #7920 itemShelvingGet --- .../es/verdnatura/domain/ConstAndValues.kt | 1 + .../articulo/fragment/ItemCardFragment.kt | 35 +++- app/src/main/res/drawable/ic_grafana.xml | 24 +++ .../main/res/layout/fragment_item_card.xml | 153 ++++++++++-------- 4 files changed, 143 insertions(+), 70 deletions(-) create mode 100644 app/src/main/res/drawable/ic_grafana.xml diff --git a/app/src/main/java/es/verdnatura/domain/ConstAndValues.kt b/app/src/main/java/es/verdnatura/domain/ConstAndValues.kt index d26603d1..fb90d19d 100644 --- a/app/src/main/java/es/verdnatura/domain/ConstAndValues.kt +++ b/app/src/main/java/es/verdnatura/domain/ConstAndValues.kt @@ -24,6 +24,7 @@ object ConstAndValues { const val USER = "user" const val PASSWORD = "password" const val TOKEN = "token" + const val TOKENMULTIMEDIA = "tokenMultimedia" const val TTL = "ttl" const val TOKENCREATED = "tokenCreated" const val SECTORDESCRIP = "sectordescrip" diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/fragment/ItemCardFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/fragment/ItemCardFragment.kt index 4d54431f..7509fb19 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/fragment/ItemCardFragment.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/fragment/ItemCardFragment.kt @@ -3,6 +3,7 @@ package es.verdnatura.presentation.view.feature.articulo.fragment import android.content.Intent import android.graphics.drawable.Drawable import android.text.InputType +import android.view.MotionEvent import android.view.View import android.view.View.GONE import android.view.inputmethod.EditorInfo @@ -12,6 +13,7 @@ import com.google.gson.Gson import es.verdnatura.R import es.verdnatura.databinding.FragmentItemCardBinding import es.verdnatura.domain.ConstAndValues.PRINTERFK +import es.verdnatura.domain.ConstAndValues.TOKENMULTIMEDIA import es.verdnatura.domain.ConstAndValues.WAREHOUSEFK import es.verdnatura.domain.notNull import es.verdnatura.domain.toast @@ -205,8 +207,39 @@ class ItemCardFragment( hideKeyboard() } - private fun setEvents() { + private fun openWebViewer(param: String) { + //variableWeb = if (itemScan is Number) "var-itemFk=$param" else "var-shelvingCode=$param" + ma.onPasillerosItemClickListener( + PasillerosItemVO( + title = R.string.titleWebViewer, + ), + + Gson().toJson( + mutableMapOf( + "entryPoint" to param, + "web" to "https://grafana.verdnatura.es/d/ce4b8ymvex4owa?var-itemFk=$param&var-vnToken=${ + mobileApplication.dataStoreApp.readDataStoreKey( + TOKENMULTIMEDIA + ) + }" + ) + ), param = "" + ) + + } + + private fun setEvents() { + binding.editItemFk.setOnTouchListener { v, event -> + if (event.action == MotionEvent.ACTION_UP) { + val drawableRight = binding.editItemFk.compoundDrawables[2] + if (drawableRight != null && event.x >= v.width - drawableRight.bounds.width()) { + openWebViewer(itemInfoG?.id?.toString() ?: "") + return@setOnTouchListener true + } + } + false + } binding.editItemFk.requestFocus() binding.editItemFk.setOnEditorActionListener { _, actionId, _ -> if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0 || actionId == 5) { diff --git a/app/src/main/res/drawable/ic_grafana.xml b/app/src/main/res/drawable/ic_grafana.xml new file mode 100644 index 00000000..3c2e35c3 --- /dev/null +++ b/app/src/main/res/drawable/ic_grafana.xml @@ -0,0 +1,24 @@ + + + + + + + + + + diff --git a/app/src/main/res/layout/fragment_item_card.xml b/app/src/main/res/layout/fragment_item_card.xml index bf438f05..751a3a2a 100644 --- a/app/src/main/res/layout/fragment_item_card.xml +++ b/app/src/main/res/layout/fragment_item_card.xml @@ -1,7 +1,7 @@ - + - + android:orientation="vertical"> - + android:textColorHint="@color/verdnatura_white" /> + android:orientation="horizontal" + android:padding="@dimen/layout_margin_min"> + + android:layout_weight="1.25" + android:orientation="vertical"> + + + android:textStyle="bold" /> + + + + android:textStyle="bold" /> + + android:layout_weight="1.1" + android:orientation="vertical"> + + + android:textStyle="bold" /> + + + + android:textStyle="bold" /> + - - - - - - - - + + + + + + + + + - - + + + + + android:clipToPadding="false" + tools:listitem="@layout/item_card_row" /> + - - - - + + android:id="@+id/main_toolbar" + layout="@layout/toolbar_fragment" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> - - \ No newline at end of file + + \ No newline at end of file