verdnatura/vn-warehouse
verdnatura
/
vn-warehouse
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Version 23.2Beta en scaleFusion

This commit is contained in:
Sergio De la torre 2023-01-09 12:36:51 +01:00
parent e52d7cb7e8
commit 7dfc775299
18 changed files with 129 additions and 248 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
.idea/deploymentTargetDropDown.xml Normal file
View File

@ -0,0 +1,17 @@
<?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>

74
.idea/workspace.xml
View File

@ -44,9 +44,9 @@
</shared> </shared>
</component> </component>
<component name="AndroidLogFilters"> <component name="AndroidLogFilters">
<option name="TOOL_WINDOW_CUSTOM_FILTER" value="verdnatura:" /> <option name="TOOL_WINDOW_CUSTOM_FILTER" value="verdnatura" />
<option name="TOOL_WINDOW_LOG_LEVEL" value="debug" /> <option name="TOOL_WINDOW_LOG_LEVEL" value="error" />
<option name="TOOL_WINDOW_CONFIGURED_FILTER" value="No Filters" /> <option name="TOOL_WINDOW_CONFIGURED_FILTER" value="verdnatura" />
<option name="TOOL_WINDOW_REGEXP_FILTER" value="false" /> <option name="TOOL_WINDOW_REGEXP_FILTER" value="false" />
</component> </component>
<component name="AutoImportSettings"> <component name="AutoImportSettings">
@ -83,58 +83,23 @@
</select> </select>
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="fa688d1c-dbee-4864-9e33-4d84ef9afca8" name="Default Changelist" comment="Version 9.7Beta. Versiones en servidor"> <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" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.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/build.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/app/build.gradle" 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/AndroidManifest.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" 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/GetAjustesUserCase.kt" beforeDir="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/GetBuscarItemAllUserCase.kt" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/GetBuscarItemUserCase.kt" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/GetClaimUserCase.kt" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/GetDayOfSaleUSerCase.kt" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/GetInventaryUserCase.kt" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/GetItemCardUserCase.kt" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/GetLoginUserCase.kt" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/GetPaletizadoresUserCase.kt" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/GetPreControladorUserCase.kt" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/GetPreSacadorUseCase.kt" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/GetQualityUserCase.kt" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/GetSacadorControladorUserCase.kt" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/GetShelvingParkingUserCase.kt" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/GetUbicadorUserCase.kt" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/GetVehicleControlTimeUserCase.kt" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/GetWokerMistakeUSerCase.kt" beforeDir="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/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/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/itemShelvingLogUSerCase.kt" beforeDir="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/testing/testPrint.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/testing/testPrint.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/collection/adapter/SaleAdapter.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/adapter/SaleAdapter.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/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/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/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/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/login/fragment/LoginViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/login/fragment/LoginViewModel.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/PackagingViewModel/SupplierViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/PackagingViewModel/SupplierViewModel.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/CmrExpeditionPalletFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/CmrExpeditionPalletFragment.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/CmrExpeditionPalletViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/CmrExpeditionPalletViewModel.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/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/ExpeditionPalletViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionPalletViewModel.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionScanSorterFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionScanSorterFragment.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionScanSorterViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionScanSorterViewModel.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionScanViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionScanViewModel.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionStateViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionStateViewModel.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionTruckListViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionTruckListViewModel.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/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/parking/fragment/ParkingViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/parking/fragment/ParkingViewModel.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/parkingSale/fragment/ParkingViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/parkingSale/fragment/ParkingViewModel.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/precontrol/PreControladorViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/precontrol/PreControladorViewModel.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/EndSacadorFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/EndSacadorFragment.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/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/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/reposicion/fragment/ReposicionViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/reposicion/fragment/ReposicionViewModel.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/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/shelvingparking/fragment/ShelvingParkingFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/shelvingparking/fragment/ShelvingParkingFragment.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/shelvingparking/fragment/ShelvingParkingViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/shelvingparking/fragment/ShelvingParkingViewModel.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/transferencia/fragment/TransferenciaViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/transferencia/fragment/TransferenciaViewModel.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/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/ubicador/fragment/UbicadorViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorViewModel.kt" afterDir="false" />
</list> </list>
@ -147,7 +112,7 @@
<component name="CodeInsightWorkspaceSettings"> <component name="CodeInsightWorkspaceSettings">
<option name="optimizeImportsOnTheFly" value="true" /> <option name="optimizeImportsOnTheFly" value="true" />
</component> </component>
<component name="ExecutionTargetManager" SELECTED_TARGET="device_and_snapshot_combo_box_target[19192521400686]" /> <component name="ExecutionTargetManager" SELECTED_TARGET="device_and_snapshot_combo_box_target[10.2.3.104:5555]" />
<component name="ExportToHTMLSettings"> <component name="ExportToHTMLSettings">
<option name="OPEN_IN_BROWSER" value="true" /> <option name="OPEN_IN_BROWSER" value="true" />
<option name="OUTPUT_DIRECTORY" value="C:\Program Files\Android\Android Studio\inspections" /> <option name="OUTPUT_DIRECTORY" value="C:\Program Files\Android\Android Studio\inspections" />
@ -931,9 +896,14 @@
<breakpoint-manager> <breakpoint-manager>
<breakpoints> <breakpoints>
<line-breakpoint enabled="true" suspend="THREAD" type="kotlin-line"> <line-breakpoint enabled="true" suspend="THREAD" type="kotlin-line">
<url>file://$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/SilexCallback.kt</url> <url>file://$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/controlvehiculo/fragment/ControlVehiculoFragment.kt</url>
<line>34</line> <line>362</line>
<option name="timeStamp" value="17" /> <option name="timeStamp" value="1" />
</line-breakpoint>
<line-breakpoint enabled="true" suspend="THREAD" type="kotlin-line">
<url>file://$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/controlvehiculo/fragment/ControlVehiculoViewModel.kt</url>
<line>123</line>
<option name="timeStamp" value="4" />
</line-breakpoint> </line-breakpoint>
</breakpoints> </breakpoints>
</breakpoint-manager> </breakpoint-manager>

22
app/build.gradle
View File

@ -13,12 +13,9 @@ android {
applicationId "es.verdnatura" applicationId "es.verdnatura"
minSdkVersion 24 //21 minSdkVersion 24 //21
targetSdkVersion 30 targetSdkVersion 30
versionCode 148 versionCode 151
//versionName = "9.4" versionCode 143 //versionName = "9.8Beta" version 148
//versionName = "9.5Beta" versionCode 143 versionName = "23.2Beta"
//versionName = "9.6Beta" version 144
//versionName = "9.7Beta" version 145
versionName = "9.8Beta"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
} }
@ -28,14 +25,15 @@ android {
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
} }
//package de la app general = "package_name": "es.verdnatura"
//package de la app beta = "package_name": "es.verdnatura.sfusion"
/*scaleFusion /*scaleFusion
//cambiar a beta "package_name": "es.verdnatura.beta" getByName("debug") {
getByName("debug") { applicationIdSuffix = ".debug"
applicationIdSuffix = ".debug" }*/
getByName("release") {
applicationIdSuffix = ".sfusion"
} }
getByName("release") {
applicationIdSuffix = ".release"
}*/
} }

6
app/release/output-metadata.json
View File

@ -4,15 +4,15 @@
"type": "APK", "type": "APK",
"kind": "Directory" "kind": "Directory"
}, },
"applicationId": "es.verdnatura", "applicationId": "es.verdnatura.sfusion",
"variantName": "release", "variantName": "release",
"elements": [ "elements": [
{ {
"type": "SINGLE", "type": "SINGLE",
"filters": [], "filters": [],
"attributes": [], "attributes": [],
"versionCode": 144, "versionCode": 151,
"versionName": "9.6Beta", "versionName": "23.2Beta",
"outputFile": "app-release.apk" "outputFile": "app-release.apk"
} }
], ],

3
app/src/main/java/es/verdnatura/domain/Extensions.kt
View File

@ -35,4 +35,7 @@ fun <T : Any> T?.notNull(f: (it: T) -> Unit) {
fun EditText.toInt(): Int { fun EditText.toInt(): Int {
return this.text.toString().toInt() return this.text.toString().toInt()
}
fun EditText.toLong(): Long {
return this.text.toString().toLong()
} }

86
app/src/main/java/es/verdnatura/domain/VerdnaturaService.kt
View File

@ -42,16 +42,16 @@ import retrofit2.http.POST
interface VerdnaturaService { interface VerdnaturaService {
//LOGIN ========================================================================> //LOGIN ========================================================================>
@POST("security/login")//REVISADA /* @POST("security/login")//REVISADA
fun login( fun login(
@Header("aplicacion") aplicacion: String, @Header("aplicacion") aplicacion: String,
@Header("version") version: String, @Header("version") version: String,
@Header("user") user: String, @Header("user") user: String,
@Header("pass") pass: String, @Header("pass") pass: String,
@Header("Content-Type") content_type: String, @Header("Content-Type") content_type: String,
@Body params: List<String> @Body params: List<String>
): ):
Call<String> Call<String>*/
@POST("security/device_checkLogin")//REVISADA @POST("security/device_checkLogin")//REVISADA
fun device_checkLogin( fun device_checkLogin(
@ -175,26 +175,15 @@ interface VerdnaturaService {
): ):
Call<List<CollectionVO>> Call<List<CollectionVO>>
/* @POST("almacennew/collectionNew")//NO SALIX
fun collectionNew(
@Header("aplicacion") aplicacion: String,
@Header("version") version: String,
@Header("user") user: String,
@Header("pass") pass: String,
@Header("Content-Type") content_type: String,
@Body params: List<String>
):
Call<String>*/
@POST("almacennew/collection_assign")//NO SALIX @POST("almacennew/collection_assign")//NO SALIX
fun collection_assign( fun collection_assign(
): ):
Call<String> Call<Any>
@POST("almacennew/operator_getItemPackingType")//NO SALIX @POST("almacennew/operator_getItemPackingType")//NO SALIX
fun operator_getItemPackingType( fun operator_getItemPackingType(
): ):
Call<String?> Call<Any?>
@POST("almacennew/worker_isF11Allowed")//NO SALIX @POST("almacennew/worker_isF11Allowed")//NO SALIX
fun worker_isF11Allowed( fun worker_isF11Allowed(
@ -257,18 +246,7 @@ interface VerdnaturaService {
fun collection_getUncheckedTicket( fun collection_getUncheckedTicket(
@Body vararg params: Any @Body vararg params: Any
): ):
Call<String> Call<Any>
@POST("almacennew/sip_getExtension")//REVISADA
fun sip_getExtension(
@Header("aplicacion") aplicacion: String,
@Header("version") version: String,
@Header("user") user: String,
@Header("pass") pass: String,
@Header("Content-Type") content_type: String,
@Body params: List<String>
):
Call<String>
//sergio: de momento se separa para ir viendo como funciona. El precontrol llamara a collectionTicketGet con otro parametro. //sergio: de momento se separa para ir viendo como funciona. El precontrol llamara a collectionTicketGet con otro parametro.
@POST("almacennew/collection_getTickets")//REVISADA @POST("almacennew/collection_getTickets")//REVISADA
@ -283,24 +261,12 @@ interface VerdnaturaService {
): ):
Call<CollectionVO> Call<CollectionVO>
@POST("almacennew/ticket_get")//REVISADA
fun ticket_get(
@Header("aplicacion") aplicacion: String,
@Header("version") version: String,
@Header("user") user: String,
@Header("pass") pass: String,
@Header("Content-Type") content_type: String,
@Body params: List<String>
):
Call<String>
@POST("almacennew/saleTrackingReplace")//REVISADA @POST("almacennew/saleTrackingReplace")//REVISADA
fun saleTrackingReplace( fun saleTrackingReplace(
@Body vararg params: Any @Body vararg params: Any
): ):
Call<Any> Call<Any>
@POST("almacennew/itemPlacementSupplyAiming")//REVISADA @POST("almacennew/itemPlacementSupplyAiming")//REVISADA
fun itemPlacementSupplyAiming( fun itemPlacementSupplyAiming(
@Body vararg params: Any @Body vararg params: Any
@ -714,7 +680,7 @@ interface VerdnaturaService {
fun qr_getCall( fun qr_getCall(
@Body vararg params: Any @Body vararg params: Any
): ):
Call<String> Call<Any>
//PALETIZADORES ========================================================================> //PALETIZADORES ========================================================================>
@ -864,7 +830,7 @@ interface VerdnaturaService {
fun expeditionState_addByPallet( fun expeditionState_addByPallet(
@Body vararg params: Any @Body vararg params: Any
): ):
Call<Unit> Call<Void>
@POST("almacennew/expeditionPallet_get")//REVISADA @POST("almacennew/expeditionPallet_get")//REVISADA
fun expeditionPallet_get( fun expeditionPallet_get(
@ -896,17 +862,6 @@ interface VerdnaturaService {
): ):
Call<Any> Call<Any>
//SMARTTAGS ========================================================================>
@POST("almacennew/workerShelving_add")//REVISADA
fun workerShelving_add(
@Header("aplicacion") aplicacion: String,
@Header("version") version: String,
@Header("user") user: String,
@Header("pass") pass: String,
@Header("Content-Type") content_type: String,
@Body params: List<String>
):
Call<Void>
@POST("almacennew/itemShelving_addByClaim")//REVISADA @POST("almacennew/itemShelving_addByClaim")//REVISADA
fun itemShelving_addByClaim( fun itemShelving_addByClaim(
@ -914,17 +869,6 @@ interface VerdnaturaService {
): ):
Call<Void> Call<Void>
/* @POST("almacennew/workerShelving_delete")//REVISADA
fun workerShelving_delete(
@Header("aplicacion") aplicacion: String,
@Header("version") version: String,
@Header("user") user: String,
@Header("pass") pass: String,
@Header("Content-Type") content_type: String,
@Body params: List<String>
):
Call<Void>*/
//SUPPLIERS //SUPPLIERS
@POST("almacennew/supplier_getItems")//REVISADA @POST("almacennew/supplier_getItems")//REVISADA
fun supplier_getItems( fun supplier_getItems(

4
app/src/main/java/es/verdnatura/presentation/view/feature/ajustes/fragment/AjustesViewModel.kt
View File

@ -418,7 +418,7 @@ class AjustesViewModel(val context: Context) : BaseViewModel(context) {
fun operator_getItemPackingType() { fun operator_getItemPackingType() {
silex.operator_getItemPackingType() silex.operator_getItemPackingType()
.enqueue(object : SilexCallback<String?>(context) { .enqueue(object : SilexCallback<Any?>(context) {
override fun onError(t: Throwable) { override fun onError(t: Throwable) {
_operatorGetItemPackingType.value = ResponseItemVO( _operatorGetItemPackingType.value = ResponseItemVO(
isError = true, isError = true,
@ -426,7 +426,7 @@ class AjustesViewModel(val context: Context) : BaseViewModel(context) {
) )
} }
override fun onSuccess(response: Response<String?>) { override fun onSuccess(response: Response<Any?>) {
_operatorGetItemPackingType.value = _operatorGetItemPackingType.value =
ResponseItemVO( ResponseItemVO(

9
app/src/main/java/es/verdnatura/presentation/view/feature/buscaritem/fragment/BuscarItemFragment.kt
View File

@ -9,7 +9,6 @@ import androidx.recyclerview.widget.LinearLayoutManager
import es.verdnatura.R import es.verdnatura.R
import es.verdnatura.databinding.FragmentBuscarItemBinding import es.verdnatura.databinding.FragmentBuscarItemBinding
import es.verdnatura.domain.notNull import es.verdnatura.domain.notNull
import es.verdnatura.domain.toInt
import es.verdnatura.presentation.base.BaseFragment import es.verdnatura.presentation.base.BaseFragment
import es.verdnatura.presentation.common.OnPasillerosItemClickListener import es.verdnatura.presentation.common.OnPasillerosItemClickListener
import es.verdnatura.presentation.view.feature.buscaritem.adapter.LocationAdapter import es.verdnatura.presentation.view.feature.buscaritem.adapter.LocationAdapter
@ -37,10 +36,10 @@ class BuscarItemFragment(
ma.hideBottomNavigation(GONE) ma.hideBottomNavigation(GONE)
binding.mainToolbar.toolbarTitle.text = getString(R.string.getubicaition) binding.mainToolbar.toolbarTitle.text = getString(R.string.getubicaition)
binding.editItemFk.inputType = android.text.InputType.TYPE_CLASS_NUMBER
setEvents() setEvents()
if (itemFk != null) { if (itemFk != null) {
getLocations(itemFk!! as Int) getLocations(itemFk!!)
} }
super.init() super.init()
} }
@ -52,7 +51,7 @@ class BuscarItemFragment(
if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0 || actionId == 5) { if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0 || actionId == 5) {
if (!binding.editItemFk.text.toString().isNullOrEmpty()) if (!binding.editItemFk.text.toString().isNullOrEmpty())
getLocations(binding.editItemFk.toInt()) getLocations(binding.editItemFk.text.toString())
binding.editItemFk.setText("") binding.editItemFk.setText("")
ma.hideKeyboard(binding.editItemFk) ma.hideKeyboard(binding.editItemFk)
return@setOnEditorActionListener true return@setOnEditorActionListener true
@ -67,7 +66,7 @@ class BuscarItemFragment(
} }
private fun getLocations(itemFk: Int) { private fun getLocations(itemFk: Any) {
this.itemFk = itemFk this.itemFk = itemFk
binding.splashProgress.visibility = View.VISIBLE binding.splashProgress.visibility = View.VISIBLE
viewModel.getLocations(itemFk) viewModel.getLocations(itemFk)

2
app/src/main/java/es/verdnatura/presentation/view/feature/buscaritem/fragment/BuscarItemViewModel.kt
View File

@ -25,7 +25,7 @@ class BuscarItemViewModel(val context: Context) : BaseViewModel(context) {
val loadLocationList = Transformations.map(_locationList) { Event(it) } val loadLocationList = Transformations.map(_locationList) { Event(it) }
fun getLocations(itemFk: Int) { fun getLocations(itemFk: Any) {
silex.searchItemsUbicador(itemFk) silex.searchItemsUbicador(itemFk)
.enqueue(object : SilexCallback<List<ItemLocationVO>>(context) { .enqueue(object : SilexCallback<List<ItemLocationVO>>(context) {
override fun onError(t: Throwable) { override fun onError(t: Throwable) {

8
app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionViewModel.kt
View File

@ -923,7 +923,7 @@ class CollectionViewModel(val context: Context) : BaseViewModel(context) {
silex.collection_getUncheckedTicket( silex.collection_getUncheckedTicket(
collectionFk collectionFk
).enqueue(object : ).enqueue(object :
SilexCallback<String>(context) { SilexCallback<Any>(context) {
override fun onError(t: Throwable) { override fun onError(t: Throwable) {
_responseCollectionUnchecked.value = ResponseItemVO( _responseCollectionUnchecked.value = ResponseItemVO(
isError = true, isError = true,
@ -931,18 +931,18 @@ class CollectionViewModel(val context: Context) : BaseViewModel(context) {
) )
} }
override fun onSuccess(response: Response<String>) { override fun onSuccess(response: Response<Any>) {
if (response.body() != null) { if (response.body() != null) {
_responseCollectionUnchecked.value = ResponseItemVO( _responseCollectionUnchecked.value = ResponseItemVO(
isError = false, isError = false,
response = response.body()!!, response = response.body()!!.toString(),
errorMessage = "" errorMessage = ""
) )
} else { } else {
_responseCollectionUnchecked.value = ResponseItemVO( _responseCollectionUnchecked.value = ResponseItemVO(
isError = true, isError = true,
response = response.body()!!, response = response.body()!!.toString(),
errorMessage = getMessageFromAllResponse( errorMessage = getMessageFromAllResponse(
nameofFunction(this), nameofFunction(this),
response.message() response.message()

5
app/src/main/java/es/verdnatura/presentation/view/feature/controlvehiculo/fragment/ControlVehiculoViewModel.kt
View File

@ -61,8 +61,9 @@ class ControlVehiculoViewModel(val context: Context) : BaseViewModel(context) {
_responseinsert.value = ResponseItemVO( _responseinsert.value = ResponseItemVO(
isError = false, isError = false,
errorMessage = getMessageFromAllResponse( errorMessage = getMessageFromAllResponse(
nameofFunction(this),response.message()), nameofFunction(this), response.message()
response=response.body().toString() ),
response = response.body().toString()
) )
} }

4
app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionPalletDetailViewModel.kt
View File

@ -114,7 +114,7 @@ class ExpeditionPalletDetailViewModel(var context: Context) : BaseViewModel(cont
vStateCode: String, vStateCode: String,
) { ) {
silex.expeditionState_addByPallet(vPalletFk, vStateCode).enqueue(object : SilexCallback<Unit>(context) { silex.expeditionState_addByPallet(vPalletFk, vStateCode).enqueue(object : SilexCallback<Void>(context) {
override fun onError(t: Throwable) { override fun onError(t: Throwable) {
_response.value = ResponseItemVO( _response.value = ResponseItemVO(
@ -123,7 +123,7 @@ class ExpeditionPalletDetailViewModel(var context: Context) : BaseViewModel(cont
) )
} }
override fun onSuccess(response: Response<Unit>) { override fun onSuccess(response: Response<Void>) {
_response.value = ResponseItemVO(isError = false, response = response.message()) _response.value = ResponseItemVO(isError = false, response = response.message())
} }
}) })

48
app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/PalletScanViewModel.kt
View File

@ -3,13 +3,12 @@ package es.verdnatura.presentation.view.feature.paletizador.fragment
import android.content.Context import android.content.Context
import androidx.lifecycle.LiveData import androidx.lifecycle.LiveData
import androidx.lifecycle.MutableLiveData import androidx.lifecycle.MutableLiveData
import es.verdnatura.domain.SilexCallback
import es.verdnatura.presentation.base.BaseViewModel import es.verdnatura.presentation.base.BaseViewModel
import es.verdnatura.presentation.base.getMessageFromAllResponse import es.verdnatura.presentation.base.getMessageFromAllResponse
import es.verdnatura.presentation.base.nameofFunction import es.verdnatura.presentation.base.nameofFunction
import es.verdnatura.presentation.common.ResponseItemVO import es.verdnatura.presentation.common.ResponseItemVO
import es.verdnatura.presentation.view.feature.paletizador.model.ItemExpeditionTruckVO import es.verdnatura.presentation.view.feature.paletizador.model.ItemExpeditionTruckVO
import retrofit2.Call
import retrofit2.Callback
import retrofit2.Response import retrofit2.Response
@ -33,8 +32,8 @@ class PalletScanViewModel(val context: Context) : BaseViewModel(context) {
vPalletId, vPalletId,
vStatePallet vStatePallet
) )
.enqueue(object : Callback<Unit> { .enqueue(object : SilexCallback<Void>(context) {
override fun onFailure(call: Call<Unit>, t: Throwable) { override fun onError(t: Throwable) {
_responseScan.value = ResponseItemVO( _responseScan.value = ResponseItemVO(
isError = true, isError = true,
@ -42,21 +41,10 @@ class PalletScanViewModel(val context: Context) : BaseViewModel(context) {
) )
} }
override fun onResponse(call: Call<Unit>, response: Response<Unit>) { override fun onSuccess(response: Response<Void>) {
if (!response.isSuccessful) {
_responseScan.value = ResponseItemVO(
isError = true,
errorMessage = getMessageFromAllResponse(
nameofFunction(this),
response.message()
)
)
} else {
_responseScan.value =
ResponseItemVO(isError = false, response = response.message()!!)
}
_responseScan.value =
ResponseItemVO(isError = false, response = response.message()!!)
} }
}) })
@ -64,8 +52,8 @@ class PalletScanViewModel(val context: Context) : BaseViewModel(context) {
fun expeditionPallet_get(vPalletId: Int) { fun expeditionPallet_get(vPalletId: Int) {
silex.expeditionPallet_get(vPalletId) silex.expeditionPallet_get(vPalletId)
.enqueue(object : Callback<ItemExpeditionTruckVO> { .enqueue(object : SilexCallback<ItemExpeditionTruckVO>(context) {
override fun onFailure(call: Call<ItemExpeditionTruckVO>, t: Throwable) { override fun onError(t: Throwable) {
_responsePalletGet.value = ItemExpeditionTruckVO( _responsePalletGet.value = ItemExpeditionTruckVO(
0, 0,
@ -74,24 +62,10 @@ class PalletScanViewModel(val context: Context) : BaseViewModel(context) {
) )
} }
override fun onResponse( override fun onSuccess(response: Response<ItemExpeditionTruckVO>) {
call: Call<ItemExpeditionTruckVO>,
response: Response<ItemExpeditionTruckVO>
) {
if (!response.isSuccessful) { _responsePalletGet.value =
_responsePalletGet.value = ItemExpeditionTruckVO( response.body()!!
0,
isError = true,
errorMessage = getMessageFromAllResponse(
nameofFunction(this),
response.message()
)
)
} else {
_responsePalletGet.value =
response.body()!!
}
} }

4
app/src/main/java/es/verdnatura/presentation/view/feature/qr/QrFragmentViewModel.kt
View File

@ -21,7 +21,7 @@ class QrFragmentViewModel(var context: Context) : BaseViewModel(context) {
fun qr_getCall(vStatement: String) { fun qr_getCall(vStatement: String) {
silex.qr_getCall(vStatement) silex.qr_getCall(vStatement)
.enqueue(object : SilexCallback<String>(context) { .enqueue(object : SilexCallback<Any>(context) {
override fun onError(t: Throwable) { override fun onError(t: Throwable) {
_qrresponse.value = ResponseItemVO( _qrresponse.value = ResponseItemVO(
isError = true, isError = true,
@ -29,7 +29,7 @@ class QrFragmentViewModel(var context: Context) : BaseViewModel(context) {
) )
} }
override fun onSuccess(response: Response<String>) { override fun onSuccess(response: Response<Any>) {
if (response.raw().code() == 555 || response.raw().code() == 403) { if (response.raw().code() == 555 || response.raw().code() == 403) {

6
app/src/main/java/es/verdnatura/presentation/view/feature/sacador/fragment/SacadorViewModel.kt
View File

@ -78,7 +78,7 @@ class SacadorViewModel(val context: Context) : BaseViewModel(context) {
fun collection_assign() { fun collection_assign() {
silex.collection_assign().enqueue( silex.collection_assign().enqueue(
object : object :
SilexCallback<String>(context) { SilexCallback<Any>(context) {
override fun onError(t: Throwable) { override fun onError(t: Throwable) {
_response.value = _response.value =
ResponseItemVO( ResponseItemVO(
@ -90,10 +90,10 @@ class SacadorViewModel(val context: Context) : BaseViewModel(context) {
) )
} }
override fun onSuccess(response: Response<String>) { override fun onSuccess(response: Response<Any>) {
if (response.body() != null) { if (response.body() != null) {
_response.value = _response.value =
ResponseItemVO(isError = false, response = response.body()!!) ResponseItemVO(isError = false, response = response.body()!!.toString())
} else { } else {
_response.value = ResponseItemVO( _response.value = ResponseItemVO(

65
app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/adapter/UbicadorAdapter.kt
View File

@ -1,13 +1,13 @@
package es.verdnatura.presentation.view.feature.ubicador.adapter package es.verdnatura.presentation.view.feature.ubicador.adapter
import android.annotation.SuppressLint import android.annotation.SuppressLint
import android.graphics.Color.RED
import android.view.LayoutInflater import android.view.LayoutInflater
import android.view.ViewGroup import android.view.ViewGroup
import androidx.core.content.ContextCompat import androidx.core.content.ContextCompat
import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.RecyclerView
import es.verdnatura.R import es.verdnatura.R
import es.verdnatura.databinding.ItemUbicationRowBinding import es.verdnatura.databinding.ItemUbicationRowBinding
import es.verdnatura.domain.notNull
import es.verdnatura.presentation.common.OnMoreClickListener import es.verdnatura.presentation.common.OnMoreClickListener
import es.verdnatura.presentation.common.OnPasillerosItemClickListener import es.verdnatura.presentation.common.OnPasillerosItemClickListener
import es.verdnatura.presentation.common.OnVisibleClickListener import es.verdnatura.presentation.common.OnVisibleClickListener
@ -88,14 +88,23 @@ class UbicadorAdapter(
) )
} }
/* if (item.checked) { if (item.isChecked!=null){
itemRowLayout.setBackgroundColor(
ContextCompat.getColor( when (item.isChecked!!.toInt()){
visibleText.context, 0 -> itemRowLayout.setBackgroundColor(
R.color.verdnatura_dark_green_verdnatura ContextCompat.getColor(
) visibleText.context,
) R.color.verdnatura_red_salix
} else { ))
in 1..Int.MAX_VALUE -> itemRowLayout.setBackgroundColor(
ContextCompat.getColor(
visibleText.context,
R.color.verdnatura_dark_green_verdnatura
))
}
}else{
itemRowLayout.setBackgroundColor( itemRowLayout.setBackgroundColor(
ContextCompat.getColor( ContextCompat.getColor(
visibleText.context, visibleText.context,
@ -103,44 +112,6 @@ class UbicadorAdapter(
) )
) )
} }
if (item.isNew) {
itemRowLayout.setBackgroundColor(
ContextCompat.getColor(
visibleText.context,
R.color.verdnatura_red_salix
))
}*/
when (item.isChecked) {
1 -> {
itemRowLayout.setBackgroundColor(
ContextCompat.getColor(
visibleText.context,
R.color.verdnatura_dark_green_verdnatura
)
)
}
0 -> {
itemRowLayout.setBackgroundColor(
ContextCompat.getColor(
visibleText.context,
R.color.verdnatura_red_salix
)
)
}
null -> {
itemRowLayout.setBackgroundColor(
ContextCompat.getColor(
visibleText.context,
R.color.verdnatura_black_5
)
)
}
}
} }
} }

9
app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorFragment.kt
View File

@ -112,7 +112,7 @@ class UbicadorFragment(
iconReload.setImageResource(R.drawable.ic_autorenew_black_24dp) iconReload.setImageResource(R.drawable.ic_autorenew_black_24dp)
//binding.mainToolbar.switchButton.visibility = VISIBLE // binding.mainToolbar.switchButton.visibility = VISIBLE
binding.mainToolbar.switchButton.setOnCheckedChangeListener { buttonView, isChecked -> binding.mainToolbar.switchButton.setOnCheckedChangeListener { buttonView, isChecked ->
if (binding.mainToolbar.toolbarTitle.text == getString(R.string.titleUbicator)) { if (binding.mainToolbar.toolbarTitle.text == getString(R.string.titleUbicator)) {
ma.messageWithSound(getString(R.string.scanShelving), false, false) ma.messageWithSound(getString(R.string.scanShelving), false, false)
@ -362,8 +362,7 @@ class UbicadorFragment(
customDialog.setTitle(getString(R.string.empty)) customDialog.setTitle(getString(R.string.empty))
.setDescription(getString(R.string.operationNoReturn)) .setDescription(getString(R.string.operationNoReturn))
.setOkButton(getString(R.string.empty)) { .setOkButton(getString(R.string.empty)) {
viewModel.clearShelvingList( viewModel.clearShelvingList(shelvingFk
shelvingFk
) )
listItems.forEach { listItems.forEach {
it.stickers = "0" it.stickers = "0"
@ -602,7 +601,7 @@ class UbicadorFragment(
} }
saveNewItem( saveNewItem(
customDialogUbicador.getItemValue().toInt(), customDialogUbicador.getItemValue().toInt(),
customDialogUbicador.getEtiquetaValue().toInt(), if (customDialogUbicador.getEtiquetaValue().isNullOrEmpty()) {1}else{customDialogUbicador.getEtiquetaValue().toInt()},
if (customDialogUbicador.getPackingValue().isNullOrEmpty()) { if (customDialogUbicador.getPackingValue().isNullOrEmpty()) {
null null
} else { } else {
@ -677,7 +676,7 @@ class UbicadorFragment(
}, },
if (delete) packingUpdate else null, if (delete) packingUpdate else null,
itemUbicador.id, itemUbicador.id,
customDialogUbicador.getGroupingValue().toInt() if (customDialogUbicador.getGroupingValue().isNullOrEmpty()) {null}else{customDialogUbicador.getGroupingValue().toInt()}
) )
return@setOnEditorActionListener true return@setOnEditorActionListener true
} }

5
app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorViewModel.kt
View File

@ -250,6 +250,11 @@ class UbicadorViewModel(val context: Context) : BaseViewModel(context) {
) )
} }
override fun onSuccess(response: Response<Any>) {
_response.value =
ResponseItemVO(isError = false, response = response.message()!!)
}
}) })
} }