From 47a768004bfc61e561e45d8887a41a8cf78da927 Mon Sep 17 00:00:00 2001
From: Sergio De la torre <sergiodt@verdnatura.es>
Date: Wed, 6 Mar 2024 12:49:02 +0100
Subject: [PATCH] refs #6964 feat:hasOlderItem

---
 .idea/misc.xml                                           | 1 -
 app/build.gradle                                         | 9 ++++-----
 .../main/java/es/verdnatura/dataStore/DataStoreLocal.kt  | 2 +-
 app/src/main/java/es/verdnatura/domain/SalixService.kt   | 6 ++++++
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index faf2ad68..d0bda703 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="DesignSurface">
     <option name="filePathToZoomLevelMap">
diff --git a/app/build.gradle b/app/build.gradle
index 2eb0d095..7d663887 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 260
-        versionName = "24.8Beta" //23.48Beta son la misma
+        versionCode 262
+        versionName = "24.8Beta"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
@@ -37,9 +37,6 @@ android {
         create("general") {
             //versionNameSuffix = "General"
         }
-        create("alpha") {
-            applicationIdSuffix = ".alpha"
-        }
     }
 
     buildFeatures {
@@ -75,6 +72,8 @@ dependencies {
     implementation 'com.google.firebase:firebase-crashlytics-ktx:18.6.1'
     implementation 'com.google.firebase:firebase-analytics-ktx:21.5.0'
     implementation 'com.google.android.gms:play-services-location:21.1.0'
+    implementation 'androidx.navigation:navigation-fragment-ktx:2.7.7'
+    implementation 'androidx.navigation:navigation-ui-ktx:2.7.7'
     kapt "androidx.room:room-compiler:2.6.1"
     implementation 'androidx.room:room-ktx:2.6.1'
     debugImplementation fileTree(dir: 'libs/debug', include: ['*.jar'])
diff --git a/app/src/main/java/es/verdnatura/dataStore/DataStoreLocal.kt b/app/src/main/java/es/verdnatura/dataStore/DataStoreLocal.kt
index c563e949..cbf846ad 100644
--- a/app/src/main/java/es/verdnatura/dataStore/DataStoreLocal.kt
+++ b/app/src/main/java/es/verdnatura/dataStore/DataStoreLocal.kt
@@ -257,7 +257,7 @@ class DataStoreLocal(var mobileApplication: MobileApplication) {
         }
         saveWorkForm(
             WorkForms(
-                "Añadir...",
+                mobileApplication.getString(R.string.addWorkForm),
                 "",
                 "",
                 created = Calendar.getInstance().timeInMillis + Calendar.getInstance().timeInMillis
diff --git a/app/src/main/java/es/verdnatura/domain/SalixService.kt b/app/src/main/java/es/verdnatura/domain/SalixService.kt
index 019bda0d..d27e14ef 100644
--- a/app/src/main/java/es/verdnatura/domain/SalixService.kt
+++ b/app/src/main/java/es/verdnatura/domain/SalixService.kt
@@ -429,6 +429,12 @@ interface SalixService {
         @Query("schema") schema: String = "vn"
     ): Call<Any>
 
+    @GET("ItemShelvings/hasItemOlder")
+    fun hasItemOlder(
+        @Query("shelvingFk") shelving: Any? = null,
+        @Query("parking") parking: Any? = null,
+    ): Call<Any>
+
     @POST("Applications/sectorCollectionSaleGroup_add/execute-proc")
     fun sectorCollectionSaleGroupAdd(
         @Query("params") params: Any? = null,