diff --git a/app/src/main/java/es/verdnatura/domain/SalixService.kt b/app/src/main/java/es/verdnatura/domain/SalixService.kt index bf9e6056..8f146ec1 100644 --- a/app/src/main/java/es/verdnatura/domain/SalixService.kt +++ b/app/src/main/java/es/verdnatura/domain/SalixService.kt @@ -9,6 +9,7 @@ import es.verdnatura.presentation.view.feature.articulo.model.ItemPackingType import es.verdnatura.presentation.view.feature.collection.SalixSaleQuantity import es.verdnatura.presentation.view.feature.collection.listSaleSalix import es.verdnatura.presentation.view.feature.historicoshelvinglog.model.ShelvingLogSalix +import es.verdnatura.presentation.view.feature.login.model.DataUserSalix import es.verdnatura.presentation.view.feature.login.model.LoginSalixVO import es.verdnatura.presentation.view.feature.login.model.OperatorSalix import es.verdnatura.presentation.view.feature.login.model.RenewToken @@ -31,6 +32,11 @@ interface SalixService { ): Call + @GET("VnUsers/getCurrentUserData") + fun getCurrentUserData( + ): + Call + /* @POST("chats/sendCheckingPresence") fun sendChekingPresence( @Body params: SalixMessageVO diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/ajustes/fragment/AjustesFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/ajustes/fragment/AjustesFragment.kt index e48e9625..ac490f1b 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/ajustes/fragment/AjustesFragment.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/ajustes/fragment/AjustesFragment.kt @@ -142,7 +142,7 @@ class AjustesFragment : ma.onPasillerosItemClickListener( PasillerosItemVO( title = getString(R.string.titleUserControlVehicle) - ), getDataInt(USERFK).toString() + ), mobileApplication.userId.toString() ) } else if (item.id == 6) { @@ -416,7 +416,7 @@ class AjustesFragment : editor.apply() viewModel.ajustesitem.get(2).selected = it.name - viewModel.worker_updateOperatorSalix("printer",getDataInt(USERFK),getDataInt(SECTORFK),it.id!!) + viewModel.worker_updateOperatorSalix("printer",mobileApplication.userId!!,getDataInt(SECTORFK),it.id!!) ajustesAdapter!!.notifyDataSetChanged() ajustesAdapter @@ -484,7 +484,7 @@ class AjustesFragment : viewModel.ajustesitem.get(0).warehouse = it.warehouseFk viewModel.ajustesitem.get(0).selected = it.description - viewModel.worker_updateOperatorSalix("sector",getDataInt(USERFK),it.id,null) + viewModel.worker_updateOperatorSalix("sector",mobileApplication.userId!!,it.id,null) ajustesAdapter!!.notifyDataSetChanged() 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 16b2e772..d5ab6175 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 @@ -83,7 +83,8 @@ class ControlVehiculoUsuarioFragment( } private fun setControlVehicleUser() { - userFk = getDataInt(USERFK) + + userFk = mobileApplication.userId!! if (userFk == vUserFK.toInt()) { binding.splashProgress.visibility = VISIBLE diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/fragments/InfoFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/fragments/InfoFragment.kt index 092b1cd9..ec897ae8 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/fragments/InfoFragment.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/fragments/InfoFragment.kt @@ -19,8 +19,8 @@ class InfoFragment(var title: String) : binding.mainToolbar.toolbarTitle.text = title ma.hideBottomNavigation(View.GONE) binding.splashProgress.visibility = View.VISIBLE - viewModel.getInfoCompany(getDataInt(USERFK)) - viewModel.getInfoFreelance(getDataInt(USERFK)) + viewModel.getInfoCompany(mobileApplication.userId!!) + viewModel.getInfoFreelance(mobileApplication.userId!!) setEvents() } diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/login/fragment/LoginFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/login/fragment/LoginFragment.kt index de18d721..3440ab4d 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/login/fragment/LoginFragment.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/login/fragment/LoginFragment.kt @@ -323,7 +323,7 @@ class LoginFragment(var imageUri: Uri?) : } else { //sergio: se aƱade el log - viewModel.worker_getId() + viewModel.getCurrentUserData() viewModel.worker_getSector() viewModel.worker_getPrinter() //viewModel.operator_getDataSalix("{\"where\": {\"workerFk\":${getDataInt(USERFK)}}}") @@ -585,7 +585,7 @@ class LoginFragment(var imageUri: Uri?) : } private fun goToMain() { - setupFirebase((requireActivity().application as MobileApplication).userId.toString()) + setupFirebase((requireActivity().application as MobileApplication).userName.toString()) val intent = Intent(activity, MainActivity::class.java) intent.data = imageUri startActivity(intent) diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/login/fragment/LoginViewModel.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/login/fragment/LoginViewModel.kt index f906f8c3..4932c1c8 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/login/fragment/LoginViewModel.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/login/fragment/LoginViewModel.kt @@ -17,6 +17,7 @@ import es.verdnatura.presentation.common.ResponseItemVO import es.verdnatura.presentation.view.feature.ajustes.model.Printers import es.verdnatura.presentation.view.feature.ajustes.model.SectorItemVO import es.verdnatura.presentation.view.feature.ajustes.model.WorkerPrintersList +import es.verdnatura.presentation.view.feature.login.model.DataUserSalix 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.OperatorList @@ -189,6 +190,16 @@ class LoginViewModel(val context: Context) : BaseViewModel(context) { }) } + fun getCurrentUserData() { + salix.getCurrentUserData().enqueue(object : SilexCallback(context) { + override fun onSuccess(response: Response) { + app.userName = response.body()?.let { it.nickname } + app.userId = response.body()?.let { it.id } + } + + }) + } + fun deviceLog_add( app: String, versionApp: String, android_id: String ) { diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/login/model/LoginItemVO.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/login/model/LoginItemVO.kt index d8cc0efb..1d42b128 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/login/model/LoginItemVO.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/login/model/LoginItemVO.kt @@ -9,8 +9,17 @@ class LoginSalixVO( var isError: Boolean = false, var errorMessage: String = "" ) + +class DataUserSalix( + val id: Int? = null, + val name: String = "", + val nickname: String = "", + var isError: Boolean = false, + var errorMessage: String = "" +) + class RenewToken( - val id:String, + val id: String, val ttl: Long = 0, var isError: Boolean = false, var errorMessage: String = "" diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/ticket/fragment/TicketAdvanceFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/ticket/fragment/TicketAdvanceFragment.kt index 71f4309b..07fa618c 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/ticket/fragment/TicketAdvanceFragment.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/ticket/fragment/TicketAdvanceFragment.kt @@ -46,7 +46,7 @@ class TicketAdvanceFragment(var title: String) : viewModel.ticket_advancePackaging( binding.scanInput.text.toString().toInt(), - getDataInt(USERFK) + mobileApplication.userId!! ) } catch (ex: Exception) { getString(R.string.ticketFormatError)