Refactor formato campos refs #6061
This commit is contained in:
parent
610efcd747
commit
e4f5cc6786
|
|
@ -128,89 +128,35 @@
|
|||
</component>
|
||||
<component name="ChangeListManager">
|
||||
<list default="true" id="fa688d1c-dbee-4864-9e33-4d84ef9afca8" name="Default Changelist" comment="Refactor formato campos refs #5134">
|
||||
<change beforePath="$PROJECT_DIR$/.idea/deploymentTargetDropDown.xml" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/beta/release/output-metadata.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/beta/release/output-metadata.json" 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/domain/VerdnaturaService.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/VerdnaturaService.kt" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/base/BaseFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/base/BaseFragment.kt" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/common/UIExtensions.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/common/UIExtensions.kt" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/common/SalixBackItems.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/common/SalixBackItems.kt" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/ajustes/fragment/AjustesViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/ajustes/fragment/AjustesViewModel.kt" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/ajustes/model/AjustesItemVO.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/ajustes/model/AjustesItemVO.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/articulo/model/ItemCardVO.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/model/ItemCardVO.kt" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/model/ItemProposal.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/model/ItemProposal.kt" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/buscaritem/fragment/BuscarItemFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/buscaritem/fragment/BuscarItemFragment.kt" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/buscaritem/model/ItemLocationVO.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/buscaritem/model/ItemLocationVO.kt" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/calidad/model/BuyerVO.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/calidad/model/BuyerVO.kt" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/claim/fragment/ClaimViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/claim/fragment/ClaimViewModel.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/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/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/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/fragments/InfoFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/fragments/InfoFragment.kt" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/fragments/LogExpeditionFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/fragments/LogExpeditionFragment.kt" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/model/InfoCompany.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/model/InfoCompany.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/diadeventa/model/ItemShelvingSaleDate.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/diadeventa/model/ItemShelvingSaleDate.kt" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/historicoarticulo/adapter/HistoricoAdapter.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/historicoarticulo/adapter/HistoricoAdapter.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/historicoarticulo/model/ItemHistoricoVO.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/historicoarticulo/model/ItemHistoricoVO.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/historicoshelving/model/ItemShelvingLog.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/historicoshelving/model/ItemShelvingLog.kt" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/historicovehiculo/model/ItemHistoricoVehiculo.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/historicovehiculo/model/ItemHistoricoVehiculo.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/InventaryParkingFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/inventario/fragment/InventaryParkingFragment.kt" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/model/ClientTicket.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/model/ClientTicket.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/inventario/fragment/SearchBuyerModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/inventario/fragment/SearchBuyerModel.kt" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/inventario/model/ItemInventaryVO.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/inventario/model/ItemInventaryVO.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/paletizador/adapter/ExpeditionPalletAdapter.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/adapter/ExpeditionPalletAdapter.kt" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/CmrExpeditionPalletViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/CmrExpeditionPalletViewModel.kt" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/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/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/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/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/PalletScanViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/PalletScanViewModel.kt" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/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/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/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/pasillero/fragment/PasilleroFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/pasillero/fragment/PasilleroFragment.kt" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/pasillero/fragment/PasilleroViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/pasillero/fragment/PasilleroViewModel.kt" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/EndSacadorFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/EndSacadorFragment.kt" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/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/reubication/adapter/ReubicatorAdapter.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/reubication/adapter/ReubicatorAdapter.kt" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/reubication/fragment/ReubicationCollectionFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/reubication/fragment/ReubicationCollectionFragment.kt" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/shelvingparking/adapter/ShelvingParkingAdapter.kt" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/shelvingparking/fragment/ShelvingParkingFragment.kt" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/shelvingparking/fragment/ShelvingParkingViewModel.kt" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/shelvingparking/model/ItemShelvingParkingVO.kt" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/ticket/fragment/TicketViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/ticket/fragment/TicketViewModel.kt" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/sacador/mapper/SacadoresMapper.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/sacador/mapper/SacadoresMapper.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/fragment/UbicadorFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorFragment.kt" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorViewModel.kt" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/item_article_row_reubication_fragment.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/item_article_row_reubication_fragment.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/item_expedition_view_row.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/item_expedition_view_row.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/item_expeditionlog_row.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/item_expeditionlog_row.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/item_expeditionpallet_row.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/item_expeditionpallet_row.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/item_expeditionscan_row.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/item_expeditionscan_row.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/item_expeditiontruck_row.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/item_expeditiontruck_row.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/item_historico_row.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/item_historico_row.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/item_inventary_row.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/item_inventary_row.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/item_location_row.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/item_location_row.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/item_proposal_row.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/item_proposal_row.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/item_shelvingdayofsale_row.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/item_shelvingdayofsale_row.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/item_shelvinglog_row.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/item_shelvinglog_row.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/item_shelvingparking_row.xml" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/workermistake/adapter/WorkermistakeAdapter.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/workermistake/adapter/WorkermistakeAdapter.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/res/layout/item_workermistake_row.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/item_workermistake_row.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/sale_row_fragment.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/sale_row_fragment.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" />
|
||||
|
|
@ -565,13 +511,6 @@
|
|||
<option name="presentableId" value="Default" />
|
||||
<updated>1618825571576</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00158" summary="refs #4678">
|
||||
<created>1686034256459</created>
|
||||
<option name="number" value="00158" />
|
||||
<option name="presentableId" value="LOCAL-00158" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1686034256459</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00159" summary="refs #5713">
|
||||
<created>1686034337439</created>
|
||||
<option name="number" value="00159" />
|
||||
|
|
@ -908,7 +847,14 @@
|
|||
<option name="project" value="LOCAL" />
|
||||
<updated>1697695522957</updated>
|
||||
</task>
|
||||
<option name="localTasksCounter" value="207" />
|
||||
<task id="LOCAL-00207" summary="Refactor formato campos refs #5134">
|
||||
<created>1698305904442</created>
|
||||
<option name="number" value="00207" />
|
||||
<option name="presentableId" value="LOCAL-00207" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1698305904442</updated>
|
||||
</task>
|
||||
<option name="localTasksCounter" value="208" />
|
||||
<servers />
|
||||
</component>
|
||||
<component name="Vcs.Log.History.Properties">
|
||||
|
|
@ -1041,7 +987,7 @@
|
|||
<breakpoints>
|
||||
<line-breakpoint enabled="true" type="kotlin-line">
|
||||
<url>file://$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/login/fragment/LoginViewModel.kt</url>
|
||||
<line>548</line>
|
||||
<line>546</line>
|
||||
<option name="timeStamp" value="6" />
|
||||
</line-breakpoint>
|
||||
<line-breakpoint enabled="true" type="kotlin-line">
|
||||
|
|
|
|||
|
|
@ -1,8 +1,10 @@
|
|||
package es.verdnatura.domain
|
||||
|
||||
import com.google.gson.JsonObject
|
||||
import es.verdnatura.presentation.common.itemBarCodeSalix
|
||||
import es.verdnatura.presentation.common.packingSiteSalix
|
||||
import es.verdnatura.presentation.view.feature.ajustes.model.SectorItemVO
|
||||
import es.verdnatura.presentation.view.feature.ajustes.model.Train
|
||||
import es.verdnatura.presentation.view.feature.articulo.model.AddressLoses
|
||||
import es.verdnatura.presentation.view.feature.articulo.model.ItemPackingType
|
||||
import es.verdnatura.presentation.view.feature.calidad.model.BuyerVO
|
||||
|
|
@ -149,10 +151,10 @@ interface SalixService {
|
|||
@Query("filter") filter: String = """{"fields": {"id": true,"name": true},"where": {"hasToMistake": true}}"""
|
||||
): Call<List<DepartmentMistake>>
|
||||
|
||||
@GET("Workers")
|
||||
@GET("Workers/findOne?")
|
||||
fun worker_idF11Allowed(
|
||||
@Query("filter") filter: String
|
||||
): Call<List<DepartmentMistake>>
|
||||
): Call<JsonObject>
|
||||
|
||||
@DELETE("ExpeditionPallets/{id}")
|
||||
fun expeditionPalletDel(
|
||||
|
|
@ -312,7 +314,8 @@ interface SalixService {
|
|||
|
||||
@PATCH("ItemShelvings/{id}")
|
||||
fun itemShelvingUpdate(
|
||||
@Path("id") id: Number, @Body params: Any
|
||||
@Path("id") id: Number,
|
||||
@Body params: Any
|
||||
): Call<Any>
|
||||
|
||||
@POST("ItemShelvings/update")
|
||||
|
|
@ -326,7 +329,7 @@ interface SalixService {
|
|||
fun ticketCollectionUpdate(
|
||||
@Query("where") filter: Any,//revisar si con Any vale, update generalmente pongo json (ejemplo: itemShelvingReset)
|
||||
@Body params: Any
|
||||
): Call<Any>
|
||||
): Call<Unit>
|
||||
|
||||
@POST("ItemShelvingSales/itemShelvingSaleSetQuantity")
|
||||
fun itemShelvingsConfirmRerserved(
|
||||
|
|
@ -368,7 +371,7 @@ interface SalixService {
|
|||
|
||||
@POST("ExpeditionMistakes")
|
||||
fun expeditionMistakesAdd(
|
||||
expeditionMistake: ExpeditionMistakeSalix
|
||||
@Body expeditionMistake: ExpeditionMistakeSalix
|
||||
): Call<Any>
|
||||
|
||||
@POST("ExpeditionStates/addExpeditionState")
|
||||
|
|
@ -378,9 +381,13 @@ interface SalixService {
|
|||
|
||||
@POST("WorkerMistakes")
|
||||
fun workerMistakesAdd(
|
||||
workerMistake: WorkerMistakeSalix
|
||||
@Body workerMistake: WorkerMistakeSalix
|
||||
): Call<Any>
|
||||
|
||||
@GET("WorkerMistakeTypes")
|
||||
fun workerMistakesTypes(
|
||||
): Call<List<MistakeType>>
|
||||
|
||||
@POST("SaleMistakes")
|
||||
fun saleMistakeAdd(
|
||||
@Body saleMistakeSalix: SaleMistakeSalix
|
||||
|
|
@ -390,6 +397,10 @@ interface SalixService {
|
|||
fun getMistakeTypes(
|
||||
): Call<List<MistakeTypeVO>>
|
||||
|
||||
@GET("Train")
|
||||
fun getTrain(
|
||||
): Call<List<Train>>
|
||||
|
||||
}
|
||||
|
||||
interface SalixServiceSend {
|
||||
|
|
|
|||
|
|
@ -23,11 +23,8 @@ import es.verdnatura.presentation.view.feature.paletizador.model.*
|
|||
import es.verdnatura.presentation.view.feature.presacador.model.PreSacadorItemVO
|
||||
import es.verdnatura.presentation.view.feature.reubication.model.Reubication
|
||||
import es.verdnatura.presentation.view.feature.sacador.model.CollectionVO
|
||||
import es.verdnatura.presentation.view.feature.sacador.model.MistakeTypeVO
|
||||
import es.verdnatura.presentation.view.feature.sacador.model.PlacementSupplyVO
|
||||
import es.verdnatura.presentation.view.feature.ubicador.model.ItemUbicadorVO
|
||||
import es.verdnatura.presentation.view.feature.workermistake.model.DepartmentMistake
|
||||
import es.verdnatura.presentation.view.feature.workermistake.model.MistakeType
|
||||
import es.verdnatura.presentation.view.feature.workermistake.model.WorkerFromMistake
|
||||
import retrofit2.Call
|
||||
import retrofit2.http.Body
|
||||
|
|
@ -45,12 +42,14 @@ interface VerdnaturaService {
|
|||
):
|
||||
Call<LoginDevice>
|
||||
|
||||
/*
|
||||
|
||||
@POST("almacennew/deviceLog_add")//REVISADA
|
||||
fun deviceLog_add(
|
||||
@Body vararg params: Any
|
||||
):
|
||||
Call<Unit>
|
||||
*/
|
||||
|
||||
|
||||
@POST("/security/getVersion")//REVISADA
|
||||
|
|
@ -164,7 +163,7 @@ interface VerdnaturaService {
|
|||
):
|
||||
Call<Boolean>
|
||||
|
||||
@POST("almacennew/operator_getTrain")//NO SALIX
|
||||
@POST("almacennew/operator_getTrain")//NO SALIX
|
||||
fun operator_getTrain(
|
||||
):
|
||||
Call<String?>
|
||||
|
|
@ -308,30 +307,30 @@ interface VerdnaturaService {
|
|||
):
|
||||
Call<List<SalesModified>>
|
||||
|
||||
@POST("almacennew/barcodeToItem")//REVISADA
|
||||
/* @POST("almacennew/barcodeToItem")//REVISADA
|
||||
fun getIdFromCode(
|
||||
@Body vararg params: Any
|
||||
):
|
||||
Call<String>
|
||||
Call<String>*/
|
||||
|
||||
|
||||
@POST("almacennew/saleMistakeAdd")//REVISADA
|
||||
/* @POST("almacennew/saleMistakeAdd")//REVISADA
|
||||
fun saleMistakeAdd(
|
||||
@Body vararg params: Any
|
||||
):
|
||||
Call<Any>
|
||||
Call<Any>*/
|
||||
|
||||
@POST("almacennew/workerMistake_Add")//A BORRAR
|
||||
/* @POST("almacennew/workerMistake_Add")//A BORRAR
|
||||
fun workerMistake_Add(
|
||||
@Body vararg params: Any
|
||||
):
|
||||
Call<Any>
|
||||
Call<Any>*/
|
||||
|
||||
@POST("almacennew/expeditionMistake_add")// A BORRAR
|
||||
/* @POST("almacennew/expeditionMistake_add")// A BORRAR
|
||||
fun expeditionMistake_add(
|
||||
@Body vararg params: Any
|
||||
):
|
||||
Call<Any>
|
||||
Call<Any>*/
|
||||
|
||||
@GET("almacennew/itemShelving_inventory")//REVISADA
|
||||
fun itemShelving_inventory(
|
||||
|
|
@ -339,26 +338,26 @@ interface VerdnaturaService {
|
|||
):
|
||||
Call<Any>
|
||||
|
||||
@POST("almacennew/mistakeType")//REVISADA
|
||||
/* @POST("almacennew/mistakeType")//REVISADA
|
||||
fun mistakeType(
|
||||
):
|
||||
Call<List<MistakeTypeVO>>
|
||||
Call<List<MistakeTypeVO>>*/
|
||||
|
||||
|
||||
@POST("almacennew/workerMistakeType_get")//A BORRAR
|
||||
/* @POST("almacennew/workerMistakeType_get")//A BORRAR
|
||||
fun workerMistakeType_get(
|
||||
):
|
||||
Call<List<MistakeType>>
|
||||
Call<List<MistakeType>>*/
|
||||
|
||||
@POST("almacennew/expeditionMistakeType_get")//A BORRAR
|
||||
/* @POST("almacennew/expeditionMistakeType_get")//A BORRAR
|
||||
fun expeditionMistakeType_get(
|
||||
):
|
||||
Call<List<MistakeType>>
|
||||
Call<List<MistakeType>>*/
|
||||
|
||||
@POST("almacennew/department_getHasMistake")//A BORRAR
|
||||
/* @POST("almacennew/department_getHasMistake")//A BORRAR
|
||||
fun department_getHasMistake(
|
||||
):
|
||||
Call<List<DepartmentMistake>>
|
||||
Call<List<DepartmentMistake>>*/
|
||||
|
||||
@POST("almacennew/worker_getFromHasMistake")//REVISADA
|
||||
fun worker_getFromHasMistake(
|
||||
|
|
@ -417,12 +416,12 @@ interface VerdnaturaService {
|
|||
Call<Any>
|
||||
|
||||
|
||||
@POST("almacennew/item_saveStems")//A BORRAR
|
||||
/* @POST("almacennew/item_saveStems")//A BORRAR
|
||||
fun item_saveStems(
|
||||
|
||||
@Body vararg params: Any
|
||||
):
|
||||
Call<Any>
|
||||
Call<Any>*/
|
||||
|
||||
@POST("almacennew/item_saveReference")//A BORRAR
|
||||
fun item_saveReference(
|
||||
|
|
@ -472,11 +471,11 @@ interface VerdnaturaService {
|
|||
):
|
||||
Call<String>
|
||||
|
||||
@POST("almacennew/deviceProduction_getnameDevice")//REVISADA
|
||||
/* @POST("almacennew/deviceProduction_getnameDevice")//REVISADA
|
||||
fun deviceProduction_getnameDevice(
|
||||
@Body vararg params: Any
|
||||
):
|
||||
Call<Any>
|
||||
Call<Any>*/
|
||||
|
||||
@POST("almacennew/deviceProductionUser_getWorker")//REVISADA
|
||||
fun deviceProductionUser_getWorker(
|
||||
|
|
|
|||
|
|
@ -16,6 +16,12 @@ data class ItemShelvingSaleSalix(
|
|||
var quantity:Int,
|
||||
var isItemShelvingSaleEmpty:Boolean?
|
||||
)
|
||||
data class ItemShelvingSalix(
|
||||
var visible:Int,
|
||||
var packing:Int,
|
||||
var grouping:Int?
|
||||
|
||||
)
|
||||
|
||||
data class ItemDiscardSalix(
|
||||
var itemFk :Int,
|
||||
|
|
|
|||
|
|
@ -7,6 +7,8 @@ import android.view.View.VISIBLE
|
|||
import androidx.lifecycle.LiveData
|
||||
import androidx.lifecycle.MutableLiveData
|
||||
import androidx.lifecycle.Transformations
|
||||
import com.google.gson.JsonObject
|
||||
import es.verdnatura.MobileApplication
|
||||
import es.verdnatura.R
|
||||
import es.verdnatura.domain.SalixCallback
|
||||
import es.verdnatura.domain.SilexCallback
|
||||
|
|
@ -295,6 +297,8 @@ class AjustesViewModel(val context: Context) : BaseViewModel(context) {
|
|||
}
|
||||
|
||||
fun train_get() {
|
||||
//Tarea 5134
|
||||
//salix.getTrain()
|
||||
silex.train_get().enqueue(object : SilexCallback<List<Train>>(context) {
|
||||
override fun onError(t: Throwable) {
|
||||
|
||||
|
|
@ -427,11 +431,8 @@ class AjustesViewModel(val context: Context) : BaseViewModel(context) {
|
|||
}
|
||||
|
||||
fun worker_isF11Allowed() {
|
||||
//Hi ha que canviar front, torna [] si no troba i [{"isF11Allowed":true}] si troba el usuario
|
||||
//salix.worker_idF11Allowed( """{"where":{"id":${(context as MobileApplication).userId},"isF11Allowed":false},"fields":{"isF11Allowed":true}}""")
|
||||
|
||||
silex.worker_isF11Allowed()
|
||||
.enqueue(object : SilexCallback<Boolean>(context) {
|
||||
salix.worker_idF11Allowed( """{"where":{"id":${(context as MobileApplication).userId}},"fields":{"isF11Allowed":true}}""")
|
||||
.enqueue(object : SalixCallback<JsonObject>(context) {
|
||||
override fun onError(t: Throwable) {
|
||||
|
||||
_workerAllowedResponse.value = ResponseItemVO(
|
||||
|
|
@ -440,9 +441,10 @@ class AjustesViewModel(val context: Context) : BaseViewModel(context) {
|
|||
)
|
||||
}
|
||||
|
||||
override fun onSuccess(response: Response<Boolean>) {
|
||||
override fun onSuccess(response: Response<JsonObject>) {
|
||||
//val isF11Allowed = (response.body())!!.get("isF11Allowed") ?: true
|
||||
_workerAllowedResponse.value = ResponseItemVO(
|
||||
response = response.body().toString(),
|
||||
response = response.body()!!.entrySet().first().value.toString(),
|
||||
isError = false,
|
||||
)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1769,13 +1769,6 @@ class CollectionFragment(
|
|||
viewModel.getIdFromCodeSalix(
|
||||
code = customDialogList.getValueTwo(),
|
||||
)
|
||||
/* } else {
|
||||
viewModel.getIdFromCode(
|
||||
usuario = getData(USER),
|
||||
password = getData(PASSWORD),
|
||||
code = customDialogList.getValueTwo(), "barcodeToItem"
|
||||
)
|
||||
}*/
|
||||
|
||||
customDialogList.dismiss()
|
||||
}
|
||||
|
|
@ -1862,14 +1855,6 @@ class CollectionFragment(
|
|||
viewModel.getIdFromCodeSalix(
|
||||
code = customDialogList.getValueTwo()
|
||||
)
|
||||
/*
|
||||
} else {
|
||||
viewModel.getIdFromCode(
|
||||
getData(USER),
|
||||
getData(PASSWORD),
|
||||
code = customDialogList.getValueTwo(), "barcodeToItem"
|
||||
)
|
||||
}*/
|
||||
customDialogList.dismiss()
|
||||
scanRequest()
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1815,13 +1815,6 @@ import org.json.JSONObject
|
|||
viewModel.getIdFromCodeSalix(
|
||||
code = customDialogList.getValueTwo(),
|
||||
)
|
||||
/* } else {
|
||||
viewModel.getIdFromCode(
|
||||
usuario = getData(USER),
|
||||
password = getData(PASSWORD),
|
||||
code = customDialogList.getValueTwo(), "barcodeToItem"
|
||||
)
|
||||
}*/
|
||||
|
||||
customDialogList.dismiss()
|
||||
}
|
||||
|
|
@ -1908,14 +1901,7 @@ import org.json.JSONObject
|
|||
viewModel.getIdFromCodeSalix(
|
||||
code = customDialogList.getValueTwo()
|
||||
)
|
||||
/*
|
||||
} else {
|
||||
viewModel.getIdFromCode(
|
||||
getData(USER),
|
||||
getData(PASSWORD),
|
||||
code = customDialogList.getValueTwo(), "barcodeToItem"
|
||||
)
|
||||
}*/
|
||||
|
||||
customDialogList.dismiss()
|
||||
scanRequest()
|
||||
}
|
||||
|
|
|
|||
|
|
@ -546,11 +546,8 @@ class CollectionViewModel(val context: Context) : BaseViewModel(context) {
|
|||
ticketFk: Int,
|
||||
usedShelves: Int
|
||||
) {
|
||||
//salix.ticketCollectionUpdate("""where={"ticketFk":$ticketFk}""", hashMapOf("usedShelves" to usedShelves))
|
||||
silex.ticketCollection_setUsedShelves(
|
||||
ticketFk,
|
||||
usedShelves
|
||||
).enqueue(object : SilexCallback<Unit>(context) {
|
||||
salix.ticketCollectionUpdate("""where={"ticketFk":$ticketFk}""", hashMapOf("usedShelves" to usedShelves))
|
||||
.enqueue(object : SilexCallback<Unit>(context) {
|
||||
override fun onError(t: Throwable) {
|
||||
|
||||
_responseUsedShelves.value = ResponseItemVO(
|
||||
|
|
@ -944,7 +941,6 @@ class CollectionViewModel(val context: Context) : BaseViewModel(context) {
|
|||
) {
|
||||
|
||||
salix.saleMistakeAdd(SaleMistakeSalix(userFk=(context as MobileApplication).userId!!, saleFk = saleFk,typeFk = typeFk))
|
||||
//silex.saleMistakeAdd(saleFk, typeFk, typeFk)
|
||||
.enqueue(object :
|
||||
SilexCallback<Any>(context) {
|
||||
override fun onError(t: Throwable) {
|
||||
|
|
@ -965,8 +961,8 @@ class CollectionViewModel(val context: Context) : BaseViewModel(context) {
|
|||
fun mistakeType() {
|
||||
|
||||
//Tarea 5134
|
||||
// salix.getMistakeTypes()
|
||||
silex.mistakeType()
|
||||
salix.getMistakeTypes()
|
||||
//silex.mistakeType()
|
||||
.enqueue(object : SilexCallback<List<MistakeTypeVO>>(context) {
|
||||
override fun onError(t: Throwable) {
|
||||
val listError: ArrayList<MistakeTypeVO> = ArrayList()
|
||||
|
|
|
|||
|
|
@ -136,10 +136,6 @@ class ControlVehiculoViewModel(val context: Context) : BaseViewModel(context) {
|
|||
|
||||
fun deviceProduction_getnameDevice(android_id: String) {
|
||||
|
||||
/* silex.deviceProduction_getnameDevice(
|
||||
android_id
|
||||
)*/
|
||||
|
||||
salix.deviceProductionsGetName(
|
||||
Gson().toJson(
|
||||
Filter(
|
||||
|
|
|
|||
|
|
@ -35,7 +35,8 @@ data class ClientTicket(
|
|||
@TypeConverters(MapTypeConverter::class) var tickets: MutableList<Ticket>,
|
||||
//Tarea 5996, falta mostrar o no si no es null
|
||||
var cmrFk: Int? = null,
|
||||
var route:Long? = null
|
||||
var route:Long? = null,
|
||||
var email:String? = null
|
||||
) : Serializable
|
||||
|
||||
data class MyLocation(
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@ import androidx.lifecycle.LiveData
|
|||
import androidx.lifecycle.MutableLiveData
|
||||
import androidx.lifecycle.Transformations
|
||||
import com.google.gson.JsonObject
|
||||
import es.verdnatura.MobileApplication
|
||||
import es.verdnatura.R
|
||||
import es.verdnatura.domain.SalixCallback
|
||||
import es.verdnatura.domain.SilexCallback
|
||||
|
|
@ -20,8 +21,10 @@ import es.verdnatura.presentation.view.feature.inventario.model.InventoryParking
|
|||
import es.verdnatura.presentation.view.feature.inventario.model.ItemInventaryVO
|
||||
import es.verdnatura.presentation.view.feature.inventario.model.ItemInventoryParking
|
||||
import es.verdnatura.presentation.view.feature.workermistake.model.DepartmentMistake
|
||||
import es.verdnatura.presentation.view.feature.workermistake.model.ExpeditionMistakeSalix
|
||||
import es.verdnatura.presentation.view.feature.workermistake.model.MistakeType
|
||||
import es.verdnatura.presentation.view.feature.workermistake.model.WorkerFromMistake
|
||||
import es.verdnatura.presentation.view.feature.workermistake.model.WorkerMistakeSalix
|
||||
import es.verdnatura.presentation.view.feature.workermistake.model.departmentMistakeList
|
||||
import es.verdnatura.presentation.view.feature.workermistake.model.workerFromMistakeList
|
||||
import es.verdnatura.presentation.view.feature.workermistake.model.workerMistakeTypeList
|
||||
|
|
@ -77,8 +80,6 @@ class InventaryViewModel(val context: Context) : BaseViewModel(context) {
|
|||
|
||||
//sergio para obtener comprador
|
||||
fun itemShelvingBuyerGet() {
|
||||
//Tarea 6141
|
||||
// salix.getCollectionSalix()
|
||||
salix.getBuyers().enqueue(object :
|
||||
SilexCallback<List<BuyerVO>>(context) {
|
||||
override fun onError(t: Throwable) {
|
||||
|
|
@ -308,8 +309,7 @@ class InventaryViewModel(val context: Context) : BaseViewModel(context) {
|
|||
|
||||
fun workerMistakeType_get() {
|
||||
//Tarea 5134
|
||||
//salix.getWorkerMistakeTypes()
|
||||
silex.workerMistakeType_get()
|
||||
salix.workerMistakesTypes()
|
||||
.enqueue(object : SilexCallback<List<MistakeType>>(context) {
|
||||
override fun onError(t: Throwable) {
|
||||
val listError: ArrayList<MistakeType> = ArrayList()
|
||||
|
|
@ -356,8 +356,7 @@ class InventaryViewModel(val context: Context) : BaseViewModel(context) {
|
|||
vTypeFk: String
|
||||
) {
|
||||
//Tarea 5134
|
||||
//salix.workerMistakesAdd(WorkerMistakeSalix(vUserFk,vTypeFk))
|
||||
silex.workerMistake_Add(vUserFk, vTypeFk)
|
||||
salix.workerMistakesAdd(WorkerMistakeSalix(vUserFk,vTypeFk))
|
||||
.enqueue(object :
|
||||
SilexCallback<Any>(context) {
|
||||
override fun onError(t: Throwable) {
|
||||
|
|
@ -382,13 +381,12 @@ class InventaryViewModel(val context: Context) : BaseViewModel(context) {
|
|||
fun expeditionMistake_add(
|
||||
vExpeditionFk: Int,
|
||||
vTypeFk: String,
|
||||
// userId:Int= (context as MobileApplication).userId!!
|
||||
) {
|
||||
//Tarea 5134
|
||||
//salix.expeditionMistakesAdd(ExpeditionMistakeSalix(expeditionFk = vExpeditionFk, typeFk = vTypeFk, workerFk = (context as MobileApplication).userId!!)
|
||||
silex.expeditionMistake_add(vExpeditionFk, vTypeFk)
|
||||
salix.expeditionMistakesAdd(
|
||||
ExpeditionMistakeSalix(expeditionFk = vExpeditionFk, typeFk = vTypeFk, workerFk = (context as MobileApplication).userId!!))
|
||||
.enqueue(object :
|
||||
SilexCallback<Any>(context) {
|
||||
SalixCallback<Any>(context) {
|
||||
override fun onError(t: Throwable) {
|
||||
_responseAddMistake.value = ResponseItemVO(
|
||||
isError = true,
|
||||
|
|
@ -616,9 +614,8 @@ class InventaryViewModel(val context: Context) : BaseViewModel(context) {
|
|||
|
||||
fun expeditionMistakeType_get() {
|
||||
// Tarea 5134 pasar a salix
|
||||
//salix.getExpeditionMistakeTypes()
|
||||
silex.expeditionMistakeType_get()
|
||||
.enqueue(object : SilexCallback<List<MistakeType>>(context) {
|
||||
salix.getExpeditionMistakeTypes()
|
||||
.enqueue(object : SalixCallback<List<MistakeType>>(context) {
|
||||
override fun onError(t: Throwable) {
|
||||
val listError: ArrayList<MistakeType> = ArrayList()
|
||||
listError.add(
|
||||
|
|
|
|||
|
|
@ -328,15 +328,12 @@ class LoginFragment(var imageUri: Uri?) :
|
|||
|
||||
} else {
|
||||
//sergio: se añade el log
|
||||
viewModel.getCurrentUserData()
|
||||
viewModel.getCurrentUserData( getString(R.string.logAppName),
|
||||
getInfoVersionNameApp(),
|
||||
getData(ANDROID_ID))
|
||||
viewModel.worker_getSector()
|
||||
viewModel.worker_getPrinter()
|
||||
//viewModel.operator_getDataSalix("{\"where\": {\"workerFk\":${getDataInt(USERFK)}}}")
|
||||
deviceLog_add(
|
||||
getString(R.string.logAppName),
|
||||
getInfoVersionNameApp(),
|
||||
getData(ANDROID_ID)
|
||||
)
|
||||
|
||||
if (binding.switchRemember.isChecked) {
|
||||
saveRemember(true)
|
||||
|
|
|
|||
|
|
@ -180,33 +180,31 @@ class LoginViewModel(val context: Context) : BaseViewModel(context) {
|
|||
})
|
||||
}
|
||||
|
||||
fun getCurrentUserData() {
|
||||
fun getCurrentUserData(appName: String, versionApp: String, android_id: String, serialnumber: String? =null) {
|
||||
salix.getCurrentUserData().enqueue(object : SilexCallback<DataUserSalix>(context) {
|
||||
override fun onSuccess(response: Response<DataUserSalix>) {
|
||||
app.userName = response.body()?.let { it.nickname }
|
||||
app.userId = response.body()?.let { it.id }
|
||||
deviceLog_addSalix(app = appName, versionApp= versionApp,android_id= android_id, userFk = app.userId!!, serialnumber = serialnumber)
|
||||
}
|
||||
|
||||
})
|
||||
}
|
||||
|
||||
fun deviceLog_add(
|
||||
app: String, versionApp: String, android_id: String
|
||||
/* fun deviceLog_add(
|
||||
app: String, versionApp: String, android_id: String, userFk :Int
|
||||
) {
|
||||
//Tarea 4815
|
||||
// salix.deviceLogInsert(DeviceLogSalix(androidId = android_id,userFk,nameApp= app,versionApp= versionApp))
|
||||
silex.deviceLog_add(app, versionApp, android_id)
|
||||
.enqueue(object : SilexCallback<Unit>(context) {
|
||||
salix.deviceLogInsert(DeviceLogSalix(android_id = android_id,nameApp= app,versionApp= versionApp, serialNumber = null, userFk = userFk))
|
||||
|
||||
.enqueue(object : SilexCallback<Unit>(context) {
|
||||
override fun onSuccess(response: Response<Unit>) {
|
||||
}
|
||||
|
||||
})
|
||||
|
||||
}
|
||||
}*/
|
||||
|
||||
fun deviceLog_addSalix(
|
||||
app: String, versionApp: String, android_id: String, userFk: Int, serialnumber: String
|
||||
app: String, versionApp: String, android_id: String, userFk: Int, serialnumber: String?
|
||||
) {
|
||||
|
||||
//Tarea 4815
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@ import android.content.Context
|
|||
import androidx.lifecycle.LiveData
|
||||
import androidx.lifecycle.MutableLiveData
|
||||
import androidx.lifecycle.Transformations
|
||||
import es.verdnatura.domain.SalixCallback
|
||||
import es.verdnatura.domain.SilexCallback
|
||||
import es.verdnatura.presentation.base.BaseViewModel
|
||||
import es.verdnatura.presentation.base.getMessageFromAllResponse
|
||||
|
|
@ -12,8 +13,6 @@ import es.verdnatura.presentation.common.Event
|
|||
import es.verdnatura.presentation.common.ResponseItemVO
|
||||
import es.verdnatura.presentation.view.feature.paletizador.model.ItemPalletViewListVO
|
||||
import es.verdnatura.presentation.view.feature.paletizador.model.ItemPalletViewVO
|
||||
import retrofit2.Call
|
||||
import retrofit2.Callback
|
||||
import retrofit2.Response
|
||||
|
||||
class ExpeditionPalletDetailViewModel(var context: Context) : BaseViewModel(context) {
|
||||
|
|
@ -70,8 +69,8 @@ class ExpeditionPalletDetailViewModel(var context: Context) : BaseViewModel(cont
|
|||
|
||||
fun expeditionPalletDel(vPalletFk: Int) {
|
||||
//Tarea 5134
|
||||
//salix.expeditionPalletDel(vPalletFk).enqueue(object : SalixCallback<Any>(context) {
|
||||
silex.expeditionPalletDel(vPalletFk).enqueue(object : SilexCallback<Any>(context) {
|
||||
salix.expeditionPalletDel(vPalletFk).enqueue(object : SalixCallback<Any>(context) {
|
||||
//silex.expeditionPalletDel(vPalletFk).enqueue(object : SilexCallback<Any>(context) {
|
||||
override fun onError(t: Throwable) {
|
||||
_response.value = ResponseItemVO(
|
||||
isError = true,
|
||||
|
|
@ -81,7 +80,7 @@ class ExpeditionPalletDetailViewModel(var context: Context) : BaseViewModel(cont
|
|||
|
||||
override fun onSuccess(response: Response<Any>) {
|
||||
_response.value = ResponseItemVO(
|
||||
isError = true,
|
||||
isError = false,
|
||||
errorMessage = getMessageFromAllResponse(
|
||||
nameofFunction(this),
|
||||
response.message()
|
||||
|
|
|
|||
|
|
@ -14,8 +14,6 @@ import es.verdnatura.presentation.view.feature.paletizador.model.ItemExpeditionS
|
|||
import es.verdnatura.presentation.view.feature.paletizador.model.ItemExpeditionScanVO
|
||||
import es.verdnatura.presentation.view.feature.paletizador.model.ItemScanList
|
||||
import es.verdnatura.presentation.view.feature.paletizador.model.ItemScanVO
|
||||
import retrofit2.Call
|
||||
import retrofit2.Callback
|
||||
import retrofit2.Response
|
||||
|
||||
class ExpeditionScanViewModel(val context: Context) : BaseViewModel(context) {
|
||||
|
|
@ -179,8 +177,8 @@ class ExpeditionScanViewModel(val context: Context) : BaseViewModel(context) {
|
|||
|
||||
|
||||
fun expeditionScanDel( vScanFk: Int) {
|
||||
//Tarea 5134
|
||||
//salix.expeditionScanDel(vScanFk).enqueue(object : SalixCallback<Any> (context){
|
||||
//Tarea 5134 // no se cambia hasta que se suba test→master 11-17-23
|
||||
//salix.expeditionScanDel(vScanFk).enqueue(object : SalixCallback<Any>(context){
|
||||
silex.expeditionScanDel(vScanFk)
|
||||
.enqueue(object : SilexCallback<Any> (context){
|
||||
override fun onError(t: Throwable) {
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ package es.verdnatura.presentation.view.feature.sacador.model
|
|||
|
||||
class CollectionTicket(
|
||||
var collectionFk: Int,
|
||||
var created: String = "",
|
||||
var created: String? = null,
|
||||
var ticketTotalCount: Int = 0,
|
||||
var tickets: MutableList<Ticket> = mutableListOf(),
|
||||
var isError: Boolean = false,
|
||||
|
|
|
|||
|
|
@ -359,9 +359,8 @@ class UbicadorFragment(
|
|||
binding.editImg.setOnClickListener {
|
||||
customDialogInput.setTitle(getString(R.string.changeShelving)).setValue("")
|
||||
.setOkButton(getString(R.string.save)) {
|
||||
viewModel.shelvingChange(
|
||||
shelvingFk,
|
||||
customDialogInput.getValue()
|
||||
viewModel.shelvingChangeSalix(
|
||||
shelvingFk,customDialogInput.getValue()
|
||||
)
|
||||
shelvingFk = customDialogInput.getValue()
|
||||
binding.mainToolbar.toolbarTitle.text =
|
||||
|
|
@ -379,7 +378,7 @@ class UbicadorFragment(
|
|||
|
||||
customDialogInput.getEditText().setOnEditorActionListener { v, actionId, event ->
|
||||
if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0) {
|
||||
viewModel.shelvingChange(
|
||||
viewModel.shelvingChangeSalix(
|
||||
shelvingFk,
|
||||
customDialogInput.getValue()
|
||||
)
|
||||
|
|
|
|||
|
|
@ -12,6 +12,7 @@ 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.ItemShelvingSalix
|
||||
import es.verdnatura.presentation.common.ResponseItemVO
|
||||
import es.verdnatura.presentation.view.feature.reubication.model.Reubication
|
||||
import es.verdnatura.presentation.view.feature.reubication.model.ReubicationList
|
||||
|
|
@ -191,16 +192,11 @@ class UbicadorViewModel(val context: Context) : BaseViewModel(context) {
|
|||
grouping: Int?
|
||||
|
||||
) {
|
||||
/* salix.itemShelvingUpdate(
|
||||
params = ,
|
||||
id = ,
|
||||
).enqueue(object : SalixCallback<Any>(context) {*/
|
||||
silex.itemShelvingMakeEdit(
|
||||
quantity,
|
||||
packing,
|
||||
itemShelvingFk,
|
||||
grouping
|
||||
).enqueue(object : SilexCallback<Any>(context) {
|
||||
salix.itemShelvingUpdate(
|
||||
params = ItemShelvingSalix(visible = quantity, packing = packing, grouping = grouping),
|
||||
id = itemShelvingFk,
|
||||
).enqueue(object : SalixCallback<Any>(context) {
|
||||
|
||||
override fun onError(t: Throwable) {
|
||||
_responseMake.value = ResponseItemVO(
|
||||
isError = true,
|
||||
|
|
@ -380,7 +376,6 @@ class UbicadorViewModel(val context: Context) : BaseViewModel(context) {
|
|||
|
||||
) {
|
||||
|
||||
// silex.clearShelvingList(shelvingFk)
|
||||
salix.itemShelvingsUpdate(
|
||||
id = JsonObject().apply { addProperty("shelvingFk", shelvingFk) },
|
||||
hashMapOf("visible" to 0)
|
||||
|
|
@ -400,6 +395,31 @@ class UbicadorViewModel(val context: Context) : BaseViewModel(context) {
|
|||
})
|
||||
}
|
||||
|
||||
fun shelvingChangeSalix(
|
||||
shelvingFkIn: String,
|
||||
shelvingFkOut:String
|
||||
|
||||
) {
|
||||
|
||||
salix.itemShelvingsUpdate(
|
||||
id = JsonObject().apply { addProperty("shelvingFk", shelvingFkIn) },
|
||||
hashMapOf("shelvingFk" to shelvingFkOut)
|
||||
)
|
||||
.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>) {
|
||||
_response.value =
|
||||
ResponseItemVO(isError = false, response = response.message())
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
fun itemShelvingTransfer(
|
||||
itemFk: Int,
|
||||
shelvingFk: String
|
||||
|
|
@ -424,8 +444,6 @@ class UbicadorViewModel(val context: Context) : BaseViewModel(context) {
|
|||
fun itemShelvingDelete(itemFk: Int) {
|
||||
salix.itemShelvingsDelete(itemFk)
|
||||
.enqueue(object : SalixCallback<Any>(context) {
|
||||
/*silex.itemShelvingDelete(itemFk)
|
||||
.enqueue(object : SilexCallback<Any>(context) {*/
|
||||
override fun onError(t: Throwable) {
|
||||
|
||||
_response.value = ResponseItemVO(
|
||||
|
|
|
|||
|
|
@ -3,69 +3,47 @@ package es.verdnatura.presentation.view.feature.workermistake.adapter
|
|||
import android.view.LayoutInflater
|
||||
import android.view.View
|
||||
import android.view.ViewGroup
|
||||
import androidx.core.content.ContentProviderCompat.requireContext
|
||||
import androidx.recyclerview.widget.RecyclerView
|
||||
import es.verdnatura.databinding.ItemInventaryRowBinding
|
||||
import es.verdnatura.databinding.ItemWorkermistakeRowBinding
|
||||
import es.verdnatura.domain.toast
|
||||
import es.verdnatura.presentation.common.OnInvetoryNichoClickListener
|
||||
import es.verdnatura.presentation.common.OnPasillerosItemClickListener
|
||||
import es.verdnatura.presentation.common.onMistakeWorkerClickListener
|
||||
import es.verdnatura.presentation.view.feature.inventario.model.ItemInventaryVO
|
||||
import es.verdnatura.presentation.view.feature.pasillero.model.PasillerosItemVO
|
||||
import es.verdnatura.presentation.view.feature.workermistake.model.WorkerFromMistake
|
||||
import timber.log.Timber.d
|
||||
|
||||
|
||||
class WorkermistakeAdapter (
|
||||
class WorkermistakeAdapter(
|
||||
private val items: List<WorkerFromMistake>,
|
||||
private val onMistakeWorkerClickListener: onMistakeWorkerClickListener
|
||||
//private val onPasillerosItemClickListener: OnPasillerosItemClickListener*/
|
||||
): RecyclerView.Adapter<WorkermistakeAdapter.ItemHolder> () {
|
||||
//private val onPasillerosItemClickListener: OnPasillerosItemClickListener*/
|
||||
) : RecyclerView.Adapter<WorkermistakeAdapter.ItemHolder>() {
|
||||
|
||||
|
||||
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemHolder {
|
||||
return ItemHolder(
|
||||
ItemWorkermistakeRowBinding.inflate(LayoutInflater.from(parent.context),parent,false)
|
||||
)
|
||||
}
|
||||
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemHolder {
|
||||
return ItemHolder(
|
||||
ItemWorkermistakeRowBinding.inflate(LayoutInflater.from(parent.context), parent, false)
|
||||
)
|
||||
}
|
||||
|
||||
override fun getItemCount() =items.size
|
||||
override fun getItemCount() = items.size
|
||||
|
||||
override fun onBindViewHolder(holder: ItemHolder, position: Int) {
|
||||
holder.bind(items[position])
|
||||
}
|
||||
override fun onBindViewHolder(holder: ItemHolder, position: Int) {
|
||||
holder.bind(items[position])
|
||||
}
|
||||
|
||||
inner class ItemHolder(
|
||||
val binding: ItemWorkermistakeRowBinding
|
||||
) : RecyclerView.ViewHolder(binding.root){
|
||||
private val res = binding.root.context.resources
|
||||
fun bind(item: WorkerFromMistake) {
|
||||
binding.apply {
|
||||
this.item = item
|
||||
inner class ItemHolder(
|
||||
val binding: ItemWorkermistakeRowBinding
|
||||
) : RecyclerView.ViewHolder(binding.root) {
|
||||
private val res = binding.root.context.resources
|
||||
fun bind(item: WorkerFromMistake) {
|
||||
binding.apply {
|
||||
this.item = item
|
||||
|
||||
itemFirstname.visibility = View.VISIBLE
|
||||
itemLastname.visibility = View.VISIBLE
|
||||
}
|
||||
/* itemNicho.setOnClickListener {
|
||||
onInvetoryNichoClickListener.onInvetoryNichoClickListener(item)
|
||||
}
|
||||
itemFk.setOnClickListener {
|
||||
onPasillerosItemClickListener.onPasillerosItemClickListener(PasillerosItemVO(title = "Consultar artículo"),item.itemFk)
|
||||
}
|
||||
itemUp.setOnClickListener {
|
||||
onPasillerosItemClickListener.onPasillerosItemClickListener(PasillerosItemVO(title = "Buscar item"),item.itemFk)
|
||||
}
|
||||
itemDown.setOnClickListener {
|
||||
onPasillerosItemClickListener.onPasillerosItemClickListener(PasillerosItemVO(title = "Buscar item"),item.itemFk)
|
||||
}*/
|
||||
|
||||
binding.imageErrorMessage.setOnClickListener {
|
||||
d("test_imageError")
|
||||
onMistakeWorkerClickListener.onMistakeWorkerClickListener(item)
|
||||
//false
|
||||
}
|
||||
}
|
||||
itemFirstname.visibility = View.VISIBLE
|
||||
itemLastname.visibility = View.VISIBLE
|
||||
}
|
||||
|
||||
binding.imageErrorMessage.setOnClickListener {
|
||||
onMistakeWorkerClickListener.onMistakeWorkerClickListener(item)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -38,8 +38,6 @@ class WorkermistakeFragment(
|
|||
private lateinit var customDialog: CustomDialog
|
||||
private var pasillerosItemClickListener: OnPasillerosItemClickListener? = null
|
||||
private var layoutManager: LinearLayoutManager? = null
|
||||
|
||||
// private var firstVisiblePosition = 0
|
||||
private lateinit var customDialogList: CustomDialogList
|
||||
private var listMistakes: ArrayList<BarcodeVO> = ArrayList()
|
||||
private var listMistakesAdapter: BarcodeAdapter? = null
|
||||
|
|
|
|||
|
|
@ -46,18 +46,19 @@
|
|||
<TextView
|
||||
android:id="@+id/item_firstname"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:gravity="left"
|
||||
android:text="@{item.firstName}"
|
||||
android:textColor="@color/verdnatura_pumpkin_orange"
|
||||
android:textSize="@dimen/row"
|
||||
android:layout_weight="2"
|
||||
android:layout_weight="1.75"
|
||||
android:ellipsize="end"
|
||||
tool:text="Sergio" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/item_lastname"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:gravity="left"
|
||||
android:text="@{item.lastName}"
|
||||
android:textColor="@color/verdnatura_pumpkin_orange"
|
||||
|
|
|
|||
|
|
@ -667,6 +667,8 @@
|
|||
<string name="scanAddressSelected">Permite escanear expediciones del consignatario seleccionado</string>
|
||||
<string name="itemNotValid">La etiqueta escaenada no es válida</string>
|
||||
<string name="plateChecked">Matrícula ya revisada</string>
|
||||
<string name="titlePreviousDescription">Accede al menú de presacador y precontrol</string>
|
||||
<string name="titlePrevious">Previa</string>
|
||||
|
||||
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -667,5 +667,7 @@
|
|||
<string name="scanAddressSelected">Permet de scanner les expéditions du consignataire sélectionné</string>
|
||||
<string name="itemNotValid">La etiqueta escaenada no es válida</string>
|
||||
<string name="plateChecked">Matrícula ya revisada</string>
|
||||
<string name="titlePreviousDescription">Accede al menú de presacador y precontrol</string>
|
||||
<string name="titlePrevious">Previa</string>
|
||||
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -667,5 +667,7 @@
|
|||
<string name="scanAddressSelected">Permite escanear expedições do consignatário selecionado</string>
|
||||
<string name="itemNotValid">La etiqueta escaenada no es válida</string>
|
||||
<string name="plateChecked">Matrícula ya revisada</string>
|
||||
<string name="titlePreviousDescription">Accede al menú de presacador y precontrol</string>
|
||||
<string name="titlePrevious">Previa</string>
|
||||
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -666,5 +666,7 @@
|
|||
<string name="scanAddressSelected">Allows scanning shipments of the selected consignee</string>
|
||||
<string name="itemNotValid">La etiqueta escaenada no es válida</string>
|
||||
<string name="plateChecked">Matrícula ya revisada</string>
|
||||
<string name="titlePreviousDescription">Accede al menú de presacador y precontrol</string>
|
||||
<string name="titlePrevious">Previa</string>
|
||||
|
||||
</resources>
|
||||
|
|
|
|||
Loading…
Reference in New Issue