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

Version 9.6Beta en test

This commit is contained in:
Sergio De la torre 2022-11-24 08:41:10 +01:00
parent 3b8b5e5535
commit b8d0f76adf
42 changed files with 285 additions and 661 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.idea/misc.xml
View File

@ -129,6 +129,7 @@
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable/ic_swap_horiz_black_24dp.xml" value="0.11979166666666667" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable/ic_ticket.xml" value="0.1705" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable/ic_transaction.xml" value="0.22708333333333333" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable/ic_ubicator_check.xml" value="0.2295" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable/ic_verified_user_black_24dp.xml" value="0.1" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable/ic_verified_user_black_24dp_selected.xml" value="0.1" />
<entry key="..\:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable/ic_visibility.xml" value="0.1775" />

82
.idea/workspace.xml
View File

@ -82,70 +82,50 @@
</select>
</component>
<component name="ChangeListManager">
<list default="true" id="fa688d1c-dbee-4864-9e33-4d84ef9afca8" name="Default Changelist" comment="Version 9.6Beta Cambiadas llamadas y campos( collectionFk). Borrado Presacador">
<list default="true" id="fa688d1c-dbee-4864-9e33-4d84ef9afca8" name="Default Changelist" comment="Version 9.6Beta suppliers">
<change afterPath="$PROJECT_DIR$/app/src/main/res/drawable/ic_ubicator_check.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.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/release/output-metadata.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/release/output-metadata.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/release/vn-picking.apk" beforeDir="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/ApiNodeJsUtils.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/GetItemCardUserCase.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/GetItemCardUserCase.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/GetPackagingUserCase.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/GetPackagingUserCase.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/GetLoginUserCase.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/GetLoginUserCase.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/GetPackagingUserCase.kt" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/GetPreSacadorUseCase.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/GetPreSacadorUseCase.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/GetQrReaderUserCase.kt" beforeDir="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/GetSmarttagsUserCase.kt" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/GetVehicleControlTimeUserCase.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/GetVehicleControlTimeUserCase.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/NodeJsService.kt" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/RestClient.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/RestClient.kt" afterDir="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/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/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/articulo/fragment/ItemCardFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/fragment/ItemCardFragment.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/articulo/fragment/ItemCardViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/fragment/ItemCardViewModel.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/calidad/fragment/BuyersViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/calidad/fragment/BuyersViewModel.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/articulo/fragment/ItemProposalFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/fragment/ItemProposalFragment.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/CollectionVO.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/CollectionVO.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/collection/fragment/ShowTicketFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/ShowTicketFragment.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/controlador/fragment/ControladorFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/controlador/fragment/ControladorFragment.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/controlador/fragment/ControladorViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/controlador/fragment/ControladorViewModel.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/controlvehiculo/fragment/ControlVehiculoFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/controlvehiculo/fragment/ControlVehiculoFragment.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/controlvehiculo/fragment/ControlVehiculoUsuarioFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/controlvehiculo/fragment/ControlVehiculoUsuarioFragment.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/diadeventa/fragment/DayOfSaleViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/diadeventa/fragment/DayOfSaleViewModel.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/historicovehiculo/fragment/HistoricoVehiculoFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/historicovehiculo/fragment/HistoricoVehiculoFragment.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/historicovehiculo/fragment/HistoricoVehiculoViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/historicovehiculo/fragment/HistoricoVehiculoViewModel.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/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/main/activity/MainActivity.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/main/activity/MainActivity.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/PackagingCountFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/PackagingCountFragment.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/packaging/fragment/SupplierFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/SupplierFragment.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/precontrol/PreControladorFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/precontrol/PreControladorFragment.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/adapter/PreSacadorAdapter.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/adapter/PreSacadorAdapter.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/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/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/PreSacadorFragment.kt" beforeDir="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/presacador/model/PreSacadorItemVO.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/model/PreSacadorItemVO.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/reposicion/adapter/ReposicionAdapter.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/reposicion/adapter/ReposicionAdapter.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/reposicion/fragment/ReposicionFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/reposicion/fragment/ReposicionFragment.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/qr/QrFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/qr/QrFragment.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/reubication/fragment/ReubicationCollectionFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/reubication/fragment/ReubicationCollectionFragment.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/reubication/fragment/ReubicationFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/reubication/fragment/ReubicationFragment.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/reubication/model/Reubication.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/reubication/model/Reubication.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/sacador/fragment/SacadorFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/sacador/fragment/SacadorFragment.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/model/TicketItemVO.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/sacador/model/TicketItemVO.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/showticket/ShowTicketFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/showticket/ShowTicketFragment.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/showticket/ShowTicketViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/showticket/ShowTicketViewModel.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/smarttag/register/RegisterSmartTagsFragment.kt" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/smarttag/sacador/fragment/AssociateSmartTagsFragment.kt" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/smarttag/sacador/fragment/SmartTagsViewModel.kt" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/smarttag/sacador/model/SmartTagAdapter.kt" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/smarttag/sacador/model/SmartTagScan.kt" beforeDir="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/res/layout/item_article_row.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/item_article_row.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/item_article_row_fragment.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/item_article_row_fragment.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/item_article_row_presacador.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/item_article_row_presacador.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/item_collection_row.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/item_collection_row.xml" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -338,11 +318,11 @@
<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" />
<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\res\assets" />
<recent name="C:\Users\sergiodt\AndroidStudioProjects\vn-warehouseManager\app\src\main\res\font" />
<recent name="C:\Users\sergiodt\AndroidStudioProjects\vn-warehouseManager\app\src\main\res\drawable" />
</key>
<key name="MoveKotlinTopLevelDeclarationsDialog.RECENTS_KEY">
<recent name="es.verdnatura.presentation.view.feature.packaging.fragment.SupplierViewModel" />
@ -464,13 +444,6 @@
<option name="presentableId" value="Default" />
<updated>1618825571576</updated>
</task>
<task id="LOCAL-00048" summary="Version 8, impresora obligatoria, controlador se desplaza al pulsar, Ubicar Reclamación y líneas controlador = orden saca el sacador">
<created>1649234340659</created>
<option name="number" value="00048" />
<option name="presentableId" value="LOCAL-00048" />
<option name="project" value="LOCAL" />
<updated>1649234340659</updated>
</task>
<task id="LOCAL-00049" summary="Version 8, impresora obligatoria, controlador se desplaza al pulsar, Ubicar Reclamación y líneas controlador = orden saca el sacador">
<created>1649235060928</created>
<option name="number" value="00049" />
@ -807,7 +780,14 @@
<option name="project" value="LOCAL" />
<updated>1669105520910</updated>
</task>
<option name="localTasksCounter" value="97" />
<task id="LOCAL-00097" summary="Version 9.6Beta Cambiadas llamadas y campos( collectionFk). Borrado Presacador">
<created>1669186502340</created>
<option name="number" value="00097" />
<option name="presentableId" value="LOCAL-00097" />
<option name="project" value="LOCAL" />
<updated>1669186502342</updated>
</task>
<option name="localTasksCounter" value="98" />
<servers />
</component>
<component name="Vcs.Log.History.Properties">
@ -849,7 +829,7 @@
<entry key="branch">
<value>
<list>
<option value="master" />
<option value="test" />
</list>
</value>
</entry>

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

@ -1,6 +1,7 @@
package es.verdnatura.domain
import android.content.Context
import android.widget.EditText
import android.widget.Toast
fun Any.toast(context: Context?, duration: Int = Toast.LENGTH_SHORT): Toast {
@ -10,3 +11,7 @@ fun Any.toast(context: Context?, duration: Int = Toast.LENGTH_SHORT): Toast {
fun <T : Any> T?.notNull(f: (it: T) -> Unit) {
if (this != null) f(this)
}
fun EditText.toInt(): Int {
return this.text.toString().toInt()
}

4
app/src/main/java/es/verdnatura/domain/GetItemCardUserCase.kt
View File

@ -30,7 +30,7 @@ class GetItemCardUserCase(context: Context) : RestClient(context) {
)
}
fun item_getSimilar(
/* fun item_getSimilar(
usuario: String,
password: String,
itemFk: String,
@ -52,7 +52,7 @@ class GetItemCardUserCase(context: Context) : RestClient(context) {
"application/json",
params = params
)
}
}*/
fun getItemPackingType(usuario: String, password: String): Call<List<ItemPackingType>> {
val params: ArrayList<String> = ArrayList()

4
app/src/main/java/es/verdnatura/domain/GetLoginUserCase.kt
View File

@ -97,10 +97,10 @@ class GetLoginUserCase(context: Context) : RestClient(context) {
)
}
fun operator_add(usuario: String, password: String): Call<Any> {
/*fun operator_add(usuario: String, password: String): Call<Any> {
return restClient!!.operator_add("json", "1", usuario, password, "application/json")
}
}*/
fun worker_getPrinter(usuario: String, password: String): Call<List<Printers>> {

54
app/src/main/java/es/verdnatura/domain/GetPackagingUserCase.kt
View File

@ -1,54 +0,0 @@
package es.verdnatura.domain
import android.content.Context
import es.verdnatura.presentation.view.feature.packaging.model.EntrySalix
import es.verdnatura.presentation.view.feature.packaging.model.ItemSupplier
import es.verdnatura.presentation.view.feature.packaging.model.Supplier
import retrofit2.Call
class GetPackagingUserCase(context: Context) : RestClient(context) {
fun getSuppliers(token: String): Call<List<Supplier>> {
return salixClient!!.getSuppliers()
}
fun Entries(token: String, entry: EntrySalix): Call<EntrySalix> {
return salixClient!!.Entries(entry = entry)
}
fun faultsReview_isChecked(
usuario: String,
password: String,
itemFk: String,
warehouseFk: String
): Call<Any> {
val params: ArrayList<String> = ArrayList()
params.add(itemFk)
params.add(warehouseFk)
return restClient!!.faultsReview_isChecked(
"json",
"1",
usuario,
password,
"application/json",
params = params
)
}
/* fun itemShelvingBuyerGet(): Call<List<BuyerVO>> {
return restClient!!.itemShelvingBuyerGet()
}*/
fun supplier_getItems(
usuario: String,
password: String,
supplierFk: String
): Call<List<ItemSupplier>> {
val params: ArrayList<String> = ArrayList()
params.add(supplierFk)
return restClient!!.supplier_getItems(
supplierFk
)
}
}

4
app/src/main/java/es/verdnatura/domain/GetPreSacadorUseCase.kt
View File

@ -120,9 +120,9 @@ class GetPreSacadorUseCase(context: Context) : RestClient(context) {
}
fun sectorCollection_get(usuario: String, password: String): Call<List<CollectionVO>> {
/* fun sectorCollection_get(usuario: String, password: String): Call<List<CollectionVO>> {
return restClient!!.sectorCollection_get("json", "1", usuario, password, "application/json")
}
}*/
fun sectorCollection_getSale(
sectorCollectionFK: Int,

26
app/src/main/java/es/verdnatura/domain/GetQrReaderUserCase.kt
View File

@ -1,26 +0,0 @@
package es.verdnatura.domain
import android.content.Context
import retrofit2.Call
class GetQrReaderUserCase(context: Context) : RestClient(context) {
fun qr_getCall(
usuario: String,
password: String,
call: String
): Call<String> {
val params: ArrayList<String> = ArrayList()
params.add(call)
return restClient!!.qr_getCall(
"json",
"1",
usuario,
password,
"application/json",
params = params
)
}
}

51
app/src/main/java/es/verdnatura/domain/GetSacadorControladorUserCase.kt
View File

@ -2,8 +2,6 @@ package es.verdnatura.domain
import android.content.Context
import es.verdnatura.presentation.view.feature.collection.SalixSaleQuantity
import es.verdnatura.presentation.view.feature.collection.listSaleSalix
import es.verdnatura.presentation.view.feature.collection.saleSalix
import es.verdnatura.presentation.view.feature.sacador.model.CollectionVO
import es.verdnatura.presentation.view.feature.sacador.model.MistakeTypeVO
import es.verdnatura.presentation.view.feature.sacador.model.PlacementSupplyVO
@ -29,7 +27,8 @@ class GetSacadorControladorUserCase(context: Context) : RestClient(context) {
type: String
): Call<CollectionVO> {
return restClient!!.collection_getTickets(collectionFk,sectorFk,print,type
return restClient!!.collection_getTickets(
collectionFk, sectorFk, print, type
)
}
@ -41,7 +40,8 @@ class GetSacadorControladorUserCase(context: Context) : RestClient(context) {
type: String
): Call<CollectionVO> {
return restClient!!.collection_get(collectionFk,sectorFk,print,type
return restClient!!.collection_get(
collectionFk, sectorFk, print, type
)
}
@ -286,7 +286,7 @@ class GetSacadorControladorUserCase(context: Context) : RestClient(context) {
val params: ArrayList<Any> = ArrayList()
params.add(collectionFk)
labelCount?.let {
params.add(labelCount)
params.add(labelCount)
}
return restClient!!.collectionStickerPrint(
@ -449,7 +449,8 @@ class GetSacadorControladorUserCase(context: Context) : RestClient(context) {
state: String
): Call<Unit> {
return restClient!!.ticket_setState( ticketFk, state
return restClient!!.ticket_setState(
ticketFk, state
)
}
@ -510,29 +511,29 @@ class GetSacadorControladorUserCase(context: Context) : RestClient(context) {
)
}
fun transferSalesSalix(
/* fun transferSalesSalix(
token: String,
ticketFk: String,
saleFk: String,
quantity: String,
token: String,
ticketFk: String,
saleFk: String,
quantity: String,
): Call<Any> {
): Call<Any> {
var saleTransfer = listSaleSalix(mutableListOf())
saleTransfer.sales.add(saleSalix(id = saleFk.toInt(), quantity = quantity.toInt()))
var saleTransfer = listSaleSalix(arrayListOf())
saleTransfer.sales.add(saleSalix(id = saleFk.toInt(), quantity = quantity.toInt()))
return salixClient!!.transferSalesSalix(
"json",
"1",
token,
"application/json",
ticketFk,
saleTransfer
return salixClient!!.transferSalesSalix(
"json",
"1",
token,
"application/json",
ticketFk,
saleTransfer
)
}
)
}*/
fun collectionIncreaseQuantitySalix(
@ -574,9 +575,9 @@ class GetSacadorControladorUserCase(context: Context) : RestClient(context) {
)
}
fun mistakeType(usuario: String, password: String): Call<List<MistakeTypeVO>> {
/* fun mistakeType(usuario: String, password: String): Call<List<MistakeTypeVO>> {
// val params:ArrayList<String> = ArrayList()
return restClient!!.mistakeType("json", "1", usuario, password, "application/json")
}
}*/
}

4
app/src/main/java/es/verdnatura/domain/GetVehicleControlTimeUserCase.kt
View File

@ -49,7 +49,7 @@ class GetVehicleControlTimeUserCase(context: Context) : RestClient(context) {
}
fun machine_getWorkerPlate(usuario: String, password: String): Call<String> {
/* fun machine_getWorkerPlate(usuario: String, password: String): Call<String> {
val params: ArrayList<String> = ArrayList()
return restClient!!.machine_getWorkerPlate(
"json",
@ -60,7 +60,7 @@ class GetVehicleControlTimeUserCase(context: Context) : RestClient(context) {
params
)
}
*/
fun deviceProductionUser_getWorker(
android_id: String
): Call<String> {

4
app/src/main/java/es/verdnatura/domain/SalixService.kt
View File

@ -77,10 +77,6 @@ interface SalixService {
@POST("tickets/{idTicket}/transferSales") //-->saleMove en Silex
fun transferSalesSalix(
@Header("aplicacion") aplicacion: String,
@Header("version") version: String,
@Header("Authorization") authorization: String,
@Header("Content-Type") content_type: String,
@Path("idTicket") idTicket: String,
@Body params: listSaleSalix
):

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

@ -149,11 +149,6 @@ interface VerdnaturaService {
@POST("almacennew/operator_add")//NO SALIX
fun operator_add(
@Header("aplicacion") aplicacion: String,
@Header("version") version: String,
@Header("user") user: String,
@Header("pass") pass: String,
@Header("Content-Type") content_type: String
):
Call<Any>
@ -208,11 +203,6 @@ interface VerdnaturaService {
@POST("almacennew/sectorCollection_get") //NO SALIX
fun sectorCollection_get(
@Header("aplicacion") aplicacion: String,
@Header("version") version: String,
@Header("user") user: String,
@Header("pass") pass: String,
@Header("Content-Type") content_type: String
):
Call<List<CollectionVO>>
@ -249,12 +239,7 @@ interface VerdnaturaService {
@POST("almacennew/sectorCollection_new")//NO SALIX
fun sectorCollection_new(
@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>
@Body vararg params: Any
):
Call<Unit>
@ -266,19 +251,13 @@ interface VerdnaturaService {
@POST("almacennew/saleTracking_addPrevOK")//NO SALIX
fun saleTracking_addPrevOK(
@Body vararg params: Any
):
Call<Unit>
@POST("almacennew/saleTracking_updateIsChecked")//NO SALIX
fun saleTracking_updateIsChecked(
@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>
@Body vararg params: Any
):
Call<Unit>
@ -340,13 +319,13 @@ interface VerdnaturaService {
//sergio: de momento se separa para ir viendo como funciona. El precontrol llamara a collectionTicketGet con otro parametro.
@POST("almacennew/collection_getTickets")//REVISADA
fun collection_getTickets(
@Body vararg params: Any
@Body vararg params: Any
):
Call<CollectionVO>
@POST("almacennew/collection_get")//REVISADA
fun collection_get(
@Body vararg params: Any
@Body vararg params: Any
):
Call<CollectionVO>
@ -386,12 +365,7 @@ interface VerdnaturaService {
@POST("almacennew/itemShelvingSaleSupplyAdd")//REVISADA
fun itemShelvingSaleSupplyAdd(
@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>
@Body vararg params: Any
):
Call<Any>
@ -438,12 +412,7 @@ interface VerdnaturaService {
@POST("almacennew/saleTracking_add")//REVISADA
fun saleTracking_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>
@Body vararg params: Any
):
Call<Void>
@ -493,12 +462,7 @@ interface VerdnaturaService {
@POST("almacennew/itemShelving_updateFromSale")//REVISADA
fun itemShelving_updateFromSale(
@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>
@Body vararg params: Any
):
Call<Unit>
@ -572,11 +536,6 @@ interface VerdnaturaService {
@POST("almacennew/mistakeType")//REVISADA
fun mistakeType(
@Header("aplicacion") aplicacion: String,
@Header("version") version: String,
@Header("user") user: String,
@Header("pass") pass: String,
@Header("Content-Type") content_type: String
):
Call<List<MistakeTypeVO>>
@ -629,12 +588,7 @@ interface VerdnaturaService {
@POST("almacennew/item_getSimilar")//REVISADA
fun item_getSimilar(
@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>
@Body vararg params: Any
):
Call<List<ItemProposal>>
@ -771,23 +725,13 @@ interface VerdnaturaService {
//CONTROL DE VEHICULOS
@POST("almacennew/machineWorker_add")//REVISADA
fun machineWorker_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>
@Body vararg params: Any
):
Call<Boolean>
@POST("almacennew/machineWorker_update")//REVISADA
fun machineWorker_update(
@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>
@Body vararg params: Any
):
Call<Boolean>
@ -812,23 +756,12 @@ interface VerdnaturaService {
@POST("almacennew/machine_getWorkerPlate")//REVISADA
fun machine_getWorkerPlate(
@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/machineWorker_getHistorical")//REVISADA
fun machineWorker_getHistorical(
@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>
@Body vararg params: Any
):
Call<List<ItemHistoricoVehiculo>>
@ -903,23 +836,13 @@ interface VerdnaturaService {
@POST("almacennew/shelvingChange")//REVISADA
fun shelvingChange(
@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>
@Body vararg params: Any
):
Call<Any>
@POST("almacennew/itemShelving_return")
fun itemShelving_return(
@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>
@Body vararg params: Any
):
Call<ArrayList<Reubication>>
@ -948,24 +871,14 @@ interface VerdnaturaService {
@POST("almacennew/itemShelving_merge")//REVISADA
fun itemShelving_merge(
@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>
@Body vararg params: Any
):
Call<Any>
@POST("almacennew/shelvingLog_add")//REVISADA
fun shelvingLog_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>
@Body vararg params: Any
):
Call<Any>
@ -997,12 +910,7 @@ interface VerdnaturaService {
@POST("almacennew/qr_getCall")//REVISADA
fun qr_getCall(
@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>
@Body vararg params: Any
):
Call<String>
@ -1309,16 +1217,16 @@ interface VerdnaturaService {
):
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>*/
/* @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
@POST("almacennew/supplier_getItems")//REVISADA

7
app/src/main/java/es/verdnatura/presentation/base/BaseFragment.kt
View File

@ -227,7 +227,7 @@ abstract class BaseFragment<T : ViewDataBinding, V : BaseViewModel>(viewModelCla
R.drawable.ic_logo_salix -> getString(R.string.accessSalix)
R.drawable.ic_eye_ui -> getString(R.string.icViewCollection)
R.drawable.ic_collection -> getString(R.string.icViewCollection)
R.drawable.ic_controller_ui -> getString(R.string.checkerUbication)
R.drawable.ic_ubicator_check-> getString(R.string.checkerUbication)
else -> {
""
}
@ -521,7 +521,7 @@ abstract class BaseFragment<T : ViewDataBinding, V : BaseViewModel>(viewModelCla
ITEMPACKINGFK -> prefs.getString(name, "").toString()
WORKFORMSELECTED -> prefs.getString(name, "Producción").toString()
"SUPPLIERNAME" -> prefs.getString(name, "").toString()
"SUPPLIERID" -> prefs.getString(name, "").toString()
"SUPPLIERID" -> prefs.getInt(name, 0).toString()
"ENTRYTYPE" -> prefs.getString(name, "").toString()
"ENTRYNUMBERIMAGES" -> prefs.getString(name, "0").toString()
"ENTRYOBSERVATIONS" -> prefs.getString(name, "").toString()
@ -686,6 +686,9 @@ abstract class BaseFragment<T : ViewDataBinding, V : BaseViewModel>(viewModelCla
DEPARTMENTMISTAKEID->{
editor.putInt(name,value as Int)
}
"SUPPLIERID"->{
editor.putInt(name,value as Int)
}
else -> {
editor.putString(name, value.toString())
}

2
app/src/main/java/es/verdnatura/presentation/testing/testPrint.kt
View File

@ -106,8 +106,6 @@ class testPrint(
if (!binding.scanInput.text.isNullOrEmpty()) {
binding.splashProgress.visibility = View.VISIBLE
viewModel.qr_getCall(
getData(USER),
getData(PASSWORD),
binding.scanInput.text.toString()
)
itemscaned = binding.scanInput.text.toString()

11
app/src/main/java/es/verdnatura/presentation/view/feature/articulo/fragment/ItemCardViewModel.kt
View File

@ -80,13 +80,10 @@ class ItemCardViewModel(context: Context) : BaseViewModel(context) {
itemFk: String,
warehouseFk: String,
vShipped: String,
vIsShowedByType: String,
user: String,
password: String
vIsShowedByType: Boolean,
) {
getItemCardUserCase.item_getSimilar(
user,
password,
silex.item_getSimilar(
itemFk,
warehouseFk,
vShipped,
@ -319,7 +316,7 @@ class ItemCardViewModel(context: Context) : BaseViewModel(context) {
}
fun updatePackingTypeSalix(itemFk: String, itemPackingType: itemPackingTypeSalix) {
salix!!.update_ItemPackingType( itemFk,itemPackingType )
salix.update_ItemPackingType( itemFk,itemPackingType )
.enqueue(object : Callback<Any> {
override fun onFailure(call: Call<Any>, t: Throwable) {
_response.value = ResponseItemVO(

10
app/src/main/java/es/verdnatura/presentation/view/feature/articulo/fragment/ItemProposalFragment.kt
View File

@ -33,7 +33,7 @@ class ItemProposalFragment(
private var pasillerosItemClickListener: OnPasillerosItemClickListener? = null
private var hideLoad = true
private var layoutManager: LinearLayoutManager? = null
private var filter = "1"
private var filter = true
companion object {
fun newInstance(entryPoint: String) = ItemProposalFragment(entryPoint)
@ -52,8 +52,6 @@ class ItemProposalFragment(
getData(WAREHOUSEFK),
vShipped = currentDay(),
vIsShowedByType = filter,
user = getData(USER),
password = getData(PASSWORD)
)
super.onCreate(savedInstanceState)
}
@ -95,17 +93,15 @@ class ItemProposalFragment(
iconFilter.drawable-> {
binding.splashProgress.visibility = View.VISIBLE
iconFilter.drawable.setTint(ContextCompat.getColor(
context!!,if (filter=="1") R.color.verdnatura_white else R.color.verdnatura_pumpkin_orange
context!!,if (filter) R.color.verdnatura_white else R.color.verdnatura_pumpkin_orange
))
filter = if (filter=="1") "0" else "1"
filter = if (filter) false else true
viewModel.item_getSimilar(
itemFk,
getData(WAREHOUSEFK),
vIsShowedByType = filter,
vShipped = currentDay(),
user = getData(USER),
password = getData(PASSWORD)
)

2
app/src/main/java/es/verdnatura/presentation/view/feature/collection/CollectionVO.kt
View File

@ -16,7 +16,7 @@ class SalixSaleQuantity(
)
class listSaleSalix(
var sales: MutableList<saleSalix>
var sales: ArrayList<saleSalix>
)
class saleSalix(
var id : Int =0,

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

@ -335,7 +335,6 @@ class CollectionFragment(
if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0 || actionId == 5) {//ID=0 ACTION_NEXT ID=5 ACTION_UNESPECEFIED)
if (!binding.scanInput.text.toString().isNullOrEmpty()) {
//sergio:para ver si ha marcado dos veces el mismo ticket
binding.scanInput.setText(textScanned_filterDouble(binding.scanInput.text!!.toString()))
@ -810,7 +809,7 @@ class CollectionFragment(
viewModel.saleTrackingDel(
getData(USER),
getData(PASSWORD),
saleFk = sales[positionUnmarked].saleFk
saleFk = sales[positionUnmarked].saleFk.toString()
)
goBack = false
@ -1057,8 +1056,6 @@ class CollectionFragment(
mistakeSale = sale
goMistakeBack = false
viewModel.mistakeType(
usuario = getData(USER),
getData(PASSWORD)
)
}
}
@ -1128,7 +1125,6 @@ class CollectionFragment(
goBack = false
goBack2 = false
if (type == SACADOR) {
for (saleVO in sales) {
//sergio: pinta si encuentra ticket o el saleGroupFk
@ -1136,9 +1132,7 @@ class CollectionFragment(
// if (saleVO.ticketFk == txtscan ) {
isOk = true
viewModel.saleTracking_add(
getData(USER),
getData(PASSWORD),
txtscan
txtscan.toInt()
)
if ((isOk) && mpok != null) {
mpok!!.start()
@ -2266,7 +2260,6 @@ class CollectionFragment(
viewModel.transferSalesSalix(
getData(TOKEN),
ticketFk = sales[position].ticketFk,
saleFk = sales[position].saleFk,
quantity = totalQuantity.toString()

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

@ -12,7 +12,9 @@ import es.verdnatura.presentation.base.nameofFunction
import es.verdnatura.presentation.common.ResponseItemVO
import es.verdnatura.presentation.view.feature.collection.ItemVO
import es.verdnatura.presentation.view.feature.collection.SalesModifiedList
import es.verdnatura.presentation.view.feature.collection.listSaleSalix
import es.verdnatura.presentation.view.feature.collection.mapper.map
import es.verdnatura.presentation.view.feature.collection.saleSalix
import es.verdnatura.presentation.view.feature.sacador.model.*
import retrofit2.Call
import retrofit2.Callback
@ -494,13 +496,9 @@ class CollectionViewModel(context: Context) : BaseViewModel(context) {
fun saleTracking_add(
usuario: String,
password: String,
saleGroupFk: String
saleGroupFk: Int
) {
getSacadorControladorUserCase.saleTracking_add(
usuario,
password,
silex.saleTracking_add(
saleGroupFk
).enqueue(object : Callback<Void> {
override fun onFailure(call: Call<Void>, t: Throwable) {
@ -610,17 +608,15 @@ class CollectionViewModel(context: Context) : BaseViewModel(context) {
}
fun transferSalesSalix(
token: String,
ticketFk: String,
saleFk: String,
quantity: String,
) {
getSacadorControladorUserCase.transferSalesSalix(
token,
ticketFk,
saleFk,
quantity
var saleTransfer = listSaleSalix(arrayListOf(saleSalix(id = saleFk.toInt(), quantity = quantity.toInt())))
salix.transferSalesSalix(
ticketFk,saleTransfer
).enqueue(object : Callback<Any> {
override fun onFailure(call: Call<Any>, t: Throwable) {
@ -1059,8 +1055,8 @@ class CollectionViewModel(context: Context) : BaseViewModel(context) {
})
}
fun mistakeType(usuario: String, password: String) {
getSacadorControladorUserCase.mistakeType(usuario, password)
fun mistakeType() {
silex.mistakeType()
.enqueue(object : Callback<List<MistakeTypeVO>> {
override fun onFailure(call: Call<List<MistakeTypeVO>>, t: Throwable) {
val listError: ArrayList<MistakeTypeVO> = ArrayList()

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

@ -196,10 +196,10 @@ class ControlVehiculoFragment(
)
} else if (direction.equals("IN")) {
binding.splashProgress.visibility = VISIBLE
viewModel.machineWorker_add(getData(USER), getData(PASSWORD), plateNumber)
viewModel.machineWorker_add(plateNumber)
} else if (direction.equals("OUT")) {
viewModel.machineWorker_update(getData(USER), getData(PASSWORD), plateNumber)
viewModel.machineWorker_update(plateNumber)
} else if (direction.equals("")) {
ma.openFragmentPickers(true)

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

@ -91,7 +91,7 @@ class ControlVehiculoUsuarioFragment(
if (userFk.equals(vUserFK)) {
binding.splashProgress.visibility = VISIBLE
viewModel.machine_getWorkerPlate(getData(USER), getData(PASSWORD))
viewModel.machine_getWorkerPlate()
viewModel.deviceProduction_getnameDevice(
getData(ANDROID_ID)
)
@ -105,7 +105,7 @@ class ControlVehiculoUsuarioFragment(
binding.userInformation.visibility = INVISIBLE
binding.nameVehiclecontrol.visibility = INVISIBLE
binding.userInformation.setOnClickListener({ binding.mainToolbar.backButton.performClick() })
viewModel.machine_getWorkerPlate(getData(USER), getData(PASSWORD))
viewModel.machine_getWorkerPlate()
}
binding.userImage.loadUrl(

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

@ -36,11 +36,9 @@ class ControlVehiculoViewModel(context: Context) : BaseViewModel(context) {
get() = _responseGetExtensionFromUserId
fun machineWorker_add(
usuario: String,
password: String,
PlateNumber: String
) {
getVehicleControlTimeUserCase.machineWorker_add(usuario, password, PlateNumber)
silex.machineWorker_add(PlateNumber)
.enqueue(object : Callback<Boolean> {
override fun onFailure(call: Call<Boolean>, t: Throwable) {
_responseinsert.value = ResponseItemVO(
@ -76,11 +74,10 @@ class ControlVehiculoViewModel(context: Context) : BaseViewModel(context) {
}
fun machineWorker_update(
usuario: String,
password: String,
PlateNumber: String
) {
getVehicleControlTimeUserCase.machineWorker_update(usuario, password, PlateNumber)
silex.machineWorker_update(PlateNumber)
.enqueue(object : Callback<Boolean> {
override fun onFailure(call: Call<Boolean>, t: Throwable) {
_responseinsert.value = ResponseItemVO(
@ -208,10 +205,9 @@ class ControlVehiculoViewModel(context: Context) : BaseViewModel(context) {
fun machine_getWorkerPlate(usuario: String, password: String) {
getVehicleControlTimeUserCase.machine_getWorkerPlate(
usuario,
password
fun machine_getWorkerPlate() {
silex.machine_getWorkerPlate(
).enqueue(object : Callback<String> {
override fun onFailure(call: Call<String>, t: Throwable) {

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

@ -33,7 +33,7 @@ class HistoricoVehiculoFragment(
ma.hideBottomNavigation(View.GONE)
viewModel.machineWorker_getHistorical(getData(USER), getData(PASSWORD), numberPlate)
viewModel.machineWorker_getHistorical(numberPlate)
binding.mainToolbar.toolbarTitle.text = getString(R.string.vehiclediary)
setEvents()
super.init()

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

@ -26,8 +26,8 @@ class HistoricoVehiculoViewModel (context: Context) : BaseViewModel(context) {
val loadHistoricoVehiculoList = Transformations.map(_historicovehiculoList) { Event(it) }
fun machineWorker_getHistorical(usuario:String,password:String,plateNumber:String){
GetVehicleControlTimeUserCase.machineWorker_getHistorical(usuario,password,plateNumber).enqueue(object :
fun machineWorker_getHistorical(plateNumber:String){
silex.machineWorker_getHistorical(plateNumber).enqueue(object :
Callback<List<ItemHistoricoVehiculo>> {
override fun onFailure(call: Call<List<ItemHistoricoVehiculo>>, t: Throwable) {
val listError:ArrayList<ItemHistoricoVehiculo> = ArrayList()

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

@ -512,7 +512,7 @@ class LoginFragment : BaseFragment<FragmentLoginBinding, LoginViewModel>(LoginVi
)
//Tarea 4351 quitar el if y poner e device_checkLogin a continuación del response de operator_add
viewModel.operator_add(getData(USER), getData(PASSWORD))
viewModel.operator_add()
}
}

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

@ -449,9 +449,9 @@ class LoginViewModel(var context: Context) : BaseViewModel(context) {
})
}
fun operator_add(user: String, password: String) {
fun operator_add() {
getLoginUserCase.operator_add(user, password).enqueue(object : Callback<Any> {
silex.operator_add().enqueue(object : Callback<Any> {
override fun onFailure(call: Call<Any>, t: Throwable) {
_operatorAdd.value = ResponseItemVO(
isError = true,

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

@ -42,9 +42,7 @@ class PackagingCountFragment(
override fun onCreate(savedInstanceState: Bundle?) {
viewModel.supplier_getItems(
usuario = getData(USER),
password = getData(PASSWORD),
getData("SUPPLIERID")
getData("SUPPLIERID") as Int
)
super.onCreate(savedInstanceState)

22
app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/PackagingViewModel/SupplierViewModel.kt
View File

@ -3,13 +3,10 @@ package es.verdnatura.presentation.view.feature.packaging.fragment.PackagingView
import android.content.Context
import androidx.lifecycle.LiveData
import androidx.lifecycle.MutableLiveData
import es.verdnatura.domain.GetInventaryUserCase
import es.verdnatura.domain.GetPackagingUserCase
import es.verdnatura.presentation.base.BaseViewModel
import es.verdnatura.presentation.base.getMessageFromAllResponse
import es.verdnatura.presentation.base.nameofFunction
import es.verdnatura.presentation.common.ResponseItemVO
import es.verdnatura.presentation.view.feature.inventario.model.InventaryListVO
import es.verdnatura.presentation.view.feature.packaging.model.*
import retrofit2.Call
import retrofit2.Callback
@ -17,13 +14,6 @@ import retrofit2.Response
class PackagingViewModel(context: Context) : BaseViewModel(context) {
private val getInventaryUserCase: GetInventaryUserCase = GetInventaryUserCase(context)
private val getPackagingUserCase: GetPackagingUserCase = GetPackagingUserCase(context)
private val _inventaryList by lazy { MutableLiveData<InventaryListVO>() }
val inventaryList: LiveData<InventaryListVO>
get() = _inventaryList
private val _itemSupplierList by lazy { MutableLiveData<itemSupplierList>() }
val itemSupplierList: LiveData<itemSupplierList>
@ -41,8 +31,8 @@ class PackagingViewModel(context: Context) : BaseViewModel(context) {
val response: LiveData<ResponseItemVO>
get() = _response
fun getSuppliers(token: String) {
getPackagingUserCase.getSuppliers(token)
fun getSuppliers() {
salix.getSuppliers()
.enqueue(object :
Callback<List<Supplier>> {
override fun onFailure(call: Call<List<Supplier>>, t: Throwable) {
@ -84,9 +74,9 @@ class PackagingViewModel(context: Context) : BaseViewModel(context) {
})
}
fun supplier_getItems(usuario: String, password: String, supplierFk: String) {
fun supplier_getItems(supplierFk: Int) {
getPackagingUserCase.supplier_getItems(usuario, password, supplierFk)
silex.supplier_getItems(supplierFk)
.enqueue(object : Callback<List<ItemSupplier>> {
override fun onFailure(call: Call<List<ItemSupplier>>, t: Throwable) {
val listError: ArrayList<ItemSupplier> = ArrayList()
@ -119,8 +109,8 @@ class PackagingViewModel(context: Context) : BaseViewModel(context) {
})
}
fun entry_addSalix(token: String, entry: EntrySalix) {
getPackagingUserCase.Entries(token, entry = entry)
fun entry_addSalix(entry: EntrySalix) {
salix.Entries(entry = entry)
.enqueue(object :
Callback<EntrySalix> {
override fun onFailure(call: Call<EntrySalix>, t: Throwable) {

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

@ -2,7 +2,6 @@ package es.verdnatura.presentation.view.feature.packaging.fragment
import android.content.Context
import android.os.Bundle
import android.util.Log.d
import android.view.View
import androidx.recyclerview.widget.LinearLayoutManager
import es.verdnatura.R
@ -45,7 +44,6 @@ class SupplierFragment(
override fun onCreate(savedInstanceState: Bundle?) {
viewModel.getSuppliers(
getData(TOKEN),
)
super.onCreate(savedInstanceState)
@ -80,8 +78,8 @@ class SupplierFragment(
setToolBar()
setEvents()
var entrada = EntrySalix(supplierFk = "591", travelFk = "186025", companyFk = "442")
viewModel.entry_addSalix(getData(TOKEN), entrada)
val entry = EntrySalix(supplierFk = "591", travelFk = "186025", companyFk = "442")
viewModel.entry_addSalix(entry)
super.init()
}
@ -102,7 +100,7 @@ class SupplierFragment(
saveData("ENTRYTYPE", "Rec")
}
R.id.radioButtonDev -> {
d("VERDNATURA::", "dev")
saveData("ENTRYTYPE", "Dev")
}

82
app/src/main/java/es/verdnatura/presentation/view/feature/pasillero/fragment/PasilleroViewModel.kt
View File

@ -213,54 +213,54 @@ class PasilleroViewModel(context: Context) : BaseViewModel(context) {
)
)
)
_pasillerositem.add(
PasillerosItemVO(
7,
R.drawable.ic_baseline_all_inbox_24,
contextApp.getString(R.string.titleReplacement),
R.string.titleReplacement,
contextApp.getString(
R.string.titleReplacDescrip
/* _pasillerositem.add(
PasillerosItemVO(
7,
R.drawable.ic_baseline_all_inbox_24,
contextApp.getString(R.string.titleReplacement),
R.string.titleReplacement,
contextApp.getString(
R.string.titleReplacDescrip
)
)
)
)
_pasillerositem.add(
PasillerosItemVO(
4,
R.drawable.ic_move_to_inbox_black_24dp,
contextApp.getString(R.string.titleFaults),
R.string.titleFaults,
contextApp.getString(R.string.titleFaultsDescrip)
)
)
_pasillerositem.add(
PasillerosItemVO(
4,
R.drawable.ic_move_to_inbox_black_24dp,
contextApp.getString(R.string.titleFaults),
R.string.titleFaults,
contextApp.getString(R.string.titleFaultsDescrip)
)
)
_pasillerositem.add(
PasillerosItemVO(
5,
R.drawable.ic_send_black_24dp,
contextApp.getString(R.string.titleShelvingParking),
R.string.titleShelvingParking,
contextApp.getString(
R.string.titleShelParkDescrip
)
)
)
_pasillerositem.add(
PasillerosItemVO(
5,
R.drawable.ic_send_black_24dp,
contextApp.getString(R.string.titleShelvingParking),
R.string.titleShelvingParking,
contextApp.getString(
R.string.titleShelParkDescrip
)
)
)
//Tarea 3335 Borrat proced(Carles)
/* _pasillerositem.add(
PasillerosItemVO(
8,
R.drawable.ic_baseline_star_24,
contextApp.getString(R.string.titleQuality),
R.string.titleQuality,
contextApp.getString(
R.string.titleQualityDescrip
)
)
)*/
//Tarea 3335 Borrat proced(Carles)
_pasillerositem.add(
PasillerosItemVO(
8,
R.drawable.ic_baseline_star_24,
contextApp.getString(R.string.titleQuality),
R.string.titleQuality,
contextApp.getString(
R.string.titleQualityDescrip
)
)
)*/
}

117
app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/EndSacadorFragment.kt
View File

@ -17,6 +17,7 @@ import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView
import es.verdnatura.R
import es.verdnatura.databinding.FragmentPreSacadorBinding
import es.verdnatura.domain.toInt
import es.verdnatura.domain.toast
import es.verdnatura.presentation.base.BaseFragment
import es.verdnatura.presentation.common.*
@ -48,7 +49,7 @@ class EndSacadorFragment(
private lateinit var customDialog: CustomDialog
private lateinit var customDialogList: CustomDialogList
private var saleAdapter: PreSacadorAdapter? = null
private var ticket: String = ""
private var ticket: Int =0
private var lm: LinearLayoutManager? = null
private var pasillerosItemClickListener: OnPasillerosItemClickListener? = null
private var storedPosition: Int = 0
@ -142,7 +143,7 @@ class EndSacadorFragment(
if (binding.scanInput.text.first().isDigit()) {
//es ticket
ticketFk = binding.scanInput.text.toString()
searchTicket(binding.scanInput.text.toString())
searchTicket(binding.scanInput.toInt())
} else {
//es sale
findSale(binding.scanInput.text.toString())
@ -314,7 +315,7 @@ class EndSacadorFragment(
} else {
viewModel.sectorCollection_getSale(
collection.collectionFk,
getData(SECTORFK)
getData(SECTORFK).toInt()
)
}
}
@ -562,28 +563,19 @@ class EndSacadorFragment(
//CREATE LIST
private fun searchSaleCollection() {
binding.splashProgress.visibility = View.VISIBLE
binding.splashProgress.visibility = VISIBLE
viewModel.sectorCollection_getSale(
collection.collectionFk,
vSectorFk = getData(SECTORFK)
vSectorFk = getData(SECTORFK).toInt()
)
}
private fun searchTicket(ticketFk: String) {
private fun searchTicket(ticketFk: Int) {
//Log.i(TAG, "Escaneamos ticket en previa" + ticketFk)
ticket = ticketFk
/* viewModel.ticketToPrePrepare(
usuario = getData(USER),
getData(PASSWORD),
ticketFk = ticketFk,
sectorFk = getData(SECTORFK)
)*/
if (!ticketFk.isNullOrEmpty())
binding.splashProgress.visibility = View.VISIBLE
if (ticketFk!=0)
binding.splashProgress.visibility = VISIBLE
viewModel.sectorCollectionSaleGroup_add(
ticketFk,
collection.collectionFk
@ -602,7 +594,7 @@ class EndSacadorFragment(
)
} else {
if (ticket.isNullOrBlank()) {
if (ticket==0) {
binding.mainToolbar.toolbarTitle.text = collection.collectionFk.toString()
}
sales = ArrayList()
@ -687,7 +679,7 @@ class EndSacadorFragment(
if (it.saldo == it.picked)
totalMark += 1
}
if (ticket.isNullOrBlank()) {
if (ticket==0) {
binding.mainToolbar.toolbarTitle.text = collection.collectionFk.toString()
}
@ -805,19 +797,15 @@ class EndSacadorFragment(
if (sales[position].picked == sales[position].quantity) {
viewModel.saleTracking_updateIsChecked(
usuario = getData(USER),
password = getData(PASSWORD),
vSaleFk = sales[position].idMovimiento,
vIsChecked = if (sales[position].picked == sales[position].quantity) "1" else "0"
vSaleFk = sales[position].idMovimiento.toInt(),
vIsChecked = sales[position].picked == sales[position].quantity
)
}
if (sales[position].picked == 0) {
viewModel.saleTracking_updateIsChecked(
usuario = getData(USER),
password = getData(PASSWORD),
vSaleFk = sales[position].idMovimiento,
vIsChecked = if (sales[position].picked == sales[position].quantity) "1" else "0"
vSaleFk = sales[position].idMovimiento.toInt(),
vIsChecked = sales[position].picked == sales[position].quantity
)
}
@ -835,8 +823,6 @@ class EndSacadorFragment(
setListPosition(position)
viewModel.itemShelving_updateFromSale(
usuario = getData(USER),
password = getData(PASSWORD),
saleFk = sales[position].idMovimiento
)
positionUnmarked = position
@ -1017,8 +1003,6 @@ class EndSacadorFragment(
viewModel.itemShelvingSaleSupplyAdd(
usuario = getData(USER),
password = getData(PASSWORD),
itemShelvingFk = itemShelvingFk,
saleFk = sales[storedPosition].idMovimiento,
quantity = customDialogList.getValue()
@ -1045,72 +1029,6 @@ class EndSacadorFragment(
return saleToCheck.itemFk == valueToCheck.toInt()
}
/* private fun showScannerParking(ticket: String) {
customDialogInputParking.setTitle("Parking").setDescription("Escanea el parking")
.setOkButton(getString(R.string.accept)) {
if (!customDialogInputParking.getValue().isNullOrEmpty()) {
//findSale(customDialogInput.getValue(),index)
parkingTicket(ticket, customDialogInputParking.getValue())
}
customDialogInputParking.setValue("")
scanRequest()
customDialogInputParking.dismiss()
hideKeyboards()
}.setKoButton(getString(R.string.cancel)) {
customDialogInputParking.dismiss()
}.setValue("").show()
customDialogInputParking.getEditText().requestFocus()
customDialogInputParking.getEditText().setOnEditorActionListener { v, actionId, event ->
if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0) {
if (!customDialogInputParking.getValue().isNullOrEmpty()) {
parkingTicket(ticket, customDialogInputParking.getValue())
}
customDialogInputParking.setValue("")
scanRequest()
customDialogInputParking.dismiss()
hideKeyboards()
return@setOnEditorActionListener true
}
false
}
}*/
/*private fun showScannerTicket() {
customDialogInput.setTitle("Ticket a aparcar").setDescription("Escanea el ticket a aparcar")
.setOkButton(getString(R.string.accept)) {
if (!customDialogInput.getValue().isNullOrEmpty()) {
showScannerParking(customDialogInput.getValue())
}
customDialogInput.setValue("")
scanRequest()
customDialogInput.dismiss()
hideKeyboards()
}.setKoButton(getString(R.string.cancel)) {
customDialogInput.dismiss()
}.setValue("").show()
customDialogInput.getEditText().requestFocus()
customDialogInput.getEditText().setOnEditorActionListener { v, actionId, event ->
if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0) {
if (!customDialogInput.getValue().isNullOrEmpty()) {
// findSale(customDialogInput.getValue(),index)
showScannerParking(customDialogInput.getValue())
}
customDialogInput.setValue("")
scanRequest()
customDialogInput.dismiss()
hideKeyboards()
return@setOnEditorActionListener true
}
false
}
}*/
private fun showScanner(index: Int, sale: PreSacadorItemVO) {
customDialogInput.setTitle("" + sale.itemFk)
@ -1324,7 +1242,7 @@ class EndSacadorFragment(
viewModel.collectionMissingTrash(
usuario = getData(USER),
password = getData(PASSWORD),
saleFk = sales[position].idMovimiento,
saleFk = sales[position].idMovimiento.toString(),
quantity = totalQuantity.toString(),
warehouseFk = getData(WAREHOUSEFK),
type = "FALSE",
@ -1347,7 +1265,6 @@ class EndSacadorFragment(
binding.splashProgress.visibility = VISIBLE
viewModel.transferSalesSalix(
getData(TOKEN),
ticketFk = sales[position].id,
saleFk = sales[position].idMovimiento,
quantity = totalQuantity.toString()
@ -1363,7 +1280,7 @@ class EndSacadorFragment(
viewModel.collectionIncreaseQuantity(
token = getData(TOKEN),
saleFk = sales[position].idMovimiento,
saleFk = sales[position].idMovimiento.toString(),
quantity = quantity
)

15
app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/InitPreSacadorFragment.kt
View File

@ -41,8 +41,7 @@ class InitPreSacadorFragment (
}
override fun getLayoutId(): Int = R.layout.fragment_sacador
override fun init() {
customDialog = CustomDialog(requireContext())
@ -50,10 +49,9 @@ class InitPreSacadorFragment (
binding.splashProgressTwo.visibility = View.GONE
setToolBar()
setEvents()
viewModel.sectorCollection_get(getData(USER),getData(PASSWORD))
viewModel.sectorCollection_get()
super.init()
}
override fun onPause() {
@ -91,12 +89,9 @@ class InitPreSacadorFragment (
iconAdd.drawable -> {
binding.splashProgress.visibility = View.VISIBLE
viewModel.sectorCollection_new(getData(USER),
getData(PASSWORD),getData(SECTORFK))
viewModel.sectorCollection_new(getData(SECTORFK).toInt())
}
}
}
})
binding.mainToolbar.toolbarIcons.layoutManager =
@ -105,7 +100,7 @@ class InitPreSacadorFragment (
private fun setEvents() {
binding.sacadorSwipe.setOnRefreshListener {
viewModel.sectorCollection_get(getData(USER),getData(PASSWORD))
viewModel.sectorCollection_get()
binding.sacadorSwipe.isRefreshing = false
}
}
@ -144,7 +139,7 @@ class InitPreSacadorFragment (
} else {
//if (goBack)
viewModel.sectorCollection_get(getData(USER),getData(PASSWORD))
viewModel.sectorCollection_get()
}
goBack = false
//sergio:para asegurarnos que aparece en pantalla. En mi movil personal y trabajo no hacia falta.

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

@ -275,15 +275,11 @@ class PreSacadorViewModel(context: Context) : BaseViewModel(context) {
}
fun itemShelvingSaleSupplyAdd(
usuario: String,
password: String,
itemShelvingFk: String,
saleFk: String,
quantity: String
) {
getSacadorControladorUserCase.itemShelvingSaleSupplyAdd(
usuario,
password,
silex.itemShelvingSaleSupplyAdd(
itemShelvingFk,
saleFk,
quantity
@ -600,9 +596,9 @@ class PreSacadorViewModel(context: Context) : BaseViewModel(context) {
}
fun sectorCollection_get(usuario: String, password: String) {
fun sectorCollection_get() {
getPreSacadorUseCase.sectorCollection_get(usuario, password).enqueue(object :
silex.sectorCollection_get().enqueue(object :
Callback<List<CollectionVO>> {
override fun onFailure(call: Call<List<CollectionVO>>, t: Throwable) {
val listError: ArrayList<CollectionVO> = ArrayList()
@ -643,11 +639,9 @@ class PreSacadorViewModel(context: Context) : BaseViewModel(context) {
}
fun sectorCollection_new(
usuario: String,
password: String,
sectorFk: String
sectorFk: Int
) {
getPreSacadorUseCase.sectorCollection_new(usuario, password, sectorFk).enqueue(
silex.sectorCollection_new(sectorFk).enqueue(
object :
Callback<Unit> {
override fun onFailure(call: Call<Unit>, t: Throwable) {
@ -706,9 +700,9 @@ class PreSacadorViewModel(context: Context) : BaseViewModel(context) {
fun sectorCollection_getSale(
sectorCollectionFK: Int,
vSectorFk: String
vSectorFk: Int
) {
getPreSacadorUseCase.sectorCollection_getSale(
silex.sectorCollection_getSale(
sectorCollectionFK,
vSectorFk
)
@ -734,10 +728,10 @@ class PreSacadorViewModel(context: Context) : BaseViewModel(context) {
fun sectorCollectionSaleGroup_add(
vSaleGroupFk: String,
vSaleGroupFk: Int,
vSectorCollectionFk: Int
) {
getPreSacadorUseCase.sectorCollectionSaleGroup_add(
silex.sectorCollectionSaleGroup_add(
vSaleGroupFk,
vSectorCollectionFk
).enqueue(
@ -831,12 +825,10 @@ class PreSacadorViewModel(context: Context) : BaseViewModel(context) {
}
fun saleTracking_updateIsChecked(
usuario: String,
password: String,
vSaleFk: String,
vIsChecked: String
vSaleFk: Int,
vIsChecked: Boolean
) {
getPreSacadorUseCase.saleTracking_updateIsChecked(usuario, password, vSaleFk, vIsChecked)
silex.saleTracking_updateIsChecked(vSaleFk, vIsChecked)
.enqueue(
object :
Callback<Unit> {
@ -883,13 +875,9 @@ class PreSacadorViewModel(context: Context) : BaseViewModel(context) {
fun itemShelving_updateFromSale(
usuario: String,
password: String,
saleFk: String
) {
getSacadorControladorUserCase.itemShelving_updateFromSale(
usuario,
password,
silex.itemShelving_updateFromSale(
saleFk
)
.enqueue(object : Callback<Unit> {
@ -918,17 +906,15 @@ class PreSacadorViewModel(context: Context) : BaseViewModel(context) {
}
fun transferSalesSalix(
token:String,
ticketFk:String,
saleFk: String,
quantity: String,
) {
getSacadorControladorUserCase.transferSalesSalix(
token,
ticketFk,
saleFk,
quantity
var saleTransfer = listSaleSalix(arrayListOf(saleSalix(id = saleFk.toInt(), quantity = quantity.toInt())))
//saleTransfer.sales.add(saleSalix(id = saleFk.toInt(), quantity = quantity.toInt()))
salix.transferSalesSalix(
ticketFk,saleTransfer
).enqueue(object : Callback<Any> {
override fun onFailure(call: Call<Any>, t: Throwable) {

17
app/src/main/java/es/verdnatura/presentation/view/feature/qr/QrFragment.kt
View File

@ -1,7 +1,6 @@
package es.verdnatura.presentation.view.feature.qr
import android.view.KeyEvent.*
import android.view.View
import android.view.inputmethod.EditorInfo
import androidx.lifecycle.Observer
@ -9,7 +8,6 @@ import es.verdnatura.R
import es.verdnatura.databinding.FragmentQrBinding
import es.verdnatura.presentation.base.BaseFragment
import es.verdnatura.presentation.view.component.CustomDialog
import es.verdnatura.presentation.view.feature.main.activity.MainActivity
@Suppress("UNUSED_ANONYMOUS_PARAMETER")
@ -63,7 +61,9 @@ class QrFragment(
goBack = false
if (!binding.scanInput.text.isNullOrEmpty()) {
binding.splashProgress.visibility = View.VISIBLE
viewModel.qr_getCall(getData(USER), getData(PASSWORD), binding.scanInput.text.toString())
viewModel.qr_getCall(
binding.scanInput.text.toString()
)
itemscaned = binding.scanInput.text.toString()
}
@ -72,7 +72,7 @@ class QrFragment(
ma.hideKeyboard(binding.scanInput)
return@setOnEditorActionListener true
}
// false
// false
}
@ -83,13 +83,16 @@ class QrFragment(
binding.splashProgress.visibility = View.GONE
if (it.isError) {
ma.messageWithSound(it.errorMessage+ " "+itemscaned,true,false)
ma.messageWithSound(it.errorMessage + " " + itemscaned, true, false)
} else {
customDialog.setTitle(getString(R.string.info))
.setDescription(getString(R.string.operation) + itemscaned + "." + getString(
R.string.answer) +it.response)
.setDescription(
getString(R.string.operation) + itemscaned + "." + getString(
R.string.answer
) + it.response
)
.setOkButton(getString(R.string.accept)) {
customDialog.dismiss()
binding.mainToolbar.backButton.performClick()

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

@ -5,7 +5,6 @@ import android.content.Context
import androidx.lifecycle.LiveData
import androidx.lifecycle.MutableLiveData
import es.verdnatura.R
import es.verdnatura.domain.GetQrReaderUserCase
import es.verdnatura.presentation.base.BaseViewModel
import es.verdnatura.presentation.base.getMessageFromAllResponse
import es.verdnatura.presentation.base.nameofFunction
@ -16,17 +15,14 @@ import retrofit2.Response
class QrFragmentViewModel(context: Context) : BaseViewModel(context) {
private val contextApp =context
private val GetQrReaderUserCase: GetQrReaderUserCase =
GetQrReaderUserCase(context)
private val _qrresponse by lazy { MutableLiveData<ResponseItemVO>() }
val qrresponse: LiveData<ResponseItemVO>
get() = _qrresponse
fun qr_getCall(user: String, password: String, vStatement: String){
GetQrReaderUserCase.qr_getCall(user, password, vStatement)
fun qr_getCall(vStatement: String){
silex.qr_getCall(vStatement)
.enqueue(object : Callback<String> {
override fun onFailure(call: Call<String>, t: Throwable) {

57
app/src/main/java/es/verdnatura/presentation/view/feature/reubication/fragment/ReubicationCollectionFragment.kt
View File

@ -179,8 +179,6 @@ class ReubicationCollectionFragment(
if (customDialogInputTwoValues.getValueTwo().isNotEmpty()) {
binding.splashProgress.visibility = VISIBLE
viewModel.itemShelving_merge(
getData(USER),
getData(PASSWORD),
itemReubication.id,
customDialogInputTwoValues.getValueTwo().uppercase()
)
@ -210,8 +208,6 @@ class ReubicationCollectionFragment(
binding.splashProgress.visibility = VISIBLE
viewModel.itemShelving_merge(
getData(USER),
getData(PASSWORD),
itemReubication.id,
customDialogInputTwoValues.getValueTwo().uppercase()
)
@ -290,62 +286,9 @@ class ReubicationCollectionFragment(
binding.splashProgress.visibility = VISIBLE
viewModel.itemShelving_return(
usuario = getData(USER),
password = getData(PASSWORD),
shelvingFk = shelving,
)
}
/* private fun createReubications(list: MutableList<Reubication>) {
*//* val listItems = mutableListOf<String>()
val reubication = mutableListOf<Reubication>()
for (item in list) {
if (!listItems.contains(item.itemFk)) {
listItems.add(item.itemFk)
reubication.add(
Reubication(
itemFk = item.itemFk,
longName = item.longName,
visible = item.visible,
shelvingFk = item.shelvingFk
)
)
}
}
for (item in list) {
for (r in reubication) {
if (item.itemFk == r.itemFk) {
if (item.shelvingFk.uppercase() != shelving.uppercase())
r.carros.add(
PlacementReubication(
code = item.code,
plate = item.shelvingFk,
visible = "(" + item.visible + ")",
idItemShelving = item.id
)
)
}
}
}
for (item in list) {
Log.d("VERDNATURA::", "el item es " + item.itemFk + "-" + item.id + "-" + item.visible)
for (r in item.carros) {
Log.d(
"VERDNATURA::",
"la reubic es" + r.idItemShelving + "-" + r.plate + "-" + r.code
)
}
}
//ma.openFragmentReubications(reubication,shelving)
*//*
showList(list)
}*/
}

3
app/src/main/java/es/verdnatura/presentation/view/feature/reubication/fragment/ReubicationFragment.kt
View File

@ -62,10 +62,7 @@ class ReubicationFragment(var entrypoint: String) :
binding.splashProgress.visibility = VISIBLE
shelvingScaned = binding.scanInput.text.toString()
viewModel.itemShelving_return(
usuario = getData(USER),
password = getData(PASSWORD),
shelvingFk = binding.scanInput.text.toString(),
)
}

2
app/src/main/java/es/verdnatura/presentation/view/feature/reubication/model/Reubication.kt
View File

@ -6,7 +6,7 @@ class ReubicationList(
)
class Reubication(
var id: String = "", //ok
var id: Int, //ok
var shelvingFk: String = "", //ok
var code: String = "", // no
var itemFk: String = "",//ok

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

@ -227,7 +227,7 @@ class SacadorFragment :
goBack = false
//sergio:para asegurarnos que aparece en pantalla.
val working_in_test = false //sergio: ok en app SACADOR
val working_in_test = true //sergio: ok en app SACADOR
if (!working_in_test) {
viewModel.collectionGetSalix(token = getData(TOKEN))
} else {

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

@ -7,6 +7,7 @@ import android.media.MediaPlayer
import android.os.Build
import android.os.Bundle
import android.view.View
import android.view.View.GONE
import android.view.View.VISIBLE
import android.view.inputmethod.EditorInfo
import android.widget.ImageView
@ -17,6 +18,7 @@ import androidx.recyclerview.widget.LinearLayoutManager
import es.verdnatura.R
import es.verdnatura.databinding.FragmentUbicadorBinding
import es.verdnatura.domain.notNull
import es.verdnatura.domain.toInt
import es.verdnatura.domain.toast
import es.verdnatura.presentation.base.BaseFragment
import es.verdnatura.presentation.common.*
@ -52,6 +54,7 @@ class UbicadorFragment(
private var modeCheckUbication = false
var mperror: MediaPlayer? = null
var mpok: MediaPlayer? = null
var isBack=false
companion object {
@ -59,7 +62,10 @@ class UbicadorFragment(
}
override fun getLayoutId(): Int = R.layout.fragment_ubicador
override fun onPause() {
super.onPause()
isBack=true
}
override fun onAttach(context: Context) {
if (context is OnPasillerosItemClickListener) pasillerosItemClickListener = context
super.onAttach(context)
@ -127,16 +133,17 @@ class UbicadorFragment(
}
val iconChecker = ImageView(context)
iconChecker.setImageResource(R.drawable.ic_controller_ui)
iconChecker.setImageResource(R.drawable.ic_ubicator_check)
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
iconReload.tooltipText = getTooltip(R.drawable.ic_autorenew_black_24dp)
iconAdd.tooltipText = getString(R.string.addItemShelving)
iconChecker.tooltipText=getTooltip(R.drawable.ic_ubicator_check)
}
listIcons.add(iconAdd)
listIcons.add(iconReload)
// listIcons.add(iconChecker)
//listIcons.add(iconChecker)
binding.mainToolbar.toolbarIcons.adapter =
@ -229,16 +236,20 @@ class UbicadorFragment(
binding.editPrioridad.setOnEditorActionListener { v, actionId, event ->
if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0 || actionId == 5) {
if (!binding.editPrioridad.text.toString().isNullOrEmpty()) {
binding.splashProgress.visibility=VISIBLE
viewModel.shelvingPriorityUpdate(
binding.editPrioridad.text.toString(),
binding.editPrioridad.toInt(),
shelvingFk
)
}
ma.hideKeyboard(binding.editPrioridad)
return@setOnEditorActionListener true
//return@setOnEditorActionListener false
}
//return@setOnEditorActionListener false
binding.editMatricula.requestFocus()
return@setOnEditorActionListener false
}
@ -308,8 +319,6 @@ class UbicadorFragment(
customDialogInput.setTitle(getString(R.string.changeShelving)).setValue("")
.setOkButton(getString(R.string.save)) {
viewModel.shelvingChange(
getData(USER),
getData(PASSWORD),
shelvingFk,
customDialogInput.getValue()
)
@ -330,8 +339,6 @@ class UbicadorFragment(
customDialogInput.getEditText().setOnEditorActionListener { v, actionId, event ->
if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0) {
viewModel.shelvingChange(
getData(USER),
getData(PASSWORD),
shelvingFk,
customDialogInput.getValue()
)
@ -426,7 +433,9 @@ class UbicadorFragment(
@SuppressLint("SetTextI18n")
override fun observeViewModel() {
with(viewModel) {
loadShelvingList.observe(viewLifecycleOwner, Observer { event ->
event.getContentIfNotHandled().notNull {
@ -517,7 +526,7 @@ class UbicadorFragment(
if (isShelvinLogfromMainScreen) {
//tarea 4454
viewModel.shelvinLog_add(getData(USER), getData(PASSWORD), shelvingFk)
viewModel.shelvinLog_add(shelvingFk)
}
}
@ -546,12 +555,14 @@ class UbicadorFragment(
})
responsepriority.observe(viewLifecycleOwner, Observer {
ma.messageWithSound(
if (!isBack){
binding.splashProgress.visibility=GONE
ma.messageWithSound(
if (it.isError) it.errorMessage else {
getString(R.string.priorityChanged)
}, it.isError, true
)
)}
isBack=false
})
@ -568,6 +579,7 @@ class UbicadorFragment(
}
})
}
}
private fun showAddItem(
@ -858,4 +870,5 @@ class UbicadorFragment(
customDialogTwoButtons.dismiss()
}.show()
}
}
}

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

@ -92,7 +92,7 @@ class UbicadorViewModel(context: Context) : BaseViewModel(context) {
}
fun shelvingPriorityUpdate(
priority: String,
priority: Int,
shelving: String
) {
@ -256,12 +256,10 @@ class UbicadorViewModel(context: Context) : BaseViewModel(context) {
}
fun shelvingChange(
usuario: String,
password: String,
origen: String,
destino: String
) {
getUbicadorUserCase.shelvingChange(usuario, password, origen, destino)
silex.shelvingChange(origen, destino)
.enqueue(object : Callback<Any> {
override fun onFailure(call: Call<Any>, t: Throwable) {
_response.value = ResponseItemVO(
@ -288,13 +286,11 @@ class UbicadorViewModel(context: Context) : BaseViewModel(context) {
}
fun itemShelving_merge(
usuario: String,
password: String,
vShelf: String,
vShelf: Int,
vShelvingFk: String
) {
getUbicadorUserCase.itemShelving_merge(usuario, password, vShelf, vShelvingFk)
silex.itemShelving_merge( vShelf, vShelvingFk)
.enqueue(object : Callback<Any> {
override fun onFailure(call: Call<Any>, t: Throwable) {
_response.value = ResponseItemVO(
@ -322,13 +318,9 @@ class UbicadorViewModel(context: Context) : BaseViewModel(context) {
fun shelvinLog_add(
usuario: String,
password: String,
code: String
) {
getUbicadorUserCase.shelvinLog_add(usuario, password, code)
silex.shelvingLog_add(code)
.enqueue(object : Callback<Any> {
override fun onFailure(call: Call<Any>, t: Throwable) {
_response.value = ResponseItemVO(
@ -352,17 +344,15 @@ class UbicadorViewModel(context: Context) : BaseViewModel(context) {
}
fun itemShelving_return(
usuario: String,
password: String,
shelvingFk: String,
) {
getUbicadorUserCase.itemShelving_return(usuario, password, shelvingFk)
silex.itemShelving_return(shelvingFk)
.enqueue(object : Callback<ArrayList<Reubication>> {
override fun onFailure(call: Call<ArrayList<Reubication>>, t: Throwable) {
val listError: ArrayList<Reubication> = ArrayList()
listError.add(
Reubication(
Reubication(0,
isError = true,
errorMessage = getMessageFromAllResponse(
nameofFunction(this),
@ -381,7 +371,7 @@ class UbicadorViewModel(context: Context) : BaseViewModel(context) {
if (response.body() == null) {
val listError: ArrayList<Reubication> = ArrayList()
listError.add(
Reubication(
Reubication(0,
isError = true,
errorMessage = getMessageFromAllResponse(
nameofFunction(this),

8
app/src/main/res/drawable/ic_ubicator_check.xml Normal file
View File

@ -0,0 +1,8 @@
<!-- drawable/eye_check_outline.xml -->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:height="24dp"
android:width="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path android:fillColor="#FFF" android:pathData="M23.5,17L18.5,22L15,18.5L16.5,17L18.5,19L22,15.5L23.5,17M12,9A3,3 0 0,1 15,12A3,3 0 0,1 12,15A3,3 0 0,1 9,12A3,3 0 0,1 12,9M12,4.5C17,4.5 21.27,7.61 23,12C22.75,12.65 22.44,13.26 22.08,13.85C21.5,13.5 20.86,13.25 20.18,13.12L20.82,12C19.17,8.64 15.76,6.5 12,6.5C8.24,6.5 4.83,8.64 3.18,12C4.83,15.36 8.24,17.5 12,17.5L13.21,17.43C13.07,17.93 13,18.46 13,19V19.46L12,19.5C7,19.5 2.73,16.39 1,12C2.73,7.61 7,4.5 12,4.5Z" />
</vector>