From 0e97150278fa36437ec9cabaecd3d6af5c34d2b2 Mon Sep 17 00:00:00 2001
From: Sergio De la torre <sergiodt@verdnatura.es>
Date: Wed, 19 Jun 2024 07:03:19 +0200
Subject: [PATCH] feat tasksRedmine

---
 app/build.gradle                              |  4 +-
 .../pasillero/fragment/PasilleroViewModel.kt  | 74 +++++++++++++------
 2 files changed, 54 insertions(+), 24 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index cb99a07a..a6faf8c3 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -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"
     }
 
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/pasillero/fragment/PasilleroViewModel.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/pasillero/fragment/PasilleroViewModel.kt
index 1e4441eb..68537191 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/pasillero/fragment/PasilleroViewModel.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/pasillero/fragment/PasilleroViewModel.kt
@@ -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(