refs #5891 inventory

.idea/workspace.xml

@@ -82,14 +82,15 @@
     </select>
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="fa688d1c-dbee-4864-9e33-4d84ef9afca8" name="Default Changelist" comment="version 23.24.1Beta">
+    <list default="true" id="fa688d1c-dbee-4864-9e33-4d84ef9afca8" name="Default Changelist" comment="refs #5613 renew token">
-      <change beforePath="$PROJECT_DIR$/.idea/deploymentTargetDropDown.xml" beforeDir="false" />
+      <change afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/inventario/fragment/InventaryParkingFragment.kt" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/app/src/main/res/drawable/ic_inventory_parking.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/ApiSalixUtils.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/ApiSalixUtils.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/VerdnaturaService.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/VerdnaturaService.kt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/SalixService.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/SalixService.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/inventario/fragment/InventaryViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/inventario/fragment/InventaryViewModel.kt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/ajustes/fragment/AjustesFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/ajustes/fragment/AjustesFragment.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/login/fragment/LoginFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/login/fragment/LoginFragment.kt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/ajustes/fragment/AjustesViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/ajustes/fragment/AjustesViewModel.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/main/activity/MainActivity.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/main/activity/MainActivity.kt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/login/model/LoginItemVO.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/login/model/LoginItemVO.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/pasillero/fragment/PasilleroViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/pasillero/fragment/PasilleroViewModel.kt" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -100,7 +101,7 @@
   <component name="CodeInsightWorkspaceSettings">
     <option name="optimizeImportsOnTheFly" value="true" />
   </component>
-  <component name="ExecutionTargetManager" SELECTED_TARGET="device_and_snapshot_combo_box_target[G65TY9DQN7X4BIE6]" />
+  <component name="ExecutionTargetManager" SELECTED_TARGET="device_and_snapshot_combo_box_target[21114523025303]" />
   <component name="ExportToHTMLSettings">
     <option name="OPEN_IN_BROWSER" value="true" />
     <option name="OUTPUT_DIRECTORY" value="C:\Program Files\Android\Android Studio\inspections" />
@@ -259,6 +260,7 @@
     &quot;cidr.known.project.marker&quot;: &quot;true&quot;,
     &quot;com.developerphil.adbidea.selecteddevices&quot;: &quot;21114523025303&quot;,
     &quot;com.google.services.firebase.aqiPopupShown&quot;: &quot;true&quot;,
+    &quot;last_directory_selection&quot;: &quot;C:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable&quot;,
     &quot;last_opened_file_path&quot;: &quot;C:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable&quot;,
     &quot;project.structure.last.edited&quot;: &quot;Project&quot;,
     &quot;project.structure.proportion&quot;: &quot;0.17&quot;,
@@ -307,11 +309,11 @@
       <recent name="es.verdnatura.presentation.view.feature.buffer.fragment" />
     </key>
     <key name="CopyKotlinDeclarationDialog.RECENTS_KEY">
+      <recent name="es.verdnatura.presentation.view.feature.inventario.fragment" />
       <recent name="es.verdnatura.presentation.view.feature.delivery.adapters" />
       <recent name="es.verdnatura.presentation.view.feature.delivery.fragments" />
       <recent name="es.verdnatura.presentation.view.feature.packingHolland" />
       <recent name="es.verdnatura.domain" />
-      <recent name="es.verdnatura.presentation.view.feature.packaging.fragment" />
     </key>
   </component>
   <component name="RunManager" selected="Android App.app">
@@ -421,20 +423,6 @@
       <option name="presentableId" value="Default" />
       <updated>1618825571576</updated>
     </task>
-    <task id="LOCAL-00117" summary="refs #4755 añadirTickets">
-      <created>1679389331215</created>
-      <option name="number" value="00117" />
-      <option name="presentableId" value="LOCAL-00117" />
-      <option name="project" value="LOCAL" />
-      <updated>1679389331215</updated>
-    </task>
-    <task id="LOCAL-00118" summary="refs #4923 previas">
-      <created>1679477988938</created>
-      <option name="number" value="00118" />
-      <option name="presentableId" value="LOCAL-00118" />
-      <option name="project" value="LOCAL" />
-      <updated>1679477988939</updated>
-    </task>
     <task id="LOCAL-00119" summary="EntrySalix">
       <created>1679575710293</created>
       <option name="number" value="00119" />
@@ -764,7 +752,21 @@
       <option name="project" value="LOCAL" />
       <updated>1687175742657</updated>
     </task>
-    <option name="localTasksCounter" value="166" />
+    <task id="LOCAL-00166" summary="version 23.26 refs #4678">
+      <created>1687877123851</created>
+      <option name="number" value="00166" />
+      <option name="presentableId" value="LOCAL-00166" />
+      <option name="project" value="LOCAL" />
+      <updated>1687877123851</updated>
+    </task>
+    <task id="LOCAL-00167" summary="refs #5613 renew token">
+      <created>1688103597824</created>
+      <option name="number" value="00167" />
+      <option name="presentableId" value="LOCAL-00167" />
+      <option name="project" value="LOCAL" />
+      <updated>1688103597825</updated>
+    </task>
+    <option name="localTasksCounter" value="168" />
     <servers />
   </component>
   <component name="Vcs.Log.History.Properties">
@@ -865,8 +867,6 @@
   </component>
   <component name="VcsManagerConfiguration">
     <option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
-    <MESSAGE value="refs #4902 retrocompatibilidad etd-eta" />
-    <MESSAGE value="refs #5071 summaryFragment" />
     <MESSAGE value="refs #4678 Carga/descarga" />
     <MESSAGE value="refs #5675 fallo parking" />
     <MESSAGE value="refs #5618 traducciones" />
@@ -890,14 +890,16 @@
     <MESSAGE value="Actualizaciones" />
     <MESSAGE value="refs #5339" />
     <MESSAGE value="refs #4678" />
-    <option name="LAST_COMMIT_MESSAGE" value="refs #4678" />
+    <MESSAGE value="version 23.26 refs #4678" />
+    <MESSAGE value="refs #5613 renew token" />
+    <option name="LAST_COMMIT_MESSAGE" value="refs #5613 renew token" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
       <breakpoints>
         <line-breakpoint type="kotlin-function">
           <url>file://$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/VerdnaturaService.kt</url>
-          <line>865</line>
+          <line>871</line>
           <properties class="es.verdnatura.domain.VerdnaturaService" method="route_getExpeditionSummary">
             <option name="WATCH_EXIT" value="false" />
           </properties>
@@ -908,6 +910,11 @@
           <line>457</line>
           <option name="timeStamp" value="3" />
         </line-breakpoint>
+        <line-breakpoint enabled="true" type="kotlin-line">
+          <url>file://$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/login/fragment/LoginViewModel.kt</url>
+          <line>525</line>
+          <option name="timeStamp" value="6" />
+        </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
     <pin-to-top-manager>

app/src/main/java/es/verdnatura/domain/VerdnaturaService.kt

@@ -33,6 +33,7 @@ import es.verdnatura.presentation.view.feature.workermistake.model.MistakeWorker
 import es.verdnatura.presentation.view.feature.workermistake.model.WorkerFromMistake
 import retrofit2.Call
 import retrofit2.http.Body
+import retrofit2.http.GET
 import retrofit2.http.Header
 import retrofit2.http.POST
 
@@ -363,6 +364,11 @@ interface VerdnaturaService {
     ):
             Call<Any>
 
+    @GET("almacennew/itemShelving_inventory")//REVISADA
+    fun itemShelving_inventory(
+        @Body vararg params: Any
+    ):
+            Call<Any>
     @POST("almacennew/mistakeType")//REVISADA
     fun mistakeType(
     ):

app/src/main/java/es/verdnatura/presentation/view/feature/inventario/fragment/InventaryViewModel.kt

@@ -362,6 +362,32 @@ class InventaryViewModel(val context: Context) : BaseViewModel(context) {
             })
     }
 
+    fun inventoryParking(
+        vParkingFromFk: Int,
+        vParkingToFk: Int
+    ) {
+        silex.itemShelving_inventory(vParkingFromFk, vParkingToFk)
+            .enqueue(object :
+                SilexCallback<Any>(context) {
+                override fun onError(t: Throwable) {
+                    _responseAddMistake.value = ResponseItemVO(
+                        isError = true,
+                        errorMessage = getMessageFromAllResponse(nameofFunction(this), t.message!!)
+                    )
+                }
+
+                override fun onSuccess(response: Response<Any>) {
+
+                    // sergio:refactor:solo debería haber un mensaje no un response o errorMessage
+                    _responseAddMistake.value =
+                        ResponseItemVO(
+                            isError = false,
+                            response = response.message()
+                        )
+                }
+            })
+    }
+
     fun expeditionMistakeType_get() {
        silex.expeditionMistakeType_get()
             .enqueue(object : SilexCallback<List<MistakeWorkerType>>(context) {

app/src/main/java/es/verdnatura/presentation/view/feature/login/fragment/LoginFragment.kt

@@ -520,10 +520,11 @@ class LoginFragment(var imageUri: Uri?) :
                     //saveTokenPref("RTymwJzRuVchAMY5u8xG2wpgcjPf7t0DQImLvMsTdNFmbFwDiVsa8lA6fr1XSaBo","2026-29-06")
                     // local
                     //saveTokenPref("rpG3yNMdViFYDh1sZfeYRCUmuHZYmKW5EqzwHkckj0zFbszSZGTWbs8xNETHyvuw","2026-29-06")
-                    /* saveUserAccesPref(
+                    //Tarea 5613 borrar que se guarde
+                   saveUserAccesPref(
                          binding.edittextUsername.text.toString(),
                          binding.edittextPassword.text.toString()
-                     )*/
+                     )
                     app.userName = binding.edittextUsername.text.toString()
                     app.userPassword = binding.edittextPassword.text.toString()
                     setupFirebase(app.userName!!)

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

@@ -133,7 +133,7 @@ class PasilleroViewModel(context: Context) : BaseViewModel(context) {
 
 
         //Tarea 5651
-    /*  _pasillerositem.add(
+     _pasillerositem.add(
             PasillerosItemVO(
                 1,
                 R.drawable.ic_advance_ticket,
@@ -143,7 +143,7 @@ class PasilleroViewModel(context: Context) : BaseViewModel(context) {
                     R.string.ticketAdvanceDescrip
                 )
             )
-        )*/
+        )
 
 
         _pasillerositem.add(
@@ -169,6 +169,18 @@ class PasilleroViewModel(context: Context) : BaseViewModel(context) {
                 )
             )
         )
+        //Tarea 5891
+       /* _pasillerositem.add(
+            PasillerosItemVO(
+                3,
+                R.drawable.ic_inventory_parking,
+                contextApp.getString(R.string.titleInventoryParking),
+                R.string.titleInventoryParking,
+                contextApp.getString(
+                    R.string.titleInventoryParkingDescrip
+                )
+            )
+        )*/
 
         _pasillerositem.add(
             PasillerosItemVO(

app/src/main/res/drawable/ic_inventory_parking.xml

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960"
+    android:tint="#F7931E">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M620,801L460,641L503,598L620,715L859,476L902,519L620,801ZM840,387L780,387L780,180Q780,180 780,180Q780,180 780,180L720,180L720,270L240,270L240,180L180,180Q180,180 180,180Q180,180 180,180L180,780Q180,780 180,780Q180,780 180,780L431,780L431,840L180,840Q154,840 137,823Q120,806 120,780L120,180Q120,154 137,137Q154,120 180,120L382,120Q389,85 416.5,62.5Q444,40 480,40Q516,40 543.5,62.5Q571,85 578,120L780,120Q806,120 823,137Q840,154 840,180L840,387ZM480,180Q497,180 508.5,168.5Q520,157 520,140Q520,123 508.5,111.5Q497,100 480,100Q463,100 451.5,111.5Q440,123 440,140Q440,157 451.5,168.5Q463,180 480,180Z"/>
+</vector>