diff --git a/app/src/main/java/es/verdnatura/domain/SalixService.kt b/app/src/main/java/es/verdnatura/domain/SalixService.kt index 992307a5..05c7f92b 100644 --- a/app/src/main/java/es/verdnatura/domain/SalixService.kt +++ b/app/src/main/java/es/verdnatura/domain/SalixService.kt @@ -38,6 +38,7 @@ import es.verdnatura.presentation.view.feature.login.model.LoginApp import es.verdnatura.presentation.view.feature.login.model.LoginAppData import es.verdnatura.presentation.view.feature.login.model.LoginDevice import es.verdnatura.presentation.view.feature.login.model.LoginSalixVO +import es.verdnatura.presentation.view.feature.login.model.NameWorker 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.SalixGrupo @@ -169,6 +170,11 @@ interface SalixService { fun getRoutes( ): Call> + @GET("Workers/findOne") + fun getNameWorker( + @Query("filter") filter: String + ): Call + @POST("Applications/{routine}/execute-proc") fun executeProc( @Path("routine") routine: String, diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/controlvehiculo/fragment/ControlVehiculoUsuarioFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/controlvehiculo/fragment/ControlVehiculoUsuarioFragment.kt index 6bc1abd2..2f9ab21b 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/controlvehiculo/fragment/ControlVehiculoUsuarioFragment.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/controlvehiculo/fragment/ControlVehiculoUsuarioFragment.kt @@ -80,6 +80,7 @@ class ControlVehiculoUsuarioFragment( private fun setControlVehicleUser() { userFk = mobileApplication.userId!! + println("userFK $userFk") if (userFk == vUserFK) { val androidId: String = mobileApplication.dataStoreApp.readDataStoreKey(ANDROID_ID) @@ -96,6 +97,7 @@ class ControlVehiculoUsuarioFragment( binding.nameVehiclecontrol.visibility = INVISIBLE binding.userImage.setOnClickListener { binding.mainToolbar.backButton.performClick() } viewModel.machineGetWorkerPlate(mobileApplication.userId!!) + viewModel.getNameWorker(userFk) } binding.userImage.loadUrl( @@ -127,30 +129,29 @@ class ControlVehiculoUsuarioFragment( responsemachine.observe(viewLifecycleOwner) { - if (it.response == "false") { - if (it.type == "getWorker") { - binding.assignedDevicename.text = - getString(R.string.noAssigned) - } - } else { + if (it.response == "false") { + if (it.type == "getWorker") { + binding.assignedDevicename.text = + getString(R.string.noAssigned) + } + } else { - when (it.type) { - "getnameDevice" -> binding.deviceName.text = it.response - "getWorker" -> binding.assignedDevicename.text = - it.response - - "getWorkerPlate" -> binding.registeredVehiclecontrol.text = it.response - } + when (it.type) { + "getnameDevice" -> binding.deviceName.text = it.response + "getWorker" -> binding.assignedDevicename.text = + it.response + "getWorkerPlate" -> binding.registeredVehiclecontrol.text = it.response + } } } responseGetExtensionFromUserId.observe(viewLifecycleOwner) { - if (it!="") { + if (it != "") { ma.messageWithSound( - getString(R.string.noSIP) +"."+ getString(R.string.user) + vUserFK, + getString(R.string.noSIP) + "." + getString(R.string.user) + vUserFK, isError = true, true ) @@ -160,6 +161,16 @@ class ControlVehiculoUsuarioFragment( } } + responseGetName.observe(viewLifecycleOwner) { + binding.nameVehiclecontrol.text = + getString( + R.string.txtName, + it.firstName, + it.lastName + ) + binding.nameVehiclecontrol.visibility = VISIBLE + + } } diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/controlvehiculo/fragment/ControlVehiculoViewModel.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/controlvehiculo/fragment/ControlVehiculoViewModel.kt index c51ac4e3..1e11c3ac 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/controlvehiculo/fragment/ControlVehiculoViewModel.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/controlvehiculo/fragment/ControlVehiculoViewModel.kt @@ -13,6 +13,7 @@ import es.verdnatura.presentation.base.getMessageFromAllResponse import es.verdnatura.presentation.base.nameofFunction import es.verdnatura.presentation.common.ResponseItemMachineControl import es.verdnatura.presentation.view.feature.controlvehiculo.fragment.model.DeviceId +import es.verdnatura.presentation.view.feature.login.model.NameWorker import org.json.JSONObject import retrofit2.Response @@ -33,6 +34,9 @@ class ControlVehiculoViewModel(val context: Context) : BaseViewModel(context) { private val _responseGetExtensionFromUserId by lazy { MutableLiveData() } val responseGetExtensionFromUserId: LiveData get() = _responseGetExtensionFromUserId + + private val _responseGetName by lazy { MutableLiveData() } + val responseGetName: LiveData = _responseGetName fun machineWorkerUpdate( plate: String ) { @@ -188,6 +192,24 @@ class ControlVehiculoViewModel(val context: Context) : BaseViewModel(context) { }) } + fun getNameWorker( + workerId: Int + ) { + salix.getNameWorker( + """{"fields": ["firstName","lastName"],"where": {"id":$workerId}}""" + ).enqueue(object : SalixCallback(context) { + + override fun onSuccess(response: Response) { + _responseGetName.value = response.body() + } + + override fun onError(t: Throwable) { + + } + }) + + } + fun sipGetExtensionSalix( workerId: Int ) { diff --git a/app/src/main/res/layout/fragment_vehiclecontrol_user.xml b/app/src/main/res/layout/fragment_vehiclecontrol_user.xml index 9627cf6c..4466f3f2 100644 --- a/app/src/main/res/layout/fragment_vehiclecontrol_user.xml +++ b/app/src/main/res/layout/fragment_vehiclecontrol_user.xml @@ -32,6 +32,7 @@ android:layout_marginTop="@dimen/toolbar_height" android:hint="@string/nameUser" android:textColor="@color/verdnatura_white" + android:gravity="center" android:textSize="@dimen/h5" android:textStyle="bold" /> diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 080e75ad..4b430275 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -834,5 +834,6 @@ Revisar sacado por cajas Hoy quedan por salir %1$x unidades Error al introducir cantidad + %1$s %2$s diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index fc73d1a0..922550b2 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -834,5 +834,6 @@ Revisar sacado por cajas Hoy quedan por salir %1$x unidades Error al introducir cantidad + %1$s %2$s diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 2a2d3b70..8c7295e0 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -834,5 +834,6 @@ Revisar sacado por cajas Hoy quedan por salir %1$x unidades Error al introducir cantidad + %1$s %2$s diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index ecaa6648..4cc20323 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -836,5 +836,6 @@ Revisar sacado por cajas Hoy quedan por salir %1$x unidades Error al introducir cantidad + %1$s %2$s