From d28ee67bc24feb61bf27307a77bf0b81ff2de438 Mon Sep 17 00:00:00 2001
From: Sergio De la torre <sergiodt@verdnatura.es>
Date: Wed, 11 Jan 2023 09:04:52 +0100
Subject: [PATCH] =?UTF-8?q?Version=2023.2Beta=20en=20scaleFusion,=20soluci?=
 =?UTF-8?q?onado=20doble=20impresi=C3=B3n=20y=20Revisar=20en=20Controlador?=
 =?UTF-8?q?es?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/deploymentTargetDropDown.xml            | 17 --------------
 .idea/workspace.xml                           | 22 +++++-------------
 app/build.gradle                              |  3 ++-
 app/release/output-metadata.json              |  2 +-
 .../es/verdnatura/domain/VerdnaturaService.kt |  4 ++--
 .../collection/fragment/CollectionFragment.kt | 12 ++++------
 .../fragment/CollectionViewModel.kt           |  6 ++---
 .../collection/fragment/ShowTicketFragment.kt | 23 ++++---------------
 8 files changed, 22 insertions(+), 67 deletions(-)
 delete mode 100644 .idea/deploymentTargetDropDown.xml

diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
deleted file mode 100644
index 898c4821..00000000
--- a/.idea/deploymentTargetDropDown.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="deploymentTargetDropDown">
-    <runningDeviceTargetSelectedWithDropDown>
-      <Target>
-        <type value="RUNNING_DEVICE_TARGET" />
-        <deviceKey>
-          <Key>
-            <type value="SERIAL_NUMBER" />
-            <value value="10.2.3.104:5555" />
-          </Key>
-        </deviceKey>
-      </Target>
-    </runningDeviceTargetSelectedWithDropDown>
-    <timeTargetWasSelectedWithDropDown value="2023-01-09T10:47:43.791932400Z" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index e9e0a471..6041670f 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -83,25 +83,15 @@
     </select>
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="fa688d1c-dbee-4864-9e33-4d84ef9afca8" name="Default Changelist" comment="Version 9.7.2Beta solucionado tema Ubicador">
-      <change afterPath="$PROJECT_DIR$/.idea/deploymentTargetDropDown.xml" afterDir="false" />
+    <list default="true" id="fa688d1c-dbee-4864-9e33-4d84ef9afca8" name="Default Changelist" comment="Version 23.2Beta en scaleFusion">
+      <change beforePath="$PROJECT_DIR$/.idea/deploymentTargetDropDown.xml" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" 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/domain/Extensions.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/Extensions.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/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/buscaritem/fragment/BuscarItemFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/buscaritem/fragment/BuscarItemFragment.kt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/buscaritem/fragment/BuscarItemViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/buscaritem/fragment/BuscarItemViewModel.kt" 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/java/es/verdnatura/presentation/view/feature/controlvehiculo/fragment/ControlVehiculoViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/controlvehiculo/fragment/ControlVehiculoViewModel.kt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionPalletDetailViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionPalletDetailViewModel.kt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/PalletScanViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/PalletScanViewModel.kt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/qr/QrFragmentViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/qr/QrFragmentViewModel.kt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/sacador/fragment/SacadorViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/sacador/fragment/SacadorViewModel.kt" 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" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorViewModel.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/ShowTicketFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/ShowTicketFragment.kt" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -112,7 +102,7 @@
   <component name="CodeInsightWorkspaceSettings">
     <option name="optimizeImportsOnTheFly" value="true" />
   </component>
-  <component name="ExecutionTargetManager" SELECTED_TARGET="device_and_snapshot_combo_box_target[10.2.3.104:5555]" />
+  <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" />
@@ -278,7 +268,7 @@
     <property name="project.structure.side.proportion" value="0.2" />
     <property name="recommended.upgrade.last.time.stamp" value="1641190974236" />
     <property name="run.code.analysis.last.selected.profile" value="pProject Default" />
-    <property name="settings.editor.selected.configurable" value="reference.settingsdialog.project.gradle" />
+    <property name="settings.editor.selected.configurable" value="configurable.group.appearance" />
   </component>
   <component name="PsdUISettings">
     <option name="MODULE_TAB" value="Default Config" />
diff --git a/app/build.gradle b/app/build.gradle
index 43f03c97..c7403ac2 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -13,8 +13,9 @@ android {
         applicationId "es.verdnatura"
         minSdkVersion 24 //21
         targetSdkVersion 30
-        versionCode 151
+        versionCode 152
         //versionName = "9.8Beta" version 148
+        //versionName = "23.2Beta" 150
         versionName = "23.2Beta"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json
index 572dbbbb..6d750865 100644
--- a/app/release/output-metadata.json
+++ b/app/release/output-metadata.json
@@ -11,7 +11,7 @@
       "type": "SINGLE",
       "filters": [],
       "attributes": [],
-      "versionCode": 151,
+      "versionCode": 152,
       "versionName": "23.2Beta",
       "outputFile": "app-release.apk"
     }
diff --git a/app/src/main/java/es/verdnatura/domain/VerdnaturaService.kt b/app/src/main/java/es/verdnatura/domain/VerdnaturaService.kt
index 5f41f94b..f73b039e 100644
--- a/app/src/main/java/es/verdnatura/domain/VerdnaturaService.kt
+++ b/app/src/main/java/es/verdnatura/domain/VerdnaturaService.kt
@@ -246,7 +246,7 @@ interface VerdnaturaService {
     fun collection_getUncheckedTicket(
         @Body vararg params: Any
     ):
-            Call<Any>
+            Call<String>
 
     //sergio: de momento se separa para ir viendo como funciona. El precontrol llamara a collectionTicketGet con otro parametro.
     @POST("almacennew/collection_getTickets")//REVISADA
@@ -292,7 +292,7 @@ interface VerdnaturaService {
     ):
             Call<Any>
 
-    @POST("almacennew/collectionStickerPrint")//REVISADA
+    @POST("almacennew/collection_printSticker")//REVISADA
     fun collectionStickerPrint(
         @Body vararg params: Any?
     ):
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 db39e269..a99eaa69 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
@@ -2471,9 +2471,8 @@ class CollectionFragment(
         //tarea#4672
         var isTicket = false
         /* for (t in collection.tickets) {
-             if (!t.ticketFk.equals(collection.collectionFk)) {
-                 isTicket = false
-                 break
+             if (t.ticketFk.toInt()==(collection.collectionFk)) {
+                 isTicket = true
              }
          }*/
         if (isTicket) {
@@ -2481,12 +2480,11 @@ class CollectionFragment(
             builder.setTitle(getString(R.string.selectLabeltoPrint))
             val labelCount = arrayOf("1", "2", "3", "4", "5", "6", "7", "8", "9", "10")
             builder.setItems(labelCount) { dialog, which ->
-                d("VERDNATURA::", "EL ELEGIDO ES" + which)
                 viewModel.collectionStickerPrint(
                     collectionFk = collection.collectionFk,
                     labelCount = (which + 1)
                 )
-                (getString(R.string.Imprimiendo) + getData(PRINTERNAME)).toast(requireContext())
+
             }
             val dialog = builder.create()
             dialog.show()
@@ -2494,11 +2492,9 @@ class CollectionFragment(
             viewModel.collectionStickerPrint(
                 collectionFk = collection.collectionFk,
                 null
-
             )
-            (getString(R.string.Imprimiendo) + getData(PRINTERNAME)).toast(requireContext())
         }
-
+        (getString(R.string.Imprimiendo) + getData(PRINTERNAME)).toast(requireContext())
 
     }
 
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionViewModel.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionViewModel.kt
index 071b2927..10f9c4c6 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionViewModel.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionViewModel.kt
@@ -923,7 +923,7 @@ class CollectionViewModel(val context: Context) : BaseViewModel(context) {
         silex.collection_getUncheckedTicket(
             collectionFk
         ).enqueue(object :
-            SilexCallback<Any>(context) {
+            SilexCallback<String>(context) {
             override fun onError(t: Throwable) {
                 _responseCollectionUnchecked.value = ResponseItemVO(
                     isError = true,
@@ -931,12 +931,12 @@ class CollectionViewModel(val context: Context) : BaseViewModel(context) {
                 )
             }
 
-            override fun onSuccess(response: Response<Any>) {
+            override fun onSuccess(response: Response<String>) {
                 if (response.body() != null) {
 
                     _responseCollectionUnchecked.value = ResponseItemVO(
                         isError = false,
-                        response = response.body()!!.toString(),
+                        response = response.body()!!,
                         errorMessage = ""
                     )
                 } else {
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/ShowTicketFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/ShowTicketFragment.kt
index 9e53f907..4ff5c0de 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/ShowTicketFragment.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/ShowTicketFragment.kt
@@ -139,9 +139,8 @@ class CollectionShowTicketFragment(
             //tarea#4672
             var isTicket = false
             /* for (t in collection.tickets) {
-                 if (!t.ticketFk.equals(collection.collectionFk)) {
-                     isTicket = false
-                     break
+                 if (t.ticketFk.toInt()==(collection.collectionFk)) {
+                     isTicket = true
                  }
              }*/
             if (isTicket){
@@ -153,34 +152,20 @@ class CollectionShowTicketFragment(
                         collectionFk = collection.collectionFk,
                         labelCount = (which+1)
                     )
-                    (getString(R.string.Imprimiendo) + getData(PRINTERNAME)).toast(requireContext())
                 }
                 val dialog = builder.create()
                 dialog.show()
             }else{
-              /*  viewModel.collectionStickerPrint(
+                viewModel.collectionStickerPrint(
 
                     collectionFk = collection.collectionFk,
                     labelCount = null
                 )
-                (getString(R.string.Imprimiendo) + getData(PRINTERNAME)).toast(requireContext())*/
 
 
         }
 
-        if (ma.havePrinter() && ma.haveSector()) {
-            viewModel.collectionStickerPrint(
-                collectionFk = collection.collectionFk,
-                labelCount = getDataInt(SECTORFK)
-
-            )
-
-            (getString(R.string.Imprimiendo) + getData(PRINTERNAME)).toast(requireContext())
-        }else{
-
-                ma.messageWithSound(getString(R.string.printerFault),isError = true,true,getString(R.string.error),false)
-
-        }
+        (getString(R.string.Imprimiendo) + getData(PRINTERNAME)).toast(requireContext())
     }
     private fun setEvents() {