verdnatura/vn-warehouse
verdnatura
/
vn-warehouse
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

refs #5618 feat:modify strings

This commit is contained in:
Sergio De la torre 2024-02-19 08:34:07 +01:00
parent e0c9fc7c60
commit c4ed1168ea
7 changed files with 158 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/es/verdnatura/presentation/view/feature/historicoshelving/fragment/ItemShelvingLogViewModel.kt
View File

@ -3,7 +3,7 @@ package es.verdnatura.presentation.view.feature.historicoshelving.fragment
import android.content.Context
import androidx.lifecycle.LiveData
import androidx.lifecycle.MutableLiveData
import androidx.lifecycle.Transformations
import androidx.lifecycle.map
import es.verdnatura.domain.SalixCallback
import es.verdnatura.domain.formatWithQuotes
import es.verdnatura.presentation.base.BaseViewModel
@ -18,7 +18,8 @@ class ItemShelvingLogViewModel(val context: Context) : BaseViewModel(context) {
val itemShelvingLogList: LiveData<ItemShelvingLogList>
get() = _itemShelvingLogList
val loadItemShelvingLogList = Transformations.map(_itemShelvingLogList) { Event(it) }
//val loadItemShelvingLogList = Transformations.map(_itemShelvingLogList) { Event(it) }
val loadItemShelvingLogList: LiveData<Event<ItemShelvingLogList>> = _itemShelvingLogList.map { Event(it) }
fun itemShelvingLogGet(vShelvingFK: String) {
//salix falla fecha

22
app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/model/ItemUbicadorVO.kt
View File

@ -20,6 +20,25 @@ class ItemUbicadorVO(
var url: String = ""
)
class ItemUbicador(
var item: Long,
var description: String = "",
var visible: Int = 0,
var stickers: Int = 0,
var packing: Int? = null,
var grouping: Int? = null,
var code: String? = "",
var id: Int = 0,
var priority: Int = 0,
var isError: Boolean = false,
var errorMessage: String = "",
var checked: Boolean = false,
var isNew: Boolean = false,
var isChecked: Int? = null,
var url: String = "",
var units:Int = 0
)
class ItemEscanerVO(
var item: Long
)
@ -27,3 +46,6 @@ class ItemEscanerVO(
class ItemUbicadorListVO(
var list: List<ItemUbicadorVO> = listOf()
)
class ItemUbicadorListNew(
var list: List<ItemUbicador> = listOf()
)

123
app/src/main/res/layout/item_ubication_row_new.xml Normal file
View File

@ -0,0 +1,123 @@
<?xml version="1.0" encoding="utf-8"?>
<layout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
>
<data>
<variable
name="item"
type="es.verdnatura.presentation.view.feature.ubicador.model.ItemUbicador" />
</data>
<LinearLayout
android:id="@+id/itemLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<LinearLayout
android:id="@+id/item_row_layout"
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/verdnatura_black_5"
android:paddingLeft="@dimen/pasilleros_margin_main_menu"
android:paddingRight="@dimen/pasilleros_margin_main_menu"
android:paddingTop="@dimen/pasilleros_margin_main_menu"
android:paddingBottom="@dimen/pasilleros_margin_main_menu">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:orientation="horizontal"
android:gravity="center"
android:layout_marginRight="@dimen/layout_margin_min">
<androidx.cardview.widget.CardView
android:layout_width="@dimen/item_image_width"
android:layout_height="@dimen/item_image_width"
app:cardCornerRadius="100dp"
android:layout_marginRight="@dimen/layout_margin_1">
<ImageView
android:id="@+id/img_item"
android:layout_width="match_parent"
android:layout_height="match_parent"
/>
</androidx.cardview.widget.CardView>
<LinearLayout
android:id="@+id/namelayout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
style="@style/LayoutClickable">
<TextView
android:id="@+id/itemfk_text"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:textSize="@dimen/h8"
android:textColor="@color/verdnatura_white"
android:text="@{String.valueOf(item.item)}"
android:textStyle="bold"/>
<TextView
android:id="@+id/longname_text"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:textSize="@dimen/h8"
android:textColor="@color/verdnatura_white"
android:text="@{item.description}"
android:ellipsize="end"
android:maxLines="1"/>
</LinearLayout>
</LinearLayout>
<LinearLayout
android:id="@+id/layer_visible"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="2"
android:orientation="vertical">
<TextView
android:id="@+id/multi_text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textSize="@dimen/body2"
android:textColor="@color/verdnatura_white"
android:text="6 x 15"
android:ellipsize="end"
android:maxLines="1"
android:gravity="center"
android:textStyle="bold"/>
<TextView
android:id="@+id/visible_text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textSize="@dimen/h6"
android:textColor="@color/verdnatura_pumpkin_orange"
android:text="@{String.valueOf(item.visible)}"
android:ellipsize="end"
android:maxLines="1"
android:gravity="center"
android:textStyle="bold"/>
</LinearLayout>
<LinearLayout
android:layout_width="@dimen/item_image_width_min"
android:layout_height="match_parent"
android:orientation="vertical">
<ImageView
android:id="@+id/more_img"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="center"
android:src="@drawable/ic_more_vert_black_24dp" />
</LinearLayout>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/verdnatura_black_9"/>
</LinearLayout>
</layout>

1
app/src/main/res/values-es/strings.xml
View File

@ -698,6 +698,7 @@
<string name="checkedByUser">Ha sido revisado por %1$s</string>
<string name="previousText">PREVIA:%1$s</string>
<string name="lastTicketsText">Últimos tickets modificados :</string>
<string name="itemfk">Artículo</string>
</resources>

7
app/src/main/res/values-fr/strings.xml
View File

@ -538,12 +538,12 @@
<string name="titleLogDescrip">Ver datos expedición</string>
<string name="titleInfoDescription">Ver datos empresa</string>
<string name="titleInfo">Afficher les informations l\'entreprise</string>
<string name="titleLog">Log y ruta de una expedición</string>
<string name="titleLog">Journal et itinéraire d\'une expédition</string>
<string name="nif">CNI</string>
<string name="adress">Adresse</string>
<string name="company">Enterprise</string>
<string name="expeditionMarkLost">Si activa este botón marca la expedición como Perdida</string>
<string name="expeditionMarkFound">Si activa este botón marca la expedición como Encontrada</string>
<string name="expeditionMarkLost">Si vous activez ce bouton, marquez l\'expédition comme perdue.</string>
<string name="expeditionMarkFound">Si vous activez ce bouton, marquez l\'expédition comme trouvée.</string>
<string name="freelance">Porteador</string>
<string name="errorScanned">Texto escaneado no válido</string>
<string name="deleteQuantity">Va a eliminar para Autoconsumo la cantidad del artículo:</string>
@ -697,6 +697,7 @@
<string name="checkedByUser">Ha sido revisado por %1$s</string>
<string name="previousText">PREVIA:%1$s</string>
<string name="lastTicketsText">Últimos tickets modificados :</string>
<string name="itemfk">Artículo</string>
</resources>

7
app/src/main/res/values-pt/strings.xml
View File

@ -538,12 +538,12 @@
<string name="titleLogDescrip">Ver datos expedición</string>
<string name="titleInfoDescription">Ver datos empresa</string>
<string name="titleInfo">Muestra información empresa</string>
<string name="titleLog">Log y ruta de una expedición</string>
<string name="titleLog">Historico e rota de uma expedição</string>
<string name="nif">NIF</string>
<string name="adress">Dirección</string>
<string name="company">Empresa</string>
<string name="expeditionMarkLost">Si activa este botón marca la expedición como Perdida</string>
<string name="expeditionMarkFound">Si activa este botón marca la expedición como Encontrada</string>
<string name="expeditionMarkLost">Se ativas este botão marca a expedição como perdida</string>
<string name="expeditionMarkFound">Se ativas este botão marca a expedição como encontrada</string>
<string name="freelance">Porteador</string>
<string name="errorScanned">Texto escaneado no válido</string>
<string name="deleteQuantity">Va a eliminar para Autoconsumo la cantidad del artículo:</string>
@ -697,6 +697,7 @@
<string name="checkedByUser">Ha sido revisado por %1$s</string>
<string name="previousText">PREVIA:%1$s</string>
<string name="lastTicketsText">Últimos tickets modificados :</string>
<string name="itemfk">Artículo</string>
</resources>

1
app/src/main/res/values/strings.xml
View File

@ -697,5 +697,6 @@
<string name="checkedByUser">ticket checked by %1$s</string>
<string name="previousText">PREVIA:%1$s</string>
<string name="lastTicketsText">Últimos tickets modificados :</string>
<string name="itemfk">Artículo</string>
</resources>