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

feat workerActivity refs #6078

This commit is contained in:
Sergio De la torre 2024-08-09 12:14:29 +02:00
parent c23dfa8a5f
commit e2f4a0f43a
18 changed files with 364 additions and 432 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
.idea/workspace.xml
View File

@ -155,6 +155,11 @@
<theme>@style/AppTheme</theme> <theme>@style/AppTheme</theme>
</config> </config>
</layout> </layout>
<layout url="file://$PROJECT_DIR$/app/src/main/res/layout/fragment_login.xml">
<config>
<theme>@style/AppTheme</theme>
</config>
</layout>
<layout url="file://$PROJECT_DIR$/app/src/main/res/layout/fragment_packaging_count.xml"> <layout url="file://$PROJECT_DIR$/app/src/main/res/layout/fragment_packaging_count.xml">
<config> <config>
<theme>@style/AppTheme</theme> <theme>@style/AppTheme</theme>
@ -334,49 +339,20 @@
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="fa688d1c-dbee-4864-9e33-4d84ef9afca8" name="Default Changelist" comment="feat itemGetBalance refs #6769"> <list default="true" id="fa688d1c-dbee-4864-9e33-4d84ef9afca8" name="Default Changelist" comment="feat itemGetBalance refs #6769">
<change beforePath="$PROJECT_DIR$/.idea/appInsightsSettings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/appInsightsSettings.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/deploymentTargetSelector.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/deploymentTargetSelector.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/beta/release/output-metadata.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/beta/release/output-metadata.json" afterDir="false" /> <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/ConstAndValues.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/ConstAndValues.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/app/build.gradle" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/general/release/baselineProfiles/0/app-general-release.dm" beforeDir="false" afterPath="$PROJECT_DIR$/app/general/release/baselineProfiles/0/app-general-release.dm" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/general/release/baselineProfiles/1/app-general-release.dm" beforeDir="false" afterPath="$PROJECT_DIR$/app/general/release/baselineProfiles/1/app-general-release.dm" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/proguard-rules.pro" beforeDir="false" afterPath="$PROJECT_DIR$/app/proguard-rules.pro" 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/SalixCallback.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/SalixCallback.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/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/base/BaseActivity.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/base/BaseActivity.kt" afterDir="false" /> <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/ajustes/adapter/AjustesAdapter.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/ajustes/adapter/AjustesAdapter.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/testing/testPrint.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/testing/testPrint.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/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/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/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/buffer/fragment/BufferFragmentViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/buffer/fragment/BufferFragmentViewModel.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/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/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/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/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/historicoshelvinglog/fragment/shelvingLogViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/historicoshelvinglog/fragment/shelvingLogViewModel.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/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/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/main/activity/MainActivityViewModel.kt" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/PackagingViewModel/SupplierViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/PackagingViewModel/SupplierViewModel.kt" afterDir="false" /> <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/main/model/ItemMenuVO.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/main/model/ItemMenuVO.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/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/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/pasillero/model/PasillerosItemVO.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/pasillero/model/PasillerosItemVO.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/photos/fragment/PhotosViewModel.kt" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/app/src/main/res/layout/fragment_ajustes.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/fragment_ajustes.xml" 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/res/layout/fragment_login.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/fragment_login.xml" 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/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/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/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" />
@ -482,7 +458,7 @@
</option> </option>
<option name="RECENT_BRANCH_BY_REPOSITORY"> <option name="RECENT_BRANCH_BY_REPOSITORY">
<map> <map>
<entry key="$PROJECT_DIR$" value="master" /> <entry key="$PROJECT_DIR$" value="dev" />
</map> </map>
</option> </option>
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" /> <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
@ -569,7 +545,7 @@
"cidr.known.project.marker": "true", "cidr.known.project.marker": "true",
"com.developerphil.adbidea.selecteddevices": "G65TY9DQN7X4BIE6", "com.developerphil.adbidea.selecteddevices": "G65TY9DQN7X4BIE6",
"com.google.services.firebase.aqiPopupShown": "true", "com.google.services.firebase.aqiPopupShown": "true",
"git-widget-placeholder": "dev", "git-widget-placeholder": "dev__6078",
"ignore.virus.scanning.warn.message": "true", "ignore.virus.scanning.warn.message": "true",
"kotlin-language-version-configured": "true", "kotlin-language-version-configured": "true",
"last_directory_selection": "C:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable", "last_directory_selection": "C:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable",
@ -1146,6 +1122,11 @@
</option> </option>
</component> </component>
<component name="Vcs.Log.Tabs.Properties"> <component name="Vcs.Log.Tabs.Properties">
<option name="OPEN_GENERIC_TABS">
<map>
<entry key="2d49b591-3bdb-4c6f-845a-678e7b2cc012" value="TOOL_WINDOW" />
</map>
</option>
<option name="RECENT_FILTERS"> <option name="RECENT_FILTERS">
<map> <map>
<entry key="Branch"> <entry key="Branch">
@ -1180,6 +1161,28 @@
</State> </State>
</value> </value>
</entry> </entry>
<entry key="2d49b591-3bdb-4c6f-845a-678e7b2cc012">
<value>
<State>
<option name="CUSTOM_BOOLEAN_PROPERTIES">
<map>
<entry key="Show.Git.Branches" value="true" />
</map>
</option>
<option name="FILTERS">
<map>
<entry key="branch">
<value>
<list>
<option value="dev_6078" />
</list>
</value>
</entry>
</map>
</option>
</State>
</value>
</entry>
<entry key="MAIN"> <entry key="MAIN">
<value> <value>
<State> <State>
@ -1286,11 +1289,6 @@
<line>83</line> <line>83</line>
<option name="timeStamp" value="14" /> <option name="timeStamp" value="14" />
</line-breakpoint> </line-breakpoint>
<line-breakpoint enabled="true" type="kotlin-line">
<url>file://$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/main/activity/MainActivity.kt</url>
<line>594</line>
<option name="timeStamp" value="15" />
</line-breakpoint>
</breakpoints> </breakpoints>
</breakpoint-manager> </breakpoint-manager>
<pin-to-top-manager> <pin-to-top-manager>

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

@ -66,6 +66,12 @@ object ConstAndValues {
const val INVENTORYPARKINGFROM = "INVENTORYPARKINGFROM" const val INVENTORYPARKINGFROM = "INVENTORYPARKINGFROM"
const val LIMITRECORDSSHELVINGLOG = 50 const val LIMITRECORDSSHELVINGLOG = 50
const val RESERVATIONMODE = "operatorReservationMode" const val RESERVATIONMODE = "operatorReservationMode"
const val MODELWORKERTYPEACTIVITY = "APP"
val ACTIONNAMES = listOf(
"STOP",
"ON_CHECKING",
"Delivery"
)
} }

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

@ -46,7 +46,6 @@ import es.verdnatura.presentation.view.feature.login.model.OperatorSalix
import es.verdnatura.presentation.view.feature.login.model.RenewToken import es.verdnatura.presentation.view.feature.login.model.RenewToken
import es.verdnatura.presentation.view.feature.login.model.SalixGrupo import es.verdnatura.presentation.view.feature.login.model.SalixGrupo
import es.verdnatura.presentation.view.feature.login.model.VersionApp import es.verdnatura.presentation.view.feature.login.model.VersionApp
import es.verdnatura.presentation.view.feature.main.model.WorkerActionSalix
import es.verdnatura.presentation.view.feature.packaging.model.EntrySalix import es.verdnatura.presentation.view.feature.packaging.model.EntrySalix
import es.verdnatura.presentation.view.feature.packaging.model.ItemSupplier import es.verdnatura.presentation.view.feature.packaging.model.ItemSupplier
import es.verdnatura.presentation.view.feature.packaging.model.NotificationQueue import es.verdnatura.presentation.view.feature.packaging.model.NotificationQueue
@ -58,6 +57,7 @@ import es.verdnatura.presentation.view.feature.paletizador.model.ItemExpeditionT
import es.verdnatura.presentation.view.feature.paletizador.model.ItemPalletVO import es.verdnatura.presentation.view.feature.paletizador.model.ItemPalletVO
import es.verdnatura.presentation.view.feature.paletizador.model.ItemPalletViewVO import es.verdnatura.presentation.view.feature.paletizador.model.ItemPalletViewVO
import es.verdnatura.presentation.view.feature.paletizador.model.ItemScanVO import es.verdnatura.presentation.view.feature.paletizador.model.ItemScanVO
import es.verdnatura.presentation.view.feature.pasillero.model.WorkerActionSalix
import es.verdnatura.presentation.view.feature.presacador.model.PreSacadorItemVO import es.verdnatura.presentation.view.feature.presacador.model.PreSacadorItemVO
import es.verdnatura.presentation.view.feature.roadmap.model.RoadMapTruck import es.verdnatura.presentation.view.feature.roadmap.model.RoadMapTruck
import es.verdnatura.presentation.view.feature.roadmap.model.RoadStopMapTruck import es.verdnatura.presentation.view.feature.roadmap.model.RoadStopMapTruck
@ -100,9 +100,7 @@ interface SalixService {
@POST("VnUsers/validate-auth") @POST("VnUsers/validate-auth")
fun validateAuth( fun validateAuth(
@Query("user") user: Any, @Query("user") user: Any, @Query("password") password: Any, @Query("code") code: Any
@Query("password") password: Any,
@Query("code") code: Any
): Call<LoginSalixVO> ): Call<LoginSalixVO>
@POST("Accounts/loginApp") @POST("Accounts/loginApp")
@ -161,8 +159,7 @@ interface SalixService {
@POST("Applications/expedition_checkRoute/execute-func") @POST("Applications/expedition_checkRoute/execute-func")
fun expeditionCheckRoute( fun expeditionCheckRoute(
@Query("params") params: Any, @Query("params") params: Any, @Query("schema") schema: String = "vn"
@Query("schema") schema: String = "vn"
): Call<String> ): Call<String>
@GET("ExpeditionStates/filter") @GET("ExpeditionStates/filter")
@ -198,38 +195,32 @@ interface SalixService {
@POST("Applications/collection_setState/execute-proc") @POST("Applications/collection_setState/execute-proc")
fun collectionSetState( fun collectionSetState(
@Query("schema") schema: String = "vn", @Query("schema") schema: String = "vn", @Query("params") params: Any? = null
@Query("params") params: Any? = null
): Call<Any?> ): Call<Any?>
@POST("Applications/itemShelvingSale_setQuantity/execute-proc") @POST("Applications/itemShelvingSale_setQuantity/execute-proc")
fun itemShelvingSaleSetquantitySalix( fun itemShelvingSaleSetquantitySalix(
@Query("schema") schema: String = "vn", @Query("schema") schema: String = "vn", @Query("params") params: Any? = null
@Query("params") params: Any? = null
): Call<Any> ): Call<Any>
@POST("Applications/itemShelvingSale_addBySectorCollection/execute-proc") @POST("Applications/itemShelvingSale_addBySectorCollection/execute-proc")
fun getReserveBySectorCollection( fun getReserveBySectorCollection(
@Query("schema") schema: String = "vn", @Query("schema") schema: String = "vn", @Query("params") params: Any? = null
@Query("params") params: Any? = null
): Call<Any> ): Call<Any>
@POST("Applications/itemShelvingSale_addBySaleGroup/execute-proc") @POST("Applications/itemShelvingSale_addBySaleGroup/execute-proc")
fun getReserveBySaleGroup( fun getReserveBySaleGroup(
@Query("schema") schema: String = "vn", @Query("schema") schema: String = "vn", @Query("params") params: Any? = null
@Query("params") params: Any? = null
): Call<Any> ): Call<Any>
@POST("Applications/collection_addWithReservation/execute-proc") @POST("Applications/collection_addWithReservation/execute-proc")
fun collectionAddWithReservation( fun collectionAddWithReservation(
@Query("schema") schema: String = "vn", @Query("schema") schema: String = "vn", @Query("params") params: Any? = null
@Query("params") params: Any? = null
): Call<Any> ): Call<Any>
@POST("Applications/collection_get/execute-proc") @POST("Applications/collection_get/execute-proc")
fun collectionGet( fun collectionGet(
@Query("schema") schema: String = "vn", @Query("schema") schema: String = "vn", @Query("params") params: Any? = null
@Query("params") params: Any? = null
): Call<CollectionVO> ): Call<CollectionVO>
@GET("Routes/getExpeditionSummary") @GET("Routes/getExpeditionSummary")
@ -239,8 +230,7 @@ interface SalixService {
@POST("Applications/addNoteFromDelivery/execute-proc") @POST("Applications/addNoteFromDelivery/execute-proc")
fun addNote( fun addNote(
@Query("params") params: Any? = null, @Query("params") params: Any? = null, @Query("schema") schema: String = "vn"
@Query("schema") schema: String = "vn"
): Call<Any> ): Call<Any>
@POST("TicketObservations") @POST("TicketObservations")
@ -255,8 +245,7 @@ interface SalixService {
@POST("TicketObservations/upsertWithWhere") @POST("TicketObservations/upsertWithWhere")
fun updateNoteFromDropOff( fun updateNoteFromDropOff(
@Query("where") where: Any? = null, @Query("where") where: Any? = null, @Body params: Any
@Body params: Any
): Call<Any> ): Call<Any>
@POST("TicketObservations/addDropOff") @POST("TicketObservations/addDropOff")
@ -267,11 +256,10 @@ interface SalixService {
@POST("Applications/item_getBalance/execute-proc") @POST("Applications/item_getBalance/execute-proc")
fun itemGetBalance( fun itemGetBalance(
@Query("params") params: Any? = null, @Query("params") params: Any? = null, @Query("schema") schema: String = "vn"
@Query("schema") schema: String = "vn"
): Call<List<ItemHistoricoVO>> ): Call<List<ItemHistoricoVO>>
@POST("workerActivities") @POST("workerActivities/add")
fun workerActivityAdd( fun workerActivityAdd(
@Body workerActionSalix: WorkerActionSalix @Body workerActionSalix: WorkerActionSalix
): Call<Any> ): Call<Any>
@ -282,56 +270,47 @@ interface SalixService {
@POST("Applications/cmrPallet_add/execute-proc") @POST("Applications/cmrPallet_add/execute-proc")
fun cmrPalletAdd( fun cmrPalletAdd(
@Query("params") params: Any? = null, @Query("params") params: Any? = null, @Query("schema") schema: String = "vn"
@Query("schema") schema: String = "vn"
): Call<Unit> ): Call<Unit>
@POST("Applications/expeditionScan_Put/execute-proc") @POST("Applications/expeditionScan_Put/execute-proc")
fun expeditionScanPut( fun expeditionScanPut(
@Query("params") params: Any? = null, @Query("params") params: Any? = null, @Query("schema") schema: String = "vn"
@Query("schema") schema: String = "vn"
): Call<Any> ): Call<Any>
@POST("Applications/expeditionScan_List/execute-proc") @POST("Applications/expeditionScan_List/execute-proc")
fun expeditionScanList( fun expeditionScanList(
@Query("params") params: Any? = null, @Query("params") params: Any? = null, @Query("schema") schema: String = "vn"
@Query("schema") schema: String = "vn"
): Call<List<ItemExpeditionScanVO>> ): Call<List<ItemExpeditionScanVO>>
@POST("Applications/expeditionScan_Add/execute-proc") @POST("Applications/expeditionScan_Add/execute-proc")
fun expeditionScanAdd( fun expeditionScanAdd(
@Query("params") params: Any? = null, @Query("params") params: Any? = null, @Query("schema") schema: String = "vn"
@Query("schema") schema: String = "vn"
): Call<List<ItemScanVO>> ): Call<List<ItemScanVO>>
@POST("Applications/expeditionPallet_View/execute-proc") @POST("Applications/expeditionPallet_View/execute-proc")
fun expeditionPalletView( fun expeditionPalletView(
@Query("params") params: Any? = null, @Query("params") params: Any? = null, @Query("schema") schema: String = "vn"
@Query("schema") schema: String = "vn"
): Call<List<ItemPalletViewVO>> ): Call<List<ItemPalletViewVO>>
@POST("Applications/expeditionPallet_List/execute-proc") @POST("Applications/expeditionPallet_List/execute-proc")
fun expeditionPalletList( fun expeditionPalletList(
@Query("params") params: Any? = null, @Query("params") params: Any? = null, @Query("schema") schema: String = "vn"
@Query("schema") schema: String = "vn"
): Call<List<ItemPalletVO>> ): Call<List<ItemPalletVO>>
@POST("Applications/expeditionPallet_printLabel/execute-proc") @POST("Applications/expeditionPallet_printLabel/execute-proc")
fun expeditionPalletPrintLabel( fun expeditionPalletPrintLabel(
@Query("params") params: Any? = null, @Query("params") params: Any? = null, @Query("schema") schema: String = "vn"
@Query("schema") schema: String = "vn"
): Call<Any> ): Call<Any>
@POST("Applications/expeditionLoading_add/execute-proc") @POST("Applications/expeditionLoading_add/execute-proc")
fun expeditionLoadingAdd( fun expeditionLoadingAdd(
@Query("params") params: Any? = null, @Query("params") params: Any? = null, @Query("schema") schema: String = "vn"
@Query("schema") schema: String = "vn"
): Call<List<Map<String, Any>>> ): Call<List<Map<String, Any>>>
@POST("Applications/expeditionState_addByPallet/execute-proc") @POST("Applications/expeditionState_addByPallet/execute-proc")
fun expeditionStateAddByPallet( fun expeditionStateAddByPallet(
@Query("params") params: Any? = null, @Query("params") params: Any? = null, @Query("schema") schema: String = "vn"
@Query("schema") schema: String = "vn"
): Call<Unit> ): Call<Unit>
@GET("ExpeditionPallets/getPallet") @GET("ExpeditionPallets/getPallet")
@ -347,8 +326,7 @@ interface SalixService {
@GET("Printers") @GET("Printers")
fun getprinters( fun getprinters(
@Query("filter") filter: Any? @Query("filter") filter: Any?
): ): Call<MutableList<Printers>>
Call<MutableList<Printers>>
@GET("Collections/getSales") @GET("Collections/getSales")
fun getSalesFromTicketOrCollection( fun getSalesFromTicketOrCollection(
@ -356,341 +334,283 @@ interface SalixService {
@Query("print") print: Boolean, @Query("print") print: Boolean,
@Query("source") source: String, @Query("source") source: String,
): ): Call<CollectionVO>
Call<CollectionVO>
@GET("Expedition_printOuts/findOne") @GET("Expedition_printOuts/findOne")
fun isBoxPickingInPrintOut( fun isBoxPickingInPrintOut(
@Query("filter") filter: String, @Query("filter") filter: String,
): ): Call<ExpeditionPrintOut>
Call<ExpeditionPrintOut>
@PATCH("Expedition_printOuts/{id}") @PATCH("Expedition_printOuts/{id}")
fun update( fun update(
@Path("id") id: Number, @Path("id") id: Number, @Body expeditionPrintOut: ExpeditionPrintOut
@Body expeditionPrintOut: ExpeditionPrintOut ): Call<ExpeditionPrintOut>
):
Call<ExpeditionPrintOut>
@GET("TicketCollections/hasUncheckedTicket") @GET("TicketCollections/hasUncheckedTicket")
fun hasUncheckedTicket( fun hasUncheckedTicket(
@Query("ticketFk") ticketFk: Number, @Query("ticketFk") ticketFk: Number,
): ): Call<String>
Call<String>
@POST("SaleTrackings/setPicked") @POST("SaleTrackings/setPicked")
fun saleTrackingMark( fun saleTrackingMark(
@Body saleTRackingSalix: SaleTrackingSalix @Body saleTRackingSalix: SaleTrackingSalix
): ): Call<Any>
Call<Any>
@GET("Sales/getFromSectorCollection") @GET("Sales/getFromSectorCollection")
fun sectorCollectionGetSale( fun sectorCollectionGetSale(
@Query("sectorFk") sectorFk: Int, @Query("sectorFk") sectorFk: Int,
@Query("sectorCollectionFk") sectorCollectionFk: Int, @Query("sectorCollectionFk") sectorCollectionFk: Int,
): ): Call<List<PreSacadorItemVO>>
Call<List<PreSacadorItemVO>>
@POST("Tickets/addSaleByCode") @POST("Tickets/addSaleByCode")
fun addSaleByCode( fun addSaleByCode(
@Body params: Any @Body params: Any
): ): Call<Any>
Call<Any>
@POST("Tickets/{id}/addSale") @POST("Tickets/{id}/addSale")
fun addSale( fun addSale(
@Path("id") id: Number, @Path("id") id: Number,
@Query("quantity") quantity: Number, @Query("quantity") quantity: Number,
@Query("barcode") barcode: String @Query("barcode") barcode: String
): ): Call<Any>
Call<Any>
@POST("Collections/assign") @POST("Collections/assign")
fun collectionAssign( fun collectionAssign(
): ): Call<Int>
Call<Int>
@POST("Collections/assignCollection") @POST("Collections/assignCollection")
fun collectionAssigned( fun collectionAssigned(
): ): Call<Int>
Call<Int>
@POST("ItemShelvings/updateFromSale") @POST("ItemShelvings/updateFromSale")
fun itemShelvingUpdateFromSale( fun itemShelvingUpdateFromSale(
@Body params: Any @Body params: Any
): ): Call<Any>
Call<Any>
@POST("SaleTrackings/delete") @POST("SaleTrackings/delete")
fun saleTrackingDel( fun saleTrackingDel(
@Body params: SaleTrackingDelSalix @Body params: SaleTrackingDelSalix
): ): Call<Any>
Call<Any>
@POST("Shelvings/addLog") @POST("Shelvings/addLog")
fun shelvingLogAdd( fun shelvingLogAdd(
@Body params: Any @Body params: Any
): ): Call<Any>
Call<Any>
@POST("ItemShelvings/upsertItem") @POST("ItemShelvings/upsertItem")
fun upsertItem( fun upsertItem(
@Body params: Any @Body params: Any
): ): Call<Any>
Call<Any>
@POST("MachineWorkers/updateInTime") @POST("MachineWorkers/updateInTime")
fun machineWorkerUpdateInTime( fun machineWorkerUpdateInTime(
@Body params: Any @Body params: Any
): ): Call<Any>
Call<Any>
@POST("MachineWorkers/add") @POST("MachineWorkers/add")
fun machineWorkerAdd( fun machineWorkerAdd(
@Query("plate") plate: Any @Query("plate") plate: Any
): ): Call<Any>
Call<Any>
@POST("SaleTrackings/updateTracking") @POST("SaleTrackings/updateTracking")
fun saleTrackingUpdate( fun saleTrackingUpdate(
@Body params: Any @Body params: Any
): ): Call<Any>
Call<Any>
@GET("ItemShelvings/return") @GET("ItemShelvings/return")
fun itemShelvingReturn( fun itemShelvingReturn(
@Query("shelvingFk") shelvingFk: String @Query("shelvingFk") shelvingFk: String
): ): Call<ArrayList<Reubication>>
Call<ArrayList<Reubication>>
@GET("ItemShelvings/getAlternative") @GET("ItemShelvings/getAlternative")
fun itemShelvingAlternative( fun itemShelvingAlternative(
@Query("shelvingFk") shelvingFk: String @Query("shelvingFk") shelvingFk: String
): ): Call<ArrayList<Reubication>>
Call<ArrayList<Reubication>>
@GET("MobileAppVersionControls/getVersion") @GET("MobileAppVersionControls/getVersion")
fun getVersion( fun getVersion(
@Query("app") app: String @Query("app") app: String
): ): Call<VersionApp>
Call<VersionApp>
@GET("Items/get") @GET("Items/get")
fun getCard( fun getCard(
@Query("barcode") barcode: Number, @Query("barcode") barcode: Number, @Query("warehouseFk") warehouseFk: Int
@Query("warehouseFk") warehouseFk: Int ): Call<ItemCardVO>
):
Call<ItemCardVO>
@POST("Applications/itemPlacementSupplyAiming/execute-proc") @POST("Applications/itemPlacementSupplyAiming/execute-proc")
fun itemPlacementSupplyAiming( fun itemPlacementSupplyAiming(
@Query("params") params: Any? = null, @Query("params") params: Any? = null, @Query("schema") schema: String = "vn"
@Query("schema") schema: String = "vn"
): Call<List<PlacementSupplyVO>> ): Call<List<PlacementSupplyVO>>
@POST("Applications/machineWorker_getHistorical/execute-proc") @POST("Applications/machineWorker_getHistorical/execute-proc")
fun machineWorkerGetHistorical( fun machineWorkerGetHistorical(
@Query("params") params: Any? = null, @Query("params") params: Any? = null, @Query("schema") schema: String = "vn"
@Query("schema") schema: String = "vn"
): Call<List<ItemHistoricoVehiculo>> ): Call<List<ItemHistoricoVehiculo>>
@POST("Applications/expedition_getFromRoute/execute-proc") @POST("Applications/expedition_getFromRoute/execute-proc")
fun expeditionGetFromRoute( fun expeditionGetFromRoute(
@Query("params") params: Any? = null, @Query("params") params: Any? = null, @Query("schema") schema: String = "vn"
@Query("schema") schema: String = "vn"
): Call<List<ExpeditionInfoLoadUnload>> ): Call<List<ExpeditionInfoLoadUnload>>
@POST("Applications/company_getFiscaldata/execute-proc") @POST("Applications/company_getFiscaldata/execute-proc")
fun companyGetFiscaldata( fun companyGetFiscaldata(
@Query("params") params: Any? = null, @Query("params") params: Any? = null, @Query("schema") schema: String = "vn"
@Query("schema") schema: String = "vn"
): Call<List<DeliveryInfo>> ): Call<List<DeliveryInfo>>
@POST("Applications/freelance_getInfo/execute-proc") @POST("Applications/freelance_getInfo/execute-proc")
fun freelanceGetInfo( fun freelanceGetInfo(
@Query("params") params: Any? = null, @Query("params") params: Any? = null, @Query("schema") schema: String = "vn"
@Query("schema") schema: String = "vn"
): Call<List<DeliveryInfo>> ): Call<List<DeliveryInfo>>
@POST("Applications/travel_updatePacking/execute-proc") @POST("Applications/travel_updatePacking/execute-proc")
fun travelUpdatePacking( fun travelUpdatePacking(
@Query("params") params: Any? = null, @Query("params") params: Any? = null, @Query("schema") schema: String = "vn"
@Query("schema") schema: String = "vn"
): Call<Any> ): Call<Any>
@POST("Applications/saleTracking_updateIsChecked/execute-proc") @POST("Applications/saleTracking_updateIsChecked/execute-proc")
fun saleTrackingUpdateIsChecked( fun saleTrackingUpdateIsChecked(
@Query("params") params: Any? = null, @Query("params") params: Any? = null, @Query("schema") schema: String = "vn"
@Query("schema") schema: String = "vn"
): Call<Any> ): Call<Any>
@POST("Applications/saleTracking_addPreparedSaleGroup/execute-proc") @POST("Applications/saleTracking_addPreparedSaleGroup/execute-proc")
fun saleTrackingAddPreparedSaleGroup( fun saleTrackingAddPreparedSaleGroup(
@Query("params") params: Any? = null, @Query("params") params: Any? = null, @Query("schema") schema: String = "vn"
@Query("schema") schema: String = "vn"
): Call<Unit> ): Call<Unit>
@POST("Applications/itemShelvingSale_setPicked/execute-proc") @POST("Applications/itemShelvingSale_setPicked/execute-proc")
fun itemShelvingSaleSetSaleGroup( fun itemShelvingSaleSetSaleGroup(
@Query("params") params: Any? = null, @Query("params") params: Any? = null, @Query("schema") schema: String = "vn"
@Query("schema") schema: String = "vn"
): Call<Unit> ): Call<Unit>
@POST("Applications/itemShelvingSale_unpicked/execute-proc") @POST("Applications/itemShelvingSale_unpicked/execute-proc")
fun itemShelvingSaleUnpicked( fun itemShelvingSaleUnpicked(
@Query("params") params: Any? = null, @Query("params") params: Any? = null, @Query("schema") schema: String = "vn"
@Query("schema") schema: String = "vn"
): Call<Unit> ): Call<Unit>
@POST("Applications/setParking/execute-proc") @POST("Applications/setParking/execute-proc")
fun setParking( fun setParking(
@Query("params") params: Any? = null, @Query("params") params: Any? = null, @Query("schema") schema: String = "vn"
@Query("schema") schema: String = "vn"
): Call<Any> ): Call<Any>
@GET("ItemShelvings/getListItemNewer") @GET("ItemShelvings/getListItemNewer")
fun getListItemNewer( fun getListItemNewer(
@Query("shelvingFk") shelvingFkIn: Any, @Query("shelvingFk") shelvingFkIn: Any, @Query("parking") parking: Any? = null
@Query("parking") parking: Any? = null
): Call<List<ItemShelvingNewer>> ): Call<List<ItemShelvingNewer>>
@POST("Applications/sectorCollectionSaleGroup_add/execute-proc") @POST("Applications/sectorCollectionSaleGroup_add/execute-proc")
fun sectorCollectionSaleGroupAdd( fun sectorCollectionSaleGroupAdd(
@Query("params") params: Any? = null, @Query("params") params: Any? = null, @Query("schema") schema: String = "vn"
@Query("schema") schema: String = "vn"
): Call<Any> ): Call<Any>
@POST("Applications/saleTracking_addPrevOK/execute-proc") @POST("Applications/saleTracking_addPrevOK/execute-proc")
fun saleTrackingAddPrevOK( fun saleTrackingAddPrevOK(
@Query("params") params: Any? = null, @Query("params") params: Any? = null, @Query("schema") schema: String = "vn"
@Query("schema") schema: String = "vn"
): Call<Any> ): Call<Any>
@POST("Applications/machine_getWorkerPlate/execute-proc") @POST("Applications/machine_getWorkerPlate/execute-proc")
fun machineGetWorkerPlate( fun machineGetWorkerPlate(
@Query("params") params: Any? = null, @Query("params") params: Any? = null, @Query("schema") schema: String = "vn"
@Query("schema") schema: String = "vn"
): Call<List<JsonObject>> ): Call<List<JsonObject>>
@POST("Applications/sectorCollection_get/execute-proc") @POST("Applications/sectorCollection_get/execute-proc")
fun sectorCollectionGet( fun sectorCollectionGet(
@Query("params") params: Any? = null, @Query("params") params: Any? = null, @Query("schema") schema: String = "vn"
@Query("schema") schema: String = "vn"
): Call<List<CollectionVO>> ): Call<List<CollectionVO>>
@POST("Applications/sectorCollection_getMyPartial/execute-proc") @POST("Applications/sectorCollection_getMyPartial/execute-proc")
fun sectorCollectionGetPartial( fun sectorCollectionGetPartial(
@Query("params") params: Any? = null, @Query("params") params: Any? = null, @Query("schema") schema: String = "vn"
@Query("schema") schema: String = "vn"
): Call<List<CollectionVO>> ): Call<List<CollectionVO>>
@POST("Applications/sectorCollection_hasSalesReserved/execute-func") @POST("Applications/sectorCollection_hasSalesReserved/execute-func")
fun hasSalesReserved( fun hasSalesReserved(
@Query("params") params: Any? = null, @Query("params") params: Any? = null, @Query("schema") schema: String = "vn"
@Query("schema") schema: String = "vn"
): Call<String> ): Call<String>
@POST("Applications/worker_getFromHasMistake/execute-proc") @POST("Applications/worker_getFromHasMistake/execute-proc")
fun workerGetFromHasMistake( fun workerGetFromHasMistake(
@Query("params") params: Any, @Query("params") params: Any, @Query("schema") schema: String = "vn"
@Query("schema") schema: String = "vn"
): Call<List<WorkerFromMistake>> ): Call<List<WorkerFromMistake>>
@POST("Applications/sectorCollection_new/execute-proc") @POST("Applications/sectorCollection_new/execute-proc")
fun sectorCollectionNew( fun sectorCollectionNew(
@Query("params") params: Any, @Query("params") params: Any, @Query("schema") schema: String = "vn"
@Query("schema") schema: String = "vn"
): Call<Any> ): Call<Any>
@POST("Applications/ticketStateToday_setState/execute-proc") @POST("Applications/ticketStateToday_setState/execute-proc")
fun ticketStateTodaySetState( fun ticketStateTodaySetState(
@Query("params") params: Any, @Query("params") params: Any, @Query("schema") schema: String = "vn"
@Query("schema") schema: String = "vn"
): Call<Unit> ): Call<Unit>
@POST("Applications/ticket_isOutClosureZone/execute-func") @POST("Applications/ticket_isOutClosureZone/execute-func")
fun ticketIsOutClosureZone( fun ticketIsOutClosureZone(
@Query("params") params: Any, @Query("params") params: Any, @Query("schema") schema: String = "vn"
@Query("schema") schema: String = "vn"
): Call<Any?> ): Call<Any?>
@GET("TicketStates") @GET("TicketStates")
fun ticketState( fun ticketState(
@Query("filter") filter: Any, @Query("filter") filter: Any, @Query("schema") schema: String = "vn"
@Query("schema") schema: String = "vn"
): Call<List<TicketState>> ): Call<List<TicketState>>
@POST("Applications/workerMachinery_isRegistered/execute-func") @POST("Applications/workerMachinery_isRegistered/execute-func")
fun workerMachineryIsRegistered( fun workerMachineryIsRegistered(
@Query("params") params: Any, @Query("params") params: Any, @Query("schema") schema: String = "vn"
@Query("schema") schema: String = "vn"
): Call<String> ): Call<String>
@POST("Applications/ticket_printLabelPrevious/execute-proc") @POST("Applications/ticket_printLabelPrevious/execute-proc")
fun ticketPrintLabelPrevious( fun ticketPrintLabelPrevious(
@Query("params") params: Any, @Query("params") params: Any, @Query("schema") schema: String = "vn"
@Query("schema") schema: String = "vn"
): Call<Any> ): Call<Any>
@POST("Applications/deviceProductionUser_getWorker/execute-proc") @POST("Applications/deviceProductionUser_getWorker/execute-proc")
fun deviceProductionUserGetWorker( fun deviceProductionUserGetWorker(
@Query("params") params: Any, @Query("params") params: Any, @Query("schema") schema: String = "vn"
@Query("schema") schema: String = "vn"
): Call<List<JsonObject>> ): Call<List<JsonObject>>
@POST("Applications/device_checkLogin/execute-proc") @POST("Applications/device_checkLogin/execute-proc")
fun deviceCheckLogin( fun deviceCheckLogin(
@Query("params") params: Any, @Query("params") params: Any, @Query("schema") schema: String = "vn"
@Query("schema") schema: String = "vn"
): Call<List<LoginDevice>> ): Call<List<LoginDevice>>
@POST("Applications/collection_printSticker/execute-proc") @POST("Applications/collection_printSticker/execute-proc")
fun collectionStickerPrint( fun collectionStickerPrint(
@Query("params") params: Any, @Query("params") params: Any, @Query("schema") schema: String = "vn"
@Query("schema") schema: String = "vn"
): Call<Any> ): Call<Any>
@POST("Applications/itemShelving_add/execute-proc") @POST("Applications/itemShelving_add/execute-proc")
fun itemShelvingAdd( fun itemShelvingAdd(
@Query("params") params: Any, @Query("params") params: Any, @Query("schema") schema: String = "vn"
@Query("schema") schema: String = "vn"
): Call<Any> ): Call<Any>
@POST("Applications/itemShelvingSale_Add/execute-proc") @POST("Applications/itemShelvingSale_Add/execute-proc")
fun itemShelvingSaleAdd( fun itemShelvingSaleAdd(
@Query("params") params: Any, @Query("params") params: Any, @Query("schema") schema: String = "vn"
@Query("schema") schema: String = "vn"
): Call<Any> ): Call<Any>
@POST("Applications/itemShelving_selfConsumption/execute-proc") @POST("Applications/itemShelving_selfConsumption/execute-proc")
fun itemShelvingSelfConsumption( fun itemShelvingSelfConsumption(
@Query("params") params: Any, @Query("params") params: Any, @Query("schema") schema: String = "vn"
@Query("schema") schema: String = "vn"
): Call<Any> ): Call<Any>
@POST("Applications/itemShelving_addList/execute-proc") @POST("Applications/itemShelving_addList/execute-proc")
fun itemShelvingAddList( fun itemShelvingAddList(
@Query("params") params: Any, @Query("params") params: Any, @Query("schema") schema: String = "vn"
@Query("schema") schema: String = "vn"
): Call<Any> ): Call<Any>
@POST("Applications/itemShelving_transfer/execute-proc") @POST("Applications/itemShelving_transfer/execute-proc")
fun itemShelvingTransfer( fun itemShelvingTransfer(
@Query("params") params: Any, @Query("params") params: Any, @Query("schema") schema: String = "vn"
@Query("schema") schema: String = "vn"
): Call<Any> ): Call<Any>
@POST("Applications/itemShelving_addByClaim/execute-proc") @POST("Applications/itemShelving_addByClaim/execute-proc")
fun itemShelvingAddByClaim( fun itemShelvingAddByClaim(
@Query("params") params: Any, @Query("params") params: Any, @Query("schema") schema: String = "vn"
@Query("schema") schema: String = "vn"
): Call<Unit> ): Call<Unit>
@POST("Applications/itemShelving_filterBuyer/execute-proc") @POST("Applications/itemShelving_filterBuyer/execute-proc")
fun itemShelvingFilterBuyer( fun itemShelvingFilterBuyer(
@Query("params") params: Any, @Query("params") params: Any, @Query("schema") schema: String = "vn"
@Query("schema") schema: String = "vn"
): Call<List<ItemInventaryVO>> ): Call<List<ItemInventaryVO>>
@POST("Applications/itemShelving_getSaleDate/execute-proc") @POST("Applications/itemShelving_getSaleDate/execute-proc")
@ -744,8 +664,7 @@ interface SalixService {
fun itemShelvingGetItemDetails( fun itemShelvingGetItemDetails(
@Query("schema") schema: String = "vn", @Query("schema") schema: String = "vn",
@Query("params") params: Any, @Query("params") params: Any,
): ): Call<List<ItemDetails>>
Call<List<ItemDetails>>
@POST("Applications/expedition_getState/execute-proc") @POST("Applications/expedition_getState/execute-proc")
fun expeditionGetState( fun expeditionGetState(
@ -755,26 +674,22 @@ interface SalixService {
@POST("Applications/item_getSimilar/execute-proc") @POST("Applications/item_getSimilar/execute-proc")
fun getItemSimilar( fun getItemSimilar(
@Query("schema") schema: String = "vn", @Query("schema") schema: String = "vn", @Query("params") params: Any
@Query("params") params: Any
): Call<List<ItemProposal>> ): Call<List<ItemProposal>>
@POST("Applications/buy_updatePacking/execute-proc") @POST("Applications/buy_updatePacking/execute-proc")
fun updatePacking( fun updatePacking(
@Query("schema") schema: String = "vn", @Query("schema") schema: String = "vn", @Query("params") params: Any
@Query("params") params: Any
): Call<Any> ): Call<Any>
@POST("Applications/buy_updateGrouping/execute-proc") @POST("Applications/buy_updateGrouping/execute-proc")
fun updateGrouping( fun updateGrouping(
@Query("schema") schema: String = "vn", @Query("schema") schema: String = "vn", @Query("params") params: Any
@Query("params") params: Any
): Call<Any> ): Call<Any>
@POST("Applications/buffer_setTypeByName/execute-proc") @POST("Applications/buffer_setTypeByName/execute-proc")
fun bufferSetTypeByName( fun bufferSetTypeByName(
@Query("schema") schema: String = "srt", @Query("schema") schema: String = "srt", @Query("params") params: Any
@Query("params") params: Any
): Call<List<JsonObject>> ): Call<List<JsonObject>>
@GET("collections/getCollection") @GET("collections/getCollection")
@ -783,14 +698,12 @@ interface SalixService {
@POST("routes/{id}/driver-route-email") @POST("routes/{id}/driver-route-email")
fun driverRouteEmail( fun driverRouteEmail(
@Path("id") id: Number, @Path("id") id: Number, @Body params: Any
@Body params: Any
): Call<Any> ): Call<Any>
@POST("collections/{id}/getTickets") @POST("collections/{id}/getTickets")
fun getCollectionTickets( fun getCollectionTickets(
@Path("id") id: Number, @Path("id") id: Number, @Body params: Any
@Body params: Any
): Call<CollectionTicket> ): Call<CollectionTicket>
@POST("collections/setSaleQuantity") @POST("collections/setSaleQuantity")
@ -834,8 +747,7 @@ interface SalixService {
@Path("id") id: Number, @Path("id") id: Number,
@Query("item") item: Number, @Query("item") item: Number,
@Query("printedStickers") printedStickers: Number @Query("printedStickers") printedStickers: Number
): ): Call<EntrySalix>
Call<EntrySalix>
@GET("Departments") @GET("Departments")
fun departmentGetHasMistake( fun departmentGetHasMistake(
@ -864,8 +776,7 @@ interface SalixService {
@PATCH("Items/{itemFk}") @PATCH("Items/{itemFk}")
fun updateItem( fun updateItem(
@Path("itemFk") itemFk: Int, @Path("itemFk") itemFk: Int, @Body params: Any
@Body params: Any
): Call<Any> ): Call<Any>
@POST("Items/setVisibleDiscard") @POST("Items/setVisibleDiscard")
@ -875,8 +786,7 @@ interface SalixService {
@POST("Shelvings/upsertWithWhere") @POST("Shelvings/upsertWithWhere")
fun updateShelvingPriority( fun updateShelvingPriority(
@Query("where") where: Any, @Query("where") where: Any, @Body params: Any
@Body params: Any
): Call<Any> ): Call<Any>
//DE MOMENTO NO FUNCIONA, SE QUERÍA AÑADIR POR INSERTIGNORE //DE MOMENTO NO FUNCIONA, SE QUERÍA AÑADIR POR INSERTIGNORE
@ -912,8 +822,7 @@ interface SalixService {
@PATCH("RoadMaps/{id}") @PATCH("RoadMaps/{id}")
fun roadMapUpdate( fun roadMapUpdate(
@Path("id") id: Number, @Path("id") id: Number, @Body params: Any
@Body params: Any
): Call<Any> ): Call<Any>
@GET("RoadmapStops") @GET("RoadmapStops")
@ -923,14 +832,12 @@ interface SalixService {
@POST("Applications/expeditionPallet_List/execute-proc") @POST("Applications/expeditionPallet_List/execute-proc")
fun getStopMapTruckPalletList( fun getStopMapTruckPalletList(
@Query("params") params: Any? = null, @Query("params") params: Any? = null, @Query("schema") schema: String = "vn"
@Query("schema") schema: String = "vn"
): Call<List<StopMapTruckPallet>> ): Call<List<StopMapTruckPallet>>
@GET("RoadmapStops/getPalletMatchState") @GET("RoadmapStops/getPalletMatchState")
fun getPalletMatchState( fun getPalletMatchState(
@Query("truckFk") roadMapStopFk: Int, @Query("truckFk") roadMapStopFk: Int, @Query("state") state: String
@Query("state") state: String
): Call<List<StopMapTruckPallet>> ): Call<List<StopMapTruckPallet>>
@POST("PackingSiteAdvanceds") @POST("PackingSiteAdvanceds")
@ -963,21 +870,17 @@ interface SalixService {
@GET("Entries") @GET("Entries")
fun getEntriesFromSupplier( fun getEntriesFromSupplier(
@Query("filter") filter: String @Query("filter") filter: String
): ): Call<List<EntrySalix>>
Call<List<EntrySalix>>
@GET("Entries") @GET("Entries")
fun addEntry( fun addEntry(
@Body entry: EntrySalix @Body entry: EntrySalix
): ): Call<EntrySalix>
Call<EntrySalix>
@PATCH("Entries/{entryId}") @PATCH("Entries/{entryId}")
fun entryUpdateObserv( fun entryUpdateObserv(
@Path("entryId") entryId: Int, @Path("entryId") entryId: Int, @Body entry: ObervationEntry
@Body entry: ObervationEntry ): Call<EntrySalix>
):
Call<EntrySalix>
@GET("Shelvings") @GET("Shelvings")
fun shelvingsGet( fun shelvingsGet(
@ -1002,16 +905,14 @@ interface SalixService {
@POST("Entries/addFromPackaging") @POST("Entries/addFromPackaging")
fun addFromPackaging( fun addFromPackaging(
@Query("supplier") supplier: Number, @Query("supplier") supplier: Number, @Query("isTravelReception") isTravelReception: Boolean
@Query("isTravelReception") isTravelReception: Boolean
): Call<EntrySalix> ): Call<EntrySalix>
@POST("notificationQueues") @POST("notificationQueues")
fun notificationQueues( fun notificationQueues(
@Body notificationQueue: NotificationQueue @Body notificationQueue: NotificationQueue
): ): Call<Void>
Call<Void>
@POST("Images/upload") @POST("Images/upload")
@Multipart @Multipart
@ -1023,14 +924,12 @@ interface SalixService {
@PATCH("Operators/{id}") @PATCH("Operators/{id}")
fun updateOperator( fun updateOperator(
@Path("id") id: Number, @Path("id") id: Number, @Body params: Any
@Body params: Any
): Call<Unit> ): Call<Unit>
@GET("Operators/{id}") @GET("Operators/{id}")
fun operatorGetData( fun operatorGetData(
@Path("id") id: Number, @Path("id") id: Number, @Query("filter") filter: String
@Query("filter") filter: String
): Call<OperatorSalix> ): Call<OperatorSalix>
@GET("AccessTokenConfigs") @GET("AccessTokenConfigs")
@ -1043,20 +942,17 @@ interface SalixService {
@PATCH("ItemShelvings/{id}") @PATCH("ItemShelvings/{id}")
fun itemShelvingUpdate( fun itemShelvingUpdate(
@Path("id") id: Number, @Path("id") id: Number, @Body params: Any
@Body params: Any
): Call<ItemUbicador?> ): Call<ItemUbicador?>
@POST("ItemShelvings/update") @POST("ItemShelvings/update")
fun itemShelvingsUpdate( fun itemShelvingsUpdate(
@Query("where") where: Any, @Query("where") where: Any, @Body params: Any
@Body params: Any
): Call<Any> ): Call<Any>
@POST("TicketCollections/update") @POST("TicketCollections/update")
fun ticketCollectionUpdate( fun ticketCollectionUpdate(
@Query("where") filter: Any, @Query("where") filter: Any, @Body params: Any
@Body params: Any
): Call<Unit> ): Call<Unit>
@GET("TicketCollections") @GET("TicketCollections")
@ -1076,8 +972,7 @@ interface SalixService {
@PATCH("ItemShelvingSales/{id}") @PATCH("ItemShelvingSales/{id}")
fun itemShelvingsReservedUpdate( fun itemShelvingsReservedUpdate(
@Path("id") id: Number, @Path("id") id: Number, @Body params: Any
@Body params: Any
): Call<Any> ): Call<Any>
@POST("ItemShelvingSales/itemShelvingSale_addByCollection") @POST("ItemShelvingSales/itemShelvingSale_addByCollection")

12
app/src/main/java/es/verdnatura/presentation/view/feature/ajustes/adapter/AjustesAdapter.kt
View File

@ -45,21 +45,25 @@ class SettingsAdapter(
if (item.title == context!!.getString(R.string.closeSession)) { if (item.title == context!!.getString(R.string.closeSession)) {
binding.itemTitle.setTextColor( binding.itemTitle.setTextColor(
ContextCompat.getColor( ContextCompat.getColor(
context!!, context!!, R.color.verdnatura_pumpkin_orange
R.color.verdnatura_pumpkin_orange
) )
) )
} else { } else {
binding.itemTitle.setTextColor( binding.itemTitle.setTextColor(
ContextCompat.getColor( ContextCompat.getColor(
context!!, context!!, R.color.verdnatura_white
R.color.verdnatura_white
) )
) )
} }
if (!item.action) { if (!item.action) {
binding.itemImage.visibility = View.INVISIBLE binding.itemImage.visibility = View.INVISIBLE
} else {
if (item.title == binding.root.context.getString(R.string.runActivityStop)) binding.itemImage.setImageDrawable(
ContextCompat.getDrawable(
root.context, R.drawable.timer_stop
)
)
} }
} }
} }

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

@ -2,10 +2,12 @@ package es.verdnatura.presentation.view.feature.ajustes.fragment
import android.app.AlertDialog import android.app.AlertDialog
import android.graphics.Color import android.graphics.Color
import android.graphics.drawable.Drawable
import android.os.Bundle import android.os.Bundle
import android.view.View import android.view.View
import android.view.ViewGroup import android.view.ViewGroup
import android.widget.ArrayAdapter import android.widget.ArrayAdapter
import android.widget.ImageView
import android.widget.TextView import android.widget.TextView
import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.LinearLayoutManager
import es.verdnatura.R import es.verdnatura.R
@ -24,6 +26,8 @@ import es.verdnatura.domain.ConstAndValues.WAREHOUSEFK
import es.verdnatura.domain.notNull import es.verdnatura.domain.notNull
import es.verdnatura.presentation.base.BaseFragment import es.verdnatura.presentation.base.BaseFragment
import es.verdnatura.presentation.common.OnAjustesItemClickListener import es.verdnatura.presentation.common.OnAjustesItemClickListener
import es.verdnatura.presentation.common.OnOptionsSelectedListener
import es.verdnatura.presentation.common.ToolBarAdapterTooltip
import es.verdnatura.presentation.view.component.CustomDialog import es.verdnatura.presentation.view.component.CustomDialog
import es.verdnatura.presentation.view.feature.ajustes.adapter.SettingsAdapter import es.verdnatura.presentation.view.feature.ajustes.adapter.SettingsAdapter
import es.verdnatura.presentation.view.feature.ajustes.model.AjustesItemVO import es.verdnatura.presentation.view.feature.ajustes.model.AjustesItemVO
@ -33,6 +37,7 @@ import es.verdnatura.presentation.view.feature.ajustes.model.Train
import es.verdnatura.presentation.view.feature.articulo.model.ItemPackingType import es.verdnatura.presentation.view.feature.articulo.model.ItemPackingType
import es.verdnatura.presentation.view.feature.login.fragment.LoginViewModel import es.verdnatura.presentation.view.feature.login.fragment.LoginViewModel
import es.verdnatura.presentation.view.feature.pasillero.fragment.PasilleroViewModel import es.verdnatura.presentation.view.feature.pasillero.fragment.PasilleroViewModel
import es.verdnatura.presentation.view.feature.pasillero.model.CodeWorkerAction
import es.verdnatura.presentation.view.feature.pasillero.model.PasillerosItemVO import es.verdnatura.presentation.view.feature.pasillero.model.PasillerosItemVO
import kotlinx.coroutines.runBlocking import kotlinx.coroutines.runBlocking
@ -73,10 +78,50 @@ class AjustesFragment :
binding.androididText.text = binding.androididText.text =
mobileApplication.dataStoreApp.readDataStoreKey<String>(ANDROID_ID) mobileApplication.dataStoreApp.readDataStoreKey<String>(ANDROID_ID)
binding.serialNumber.text = mobileApplication.serialNumber binding.serialNumber.text = mobileApplication.serialNumber
pasilleroViewModel = PasilleroViewModel(mobileApplication)
setToolBar()
super.init() super.init()
} }
private fun setToolBar() {
val listIcons: ArrayList<ImageView> = ArrayList()
val iconInfo = ImageView(context)
iconInfo.setImageResource(R.drawable.ic_info_delivery)
listIcons.add(iconInfo)
binding.mainToolbar.toolbarIcons.adapter =
ToolBarAdapterTooltip(listIcons, object : OnOptionsSelectedListener {
override fun onOptionsItemSelected(item: Drawable) {
customDialog.setTitle(getString(R.string.info))
.setDescription(
getString(R.string.version) + ":\t" +
requireActivity().packageManager.getPackageInfo(
requireActivity().packageName, 0
).versionName!! + "\n" +
getString(R.string.user) + ":\t" +
mobileApplication.userName + "\n" +
getString(R.string.androidid) + ":\t" +
mobileApplication.dataStoreApp.readDataStoreKey<String>(
ANDROID_ID
) + "\n" +
if (mobileApplication.serialNumber != "") {
getString(R.string.serialNumber) + "\t" +
mobileApplication.serialNumber
} else ""
)
.setOkButton(getString(R.string.Close)) {
customDialog.dismiss()
}.show()
}
})
binding.mainToolbar.toolbarIcons.layoutManager =
LinearLayoutManager(requireContext(), LinearLayoutManager.HORIZONTAL, false)
}
override fun observeViewModel() { override fun observeViewModel() {
with(viewModel) { with(viewModel) {
@ -103,6 +148,9 @@ class AjustesFragment :
getString(R.string.menuByDefault) -> showMenuByDefault() getString(R.string.menuByDefault) -> showMenuByDefault()
getString(R.string.settingsTitleItemPacking) -> if (item.action) viewModel.getItemPackingTypeSalix() getString(R.string.settingsTitleItemPacking) -> if (item.action) viewModel.getItemPackingTypeSalix()
getString(R.string.settingsTitleTrain) -> if (item.action) viewModel.trainGet() getString(R.string.settingsTitleTrain) -> if (item.action) viewModel.trainGet()
getString(R.string.runActivityStop) -> pasilleroViewModel.workerActivityAdd(
CodeWorkerAction.STOP
)
else -> {} else -> {}
} }
@ -227,9 +275,7 @@ class AjustesFragment :
loginViewModel.operatorGetData(mobileApplication.userId!!) loginViewModel.operatorGetData(mobileApplication.userId!!)
} catch (_: Exception) { } catch (_: Exception) {
ma.messageWithSound( ma.messageWithSound(
message = getString(R.string.errorGetData), message = getString(R.string.errorGetData), isError = true, isPlayed = true
isError = true,
isPlayed = true
) )
} }
loginViewModel.workerOperator.observe(this@AjustesFragment) { iti -> loginViewModel.workerOperator.observe(this@AjustesFragment) { iti ->
@ -244,7 +290,7 @@ class AjustesFragment :
} }
private fun showMenuByDefault() { private fun showMenuByDefault() {
pasilleroViewModel = PasilleroViewModel(mobileApplication)
pasilleroViewModel.inititializeDefaultDataInit() pasilleroViewModel.inititializeDefaultDataInit()
val arrayList: ArrayList<String> = arrayListOf() val arrayList: ArrayList<String> = arrayListOf()
@ -428,8 +474,7 @@ class AjustesFragment :
PRINTERNAME, name PRINTERNAME, name
) )
mobileApplication.dataStoreApp.editDataStoreKey( mobileApplication.dataStoreApp.editDataStoreKey(
PRINTERFK, PRINTERFK, id
id
) )
} }
@ -449,10 +494,9 @@ class AjustesFragment :
private fun showWarningPrinter(name: String, id: Int) { private fun showWarningPrinter(name: String, id: Int) {
val customWarningPrinter = CustomDialog(requireContext()) val customWarningPrinter = CustomDialog(requireContext())
customWarningPrinter.setTitle(getString(R.string.confirm)) customWarningPrinter.setTitle(getString(R.string.confirm)).setDescription(
.setDescription( getString(R.string.selectPrinterEmergency)
getString(R.string.selectPrinterEmergency) )
)
.setOkButton(getString(R.string.yes)) { .setOkButton(getString(R.string.yes)) {
customWarningPrinter.dismiss() customWarningPrinter.dismiss()
@ -461,8 +505,7 @@ class AjustesFragment :
}.setKoButton(getString(R.string.no)) { }.setKoButton(getString(R.string.no)) {
customWarningPrinter.dismiss() customWarningPrinter.dismiss()
} }.show()
.show()
} }
} }

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

@ -70,26 +70,16 @@ class AjustesViewModel(val context: Context) : BaseViewModel(context) {
_settingsItem.clear() _settingsItem.clear()
_settingsItem.add( _settingsItem.add(
AjustesItemVO( AjustesItemVO(
0, context.getString(R.string.sector), sectorDescrip, sectorFk, action = true
context.getString(R.string.sector), )
sectorDescrip, )
sectorFk, _settingsItem.add(
action = true AjustesItemVO(
) context.getString(R.string.wagoons), wagoonDescrip, action = false
)
_settingsItem.add(
AjustesItemVO(
1,
context.getString(R.string.wagoons),
wagoonDescrip,
action = false
) )
) )
_settingsItem.add( _settingsItem.add(
AjustesItemVO( AjustesItemVO(
2,
context.getString(R.string.printerLabel), context.getString(R.string.printerLabel),
printerSelected, printerSelected,
printerFk = printerFk, printerFk = printerFk,
@ -99,56 +89,41 @@ class AjustesViewModel(val context: Context) : BaseViewModel(context) {
) )
_settingsItem.add( _settingsItem.add(
AjustesItemVO( AjustesItemVO(
6, context.getString(R.string.settingsTitleTrain), train, action = false
context.getString(R.string.settingsTitleTrain),
train,
action = false
) )
) )
_settingsItem.add( _settingsItem.add(
AjustesItemVO( AjustesItemVO(
7,
context.getString(R.string.settingsTitleItemPacking), context.getString(R.string.settingsTitleItemPacking),
itemPackingType, itemPackingType,
action = false action = false
) )
) )
_settingsItem.add( _settingsItem.add(
AjustesItemVO( AjustesItemVO(
4, context.getString(R.string.vehicleControl), action = true
context.getString(R.string.vehicleControl),
action = true
) )
) )
_settingsItem.add( _settingsItem.add(
AjustesItemVO( AjustesItemVO(
9, context.getString(R.string.menuByDefault), selected = menuDefault, action = true
context.getString(R.string.menuByDefault),
selected = menuDefault,
action = true
) )
) )
/* _ajustesitem.add(
AjustesItemVO(
9,
"Iniciar parada",
action = false
)
)*/
_settingsItem.add( _settingsItem.add(
AjustesItemVO( AjustesItemVO(
5, context.getString(R.string.runActivityStop), action = true
context.getString(R.string.closeSession), )
action = true )
_settingsItem.add(
AjustesItemVO(
context.getString(R.string.closeSession), action = true
) )
) )
} }
fun getItemPackingTypeSalix() { fun getItemPackingTypeSalix() {
salix.getItemPackingType().enqueue(object : salix.getItemPackingType().enqueue(object : SalixCallback<List<ItemPackingType>>(context) {
SalixCallback<List<ItemPackingType>>(context) {
override fun onSuccess(response: Response<List<ItemPackingType>>) { override fun onSuccess(response: Response<List<ItemPackingType>>) {
_itemspackinglist.value = response.body()?.let { ItemPackingTypeList(it) } _itemspackinglist.value = response.body()?.let { ItemPackingTypeList(it) }
@ -206,8 +181,7 @@ class AjustesViewModel(val context: Context) : BaseViewModel(context) {
fun operatorUpdate(workerId: Int, update: HashMap<String, String>) { fun operatorUpdate(workerId: Int, update: HashMap<String, String>) {
salix.updateOperator(id = workerId, params = update) salix.updateOperator(id = workerId, params = update)
.enqueue(object : SalixCallback<Unit>(context) { .enqueue(object : SalixCallback<Unit>(context) {})
})
} }
} }

1
app/src/main/java/es/verdnatura/presentation/view/feature/ajustes/model/AjustesItemVO.kt
View File

@ -3,7 +3,6 @@ package es.verdnatura.presentation.view.feature.ajustes.model
import es.verdnatura.presentation.view.feature.login.model.Sector import es.verdnatura.presentation.view.feature.login.model.Sector
class AjustesItemVO( class AjustesItemVO(
var id: Int,
var title: String = "", var title: String = "",
var selected: String? = null, var selected: String? = null,
var sectorFk: Int? = null, var sectorFk: Int? = null,

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

@ -107,6 +107,8 @@ import es.verdnatura.presentation.view.feature.paletizador.model.ItemExpeditionT
import es.verdnatura.presentation.view.feature.paletizador.model.ItemPalletVO import es.verdnatura.presentation.view.feature.paletizador.model.ItemPalletVO
import es.verdnatura.presentation.view.feature.parking.fragment.ParkingFragment import es.verdnatura.presentation.view.feature.parking.fragment.ParkingFragment
import es.verdnatura.presentation.view.feature.pasillero.fragment.PasilleroFragment import es.verdnatura.presentation.view.feature.pasillero.fragment.PasilleroFragment
import es.verdnatura.presentation.view.feature.pasillero.fragment.PasilleroViewModel
import es.verdnatura.presentation.view.feature.pasillero.model.CodeWorkerAction
import es.verdnatura.presentation.view.feature.pasillero.model.PasillerosItemVO import es.verdnatura.presentation.view.feature.pasillero.model.PasillerosItemVO
import es.verdnatura.presentation.view.feature.photos.fragment.PhotosFragment import es.verdnatura.presentation.view.feature.photos.fragment.PhotosFragment
import es.verdnatura.presentation.view.feature.precontrol.PreControladorFragment import es.verdnatura.presentation.view.feature.precontrol.PreControladorFragment
@ -160,7 +162,7 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), OnPasillerosItemClickL
private val _renewTokenResponse = MutableLiveData<RenewToken>() private val _renewTokenResponse = MutableLiveData<RenewToken>()
private lateinit var networkUtils: NetworkUtilsApp private lateinit var networkUtils: NetworkUtilsApp
private var myTimeUserInteraction = (System.currentTimeMillis() / 1000 / 3600) private var myTimeUserInteraction = (System.currentTimeMillis() / 1000 / 3600)
private lateinit var mainActivityViewmodel: MainActivityViewModel private lateinit var mainActivityPasilleroViewModel: PasilleroViewModel
private val backDispatcher = onBackPressedDispatcher private val backDispatcher = onBackPressedDispatcher
override fun getLayoutId(): Int = R.layout.activity_main override fun getLayoutId(): Int = R.layout.activity_main
@ -218,7 +220,7 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), OnPasillerosItemClickL
} }
private fun setViewModel() { private fun setViewModel() {
mainActivityViewmodel = MainActivityViewModel(application as MobileApplication) mainActivityPasilleroViewModel = PasilleroViewModel(application as MobileApplication)
} }
private fun printBluetooth() { private fun printBluetooth() {
@ -549,6 +551,7 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), OnPasillerosItemClickL
} }
getString(R.string.titleCorridors) -> { getString(R.string.titleCorridors) -> {
mainActivityPasilleroViewModel.workerActivityAdd(CodeWorkerAction.ON_PREPARATION)
addFragmentOnTop( addFragmentOnTop(
PasilleroFragment.newInstance(item.title, isInitMenu = false), PasilleroFragment.newInstance(item.title, isInitMenu = false),
) )
@ -790,7 +793,7 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), OnPasillerosItemClickL
} }
getString(R.string.titleDelivery) -> { getString(R.string.titleDelivery) -> {
mainActivityPasilleroViewModel.workerActivityAdd(CodeWorkerAction.DELIVERY)
addFragmentOnTop( addFragmentOnTop(
RoutesFragment.newInstance(getString(R.string.titleDeliveryRoute)), RoutesFragment.newInstance(getString(R.string.titleDeliveryRoute)),
getString(R.string.titleDeliverySummary) getString(R.string.titleDeliverySummary)
@ -915,6 +918,7 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), OnPasillerosItemClickL
currentFragment?.let { currentFragment?.let {
remove(it) remove(it)
} }
commit()
} }
} }
supportFragmentManager.beginTransaction().replace(R.id.main_frame_layout, fragment!!) supportFragmentManager.beginTransaction().replace(R.id.main_frame_layout, fragment!!)

44
app/src/main/java/es/verdnatura/presentation/view/feature/main/activity/MainActivityViewModel.kt
View File

@ -1,44 +0,0 @@
package es.verdnatura.presentation.view.feature.main.activity
import android.content.Context
import androidx.lifecycle.LiveData
import androidx.lifecycle.MutableLiveData
import es.verdnatura.domain.SalixCallback
import es.verdnatura.presentation.base.BaseViewModel
import es.verdnatura.presentation.common.ResponseItemVO
import es.verdnatura.presentation.view.feature.main.model.WorkerActionSalix
import retrofit2.Response
class MainActivityViewModel(var context: Context) : BaseViewModel(context) {
private val _response by lazy { MutableLiveData<ResponseItemVO>() }
val inventaryList: LiveData<ResponseItemVO>
get() = _response
fun workerActivityAdd(
workerActionSalix: WorkerActionSalix
) {
salix.workerActivityAdd(workerActionSalix)
.enqueue(object : SalixCallback<Any>(context) {
override fun onSuccess(response: Response<Any>) {
_response.value = ResponseItemVO(isError = false, response = response.message())
}
})
}
fun workerActivityList(
) {
salix.workerActivityList()
.enqueue(object : SalixCallback<Any>(context) {
override fun onSuccess(response: Response<Any>) {
_response.value = ResponseItemVO(isError = false, response = response.message())
}
})
}
}

12
app/src/main/java/es/verdnatura/presentation/view/feature/main/model/ItemMenuVO.kt
View File

@ -3,15 +3,5 @@ package es.verdnatura.presentation.view.feature.main.model
import android.graphics.drawable.Drawable import android.graphics.drawable.Drawable
data class ItemMenuVO( data class ItemMenuVO(
val id: Int, val id: Int, val title: String, val defaultImage: Drawable?, val selectedImage: Drawable?
val title: String,
val defaultImage: Drawable?,
val selectedImage: Drawable?
) )
data class WorkerActionSalix(
val workerFk:Int,
val workerActivityTypeFk:String,
val inTimed:String? = null,
val outTimed:String? = null
)

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

@ -2,11 +2,17 @@ package es.verdnatura.presentation.view.feature.pasillero.fragment
import android.annotation.SuppressLint import android.annotation.SuppressLint
import android.content.Context import android.content.Context
import androidx.lifecycle.LiveData
import androidx.lifecycle.MutableLiveData
import es.verdnatura.MobileApplication import es.verdnatura.MobileApplication
import es.verdnatura.R import es.verdnatura.R
import es.verdnatura.domain.ConstAndValues.RESERVATIONMODE import es.verdnatura.domain.ConstAndValues.RESERVATIONMODE
import es.verdnatura.domain.SalixCallback
import es.verdnatura.presentation.base.BaseViewModel import es.verdnatura.presentation.base.BaseViewModel
import es.verdnatura.presentation.common.ResponseItemVO
import es.verdnatura.presentation.view.feature.pasillero.model.CodeWorkerAction
import es.verdnatura.presentation.view.feature.pasillero.model.PasillerosItemVO import es.verdnatura.presentation.view.feature.pasillero.model.PasillerosItemVO
import retrofit2.Response
class PasilleroViewModel(context: Context) : BaseViewModel(context) { class PasilleroViewModel(context: Context) : BaseViewModel(context) {
@SuppressLint("StaticFieldLeak") @SuppressLint("StaticFieldLeak")
@ -15,11 +21,14 @@ class PasilleroViewModel(context: Context) : BaseViewModel(context) {
val pasillerositem: List<PasillerosItemVO> val pasillerositem: List<PasillerosItemVO>
get() = _pasillerositem get() = _pasillerositem
val userId = (contextApp as MobileApplication).userId val userId = (contextApp as MobileApplication).userId
val isOnReservationMode = private val isOnReservationMode =
(contextApp as MobileApplication).dataStoreApp.readDataStoreKey<Boolean>(RESERVATIONMODE) (contextApp as MobileApplication).dataStoreApp.readDataStoreKey<Boolean>(RESERVATIONMODE)
fun inititializeDefaultData() { private val _response by lazy { MutableLiveData<ResponseItemVO>() }
val inventaryList: LiveData<ResponseItemVO> get() = _response
fun inititializeDefaultData() {
workerActivityAdd(CodeWorkerAction.STORAGE)
_pasillerositem.add( _pasillerositem.add(
PasillerosItemVO( PasillerosItemVO(
0, 0,
@ -93,7 +102,6 @@ class PasilleroViewModel(context: Context) : BaseViewModel(context) {
) )
) )
) )
var userFK = (contextApp as MobileApplication).userId
/* _pasillerositem.add( /* _pasillerositem.add(
PasillerosItemVO( PasillerosItemVO(
@ -158,7 +166,7 @@ class PasilleroViewModel(context: Context) : BaseViewModel(context) {
} }
fun inititializeDefaultPallet() { fun inititializeDefaultPallet() {
workerActivityAdd(CodeWorkerAction.PALLETIZING)
_pasillerositem.add( _pasillerositem.add(
PasillerosItemVO( PasillerosItemVO(
30, 30,
@ -330,6 +338,7 @@ class PasilleroViewModel(context: Context) : BaseViewModel(context) {
} }
fun inititializeDefaultDataInit(pasillero: PasillerosItemVO? = null) { fun inititializeDefaultDataInit(pasillero: PasillerosItemVO? = null) {
workerActivityAdd(CodeWorkerAction.ON_PREPARATION)
val userId = (contextApp as MobileApplication).userId val userId = (contextApp as MobileApplication).userId
if (pasillero != null) { if (pasillero != null) {
_pasillerositem.add(pasillero) _pasillerositem.add(pasillero)
@ -495,7 +504,7 @@ class PasilleroViewModel(context: Context) : BaseViewModel(context) {
} }
fun inititializeDefaultClaim() { fun inititializeDefaultClaim() {
workerActivityAdd(CodeWorkerAction.CLAIM)
_pasillerositem.add( _pasillerositem.add(
PasillerosItemVO( PasillerosItemVO(
30, 30,
@ -524,7 +533,6 @@ class PasilleroViewModel(context: Context) : BaseViewModel(context) {
} }
fun inititializeDefaultDelivery() { fun inititializeDefaultDelivery() {
_pasillerositem.add( _pasillerositem.add(
PasillerosItemVO( PasillerosItemVO(
6, 6,
@ -552,6 +560,7 @@ class PasilleroViewModel(context: Context) : BaseViewModel(context) {
} }
fun inititializeDefaultPrevia() { fun inititializeDefaultPrevia() {
workerActivityAdd(CodeWorkerAction.PREVIOUS)
//lolass //lolass
if (isOnReservationMode) { if (isOnReservationMode) {
// if (userId == 19591 || userId == 18404 || userId == 9) { // if (userId == 19591 || userId == 18404 || userId == 9) {
@ -623,7 +632,7 @@ class PasilleroViewModel(context: Context) : BaseViewModel(context) {
} }
fun inititializeDefaultChecker() { fun inititializeDefaultChecker() {
workerActivityAdd(CodeWorkerAction.ON_CHECKING)
_pasillerositem.add( _pasillerositem.add(
PasillerosItemVO( PasillerosItemVO(
7, 7,
@ -743,4 +752,29 @@ class PasilleroViewModel(context: Context) : BaseViewModel(context) {
) )
} }
fun workerActivityAdd(
codeActivity: CodeWorkerAction
) {
//Tarea 6078
/* salix.workerActivityAdd(WorkerActionSalix(codeActivity.toString()))
.enqueue(object : SalixCallback<Any>(contextApp) {
override fun onSuccess(response: Response<Any>) {
}
})*/
}
fun workerActivityList(
) {
salix.workerActivityList().enqueue(object : SalixCallback<Any>(contextApp) {
override fun onSuccess(response: Response<Any>) {
_response.value = ResponseItemVO(isError = false, response = response.message())
}
})
}
} }

19
app/src/main/java/es/verdnatura/presentation/view/feature/pasillero/model/PasillerosItemVO.kt
View File

@ -1,5 +1,7 @@
package es.verdnatura.presentation.view.feature.pasillero.model package es.verdnatura.presentation.view.feature.pasillero.model
import es.verdnatura.domain.ConstAndValues
class PasillerosItemVO( class PasillerosItemVO(
var id: Int = 0, var id: Int = 0,
var iconResource: Int = 0, var iconResource: Int = 0,
@ -7,5 +9,20 @@ class PasillerosItemVO(
val titleToShow: Int = 0, val titleToShow: Int = 0,
val description: String = "" val description: String = ""
)
) data class WorkerActionSalix(
val code: String, val model: String = ConstAndValues.MODELWORKERTYPEACTIVITY
)
enum class CodeWorkerAction {
CLAIM,
DELIVERY,
ON_CHECKING,
ON_PREPARATION,
PREVIOUS,
PALLETIZING,
STOP,
STORAGE
}

86
app/src/main/res/layout/fragment_ajustes.xml
View File

@ -7,35 +7,68 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@color/verdnatura_black"> android:background="@color/verdnatura_black">
<!-- Toolbar en la parte superior -->
<include
android:id="@+id/main_toolbar"
layout="@layout/toolbar_fragment"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<!-- Divider debajo del toolbar -->
<View <View
android:id="@+id/divider" android:id="@+id/divider"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1dp" android:layout_height="1dp"
android:background="@color/verdnatura_white" android:background="@color/verdnatura_white"
app:layout_constraintBottom_toBottomOf="@+id/main_toolbar" /> app:layout_constraintTop_toBottomOf="@id/main_toolbar"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent" />
<!-- RecyclerView en la parte superior -->
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/setttings_items"
android:layout_width="0dp"
android:layout_height="wrap_content"
app:layout_constraintTop_toBottomOf="@id/divider"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintBottom_toTopOf="@id/scrollView"
app:layout_constraintVertical_bias="0"
/>
<!-- Contenedor de los demás datos debajo del RecyclerView -->
<ScrollView
android:id="@+id/scrollView"
android:layout_width="match_parent"
android:layout_height="0dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toBottomOf="@id/setttings_items"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent">
<LinearLayout <LinearLayout
android:id="@+id/linearLayout" android:id="@+id/linearLayout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/pasilleros_margin_main_menu"
android:orientation="vertical" android:orientation="vertical"
android:padding="@dimen/navigation_row_min_padding" android:padding="@dimen/navigation_row_min_padding"
android:visibility="visible" android:visibility="gone"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/divider"> app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/setttings_items"
>
<!-- Resto de los elementos, como versiones, usuarios, etc. -->
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal"> android:orientation="horizontal">
<TextView <TextView
android:layout_width="150dp" android:layout_width="150dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/default_layout_margin" android:layout_marginEnd="@dimen/default_layout_margin"
android:text="@string/Versión" android:text="@string/version"
android:textColor="@color/verdnatura_white" android:textColor="@color/verdnatura_white"
android:textSize="@dimen/body1" android:textSize="@dimen/body1"
android:textStyle="bold" /> android:textStyle="bold" />
@ -48,19 +81,17 @@
android:text="" android:text=""
android:textColor="@color/verdnatura_white" android:textColor="@color/verdnatura_white"
android:textSize="@dimen/body1" /> android:textSize="@dimen/body1" />
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal"> android:orientation="horizontal">
<TextView <TextView
android:layout_width="150dp" android:layout_width="150dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/default_layout_margin" android:layout_marginEnd="@dimen/default_layout_margin"
android:text="@string/Usuario" android:text="@string/user"
android:textColor="@color/verdnatura_white" android:textColor="@color/verdnatura_white"
android:textSize="@dimen/body1" android:textSize="@dimen/body1"
android:textStyle="bold" /> android:textStyle="bold" />
@ -73,13 +104,12 @@
android:text="" android:text=""
android:textColor="@color/verdnatura_white" android:textColor="@color/verdnatura_white"
android:textSize="@dimen/body1" /> android:textSize="@dimen/body1" />
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="wrap_content"
android:orientation="horizontal">
<TextView <TextView
android:layout_width="150dp" android:layout_width="150dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -92,7 +122,7 @@
<TextView <TextView
android:id="@+id/androidid_text" android:id="@+id/androidid_text"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/default_layout_margin" android:layout_marginStart="@dimen/default_layout_margin"
android:text="" android:text=""
android:textColor="@color/verdnatura_white" android:textColor="@color/verdnatura_white"
@ -103,8 +133,7 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:visibility="visible"> android:orientation="horizontal">
<TextView <TextView
android:layout_width="150dp" android:layout_width="150dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -117,32 +146,16 @@
<TextView <TextView
android:id="@+id/serial_number" android:id="@+id/serial_number"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/default_layout_margin" android:layout_marginStart="@dimen/default_layout_margin"
android:text="" android:text=""
android:textColor="@color/verdnatura_white" android:textColor="@color/verdnatura_white"
android:textSize="@dimen/body1" /> android:textSize="@dimen/body1" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
</ScrollView>
<include <!-- Splash progress en el centro de la pantalla -->
android:id="@+id/main_toolbar"
layout="@layout/toolbar_fragment"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/setttings_items"
android:layout_width="0dp"
android:layout_height="0dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.6"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/linearLayout" />
<LinearLayout <LinearLayout
android:id="@+id/splash_progress" android:id="@+id/splash_progress"
android:layout_width="0dp" android:layout_width="0dp"
@ -157,7 +170,6 @@
app:layout_constraintTop_toTopOf="parent"> app:layout_constraintTop_toTopOf="parent">
<com.airbnb.lottie.LottieAnimationView <com.airbnb.lottie.LottieAnimationView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="@dimen/verdnatura_logo_large_height" android:layout_height="@dimen/verdnatura_logo_large_height"
app:lottie_autoPlay="true" app:lottie_autoPlay="true"
@ -168,4 +180,4 @@
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
</layout> </layout>

2
app/src/main/res/layout/fragment_login.xml
View File

@ -75,7 +75,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_margin="8dp" android:layout_margin="8dp"
android:backgroundTint="@android:color/white" android:backgroundTint="@android:color/white"
android:hint="@string/Usuario" android:hint="@string/user"
android:inputType="text" android:inputType="text"
android:lines="1" android:lines="1"
android:maxLines="1" android:maxLines="1"

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

@ -27,8 +27,7 @@
<string name="Borrardatosdeacceso">Borrar datos de acceso</string> <string name="Borrardatosdeacceso">Borrar datos de acceso</string>
<string name="Bienvenido">Bienvenido</string> <string name="Bienvenido">Bienvenido</string>
<string name="Recordarusuarioycontraseña">Recordar usuario y contraseña</string> <string name="Recordarusuarioycontraseña">Recordar usuario y contraseña</string>
<string name="Versión">Versión</string> <string name="version">Versión</string>
<string name="Usuario">Usuario</string>
<string name="Escaneaetiqueta">Escanear etiqueta</string> <string name="Escaneaetiqueta">Escanear etiqueta</string>
<string name="Filtro">Filtro</string> <string name="Filtro">Filtro</string>
<string name="Nuevovalor">Nuevo Valor</string> <string name="Nuevovalor">Nuevo Valor</string>
@ -329,7 +328,7 @@
<string name="registerAdded">Registro añadido</string> <string name="registerAdded">Registro añadido</string>
<string name="keepPlate">\u0020 guardada con matrícula \u0020</string> <string name="keepPlate">\u0020 guardada con matrícula \u0020</string>
<string name="splitOk">Split ok</string> <string name="splitOk">Split ok</string>
<string name="user">Usuario:</string> <string name="user">Usuario</string>
<string name="warning">Aviso</string> <string name="warning">Aviso</string>
<string name="rocketKO">Error al enviar mensaje rocket.</string> <string name="rocketKO">Error al enviar mensaje rocket.</string>
<string name="historical">HISTÓRICO</string> <string name="historical">HISTÓRICO</string>
@ -855,5 +854,6 @@
<string name="errorUserId">No se podido obtener tu id. Vuelve a intentarlo</string> <string name="errorUserId">No se podido obtener tu id. Vuelve a intentarlo</string>
<string name="errorScanItem">Error al escanea el artículo. Inténtalo de nuevo</string> <string name="errorScanItem">Error al escanea el artículo. Inténtalo de nuevo</string>
<string name="errorSignActivity">Vuelve a pulsar para intentar firmar</string> <string name="errorSignActivity">Vuelve a pulsar para intentar firmar</string>
<string name="runActivityStop">Iniciar parada</string>
</resources> </resources>

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

@ -27,8 +27,7 @@
<string name="Borrardatosdeacceso">Borrar datos de acceso</string> <string name="Borrardatosdeacceso">Borrar datos de acceso</string>
<string name="Bienvenido">Bienvenido</string> <string name="Bienvenido">Bienvenido</string>
<string name="Recordarusuarioycontraseña">Recordar usuario y contraseña</string> <string name="Recordarusuarioycontraseña">Recordar usuario y contraseña</string>
<string name="Versión">Versión</string> <string name="version">Versión</string>
<string name="Usuario">Usuario</string>
<string name="Escaneaetiqueta">Escanear etiqueta</string> <string name="Escaneaetiqueta">Escanear etiqueta</string>
<string name="Filtro">Filtro</string> <string name="Filtro">Filtro</string>
<string name="Nuevovalor">Nuevo Valor</string> <string name="Nuevovalor">Nuevo Valor</string>
@ -329,7 +328,7 @@
<string name="registerAdded">Registro añadido</string> <string name="registerAdded">Registro añadido</string>
<string name="keepPlate">\u0020 guardada con matrícula \u0020</string> <string name="keepPlate">\u0020 guardada con matrícula \u0020</string>
<string name="splitOk">Split ok</string> <string name="splitOk">Split ok</string>
<string name="user">Usuario:</string> <string name="user">Usuario</string>
<string name="warning">Aviso</string> <string name="warning">Aviso</string>
<string name="rocketKO">Error al enviar mensaje rocket.</string> <string name="rocketKO">Error al enviar mensaje rocket.</string>
<string name="historical">HISTÓRICO</string> <string name="historical">HISTÓRICO</string>
@ -855,5 +854,6 @@
<string name="errorUserId">No se podido obtener tu id. Vuelve a intentarlo</string> <string name="errorUserId">No se podido obtener tu id. Vuelve a intentarlo</string>
<string name="errorScanItem">Error al escanea el artículo. Inténtalo de nuevo</string> <string name="errorScanItem">Error al escanea el artículo. Inténtalo de nuevo</string>
<string name="errorSignActivity">Vuelve a pulsar para intentar firmar</string> <string name="errorSignActivity">Vuelve a pulsar para intentar firmar</string>
<string name="runActivityStop">Iniciar parada</string>
</resources> </resources>

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

@ -27,8 +27,7 @@
<string name="Borrardatosdeacceso">Borrar datos de acceso</string> <string name="Borrardatosdeacceso">Borrar datos de acceso</string>
<string name="Bienvenido">Bienvenido</string> <string name="Bienvenido">Bienvenido</string>
<string name="Recordarusuarioycontraseña">Recordar usuario y contraseña</string> <string name="Recordarusuarioycontraseña">Recordar usuario y contraseña</string>
<string name="Versión">Versión</string> <string name="version">Versión</string>
<string name="Usuario">Usuario</string>
<string name="Escaneaetiqueta">Escanear etiqueta</string> <string name="Escaneaetiqueta">Escanear etiqueta</string>
<string name="Filtro">Filtro</string> <string name="Filtro">Filtro</string>
<string name="Nuevovalor">Nuevo Valor</string> <string name="Nuevovalor">Nuevo Valor</string>
@ -329,7 +328,7 @@
<string name="registerAdded">Registro añadido</string> <string name="registerAdded">Registro añadido</string>
<string name="keepPlate">\u0020 guardada con matrícula \u0020</string> <string name="keepPlate">\u0020 guardada con matrícula \u0020</string>
<string name="splitOk">Split ok</string> <string name="splitOk">Split ok</string>
<string name="user">Usuario:</string> <string name="user">Usuario</string>
<string name="warning">Aviso</string> <string name="warning">Aviso</string>
<string name="rocketKO">Error al enviar mensaje rocket.</string> <string name="rocketKO">Error al enviar mensaje rocket.</string>
<string name="historical">HISTÓRICO</string> <string name="historical">HISTÓRICO</string>
@ -855,5 +854,6 @@
<string name="errorUserId">No se podido obtener tu id. Vuelve a intentarlo</string> <string name="errorUserId">No se podido obtener tu id. Vuelve a intentarlo</string>
<string name="errorScanItem">Error al escanea el artículo. Inténtalo de nuevo</string> <string name="errorScanItem">Error al escanea el artículo. Inténtalo de nuevo</string>
<string name="errorSignActivity">Vuelve a pulsar para intentar firmar</string> <string name="errorSignActivity">Vuelve a pulsar para intentar firmar</string>
<string name="runActivityStop">Iniciar parada</string>
</resources> </resources>

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

@ -35,10 +35,9 @@
<string name="Recordarusuarioycontraseña">Remember username and password</string> <string name="Recordarusuarioycontraseña">Remember username and password</string>
<string name="saveSesion">Remember sesion data</string> <string name="saveSesion">Remember sesion data</string>
<string name="titleFaults">Foults</string> <string name="titleFaults">Foults</string>
<string name="Versión">Version</string> <string name="version">Version</string>
<string name="name">Company</string> <string name="name">Company</string>
<string name="nif">NIF</string> <string name="nif">NIF</string>
<string name="Usuario">User</string>
<string name="Escaneaetiqueta">Scan label</string> <string name="Escaneaetiqueta">Scan label</string>
<string name="Filtro">Filter</string> <string name="Filtro">Filter</string>
<string name="itemFilter">Item filter</string> <string name="itemFilter">Item filter</string>
@ -857,5 +856,6 @@
<string name="errorUserId">No se podido obtener tu id. Vuelve a intentarlo</string> <string name="errorUserId">No se podido obtener tu id. Vuelve a intentarlo</string>
<string name="errorScanItem">Error al escanea el artículo. Inténtalo de nuevo</string> <string name="errorScanItem">Error al escanea el artículo. Inténtalo de nuevo</string>
<string name="errorSignActivity">Vuelve a pulsar para intentar firmar</string> <string name="errorSignActivity">Vuelve a pulsar para intentar firmar</string>
<string name="runActivityStop">Iniciar parada</string>
</resources> </resources>