version 23.10 General
This commit is contained in:
parent
f8efe73da7
commit
2cfc560649
|
|
@ -84,9 +84,15 @@
|
|||
</component>
|
||||
<component name="ChangeListManager">
|
||||
<list default="true" id="fa688d1c-dbee-4864-9e33-4d84ef9afca8" name="Default Changelist" comment="refs #4731 print">
|
||||
<change afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/packingHolland/fragment/PackingHollandFragment.kt" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/packingHolland/fragment/PackingHollandViewModel.kt" afterDir="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/src/main/java/es/verdnatura/di/viewModelModule.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/di/viewModelModule.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/pasillero/fragment/PasilleroViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/pasillero/fragment/PasilleroViewModel.kt" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/InitPreSacadorFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/InitPreSacadorFragment.kt" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/PreSacadorViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/PreSacadorViewModel.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/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" />
|
||||
</list>
|
||||
|
|
@ -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 @@
|
|||
</component>
|
||||
<component name="RecentsManager">
|
||||
<key name="CopyFile.RECENT_KEYS">
|
||||
<recent name="C:\Users\sergiodt\AndroidStudioProjects\vn-warehouseManager\app\src\main\java\es\verdnatura\presentation\view\feature" />
|
||||
<recent name="C:\Users\sergiodt\AndroidStudioProjects\vn-warehouseManager\app\src\main\res\drawable" />
|
||||
<recent name="C:\Users\sergiodt\AndroidStudioProjects\vn-warehouseManager\app\src\main\res\layout" />
|
||||
<recent name="C:\Users\sergiodt\AndroidStudioProjects\vn-warehouseManager\app\src\main\res\drawable-v24" />
|
||||
<recent name="C:\Users\sergiodt\AndroidStudioProjects\vn-warehouseManager\app\src\main\res\raw" />
|
||||
<recent name="C:\Users\sergiodt\AndroidStudioProjects\vn-warehouseManager\app\src\main\java\es\verdnatura\presentation\view\feature" />
|
||||
</key>
|
||||
<key name="MoveFile.RECENT_KEYS">
|
||||
<recent name="C:\Users\sergiodt\AndroidStudioProjects\vn-warehouseManager\app\src\main\res\drawable" />
|
||||
|
|
@ -278,13 +284,14 @@
|
|||
<recent name="C:\Users\sergiodt\AndroidStudioProjects\vn-warehouseManager\app\src\main\res\font" />
|
||||
</key>
|
||||
<key name="MoveKotlinTopLevelDeclarationsDialog.RECENTS_KEY">
|
||||
<recent name="es.verdnatura.presentation.view.feature.packingHolland.fragment" />
|
||||
<recent name="es.verdnatura.presentation.view.feature.packaging.fragment.SupplierViewModel" />
|
||||
<recent name="es.verdnatura.presentation.view.feature.workermistake.fragment" />
|
||||
<recent name="es.verdnatura.presentation.view.feature.historicoshelving.fragment" />
|
||||
<recent name="es.verdnatura.presentation.view.feature.buffer.fragment" />
|
||||
<recent name="es.verdnatura.presentation.view.feature.smarttag.register" />
|
||||
</key>
|
||||
<key name="CopyKotlinDeclarationDialog.RECENTS_KEY">
|
||||
<recent name="es.verdnatura.presentation.view.feature.packingHolland" />
|
||||
<recent name="es.verdnatura.domain" />
|
||||
<recent name="es.verdnatura.presentation.view.feature.packaging.fragment" />
|
||||
<recent name="es.verdnatura.presentation.view.component" />
|
||||
|
|
@ -398,13 +405,6 @@
|
|||
<option name="presentableId" value="Default" />
|
||||
<updated>1618825571576</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00072" summary="Version 9Beta-Tarea3420">
|
||||
<created>1662982877783</created>
|
||||
<option name="number" value="00072" />
|
||||
<option name="presentableId" value="LOCAL-00072" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1662982877783</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00073" summary="Version 9Beta-Borrados comentarios">
|
||||
<created>1663050116723</created>
|
||||
<option name="number" value="00073" />
|
||||
|
|
@ -741,7 +741,14 @@
|
|||
<option name="project" value="LOCAL" />
|
||||
<updated>1679905259957</updated>
|
||||
</task>
|
||||
<option name="localTasksCounter" value="121" />
|
||||
<task id="LOCAL-00121" summary="refs #4731 print">
|
||||
<created>1679917077712</created>
|
||||
<option name="number" value="00121" />
|
||||
<option name="presentableId" value="LOCAL-00121" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1679917077712</updated>
|
||||
</task>
|
||||
<option name="localTasksCounter" value="122" />
|
||||
<servers />
|
||||
</component>
|
||||
<component name="Vcs.Log.History.Properties">
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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())
|
||||
}
|
||||
}
|
||||
|
|
@ -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(
|
||||
|
|
|
|||
|
|
@ -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 {
|
||||
|
|
|
|||
|
|
@ -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<Any>(context) {
|
||||
override fun onError(t: Throwable) {
|
||||
_response.value = ResponseItemVO(
|
||||
isError = true,
|
||||
errorMessage = getMessageFromAllResponse(nameofFunction(this), t.message!!)
|
||||
)
|
||||
}
|
||||
|
||||
override fun onSuccess(response: Response<Any>) {
|
||||
_response.value =
|
||||
ResponseItemVO(isError = false, response = response.message()!!)
|
||||
}
|
||||
|
||||
})
|
||||
}
|
||||
|
||||
fun itemShelving_return(
|
||||
shelvingFk: String,
|
||||
|
||||
|
|
|
|||
|
|
@ -74,6 +74,7 @@
|
|||
<string name="txtnuevacantidad">Indica la nueva cantidad y la acción que quieres realizar con el resto.</string>
|
||||
<string name="BasuraRechazar">Basura</string>
|
||||
<string name="Indicanuevacantidad">Indica nueva cantidad</string>
|
||||
<string name="packingQuantity">Indica nuevo packing para el item :</string>
|
||||
<string name="Coleccióncompleta">Colección completa</string>
|
||||
<string name="Parking">Parking</string>
|
||||
<string name="Reject">Rechazar</string>
|
||||
|
|
@ -549,5 +550,7 @@
|
|||
<string name="printPreviousGroup">Introduce el número de previa a imprimir</string>
|
||||
<string name="print">Imprimir</string>
|
||||
<string name="errorInput">Elemento introducido no válido</string>
|
||||
<string name="titlePackingHolland">Packing Holanda</string>
|
||||
<string name="titlePackingHollandDescrip">Permite moficar el packing de los ítems de Holanda</string>
|
||||
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -391,6 +391,7 @@
|
|||
<string name="titleReplacement">Replacement</string>
|
||||
<string name="titleItemConsult">Consult item</string>
|
||||
<string name="titleUbicator">Ubicator</string>
|
||||
<string name="titlePackingHolland">Packing Holanda</string>
|
||||
<string name="titleSelfConsumption">Self-autoconsumption</string>
|
||||
<string name="titleSelfDescription">Self-autoconsumption from your warehouse</string>
|
||||
<string name="titleReUbicator">Reubication</string>
|
||||
|
|
@ -451,6 +452,7 @@
|
|||
<string name="titleParkingDescrip">Allows parking tickets or cars</string>
|
||||
<string name="titleItemSearchDescrip">Search where an item is located</string>
|
||||
<string name="titleUbicatorDescrip">Allows you to locate/know the items in a wagoon</string>
|
||||
<string name="titlePackingHollandDescrip">Allows you to modify packing of items in Holland</string>
|
||||
<string name="titleReubicatorDescrip">Allows you to relocate the items from a wagoon</string>
|
||||
<string name="titleInventoryDescrip">Visualize that it is missing or misplaced</string>
|
||||
<string name="titleWorkerMistakeDescrip">Allows to add faults to a worker</string>
|
||||
|
|
@ -548,5 +550,6 @@
|
|||
<string name="adress">Address</string>
|
||||
<string name="modify">Modify</string>
|
||||
<string name="problemUpdate">It\'s not possible to update. Problem with the download of app</string>
|
||||
<string name="packingQuantity">"Introduce new packing for the item : "</string>
|
||||
|
||||
</resources>
|
||||
|
|
|
|||
Loading…
Reference in New Issue