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

feat tasksRedmine

This commit is contained in:
Sergio De la torre 2024-06-19 07:03:19 +02:00
parent f4e97d1778
commit 0e97150278
2 changed files with 54 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@ -13,8 +13,8 @@ android {
applicationId "es.verdnatura"
minSdkVersion 26
targetSdkVersion 33 // se deja con target si no Play Protect la bloquea
versionCode 302 //qr
versionName = "24.22Beta"
versionCode 305
versionName = "24.24Beta"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}

74
app/src/main/java/es/verdnatura/presentation/view/feature/pasillero/fragment/PasilleroViewModel.kt
View File

@ -89,6 +89,19 @@ class PasilleroViewModel(context: Context) : BaseViewModel(context) {
)
)
)
var userFK = (contextApp as MobileApplication).userId
/* _pasillerositem.add(
PasillerosItemVO(
100,
R.drawable.ic_category,
contextApp.getString(R.string.titleChangeCategory),
R.string.titleChangeCategory,
contextApp.getString(
R.string.titleChangeCategory
)
)
)*/
_pasillerositem.add(
PasillerosItemVO(
@ -362,7 +375,7 @@ class PasilleroViewModel(context: Context) : BaseViewModel(context) {
)
)
)
if (userId == 19591){
if (userId == 19591) {
_pasillerositem.add(
PasillerosItemVO(
7,
@ -421,16 +434,30 @@ class PasilleroViewModel(context: Context) : BaseViewModel(context) {
)
)
val userFk = (contextApp).userId
if (userFk == 19591) {
_pasillerositem.add(
PasillerosItemVO(
6,
R.drawable.ic_truck,
contextApp.getString(R.string.titleDeliveryTruck),
R.string.titleDeliveryTruck,
contextApp.getString(R.string.titleDeliveryTruck)
)
)
}
//#tarea4021
/* _pasillerositem.add(
PasillerosItemVO(
6,
R.drawable.ic_packaging_entries,
contextApp.getString(R.string.titlePackaging),
R.string.titlePackaging,
contextApp.getString(R.string.titlePackagingDescrip)
)
)*/
_pasillerositem.add(
PasillerosItemVO(
6,
R.drawable.ic_packaging_entries,
contextApp.getString(R.string.titlePackaging),
R.string.titlePackaging,
contextApp.getString(R.string.titlePackagingDescrip)
)
)
_pasillerositem.add(
PasillerosItemVO(
6,
@ -522,18 +549,19 @@ class PasilleroViewModel(context: Context) : BaseViewModel(context) {
)
)
val userId = (contextApp as MobileApplication).userId
if (userId == 19591 || userId == 18404){
_pasillerositem.add(
PasillerosItemVO(
7,
R.drawable.ic_previous_presacador,
contextApp.getString(R.string.titlePrePickerTest),
R.string.titlePrePickerTest,
contextApp.getString(
R.string.titlePickerDescrip
if (userId == 19591 || userId == 18404) {
_pasillerositem.add(
PasillerosItemVO(
7,
R.drawable.ic_previous_presacador,
contextApp.getString(R.string.titlePrePickerTest),
R.string.titlePrePickerTest,
contextApp.getString(
R.string.titlePickerDescrip
)
)
)
)}
}
_pasillerositem.add(
PasillerosItemVO(
7,
@ -586,6 +614,8 @@ class PasilleroViewModel(context: Context) : BaseViewModel(context) {
)
)
_pasillerositem.add(
PasillerosItemVO(
7,
@ -641,7 +671,7 @@ class PasilleroViewModel(context: Context) : BaseViewModel(context) {
)
//Tarea 5186
/* _pasillerositem.add(
_pasillerositem.add(
PasillerosItemVO(
7,
R.drawable.ic_parking_previa,
@ -651,7 +681,7 @@ class PasilleroViewModel(context: Context) : BaseViewModel(context) {
R.string.titleParkingTicketPrevia
)
)
)*/
)
_pasillerositem.add(
PasillerosItemVO(