From 480cee44bde2028b32682776dc4ee0875dba8e97 Mon Sep 17 00:00:00 2001
From: Sergio De la torre <sergiodt@verdnatura.es>
Date: Fri, 4 Nov 2022 07:00:12 +0100
Subject: [PATCH] =?UTF-8?q?Modificado=20control=20ubicaci=C3=B3n?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           | 21 ++++++++--------
 app/build.gradle                              |  5 ++--
 app/release/output-metadata.json              |  4 ++--
 .../collection/fragment/CollectionFragment.kt | 10 ++++----
 .../ubicador/adapter/UbicadorAdapter.kt       | 10 ++++++--
 .../ubicador/fragment/UbicadorFragment.kt     | 24 +++++++++++--------
 6 files changed, 44 insertions(+), 30 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 391f4a1a..35cfe790 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -82,16 +82,14 @@
     </select>
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="fa688d1c-dbee-4864-9e33-4d84ef9afca8" name="Default Changelist" comment="Modificado .gitignore">
+    <list default="true" id="fa688d1c-dbee-4864-9e33-4d84ef9afca8" name="Default Changelist" comment="Ticket_closure">
+      <change afterPath="$PROJECT_DIR$/app/release/vn-pickingBeta.apk" 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/GetSacadorControladorUserCase.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/GetSacadorControladorUserCase.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/presentation/base/BaseFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/base/BaseFragment.kt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/common/ResponseItemVO.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/common/ResponseItemVO.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/build.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/app/build.gradle" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/release/output-metadata.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/release/output-metadata.json" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragment.kt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionViewModel.kt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/res/values-es/strings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/values-es/strings.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/res/values/strings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/values/strings.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/adapter/UbicadorAdapter.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/adapter/UbicadorAdapter.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorFragment.kt" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -102,7 +100,7 @@
   <component name="CodeInsightWorkspaceSettings">
     <option name="optimizeImportsOnTheFly" value="true" />
   </component>
-  <component name="ExecutionTargetManager" SELECTED_TARGET="device_and_snapshot_combo_box_target[21114523025303]" />
+  <component name="ExecutionTargetManager" SELECTED_TARGET="device_and_snapshot_combo_box_target[C:\Users\sergiodt\.android\avd\Pixel_3a_API_30_x86.avd]" />
   <component name="ExportToHTMLSettings">
     <option name="OPEN_IN_BROWSER" value="true" />
     <option name="OUTPUT_DIRECTORY" value="C:\Program Files\Android\Android Studio\inspections" />
@@ -115,6 +113,9 @@
   <component name="ExternalProjectsManager">
     <system id="GRADLE">
       <state>
+        <task path="$PROJECT_DIR$">
+          <activation />
+        </task>
         <projects_view>
           <tree_state>
             <expand />
@@ -791,7 +792,7 @@
                   <entry key="branch">
                     <value>
                       <list>
-                        <option value="testWith3420" />
+                        <option value="test" />
                       </list>
                     </value>
                   </entry>
diff --git a/app/build.gradle b/app/build.gradle
index 6396501f..a3316eb9 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -13,8 +13,9 @@ android {
         applicationId "es.verdnatura"
         minSdkVersion 21 //21
         targetSdkVersion 30
-        versionCode 140
-        versionName = "9.4Beta"
+        versionCode 141
+        versionName = "9.4.1Beta"
+        //versionName = "9.4Beta" versionCode 140
         //versionName = 9.2
         //versionName = "9.3.2Beta" versionCode 139
 
diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json
index 09d7cf6f..d8eb7f91 100644
--- a/app/release/output-metadata.json
+++ b/app/release/output-metadata.json
@@ -11,8 +11,8 @@
       "type": "SINGLE",
       "filters": [],
       "attributes": [],
-      "versionCode": 140,
-      "versionName": "9.4Beta",
+      "versionCode": 141,
+      "versionName": "9.4.1Beta",
       "outputFile": "app-release.apk"
     }
   ],
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragment.kt
index bbe11342..af1464c1 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragment.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragment.kt
@@ -114,12 +114,13 @@ class CollectionFragment(
         mpok = MediaPlayer.create((activity as MainActivity), R.raw.ok)
         if (type.equals(CONTROLADOR)) {
             //sergio: comprueba si viene de la pantalla de controlador
-            viewModel.ticket_checkFullyControlled(
+            //Tarea #4280 cambiar a ticket_isOutClosureZone
+           /* viewModel.ticket_checkFullyControlled(
                 getData(USER),
                 getData(PASSWORD),
                 collection.collectionFk
 
-            )
+            )*/
             workerFkFromTicket = collection.tickets.get(0).sales.get(0).workerFk
         }
 
@@ -1273,12 +1274,13 @@ class CollectionFragment(
                     )
 
                     if (type.equals(CONTROLADOR)) {
-                        viewModel.ticket_checkFullyControlled(
+                    //Tarea #4280 cambiar a ticket_isOutClosureZone
+                    /*  viewModel.ticket_checkFullyControlled(
                             getData(USER),
                             getData(PASSWORD),
                             txtscan
 
-                        )
+                        )*/
                     }
 
                 }
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/adapter/UbicadorAdapter.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/adapter/UbicadorAdapter.kt
index a32ebb2d..41cc4655 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/adapter/UbicadorAdapter.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/adapter/UbicadorAdapter.kt
@@ -1,7 +1,6 @@
 package es.verdnatura.presentation.view.feature.ubicador.adapter
 
 import android.annotation.SuppressLint
-import android.graphics.Color.GREEN
 import android.graphics.Color.RED
 import android.view.LayoutInflater
 import android.view.ViewGroup
@@ -96,8 +95,15 @@ class UbicadorAdapter(
                             R.color.verdnatura_dark_green_verdnatura
                         )
                     )
+                } else {
+                    itemRowLayout.setBackgroundColor(
+                        ContextCompat.getColor(
+                            visibleText.context,
+                            R.color.verdnatura_black_5
+                        )
+                    )
                 }
-                if (item.isNew){
+                if (item.isNew) {
                     itemRowLayout.setBackgroundColor(
                         RED
                     )
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorFragment.kt
index 8f777a2f..1557c096 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorFragment.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorFragment.kt
@@ -107,17 +107,21 @@ class UbicadorFragment(
 
         binding.mainToolbar.switchButton.visibility = VISIBLE
         binding.mainToolbar.switchButton.setOnCheckedChangeListener { buttonView, isChecked ->
-            modeCheckUbication = isChecked
-            binding.mainToolbar.switchButton.tooltipText = if (isChecked)
-                getString(R.string.activateModoChecking) else
-                getString(R.string.allowCheckingMode)
-            binding.textinputlayoutMatricula.hint =
-                if (isChecked) getString(R.string.scanItem) else {
-                    getString(R.string.scanPlate)
+            if (binding.mainToolbar.toolbarTitle.text == getString(R.string.titleUbicator)) {
+                ma.messageWithSound(getString(R.string.scanShelving), false, false)
+                binding.mainToolbar.switchButton.isChecked = false
+            } else {
+                modeCheckUbication = isChecked
+                binding.mainToolbar.switchButton.tooltipText = if (isChecked)
+                    getString(R.string.activateModoChecking) else
+                    getString(R.string.allowCheckingMode)
+                binding.textinputlayoutMatricula.hint =
+                    if (isChecked) getString(R.string.scanItem) else {
+                        getString(R.string.scanPlate)
+                    }
+                if (!isChecked) {
+                    listLocalItems.clear()
                 }
-
-            if (!isChecked) {
-                listLocalItems.clear()
             }
         }