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

feat: refactorResponse refs #7827

This commit is contained in:
Sergio De la torre 2024-09-10 07:19:28 +02:00
parent 5b8c089734
commit 81758cf340
84 changed files with 778 additions and 873 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
.idea/appInsightsSettings.xml
View File

@ -35,7 +35,16 @@
</ConnectionSetting> </ConnectionSetting>
</option> </option>
<option name="signal" value="SIGNAL_UNSPECIFIED" /> <option name="signal" value="SIGNAL_UNSPECIFIED" />
<option name="timeIntervalDays" value="ONE_DAY" /> <option name="timeIntervalDays" value="SIXTY_DAYS" />
<option name="versions">
<list>
<VersionSetting>
<option name="buildVersion" value="324" />
<option name="displayName" value="24.32 (324)" />
<option name="displayVersion" value="24.32" />
</VersionSetting>
</list>
</option>
<option name="visibilityType" value="ALL" /> <option name="visibilityType" value="ALL" />
</InsightsFilterSettings> </InsightsFilterSettings>
</value> </value>

235
.idea/workspace.xml
View File

@ -160,11 +160,6 @@
<theme>@style/AppTheme</theme> <theme>@style/AppTheme</theme>
</config> </config>
</layout> </layout>
<layout url="file://$PROJECT_DIR$/app/src/main/res/layout/fragment_item_expeditionstate_prepared_card.xml">
<config>
<theme>@style/AppTheme</theme>
</config>
</layout>
<layout url="file://$PROJECT_DIR$/app/src/main/res/layout/fragment_itemexpeditionstate_card.xml"> <layout url="file://$PROJECT_DIR$/app/src/main/res/layout/fragment_itemexpeditionstate_card.xml">
<config> <config>
<theme>@style/AppTheme</theme> <theme>@style/AppTheme</theme>
@ -190,11 +185,6 @@
<theme>@style/AppTheme</theme> <theme>@style/AppTheme</theme>
</config> </config>
</layout> </layout>
<layout url="file://$PROJECT_DIR$/app/src/main/res/layout/fragment_parking_expedition.xml">
<config>
<theme>@style/AppTheme</theme>
</config>
</layout>
<layout url="file://$PROJECT_DIR$/app/src/main/res/layout/fragment_roadmap_truck_list.xml"> <layout url="file://$PROJECT_DIR$/app/src/main/res/layout/fragment_roadmap_truck_list.xml">
<config> <config>
<theme>@style/AppTheme</theme> <theme>@style/AppTheme</theme>
@ -251,6 +241,11 @@
<theme>@style/AppTheme</theme> <theme>@style/AppTheme</theme>
</config> </config>
</layout> </layout>
<layout url="file://$PROJECT_DIR$/app/src/main/res/layout/item_expeditionscan_row.xml">
<config>
<theme>@style/AppTheme</theme>
</config>
</layout>
<layout url="file://$PROJECT_DIR$/app/src/main/res/layout/item_expeditionstate_row.xml"> <layout url="file://$PROJECT_DIR$/app/src/main/res/layout/item_expeditionstate_row.xml">
<config> <config>
<theme>@style/AppTheme</theme> <theme>@style/AppTheme</theme>
@ -281,6 +276,16 @@
<theme>@style/AppTheme</theme> <theme>@style/AppTheme</theme>
</config> </config>
</layout> </layout>
<layout url="file://$PROJECT_DIR$/app/src/main/res/layout/item_main_menu.xml">
<config>
<theme>@style/AppTheme</theme>
</config>
</layout>
<layout url="file://$PROJECT_DIR$/app/src/main/res/layout/item_pasilleros_main_menu.xml">
<config>
<theme>@style/AppTheme</theme>
</config>
</layout>
<layout url="file://$PROJECT_DIR$/app/src/main/res/layout/item_roadmap_truck_row.xml"> <layout url="file://$PROJECT_DIR$/app/src/main/res/layout/item_roadmap_truck_row.xml">
<config> <config>
<theme>@style/AppTheme</theme> <theme>@style/AppTheme</theme>
@ -368,28 +373,99 @@
</select> </select>
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="fa688d1c-dbee-4864-9e33-4d84ef9afca8" name="Default Changelist" comment="feat: regularizar Parking #7817"> <list default="true" id="fa688d1c-dbee-4864-9e33-4d84ef9afca8" name="Default Changelist" comment="feat: refactorResponse PasillerosItem refs #7827">
<change afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionPreparedStateFragment.kt" afterDir="false" />
<change afterPath="$PROJECT_DIR$/app/src/main/res/drawable/ic_scan_prepared.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/app/src/main/res/drawable/ic_ubicador_expedition.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/app/src/main/res/layout/fragment_automatic_add_expedition.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/app/src/main/res/layout/fragment_parking_expedition.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/appInsightsSettings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/appInsightsSettings.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/appInsightsSettings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/appInsightsSettings.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$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/app/build.gradle" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/di/viewModelModule.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/di/viewModelModule.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/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/presentation/common/GeneralAdapter.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/common/GeneralAdapter.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/common/UICallbacks.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/common/UICallbacks.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/common/UtilFunctions.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/common/UtilFunctions.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/ajustes/fragment/AjustesFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/ajustes/fragment/AjustesFragment.kt" afterDir="false" /> <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/ajustes/fragment/AjustesFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/ajustes/fragment/AjustesFragment.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/adapter/ItemProposalAdapter.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/adapter/ItemProposalAdapter.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/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/buffer/fragment/BufferLoadFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/buffer/fragment/BufferLoadFragment.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/buffer/fragment/adapter/BufferAdapter.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/buffer/fragment/adapter/BufferAdapter.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/buscaritem/adapter/LocationAdapter.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/buscaritem/adapter/LocationAdapter.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/category/ChangeCategoryFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/category/ChangeCategoryFragment.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/category/ChangeCategoryViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/category/ChangeCategoryViewModel.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/claim/fragment/reubication/adapter/ReubicatorAdapter.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/claim/fragment/reubication/adapter/ReubicatorAdapter.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/claim/fragment/reubication/adapter/ReubicatorPlacementAdapter.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/claim/fragment/reubication/adapter/ReubicatorPlacementAdapter.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/claim/fragment/ubication/ClaimUbicationFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/claim/fragment/ubication/ClaimUbicationFragment.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/adapter/PlacementAdapter.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/adapter/PlacementAdapter.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/collection/adapter/SaleAdapterNew.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/adapter/SaleAdapterNew.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/CollectionFragmentPicker.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragmentPicker.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragmentPickerNew.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragmentPickerNew.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragmentPickerPreviousNew.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragmentPickerPreviousNew.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragmentPreChecker.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragmentPreChecker.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragmentPreCheckerNew.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragmentPreCheckerNew.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionViewModel.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/controlvehiculo/fragment/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/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/delivery/activity/SignedActivity.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/activity/SignedActivity.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/fragments/RoutesFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/fragments/RoutesFragment.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/fragments/SummaryFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/fragments/SummaryFragment.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/fragments/TicketsFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/fragments/TicketsFragment.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/viewmodels/DeliveryViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/viewmodels/DeliveryViewModel.kt" afterDir="false" /> <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/viewmodels/DeliveryViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/viewmodels/DeliveryViewModel.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/diadeventa/adapter/DayOfSaleAdapter.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/diadeventa/adapter/DayOfSaleAdapter.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/historicoarticulo/fragment/HistoricoArticuloFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/historicoarticulo/fragment/HistoricoArticuloFragment.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/historicoshelving/adapter/ItemShelvingLogAdapter.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/historicoshelving/adapter/ItemShelvingLogAdapter.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/historicoshelvinglog/fragment/shelvingLogFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/historicoshelvinglog/fragment/shelvingLogFragment.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/inventario/adapter/InventoryAdapter.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/inventario/adapter/InventoryAdapter.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/inventario/adapter/InventoryParkingAdapter.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/inventario/adapter/InventoryParkingAdapter.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/inventario/fragment/InventaryFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/inventario/fragment/InventaryFragment.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/login/adapter/WorkFormAdapter.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/login/adapter/WorkFormAdapter.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/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/adapter/ItemSupplierAdapter.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/adapter/ItemSupplierAdapter.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/adapter/ListImageAdapter.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/adapter/ListImageAdapter.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/ObservFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/ObservFragment.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/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/paletizador/fragment/ExpeditionPalletDetailFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionPalletDetailFragment.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/ExpeditionPalletFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionPalletFragment.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionPalletViewModel.kt" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionPreparedStateFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionPreparedStateFragment.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionScanFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionScanFragment.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/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/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/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/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/ExpeditionTruckListFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionTruckListFragment.kt" afterDir="false" /> <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionTruckListFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionTruckListFragment.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/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/model/ItemExpeditionTruckVO.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/model/ItemExpeditionTruckVO.kt" afterDir="false" /> <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/model/ItemExpeditionTruckVO.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/model/ItemExpeditionTruckVO.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/paletizador/model/ItemPalletVO.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/model/ItemPalletVO.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/adapter/AutomaticAdapter.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/adapter/AutomaticAdapter.kt" afterDir="false" /> <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/model/ItemScanVO.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/model/ItemScanVO.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/adapter/AutomaticAdapterTEST.kt" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/parking/fragment/ParkingFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/parking/fragment/ParkingFragment.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/photos/fragment/PhotosFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/photos/fragment/PhotosFragment.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" />
<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/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/presacador/fragment/SectorCollectionReserveFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/SectorCollectionReserveFragment.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/roadmap/fragment/StopMapListFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/roadmap/fragment/StopMapListFragment.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/showticket/ShowTicketFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/sacador/fragment/showticket/ShowTicketFragment.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/ubicador/adapter/UbicadorAdapter.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/adapter/UbicadorAdapter.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/adapter/UbicadorAdapterNew.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/adapter/UbicadorAdapterNew.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/AutomaticAddItemFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/AutomaticAddItemFragment.kt" afterDir="false" /> <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/AutomaticAddItemFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/AutomaticAddItemFragment.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/fragment_automatic_add_item.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/fragment_automatic_add_item.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/AutomaticAddItemViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/AutomaticAddItemViewModel.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorFragmentNew.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorFragmentNew.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/workermistake/fragment/PackingMistakeFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/workermistake/fragment/PackingMistakeFragment.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/workermistake/fragment/WorkermistakeFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/workermistake/fragment/WorkermistakeFragment.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/workermistake/model/mistakeWorkerType.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/workermistake/model/mistakeWorkerType.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/res/values-es/strings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/values-es/strings.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/app/src/main/res/values-es/strings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/values-es/strings.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/res/values-fr/strings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/values-fr/strings.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/app/src/main/res/values-fr/strings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/values-fr/strings.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/res/values-pt/strings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/values-pt/strings.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/app/src/main/res/values-pt/strings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/values-pt/strings.xml" afterDir="false" />
@ -445,6 +521,9 @@
</list> </list>
</option> </option>
</component> </component>
<component name="FormatOnSaveOptions">
<option name="myRunOnSave" value="true" />
</component>
<component name="GenerateSignedApkSettings"> <component name="GenerateSignedApkSettings">
<option name="KEY_STORE_PATH" value="C:\Users\sergiodt\Documents\KEYSTORE\keystore.jks" /> <option name="KEY_STORE_PATH" value="C:\Users\sergiodt\Documents\KEYSTORE\keystore.jks" />
<option name="KEY_ALIAS" value="keystore" /> <option name="KEY_ALIAS" value="keystore" />
@ -535,6 +614,9 @@
<component name="MarkdownSettingsMigration"> <component name="MarkdownSettingsMigration">
<option name="stateVersion" value="1" /> <option name="stateVersion" value="1" />
</component> </component>
<component name="OptimizeOnSaveOptions">
<option name="myRunOnSave" value="true" />
</component>
<component name="ProblemsViewState"> <component name="ProblemsViewState">
<option name="proportion" value="0.50190353" /> <option name="proportion" value="0.50190353" />
<option name="selectedTabId" value="CurrentFile" /> <option name="selectedTabId" value="CurrentFile" />
@ -553,62 +635,63 @@
<option name="showLibraryContents" value="true" /> <option name="showLibraryContents" value="true" />
<option name="showMembers" value="true" /> <option name="showMembers" value="true" />
</component> </component>
<component name="PropertiesComponent">{ <component name="PropertiesComponent"><![CDATA[{
&quot;keyToString&quot;: { "keyToString": {
&quot;Android App.app.executor&quot;: &quot;Run&quot;, "Android App.app.executor": "Run",
&quot;ApkExportedModule&quot;: &quot;Gestor_Almacén.app&quot;, "ApkExportedModule": "Gestor_Almacén.app",
&quot;DEBUGGABLE_DEVICE&quot;: &quot;zebra_technologies-tc21-21114523025303&quot;, "DEBUGGABLE_DEVICE": "zebra_technologies-tc21-21114523025303",
&quot;DEBUGGABLE_PROCESS&quot;: &quot;es.verdnatura.sfusion&quot;, "DEBUGGABLE_PROCESS": "es.verdnatura.sfusion",
&quot;DEBUGGER_ID&quot;: &quot;Auto&quot;, "DEBUGGER_ID": "Auto",
&quot;ExportApk.ApkPathForGestor_Almacén.app&quot;: &quot;C:\\Users\\sergiodt\\AndroidStudioProjects\\vn-warehouseManager\\app&quot;, "ExportApk.ApkPathForGestor_Almacén.app": "C:\\Users\\sergiodt\\AndroidStudioProjects\\vn-warehouseManager\\app",
&quot;Gradle.vn-warehouseManager [clean].executor&quot;: &quot;Run&quot;, "Gradle.vn-warehouseManager [clean].executor": "Run",
&quot;Gradle.vn-warehouseManager.executor&quot;: &quot;Run&quot;, "Gradle.vn-warehouseManager.executor": "Run",
&quot;KotlinFunctionFindUsagesOptions.isSearchForTextOccurrences&quot;: &quot;true&quot;, "KotlinFunctionFindUsagesOptions.isSearchForTextOccurrences": "true",
&quot;PROJECT_TRUSTED_KEY&quot;: &quot;true&quot;, "PROJECT_TRUSTED_KEY": "true",
&quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;, "RunOnceActivity.OpenProjectViewOnStart": "true",
&quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;, "RunOnceActivity.ShowReadmeOnStart": "true",
&quot;RunOnceActivity.cidr.known.project.marker&quot;: &quot;true&quot;, "RunOnceActivity.cidr.known.project.marker": "true",
&quot;RunOnceActivity.readMode.enableVisualFormatting&quot;: &quot;true&quot;, "RunOnceActivity.readMode.enableVisualFormatting": "true",
&quot;SHARE_PROJECT_CONFIGURATION_FILES&quot;: &quot;true&quot;, "SHARE_PROJECT_CONFIGURATION_FILES": "true",
&quot;SHOW_ALL_PROCESSES&quot;: &quot;false&quot;, "SHOW_ALL_PROCESSES": "false",
&quot;ScreenRecorder.SavePath&quot;: &quot;C:\\Users\\sergiodt&quot;, "ScreenRecorder.SavePath": "C:\\Users\\sergiodt",
&quot;android-custom-viewC:/Users/sergiodt/.gradle/caches/modules-2/files-2.1/androidx.recyclerview/recyclerview/1.2.1/f0f93e67af3f7417bdd560d5142f6dec4fe629c3/recyclerview-1.2.1-sources.jar!/androidx/recyclerview/widget/RecyclerView.java_SELECTED&quot;: &quot;RecyclerView&quot;, "android-custom-viewC:/Users/sergiodt/.gradle/caches/modules-2/files-2.1/androidx.recyclerview/recyclerview/1.2.1/f0f93e67af3f7417bdd560d5142f6dec4fe629c3/recyclerview-1.2.1-sources.jar!/androidx/recyclerview/widget/RecyclerView.java_SELECTED": "RecyclerView",
&quot;android-custom-viewC:/Users/sergiodt/AppData/Local/Android/Sdk/sources/android-29/android/widget/TextView.java_SELECTED&quot;: &quot;TextView&quot;, "android-custom-viewC:/Users/sergiodt/AppData/Local/Android/Sdk/sources/android-29/android/widget/TextView.java_SELECTED": "TextView",
&quot;android-custom-viewC:/Users/sergiodt/AppData/Local/Android/Sdk/sources/android-33/android/view/View.java_SELECTED&quot;: &quot;View&quot;, "android-custom-viewC:/Users/sergiodt/AppData/Local/Android/Sdk/sources/android-33/android/view/View.java_SELECTED": "View",
&quot;android-custom-viewC:/Users/sergiodt/AppData/Local/Android/Sdk/sources/android-34/android/view/View.java_SELECTED&quot;: &quot;View&quot;, "android-custom-viewC:/Users/sergiodt/AppData/Local/Android/Sdk/sources/android-34/android/view/View.java_SELECTED": "View",
&quot;android-custom-viewC:/Users/sergiodt/AppData/Local/Android/Sdk/sources/android-34/android/widget/CompoundButton.java_SELECTED&quot;: &quot;CompoundButton&quot;, "android-custom-viewC:/Users/sergiodt/AppData/Local/Android/Sdk/sources/android-34/android/widget/CompoundButton.java_SELECTED": "CompoundButton",
&quot;android-custom-viewC:/Users/sergiodt/AppData/Local/Android/Sdk/sources/android-34/android/widget/TextView.java_SELECTED&quot;: &quot;TextView&quot;, "android-custom-viewC:/Users/sergiodt/AppData/Local/Android/Sdk/sources/android-34/android/widget/TextView.java_SELECTED": "TextView",
&quot;cf.first.check.clang-format&quot;: &quot;false&quot;, "cf.first.check.clang-format": "false",
&quot;cidr.known.project.marker&quot;: &quot;true&quot;, "cidr.known.project.marker": "true",
&quot;com.developerphil.adbidea.selecteddevices&quot;: &quot;G65TY9DQN7X4BIE6&quot;, "com.developerphil.adbidea.selecteddevices": "G65TY9DQN7X4BIE6",
&quot;com.google.services.firebase.aqiPopupShown&quot;: &quot;true&quot;, "com.google.services.firebase.aqiPopupShown": "true",
&quot;git-widget-placeholder&quot;: &quot;dev__6078&quot;, "git-widget-placeholder": "dev__6078",
&quot;ignore.virus.scanning.warn.message&quot;: &quot;true&quot;, "ignore.virus.scanning.warn.message": "true",
&quot;kotlin-language-version-configured&quot;: &quot;true&quot;, "kotlin-language-version-configured": "true",
&quot;last_directory_selection&quot;: &quot;C:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable&quot;, "last_directory_selection": "C:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable",
&quot;last_opened_file_path&quot;: &quot;C:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout&quot;, "last_opened_file_path": "C:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout",
&quot;project.structure.last.edited&quot;: &quot;Modules&quot;, "project.structure.last.edited": "Modules",
&quot;project.structure.proportion&quot;: &quot;0.17&quot;, "project.structure.proportion": "0.17",
&quot;project.structure.side.proportion&quot;: &quot;0.2&quot;, "project.structure.side.proportion": "0.2",
&quot;run.code.analysis.last.selected.profile&quot;: &quot;pProject Default&quot;, "rearrange.code.on.save": "true",
&quot;settings.editor.selected.configurable&quot;: &quot;preferences.editor.code.editing&quot; "run.code.analysis.last.selected.profile": "pProject Default",
"settings.editor.selected.configurable": "actions.on.save"
}, },
&quot;keyToStringList&quot;: { "keyToStringList": {
&quot;ExportApk.BuildVariants&quot;: [ "ExportApk.BuildVariants": [
&quot;betaRelease&quot; "betaRelease"
], ],
&quot;com.android.tools.idea.sqlite.queryhistory&quot;: [ "com.android.tools.idea.sqlite.queryhistory": [
&quot;select * from expedition where routeFk=182933;&quot;, "select * from expedition where routeFk=182933;",
&quot;select * from expedition;&quot;, "select * from expedition;",
&quot;select * from expeditionPending;&quot;, "select * from expeditionPending;",
&quot;select * from expedition where id = 7753995;\n\n&quot;, "select * from expedition where id = 7753995;\n\n",
&quot;\nselect * from expedition where id = 7753995;&quot; "\nselect * from expedition where id = 7753995;"
], ],
&quot;kotlin-gradle-user-dirs&quot;: [ "kotlin-gradle-user-dirs": [
&quot;C:\\Users\\sergiodt\\.gradle&quot; "C:\\Users\\sergiodt\\.gradle"
] ]
} }
}</component> }]]></component>
<component name="PsdUISettings"> <component name="PsdUISettings">
<option name="MODULE_TAB" value="Properties" /> <option name="MODULE_TAB" value="Properties" />
<option name="LAST_EDITED_SIGNING_CONFIG" value="debug" /> <option name="LAST_EDITED_SIGNING_CONFIG" value="debug" />
@ -1145,7 +1228,7 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1709725795643</updated> <updated>1709725795643</updated>
</task> </task>
<option name="localTasksCounter" value="335" /> <option name="localTasksCounter" value="338" />
<servers /> <servers />
</component> </component>
<component name="Vcs.Log.History.Properties"> <component name="Vcs.Log.History.Properties">
@ -1273,8 +1356,6 @@
</component> </component>
<component name="VcsManagerConfiguration"> <component name="VcsManagerConfiguration">
<option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" /> <option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
<MESSAGE value="refs #6530 feat:refactorOnBackPressed" />
<MESSAGE value="feat changeCategory #refs 4979" />
<MESSAGE value="feat refactor Ubicador #refs 6413" /> <MESSAGE value="feat refactor Ubicador #refs 6413" />
<MESSAGE value="feat notesDelivery #refs 6921" /> <MESSAGE value="feat notesDelivery #refs 6921" />
<MESSAGE value="feat lilium" /> <MESSAGE value="feat lilium" />
@ -1298,7 +1379,9 @@
<MESSAGE value="feat reservas refs #6861" /> <MESSAGE value="feat reservas refs #6861" />
<MESSAGE value="version 24.30" /> <MESSAGE value="version 24.30" />
<MESSAGE value="feat itemGetBalance refs #6769" /> <MESSAGE value="feat itemGetBalance refs #6769" />
<option name="LAST_COMMIT_MESSAGE" value="feat itemGetBalance refs #6769" /> <MESSAGE value="feat: boxPickingPrepared refs #7855" />
<MESSAGE value="feat: refactorResponse PasillerosItem refs #7827" />
<option name="LAST_COMMIT_MESSAGE" value="feat: refactorResponse PasillerosItem refs #7827" />
</component> </component>
<component name="XDebuggerManager"> <component name="XDebuggerManager">
<breakpoint-manager> <breakpoint-manager>

4
app/build.gradle
View File

@ -13,8 +13,8 @@ android {
applicationId "es.verdnatura" applicationId "es.verdnatura"
minSdkVersion 26 minSdkVersion 26
targetSdkVersion 33 // se deja con target si no Play Protect la bloquea targetSdkVersion 33 // se deja con target si no Play Protect la bloquea
versionCode 324 versionCode 326
versionName = "24.32Beta" versionName = "24.36Beta"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
} }

5
app/src/main/java/es/verdnatura/di/viewModelModule.kt
View File

@ -21,7 +21,6 @@ import es.verdnatura.presentation.view.feature.packaging.fragment.SupplierViewMo
import es.verdnatura.presentation.view.feature.packingHolland.fragment.PackingHollandViewModel import es.verdnatura.presentation.view.feature.packingHolland.fragment.PackingHollandViewModel
import es.verdnatura.presentation.view.feature.paletizador.fragment.CmrExpeditionPalletViewModel import es.verdnatura.presentation.view.feature.paletizador.fragment.CmrExpeditionPalletViewModel
import es.verdnatura.presentation.view.feature.paletizador.fragment.ExpeditionPalletDetailViewModel import es.verdnatura.presentation.view.feature.paletizador.fragment.ExpeditionPalletDetailViewModel
import es.verdnatura.presentation.view.feature.paletizador.fragment.ExpeditionPalletViewModel
import es.verdnatura.presentation.view.feature.paletizador.fragment.ExpeditionScanSorterViewModel import es.verdnatura.presentation.view.feature.paletizador.fragment.ExpeditionScanSorterViewModel
import es.verdnatura.presentation.view.feature.paletizador.fragment.ExpeditionScanViewModel import es.verdnatura.presentation.view.feature.paletizador.fragment.ExpeditionScanViewModel
import es.verdnatura.presentation.view.feature.paletizador.fragment.ExpeditionStateViewModel import es.verdnatura.presentation.view.feature.paletizador.fragment.ExpeditionStateViewModel
@ -125,10 +124,6 @@ val viewModelModule = module {
ExpeditionTruckListViewModel(androidContext()) ExpeditionTruckListViewModel(androidContext())
} }
viewModel {
ExpeditionPalletViewModel(androidContext())
}
viewModel { viewModel {
ExpeditionPalletDetailViewModel(androidContext()) ExpeditionPalletDetailViewModel(androidContext())
} }

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

@ -160,7 +160,7 @@ interface SalixService {
@POST("Applications/expedition_checkRoute/execute-func") @POST("Applications/expedition_checkRoute/execute-func")
fun expeditionCheckRoute( fun expeditionCheckRoute(
@Query("params") params: Any, @Query("schema") schema: String = "vn" @Query("params") params: Any, @Query("schema") schema: String = "vn"
): Call<String> ): Call<Int>
@GET("ExpeditionStates/filter") @GET("ExpeditionStates/filter")
fun getExpeditionStates( fun getExpeditionStates(
@ -264,10 +264,6 @@ interface SalixService {
@Body workerActionSalix: WorkerActionSalix @Body workerActionSalix: WorkerActionSalix
): Call<Any> ): Call<Any>
@GET("workerActivityTypes")
fun workerActivityList(
): Call<Any>
@POST("Applications/cmrPallet_add/execute-proc") @POST("Applications/cmrPallet_add/execute-proc")
fun cmrPalletAdd( fun cmrPalletAdd(
@Query("params") params: Any? = null, @Query("schema") schema: String = "vn" @Query("params") params: Any? = null, @Query("schema") schema: String = "vn"

16
app/src/main/java/es/verdnatura/presentation/common/GeneralAdapter.kt
View File

@ -10,30 +10,28 @@ class GeneralAdapter(
private val items: List<GeneralItem>, private val items: List<GeneralItem>,
private val OnGeneralItemRowClickListener: OnGeneralItemRowClickListener, private val OnGeneralItemRowClickListener: OnGeneralItemRowClickListener,
// private var showDelete: Boolean = false // private var showDelete: Boolean = false
): RecyclerView.Adapter<GeneralAdapter.ItemHolder> () { ) : RecyclerView.Adapter<GeneralAdapter.ItemHolder>() {
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemHolder { override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemHolder {
return ItemHolder( return ItemHolder(
ItemGeneralRowBinding.inflate(LayoutInflater.from(parent.context),parent,false) ItemGeneralRowBinding.inflate(LayoutInflater.from(parent.context), parent, false)
) )
} }
override fun getItemCount() =items.size override fun getItemCount() = items.size
override fun onBindViewHolder(holder: ItemHolder, position: Int) { override fun onBindViewHolder(holder: ItemHolder, position: Int) {
holder.bind(items[position]) holder.bind(items[position])
holder.binding.root.setOnClickListener { holder.binding.root.setOnClickListener {
OnGeneralItemRowClickListener.OnGeneralItemRowClickListener(items[position]) OnGeneralItemRowClickListener.onGeneralItemRowClickListener(items[position])
} }
} }
inner class ItemHolder( inner class ItemHolder(
val binding: ItemGeneralRowBinding val binding: ItemGeneralRowBinding
) : RecyclerView.ViewHolder(binding.root){ ) : RecyclerView.ViewHolder(binding.root) {
//private val res = binding.root.context.resources //private val res = binding.root.context.resources
fun bind(item: GeneralItem) { fun bind(item: GeneralItem) {
binding.apply { binding.apply {
@ -41,8 +39,8 @@ class GeneralAdapter(
/*if (showDelete) itemImage.visibility = View.VISIBLE /*if (showDelete) itemImage.visibility = View.VISIBLE
else itemImage.visibility = View.GONE*/ else itemImage.visibility = View.GONE*/
itemCode.visibility=View.GONE itemCode.visibility = View.GONE
}
} }
} }
} }
}

16
app/src/main/java/es/verdnatura/presentation/common/UICallbacks.kt
View File

@ -77,6 +77,7 @@ interface OnItemButtonTicketRowClickListener {
interface OnItemButtonRoadMapStopRowClickListener { interface OnItemButtonRoadMapStopRowClickListener {
fun onItemButtonRoadMapStopRowClickListener(item: ClientTicketSalix, action: String) fun onItemButtonRoadMapStopRowClickListener(item: ClientTicketSalix, action: String)
} }
interface OnItemButtonCMRRowClickListener { interface OnItemButtonCMRRowClickListener {
fun onItemButtonCMRRowClickListener(item: Ticket) fun onItemButtonCMRRowClickListener(item: Ticket)
} }
@ -94,11 +95,11 @@ interface OnBarcodeRowClickListener {
} }
interface OnSmartTagRowClickListener { interface OnSmartTagRowClickListener {
fun OnSmartTagRowClickListener(item: SmartTag) fun onSmartTagRowClickListener(item: SmartTag)
} }
interface OnGeneralItemRowClickListener { interface OnGeneralItemRowClickListener {
fun OnGeneralItemRowClickListener(item: GeneralItem) fun onGeneralItemRowClickListener(item: GeneralItem)
} }
interface OnImageTrashClickListener { interface OnImageTrashClickListener {
@ -106,8 +107,9 @@ interface OnImageTrashClickListener {
} }
interface OnEditSubQuantityListener { interface OnEditSubQuantityListener {
fun OnEditSubQuantityListener(item: Any, text: String) fun onEditSubQuantityListener(item: Any, text: String)
} }
interface AdapterCallback { interface AdapterCallback {
fun getPosition(): Int fun getPosition(): Int
} }
@ -117,15 +119,15 @@ interface OnItemClickListener {
} }
interface OnImageUpdateClickListener { interface OnImageUpdateClickListener {
fun OnImageUpdateClickListener(item: Any) fun onImageUpdateClickListener(item: Any)
} }
interface OnWorkFormsItemRowClickListener { interface OnWorkFormsItemRowClickListener {
fun OnWorkFormsItemRowClickListener(item: WorkForms) fun onWorkFormsItemRowClickListener(item: WorkForms)
} }
interface OnTrashItemRowClickListener { interface OnTrashItemRowClickListener {
fun OnTrashItemRowClickListener(item: WorkForms) fun onTrashItemRowClickListener(item: WorkForms)
} }
interface OnLocationRowClickListener { interface OnLocationRowClickListener {
@ -209,7 +211,7 @@ interface OnComprobarPalletViewClickListener {
} }
interface OnScanLongClickListener { interface OnScanLongClickListener {
fun onScanLongClickListener(ItemExpeditionScanVO: ItemExpeditionScanVO) fun onScanLongClickListener(itemExpeditionScanVO: ItemExpeditionScanVO)
} }
interface OnCollectionSelectedListener { interface OnCollectionSelectedListener {

19
app/src/main/java/es/verdnatura/presentation/common/UtilFunctions.kt
View File

@ -1,13 +1,18 @@
package es.verdnatura.presentation.common package es.verdnatura.presentation.common
import android.content.Context
import com.google.gson.Gson import com.google.gson.Gson
import com.google.gson.reflect.TypeToken import com.google.gson.reflect.TypeToken
import es.verdnatura.R
import java.text.SimpleDateFormat
import java.util.Calendar
import java.util.Locale
class FunctionUtils{ class FunctionUtils{
fun getMessageFromJSON(json: String): String { fun getMessageFromJSON(json: String): String {
val gson = Gson() val gson = Gson()
var message = "" var message = ""
var tutorialMap: Map<String, Any> = val tutorialMap: Map<String, Any> =
gson.fromJson(json, object : TypeToken<Map<String, Any>>() {}.type) gson.fromJson(json, object : TypeToken<Map<String, Any>>() {}.type)
tutorialMap.forEach { tutorialMap.forEach {
if (it.key == "Message") { if (it.key == "Message") {
@ -19,9 +24,9 @@ class FunctionUtils{
fun getListFromJSON(json: String): List<String> { fun getListFromJSON(json: String): List<String> {
val gson = Gson() val gson = Gson()
var list = mutableListOf<String>() val list = mutableListOf<String>()
// val mapType = object : TypeToken<Map<String, Any>>() {}.type // val mapType = object : TypeToken<Map<String, Any>>() {}.type
var tutorialMap: Map<String, Any> = val tutorialMap: Map<String, Any> =
gson.fromJson(json, object : TypeToken<Map<String, Any>>() {}.type) gson.fromJson(json, object : TypeToken<Map<String, Any>>() {}.type)
tutorialMap.forEach { tutorialMap.forEach {
@ -30,4 +35,12 @@ class FunctionUtils{
} }
return list return list
} }
private fun getCurdate(date: String, context: Context): String {
val c = Calendar.getInstance()
val df = SimpleDateFormat(context.getString(R.string.dateCompleteFormat), Locale.getDefault())
val df2 = SimpleDateFormat(context.getString(R.string.timeFormat), Locale.getDefault())
c.time = df.parse(date)!!
return df2.format(c.time)
}
} }

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

@ -106,7 +106,7 @@ class AjustesFragment :
mobileApplication.dataStoreApp.readDataStoreKey<String>( mobileApplication.dataStoreApp.readDataStoreKey<String>(
ANDROID_ID ANDROID_ID
) + "\n" + ) + "\n" +
if (mobileApplication.serialNumber != "") { if (!mobileApplication.serialNumber.isNullOrBlank() ) {
getString(R.string.serialNumber) + "\t" + getString(R.string.serialNumber) + "\t" +
mobileApplication.serialNumber mobileApplication.serialNumber
} else "" } else ""
@ -141,7 +141,7 @@ class AjustesFragment :
getString(R.string.vehicleControl) -> ma.onPasillerosItemClickListener( getString(R.string.vehicleControl) -> ma.onPasillerosItemClickListener(
PasillerosItemVO( PasillerosItemVO(
title = getString(R.string.titleUserControlVehicle) title = R.string.titleUserControlVehicle
), mobileApplication.userId.toString() ), mobileApplication.userId.toString()
) )
@ -290,7 +290,7 @@ class AjustesFragment :
val arrayList: ArrayList<String> = arrayListOf() val arrayList: ArrayList<String> = arrayListOf()
pasilleroViewModel.pasillerositem.forEach { pasilleroViewModel.pasillerositem.forEach {
arrayList.add(it.title) arrayList.add(getString(it.title!!))
} }
arrayList.add(getString(R.string.all)) arrayList.add(getString(R.string.all))
arrayList.sorted() arrayList.sorted()

6
app/src/main/java/es/verdnatura/presentation/view/feature/articulo/adapter/ItemProposalAdapter.kt
View File

@ -51,21 +51,21 @@ class ItemProposalAdapter(
itemFk.setOnClickListener { itemFk.setOnClickListener {
onPasillerosItemClickListener.onPasillerosItemClickListener( onPasillerosItemClickListener.onPasillerosItemClickListener(
PasillerosItemVO( PasillerosItemVO(
title = res.getString(R.string.itemSearch) title =R.string.itemSearch
), item.itemFk.toString() ), item.itemFk.toString()
) )
} }
itemUp.setOnClickListener { itemUp.setOnClickListener {
onPasillerosItemClickListener.onPasillerosItemClickListener( onPasillerosItemClickListener.onPasillerosItemClickListener(
PasillerosItemVO( PasillerosItemVO(
title = res.getString(R.string.titleItemSearch) title = R.string.titleItemSearch
), item.itemFk.toString() ), item.itemFk.toString()
) )
} }
itemDown.setOnClickListener { itemDown.setOnClickListener {
onPasillerosItemClickListener.onPasillerosItemClickListener( onPasillerosItemClickListener.onPasillerosItemClickListener(
PasillerosItemVO( PasillerosItemVO(
title = res.getString(R.string.titleItemSearch) title = R.string.titleItemSearch
), item.itemFk.toString() ), item.itemFk.toString()
) )
} }

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

@ -119,7 +119,7 @@ class ItemCardFragment(
iconHistory.drawable -> { iconHistory.drawable -> {
ma.onPasillerosItemClickListener( ma.onPasillerosItemClickListener(
PasillerosItemVO(title = getString(R.string.titleHistorical)), PasillerosItemVO(title = R.string.titleHistorical),
itemInfoG!!.id.toString() itemInfoG!!.id.toString()
) )
@ -137,7 +137,7 @@ class ItemCardFragment(
) )
ma.onPasillerosItemClickListener( ma.onPasillerosItemClickListener(
PasillerosItemVO( PasillerosItemVO(
title = getString(R.string.titleWebViewer), title = R.string.titleWebViewer,
), entryPoint = entryPoint ), entryPoint = entryPoint
) )
@ -379,7 +379,7 @@ class ItemCardFragment(
"itemProposal" -> { "itemProposal" -> {
ma.onPasillerosItemClickListener( ma.onPasillerosItemClickListener(
PasillerosItemVO( PasillerosItemVO(
title = getString(R.string.titleSearchSimilarItems) title = R.string.titleSearchSimilarItems
), itemInfoG!!.id.toString() ), itemInfoG!!.id.toString()
) )
} }
@ -391,7 +391,7 @@ class ItemCardFragment(
"buscarItem" -> { "buscarItem" -> {
ma.onPasillerosItemClickListener( ma.onPasillerosItemClickListener(
PasillerosItemVO( PasillerosItemVO(
title = getString(R.string.titleItemSearch) title = R.string.titleItemSearch
), itemInfoG!!.id.toString() ), itemInfoG!!.id.toString()
) )
} }

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

@ -11,7 +11,6 @@ import es.verdnatura.presentation.base.BaseViewModel
import es.verdnatura.presentation.common.Event import es.verdnatura.presentation.common.Event
import es.verdnatura.presentation.common.ItemBarCodeSalix import es.verdnatura.presentation.common.ItemBarCodeSalix
import es.verdnatura.presentation.common.ItemDiscardSalixShortage import es.verdnatura.presentation.common.ItemDiscardSalixShortage
import es.verdnatura.presentation.common.ResponseItemVO
import es.verdnatura.presentation.view.feature.articulo.model.AddressLoses import es.verdnatura.presentation.view.feature.articulo.model.AddressLoses
import es.verdnatura.presentation.view.feature.articulo.model.AddressLosesList import es.verdnatura.presentation.view.feature.articulo.model.AddressLosesList
import es.verdnatura.presentation.view.feature.articulo.model.ItemCardVO import es.verdnatura.presentation.view.feature.articulo.model.ItemCardVO
@ -94,7 +93,7 @@ class ItemCardViewModel(var context: Context) : BaseViewModel(context) {
).enqueue(object : SalixCallback<Any>(context) { ).enqueue(object : SalixCallback<Any>(context) {
override fun onSuccess(response: Response<Any>) { override fun onSuccess(response: Response<Any>) {
getItemCard(itemFk,warehouseFk) getItemCard(itemFk, warehouseFk)
super.onSuccess(response) super.onSuccess(response)
} }
}) })
@ -107,7 +106,7 @@ class ItemCardViewModel(var context: Context) : BaseViewModel(context) {
salix.updateGrouping(params = arrayListOf(warehouseFk, itemFk, value)) salix.updateGrouping(params = arrayListOf(warehouseFk, itemFk, value))
.enqueue(object : SalixCallback<Any>(context) { .enqueue(object : SalixCallback<Any>(context) {
override fun onSuccess(response: Response<Any>) { override fun onSuccess(response: Response<Any>) {
getItemCard(itemFk,warehouseFk) getItemCard(itemFk, warehouseFk)
super.onSuccess(response) super.onSuccess(response)
} }
@ -121,7 +120,7 @@ class ItemCardViewModel(var context: Context) : BaseViewModel(context) {
salix.updatePacking(params = arrayListOf(warehouseFk, itemFk, value)) salix.updatePacking(params = arrayListOf(warehouseFk, itemFk, value))
.enqueue(object : SalixCallback<Any>(context) { .enqueue(object : SalixCallback<Any>(context) {
override fun onSuccess(response: Response<Any>) { override fun onSuccess(response: Response<Any>) {
getItemCard(itemFk,warehouseFk) getItemCard(itemFk, warehouseFk)
super.onSuccess(response) super.onSuccess(response)
} }
@ -129,13 +128,13 @@ class ItemCardViewModel(var context: Context) : BaseViewModel(context) {
} }
fun updateStems( fun updateStems(
itemFk: Int, value: Int?,warehouseFk: Int itemFk: Int, value: Int?, warehouseFk: Int
) { ) {
salix.updateItem(itemFk, hashMapOf("stems" to value)) salix.updateItem(itemFk, hashMapOf("stems" to value))
.enqueue(object : SalixCallback<Any>(context) { .enqueue(object : SalixCallback<Any>(context) {
override fun onSuccess(response: Response<Any>) { override fun onSuccess(response: Response<Any>) {
getItemCard(itemFk,warehouseFk) getItemCard(itemFk, warehouseFk)
super.onSuccess(response) super.onSuccess(response)
} }
}) })
@ -148,7 +147,7 @@ class ItemCardViewModel(var context: Context) : BaseViewModel(context) {
.enqueue(object : SalixCallback<Any>(context) { .enqueue(object : SalixCallback<Any>(context) {
override fun onSuccess(response: Response<Any>) { override fun onSuccess(response: Response<Any>) {
getItemCard(itemFk,warehouseFk) getItemCard(itemFk, warehouseFk)
super.onSuccess(response) super.onSuccess(response)
} }
}) })
@ -165,7 +164,7 @@ class ItemCardViewModel(var context: Context) : BaseViewModel(context) {
}) })
} }
fun barcodesEditSalix(itemFk: Int, barCodeValue: String, delete: Boolean,warehouseFk: Int) { fun barcodesEditSalix(itemFk: Int, barCodeValue: String, delete: Boolean, warehouseFk: Int) {
if (delete) { if (delete) {
salix.barcodesDelete(itemFk = itemFk, barcode = barCodeValue) salix.barcodesDelete(itemFk = itemFk, barcode = barCodeValue)
@ -177,15 +176,11 @@ class ItemCardViewModel(var context: Context) : BaseViewModel(context) {
}.enqueue(object : SalixCallback<Any>(context) { }.enqueue(object : SalixCallback<Any>(context) {
override fun onSuccess(response: Response<Any>) { override fun onSuccess(response: Response<Any>) {
getItemCard(itemFk,warehouseFk) getItemCard(itemFk, warehouseFk)
} }
}) })
} }
private val _responseinsert by lazy { MutableLiveData<ResponseItemVO>() }
val responseinsert: LiveData<ResponseItemVO>
get() = _responseinsert
fun uploadPhoto( fun uploadPhoto(
urlImage: String, urlImage: String,
itemFK: Number, itemFK: Number,
@ -197,12 +192,6 @@ class ItemCardViewModel(var context: Context) : BaseViewModel(context) {
) { ) {
salix.uploadImage("catalog", itemFK, filePart) salix.uploadImage("catalog", itemFK, filePart)
.enqueue(object : SalixCallback<Any>(context) { .enqueue(object : SalixCallback<Any>(context) {
override fun onSuccess(response: Response<Any>) {
_responseinsert.value = ResponseItemVO(
isError = false
)
}
}) })
} }

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

@ -157,7 +157,7 @@ class BufferLoadFragment(
tagsAdapter = BufferAdapter(listTags, object : OnSmartTagRowClickListener { tagsAdapter = BufferAdapter(listTags, object : OnSmartTagRowClickListener {
override fun OnSmartTagRowClickListener(item: SmartTag) { override fun onSmartTagRowClickListener(item: SmartTag) {
} }
}, showDelete = false) }, showDelete = false)
customDialogList.getRecyclerView().adapter = tagsAdapter customDialogList.getRecyclerView().adapter = tagsAdapter

14
app/src/main/java/es/verdnatura/presentation/view/feature/buffer/fragment/adapter/BufferAdapter.kt
View File

@ -1,6 +1,5 @@
package es.verdnatura.presentation.view.feature.buffer.fragment.adapter package es.verdnatura.presentation.view.feature.buffer.fragment.adapter
import android.view.LayoutInflater import android.view.LayoutInflater
import android.view.View import android.view.View
import android.view.ViewGroup import android.view.ViewGroup
@ -9,35 +8,32 @@ import es.verdnatura.databinding.ItemSmarttagRowBinding
import es.verdnatura.presentation.common.OnSmartTagRowClickListener import es.verdnatura.presentation.common.OnSmartTagRowClickListener
import es.verdnatura.presentation.view.feature.smarttag.model.SmartTag import es.verdnatura.presentation.view.feature.smarttag.model.SmartTag
class BufferAdapter( class BufferAdapter(
private val items: List<SmartTag>, private val items: List<SmartTag>,
private val onSmartTagRowClickListener: OnSmartTagRowClickListener, private val onSmartTagRowClickListener: OnSmartTagRowClickListener,
private var showDelete: Boolean = true private var showDelete: Boolean = true
): RecyclerView.Adapter<BufferAdapter.ItemHolder> () { ) : RecyclerView.Adapter<BufferAdapter.ItemHolder>() {
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemHolder { override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemHolder {
return ItemHolder( return ItemHolder(
ItemSmarttagRowBinding.inflate(LayoutInflater.from(parent.context),parent,false) ItemSmarttagRowBinding.inflate(LayoutInflater.from(parent.context), parent, false)
) )
} }
override fun getItemCount() =items.size override fun getItemCount() = items.size
override fun onBindViewHolder(holder: ItemHolder, position: Int) { override fun onBindViewHolder(holder: ItemHolder, position: Int) {
holder.bind(items[position]) holder.bind(items[position])
holder.binding.root.setOnClickListener { holder.binding.root.setOnClickListener {
onSmartTagRowClickListener.OnSmartTagRowClickListener(items[position]) onSmartTagRowClickListener.onSmartTagRowClickListener(items[position])
} }
} }
inner class ItemHolder( inner class ItemHolder(
val binding: ItemSmarttagRowBinding val binding: ItemSmarttagRowBinding
) : RecyclerView.ViewHolder(binding.root){ ) : RecyclerView.ViewHolder(binding.root) {
private val res = binding.root.context.resources private val res = binding.root.context.resources
fun bind(item: SmartTag) { fun bind(item: SmartTag) {
binding.apply { binding.apply {

4
app/src/main/java/es/verdnatura/presentation/view/feature/buscaritem/adapter/LocationAdapter.kt
View File

@ -26,8 +26,8 @@ class LocationAdapter (
override fun onBindViewHolder(holder: ItemHolder, position: Int) { override fun onBindViewHolder(holder: ItemHolder, position: Int) {
holder.bind(items[position]) holder.bind(items[position])
holder.binding.root.setOnClickListener { holder.binding.root.setOnClickListener {
onPasillerosItemClickListener.onPasillerosItemClickListener(PasillerosItemVO(title = holder.binding.root.context.getString( onPasillerosItemClickListener.onPasillerosItemClickListener(PasillerosItemVO(title =
R.string.titleUbicator)),items[position].Matricula) R.string.titleUbicator),items[position].Matricula)
} }
} }

18
app/src/main/java/es/verdnatura/presentation/view/feature/category/ChangeCategoryFragment.kt
View File

@ -167,29 +167,15 @@ class ChangeCategoryFragment(var entrypoint: String) :
if (it == true) { if (it == true) {
scanShelving() scanShelving()
} else { } else {
resetTxt()
}
}
responseItem.observe(viewLifecycleOwner) {
if (it.isError) {
isScannedForDetails = false isScannedForDetails = false
scanShelving() scanShelving()
ma.messageWithSound(
message = it.errorMessage,
titleWithError = getString(R.string.errorChangeCategory),
isError = true,
isPlayed = true,
isToasted = false
)
resetTxt() resetTxt()
}
}
} }
} }
}
}
private fun resetTxt() { private fun resetTxt() {
binding.itemFK.setText("") binding.itemFK.setText("")

23
app/src/main/java/es/verdnatura/presentation/view/feature/category/ChangeCategoryViewModel.kt
View File

@ -6,9 +6,6 @@ import androidx.lifecycle.MutableLiveData
import es.verdnatura.domain.SalixCallback import es.verdnatura.domain.SalixCallback
import es.verdnatura.domain.formatWithQuotes import es.verdnatura.domain.formatWithQuotes
import es.verdnatura.presentation.base.BaseViewModel 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.articulo.model.ItemDetails import es.verdnatura.presentation.view.feature.articulo.model.ItemDetails
import retrofit2.Response import retrofit2.Response
@ -19,13 +16,17 @@ class ChangeCategoryViewModel(val context: Context) : BaseViewModel(context) {
private val _responseDevalue by lazy { MutableLiveData<Boolean>() } private val _responseDevalue by lazy { MutableLiveData<Boolean>() }
var responseDevalue: LiveData<Boolean> = _responseDevalue var responseDevalue: LiveData<Boolean> = _responseDevalue
private val _responseItem by lazy { MutableLiveData<ResponseItemVO>() }
var responseItem: LiveData<ResponseItemVO> = _responseItem
fun itemDevalueA2( fun itemDevalueA2(
itemFk: Long, shelvingFk: String, buyingValue: Double, quantity: Int itemFk: Long, shelvingFk: String, buyingValue: Double, quantity: Int
) { ) {
salix.itemDevalueA2(params = arrayListOf(itemFk, shelvingFk, buyingValue, quantity).formatWithQuotes()) salix.itemDevalueA2(
params = arrayListOf(
itemFk,
shelvingFk,
buyingValue,
quantity
).formatWithQuotes()
)
.enqueue(object : SalixCallback<Unit>(context) { .enqueue(object : SalixCallback<Unit>(context) {
override fun onSuccess(response: Response<Unit>) { override fun onSuccess(response: Response<Unit>) {
_responseDevalue.value = true _responseDevalue.value = true
@ -33,11 +34,8 @@ class ChangeCategoryViewModel(val context: Context) : BaseViewModel(context) {
} }
override fun onError(t: Throwable) { override fun onError(t: Throwable) {
_responseItem.value = ResponseItemVO( super.onError(t)
isError = true, errorMessage = getMessageFromAllResponse( _responseDevalue.value = false
nameofFunction(this), t.message!!
)
)
} }
}) })
} }
@ -59,7 +57,6 @@ class ChangeCategoryViewModel(val context: Context) : BaseViewModel(context) {
} }
}) })
} }
} }

5
app/src/main/java/es/verdnatura/presentation/view/feature/claim/fragment/reubication/adapter/ReubicatorAdapter.kt
View File

@ -9,9 +9,8 @@ import es.verdnatura.R
import es.verdnatura.databinding.ItemArticleRowReubicationFragmentBinding import es.verdnatura.databinding.ItemArticleRowReubicationFragmentBinding
import es.verdnatura.presentation.common.OnPasillerosItemClickListener import es.verdnatura.presentation.common.OnPasillerosItemClickListener
import es.verdnatura.presentation.common.OnReubicationClickListener import es.verdnatura.presentation.common.OnReubicationClickListener
import es.verdnatura.presentation.view.feature.pasillero.model.PasillerosItemVO
import es.verdnatura.presentation.view.feature.claim.fragment.reubication.model.Reubication import es.verdnatura.presentation.view.feature.claim.fragment.reubication.model.Reubication
import es.verdnatura.presentation.view.feature.pasillero.model.PasillerosItemVO
class ReubicatorAdapter( class ReubicatorAdapter(
private val items: List<Reubication>, private val items: List<Reubication>,
@ -48,7 +47,7 @@ class ReubicatorAdapter(
itemArticleItemFk.setOnClickListener { itemArticleItemFk.setOnClickListener {
onPasillerosItemClickListener.onPasillerosItemClickListener( onPasillerosItemClickListener.onPasillerosItemClickListener(
PasillerosItemVO( PasillerosItemVO(
title = binding.root.context.getString(R.string.titleItemConsult) title = R.string.titleItemConsult
), reubication.itemFk.toString() ), reubication.itemFk.toString()
) )
} }

5
app/src/main/java/es/verdnatura/presentation/view/feature/claim/fragment/reubication/adapter/ReubicatorPlacementAdapter.kt
View File

@ -7,8 +7,8 @@ import androidx.recyclerview.widget.RecyclerView
import es.verdnatura.R import es.verdnatura.R
import es.verdnatura.databinding.ItemPlacementReubicationRowBinding import es.verdnatura.databinding.ItemPlacementReubicationRowBinding
import es.verdnatura.presentation.common.OnPasillerosItemClickListener import es.verdnatura.presentation.common.OnPasillerosItemClickListener
import es.verdnatura.presentation.view.feature.pasillero.model.PasillerosItemVO
import es.verdnatura.presentation.view.feature.claim.fragment.reubication.model.PlacementReubication import es.verdnatura.presentation.view.feature.claim.fragment.reubication.model.PlacementReubication
import es.verdnatura.presentation.view.feature.pasillero.model.PasillerosItemVO
class ReubicatorPlacementAdapter( class ReubicatorPlacementAdapter(
private val items: List<PlacementReubication>, private val items: List<PlacementReubication>,
@ -46,9 +46,8 @@ class ReubicatorPlacementAdapter(
itemRootLayout.setOnClickListener { itemRootLayout.setOnClickListener {
onPasillerosItemClickListener.onPasillerosItemClickListener( onPasillerosItemClickListener.onPasillerosItemClickListener(
PasillerosItemVO( PasillerosItemVO(
title = binding.root.context.getString( title =
R.string.titleUbicator R.string.titleUbicator
)
), placement.plate ), placement.plate
) )
} }

4
app/src/main/java/es/verdnatura/presentation/view/feature/claim/fragment/ubication/ClaimUbicationFragment.kt
View File

@ -52,7 +52,7 @@ class ClaimUbicationFragment(
private fun setAdapter() { private fun setAdapter() {
claimAdapter = GeneralAdapter(listClaims, object : OnGeneralItemRowClickListener { claimAdapter = GeneralAdapter(listClaims, object : OnGeneralItemRowClickListener {
override fun OnGeneralItemRowClickListener(item: GeneralItem) { override fun onGeneralItemRowClickListener(item: GeneralItem) {
} }
}) })
customDialogList.getRecyclerView().adapter = claimAdapter customDialogList.getRecyclerView().adapter = claimAdapter
@ -127,7 +127,7 @@ class ClaimUbicationFragment(
} catch (e: Exception) { } catch (e: Exception) {
getString(R.string.errorInput).toast(requireContext()) getString(R.string.errorInput).toast(requireContext())
listClaims.clear() listClaims.clear()
claimAdapter!!.notifyItemRangeRemoved(0,1) claimAdapter!!.notifyItemRangeRemoved(0, 1)
showInputClaim() showInputClaim()
} }
} }

4
app/src/main/java/es/verdnatura/presentation/view/feature/collection/adapter/PlacementAdapter.kt
View File

@ -40,8 +40,8 @@ class PlacementAdapter (
this.item = placement this.item = placement
itemRootLayout.setOnClickListener { itemRootLayout.setOnClickListener {
onPasillerosItemClickListener.onPasillerosItemClickListener(PasillerosItemVO(title = binding.root.context.getString( onPasillerosItemClickListener.onPasillerosItemClickListener(PasillerosItemVO(title =
R.string.titleUbicator)),placement.shelving) R.string.titleUbicator),placement.shelving)
} }
} }
} }

4
app/src/main/java/es/verdnatura/presentation/view/feature/collection/adapter/SaleAdapter.kt
View File

@ -91,7 +91,7 @@ class SaleAdapter(
itemArticleItemFk.setOnClickListener { itemArticleItemFk.setOnClickListener {
onPasillerosItemClickListener.onPasillerosItemClickListener( onPasillerosItemClickListener.onPasillerosItemClickListener(
PasillerosItemVO( PasillerosItemVO(
title = binding.root.context.getString(R.string.titleItemConsult) title = R.string.titleItemConsult
), sale.itemFk.toString() ), sale.itemFk.toString()
) )
} }
@ -340,7 +340,7 @@ class SaleAdapter(
txtdeNew.visibility = View.VISIBLE txtdeNew.visibility = View.VISIBLE
itemArticleQuantityPicked.visibility = View.VISIBLE itemArticleQuantityPicked.visibility = View.VISIBLE
itemArticleQuantityLine3.visibility = View.VISIBLE itemArticleQuantityLine3.visibility = View.VISIBLE
if (type != SACADOR) {//6276 hasMistake == retrocompatibilidad if (type != SACADOR) {
val colorRes = val colorRes =
if (sale.hasMistake == true || sale.hasMistake == 1) R.color.verdnatura_red_salix else R.color.verdnatura_black if (sale.hasMistake == true || sale.hasMistake == 1) R.color.verdnatura_red_salix else R.color.verdnatura_black
imageErrorMessage.imageTintList = imageErrorMessage.imageTintList =

4
app/src/main/java/es/verdnatura/presentation/view/feature/collection/adapter/SaleAdapterNew.kt
View File

@ -103,7 +103,7 @@ class SaleAdapterNew(
itemArticleLongInfo.setOnClickListener { itemArticleLongInfo.setOnClickListener {
onPasillerosItemClickListener.onPasillerosItemClickListener( onPasillerosItemClickListener.onPasillerosItemClickListener(
PasillerosItemVO( PasillerosItemVO(
title = binding.root.context.getString(R.string.titleItemConsult) title = R.string.titleItemConsult
), sale.itemFk.toString() ), sale.itemFk.toString()
) )
} }
@ -111,7 +111,7 @@ class SaleAdapterNew(
itemArticleItemFkNew.setOnClickListener { itemArticleItemFkNew.setOnClickListener {
onPasillerosItemClickListener.onPasillerosItemClickListener( onPasillerosItemClickListener.onPasillerosItemClickListener(
PasillerosItemVO( PasillerosItemVO(
title = binding.root.context.getString(R.string.titleItemConsult) title = R.string.titleItemConsult
), sale.itemFk.toString() ), sale.itemFk.toString()
) )
} }

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

@ -266,7 +266,7 @@ class CollectionFragment(
iconUpdate.drawable -> updateScreen() iconUpdate.drawable -> updateScreen()
iconParking.drawable -> pasillerosItemClickListener?.onPasillerosItemClickListener( iconParking.drawable -> pasillerosItemClickListener?.onPasillerosItemClickListener(
PasillerosItemVO( PasillerosItemVO(
title = getString(R.string.Parking) title = R.string.Parking
), "" ), ""
) )
} }
@ -389,7 +389,7 @@ class CollectionFragment(
private fun showUser() { private fun showUser() {
ma.onPasillerosItemClickListener( ma.onPasillerosItemClickListener(
PasillerosItemVO(title = getString(R.string.titleUserControlVehicle)), PasillerosItemVO(title = R.string.titleUserControlVehicle),
workerFkFromTicket.toString() workerFkFromTicket.toString()
) )
@ -901,7 +901,6 @@ class CollectionFragment(
} }
} }
//CREATE LIST //CREATE LIST
private fun createCollectionList() { private fun createCollectionList() {
@ -1030,7 +1029,7 @@ class CollectionFragment(
) )
ma.onPasillerosItemClickListener( ma.onPasillerosItemClickListener(
PasillerosItemVO( PasillerosItemVO(
title = getString(R.string.titleWebViewer), title = R.string.titleWebViewer,
), entryPoint = entryPoint ), entryPoint = entryPoint
) )
} }
@ -2383,8 +2382,8 @@ class CollectionFragment(
mySale.line1 = "Previa :${mySale.saleGroupFk}" mySale.line1 = "Previa :${mySale.saleGroupFk}"
mySale.line2 = "Líneas: ${value.size}" mySale.line2 = "Líneas: ${value.size}"
mySale.line3 = value[0].code ?: "" //6276 mySale.line3 = value[0].code ?: ""
mySale.placements = listOf(PlacementVO(shelving = value[0].code ?: "")) //6276 mySale.placements = listOf(PlacementVO(shelving = value[0].code ?: ""))
myList.add(mySale) myList.add(mySale)
} else { } else {

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

@ -259,7 +259,7 @@ class CollectionFragmentPicker(
iconUpdate.drawable -> updateScreen() iconUpdate.drawable -> updateScreen()
iconParking.drawable -> pasillerosItemClickListener?.onPasillerosItemClickListener( iconParking.drawable -> pasillerosItemClickListener?.onPasillerosItemClickListener(
PasillerosItemVO( PasillerosItemVO(
title = getString(R.string.Parking) title = R.string.Parking
), "" ), ""
) )
} }
@ -352,7 +352,7 @@ class CollectionFragmentPicker(
private fun showUser() { private fun showUser() {
ma.onPasillerosItemClickListener( ma.onPasillerosItemClickListener(
PasillerosItemVO(title = getString(R.string.titleUserControlVehicle)), PasillerosItemVO(title = R.string.titleUserControlVehicle),
workerFkFromTicket.toString() workerFkFromTicket.toString()
) )
@ -987,7 +987,7 @@ class CollectionFragmentPicker(
) )
ma.onPasillerosItemClickListener( ma.onPasillerosItemClickListener(
PasillerosItemVO( PasillerosItemVO(
title = getString(R.string.titleWebViewer), title = R.string.titleWebViewer,
), entryPoint = entryPoint ), entryPoint = entryPoint
) )
} }
@ -1354,9 +1354,9 @@ class CollectionFragmentPicker(
canChangeState = true canChangeState = true
try { try {
saleTracking_mark(position, newType) saleTracking_mark(position, newType)
}catch (ex:Exception){ } catch (ex: Exception) {
//error "" //error ""
Log.e("Crashlytics",ex.message.toString()) Log.e("Crashlytics", ex.message.toString())
} }
//nuevo //nuevo
@ -1915,8 +1915,13 @@ class CollectionFragmentPicker(
ticketFk = ticketSelected, ticketFk = ticketSelected,
quantity = customDialogList.getValueTwo().toInt() quantity = customDialogList.getValueTwo().toInt()
) )
}catch (ex:Exception){ } catch (ex: Exception) {
ma.messageWithSound(message = getString(R.string.errorScanItem), isError = true, isToasted = true, isPlayed = true) ma.messageWithSound(
message = getString(R.string.errorScanItem),
isError = true,
isToasted = true,
isPlayed = true
)
} }
scanRequest() scanRequest()
@ -1973,11 +1978,15 @@ class CollectionFragmentPicker(
) )
scanRequest() scanRequest()
customDialogList.dismiss() customDialogList.dismiss()
}catch (_:Exception){ } catch (_: Exception) {
ma.messageWithSound(getString(R.string.errorInput), isError = true, isPlayed = true, isToasted = true) ma.messageWithSound(
getString(R.string.errorInput),
isError = true,
isPlayed = true,
isToasted = true
)
} }
} }
} }
hideKeyboards() hideKeyboards()
@ -2417,7 +2426,7 @@ class CollectionFragmentPicker(
isPrepared = value[0].isPrepared, isPrepared = value[0].isPrepared,
isPreviousPrepared = value[0].isPreviousPrepared, isPreviousPrepared = value[0].isPreviousPrepared,
isControlled = value[0].isControlled, isControlled = value[0].isControlled,
line3 = value[0].code ?: "", //6276 line3 = value[0].code ?: "",
picked = value[0].picked, picked = value[0].picked,
ticketFk = value[0].ticketFk, ticketFk = value[0].ticketFk,
level = value[0].level level = value[0].level
@ -2431,8 +2440,8 @@ class CollectionFragmentPicker(
mySale.line1 = "Previa :${mySale.saleGroupFk}" mySale.line1 = "Previa :${mySale.saleGroupFk}"
mySale.line2 = "Líneas: ${value.size}" mySale.line2 = "Líneas: ${value.size}"
mySale.line3 = value[0].code ?: ""//6276 mySale.line3 = value[0].code ?: ""
mySale.placements = listOf(PlacementVO(shelving = value[0].code ?: ""))//6276 mySale.placements = listOf(PlacementVO(shelving = value[0].code ?: ""))
myList.add(mySale) myList.add(mySale)
} else { } else {

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

@ -200,7 +200,7 @@ class CollectionFragmentPickerNew(
iconUpdate.drawable -> updateScreen() iconUpdate.drawable -> updateScreen()
iconParking.drawable -> pasillerosItemClickListener?.onPasillerosItemClickListener( iconParking.drawable -> pasillerosItemClickListener?.onPasillerosItemClickListener(
PasillerosItemVO( PasillerosItemVO(
title = getString(R.string.Parking) title = R.string.Parking
), "" ), ""
) )
} }
@ -243,7 +243,7 @@ class CollectionFragmentPickerNew(
private fun showUser() { private fun showUser() {
ma.onPasillerosItemClickListener( ma.onPasillerosItemClickListener(
PasillerosItemVO(title = getString(R.string.titleUserControlVehicle)), PasillerosItemVO(title = R.string.titleUserControlVehicle),
workerFkFromTicket.toString() workerFkFromTicket.toString()
) )
@ -556,7 +556,7 @@ class CollectionFragmentPickerNew(
goBack = true goBack = true
if (!sale.code.isNullOrEmpty()) ma.onPasillerosItemClickListener( if (!sale.code.isNullOrEmpty()) ma.onPasillerosItemClickListener(
PasillerosItemVO( PasillerosItemVO(
title = getString(R.string.titleUbicator), title = R.string.titleUbicator,
), entryPoint = sale.code ), entryPoint = sale.code
) )
} }
@ -574,7 +574,7 @@ class CollectionFragmentPickerNew(
) )
ma.onPasillerosItemClickListener( ma.onPasillerosItemClickListener(
PasillerosItemVO( PasillerosItemVO(
title = getString(R.string.titleWebViewer), title = R.string.titleWebViewer,
), entryPoint = entryPoint ), entryPoint = entryPoint
) )
} }

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

@ -205,7 +205,7 @@ class CollectionFragmentPickerPreviousNew(
iconUpdate.drawable -> updateScreen() iconUpdate.drawable -> updateScreen()
iconParking.drawable -> pasillerosItemClickListener?.onPasillerosItemClickListener( iconParking.drawable -> pasillerosItemClickListener?.onPasillerosItemClickListener(
PasillerosItemVO( PasillerosItemVO(
title = getString(R.string.Parking) title =R.string.Parking
), "" ), ""
) )
} }
@ -250,7 +250,7 @@ class CollectionFragmentPickerPreviousNew(
private fun showUser() { private fun showUser() {
ma.onPasillerosItemClickListener( ma.onPasillerosItemClickListener(
PasillerosItemVO(title = getString(R.string.titleUserControlVehicle)), PasillerosItemVO(title = R.string.titleUserControlVehicle),
workerFkFromTicket.toString() workerFkFromTicket.toString()
) )
@ -610,7 +610,7 @@ class CollectionFragmentPickerPreviousNew(
if (!sale.code.isNullOrEmpty()) ma.onPasillerosItemClickListener( if (!sale.code.isNullOrEmpty()) ma.onPasillerosItemClickListener(
PasillerosItemVO( PasillerosItemVO(
title = getString(R.string.titleUbicator), title = R.string.titleUbicator,
), entryPoint = sale.code ), entryPoint = sale.code
) )
} }
@ -628,7 +628,7 @@ class CollectionFragmentPickerPreviousNew(
) )
ma.onPasillerosItemClickListener( ma.onPasillerosItemClickListener(
PasillerosItemVO( PasillerosItemVO(
title = getString(R.string.titleWebViewer), title = R.string.titleWebViewer,
), entryPoint = entryPoint ), entryPoint = entryPoint
) )
} }

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

@ -260,7 +260,7 @@ class CollectionFragmentPreChecker(
iconUpdate.drawable -> updateScreen() iconUpdate.drawable -> updateScreen()
iconParking.drawable -> pasillerosItemClickListener?.onPasillerosItemClickListener( iconParking.drawable -> pasillerosItemClickListener?.onPasillerosItemClickListener(
PasillerosItemVO( PasillerosItemVO(
title = getString(R.string.Parking) title = R.string.Parking
), "" ), ""
) )
} }
@ -343,7 +343,7 @@ class CollectionFragmentPreChecker(
private fun showUser() { private fun showUser() {
ma.onPasillerosItemClickListener( ma.onPasillerosItemClickListener(
PasillerosItemVO(title = getString(R.string.titleUserControlVehicle)), PasillerosItemVO(title = R.string.titleUserControlVehicle),
workerFkFromTicket.toString() workerFkFromTicket.toString()
) )
@ -960,20 +960,18 @@ class CollectionFragmentPreChecker(
if (type == CONTROLADOR || type == PRECHECKER) { if (type == CONTROLADOR || type == PRECHECKER) {
if (salesList.filter { it.sectorFk != null && it.sectorFk!! > 0 }.isNotEmpty()) { if (salesList.filter { it.sectorFk != null && it.sectorFk!! > 0 }.isNotEmpty()) {
val isOnReservationMode = mobileApplication.dataStoreApp.readDataStoreKey<Boolean>( val isOnReservationMode = mobileApplication.dataStoreApp.readDataStoreKey<Boolean>(
ConstAndValues.RESERVATIONMODE ConstAndValues.RESERVATIONMODE
) )
//lolass //lolass
if (isOnReservationMode){ if (isOnReservationMode) {
sales = salesList.filter { sales = salesList.filter {
it.sectorFk == mobileApplication.dataStoreApp.readDataStoreKey<Int>(SECTORFK) it.sectorFk == mobileApplication.dataStoreApp.readDataStoreKey<Int>(SECTORFK)
}.sortedWith(compareBy({ it.saleOrder })) }.sortedWith(compareBy({ it.saleOrder }))
}else { } else {
sales = salesList.filter { sales = salesList.filter {
it.sectorFk == mobileApplication.dataStoreApp.readDataStoreKey<Int>(SECTORFK) it.sectorFk == mobileApplication.dataStoreApp.readDataStoreKey<Int>(SECTORFK)
}.sortedWith(compareBy({ it.picked })) }.sortedWith(compareBy({ it.picked }))
@ -1054,7 +1052,7 @@ class CollectionFragmentPreChecker(
) )
ma.onPasillerosItemClickListener( ma.onPasillerosItemClickListener(
PasillerosItemVO( PasillerosItemVO(
title = getString(R.string.titleWebViewer), title = R.string.titleWebViewer,
), entryPoint = entryPoint ), entryPoint = entryPoint
) )
} }
@ -2374,7 +2372,7 @@ class CollectionFragmentPreChecker(
isPrepared = value[0].isPrepared, isPrepared = value[0].isPrepared,
isPreviousPrepared = value[0].isPreviousPrepared, isPreviousPrepared = value[0].isPreviousPrepared,
isControlled = value[0].isControlled, isControlled = value[0].isControlled,
line3 = value[0].code ?: "", //6276 line3 = value[0].code ?: "",
picked = value[0].picked, picked = value[0].picked,
ticketFk = value[0].ticketFk, ticketFk = value[0].ticketFk,
level = value[0].level level = value[0].level
@ -2388,8 +2386,8 @@ class CollectionFragmentPreChecker(
mySale.line1 = "Previa :${mySale.saleGroupFk}" mySale.line1 = "Previa :${mySale.saleGroupFk}"
mySale.line2 = "Líneas: ${value.size}" mySale.line2 = "Líneas: ${value.size}"
mySale.line3 = value[0].code ?: "" //6276 mySale.line3 = value[0].code ?: ""
mySale.placements = listOf(PlacementVO(shelving = value[0].code ?: ""))//6276 mySale.placements = listOf(PlacementVO(shelving = value[0].code ?: ""))
myList.add(mySale) myList.add(mySale)
} else { } else {

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

@ -18,7 +18,6 @@ import androidx.recyclerview.widget.RecyclerView
import com.google.gson.Gson import com.google.gson.Gson
import es.verdnatura.R import es.verdnatura.R
import es.verdnatura.databinding.FragmentCollectionNewBinding import es.verdnatura.databinding.FragmentCollectionNewBinding
import es.verdnatura.domain.ConstAndValues
import es.verdnatura.domain.ConstAndValues.BASEURLSALIX import es.verdnatura.domain.ConstAndValues.BASEURLSALIX
import es.verdnatura.domain.ConstAndValues.PRECHECKERNEW import es.verdnatura.domain.ConstAndValues.PRECHECKERNEW
import es.verdnatura.domain.ConstAndValues.PRINTERNAME import es.verdnatura.domain.ConstAndValues.PRINTERNAME
@ -201,7 +200,7 @@ class CollectionFragmentPreCheckerNew(
iconUpdate.drawable -> updateScreen() iconUpdate.drawable -> updateScreen()
iconParking.drawable -> pasillerosItemClickListener?.onPasillerosItemClickListener( iconParking.drawable -> pasillerosItemClickListener?.onPasillerosItemClickListener(
PasillerosItemVO( PasillerosItemVO(
title = getString(R.string.Parking) title = R.string.Parking
), "" ), ""
) )
} }
@ -249,7 +248,7 @@ class CollectionFragmentPreCheckerNew(
private fun showUser() { private fun showUser() {
ma.onPasillerosItemClickListener( ma.onPasillerosItemClickListener(
PasillerosItemVO(title = getString(R.string.titleUserControlVehicle)), PasillerosItemVO(title = R.string.titleUserControlVehicle),
workerFkFromTicket.toString() workerFkFromTicket.toString()
) )
@ -612,7 +611,7 @@ class CollectionFragmentPreCheckerNew(
if (!sale.code.isNullOrEmpty()) ma.onPasillerosItemClickListener( if (!sale.code.isNullOrEmpty()) ma.onPasillerosItemClickListener(
PasillerosItemVO( PasillerosItemVO(
title = getString(R.string.titleUbicator), title = R.string.titleUbicator,
), entryPoint = sale.code ), entryPoint = sale.code
) )
} }
@ -630,7 +629,7 @@ class CollectionFragmentPreCheckerNew(
) )
ma.onPasillerosItemClickListener( ma.onPasillerosItemClickListener(
PasillerosItemVO( PasillerosItemVO(
title = getString(R.string.titleWebViewer), title = R.string.titleWebViewer,
), entryPoint = entryPoint ), entryPoint = entryPoint
) )
} }

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

@ -237,7 +237,6 @@ class CollectionViewModel(val context: Context) : BaseViewModel(context) {
} }
//Tarea 6276 Salix collection_getTickets
fun collectionTicketGetSalix( fun collectionTicketGetSalix(
collectionFk: Int, collectionFk: Int,
print: Boolean, print: Boolean,
@ -325,19 +324,11 @@ class CollectionViewModel(val context: Context) : BaseViewModel(context) {
buyFk: Long, buyFk: Long,
isScanned: Boolean? isScanned: Boolean?
) { ) {
//Tarea 6276 OK
salix.saleTrackingUpdate( salix.saleTrackingUpdate(
SaleTrackingReplaceSalix( SaleTrackingReplaceSalix(
saleFk, originalQuantity, code, isChecked != "0", buyFk, isScanned!! saleFk, originalQuantity, code, isChecked != "0", buyFk, isScanned!!
) )
)/* silex.saleTrackingReplace( ).enqueue(object : SalixCallback<Any>(context) {
saleFk,
originalQuantity,
code,
isChecked != "0",
buyFk,
isScanned!!
)*/.enqueue(object : SalixCallback<Any>(context) {
override fun onError(t: Throwable) { override fun onError(t: Throwable) {
_responseSaleReplace.value = ResponseItemVO( _responseSaleReplace.value = ResponseItemVO(
isError = true, isError = true,
@ -361,7 +352,6 @@ class CollectionViewModel(val context: Context) : BaseViewModel(context) {
quantity: Int, quantity: Int,
isScanned: Boolean? isScanned: Boolean?
) { ) {
//Tarea 6276 flata probar
salix.saleTrackingMark( salix.saleTrackingMark(
SaleTrackingSalix( SaleTrackingSalix(
saleFk = saleFk, saleFk = saleFk,
@ -373,15 +363,7 @@ class CollectionViewModel(val context: Context) : BaseViewModel(context) {
quantity = quantity, quantity = quantity,
isScanned = isScanned!! isScanned = isScanned!!
) )
)/* silex.saleTracking_mark( ).enqueue(object : SalixCallback<Any>(context) {
saleFk,
originalQuantity,
code,
isChecked != "0",
buyFk,
itemShelvingFk,
quantity,
isScanned)*/.enqueue(object : SalixCallback<Any>(context) {
override fun onError(t: Throwable) { override fun onError(t: Throwable) {
_responseSaleTracking_mark.value = ResponseItemVO( _responseSaleTracking_mark.value = ResponseItemVO(
isError = true, isError = true,
@ -669,13 +651,12 @@ class CollectionViewModel(val context: Context) : BaseViewModel(context) {
} }
fun saleTrackingDel(saleFk: Int) { fun saleTrackingDel(saleFk: Int) {
//Tarea 6276
salix.saleTrackingDel( salix.saleTrackingDel(
SaleTrackingDelSalix( SaleTrackingDelSalix(
saleFk = saleFk, stateCodes = listOf("CHECKED", "OK", "PREPARED") saleFk = saleFk, stateCodes = listOf("CHECKED", "OK", "PREPARED")
) )
) )
//silex.saleTrackingDel(saleFk)
.enqueue(object : SalixCallback<Any>(context) { .enqueue(object : SalixCallback<Any>(context) {
override fun onError(t: Throwable) { override fun onError(t: Throwable) {
_responseDel.value = ResponseItemVO( _responseDel.value = ResponseItemVO(
@ -694,7 +675,6 @@ class CollectionViewModel(val context: Context) : BaseViewModel(context) {
fun itemShelvingUpdateFromSale( fun itemShelvingUpdateFromSale(
saleFk: Int saleFk: Int
) { ) {
//Tarea 6276 OK
salix.itemShelvingUpdateFromSale(hashMapOf("saleFk" to saleFk)) salix.itemShelvingUpdateFromSale(hashMapOf("saleFk" to saleFk))
// silex.itemShelving_updateFromSale(saleFk) // silex.itemShelving_updateFromSale(saleFk)
.enqueue(object : SalixCallback<Any>(context) { .enqueue(object : SalixCallback<Any>(context) {

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

@ -178,7 +178,7 @@ class ControlVehiculoFragment(
when (direction) { when (direction) {
"HISTORY" -> { "HISTORY" -> {
ma.onPasillerosItemClickListener( ma.onPasillerosItemClickListener(
PasillerosItemVO(title = getString(R.string.titleHistoricalHide)), plateNumber PasillerosItemVO(title = R.string.titleHistoricalHide), plateNumber
) )
} }

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

@ -33,7 +33,6 @@ class ControlVehiculoViewModel(val context: Context) : BaseViewModel(context) {
fun machineWorkerUpdate( fun machineWorkerUpdate(
plate: String plate: String
) { ) {
//tarea 6276 vehiculo
salix.machineWorkerUpdateInTime(hashMapOf("plate" to plate)) salix.machineWorkerUpdateInTime(hashMapOf("plate" to plate))
.enqueue(object : SalixCallback<Any>(context) { .enqueue(object : SalixCallback<Any>(context) {
@ -119,7 +118,8 @@ class ControlVehiculoViewModel(val context: Context) : BaseViewModel(context) {
response = if (response.body()!!.isEmpty()) { response = if (response.body()!!.isEmpty()) {
"" ""
} else { } else {
response.body()!![0].entrySet().first().value.toString().replace("\"", "") response.body()!![0].entrySet().first().value.toString()
.replace("\"", "")
}, },
type = "getWorkerPlate" type = "getWorkerPlate"
) )
@ -143,5 +143,4 @@ class ControlVehiculoViewModel(val context: Context) : BaseViewModel(context) {
} }
} }

2
app/src/main/java/es/verdnatura/presentation/view/feature/delivery/activity/SignedActivity.kt
View File

@ -226,7 +226,7 @@ class SignedActivity : BaseActivity<ActivitySignBinding>(), LocationUpdateCallba
val listObservationsAdapter = val listObservationsAdapter =
GeneralAdapter(ticketNotes, object : OnGeneralItemRowClickListener { GeneralAdapter(ticketNotes, object : OnGeneralItemRowClickListener {
override fun OnGeneralItemRowClickListener(item: GeneralItem) { override fun onGeneralItemRowClickListener(item: GeneralItem) {
customDialogList.dismiss() customDialogList.dismiss()
} }

29
app/src/main/java/es/verdnatura/presentation/view/feature/delivery/fragments/RoutesFragment.kt
View File

@ -51,7 +51,6 @@ class RoutesFragment(
override fun getLayoutId(): Int = R.layout.fragment_route override fun getLayoutId(): Int = R.layout.fragment_route
override fun init() { override fun init() {
super.init() super.init()
setEvents() setEvents()
@ -80,7 +79,7 @@ class RoutesFragment(
val pendingExpeditionSend = pendingExpedition.map { l -> val pendingExpeditionSend = pendingExpedition.map { l ->
ExpeditionSalix( ExpeditionSalix(
expeditionFk = l.id, stateCode = l.code , l.isScanned expeditionFk = l.id, stateCode = l.code, l.isScanned
) )
} }
@ -131,6 +130,7 @@ class RoutesFragment(
} }
} }
private fun setToolBar() { private fun setToolBar() {
ma.hideBottomNavigation(View.GONE) ma.hideBottomNavigation(View.GONE)
binding.mainToolbar.toolbarSubtitle.setTextColor(requireContext().getColor((R.color.verdnatura_pumpkin_orange))) binding.mainToolbar.toolbarSubtitle.setTextColor(requireContext().getColor((R.color.verdnatura_pumpkin_orange)))
@ -167,14 +167,14 @@ class RoutesFragment(
iconInfo.drawable -> { iconInfo.drawable -> {
ma.onPasillerosItemClickListener( ma.onPasillerosItemClickListener(
PasillerosItemVO(title = getString(R.string.titleInfo)), PasillerosItemVO(title = R.string.titleInfo),
getString(R.string.titleInfo) getString(R.string.titleInfo)
) )
} }
iconSearch.drawable -> { iconSearch.drawable -> {
ma.onPasillerosItemClickListener( ma.onPasillerosItemClickListener(
PasillerosItemVO(title = getString(R.string.titleLog)), PasillerosItemVO(title = R.string.titleLog),
getString(R.string.titleLog) getString(R.string.titleLog)
) )
} }
@ -244,14 +244,26 @@ class RoutesFragment(
if (it.isError) { if (it.isError) {
binding.mainToolbar.toolbarIcons.visibility = View.VISIBLE binding.mainToolbar.toolbarIcons.visibility = View.VISIBLE
ma.messageWithSound(it.errorMessage, isError = false, isPlayed =false, titleWithError = "", isToasted = true) ma.messageWithSound(
it.errorMessage,
isError = false,
isPlayed = false,
titleWithError = "",
isToasted = true
)
} else { } else {
deleteSignTickets(it.response) deleteSignTickets(it.response)
} }
} }
responseLoadList.observe(viewLifecycleOwner) { responseLoadList.observe(viewLifecycleOwner) {
ma.messageWithSound(getString(R.string.offline), isError = false, isPlayed = false, titleWithError = "", isToasted = true) ma.messageWithSound(
getString(R.string.offline),
isError = false,
isPlayed = false,
titleWithError = "",
isToasted = true
)
ma.onApplicationEventAnimation(View.INVISIBLE) ma.onApplicationEventAnimation(View.INVISIBLE)
createListRoutes(mutableListOf(), getSaved = true) createListRoutes(mutableListOf(), getSaved = true)
} }
@ -260,7 +272,6 @@ class RoutesFragment(
if (!it.isError) { if (!it.isError) {
binding.mainToolbar.toolbarIcons.visibility = View.VISIBLE binding.mainToolbar.toolbarIcons.visibility = View.VISIBLE
deleteExpeditionsPending(it.response) deleteExpeditionsPending(it.response)
} }
} }
@ -294,14 +305,14 @@ class RoutesFragment(
"loadVan" -> { "loadVan" -> {
binding.scanInput.isEnabled = true binding.scanInput.isEnabled = true
ma.onPasillerosItemClickListener( ma.onPasillerosItemClickListener(
PasillerosItemVO(title = getString(R.string.titleDeliverySummary)), PasillerosItemVO(title = R.string.titleDeliverySummary),
item.id.toString() item.id.toString()
) )
} }
"showTickets" -> { "showTickets" -> {
ma.onPasillerosItemClickListener( ma.onPasillerosItemClickListener(
PasillerosItemVO(title = getString(R.string.tickets)), PasillerosItemVO(title = R.string.tickets),
Gson().toJson(item) Gson().toJson(item)
) )
} }

2
app/src/main/java/es/verdnatura/presentation/view/feature/delivery/fragments/SummaryFragment.kt
View File

@ -143,7 +143,7 @@ class SummaryFragment(
) )
ma.onPasillerosItemClickListener( ma.onPasillerosItemClickListener(
PasillerosItemVO(title = getString(R.string.titleLoadTruck)), entryPoint PasillerosItemVO(title = R.string.titleLoadTruck), entryPoint
) )
} }

14
app/src/main/java/es/verdnatura/presentation/view/feature/delivery/fragments/TicketsFragment.kt
View File

@ -175,7 +175,7 @@ class TicketsFragment : BaseFragment<FragmentTicketsBinding, DeliveryViewModel>(
iconSort.drawable -> { iconSort.drawable -> {
ma.onPasillerosItemClickListener( ma.onPasillerosItemClickListener(
PasillerosItemVO( PasillerosItemVO(
title = getString(R.string.titleWebViewer), title = R.string.titleWebViewer,
), entryPoint = Gson().toJson( ), entryPoint = Gson().toJson(
mutableMapOf( mutableMapOf(
"entryPoint" to route.id, "web" to "${ "entryPoint" to route.id, "web" to "${
@ -415,9 +415,9 @@ class TicketsFragment : BaseFragment<FragmentTicketsBinding, DeliveryViewModel>(
) )
) )
ma.onPasillerosItemClickListener(PasillerosItemVO( ma.onPasillerosItemClickListener(PasillerosItemVO(
title = getString( title =
R.string.titleUnLoadTruck R.string.titleUnLoadTruck
)
), entryPoint, myListClientTicket.filter { it.id == item.id }) ), entryPoint, myListClientTicket.filter { it.id == item.id })
} }
@ -449,7 +449,7 @@ class TicketsFragment : BaseFragment<FragmentTicketsBinding, DeliveryViewModel>(
ma.onPasillerosItemClickListener( ma.onPasillerosItemClickListener(
PasillerosItemVO( PasillerosItemVO(
title = getString(R.string.titleWebViewer), title = R.string.titleWebViewer,
), entryPoint = Gson().toJson( ), entryPoint = Gson().toJson(
mutableMapOf( mutableMapOf(
"entryPoint" to route.id, "web" to "${ "entryPoint" to route.id, "web" to "${
@ -498,7 +498,7 @@ class TicketsFragment : BaseFragment<FragmentTicketsBinding, DeliveryViewModel>(
adapter = GeneralAdapter(itemsNotes, object : OnGeneralItemRowClickListener { adapter = GeneralAdapter(itemsNotes, object : OnGeneralItemRowClickListener {
override fun OnGeneralItemRowClickListener(item: GeneralItem) { override fun onGeneralItemRowClickListener(item: GeneralItem) {
itemClient.tickets.forEach { listClient -> itemClient.tickets.forEach { listClient ->
listClient.Note = customDialogInput.getValue() listClient.Note = customDialogInput.getValue()
} }
@ -563,7 +563,7 @@ class TicketsFragment : BaseFragment<FragmentTicketsBinding, DeliveryViewModel>(
}.hideDialog().show() }.hideDialog().show()
val listPhonesAdapter = GeneralAdapter(ticketNotes, object : OnGeneralItemRowClickListener { val listPhonesAdapter = GeneralAdapter(ticketNotes, object : OnGeneralItemRowClickListener {
override fun OnGeneralItemRowClickListener(item: GeneralItem) { override fun onGeneralItemRowClickListener(item: GeneralItem) {
customDialogList.dismiss() customDialogList.dismiss()
} }
@ -626,7 +626,7 @@ class TicketsFragment : BaseFragment<FragmentTicketsBinding, DeliveryViewModel>(
}.hideDialog().show() }.hideDialog().show()
val listPhonesAdapter = GeneralAdapter(phones, object : OnGeneralItemRowClickListener { val listPhonesAdapter = GeneralAdapter(phones, object : OnGeneralItemRowClickListener {
override fun OnGeneralItemRowClickListener(item: GeneralItem) { override fun onGeneralItemRowClickListener(item: GeneralItem) {
phones.forEach { phones.forEach {
if (it.code == item.code) { if (it.code == item.code) {
if (ContextCompat.checkSelfPermission( if (ContextCompat.checkSelfPermission(

10
app/src/main/java/es/verdnatura/presentation/view/feature/delivery/viewmodels/DeliveryViewModel.kt
View File

@ -85,8 +85,8 @@ class DeliveryViewModel(val context: Context) : BaseViewModel(context) {
val loadRouteList: LiveData<Event<RouteList>> = _routeList.map { Event(it) } val loadRouteList: LiveData<Event<RouteList>> = _routeList.map { Event(it) }
private val _responseLoadList by lazy { MutableLiveData<ResponseItemVO>() } private val _responseLoadList by lazy { MutableLiveData<Boolean>() }
val responseLoadList: LiveData<ResponseItemVO> = _responseLoadList val responseLoadList: LiveData<Boolean> = _responseLoadList
private val _responseStateList by lazy { MutableLiveData<ResponseItemVO>() } private val _responseStateList by lazy { MutableLiveData<ResponseItemVO>() }
val responseStateList: LiveData<ResponseItemVO> = _responseStateList val responseStateList: LiveData<ResponseItemVO> = _responseStateList
@ -269,13 +269,13 @@ class DeliveryViewModel(val context: Context) : BaseViewModel(context) {
override fun onError(t: Throwable) { override fun onError(t: Throwable) {
//_routeList.value = RouteList() //_routeList.value = RouteList()
_responseLoadList.value = ResponseItemVO("", true, t.message.toString(), 0) _responseLoadList.value = false
//super.onError(t) //super.onError(t)
} }
override fun onFailure(call: Call<MutableList<RouteInfo>>, t: Throwable) { override fun onFailure(call: Call<MutableList<RouteInfo>>, t: Throwable) {
_responseLoadList.value = ResponseItemVO("", true, t.message.toString(), 0) _responseLoadList.value = false
} }
}) })
} }
@ -290,7 +290,7 @@ class DeliveryViewModel(val context: Context) : BaseViewModel(context) {
} }
override fun onError(t: Throwable) { override fun onError(t: Throwable) {
_responseLoadList.value = ResponseItemVO("", true, t.message.toString(), 0) _responseLoadList.value = false
} }
}) })

4
app/src/main/java/es/verdnatura/presentation/view/feature/diadeventa/adapter/DayOfSaleAdapter.kt
View File

@ -65,9 +65,9 @@ class DayOfSaleAdapter(
historicoDate.setOnClickListener { historicoDate.setOnClickListener {
onPasillerosItemClickListener!!.onPasillerosItemClickListener( onPasillerosItemClickListener!!.onPasillerosItemClickListener(
PasillerosItemVO( PasillerosItemVO(
title = res.getString( title =
R.string.titleItemConsult R.string.titleItemConsult
)
), item.itemFk.toString() ), item.itemFk.toString()
) )
} }

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

@ -215,7 +215,7 @@ class HistoricoArticuloFragment(
if (item.isTicket == 1) { if (item.isTicket == 1) {
ma.onPasillerosItemClickListener( ma.onPasillerosItemClickListener(
PasillerosItemVO( PasillerosItemVO(
title = getString(R.string.titleWebViewer), title = R.string.titleWebViewer,
), entryPoint = Gson().toJson( ), entryPoint = Gson().toJson(
mutableMapOf( mutableMapOf(
"entryPoint" to item.originId, "entryPoint" to item.originId,

5
app/src/main/java/es/verdnatura/presentation/view/feature/historicoshelving/adapter/ItemShelvingLogAdapter.kt
View File

@ -30,9 +30,8 @@ class ItemShelvingLogAdapter(
onPasillerosItemClickListener.onPasillerosItemClickListener( onPasillerosItemClickListener.onPasillerosItemClickListener(
PasillerosItemVO( PasillerosItemVO(
title = holder.binding.root.context.getString( title =
R.string.titleUbicator R.string.titleUbicator
)
), items[position].shelvingFk!! ), items[position].shelvingFk!!
) )
} }
@ -67,7 +66,7 @@ class ItemShelvingLogAdapter(
private fun openWorker(binding: ItemShelvinglogRowBinding, id: Int) { private fun openWorker(binding: ItemShelvinglogRowBinding, id: Int) {
onPasillerosItemClickListener.onPasillerosItemClickListener( onPasillerosItemClickListener.onPasillerosItemClickListener(
PasillerosItemVO(title = binding.root.context.getString(R.string.titleUserControlVehicle)), PasillerosItemVO(title = R.string.titleUserControlVehicle),
id.toString() id.toString()
) )
} }

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

@ -119,7 +119,7 @@ class ShelvingLogFragment(
private fun openWebViewer(param: Int, web: String) { private fun openWebViewer(param: Int, web: String) {
ma.onPasillerosItemClickListener( ma.onPasillerosItemClickListener(
PasillerosItemVO( PasillerosItemVO(
title = getString(R.string.titleWebViewer), title = R.string.titleWebViewer,
), ),
entryPoint = Gson().toJson( entryPoint = Gson().toJson(

10
app/src/main/java/es/verdnatura/presentation/view/feature/inventario/adapter/InventoryAdapter.kt
View File

@ -52,27 +52,25 @@ class InventoryAdapter(
itemFk.setOnClickListener { itemFk.setOnClickListener {
onPasillerosItemClickListener.onPasillerosItemClickListener( onPasillerosItemClickListener.onPasillerosItemClickListener(
PasillerosItemVO( PasillerosItemVO(
title = res.getString( title =
R.string.titleItemConsult R.string.titleItemConsult
)
), item.itemFk.toString() ), item.itemFk.toString()
) )
} }
itemUp.setOnClickListener { itemUp.setOnClickListener {
onPasillerosItemClickListener.onPasillerosItemClickListener( onPasillerosItemClickListener.onPasillerosItemClickListener(
PasillerosItemVO( PasillerosItemVO(
title = res.getString( title =
R.string.titleItemSearch R.string.titleItemSearch
)
), item.itemFk.toString() ), item.itemFk.toString()
) )
} }
itemDown.setOnClickListener { itemDown.setOnClickListener {
onPasillerosItemClickListener.onPasillerosItemClickListener( onPasillerosItemClickListener.onPasillerosItemClickListener(
PasillerosItemVO( PasillerosItemVO(
title = res.getString( title =
R.string.titleItemSearch R.string.titleItemSearch
)
), item.itemFk.toString() ), item.itemFk.toString()
) )
} }

11
app/src/main/java/es/verdnatura/presentation/view/feature/inventario/adapter/InventoryParkingAdapter.kt
View File

@ -88,9 +88,8 @@ class InventoryParkingAdapter(
imgItem.setOnClickListener { imgItem.setOnClickListener {
onPasillerosItemClickListener.onPasillerosItemClickListener( onPasillerosItemClickListener.onPasillerosItemClickListener(
PasillerosItemVO( PasillerosItemVO(
title = res.getString( title =
R.string.itemSearch R.string.itemSearch
)
), item.itemFk.toString() ), item.itemFk.toString()
) )
} }
@ -127,15 +126,15 @@ class InventoryParkingAdapter(
itemShelving.setOnClickListener { itemShelving.setOnClickListener {
onPasillerosItemClickListener.onPasillerosItemClickListener( onPasillerosItemClickListener.onPasillerosItemClickListener(
PasillerosItemVO( PasillerosItemVO(
title = res.getString(R.string.titleUbicator) title = R.string.titleUbicator)
), item.shelvingFk , item.shelvingFk
) )
} }
itemfkText.setOnClickListener { itemfkText.setOnClickListener {
onPasillerosItemClickListener.onPasillerosItemClickListener( onPasillerosItemClickListener.onPasillerosItemClickListener(
PasillerosItemVO( PasillerosItemVO(
title = res.getString(R.string.itemSearch) title = R.string.itemSearch)
), item.itemFk.toString() , item.itemFk.toString()
) )
} }

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

@ -208,7 +208,7 @@ class InventaryFragment :
customDialog.dismiss() customDialog.dismiss()
ma.onPasillerosItemClickListener( ma.onPasillerosItemClickListener(
PasillerosItemVO( PasillerosItemVO(
title = getString(R.string.titleUbicator), title = R.string.titleUbicator,
), entryPoint = "" ), entryPoint = ""
) )

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

@ -9,8 +9,6 @@ import es.verdnatura.MobileApplication
import es.verdnatura.domain.SalixCallback import es.verdnatura.domain.SalixCallback
import es.verdnatura.domain.userCases.GetItemFromBarcodeUseCase import es.verdnatura.domain.userCases.GetItemFromBarcodeUseCase
import es.verdnatura.presentation.base.BaseViewModel import es.verdnatura.presentation.base.BaseViewModel
import es.verdnatura.presentation.base.getMessageFromAllResponse
import es.verdnatura.presentation.base.nameofFunction
import es.verdnatura.presentation.common.Event import es.verdnatura.presentation.common.Event
import es.verdnatura.presentation.common.ItemDiscardSalixShortage import es.verdnatura.presentation.common.ItemDiscardSalixShortage
import es.verdnatura.presentation.common.ResponseItemVO import es.verdnatura.presentation.common.ResponseItemVO
@ -131,7 +129,6 @@ class InventaryViewModel(val context: Context) : BaseViewModel(context) {
}) })
} }
fun itemSetVisibleDiscard( fun itemSetVisibleDiscard(
itemFk: Int, warehouseFk: Int, newValue: Int itemFk: Int, warehouseFk: Int, newValue: Int
) { ) {
@ -162,18 +159,6 @@ class InventaryViewModel(val context: Context) : BaseViewModel(context) {
response.body()?.let { WorkerFromMistakeList(it) } response.body()?.let { WorkerFromMistakeList(it) }
} }
override fun onError(t: Throwable) {
val listError: ArrayList<WorkerFromMistake> = ArrayList()
listError.add(
WorkerFromMistake(
isError = true, errorMessage = getMessageFromAllResponse(
nameofFunction(this), t.message!!
)
)
)
_workerFromMistakeList.value = WorkerFromMistakeList(listError)
}
}) })
} }

13
app/src/main/java/es/verdnatura/presentation/view/feature/login/adapter/WorkFormAdapter.kt
View File

@ -16,7 +16,6 @@ class WorkFormAdapter(
// private var showDelete: Boolean = false // private var showDelete: Boolean = false
) : RecyclerView.Adapter<WorkFormAdapter.ItemHolder>() { ) : RecyclerView.Adapter<WorkFormAdapter.ItemHolder>() {
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemHolder { override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemHolder {
return ItemHolder( return ItemHolder(
ItemWorkFormsRowBinding.inflate(LayoutInflater.from(parent.context), parent, false) ItemWorkFormsRowBinding.inflate(LayoutInflater.from(parent.context), parent, false)
@ -29,15 +28,14 @@ class WorkFormAdapter(
holder.bind(items[position]) holder.bind(items[position])
holder.binding.root.setOnClickListener { holder.binding.root.setOnClickListener {
OnWorkFormsItemRowClickListener.OnWorkFormsItemRowClickListener(items[position]) OnWorkFormsItemRowClickListener.onWorkFormsItemRowClickListener(items[position])
} }
holder.binding.itemImage.setOnClickListener{ holder.binding.itemImage.setOnClickListener {
OnTrashItemRowClickListener.OnTrashItemRowClickListener(items[position]) OnTrashItemRowClickListener.onTrashItemRowClickListener(items[position])
} }
} }
inner class ItemHolder( inner class ItemHolder(
val binding: ItemWorkFormsRowBinding val binding: ItemWorkFormsRowBinding
) : RecyclerView.ViewHolder(binding.root) { ) : RecyclerView.ViewHolder(binding.root) {
@ -47,10 +45,9 @@ class WorkFormAdapter(
this.item = item this.item = item
if (item.isShowDelete) { if (item.isShowDelete) {
itemImage.visibility = View.VISIBLE itemImage.visibility = View.VISIBLE
} } else itemImage.visibility = View.GONE
else itemImage.visibility = View.GONE
itemImage.setOnClickListener{ itemImage.setOnClickListener {
//deleteWorkForm(item.name) //deleteWorkForm(item.name)
} }
//itemCode.visibility = View.GONE //itemCode.visibility = View.GONE

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

@ -186,7 +186,7 @@ class LoginFragment(private var imageUri: Uri?) :
workFormAdapter = WorkFormAdapter(listWorkForms, object : OnWorkFormsItemRowClickListener { workFormAdapter = WorkFormAdapter(listWorkForms, object : OnWorkFormsItemRowClickListener {
override fun OnWorkFormsItemRowClickListener(item: WorkForms) { override fun onWorkFormsItemRowClickListener(item: WorkForms) {
when (item.name) { when (item.name) {
getString(R.string.addWorkForm) -> { getString(R.string.addWorkForm) -> {
@ -214,7 +214,7 @@ class LoginFragment(private var imageUri: Uri?) :
} }
}, object : OnTrashItemRowClickListener { }, object : OnTrashItemRowClickListener {
override fun OnTrashItemRowClickListener(item: WorkForms) { override fun onTrashItemRowClickListener(item: WorkForms) {
customDialog.setTitle(getString(R.string.deleteWorkForm)) customDialog.setTitle(getString(R.string.deleteWorkForm))
.setDescription(getString(R.string.deleteWorkFormConfirmation)) .setDescription(getString(R.string.deleteWorkFormConfirmation))
@ -335,7 +335,6 @@ class LoginFragment(private var imageUri: Uri?) :
versionAppItem.observe(viewLifecycleOwner) { versionAppItem.observe(viewLifecycleOwner) {
if (it.version == getInfoVersionNameApp()) { if (it.version == getInfoVersionNameApp()) {
goToMain() goToMain()
} else { } else {
@ -367,7 +366,6 @@ class LoginFragment(private var imageUri: Uri?) :
} }
customDialog.show() customDialog.show()
} }
} }

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

@ -230,7 +230,6 @@ class LoginViewModel(val context: Context) : BaseViewModel(context) {
} }
fun checkVersion(nameApp: String) { fun checkVersion(nameApp: String) {
//Tarea 6276 Modificado back
salix.getVersion(nameApp).enqueue(object : SalixCallback<VersionApp>(context) { salix.getVersion(nameApp).enqueue(object : SalixCallback<VersionApp>(context) {
override fun onSuccess(response: Response<VersionApp>) { override fun onSuccess(response: Response<VersionApp>) {
@ -262,7 +261,6 @@ class LoginViewModel(val context: Context) : BaseViewModel(context) {
} }
fun operatorAdd(workerFk: Int? = null) { fun operatorAdd(workerFk: Int? = null) {
//Tarea 6276
salix.operatorAdd(OperatorAdd(workerFk!!, false)) salix.operatorAdd(OperatorAdd(workerFk!!, false))
.enqueue(object : SalixCallback<Any>(context) { .enqueue(object : SalixCallback<Any>(context) {
override fun onError(t: Throwable) { override fun onError(t: Throwable) {
@ -273,7 +271,6 @@ class LoginViewModel(val context: Context) : BaseViewModel(context) {
}) })
} }
//Tarea 5870
fun operatorGetData( fun operatorGetData(
workerId: Int workerId: Int
) { ) {

106
app/src/main/java/es/verdnatura/presentation/view/feature/main/activity/MainActivity.kt
View File

@ -273,13 +273,9 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), OnPasillerosItemClickL
if (uriImage != null) { if (uriImage != null) {
onPasillerosItemClickListener( onPasillerosItemClickListener(
PasillerosItemVO( PasillerosItemVO(
30,
R.drawable.photo_camera, R.drawable.photo_camera,
getString(R.string.titlePhotos),
R.string.titlePhotos, R.string.titlePhotos,
getString(
R.string.titlePhotosDescrip R.string.titlePhotosDescrip
)
), uriImage.toString() ), uriImage.toString()
) )
@ -498,8 +494,8 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), OnPasillerosItemClickL
override fun onPasillerosItemClickListener( override fun onPasillerosItemClickListener(
item: PasillerosItemVO, entryPoint: String, param: Any? item: PasillerosItemVO, entryPoint: String, param: Any?
) { ) {
val itemTitle = getString(item.title!!)
when (item.title) { when (itemTitle) {
//BUFFERS //BUFFERS
getString(R.string.titlePalletizar) -> { getString(R.string.titlePalletizar) -> {
@ -518,25 +514,25 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), OnPasillerosItemClickL
getString(R.string.historicals) -> { getString(R.string.historicals) -> {
addFragmentOnTop( addFragmentOnTop(
PasilleroFragment.newInstance(item.title, isInitMenu = false), PasilleroFragment.newInstance(itemTitle, isInitMenu = false),
) )
} }
getString(R.string.titleControllers) -> { getString(R.string.titleControllers) -> {
addFragmentOnTop( addFragmentOnTop(
PasilleroFragment.newInstance(item.title, isInitMenu = false), PasilleroFragment.newInstance(itemTitle, isInitMenu = false),
) )
} }
getString(R.string.titleOther) -> { getString(R.string.titleOther) -> {
addFragmentOnTop( addFragmentOnTop(
PasilleroFragment.newInstance(item.title, isInitMenu = false), PasilleroFragment.newInstance(itemTitle, isInitMenu = false),
) )
} }
getString(R.string.titleChangeCategory) -> { getString(R.string.titleChangeCategory) -> {
addFragmentOnTop( addFragmentOnTop(
ChangeCategoryFragment.newInstance(item.title), ChangeCategoryFragment.newInstance(itemTitle),
) )
} }
@ -554,29 +550,29 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), OnPasillerosItemClickL
getString(R.string.titleCorridors) -> { getString(R.string.titleCorridors) -> {
mainActivityPasilleroViewModel.workerActivityAdd(CodeWorkerAction.ON_PREPARATION) mainActivityPasilleroViewModel.workerActivityAdd(CodeWorkerAction.ON_PREPARATION)
addFragmentOnTop( addFragmentOnTop(
PasilleroFragment.newInstance(item.title, isInitMenu = false), PasilleroFragment.newInstance(itemTitle, isInitMenu = false),
) )
} }
getString(R.string.titlePrevious) -> { getString(R.string.titlePrevious) -> {
addFragmentOnTop( addFragmentOnTop(
PasilleroFragment.newInstance(item.title, isInitMenu = false), PasilleroFragment.newInstance(itemTitle, isInitMenu = false),
) )
} }
getString(R.string.titleExpeditionState) -> { getString(R.string.titleExpeditionState) -> {
// addFragment(ExpeditionStateFragment.newInstance(entryPoint),R.id.main_frame_layout, ExpeditionTruckListFragment.TAG,false) // addFragment(ExpeditionStateFragment.newInstance(entryPoint),R.id.main_frame_layout, ExpeditionTruckListFragment.TAG,false)
addFragmentOnTop(ExpeditionStateFragment.newInstance(item.title)) addFragmentOnTop(ExpeditionStateFragment.newInstance(itemTitle))
} }
getString(R.string.titleScanExpedition) -> { getString(R.string.titleScanExpedition) -> {
addFragmentOnTop(ExpeditionScanSorterFragment.newInstance(item.title)) addFragmentOnTop(ExpeditionScanSorterFragment.newInstance(itemTitle))
} }
getString(R.string.titleBufferManegement) -> { getString(R.string.titleBufferManegement) -> {
addFragmentOnTop( addFragmentOnTop(
PasilleroFragment.newInstance( PasilleroFragment.newInstance(
item.title, isInitMenu = false itemTitle, isInitMenu = false
) )
) )
} }
@ -584,7 +580,7 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), OnPasillerosItemClickL
getString(R.string.titleClaims) -> { getString(R.string.titleClaims) -> {
addFragmentOnTop( addFragmentOnTop(
PasilleroFragment.newInstance( PasilleroFragment.newInstance(
item.title, isInitMenu = false itemTitle, isInitMenu = false
) )
) )
@ -603,7 +599,7 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), OnPasillerosItemClickL
addFragmentOnTop(PreSacadorFragment.newInstance()) addFragmentOnTop(PreSacadorFragment.newInstance())
}*/ }*/
getString(R.string.titleDayOfSale) -> { getString(R.string.titleDayOfSale) -> {
addFragmentOnTop(DayOfSaleFragment(item.title)) addFragmentOnTop(DayOfSaleFragment(itemTitle))
} }
getString(R.string.titleShowTicket) -> { getString(R.string.titleShowTicket) -> {
@ -666,11 +662,11 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), OnPasillerosItemClickL
} }
getString(R.string.titleAuto) -> { getString(R.string.titleAuto) -> {
addFragmentOnTop(AutomaticAddItemFragment.newInstance(entryPoint, item.title)) addFragmentOnTop(AutomaticAddItemFragment.newInstance(entryPoint, itemTitle))
} }
/* getString(R.string.titleControllersAction) -> { /* getString(R.string.titleControllersAction) -> {
addFragmentOnTop(AutomaticAddItemFragment.newInstance(entryPoint, item.title)) addFragmentOnTop(AutomaticAddItemFragment.newInstance(entryPoint, itemTitle))
}*/ }*/
getString(R.string.titlePickers) -> { getString(R.string.titlePickers) -> {
@ -689,32 +685,32 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), OnPasillerosItemClickL
} }
//Menu qr //Menu qr
getString(R.string.titleQrReader) -> { getString(R.string.titleQrReader) -> {
addFragmentOnTop(QrFragment.newInstance(item.title)) addFragmentOnTop(QrFragment.newInstance(itemTitle))
} }
//Menu buffer //Menu buffer
getString(R.string.titleBufferEmpty) -> { getString(R.string.titleBufferEmpty) -> {
addFragmentOnTop(BufferFragment.newInstance(item.title)) addFragmentOnTop(BufferFragment.newInstance(itemTitle))
} }
getString(R.string.titleBufferFill) -> { getString(R.string.titleBufferFill) -> {
addFragmentOnTop(BufferFragment.newInstance(item.title)) addFragmentOnTop(BufferFragment.newInstance(itemTitle))
} }
getString(R.string.titleBufferAccumulate) -> { getString(R.string.titleBufferAccumulate) -> {
addFragmentOnTop(BufferFragment.newInstance(item.title)) addFragmentOnTop(BufferFragment.newInstance(itemTitle))
} }
getString(R.string.titleBufferOff) -> { getString(R.string.titleBufferOff) -> {
addFragmentOnTop(BufferFragment.newInstance(item.title)) addFragmentOnTop(BufferFragment.newInstance(itemTitle))
} }
getString(R.string.titleBufferload) -> { getString(R.string.titleBufferload) -> {
addFragmentOnTop(BufferLoadFragment.newInstance(item.title)) addFragmentOnTop(BufferLoadFragment.newInstance(itemTitle))
} }
getString(R.string.titleBufferStrapping) -> { getString(R.string.titleBufferStrapping) -> {
addFragmentOnTop(BufferFragment.newInstance(item.title)) addFragmentOnTop(BufferFragment.newInstance(itemTitle))
} }
getString(R.string.titlePreControl) -> { getString(R.string.titlePreControl) -> {
@ -726,24 +722,24 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), OnPasillerosItemClickL
} }
getString(R.string.titleShelvingHistorical) -> { getString(R.string.titleShelvingHistorical) -> {
addFragmentOnTop(ItemShelvingLogFragment.newInstance(item.title)) addFragmentOnTop(ItemShelvingLogFragment.newInstance(itemTitle))
} }
getString(R.string.titleLogShelving) -> { getString(R.string.titleLogShelving) -> {
addFragmentOnTop(ShelvingLogFragment.newInstance(item.title, LogType.SHELVING)) addFragmentOnTop(ShelvingLogFragment.newInstance(itemTitle, LogType.SHELVING))
} }
getString(R.string.titleParkingTicketPrevia) -> { getString(R.string.titleParkingTicketPrevia) -> {
addFragmentOnTop(ShelvingLogFragment.newInstance(item.title, LogType.PREVIOUS)) addFragmentOnTop(ShelvingLogFragment.newInstance(itemTitle, LogType.PREVIOUS))
} }
getString(R.string.titleWorkerMistake) -> { getString(R.string.titleWorkerMistake) -> {
addFragmentOnTop(WorkermistakeFragment.newInstance(item.title)) addFragmentOnTop(WorkermistakeFragment.newInstance(itemTitle))
} }
getString(R.string.titlePackingMistake) -> { getString(R.string.titlePackingMistake) -> {
addFragmentOnTop(PackingMistakeFragment.newInstance(item.title)) addFragmentOnTop(PackingMistakeFragment.newInstance(itemTitle))
} }
getString(R.string.titlePrePickerTest) -> { getString(R.string.titlePrePickerTest) -> {
@ -755,39 +751,39 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), OnPasillerosItemClickL
} }
getString(R.string.titleClaimUbication) -> { getString(R.string.titleClaimUbication) -> {
addFragmentOnTop(ClaimUbicationFragment.newInstance(item.title)) addFragmentOnTop(ClaimUbicationFragment.newInstance(itemTitle))
} }
getString(R.string.titleReUbicator) -> { getString(R.string.titleReUbicator) -> {
addFragmentOnTop(ReubicationFragment.newInstance(item.title)) addFragmentOnTop(ReubicationFragment.newInstance(itemTitle))
} }
getString(R.string.titleCMRState) -> { getString(R.string.titleCMRState) -> {
addFragmentOnTop(CmrExpeditionPalletFragment.newInstance(item.title)) addFragmentOnTop(CmrExpeditionPalletFragment.newInstance(itemTitle))
} }
getString(R.string.scanPlatform) -> { getString(R.string.scanPlatform) -> {
addFragmentOnTop(PalletScanFragment.newInstance(item.title, "receive")) addFragmentOnTop(PalletScanFragment.newInstance(itemTitle, "receive"))
} }
getString(R.string.titleScanPalletizar) -> { getString(R.string.titleScanPalletizar) -> {
addFragmentOnTop(PalletScanFragment.newInstance(item.title, "get")) addFragmentOnTop(PalletScanFragment.newInstance(itemTitle, "get"))
} }
getString(R.string.titlePackaging) -> { getString(R.string.titlePackaging) -> {
addFragmentOnTop(SupplierFragment.newInstance(item.title), name = item.title) addFragmentOnTop(SupplierFragment.newInstance(itemTitle), name = itemTitle)
} }
getString(R.string.titlePackagingCount) -> { getString(R.string.titlePackagingCount) -> {
addFragmentOnTop(PackagingCountFragment.newInstance(item.title), name = item.title) addFragmentOnTop(PackagingCountFragment.newInstance(itemTitle), name = itemTitle)
} }
getString(R.string.titlePackagingObs) -> { getString(R.string.titlePackagingObs) -> {
addFragmentOnTop(ObservFragment.newInstance(item.title), name = item.title) addFragmentOnTop(ObservFragment.newInstance(itemTitle), name = itemTitle)
} }
getString(R.string.titlePackagingSummary) -> { getString(R.string.titlePackagingSummary) -> {
addFragmentOnTop(PackagingSummaryFragment.newInstance(item.title)) addFragmentOnTop(PackagingSummaryFragment.newInstance(itemTitle))
} }
getString(R.string.selfConsumption) -> { getString(R.string.selfConsumption) -> {
@ -795,7 +791,7 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), OnPasillerosItemClickL
} }
getString(R.string.titlePackingHolland) -> { getString(R.string.titlePackingHolland) -> {
addFragmentOnTop(PackingHollandFragment.newInstance(item.title)) addFragmentOnTop(PackingHollandFragment.newInstance(itemTitle))
} }
getString(R.string.titleDelivery) -> { getString(R.string.titleDelivery) -> {
@ -817,7 +813,7 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), OnPasillerosItemClickL
getString(R.string.titleInfo) -> { getString(R.string.titleInfo) -> {
addFragmentOnTop( addFragmentOnTop(
InfoFragment.newInstance(item.title), getString(R.string.titleInfo) InfoFragment.newInstance(itemTitle), getString(R.string.titleInfo)
) )
} }
@ -825,14 +821,14 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), OnPasillerosItemClickL
getString(R.string.titleLog) -> { getString(R.string.titleLog) -> {
addFragmentOnTop( addFragmentOnTop(
LogExpeditionFragment.newInstance(item.title), getString(R.string.titleLog) LogExpeditionFragment.newInstance(itemTitle), getString(R.string.titleLog)
) )
} }
getString(R.string.titleLoadTruck) -> { getString(R.string.titleLoadTruck) -> {
addFragmentOnTop( addFragmentOnTop(
LoadUnloadFragment.newInstance(item.title, "ON DELIVERY", entryPoint), LoadUnloadFragment.newInstance(itemTitle, "ON DELIVERY", entryPoint),
getString(R.string.titleLoadTruck) getString(R.string.titleLoadTruck)
) )
@ -843,7 +839,7 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), OnPasillerosItemClickL
@Suppress("UNCHECKED_CAST") @Suppress("UNCHECKED_CAST")
addFragmentOnTop( addFragmentOnTop(
LoadUnloadFragment.newInstance( LoadUnloadFragment.newInstance(
item.title, "DELIVERED", entryPoint, itemTitle, "DELIVERED", entryPoint,
param as? ArrayList<ClientTicketSalix> param as? ArrayList<ClientTicketSalix>
), getString(R.string.titleUnLoadTruck) ), getString(R.string.titleUnLoadTruck)
) )
@ -853,7 +849,7 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), OnPasillerosItemClickL
getString(R.string.titleDeliverySummary) -> { getString(R.string.titleDeliverySummary) -> {
addFragmentOnTop( addFragmentOnTop(
SummaryFragment.newInstance(item.title, "ON DELIVERY", entryPoint.toInt()), SummaryFragment.newInstance(itemTitle, "ON DELIVERY", entryPoint.toInt()),
getString(R.string.titleDeliverySummary) getString(R.string.titleDeliverySummary)
) )
@ -862,43 +858,43 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), OnPasillerosItemClickL
getString(R.string.titleDeliveryRoute) -> { getString(R.string.titleDeliveryRoute) -> {
addFragmentOnTop( addFragmentOnTop(
RoutesFragment.newInstance(item.title), getString(R.string.titleDeliverySummary) RoutesFragment.newInstance(itemTitle), getString(R.string.titleDeliverySummary)
) )
} }
getString(R.string.titlePhotos) -> { getString(R.string.titlePhotos) -> {
addFragmentOnTop( addFragmentOnTop(
PhotosFragment.newInstance(item.title, entryPoint) PhotosFragment.newInstance(itemTitle, entryPoint)
) )
} }
getString(R.string.ticketAdvance) -> { getString(R.string.ticketAdvance) -> {
addFragmentOnTop( addFragmentOnTop(
TicketAdvanceFragment.newInstance(item.title) TicketAdvanceFragment.newInstance(itemTitle)
) )
} }
getString(R.string.testing) -> { getString(R.string.testing) -> {
// addFragmentOnTop( // addFragmentOnTop(
// es.verdnatura.presentation.view.feature.photos.fragment.PhotosFragment.newInstance(item.title)) // es.verdnatura.presentation.view.feature.photos.fragment.PhotosFragment.newInstance(itemTitle))
//addFragmentOnTop(testPrint.newInstance(item.title)) //addFragmentOnTop(testPrint.newInstance(itemTitle))
} }
getString(R.string.titleInventoryParking) -> { getString(R.string.titleInventoryParking) -> {
addFragmentOnTop(InventaryParkingFragment.newInstance(item.title)) addFragmentOnTop(InventaryParkingFragment.newInstance(itemTitle))
} }
getString(R.string.tickets) -> { getString(R.string.tickets) -> {
addFragmentOnTop(TicketsFragment.newInstance(item.title, entryPoint)) addFragmentOnTop(TicketsFragment.newInstance(itemTitle, entryPoint))
} }
getString(R.string.reviewBoxPicking) -> { getString(R.string.reviewBoxPicking) -> {
addFragmentOnTop(BoxPickingFragment.newInstance(item.title)) addFragmentOnTop(BoxPickingFragment.newInstance(itemTitle))
} }
getString(R.string.pickerHelper) -> { getString(R.string.pickerHelper) -> {
addFragmentOnTop(PickerHelperFragment.newInstance(item.title)) addFragmentOnTop(PickerHelperFragment.newInstance(itemTitle))
} }
"PREITEMPICKERTEST" -> { "PREITEMPICKERTEST" -> {

2
app/src/main/java/es/verdnatura/presentation/view/feature/packaging/adapter/ItemSupplierAdapter.kt
View File

@ -48,7 +48,7 @@ class ItemSupplierAdapter(
itemRemove.visibility = View.GONE itemRemove.visibility = View.GONE
} }
itemAdd.setOnClickListener { itemAdd.setOnClickListener {
onImageUpdateClickListener!!.OnImageUpdateClickListener( onImageUpdateClickListener!!.onImageUpdateClickListener(
item item
) )
} }

2
app/src/main/java/es/verdnatura/presentation/view/feature/packaging/adapter/ListImageAdapter.kt
View File

@ -34,7 +34,7 @@ class ListImageAdapter(
itemName.text = item.name itemName.text = item.name
itemImageUpdate.setOnClickListener { itemImageUpdate.setOnClickListener {
onImageUpdateClickListener.OnImageUpdateClickListener( onImageUpdateClickListener.onImageUpdateClickListener(
item item
) )
} }

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

@ -160,7 +160,7 @@ class ObservFragment(
private fun openSummary() { private fun openSummary() {
ma.onPasillerosItemClickListener( ma.onPasillerosItemClickListener(
PasillerosItemVO(title = getString(R.string.titlePackagingSummary)), PasillerosItemVO(title = R.string.titlePackagingSummary),
getString(R.string.titlePackagingSummary) getString(R.string.titlePackagingSummary)
) )
} }
@ -273,7 +273,7 @@ class ObservFragment(
adapterListImage = adapterListImage =
ListImageAdapter(list, object : OnImageUpdateClickListener { ListImageAdapter(list, object : OnImageUpdateClickListener {
override fun OnImageUpdateClickListener(item: Any) { override fun onImageUpdateClickListener(item: Any) {
val drawable = getDrawableFromImageUri(requireContext(), (item as Image).uri) val drawable = getDrawableFromImageUri(requireContext(), (item as Image).uri)
val bitmap = drawable!!.toBitmap() val bitmap = drawable!!.toBitmap()

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

@ -76,7 +76,7 @@ class PackagingCountFragment(
when (item) { when (item) {
iconNext.drawable -> { iconNext.drawable -> {
ma.onPasillerosItemClickListener( ma.onPasillerosItemClickListener(
PasillerosItemVO(title = getString(R.string.titlePackagingObs)), PasillerosItemVO(title = R.string.titlePackagingObs),
getString(R.string.titlePackagingObs) getString(R.string.titlePackagingObs)
) )
} }
@ -115,28 +115,36 @@ class PackagingCountFragment(
itemSupplierList.observe(viewLifecycleOwner) { iti -> itemSupplierList.observe(viewLifecycleOwner) { iti ->
adapteritemsupplier = adapteritemsupplier =
ItemSupplierAdapter(iti.list.sortedBy { it.name }, object : OnImageUpdateClickListener { ItemSupplierAdapter(
iti.list.sortedBy { it.name },
object : OnImageUpdateClickListener {
override fun OnImageUpdateClickListener(item: Any) { override fun onImageUpdateClickListener(item: Any) {
showCustomDialog("quantity", item as ItemSupplier) showCustomDialog("quantity", item as ItemSupplier)
} }
}, object : OnImageTrashClickListener { },
object : OnImageTrashClickListener {
override fun onImageTrashClickListener(item: Any) { override fun onImageTrashClickListener(item: Any) {
showCustomDialog("delete", item as ItemSupplier) showCustomDialog("delete", item as ItemSupplier)
} }
}, object : OnEditSubQuantityListener { },
override fun OnEditSubQuantityListener(item: Any, text: String) { object : OnEditSubQuantityListener {
override fun onEditSubQuantityListener(item: Any, text: String) {
hideKeyboard() hideKeyboard()
} }
}, object : OnItemClickListener { },
object : OnItemClickListener {
override fun onItemClickListener(item: ItemSupplier) { override fun onItemClickListener(item: ItemSupplier) {
if (!item.url.isNullOrBlank()) { if (!item.url.isNullOrBlank()) {
val i = Intent(activity, ImageViewActivity::class.java) val i = Intent(activity, ImageViewActivity::class.java)
i.putExtra(getString(R.string.url), "http:${item.url}/catalog/1600x900/${item.id}") i.putExtra(
getString(R.string.url),
"http:${item.url}/catalog/1600x900/${item.id}"
)
i.putExtra(getString(R.string.title), item.name) i.putExtra(getString(R.string.title), item.name)
startActivity(i) startActivity(i)
} }

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

@ -124,7 +124,7 @@ class SupplierFragment(
mobileApplication.dataStoreApp.deleteImages() mobileApplication.dataStoreApp.deleteImages()
} }
ma.onPasillerosItemClickListener( ma.onPasillerosItemClickListener(
PasillerosItemVO(title = getString(R.string.titlePackagingCount)), PasillerosItemVO(title = R.string.titlePackagingCount),
getString(R.string.titlePackagingCount) getString(R.string.titlePackagingCount)
) )
// } // }
@ -154,7 +154,7 @@ class SupplierFragment(
} }
ma.onPasillerosItemClickListener( ma.onPasillerosItemClickListener(
PasillerosItemVO(title = getString(R.string.titlePackagingCount)), PasillerosItemVO(title = R.string.titlePackagingCount),
getString(R.string.titlePackagingCount) getString(R.string.titlePackagingCount)
) )
} }

8
app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/model/ItemExpeditionTruckVO.kt
View File

@ -1,17 +1,11 @@
package es.verdnatura.presentation.view.feature.paletizador.model package es.verdnatura.presentation.view.feature.paletizador.model
import com.google.gson.annotations.SerializedName
import es.verdnatura.presentation.view.feature.articulo.model.BarcodeVO import es.verdnatura.presentation.view.feature.articulo.model.BarcodeVO
class ItemExpeditionTruckVO( class ItemExpeditionTruckVO(
var id: Int, var id: Int,
//Tarea 4902
@SerializedName(value = "ETD", alternate = ["eta"])
var eta: String = "", var eta: String = "",
var Destino: String = "", var description: String = ""
var description: String = "",
var isError: Boolean = false,
var errorMessage: String = ""
) )
data class ItemExpeditionTruckSalix( data class ItemExpeditionTruckSalix(

7
app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/model/ItemPalletVO.kt
View File

@ -3,10 +3,7 @@ package es.verdnatura.presentation.view.feature.paletizador.model
class ItemPalletVO( class ItemPalletVO(
var Pallet:Int, var Pallet:Int,
var Rutas:Int =0, var Rutas:Int =0,
var Eti:Int = 0, var Eti:Int = 0
var isError: Boolean = false,
var errorMessage: String = ""
) )
class ItemPalletListVO( class ItemPalletListVO(
@ -18,8 +15,6 @@ class ItemPalletViewVO(
var Pallet:Int = 0, var Pallet:Int = 0,
var Rutas:Int = 0, var Rutas:Int = 0,
var Cajas:Int = 0, var Cajas:Int = 0,
var isError: Boolean = false,
var errorMessage: String = ""
) )
class ItemPalletViewListVO( class ItemPalletViewListVO(

24
app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/model/ItemScanVO.kt
View File

@ -1,27 +1,23 @@
package es.verdnatura.presentation.view.feature.paletizador.model package es.verdnatura.presentation.view.feature.paletizador.model
class ItemScanVO ( class ItemScanVO(
var expeditionFk:String = "", var expeditionFk: String = "",
var palletFk:Int, var palletFk: Int
var isError:Boolean = false,
var errorMessage:String = ""
) )
class ItemScanList( class ItemScanList(
var list:List<ItemScanVO> = listOf() var list: List<ItemScanVO> = listOf()
) )
class ItemExpeditionScanVO( class ItemExpeditionScanVO(
var id:Int, var id: Int,
var expeditionFk:Int = 0, var expeditionFk: Int = 0,
var Ruta:Int = 0, var Ruta: Int = 0,
var Ticket:Int= 0, var Ticket: Int = 0,
var Caja:Int = 0, var Caja: Int = 0
var isError:Boolean = false,
var errorMessage:String = ""
) )
class ItemExpeditionScanList( class ItemExpeditionScanList(
var list:List<ItemExpeditionScanVO> = listOf() var list: List<ItemExpeditionScanVO> = listOf()
) )

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

@ -79,7 +79,7 @@ class ParkingFragment(var menuOrigin: String) :
override fun observeViewModel() { override fun observeViewModel() {
with(viewModel) { with(viewModel) {
response.observe(viewLifecycleOwner) { responseParking.observe(viewLifecycleOwner) {
ma.messageWithSound( ma.messageWithSound(
message = getString(R.string.Aparcado), message = getString(R.string.Aparcado),
@ -106,7 +106,7 @@ class ParkingFragment(var menuOrigin: String) :
val position = scanerList.indexOf(item) val position = scanerList.indexOf(item)
if (position != -1) { if (position != -1) {
scanerList.removeAt(position) scanerList.removeAt(position)
adapter!!.notifyItemRangeChanged(position,scanerList.size-position+1) adapter!!.notifyItemRangeChanged(position, scanerList.size - position + 1)
} }
} catch (ex: Exception) { } catch (ex: Exception) {
ex.message.toString().toast(requireContext()) ex.message.toString().toast(requireContext())
@ -146,9 +146,4 @@ class ParkingFragment(var menuOrigin: String) :
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
} }
@Throws(NumberFormatException::class)
fun isLetter(text: String): Boolean {
return text.matches(getString(R.string.regExp).toRegex())
}
} }

7
app/src/main/java/es/verdnatura/presentation/view/feature/parking/fragment/ParkingViewModel.kt
View File

@ -9,16 +9,15 @@ import es.verdnatura.presentation.base.BaseViewModel
import retrofit2.Response import retrofit2.Response
class ParkingViewModel(val context: Context) : BaseViewModel(context) { class ParkingViewModel(val context: Context) : BaseViewModel(context) {
private val _response by lazy { MutableLiveData<Any>() } private val _responseParking by lazy { MutableLiveData<Boolean>() }
val response: LiveData<Any> val responseParking: LiveData<Boolean> = _responseParking
get() = _response
fun setParking(scanItem: String, parking: String) { fun setParking(scanItem: String, parking: String) {
salix.setParking(arrayListOf(scanItem, parking).formatWithQuotes()) salix.setParking(arrayListOf(scanItem, parking).formatWithQuotes())
.enqueue(object : .enqueue(object :
SalixCallback<Any>(context) { SalixCallback<Any>(context) {
override fun onSuccess(response: Response<Any>) { override fun onSuccess(response: Response<Any>) {
_response.value = response.message() _responseParking.value = true
} }
}) })
} }

22
app/src/main/java/es/verdnatura/presentation/view/feature/photos/fragment/PhotosFragment.kt
View File

@ -1,4 +1,5 @@
package es.verdnatura.presentation.view.feature.photos.fragment package es.verdnatura.presentation.view.feature.photos.fragment
import android.app.Activity.RESULT_OK import android.app.Activity.RESULT_OK
import android.content.Context import android.content.Context
import android.content.Intent import android.content.Intent
@ -62,7 +63,6 @@ class PhotosFragment(
} }
} }
override fun getLayoutId(): Int = R.layout.fragment_photos override fun getLayoutId(): Int = R.layout.fragment_photos
companion object { companion object {
@ -138,7 +138,7 @@ class PhotosFragment(
viewModel.getIdFromCodeSalix(originalItem) viewModel.getIdFromCodeSalix(originalItem)
} catch (ex: Exception) { } catch (ex: Exception) {
ma.messageWithSound(ex.message.toString(), isError = true, isPlayed =true) ma.messageWithSound(ex.message.toString(), isError = true, isPlayed = true)
} }
} }
binding.editItemFk.setText("") binding.editItemFk.setText("")
@ -155,23 +155,7 @@ class PhotosFragment(
override fun observeViewModel() { override fun observeViewModel() {
with(viewModel) { with(viewModel) {
responseinsert.observe(viewLifecycleOwner) {
if (it.isError) {
ma.messageWithSound(
it.errorMessage + getString(R.string.user) + title,
isError = true,
true
)
} else {
ma.messageWithSound(
getString(R.string.itemUpdated),
isError = it.isError,
true
)
}
}
itemCard.observe(viewLifecycleOwner) { itemCard.observe(viewLifecycleOwner) {
if (it.id != 0) { if (it.id != 0) {
@ -192,7 +176,7 @@ class PhotosFragment(
} }
responseCode.observe(viewLifecycleOwner) { responseCode.observe(viewLifecycleOwner) {
if (it!=null) { if (it != null) {
viewModel.getItemCard( viewModel.getItemCard(
it.toLong(), it.toLong(),
mobileApplication.dataStoreApp.readDataStoreKey(WAREHOUSEFK) mobileApplication.dataStoreApp.readDataStoreKey(WAREHOUSEFK)

11
app/src/main/java/es/verdnatura/presentation/view/feature/precontrol/PreControladorFragment.kt
View File

@ -4,7 +4,6 @@ import android.content.Context
import android.os.Bundle import android.os.Bundle
import android.view.View.VISIBLE import android.view.View.VISIBLE
import android.view.inputmethod.EditorInfo import android.view.inputmethod.EditorInfo
import androidx.lifecycle.Observer
import es.verdnatura.R import es.verdnatura.R
import es.verdnatura.databinding.FragmentGeneralBlackBinding import es.verdnatura.databinding.FragmentGeneralBlackBinding
import es.verdnatura.domain.ConstAndValues import es.verdnatura.domain.ConstAndValues
@ -65,7 +64,11 @@ class PreControladorFragment :
try { try {
viewModel.getSales( viewModel.getSales(
collectionFk = itemScanValue(binding.scanInput.text.toString(),arrayOf("saleGroup"),"id").toString().toInt(), collectionFk = itemScanValue(
binding.scanInput.text.toString(),
arrayOf("saleGroup"),
"id"
).toString().toInt(),
print = false, print = false,
source = type source = type
) )
@ -84,12 +87,12 @@ class PreControladorFragment :
override fun observeViewModel() { override fun observeViewModel() {
with(viewModel) { with(viewModel) {
collectionTicketList.observe(viewLifecycleOwner, Observer { collectionTicketList.observe(viewLifecycleOwner) {
if (!goBack) navigateToCollectionList(it) if (!goBack) navigateToCollectionList(it)
goBack = false goBack = false
}) }
} }
} }

45
app/src/main/java/es/verdnatura/presentation/view/feature/precontrol/PreControladorViewModel.kt
View File

@ -1,45 +0,0 @@
package es.verdnatura.presentation.view.feature.precontrol
import android.content.Context
import androidx.lifecycle.LiveData
import androidx.lifecycle.MutableLiveData
import es.verdnatura.presentation.base.BaseViewModel
import es.verdnatura.presentation.view.feature.sacador.model.CollectionVO
class PreControladorViewModel(val context: Context) : BaseViewModel(context) {
private val _collectionTicketList by lazy { MutableLiveData<CollectionVO>() }
val collectionTicketList: LiveData<CollectionVO>
get() = _collectionTicketList
//Tarea 6276
//a salix
/* fun collectionTicketGet(collectionFk: String, sectorFk: String, type: String) {
silex.collection_getTickets(collectionFk, sectorFk, "0", type).enqueue(object :
SilexCallback<CollectionVO>(context) {
override fun onError(t: Throwable) {
_collectionTicketList.value = CollectionVO(
0,
isError = true,
errorMessage = getMessageFromAllResponse(nameofFunction(this), t.message!!)
)
}
override fun onSuccess(response: Response<CollectionVO>) {
if (response.body() != null) {
_collectionTicketList.value = response.body()?.let { it.map(context) }
} else {
_collectionTicketList.value = CollectionVO(
0,
isError = true,
errorMessage = getMessageFromAllResponse(
nameofFunction(this),
response.message()
)
)
}
}
})
}*/
}

2
app/src/main/java/es/verdnatura/presentation/view/feature/presacador/adapter/PreSacadorAdapter.kt
View File

@ -72,7 +72,7 @@ class PreSacadorAdapter(
itemArticleItemFk.setOnClickListener { itemArticleItemFk.setOnClickListener {
onPasillerosItemClickListener.onPasillerosItemClickListener( onPasillerosItemClickListener.onPasillerosItemClickListener(
PasillerosItemVO( PasillerosItemVO(
title = binding.root.context.resources.getString(R.string.titleItemConsult) title = R.string.titleItemConsult
), sale.itemFk.toString() ), sale.itemFk.toString()
) )
} }

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

@ -152,7 +152,7 @@ class EndSacadorFragment(
if ((binding.scanInput.text.toString()).isParking()) { if ((binding.scanInput.text.toString()).isParking()) {
pasillerosItemClickListener?.onPasillerosItemClickListener( pasillerosItemClickListener?.onPasillerosItemClickListener(
PasillerosItemVO( PasillerosItemVO(
title = getString(R.string.Parking) title = R.string.Parking
), "" ), ""
) )
} else { } else {
@ -949,7 +949,7 @@ class EndSacadorFragment(
when (item) { when (item) {
iconParking.drawable -> pasillerosItemClickListener?.onPasillerosItemClickListener( iconParking.drawable -> pasillerosItemClickListener?.onPasillerosItemClickListener(
PasillerosItemVO( PasillerosItemVO(
title = getString(R.string.parking) title = R.string.parking
), "" ), ""
) )

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

@ -227,7 +227,6 @@ class PreSacadorViewModel(val context: Context) : BaseViewModel(context) {
}) })
} }
fun collectionIncreaseQuantity( fun collectionIncreaseQuantity(
saleFk: Int, quantity: Int saleFk: Int, quantity: Int
) { ) {
@ -300,11 +299,8 @@ class PreSacadorViewModel(val context: Context) : BaseViewModel(context) {
fun sectorCollectionGetSale( fun sectorCollectionGetSale(
sectorCollectionFK: Int, sectorFk: Int sectorCollectionFK: Int, sectorFk: Int
) { ) {
//Tarea 6276
salix.sectorCollectionGetSale(sectorFk = sectorFk, sectorCollectionFk = sectorCollectionFK) salix.sectorCollectionGetSale(sectorFk = sectorFk, sectorCollectionFk = sectorCollectionFK)
/* silex.sectorCollection_getSale(
sectorCollectionFK, sectorFk.toString()
)*/
.enqueue(object : SalixCallback<List<PreSacadorItemVO>>(context) { .enqueue(object : SalixCallback<List<PreSacadorItemVO>>(context) {
override fun onError(t: Throwable) { override fun onError(t: Throwable) {
_salesList.value = listOf() _salesList.value = listOf()
@ -457,11 +453,8 @@ class PreSacadorViewModel(val context: Context) : BaseViewModel(context) {
fun itemShelving_updateFromSale( fun itemShelving_updateFromSale(
saleFk: Int saleFk: Int
) { ) {
//Tarea 6276 pasar a Salix
//09/04/2024
salix.itemShelvingUpdateFromSale(hashMapOf("saleFk" to saleFk))
// silex.itemShelving_updateFromSale(saleFk) salix.itemShelvingUpdateFromSale(hashMapOf("saleFk" to saleFk))
.enqueue(object : SalixCallback<Any>(context) { .enqueue(object : SalixCallback<Any>(context) {
override fun onError(t: Throwable) { override fun onError(t: Throwable) {

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

@ -78,7 +78,7 @@ class SectorCollectionReserveFragment(
requireActivity().supportFragmentManager.popBackStack() requireActivity().supportFragmentManager.popBackStack()
} else { } else {
ma.onPasillerosItemClickListener( ma.onPasillerosItemClickListener(
PasillerosItemVO(title = "titlePrePickerTest"), PasillerosItemVO(title = R.string.titleprepickertest),
entryPoint = collectionFk.toString() entryPoint = collectionFk.toString()
) )
} }
@ -359,7 +359,7 @@ class SectorCollectionReserveFragment(
if (::customDialogList.isInitialized) customDialogList.dismiss() if (::customDialogList.isInitialized) customDialogList.dismiss()
ma.onPasillerosItemClickListener( ma.onPasillerosItemClickListener(
PasillerosItemVO(title = "PREITEMPICKERTEST"), entryPoint = collectionFk.toString() PasillerosItemVO(title =R.string.preitempickertestMayus), entryPoint = collectionFk.toString()
) )
// onBack = true // onBack = true
} }

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

@ -1,14 +1,11 @@
package es.verdnatura.presentation.view.feature.qr package es.verdnatura.presentation.view.feature.qr
import android.view.inputmethod.EditorInfo import android.view.inputmethod.EditorInfo
import androidx.lifecycle.Observer
import es.verdnatura.R import es.verdnatura.R
import es.verdnatura.databinding.FragmentQrBinding import es.verdnatura.databinding.FragmentQrBinding
import es.verdnatura.presentation.base.BaseFragment import es.verdnatura.presentation.base.BaseFragment
import es.verdnatura.presentation.view.component.CustomDialog import es.verdnatura.presentation.view.component.CustomDialog
@Suppress("UNUSED_ANONYMOUS_PARAMETER") @Suppress("UNUSED_ANONYMOUS_PARAMETER")
class QrFragment( class QrFragment(
var entryPoint: String = "" var entryPoint: String = ""
@ -23,7 +20,6 @@ class QrFragment(
fun newInstance(entryPoint: String) = QrFragment(entryPoint) fun newInstance(entryPoint: String) = QrFragment(entryPoint)
} }
override fun init() { override fun init() {
customDialog = CustomDialog(requireContext()) customDialog = CustomDialog(requireContext())
@ -42,7 +38,6 @@ class QrFragment(
super.onPause() super.onPause()
} }
private fun setEvents() { private fun setEvents() {
binding.mainToolbar.backButton.setOnClickListener { binding.mainToolbar.backButton.setOnClickListener {
@ -54,7 +49,6 @@ class QrFragment(
if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0) { if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0) {
goBack = false goBack = false
if (!binding.scanInput.text.isNullOrEmpty()) { if (!binding.scanInput.text.isNullOrEmpty()) {
/* viewModel.qr_getCall( /* viewModel.qr_getCall(
@ -74,7 +68,7 @@ class QrFragment(
override fun observeViewModel() { override fun observeViewModel() {
with(viewModel) { with(viewModel) {
qrresponse.observe(viewLifecycleOwner, Observer { qrresponse.observe(viewLifecycleOwner) {
if (it.isError) { if (it.isError) {
@ -95,11 +89,10 @@ class QrFragment(
} }
}) }
} }
} }
} }

36
app/src/main/java/es/verdnatura/presentation/view/feature/roadmap/fragment/StopMapListFragment.kt
View File

@ -138,17 +138,17 @@ class StopMapListFragment(
with(viewModel) { with(viewModel) {
loadStopMapTruckList.observe(viewLifecycleOwner) { event -> loadStopMapTruckList.observe(viewLifecycleOwner) { event ->
event.getContentIfNotHandled().notNull { event.getContentIfNotHandled().notNull {
for (item in it.list ) for (item in it.list) {
{
println("llista") println("llista")
println("llista $item") println("llista $item")
println("llista addressFk ${item.addressFk}") println("llista addressFk ${item.addressFk}")
println("llista id" + item.id) println("llista id" + item.id)
println("llista address" +item.address) println("llista address" + item.address)
println("llista client id" +item.address?.address?.client) println("llista client id" + item.address?.address?.client)
println("llista mobile " +item.address?.address?.mobile) println("llista mobile " + item.address?.address?.mobile)
}
showRoadMapList(it)
} }
showRoadMapList(it) }
} }
} }
@ -209,21 +209,26 @@ class StopMapListFragment(
popupMenu.setOnMenuItemClickListener { itemOption -> popupMenu.setOnMenuItemClickListener { itemOption ->
when (itemOption.itemId) { when (itemOption.itemId) {
R.id.maps -> { R.id.maps -> {
val uri:String val uri: String
if (item.address?.address?.street != null) { if (item.address?.address?.street != null) {
uri = "geo:0,0?q=" + item.address?.address?.nickname + " " + item.address?.address?.street + " " + item.address?.address?.city + " " + item.address?.address?.postalCode uri =
"geo:0,0?q=" + item.address?.address?.nickname + " " + item.address?.address?.street + " " + item.address?.address?.city + " " + item.address?.address?.postalCode
val locationIntent = val locationIntent =
Intent(Intent.ACTION_VIEW, Uri.parse(uri)) Intent(Intent.ACTION_VIEW, Uri.parse(uri))
startActivity(locationIntent) startActivity(locationIntent)
}else{ } else {
if (item.address?.address?.latitude == null || item.address?.address?.longitude == null){ if (item.address?.address?.latitude == null || item.address?.address?.longitude == null) {
getString(R.string.errorLocation).toast(requireContext()) getString(R.string.errorLocation).toast(
}else{ requireContext()
uri = "geo:${item.address?.address?.latitude},${item.address?.address?.longitude}" )
} else {
uri =
"geo:${item.address?.address?.latitude},${item.address?.address?.longitude}"
val locationIntent = val locationIntent =
Intent(Intent.ACTION_VIEW, Uri.parse(uri)) Intent(Intent.ACTION_VIEW, Uri.parse(uri))
startActivity(locationIntent)} startActivity(locationIntent)
}
} }
true true
@ -245,7 +250,6 @@ class StopMapListFragment(
} }
}) })
binding.stopmapTruckRecyclerview.adapter = adapter binding.stopmapTruckRecyclerview.adapter = adapter
binding.stopmapTruckRecyclerview.layoutManager = lm binding.stopmapTruckRecyclerview.layoutManager = lm
@ -294,7 +298,7 @@ class StopMapListFragment(
}.hideDialog().show() }.hideDialog().show()
val listPhonesAdapter = GeneralAdapter(phones, object : OnGeneralItemRowClickListener { val listPhonesAdapter = GeneralAdapter(phones, object : OnGeneralItemRowClickListener {
override fun OnGeneralItemRowClickListener(item: GeneralItem) { override fun onGeneralItemRowClickListener(item: GeneralItem) {
phones.forEach { phones.forEach {
if (it.code == item.code) { if (it.code == item.code) {
if (ContextCompat.checkSelfPermission( if (ContextCompat.checkSelfPermission(

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

@ -56,7 +56,6 @@ class SacadorViewModel(val context: Context) : BaseViewModel(context) {
val loadPickingOrder: LiveData<Event<ResponseItemVO>> = _responsePickingOrder.map { Event(it) } val loadPickingOrder: LiveData<Event<ResponseItemVO>> = _responsePickingOrder.map { Event(it) }
fun sectorCollectionNew( fun sectorCollectionNew(
sectorFk: Int sectorFk: Int
) { ) {
@ -99,7 +98,6 @@ class SacadorViewModel(val context: Context) : BaseViewModel(context) {
} }
fun collection_assign() { fun collection_assign() {
//Tarea 6276
salix.collectionAssign() salix.collectionAssign()
// silex.collection_assign() // silex.collection_assign()
.enqueue( .enqueue(

10
app/src/main/java/es/verdnatura/presentation/view/feature/sacador/fragment/showticket/ShowTicketFragment.kt
View File

@ -32,6 +32,7 @@ class ShowTicketFragment() :
constructor(menuOrigin: String) : this() { constructor(menuOrigin: String) : this() {
this.menuOrigin = menuOrigin this.menuOrigin = menuOrigin
} }
companion object { companion object {
private const val ARG_MENU_ORIGIN = "menu_origin" private const val ARG_MENU_ORIGIN = "menu_origin"
@ -58,8 +59,8 @@ class ShowTicketFragment() :
//Tarea 6531 //Tarea 6531
try { try {
viewModel.myLastTickets(mobileApplication.userId!!) viewModel.myLastTickets(mobileApplication.userId!!)
}catch (ex:Exception){ } catch (ex: Exception) {
e("Crashlytics",ex.message.toString()) e("Crashlytics", ex.message.toString())
} }
super.init() super.init()
@ -98,11 +99,12 @@ class ShowTicketFragment() :
if (!binding.scanInput.text.isNullOrEmpty()) { if (!binding.scanInput.text.isNullOrEmpty()) {
try { try {
//Tarea 6276
viewModel.getSales( viewModel.getSales(
collectionFk = itemScanValue( collectionFk = itemScanValue(
binding.scanInput.text.toString(), arrayOf("ticket","saleGroup"), "id" binding.scanInput.text.toString(),
arrayOf("ticket", "saleGroup"),
"id"
).toString().toInt(), ).toString().toInt(),
print = false, print = false,
source = type source = type

8
app/src/main/java/es/verdnatura/presentation/view/feature/sacador/model/TicketItemVO.kt
View File

@ -158,8 +158,8 @@ class SaleVO(
var isParent: Boolean = false, var isParent: Boolean = false,
var totalSales: Int = 0, var totalSales: Int = 0,
var sonSales: MutableList<SaleVO> = mutableListOf(), var sonSales: MutableList<SaleVO> = mutableListOf(),
var code: String? = "", //6276 nulable var code: String? = "",
var hasMistake: Any? = false, //modificar a Int 6276 var hasMistake: Any? = false,
var sectorFk: Int? = null, var sectorFk: Int? = null,
var packingChecked: Int = 1 var packingChecked: Int = 1
@ -225,8 +225,8 @@ class SaleSalix(
var isParent: Boolean = false, var isParent: Boolean = false,
var totalSales: Int = 0, var totalSales: Int = 0,
var sonSales: MutableList<SaleVO> = mutableListOf(), var sonSales: MutableList<SaleVO> = mutableListOf(),
var code: String? = "", //6276 nulable var code: String? = "",
var hasMistake: Any = false, //modificar a Int 6276 var hasMistake: Any = false,
var sectorFk: Int? = null, var sectorFk: Int? = null,
var packingChecked: Int = 1 var packingChecked: Int = 1

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

@ -53,9 +53,8 @@ class UbicadorAdapter(
imgItem.setOnClickListener { imgItem.setOnClickListener {
onPasillerosItemClickListener.onPasillerosItemClickListener( onPasillerosItemClickListener.onPasillerosItemClickListener(
PasillerosItemVO( PasillerosItemVO(
title = res.getString( title =
R.string.itemSearch R.string.itemSearch
)
), item.item.toString() ), item.item.toString()
) )
} }
@ -87,7 +86,7 @@ class UbicadorAdapter(
namelayout.setOnClickListener { namelayout.setOnClickListener {
onPasillerosItemClickListener.onPasillerosItemClickListener( onPasillerosItemClickListener.onPasillerosItemClickListener(
PasillerosItemVO( PasillerosItemVO(
title = res.getString(R.string.itemSearch) title = R.string.itemSearch
), item.item.toString() ), item.item.toString()
) )
} }

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

@ -47,9 +47,9 @@ class UbicadorAdapterNew(
imgItem.setOnClickListener { imgItem.setOnClickListener {
onPasillerosItemClickListener.onPasillerosItemClickListener( onPasillerosItemClickListener.onPasillerosItemClickListener(
PasillerosItemVO( PasillerosItemVO(
title = res.getString( title =
R.string.itemSearch R.string.itemSearch
)
), item.item.toString() ), item.item.toString()
) )
} }
@ -81,7 +81,7 @@ class UbicadorAdapterNew(
namelayout.setOnClickListener { namelayout.setOnClickListener {
onPasillerosItemClickListener.onPasillerosItemClickListener( onPasillerosItemClickListener.onPasillerosItemClickListener(
PasillerosItemVO( PasillerosItemVO(
title = res.getString(R.string.itemSearch) title = R.string.itemSearch
), item.item.toString() ), item.item.toString()
) )
} }

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

@ -2,7 +2,6 @@ package es.verdnatura.presentation.view.feature.ubicador.fragment
import android.view.View import android.view.View
import android.view.inputmethod.EditorInfo import android.view.inputmethod.EditorInfo
import androidx.lifecycle.Observer
import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.LinearLayoutManager
import es.verdnatura.R import es.verdnatura.R
import es.verdnatura.databinding.FragmentAutomaticAddItemBinding import es.verdnatura.databinding.FragmentAutomaticAddItemBinding
@ -46,7 +45,8 @@ class AutomaticAddItemFragment(
} }
private fun setSubtitle() { private fun setSubtitle() {
binding.mainToolbar.toolbarSubtitle.text = getString(R.string.labels) + contador binding.mainToolbar.toolbarSubtitle.text =
getString(R.string.doubleText, getString(R.string.labels), contador.toString())
} }
private fun setViews() { private fun setViews() {
@ -56,9 +56,9 @@ class AutomaticAddItemFragment(
setSubtitle() setSubtitle()
if (listItems.size > position) { if (listItems.size > position) {
listItems.removeAt(position) listItems.removeAt(position)
adapter!!.notifyDataSetChanged()
} }
adapter!!.notifyDataSetChanged()
} }
}) })
binding.itemsRecyclerview.adapter = adapter binding.itemsRecyclerview.adapter = adapter
@ -71,7 +71,7 @@ class AutomaticAddItemFragment(
binding.editMatricula.setOnEditorActionListener { v, actionId, event -> binding.editMatricula.setOnEditorActionListener { v, actionId, event ->
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.editMatricula.text.toString().isNullOrEmpty()) { if (binding.editMatricula.text.toString().isNotEmpty()) {
contador += 1 contador += 1
setSubtitle() setSubtitle()
try { try {
@ -87,14 +87,18 @@ class AutomaticAddItemFragment(
adapter!!.notifyItemInserted(0) adapter!!.notifyItemInserted(0)
binding.itemsRecyclerview.scrollToPosition(0) binding.itemsRecyclerview.scrollToPosition(0)
} catch (ex: Exception) { } catch (ex: Exception) {
ma.messageWithSound(ex.message.toString(), true, true) ma.messageWithSound(ex.message.toString(), isError = true, isPlayed = true)
} }
} }
binding.editMatricula.setText("") binding.editMatricula.setText("")
ma.hideKeyboard(binding.editMatricula) ma.hideKeyboard(binding.editMatricula)
return@setOnEditorActionListener true return@setOnEditorActionListener true
} else { } else {
ma.messageWithSound("ACTION ID DIFERENTE", true, true) ma.messageWithSound(
getString(R.string.diferentAction),
isError = true,
isPlayed = true
)
} }
@ -134,9 +138,9 @@ class AutomaticAddItemFragment(
override fun observeViewModel() { override fun observeViewModel() {
with(viewModel) { with(viewModel) {
response.observe(viewLifecycleOwner, Observer { response.observe(viewLifecycleOwner) {
ma.onMyBackPressed() ma.onMyBackPressed()
}) }
} }
} }

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

@ -6,39 +6,26 @@ import androidx.lifecycle.MutableLiveData
import es.verdnatura.domain.SalixCallback import es.verdnatura.domain.SalixCallback
import es.verdnatura.domain.formatWithQuotes import es.verdnatura.domain.formatWithQuotes
import es.verdnatura.presentation.base.BaseViewModel 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.workermistake.model.MakeMultiSalix import es.verdnatura.presentation.view.feature.workermistake.model.MakeMultiSalix
import retrofit2.Response import retrofit2.Response
class AutomaticAddItemViewModel(val context: Context) : BaseViewModel(context) { class AutomaticAddItemViewModel(val context: Context) : BaseViewModel(context) {
private val _response by lazy { MutableLiveData<ResponseItemVO>() } private val _response by lazy { MutableLiveData<Boolean>() }
val response: LiveData<ResponseItemVO> val response: LiveData<Boolean> = _response
get() = _response
fun itemShelvingMakeMulti( fun itemShelvingMakeMulti(
shelvingFk: String, shelvingFk: String, items: List<Long>, warehouseFk: Int
items: List<Long>,
warehouseFk: Int
) { ) {
salix.upsertItem(MakeMultiSalix(shelvingFk, items, warehouseFk)) salix.upsertItem(MakeMultiSalix(shelvingFk, items, warehouseFk))
.enqueue(object : .enqueue(object : SalixCallback<Any>(context) {
SalixCallback<Any>(context) {
override fun onError(t: Throwable) { override fun onError(t: Throwable) {
_response.value = ResponseItemVO( _response.value = false
isError = true, errorMessage = getMessageFromAllResponse(
nameofFunction(this), t.message!!
)
)
} }
override fun onSuccess(response: Response<Any>) { override fun onSuccess(response: Response<Any>) {
_response.value = true
_response.value =
ResponseItemVO(isError = false, response = response.message()!!)
} }
}) })
@ -46,27 +33,17 @@ class AutomaticAddItemViewModel(val context: Context) : BaseViewModel(context) {
} }
fun itemShelvingAddList( fun itemShelvingAddList(
shelving: String, shelving: String, items: Any, isChecking: Boolean, warehouse: Int
items: Any,
isChecking: Boolean,
warehouse: Int
) { ) {
salix.itemShelvingAddList( salix.itemShelvingAddList(
arrayListOf(shelving, items, isChecking, warehouse).formatWithQuotes() arrayListOf(shelving, items, isChecking, warehouse).formatWithQuotes()
).enqueue(object : ).enqueue(object : SalixCallback<Any>(context) {
SalixCallback<Any>(context) {
override fun onSuccess(response: Response<Any>) { override fun onSuccess(response: Response<Any>) {
_response.value = _response.value = true
ResponseItemVO(isError = false, response = response.message()!!)
} }
override fun onError(t: Throwable) { override fun onError(t: Throwable) {
_response.value = ResponseItemVO( _response.value = false
isError = true, errorMessage = getMessageFromAllResponse(
nameofFunction(this), t.message!!
)
)
} }
}) })

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

@ -329,7 +329,7 @@ class UbicadorFragmentNew : BaseFragment<FragmentUbicadorBinding, UbicadorViewMo
binding.automaticImg.setOnClickListener { binding.automaticImg.setOnClickListener {
if (shelvingFk.isNotBlank()) ma.onPasillerosItemClickListener( if (shelvingFk.isNotBlank()) ma.onPasillerosItemClickListener(
PasillerosItemVO(title = getString(R.string.titleAuto)), entryPoint = shelvingFk PasillerosItemVO(title = R.string.titleAuto), entryPoint = shelvingFk
) )
else getString(R.string.scanShelving).toast( else getString(R.string.scanShelving).toast(
requireActivity(), Toast.LENGTH_SHORT requireActivity(), Toast.LENGTH_SHORT
@ -544,13 +544,23 @@ class UbicadorFragmentNew : BaseFragment<FragmentUbicadorBinding, UbicadorViewMo
viewModel.itemShelvingListNew(shelvingFk) viewModel.itemShelvingListNew(shelvingFk)
} }
} }
response.observe(viewLifecycleOwner) {
/*response.observe(viewLifecycleOwner) {
viewModel.itemShelvingListNew(shelvingFk) viewModel.itemShelvingListNew(shelvingFk)
}*/
//parking, isChecked, responseOlder, responseMake Add
responseUbicator.observe(viewLifecycleOwner) {
if (shelvingFk.isNotEmpty()) {
binding.mainToolbar.toolbarTitle.text = shelvingFk
viewModel.itemShelvingListNew(
shelvingFk
)
}
} }
responseLogAdd.observe(viewLifecycleOwner) { responseLogAdd.observe(viewLifecycleOwner) {
isShelvinLogfromMainScreen = false isShelvinLogfromMainScreen = false
} }
loadResponseCode.observe(viewLifecycleOwner) { event -> loadResponseCode.observe(viewLifecycleOwner) { event ->
event.getContentIfNotHandled().notNull { event.getContentIfNotHandled().notNull {
@ -558,7 +568,7 @@ class UbicadorFragmentNew : BaseFragment<FragmentUbicadorBinding, UbicadorViewMo
} }
} }
responseMake.observe(viewLifecycleOwner) { loadAddList.observe(viewLifecycleOwner) {
if (shelvingFk.isNotEmpty()) { if (shelvingFk.isNotEmpty()) {
binding.mainToolbar.toolbarTitle.text = shelvingFk binding.mainToolbar.toolbarTitle.text = shelvingFk
@ -1093,7 +1103,9 @@ class UbicadorFragmentNew : BaseFragment<FragmentUbicadorBinding, UbicadorViewMo
} }
private fun customDialogTransferAction(item: ItemUbicador) { private fun customDialogTransferAction(item: ItemUbicador) {
if (customDialogInput.getValue().isNotEmpty()) {/*tearea 6964*//*viewModel.hasItemOlder( if (customDialogInput.getValue().isNotEmpty()) {
/*tearea 6964*//*
viewModel.hasItemOlder(
shelvingFkIn = shelvingFk, shelvingFkIn = shelvingFk,
shelvingFkOut = customDialogInput.getValue(), shelvingFkOut = customDialogInput.getValue(),
itemFk = item.id, itemFk = item.id,

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

@ -37,27 +37,22 @@ class UbicadorViewModel(val context: Context) : BaseViewModel(context) {
val response: LiveData<ResponseItemVO> val response: LiveData<ResponseItemVO>
get() = _response get() = _response
private val _responseUbicator by lazy { MutableLiveData<Boolean>() }
val responseUbicator: LiveData<Boolean>
get() = _responseUbicator
private val _responseHasOlder by lazy { MutableLiveData<ResponseHasOlder>() } private val _responseHasOlder by lazy { MutableLiveData<ResponseHasOlder>() }
val responseHasOlder: LiveData<ResponseHasOlder> val responseHasOlder: LiveData<ResponseHasOlder>
get() = _responseHasOlder get() = _responseHasOlder
val loadResponseHasOlder: LiveData<Event<ResponseHasOlder>> = val loadResponseHasOlder: LiveData<Event<ResponseHasOlder>> =
_responseHasOlder.map { Event(it) } _responseHasOlder.map { Event(it) }
private val _responsepriority by lazy { MutableLiveData<ResponseItemVO>() }
val responsepriority: LiveData<ResponseItemVO>
get() = _responsepriority
private val _responseMake by lazy { MutableLiveData<ResponseItemVO>() }
val responseMake: LiveData<ResponseItemVO>
get() = _responseMake
val loadShelvingList: LiveData<Event<ItemUbicadorListVO>> = _shelvingList.map { Event(it) } val loadShelvingList: LiveData<Event<ItemUbicadorListVO>> = _shelvingList.map { Event(it) }
private val _shelvingListNew by lazy { MutableLiveData<ItemUbicadorListNew>() } private val _shelvingListNew by lazy { MutableLiveData<ItemUbicadorListNew>() }
val loadShelvingListNew: LiveData<Event<ItemUbicadorListNew>> = val loadShelvingListNew: LiveData<Event<ItemUbicadorListNew>> =
_shelvingListNew.map { Event(it) } _shelvingListNew.map { Event(it) }
private val _shelvingListItemNewer by lazy { MutableLiveData<ItemShelvingNewerList>() } private val _shelvingListItemNewer by lazy { MutableLiveData<ItemShelvingNewerList>() }
val loadShelvingListItemNewer: LiveData<Event<ItemShelvingNewerList>> = val loadShelvingListItemNewer: LiveData<Event<ItemShelvingNewerList>> =
_shelvingListItemNewer.map { Event(it) } _shelvingListItemNewer.map { Event(it) }
@ -72,10 +67,10 @@ class UbicadorViewModel(val context: Context) : BaseViewModel(context) {
val loadResponseCode: LiveData<Event<Int?>> = _responseCode.map { Event(it) } val loadResponseCode: LiveData<Event<Int?>> = _responseCode.map { Event(it) }
private val _responseAddList by lazy { MutableLiveData<ResponseItemVO>() } private val _responseAddList by lazy { MutableLiveData<Boolean>() }
val responseAddList: LiveData<ResponseItemVO> = _responseAddList val responseAddList: LiveData<Boolean> = _responseAddList
val loadAddList: LiveData<Event<ResponseItemVO>> = _responseAddList.map { Event(it) } val loadAddList: LiveData<Event<Boolean>> = _responseAddList.map { Event(it) }
private val _responseLogAdd by lazy { MutableLiveData<Any>() } private val _responseLogAdd by lazy { MutableLiveData<Any>() }
val responseLogAdd: LiveData<Any> val responseLogAdd: LiveData<Any>
@ -116,25 +111,9 @@ class UbicadorViewModel(val context: Context) : BaseViewModel(context) {
.enqueue( .enqueue(
object : SalixCallback<List<ItemUbicador>>(context) { object : SalixCallback<List<ItemUbicador>>(context) {
override fun onSuccess(response: Response<List<ItemUbicador>>) { override fun onSuccess(response: Response<List<ItemUbicador>>) {
_shelvingListNew.value = response.body()?.let { ItemUbicadorListNew(it) } _shelvingListNew.value = response.body()?.let { ItemUbicadorListNew(it) }
} }
override fun onError(t: Throwable) {
val listError: ArrayList<ItemUbicador> = ArrayList()
listError.add(
ItemUbicador(
0,
isError = true,
errorMessage = getMessageFromAllResponse(
nameofFunction(this),
t.message!!,
),
),
)
_shelvingListNew.value = ItemUbicadorListNew(listError)
}
}, },
) )
} }
@ -156,8 +135,8 @@ class UbicadorViewModel(val context: Context) : BaseViewModel(context) {
arrayListOf(shelving, items, isChecking, warehouse).formatWithQuotes() arrayListOf(shelving, items, isChecking, warehouse).formatWithQuotes()
).enqueue(object : SalixCallback<Any>(context) { ).enqueue(object : SalixCallback<Any>(context) {
override fun onSuccess(response: Response<Any>) { override fun onSuccess(response: Response<Any>) {
_responseAddList.value = _responseUbicator.value =
ResponseItemVO(isError = false, response = response.message()!!) true
} }
@ -186,18 +165,20 @@ class UbicadorViewModel(val context: Context) : BaseViewModel(context) {
).enqueue(object : SalixCallback<Any>(context) { ).enqueue(object : SalixCallback<Any>(context) {
override fun onResponse(call: Call<Any>, response: Response<Any>) { override fun onResponse(call: Call<Any>, response: Response<Any>) {
if (!createdRename.isNullOrBlank() && response.body() != null) {
if (!createdRename.isNullOrBlank() && response.body()!=null) {
val jsonArray = JsonParser().parse(response.body().toString()).asJsonArray val jsonArray = JsonParser().parse(response.body().toString()).asJsonArray
val jsonObject = jsonArray.get(0).asJsonObject val jsonObject = jsonArray.get(0).asJsonObject
itemShelvingUpdateCreated(itemShelvingFk = (jsonObject.get("LAST_INSERT_ID()") as JsonPrimitive).asInt, created = createdRename) itemShelvingUpdateCreated(
itemShelvingFk = (jsonObject.get("LAST_INSERT_ID()") as JsonPrimitive).asInt,
created = createdRename
)
} else { } else {
_responseMake.value = _responseUbicator.value =
ResponseItemVO(isError = false, response = response.message()!!) true
} }
_responseMake.value = _responseUbicator.value =
ResponseItemVO(isError = false, response = response.message()!!) true
super.onResponse(call, response) super.onResponse(call, response)
} }
@ -205,16 +186,21 @@ class UbicadorViewModel(val context: Context) : BaseViewModel(context) {
} }
fun itemShelvingMakeEdit( fun itemShelvingMakeEdit(
quantity: Int, packing: Int?, itemShelvingFk: Int, grouping: Int?, available : Int? quantity: Int, packing: Int?, itemShelvingFk: Int, grouping: Int?, available: Int?
) { ) {
salix.itemShelvingUpdate( salix.itemShelvingUpdate(
params = ItemShelvingSalix(visible = quantity, packing = packing, grouping = grouping, available = available), params = ItemShelvingSalix(
visible = quantity,
packing = packing,
grouping = grouping,
available = available
),
id = itemShelvingFk, id = itemShelvingFk,
).enqueue(object : SalixCallback<ItemUbicador?>(context) { ).enqueue(object : SalixCallback<ItemUbicador?>(context) {
override fun onSuccess(response: Response<ItemUbicador?>) { override fun onSuccess(response: Response<ItemUbicador?>) {
_responseMake.value = _responseUbicator.value = true
ResponseItemVO(isError = false, response = response.message()!!)
} }
}) })
@ -255,7 +241,7 @@ class UbicadorViewModel(val context: Context) : BaseViewModel(context) {
salix.setParking(arrayListOf(shelving, parking).formatWithQuotes()) salix.setParking(arrayListOf(shelving, parking).formatWithQuotes())
.enqueue(object : SalixCallback<Any>(context) { .enqueue(object : SalixCallback<Any>(context) {
override fun onResponse(call: Call<Any>, response: Response<Any>) { override fun onResponse(call: Call<Any>, response: Response<Any>) {
_response.value = ResponseItemVO(isError = false, response = response.message()) _responseUbicator.value = true
super.onResponse(call, response) super.onResponse(call, response)
} }
@ -320,8 +306,9 @@ class UbicadorViewModel(val context: Context) : BaseViewModel(context) {
} }
}) })
} }
fun itemShelvingUpdateCreated( fun itemShelvingUpdateCreated(
itemShelvingFk: Int, created:String itemShelvingFk: Int, created: String
) { ) {
salix.itemShelvingsUpdate( salix.itemShelvingsUpdate(
@ -339,7 +326,6 @@ class UbicadorViewModel(val context: Context) : BaseViewModel(context) {
fun shelvingLogAdd( fun shelvingLogAdd(
code: String code: String
) { ) {
//Tarea 6276 OK
salix.shelvingLogAdd(hashMapOf("code" to code)) salix.shelvingLogAdd(hashMapOf("code" to code))
.enqueue(object : SalixCallback<Any>(context) { .enqueue(object : SalixCallback<Any>(context) {
@ -354,7 +340,6 @@ class UbicadorViewModel(val context: Context) : BaseViewModel(context) {
shelvingFk: String, shelvingFk: String,
) { ) {
//Tarea 6276
salix.itemShelvingAlternative(shelvingFk) salix.itemShelvingAlternative(shelvingFk)
.enqueue(object : SalixCallback<ArrayList<Reubication>>(context) { .enqueue(object : SalixCallback<ArrayList<Reubication>>(context) {
@ -384,8 +369,6 @@ class UbicadorViewModel(val context: Context) : BaseViewModel(context) {
}) })
} }
fun updateIsChecked( fun updateIsChecked(
itemShelvingFk: Int itemShelvingFk: Int
@ -397,7 +380,7 @@ class UbicadorViewModel(val context: Context) : BaseViewModel(context) {
).enqueue(object : SalixCallback<ItemUbicador?>(context) { ).enqueue(object : SalixCallback<ItemUbicador?>(context) {
override fun onSuccess(response: Response<ItemUbicador?>) { override fun onSuccess(response: Response<ItemUbicador?>) {
_response.value = ResponseItemVO(isError = false, response = response.message()) _responseUbicator.value = true
} }
}) })
} }
@ -426,34 +409,18 @@ class UbicadorViewModel(val context: Context) : BaseViewModel(context) {
salix.itemShelvingTransfer(arrayListOf(itemFk, shelvingFk).formatWithQuotes()) salix.itemShelvingTransfer(arrayListOf(itemFk, shelvingFk).formatWithQuotes())
.enqueue(object : SalixCallback<Any>(context) { .enqueue(object : SalixCallback<Any>(context) {
override fun onSuccess(response: Response<Any>) { override fun onSuccess(response: Response<Any>) {
_responseUbicator.value = true
_response.value =
ResponseItemVO(isError = false, response = response.message()!!)
super.onSuccess(response) super.onSuccess(response)
} }
override fun onError(t: Throwable) {
_response.value = ResponseItemVO(
isError = true,
errorMessage = getMessageFromAllResponse(nameofFunction(this), t.message!!)
)
}
}) })
} }
fun itemShelvingDelete(itemShelvingFk: Int) { fun itemShelvingDelete(itemShelvingFk: Int) {
salix.itemShelvingsDelete(itemShelvingFk).enqueue(object : SalixCallback<Any>(context) { salix.itemShelvingsDelete(itemShelvingFk).enqueue(object : SalixCallback<Any>(context) {
override fun onError(t: Throwable) {
_response.value = ResponseItemVO(
isError = true,
errorMessage = getMessageFromAllResponse(nameofFunction(this), t.message!!)
)
}
override fun onSuccess(response: Response<Any>) { override fun onSuccess(response: Response<Any>) {
_response.value = ResponseItemVO(isError = false, response = response.message()) _responseUbicator.value = true
} }
}) })
@ -466,7 +433,7 @@ class UbicadorViewModel(val context: Context) : BaseViewModel(context) {
).formatWithQuotes() ).formatWithQuotes()
).enqueue(object : SalixCallback<Any>(context) { ).enqueue(object : SalixCallback<Any>(context) {
override fun onSuccess(response: Response<Any>) { override fun onSuccess(response: Response<Any>) {
_response.value = ResponseItemVO(isError = false, response = response.message()) _responseUbicator.value = true
} }
}) })
} }

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

@ -119,7 +119,7 @@ class PackingMistakeFragment(var menuOrigin: String) :
listMistakesAdapter = listMistakesAdapter =
GeneralAdapter(listMistakes, object : OnGeneralItemRowClickListener { GeneralAdapter(listMistakes, object : OnGeneralItemRowClickListener {
override fun OnGeneralItemRowClickListener(item: GeneralItem) { override fun onGeneralItemRowClickListener(item: GeneralItem) {
list.forEach { list.forEach {
if (it.description == item.text) { if (it.description == item.text) {

7
app/src/main/java/es/verdnatura/presentation/view/feature/workermistake/fragment/WorkermistakeFragment.kt
View File

@ -161,7 +161,7 @@ class WorkermistakeFragment(
viewModel.workerMistakeTypeGet( viewModel.workerMistakeTypeGet(
) )
workerMistakeName = workerMistakeName =
WorkerFromMistake(item.id, item.firstName, item.lastName, true, "") WorkerFromMistake(item.id, item.firstName, item.lastName)
} }
}) })
binding.workermistakeRecyclerview.adapter = adapterworker binding.workermistakeRecyclerview.adapter = adapterworker
@ -217,12 +217,11 @@ class WorkermistakeFragment(
private fun createDepartmentList(list: List<DepartmentMistake>) { private fun createDepartmentList(list: List<DepartmentMistake>) {
departments.clear() departments.clear()
list.forEach { department -> list.forEach { department ->
if (!department.isError) {
try { try {
departments.add(SearchDepartmentModel(department.name, department.id)) departments.add(SearchDepartmentModel(department.name, department.id))
} catch (e: Exception) { } catch (e: Exception) {
e.message!!.toast(requireContext()) e.message!!.toast(requireContext())
}
} }
} }
} }
@ -231,13 +230,11 @@ class WorkermistakeFragment(
listWorker.clear() listWorker.clear()
list.forEach { worker -> list.forEach { worker ->
if (!worker.isError) {
try { try {
listWorker.add(worker) listWorker.add(worker)
} catch (e: Exception) { } catch (e: Exception) {
e.message!!.toast(requireContext()) e.message!!.toast(requireContext())
} }
}
} }
listWorkerAuxiliary.clear() listWorkerAuxiliary.clear()

15
app/src/main/java/es/verdnatura/presentation/view/feature/workermistake/model/mistakeWorkerType.kt
View File

@ -1,6 +1,5 @@
package es.verdnatura.presentation.view.feature.workermistake.model package es.verdnatura.presentation.view.feature.workermistake.model
data class MistakeType( data class MistakeType(
var code: String = "", var code: String = "",
var description: String = "" var description: String = ""
@ -14,20 +13,14 @@ data class ExpeditionMistakeSalix(
) )
data class DepartmentMistake( data class DepartmentMistake(
var id: Int? = null, var id: Int? = null,
var name: String = "", var name: String = ""
var isError: Boolean = false,
var errorMessage: String = ""
) )
data class WorkerFromMistake( data class WorkerFromMistake(
var id: Int? = null, var id: Int? = null,
var firstName: String = "", var firstName: String = "",
var lastName: String = "", var lastName: String = ""
var isError: Boolean = false,
var errorMessage: String = ""
) )
data class WorkerMistakeSalix( data class WorkerMistakeSalix(
@ -38,8 +31,9 @@ data class WorkerMistakeSalix(
data class SaleMistakeSalix( data class SaleMistakeSalix(
var userFk: Number, var userFk: Number,
var typeFk: Number, var typeFk: Number,
var saleFk :Number var saleFk: Number
) )
data class WorkerMistakeTypeList( data class WorkerMistakeTypeList(
var list: List<MistakeType> = listOf() var list: List<MistakeType> = listOf()
) )
@ -51,6 +45,7 @@ data class DepartmentMistakeList(
data class WorkerFromMistakeList( data class WorkerFromMistakeList(
var list: List<WorkerFromMistake> = listOf() var list: List<WorkerFromMistake> = listOf()
) )
data class MakeMultiSalix( data class MakeMultiSalix(
var shelvingFk: String, var shelvingFk: String,
var items: List<Long>, var items: List<Long>,

4
app/src/main/res/values-es/strings.xml
View File

@ -182,7 +182,7 @@
<string name="deletedLabel">Carro/etiqueta borrada</string> <string name="deletedLabel">Carro/etiqueta borrada</string>
<string name="end">Finalizar</string> <string name="end">Finalizar</string>
<string name="undone">Deshacer</string> <string name="undone">Deshacer</string>
<string name="labels">Etiquetas: </string> <string name="labels">Etiquetas</string>
<string name="nameApp">warehouse</string> <string name="nameApp">warehouse</string>
<string name="scanSmarttagOrShelving">Escanea matrícula del carro/s</string> <string name="scanSmarttagOrShelving">Escanea matrícula del carro/s</string>
<string name="scanHighLabel">Escanea etiqueta superior</string> <string name="scanHighLabel">Escanea etiqueta superior</string>
@ -860,6 +860,8 @@
<string name="countNumber">%1$s%2$d</string> <string name="countNumber">%1$s%2$d</string>
<string name="diferentAction">ACTION ID DIFERENTE</string> <string name="diferentAction">ACTION ID DIFERENTE</string>
<string name="scanExpeditions">Escanear cajas</string> <string name="scanExpeditions">Escanear cajas</string>
<string name="titleprepickertest">titlePrePickerTest</string>
<string name="preitempickertestMayus">PREITEMPICKERTEST</string>
</resources> </resources>

4
app/src/main/res/values-fr/strings.xml
View File

@ -182,7 +182,7 @@
<string name="deletedLabel">Carro/etiqueta borrada</string> <string name="deletedLabel">Carro/etiqueta borrada</string>
<string name="end">Finalizar</string> <string name="end">Finalizar</string>
<string name="undone">Deshacer</string> <string name="undone">Deshacer</string>
<string name="labels">Etiquetas: </string> <string name="labels">Etiquetas</string>
<string name="nameApp">warehouse</string> <string name="nameApp">warehouse</string>
<string name="scanSmarttagOrShelving">Escanea matrícula del carro/s</string> <string name="scanSmarttagOrShelving">Escanea matrícula del carro/s</string>
<string name="scanHighLabel">Escanea etiqueta superior</string> <string name="scanHighLabel">Escanea etiqueta superior</string>
@ -860,5 +860,7 @@
<string name="countNumber">%1$s%2$d</string> <string name="countNumber">%1$s%2$d</string>
<string name="diferentAction">ACTION ID DIFERENTE</string> <string name="diferentAction">ACTION ID DIFERENTE</string>
<string name="scanExpeditions">Escanear cajas</string> <string name="scanExpeditions">Escanear cajas</string>
<string name="titleprepickertest">titlePrePickerTest</string>
<string name="preitempickertestMayus">PREITEMPICKERTEST</string>
</resources> </resources>

4
app/src/main/res/values-pt/strings.xml
View File

@ -182,7 +182,7 @@
<string name="deletedLabel">Carro/etiqueta borrada</string> <string name="deletedLabel">Carro/etiqueta borrada</string>
<string name="end">Finalizar</string> <string name="end">Finalizar</string>
<string name="undone">Deshacer</string> <string name="undone">Deshacer</string>
<string name="labels">Etiquetas: </string> <string name="labels">Etiquetas</string>
<string name="nameApp">warehouse</string> <string name="nameApp">warehouse</string>
<string name="scanSmarttagOrShelving">Escanea matrícula del carro/s</string> <string name="scanSmarttagOrShelving">Escanea matrícula del carro/s</string>
<string name="scanHighLabel">Escanea etiqueta superior</string> <string name="scanHighLabel">Escanea etiqueta superior</string>
@ -860,6 +860,8 @@
<string name="countNumber">%1$s%2$d</string> <string name="countNumber">%1$s%2$d</string>
<string name="diferentAction">ACTION ID DIFERENTE</string> <string name="diferentAction">ACTION ID DIFERENTE</string>
<string name="scanExpeditions">Escanear cajas</string> <string name="scanExpeditions">Escanear cajas</string>
<string name="titleprepickertest">titlePrePickerTest</string>
<string name="preitempickertestMayus">PREITEMPICKERTEST</string>
</resources> </resources>

5
app/src/main/res/values/strings.xml
View File

@ -215,7 +215,7 @@
<string name="deletedLabel">Wagon/label deleted</string> <string name="deletedLabel">Wagon/label deleted</string>
<string name="end">Finish</string> <string name="end">Finish</string>
<string name="undone">Undo</string> <string name="undone">Undo</string>
<string name="labels">Labels:</string> <string name="labels">Labels</string>
<string name="nameApp">warehouse</string> <string name="nameApp">warehouse</string>
<string name="scanSmarttagOrShelving">Scan wagoon plate</string> <string name="scanSmarttagOrShelving">Scan wagoon plate</string>
<string name="scanHighLabel">Scan high label</string> <string name="scanHighLabel">Scan high label</string>
@ -862,5 +862,8 @@
<string name="diferentAction">ACTION ID DIFERENTE</string> <string name="diferentAction">ACTION ID DIFERENTE</string>
<string name="scanPreparedExpedition">Escanear cajas preparadas</string> <string name="scanPreparedExpedition">Escanear cajas preparadas</string>
<string name="scanExpeditions">Escanear cajas</string> <string name="scanExpeditions">Escanear cajas</string>
<string name="titleprepickertest">titlePrePickerTest</string>
<string name="preitempickertestMayus">PREITEMPICKERTEST</string>
<string name="expeditionInfo" translatable="false">%1$s %2$s</string>
</resources> </resources>