From c9d7978519180feb27d1904e9438e9f91067eb94 Mon Sep 17 00:00:00 2001 From: Sergio De la torre Date: Thu, 9 Nov 2023 15:49:21 +0100 Subject: [PATCH] refs #5870 feat:operatorSalix --- .../fragment/CollectionFragmentPicker.kt | 49 +----- .../feature/login/fragment/LoginFragment.kt | 88 ++++------ .../feature/login/fragment/LoginViewModel.kt | 164 +++++++----------- .../view/feature/login/model/LoginItemVO.kt | 16 +- 4 files changed, 107 insertions(+), 210 deletions(-) diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragmentPicker.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragmentPicker.kt index 542d48c1..e867188a 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragmentPicker.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragmentPicker.kt @@ -2478,47 +2478,16 @@ class CollectionFragmentPicker( customDialogThreeButtons.setDescription(getString(R.string.txtnuevacantidad)) .setValue("") - //Tarea4495 - // if (type != SACADOR) { - /* customDialogThreeButtons.setOkButton(getString(R.string.titleFaults)) { - checkAndCall( - position, - customDialogThreeButtons.getValue(), - getString(R.string.titleFaults) - ) - - }.setOkButtonTwo(getString(R.string.BasuraRechazar)) { - - checkAndCall( - position, - customDialogThreeButtons.getValue(), - getString(R.string.BasuraRechazar) - ) - } - // } - - customDialogThreeButtons.setOkButtonThree(getString(R.string.Reject)) { - checkAndCall( - position, - customDialogThreeButtons.getValue(), - getString(R.string.Reject) - ) - - }.setOkButtonFour(getString(R.string.Split)) { - checkAndCall( - position, - customDialogThreeButtons.getValue(), - getString(R.string.Split) - )*/ - - .setOkButtonAdd(getString(R.string.Agregar)) { - /* checkAndCall( - position, - customDialogThreeButtons.getValue(), - getString(R.string.Agregar) - )*/ - increaseQuantity(position, customDialogThreeButtons.getValue().toInt()) + + try { + increaseQuantity(position, customDialogThreeButtons.getValue().toInt()) + } catch (ex: Exception) { + getString(R.string.errorInput).toast(requireContext()) + } + + + scanRequest() customDialogThreeButtons.dismiss() 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 2593dbf4..dce69086 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 @@ -1,7 +1,5 @@ package es.verdnatura.presentation.view.feature.login.fragment -//import es.verdnatura.presentation.view.feature.login.model.LoginItemVO - import android.annotation.SuppressLint import android.content.Intent import android.content.SharedPreferences @@ -11,6 +9,7 @@ import android.net.Uri import android.os.Build import android.os.Environment import android.provider.Settings +import android.util.Log.d import android.view.View import androidx.annotation.RequiresApi import androidx.lifecycle.Observer @@ -122,7 +121,7 @@ class LoginFragment(var imageUri: Uri?) : //saveData("SERIALNUMBER", file.readText()) mobileApplication.serialNumber = file.readText() } catch (ex: Exception) { - "" + d("VERDNATURA:",getString(R.string.errorFile)) } } @@ -186,8 +185,6 @@ class LoginFragment(var imageUri: Uri?) : .hideDialog() .setOkButton(getString(R.string.cancel)) { customDialogList.dismiss() - // customNewForm.dismiss() - // customDialog.dismiss() } .show() @@ -199,7 +196,7 @@ class LoginFragment(var imageUri: Uri?) : val AndroidId: String = Settings.Secure.getString(requireActivity().contentResolver, Settings.Secure.ANDROID_ID) - mobileApplication.androidId = AndroidId + mobileApplication.androidId = AndroidId saveData(ANDROID_ID, AndroidId) } @@ -323,17 +320,17 @@ class LoginFragment(var imageUri: Uri?) : .setOkButton(getString(R.string.close)) { customDialog.dismiss() binding.splashProgress.visibility = View.GONE - // goToMain() }.show() } else { //sergio: se añade el log - viewModel.getCurrentUserData( getString(R.string.logAppName), + viewModel.getCurrentUserData( + getString(R.string.logAppName), getInfoVersionNameApp(), - getData(ANDROID_ID)) + getData(ANDROID_ID) + ) viewModel.worker_getSector() viewModel.worker_getPrinter() - //viewModel.operator_getDataSalix("{\"where\": {\"workerFk\":${getDataInt(USERFK)}}}") if (binding.switchRemember.isChecked) { saveRemember(true) @@ -341,19 +338,18 @@ class LoginFragment(var imageUri: Uri?) : saveRemember(false) } - if (it.vIsAuthorized == "1" && it.vMessage.isNullOrEmpty()) { + if (it.vIsAuthorized == "1") { - getVersion() - - } - if (it.vIsAuthorized == "1" && !it.vMessage.isNullOrEmpty()) { - //binding.splashProgress.visibility = View.GONE - customDialog.setTitle(getString(R.string.info)) - .setDescription(it.vMessage) - .setOkButton(getString(R.string.close)) { - customDialog.dismiss() - getVersion() - }.show() + if (it.vMessage.isNullOrEmpty()) { + getVersion() + } else { + customDialog.setTitle(getString(R.string.info)) + .setDescription(it.vMessage) + .setOkButton(getString(R.string.close)) { + customDialog.dismiss() + getVersion() + }.show() + } } @@ -368,6 +364,14 @@ class LoginFragment(var imageUri: Uri?) : saveUserFkPref(it.Id.toString()) } } + //Tarea 5870 + workerOperator.observe(viewLifecycleOwner) { + if (!it.isError) { + + }else{ + + } + } operatorAdd.observe(viewLifecycleOwner) { if (it.isError) { @@ -427,35 +431,7 @@ class LoginFragment(var imageUri: Uri?) : } } - - /* loadOperatorList.observe(viewLifecycleOwner, Observer { event -> - //binding.splashProgress.visibility = View.GONE - - event.getContentIfNotHandled().notNull { - - if (it.list.isEmpty()) { - "No se han podido obtener datos de Salix".toast(context) - removePrinter() - - } else { - if (!it.list.get(0).isError) { - saveDataInt(NUMBEROFWAGONS, it.list[0].numberOfWagons) - saveDataInt(PRINTERFK, it.list[0].labelerFk!!) - saveDataInt(TRAINFK, it.list[0].trainFk) - saveData(ITEMPACKINGFK, it.list[0].itemPackingTypeFk) - - //saveData(PRINTERNAME, it.list.get(0).name) - } else { - it.list.get(0).errorMessage.toast(context) - } - } - } - - })*/ - - loadWorkerPrintList.observe(viewLifecycleOwner, Observer { event -> - //binding.splashProgress.visibility = View.GONE event.getContentIfNotHandled().notNull { @@ -465,8 +441,8 @@ class LoginFragment(var imageUri: Uri?) : } else { if (!it.list.get(0).isError) { - saveDataInt(PRINTERFK, it.list.get(0).id!!) - saveData(PRINTERNAME, it.list.get(0).name) + saveDataInt(PRINTERFK, it.list[0].id) + saveData(PRINTERNAME, it.list[0].name) } else { it.list.get(0).errorMessage.toast(context) } @@ -476,8 +452,6 @@ class LoginFragment(var imageUri: Uri?) : }) - - loginsalixitem.observe(viewLifecycleOwner) { if (it.isError) { @@ -514,7 +488,7 @@ class LoginFragment(var imageUri: Uri?) : //Tarea 5613 viewModel.getAccessTokenConfigs() - //viewModel.operator_add() + viewModel.operator_add() } } @@ -528,9 +502,7 @@ class LoginFragment(var imageUri: Uri?) : } else { if (!it.list[0].isError) { - /* app.renewPeriod = it.list[0].renewPeriod!! - app.renewInterval = it.list[0].renewInterval!!*/ - saveDataLong("renewPeriod", it.list[0].renewPeriod!!) + saveDataLong("renewPeriod", it.list[0].renewPeriod) saveDataLong("renewInterval", it.list[0].renewInterval) viewModel.operator_add() } else { 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 84654653..bed91fc3 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 @@ -75,6 +75,11 @@ class LoginViewModel(val context: Context) : BaseViewModel(context) { private val _workerPrintList by lazy { MutableLiveData() } private val _workerOperatorList by lazy { MutableLiveData() } + + private val _workerOperator by lazy { MutableLiveData() } + val workerOperator: LiveData + get() = _workerOperator + private val _accessConfigSalixList by lazy { MutableLiveData() } private val _renewTokenResponse by lazy { MutableLiveData() } @@ -180,28 +185,41 @@ class LoginViewModel(val context: Context) : BaseViewModel(context) { }) } - fun getCurrentUserData(appName: String, versionApp: String, android_id: String, serialnumber: String? =null) { + fun getCurrentUserData( + appName: String, + versionApp: String, + android_id: String, + serialnumber: String? = null + ) { 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 } - deviceLog_addSalix(app = appName, versionApp= versionApp,android_id= android_id, userFk = app.userId!!, serialnumber = serialnumber) + deviceLog_addSalix( + app = appName, + versionApp = versionApp, + android_id = android_id, + userFk = app.userId!!, + serialnumber = serialnumber + ) + //Tarea 5870 + //operator_getDataSalix(app.userId!!) } }) } -/* fun deviceLog_add( - app: String, versionApp: String, android_id: String, userFk :Int - ) { - //Tarea 4815 - salix.deviceLogInsert(DeviceLogSalix(android_id = android_id,nameApp= app,versionApp= versionApp, serialNumber = null, userFk = userFk)) + /* fun deviceLog_add( + app: String, versionApp: String, android_id: String, userFk :Int + ) { + //Tarea 4815 + salix.deviceLogInsert(DeviceLogSalix(android_id = android_id,nameApp= app,versionApp= versionApp, serialNumber = null, userFk = userFk)) - .enqueue(object : SilexCallback(context) { - override fun onSuccess(response: Response) { - } - }) + .enqueue(object : SilexCallback(context) { + override fun onSuccess(response: Response) { + } + }) - }*/ + }*/ fun deviceLog_addSalix( app: String, versionApp: String, android_id: String, userFk: Int, serialnumber: String? @@ -271,68 +289,10 @@ class LoginViewModel(val context: Context) : BaseViewModel(context) { }) } - /* fun nodeJsTest(smarttag: String, wagon: String, shelving: String) - { - getLoginUserCase.nodeJsTest(smarttag, wagon, shelving) - .enqueue(object : Callback - { - override fun onResponse( - call: Call, - response: Response - ) - { - - - val workerId: NodeJsService.SmartTagNode? - - *//* if (response.isSuccessful()){ - //Log.i("VERDNATURA::","OK") - } - - if (!response.errorBody().toString().isEmpty()){ - - }*//* - - if (response.body() != null) - { - - workerId = NodeJsService.SmartTagNode( - response.body().toString(), - isError = false, - errorMessage = "" - ) - - } else - { - workerId = NodeJsService.SmartTagNode( - isError = true, - errorMessage = "Error al llamar al servicio Node." - ) - } - - _nodejs.value = workerId - } - - override fun onFailure(call: Call, t: Throwable) - { - val workerId = - NodeJsService.SmartTagNode(isError = true, errorMessage = t.message!!) - - //Log.i("VERDNATURA::","el error nodejs es "+t.message+"--"+t.cause.toString()+"--"+t.stackTrace.toString()) - - _nodejs.value = workerId - } - - }) - }*/ - fun getListFromJSON(json: JsonObject): MutableList { val gson = Gson() - var list = mutableListOf() - - // val mapType = object : TypeToken>() {}.type - - var expeditionState: Map = + val list = mutableListOf() + val expeditionState: Map = gson.fromJson(json, object : TypeToken>() {}.type) expeditionState.forEach { @@ -383,14 +343,14 @@ class LoginViewModel(val context: Context) : BaseViewModel(context) { } override fun onSuccess(response: Response) { - _operatorGetNumberOfWagons.value = - ResponseItemNumber( - if (response.body() is Number) { - ((response.body() as Double).roundToInt()) - } else { - 0 - }, isError = false - ) + _operatorGetNumberOfWagons.value = + ResponseItemNumber( + if (response.body() is Number) { + ((response.body() as Double).roundToInt()) + } else { + 0 + }, isError = false + ) } }) } @@ -460,36 +420,32 @@ class LoginViewModel(val context: Context) : BaseViewModel(context) { }) } - fun operator_getDataSalix( - workerId: String - ) { - salix.operator_getData(workerId) - .enqueue(object : SilexCallback>(context) { + //Tarea 5870 + fun operator_getDataSalix( + workerId: Int + ) { + val filter = + """{"fields":["itemPackingTypeFk","numberOfWagons","sectorFk","trainFk","labelerFk"],"include":[{"relation":"sector","scope":{"fields":["description","warehouseFk"]}}]}""" + salix.operator_getData(id = workerId, filter) + .enqueue(object : SilexCallback(context) { override fun onError(t: Throwable) { - val listError: ArrayList = ArrayList() - listError.add( - OperatorSalix( - isError = true, - errorMessage = getMessageFromAllResponse( - nameofFunction(this), - t.message!! - ) + + _workerOperator.value = OperatorSalix( + isError = true, + errorMessage = getMessageFromAllResponse( + nameofFunction(this), + t.message!! ) ) - _workerOperatorList.value = OperatorList(listError) } - override fun onSuccess(response: Response>) { + override fun onSuccess(response: Response) { if (response.body() != null) { - _workerOperatorList.value = response.body()?.let { - OperatorList(it) - } - + _workerOperator.value = response.body() } else { - val listError: ArrayList = ArrayList() - listError.add( + _workerOperator.value = response.body()?.let { OperatorSalix( isError = true, errorMessage = getMessageFromAllResponse( @@ -497,9 +453,7 @@ class LoginViewModel(val context: Context) : BaseViewModel(context) { response.message() ) ) - ) - _workerOperatorList.value = OperatorList(listError) - + } } } @@ -560,7 +514,7 @@ class LoginViewModel(val context: Context) : BaseViewModel(context) { override fun onSuccess(response: Response) { - var RenewToken = response.body() + val RenewToken = response.body() val prefs = app.getPrefsEditor() prefs.putString("token", RenewToken!!.id) prefs.putLong("ttl", RenewToken!!.ttl) 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 1d42b128..e60af052 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 @@ -38,18 +38,20 @@ class SalixGrupo( val message: String = "" ) - +//Tarea 5870 class OperatorSalix( - val workerFk: Int = 0, - val sectorFk: Int = 0, - val labelerFk: Int = 0, + val sector: Sector? = null, + val train: Train? = null, + val labeller: Printer? = null, val numberOfWagons: Int = 0, - val trainFk: Int = 0, - val warehouseFk: Int = 0, - var itemPackingTypeFk: String = "", + var itemPackingTypeFk: String? = null, val isError: Boolean = false, var errorMessage: String = "" ) +data class Sector (val id:Int, val description:String,val warehouseFk:Int) +data class Printer(val id:Int, val name:String) +data class Train(val name:String) + class accessConfigSalix( val id: Number = 0,