diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 958b01ee..f4656803 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -84,9 +84,15 @@
+
+
+
+
+
+
-
+
@@ -244,7 +250,7 @@
"ScreenRecorder.SavePath": "C:\\Users\\sergiodt\\device-2023-03-17-114045.mp4",
"cidr.known.project.marker": "true",
"com.google.services.firebase.aqiPopupShown": "true",
- "last_opened_file_path": "Z:/KEYSTORE/keystore.jks",
+ "last_opened_file_path": "C:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/java/es/verdnatura/presentation/view/feature",
"project.structure.last.edited": "Modules",
"project.structure.proportion": "0.17",
"project.structure.side.proportion": "0.2",
@@ -264,11 +270,11 @@
+
-
@@ -278,13 +284,14 @@
+
-
+
@@ -398,13 +405,6 @@
1618825571576
-
- 1662982877783
-
-
-
- 1662982877783
-
1663050116723
@@ -741,7 +741,14 @@
1679905259957
-
+
+ 1679917077712
+
+
+
+ 1679917077712
+
+
diff --git a/app/build.gradle b/app/build.gradle
index d63f7cd0..cd5899fa 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -14,8 +14,8 @@ android {
minSdkVersion 24 //21
targetSdkVersion 33
versionCode 174
- versionName = "23.10.2Beta"
- //versionName = "23.10Beta" versionCode 172
+ versionName = "23.10"
+ //versionName = "23.10.2Beta" versionCode 174
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
diff --git a/app/src/main/java/es/verdnatura/di/viewModelModule.kt b/app/src/main/java/es/verdnatura/di/viewModelModule.kt
index 06a91e4e..4e76be23 100644
--- a/app/src/main/java/es/verdnatura/di/viewModelModule.kt
+++ b/app/src/main/java/es/verdnatura/di/viewModelModule.kt
@@ -20,6 +20,7 @@ import es.verdnatura.presentation.view.feature.historicovehiculo.fragment.Histor
import es.verdnatura.presentation.view.feature.inventario.fragment.InventaryViewModel
import es.verdnatura.presentation.view.feature.login.fragment.LoginViewModel
import es.verdnatura.presentation.view.feature.packaging.fragment.PackagingViewModel.PackagingViewModel
+import es.verdnatura.presentation.view.feature.packingHolland.fragment.PackingHollandViewModel
import es.verdnatura.presentation.view.feature.paletizador.fragment.*
import es.verdnatura.presentation.view.feature.parking.fragment.ParkingViewModel
import es.verdnatura.presentation.view.feature.pasillero.fragment.PasilleroViewModel
@@ -204,4 +205,8 @@ val viewModelModule = module {
viewModel {
DeliveryViewModel(androidContext())
}
+
+ viewModel {
+ PackingHollandViewModel(androidContext())
+ }
}
\ No newline at end of file
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 c246f232..9a669d44 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
@@ -119,6 +119,19 @@ class PasilleroViewModel(context: Context) : BaseViewModel(context) {
)
)
+ //Tarea 4940
+ /* _pasillerositem.add(
+ PasillerosItemVO(
+ 1,
+ R.drawable.ic_dashboard_black_24dp,
+ contextApp.getString(R.string.titlePackingHolland),
+ R.string.titlePackingHolland,
+ contextApp.getString(
+ R.string.titleUbicatorDescrip
+ )
+ )
+ )*/
+
//Tarea 5095
/* _pasillerositem.add(
PasillerosItemVO(
@@ -511,7 +524,7 @@ class PasilleroViewModel(context: Context) : BaseViewModel(context) {
)
//#tarea4679
- _pasillerositem.add(
+ /* _pasillerositem.add(
PasillerosItemVO(
6,
R.drawable.ic_delivery_truck,
@@ -519,7 +532,7 @@ class PasilleroViewModel(context: Context) : BaseViewModel(context) {
R.string.titleDelivery,
contextApp.getString(R.string.titleDeliveryDescrip)
)
- )
+ )*/
//#tarea4021
/* _pasillerositem.add(
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/InitPreSacadorFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/InitPreSacadorFragment.kt
index 884cbadd..0d81a257 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/InitPreSacadorFragment.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/InitPreSacadorFragment.kt
@@ -85,14 +85,14 @@ class InitPreSacadorFragment(
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
iconAdd.tooltipText = getTooltip(R.drawable.ic_add_black_24dp)
- // Tarea 4731
- // iconPrint.tooltipText = getTooltip(R.drawable.ic_print_black_24dp)
+ iconPrint.tooltipText = getTooltip(R.drawable.ic_print_black_24dp)
}
listIcons.add(iconAdd)
- listIcons.add(iconPrint)
+ // Tarea 4731
+ //listIcons.add(iconPrint)
binding.mainToolbar.toolbarIcons.adapter =
ToolBarAdapterTooltip(listIcons, object : OnOptionsSelectedListener {
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorViewModel.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorViewModel.kt
index d7ab1516..f4a04e4e 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorViewModel.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorViewModel.kt
@@ -294,6 +294,27 @@ class UbicadorViewModel(val context: Context) : BaseViewModel(context) {
})
}
+ fun travel_updatePacking(
+ itemFk: Int,
+ packingFk: Int
+ ) {
+ silex.travel_updatePacking(itemFk, packingFk)
+ .enqueue(object : SilexCallback(context) {
+ override fun onError(t: Throwable) {
+ _response.value = ResponseItemVO(
+ isError = true,
+ errorMessage = getMessageFromAllResponse(nameofFunction(this), t.message!!)
+ )
+ }
+
+ override fun onSuccess(response: Response) {
+ _response.value =
+ ResponseItemVO(isError = false, response = response.message()!!)
+ }
+
+ })
+ }
+
fun itemShelving_return(
shelvingFk: String,
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 3e18a1c3..ef28f396 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -74,6 +74,7 @@
Indica la nueva cantidad y la acción que quieres realizar con el resto.
Basura
Indica nueva cantidad
+ Indica nuevo packing para el item :
Colección completa
Parking
Rechazar
@@ -549,5 +550,7 @@
Introduce el número de previa a imprimir
Imprimir
Elemento introducido no válido
+ Packing Holanda
+ Permite moficar el packing de los ítems de Holanda
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 4ef9ebb7..0f507705 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -391,6 +391,7 @@
Replacement
Consult item
Ubicator
+ Packing Holanda
Self-autoconsumption
Self-autoconsumption from your warehouse
Reubication
@@ -451,6 +452,7 @@
Allows parking tickets or cars
Search where an item is located
Allows you to locate/know the items in a wagoon
+ Allows you to modify packing of items in Holland
Allows you to relocate the items from a wagoon
Visualize that it is missing or misplaced
Allows to add faults to a worker
@@ -548,5 +550,6 @@
Address
Modify
It\'s not possible to update. Problem with the download of app
+ "Introduce new packing for the item : "