diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml new file mode 100644 index 00000000..bbf7051a --- /dev/null +++ b/.idea/deploymentTargetDropDown.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 1cb33005..f89fdd1d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,6 +1,5 @@ apply plugin: 'com.android.application' apply plugin: 'kotlin-android' -//apply plugin: 'kotlin-android-extensions'//deprecated:sergio apply plugin: 'kotlin-kapt' apply plugin: 'com.google.gms.google-services' //apply plugin: 'com.google.firebase.crashlytics' diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json index db082180..4f3f2be8 100644 --- a/app/release/output-metadata.json +++ b/app/release/output-metadata.json @@ -11,8 +11,8 @@ "type": "SINGLE", "filters": [], "attributes": [], - "versionCode": 117, - "versionName": "8.4Beta", + "versionCode": 118, + "versionName": "8.4.1Beta", "outputFile": "app-release.apk" } ], diff --git a/app/release/vn-pickingBeta.apk b/app/release/vn-pickingBeta.apk index 7580bb6c..b3da2e89 100644 Binary files a/app/release/vn-pickingBeta.apk and b/app/release/vn-pickingBeta.apk differ diff --git a/app/src/main/java/es/verdnatura/domain/ApiSalixUtils.kt b/app/src/main/java/es/verdnatura/domain/ApiSalixUtils.kt index 36fb52ba..a4047c7b 100644 --- a/app/src/main/java/es/verdnatura/domain/ApiSalixUtils.kt +++ b/app/src/main/java/es/verdnatura/domain/ApiSalixUtils.kt @@ -1,5 +1,8 @@ package es.verdnatura.domain +import android.content.Context +import android.util.Log.d +import androidx.preference.PreferenceManager import retrofit2.Retrofit import retrofit2.converter.gson.GsonConverterFactory @@ -8,11 +11,30 @@ class ApiSalixUtils { //const val BASE_URL:String = "http://192.168.1.155:9009/" //const val BASE_URL: String = "https://test-salix.verdnatura.es/api/" const val BASE_URL: String = "https://salix.verdnatura.es/api/" - fun getApiService(): SalixService { - val salixRetrofit = Retrofit.Builder().baseUrl(BASE_URL).addConverterFactory( + + fun getApiService(context: Context): SalixService { + val salixRetrofit = Retrofit.Builder().baseUrl(getBaseUrlLocal(context = context)).addConverterFactory( GsonConverterFactory.create() ).build() + d("VERDNATURA::","El server Salix es "+getBaseUrlLocal(context = context)) return salixRetrofit.create(SalixService::class.java) } + + fun getBaseUrlLocal(context: Context): String { + var url = this.getDefaults("base_urlSalix", context) + if (url.isNullOrEmpty()) { + ApiUtils.setDefaults("base_urlSalix", ApiSalixUtils.BASE_URL, context) + } else { + if (!url.contains("http")) { + url = "https://" + url + } + } + return if (url.isNullOrEmpty()) ApiSalixUtils.BASE_URL else url + } + + fun getDefaults(key: String?, context: Context?): String? { + val preferences = PreferenceManager.getDefaultSharedPreferences(context) + return preferences.getString(key, null) + } } } \ No newline at end of file diff --git a/app/src/main/java/es/verdnatura/domain/GetDayOfSaleUSerCase.kt b/app/src/main/java/es/verdnatura/domain/GetDayOfSaleUSerCase.kt index ef620a6a..a51cfb73 100644 --- a/app/src/main/java/es/verdnatura/domain/GetDayOfSaleUSerCase.kt +++ b/app/src/main/java/es/verdnatura/domain/GetDayOfSaleUSerCase.kt @@ -50,7 +50,7 @@ class GetDayOfSaleUSerCase(context: Context) : RestClient(context) { password: String, shelving: String, parking: String - ): Call { + ): Call { val params: ArrayList = ArrayList() params.add(shelving) params.add(parking) diff --git a/app/src/main/java/es/verdnatura/domain/GetUbicadorUserCase.kt b/app/src/main/java/es/verdnatura/domain/GetUbicadorUserCase.kt index ee255dd8..b37cc395 100644 --- a/app/src/main/java/es/verdnatura/domain/GetUbicadorUserCase.kt +++ b/app/src/main/java/es/verdnatura/domain/GetUbicadorUserCase.kt @@ -129,7 +129,7 @@ class GetUbicadorUserCase(context: Context) : RestClient(context) { password: String, shelving: String, parking: String - ): Call { + ): Call { val params: ArrayList = ArrayList() params.add(shelving) params.add(parking) diff --git a/app/src/main/java/es/verdnatura/domain/RestClient.kt b/app/src/main/java/es/verdnatura/domain/RestClient.kt index 0b6e285a..2520e91e 100644 --- a/app/src/main/java/es/verdnatura/domain/RestClient.kt +++ b/app/src/main/java/es/verdnatura/domain/RestClient.kt @@ -9,7 +9,7 @@ open class RestClient(context: Context) { init { restClient = ApiUtils.getApiService(context) - salixClient = ApiSalixUtils.getApiService() + salixClient = ApiSalixUtils.getApiService(context) nodejsClient = ApiNodeJsUtils.getApiService() } diff --git a/app/src/main/java/es/verdnatura/domain/VerdnaturaService.kt b/app/src/main/java/es/verdnatura/domain/VerdnaturaService.kt index 96a5a310..4b6d6422 100644 --- a/app/src/main/java/es/verdnatura/domain/VerdnaturaService.kt +++ b/app/src/main/java/es/verdnatura/domain/VerdnaturaService.kt @@ -1011,7 +1011,7 @@ interface VerdnaturaService { @Header("Content-Type") content_type: String, @Body params: List ): - Call + Call @POST("almacennew/shelvingChange")//REVISADA fun shelvingChange( diff --git a/app/src/main/java/es/verdnatura/presentation/base/BaseFragment.kt b/app/src/main/java/es/verdnatura/presentation/base/BaseFragment.kt index a073ce38..3504d89f 100644 --- a/app/src/main/java/es/verdnatura/presentation/base/BaseFragment.kt +++ b/app/src/main/java/es/verdnatura/presentation/base/BaseFragment.kt @@ -249,6 +249,11 @@ override fun onViewCreated(view: View, savedInstanceState: Bundle?) R.drawable.alpha_b_circle_outline->getString(R.string.showTrash) R.drawable.filter_outline->getString(R.string.filterFlower) + + R.drawable.ic_mode_edit_black_24dp->getString(R.string.allowChangeShelving) + R.drawable.ic_delete_forever_black_24dp->getString(R.string.deleteAllitems) + R.drawable.ic_flash_auto_black_24dp->getString(R.string.allowAutomaticAddItem) + else -> {""} } @@ -364,7 +369,7 @@ override fun onViewCreated(view: View, savedInstanceState: Bundle?) val listo = getMatch(text, "listo") //check for cancelar - val cancelar = getMatch(text, "cancelar") + val cancelar = getMatch(text, getString(R.string.cancel)) //check for volver val volver = getMatch(text, "volver") @@ -575,6 +580,12 @@ override fun onViewCreated(view: View, savedInstanceState: Bundle?) editorPref.commit() } + "base_urlSalix"->{ + val preferences = PreferenceManager.getDefaultSharedPreferences(context) + val editorPref = preferences.edit() + editorPref.putString("base_urlSalix", value) + editorPref.commit() + } else -> { editor.putString(name, value) diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/fragment/ItemCardFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/fragment/ItemCardFragment.kt index 4b89f752..84204d15 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/fragment/ItemCardFragment.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/fragment/ItemCardFragment.kt @@ -179,7 +179,7 @@ class ItemCardFragment( this.itemFk = itemFk binding.splashProgressTwo.visibility = View.VISIBLE - viewModel.getItemCard(itemFk, warehouseFk, user, password, "item_card") + viewModel.getItemCard(itemFk, warehouseFk, user, password) binding.splashProgress.visibility = View.VISIBLE @@ -409,12 +409,12 @@ class ItemCardFragment( if (item.action != "toBarcode" && item.action != "buscarItem" && item.action != "itemStockUpdateAdd" && item.action != "itemStockUpdateRemove") { customDialogInput.setTitle(item.title!!) .setDescription("Valor actual: " + item.value!!) - .setOkButton("Guardar") { + .setOkButton(getString(R.string.save)) { ma.hideKeyboard(customDialogInput.getEditText()) editItemCardRow(item, customDialogInput.getValue()) customDialogInput.dismiss() - }.setKoButton("Cancelar") { + }.setKoButton(getString(R.string.cancel)) { ma.hideKeyboard(customDialogInput.getEditText()) customDialogInput.dismiss() }.setValue("").show() @@ -443,12 +443,12 @@ class ItemCardFragment( } else if (item.action == "itemStockUpdateAdd") { customDialogInput.setTitle(item.title!!) .setDescription("Indica la cantidad a dar de alta") - .setOkButton("Guardar") { + .setOkButton(getString(R.string.save)) { ma.hideKeyboard(customDialogInput.getEditText()) editItemCardRow(item, customDialogInput.getValue()) customDialogInput.dismiss() - }.setKoButton("Cancelar") { + }.setKoButton(getString(R.string.cancel)) { ma.hideKeyboard(customDialogInput.getEditText()) customDialogInput.dismiss() }.setValue("").show() @@ -468,12 +468,12 @@ class ItemCardFragment( } else if (item.action == "itemStockUpdateRemove") { customDialogInput.setTitle(item.title!!) .setDescription("Indica la cantidad a dar de baja ") - .setOkButton("Guardar") { + .setOkButton(getString(R.string.save)) { ma.hideKeyboard(customDialogInput.getEditText()) editItemCardRow(item, customDialogInput.getValue()) customDialogInput.dismiss() - }.setKoButton("Cancelar") { + }.setKoButton(getString(R.string.cancel)) { ma.hideKeyboard(customDialogInput.getEditText()) customDialogInput.dismiss() }.setValue("").show() @@ -530,30 +530,26 @@ class ItemCardFragment( user = user, password = password, value = value, - warehouseFk = warehouseFk, - "buy_updateGrouping" + warehouseFk = warehouseFk ) "updatePacking" -> viewModel.updatePacking( itemFk = itemFk, user = user, password = password, value = value, - warehouseFk = warehouseFk, - "buy_updatePacking" + warehouseFk = warehouseFk ) "itemSaveMin" -> viewModel.itemSaveMin( itemFk = itemFk, user = user, password = password, - value = value, - "itemSaveMin" + value = value ) "item_saveReference" -> viewModel.item_saveReference( itemFk = itemFk, user = user, password = password, - value = value, - "item_saveReference" + value = value ) @@ -603,7 +599,7 @@ class ItemCardFragment( changeOfflineValue(itemB,value, listBarcodes) customDialogTwo.dismiss() - }.setKoButton("Cancelar"){ + }.setKoButton(getString(R.string.cancel)){ customDialogTwo.dismiss() }.show() @@ -613,7 +609,7 @@ class ItemCardFragment( } }catch (e:Exception){ binding.itemcardLayout.visibility = View.GONE - customDialog.setTitle(getString(R.string.error)).setDescription("El elemento introducido no es un número").setKoButton("Cancelar"){ + customDialog.setTitle(getString(R.string.error)).setDescription("El elemento introducido no es un número").setKoButton(getString(R.string.cancel)){ customDialog.dismiss() }.show() } @@ -654,7 +650,7 @@ class ItemCardFragment( showProgress() customDialogTwo.dismiss() - }.setKoButton("Cancelar") { + }.setKoButton(getString(R.string.cancel)) { customDialogTwo.dismiss() }.show() @@ -680,7 +676,7 @@ class ItemCardFragment( private fun prepareBarcodeDialog(itemB: ItemCardRowVO) { - customDialogList.setTitle("Barcodes").setOkButton("Guardar") { + customDialogList.setTitle("Barcodes").setOkButton(getString(R.string.save)) { ma.hideKeyboard(customDialogList.getEditText()) if (!customDialogList.getValue().isNullOrEmpty()) updateBarcode(customDialogList.getValue(), "0", itemB) diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/fragment/ItemCardViewModel.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/fragment/ItemCardViewModel.kt index 169b6ead..8e742479 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/fragment/ItemCardViewModel.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/fragment/ItemCardViewModel.kt @@ -40,8 +40,8 @@ class ItemCardViewModel(context: Context) : BaseViewModel() { itemFk: String, warehouseFk: String, user: String, - password: String, - callFunction: String + password: String + ) { getItemCardUserCase.getItemCard(user, password, itemFk, warehouseFk) .enqueue(object : Callback { @@ -80,8 +80,7 @@ class ItemCardViewModel(context: Context) : BaseViewModel() { vShipped: String, vIsShowedByType: String, user: String, - password: String, - callFunction: String + password: String ) { getItemCardUserCase.item_getSimilar( user, @@ -286,8 +285,8 @@ class ItemCardViewModel(context: Context) : BaseViewModel() { user: String, password: String, value: String, - warehouseFk: String, - callFunction: String + warehouseFk: String + ) { getItemCardUserCase.updateGrouping(user, password, itemFk, value, warehouseFk) .enqueue(object : Callback { @@ -322,8 +321,8 @@ class ItemCardViewModel(context: Context) : BaseViewModel() { user: String, password: String, value: String, - warehouseFk: String, - callFunction: String + warehouseFk: String + ) { getItemCardUserCase.updatePacking(user, password, itemFk, value, warehouseFk) .enqueue(object : Callback { @@ -406,8 +405,8 @@ class ItemCardViewModel(context: Context) : BaseViewModel() { itemFk: String, user: String, password: String, - value: String, - callFunction: String + value: String + ) { getItemCardUserCase.itemSaveMin(user, password, itemFk, value) .enqueue(object : Callback { @@ -441,8 +440,8 @@ class ItemCardViewModel(context: Context) : BaseViewModel() { itemFk: String, user: String, password: String, - value: String, - callFunction: String + value: String + ) { getItemCardUserCase.item_saveReference(user, password, itemFk, value) .enqueue(object : Callback { diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/fragment/ItemProposalFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/fragment/ItemProposalFragment.kt index c1375b35..df78d10d 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/fragment/ItemProposalFragment.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/fragment/ItemProposalFragment.kt @@ -53,7 +53,7 @@ class ItemProposalFragment( vShipped = currentDay(), vIsShowedByType = filter, user = getData(USER), - password = getData(PASSWORD),"item_getSimilar" + password = getData(PASSWORD) ) super.onCreate(savedInstanceState) } @@ -105,8 +105,8 @@ class ItemProposalFragment( vIsShowedByType = filter, vShipped = currentDay(), user = getData(USER), - password = getData(PASSWORD) , - callFunction = "item_getSimilar") + password = getData(PASSWORD) + ) } diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragment.kt index 86d7e76a..f5699ec9 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragment.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragment.kt @@ -119,8 +119,8 @@ class CollectionFragment( viewModel.ticket_checkFullyControlled( getData(USER), getData(PASSWORD), - collection.collectionFk, - "ticket_checkFullyControlled" + collection.collectionFk + ) workerFkFromTicket = collection.tickets.get(0).sales.get(0).workerFk } @@ -132,8 +132,7 @@ class CollectionFragment( getData(PASSWORD), collection.collectionFk, getData(SECTORFK), - type, - "collection_getTickets" + type ) } @@ -252,7 +251,7 @@ class CollectionFragment( /* var working_in_test = true // sergio: en proves app if (working_in_test) {*/ - viewModel.sip_getExtensionSalix(getData(TOKEN), workerFkFromTicket, "sip_getExtension") + viewModel.sip_getExtensionSalix(getData(TOKEN), workerFkFromTicket) /* } else { viewModel.sip_getExtension( getData(USER), @@ -322,7 +321,7 @@ class CollectionFragment( getData(PASSWORD), collection.collectionFk, getData(SECTORFK), - type, "collection_getTickets" + type ) binding.collectionSwipe.isRefreshing = false //} @@ -367,7 +366,7 @@ class CollectionFragment( } } else { customDialog.setTitle(getString(R.string.error)).setDescription(it.errorMessage) - .setOkButton("Aceptar") { + .setOkButton(getString(R.string.accept)) { customDialog.dismiss() if (activity != null) requireActivity().onBackPressed() }.show() @@ -380,12 +379,24 @@ class CollectionFragment( if (!goBack) { ma.messageWithSound( - if (it.isError) it.errorMessage else "Baldas guardadas", + if (it.isError) it.errorMessage else getString(R.string.savedShelves), it.isError, true ) } }) + responseParking.observe(viewLifecycleOwner, Observer { + binding.splashProgress.visibility = GONE + + if (!goBack) { + ma.messageWithSound( + if (it.isError) it.errorMessage else getString(R.string.Aparcado), + it.isError, true + ) + } + + }) + responsePrint.observe(viewLifecycleOwner, Observer { binding.splashProgress.visibility = GONE @@ -430,8 +441,7 @@ class CollectionFragment( getData(PASSWORD), collection.collectionFk, getData(SECTORFK), - type, - "collection_getTickets" + type ) } @@ -450,8 +460,7 @@ class CollectionFragment( getData(PASSWORD), collection.collectionFk, getData(SECTORFK), - type, - "collection_getTickets" + type ) } }) @@ -494,8 +503,7 @@ class CollectionFragment( getData(PASSWORD), collection.collectionFk, getData(SECTORFK), - type, "collection_getTickets" - ) + type) // //Log.i("VERDNATURA:","La collection es ${collection.collectionFk}") } @@ -612,7 +620,7 @@ class CollectionFragment( if (it.isError) { ma.messageWithSound(it.errorMessage, it.isError, false) /*customDialog.setTitle(getString(R.string.error)).setDescription(it.errorMessage) - .setOkButton("Aceptar") { + .setOkButton(getString(R.string.accept)) { customDialog.dismiss() }.show()*/ } else { @@ -621,7 +629,7 @@ class CollectionFragment( customDialog.setTitle("Aviso") .setDescription("Pendiente de revisar : " + it.response) - .setOkButton("Aceptar") { + .setOkButton(getString(R.string.accept)) { customDialog.dismiss() } @@ -632,8 +640,7 @@ class CollectionFragment( getData(PASSWORD), it.response, getData(SECTORFK), - type, - "collection_getTickets" + type ) customDialog.dismiss() } @@ -662,7 +669,7 @@ class CollectionFragment( getData(PASSWORD), collection.collectionFk, getData(SECTORFK), - type, "collection_getTickets" + type ) goBack = false @@ -702,7 +709,7 @@ class CollectionFragment( } /*customDialog.setTitle(getString(R.string.error)).setDescription(it.errorMessage) - .setOkButton("Aceptar") { + .setOkButton(getString(R.string.accept)) { customDialog.dismiss() }.show()*/ } @@ -941,7 +948,7 @@ class CollectionFragment( private fun printObservations(observations: String) { if (observations.trim().isNotEmpty()) { customDialog.setTitle("Observaciones").setDescription(observations) - .setOkButton("Aceptar") { + .setOkButton(getString(R.string.accept)) { customDialog.hide() customDialog.dismiss() }.show() @@ -969,8 +976,7 @@ class CollectionFragment( viewModel.saleTracking_add( getData(USER), getData(PASSWORD), - txtscan, - "saleTracking_add" + txtscan ) if ((isOk) && mpok != null) { mpok!!.start() @@ -1026,13 +1032,12 @@ class CollectionFragment( getData(USER), getData(PASSWORD), ticketFk = tickets[0], - parking = txtscan, - "shelvingPark" + parking = txtscan ) } Timber.i("La coleccion es " + tickets[0]) - if (mpok != null) mpok!!.start() - "Ticket aparcado".toast(requireContext()) + /* if (mpok != null) mpok!!.start() + "Ticket aparcado".toast(requireContext())*/ } else { if (mperror != null) mperror!!.start() } @@ -1070,12 +1075,11 @@ class CollectionFragment( getData(USER), getData(PASSWORD), ticketFk = tickets[0], - parking = txtscan, - "shelvingPark" + parking = txtscan ) } - if (mpok != null) mpok!!.start() - getString(R.string.Ticketaparcado).toast(requireContext()) + /* if (mpok != null) mpok!!.start() + getString(R.string.Ticketaparcado).toast(requireContext())*/ } else { if (binding.splashProgress != null) binding.splashProgress.visibility = View.VISIBLE @@ -1088,16 +1092,15 @@ class CollectionFragment( getData(PASSWORD), txtscan, getData(SECTORFK), - type, - "collection_getTickets" + type ) if (type.equals(CONTROLADOR)) { viewModel.ticket_checkFullyControlled( getData(USER), getData(PASSWORD), - txtscan, - "ticket_checkFullyControlled" + txtscan + ) } // } else { @@ -1155,12 +1158,11 @@ class CollectionFragment( getData(USER), getData(PASSWORD), ticketFk = it, - parking = txtscan, - "shelvingPark" + parking = txtscan ) } - if (mpok != null) mpok!!.start() - "Ticket aparcado".toast(requireContext()) + /* if (mpok != null) mpok!!.start() + "Ticket aparcado".toast(requireContext())*/ } else { if (mperror != null) mperror!!.start() @@ -1238,8 +1240,8 @@ class CollectionFragment( vIsChecked = if (type == SACADOR) sales[position].isPrepared else if (type == CONTROLADOR) sales[position].isControlled else if (type == "PRECHECKER") sales[position].isPreControlled else "1", vOriginalQuantity = sales[position].pickedQuantity, vStateFk = if (type == CONTROLADOR) "CHECKED" else if (type == "PRECHECKER") "PREVIOUS_CONTROL" else type,//type.toString(), - vBuyFk = originalItemScan, - callFunction = "saleTrackingReplace" + vBuyFk = originalItemScan + ) } @@ -1262,8 +1264,7 @@ class CollectionFragment( getData(USER), getData(PASSWORD), sales[position].saleFk, - sales[position].quantity, - "" + sales[position].quantity ) positionUnmarked = position @@ -1279,7 +1280,7 @@ class CollectionFragment( setTotalLines() scanRequest() customDialog.dismiss() - }.setKoButton("Cancelar") { + }.setKoButton(getString(R.string.cancel)) { scanRequest() customDialog.dismiss() }.show() @@ -1304,8 +1305,8 @@ class CollectionFragment( getData(PASSWORD), itemFk = sales[position].itemFk, quantity = quantityGet, - shelvingFk = sales[position].placements[shelvingPosition].shelving, - callFunction = "itemPlacementSupplyAiming" + shelvingFk = sales[position].placements[shelvingPosition].shelving + ) } @@ -1521,8 +1522,7 @@ class CollectionFragment( getData(PASSWORD), collection.collectionFk, getData(SECTORFK), - type, - "collection_getTickets" + type ) } @@ -1610,8 +1610,7 @@ class CollectionFragment( getData(USER), getData(PASSWORD), collectionFk = collection.collectionFk, - sectorFk = getData(SECTORFK), - "collectionStickerPrint" + sectorFk = getData(SECTORFK) ) (getString(R.string.Imprimiendo) + getData(PRINTERNAME)).toast(requireContext()) } else { @@ -1772,7 +1771,7 @@ class CollectionFragment( scanRequest() customDialogInput.dismiss() - }.setKoButton("Cancelar") { + }.setKoButton(getString(R.string.cancel)) { if (binding.splashProgress != null) { binding.splashProgress.visibility = View.GONE } @@ -1808,7 +1807,7 @@ class CollectionFragment( } customDialog.setTitle("Artículo: " + item.id) - .setDescription("Disponible: " + item.available).setOkButton("Aceptar") { + .setDescription("Disponible: " + item.available).setOkButton(getString(R.string.accept)) { scanRequest() customDialog.dismiss() }.show() @@ -1875,7 +1874,7 @@ class CollectionFragment( customDialogInput.setTitle("Número de baldas del ticket") .setDescription("Indica el número de baldas que ocupa el ticket") - .setOkButton("Aceptar") { + .setOkButton(getString(R.string.accept)) { if (!customDialogInput.getValue().isNullOrEmpty()) { binding.splashProgress.visibility = VISIBLE @@ -1883,8 +1882,7 @@ class CollectionFragment( getData(USER), getData(PASSWORD), ticketFk = collection.collectionFk, - usedShelves = customDialogInput.getValue(), - "ticketCollection_setUsedShelves" + usedShelves = customDialogInput.getValue() ) hideKeyboards() // showKeyboards() @@ -1895,7 +1893,7 @@ class CollectionFragment( showKeyboards() //hideKeyboards() //showKeyboards() - }.setKoButton("Cancelar") { + }.setKoButton(getString(R.string.cancel)) { customDialogInput.dismiss() // hideKeyboards() showKeyboards() @@ -1915,8 +1913,7 @@ class CollectionFragment( getData(USER), getData(PASSWORD), ticketFk = collection.collectionFk, - usedShelves = customDialogInput.getValue(), - "ticketCollection_setUsedShelves" + usedShelves = customDialogInput.getValue() ) hideKeyboards() } @@ -1941,7 +1938,7 @@ class CollectionFragment( isMarking = false customDialogInput.setTitle("Número de paquetes en balda") .setDescription("Indica el número de paquetes que caben en una balda") - .setOkButton("Aceptar") { + .setOkButton(getString(R.string.accept)) { if (!customDialogInput.getValue().isNullOrEmpty()) { binding.splashProgress.visibility = VISIBLE @@ -1949,8 +1946,7 @@ class CollectionFragment( getData(USER), getData(PASSWORD), vSelf = itemFk, - vPacking = customDialogInput.getValue(), - "item_updatePackingShelve" + vPacking = customDialogInput.getValue() ) hideKeyboards() //showKeyboards() @@ -1960,7 +1956,7 @@ class CollectionFragment( customDialogInput.dismiss() // hideKeyboards() showKeyboards() - }.setKoButton("Cancelar") { + }.setKoButton(getString(R.string.cancel)) { customDialogInput.dismiss() //hideKeyboards() @@ -1981,8 +1977,7 @@ class CollectionFragment( getData(USER), getData(PASSWORD), ticketFk = collection.collectionFk, - usedShelves = customDialogInput.getValue(), - "ticketCollection_setUsedShelves" + usedShelves = customDialogInput.getValue() ) } @@ -2041,7 +2036,7 @@ class CollectionFragment( getString(R.string.Agregar) ) - }.setKoButton("Cancelar") { + }.setKoButton(getString(R.string.cancel)) { scanRequest() customDialogThreeButtons.dismiss() }.show() @@ -2125,8 +2120,7 @@ class CollectionFragment( quantity = totalQuantity.toString(), warehouseFk = getData(WAREHOUSEFK), type = typeCollectionTrashMissingReject, - originalQuantity = quantity, - callFunction = "collectionMissingTrash" + originalQuantity = quantity ) /* sales[position].quantity = quantity saleAdapter!!.notifyDataSetChanged() @@ -2224,7 +2218,7 @@ class CollectionFragment( quantity = totalQuantity.toString(), warehouseFk = warehouseFk, type = "reject", - originalQuantity = quantity, callFunction = "collectionMissingTrash" + originalQuantity = quantity ) //sales[position].originalQuantity = quantity @@ -2297,8 +2291,7 @@ class CollectionFragment( getData(PASSWORD), collection.collectionFk, getData(SECTORFK), - type, - "collection_getTickets" + type ) } @@ -2369,7 +2362,7 @@ class CollectionFragment( viewModel.collectionIncreaseQuantitySalix( getData(TOKEN), saleFk = sales[position].saleFk, - quantity = quantity, "collection_increaseQuantity" + quantity = quantity ) /* }*/ @@ -2384,8 +2377,7 @@ class CollectionFragment( usuario = getData(USER), password = getData(PASSWORD), ticketFk = it, - state = "CHECKED", - callFunction = "ticket_setState" + state = "CHECKED" ) } } else if (type == SACADOR) { @@ -2394,8 +2386,7 @@ class CollectionFragment( usuario = getData(USER), password = getData(PASSWORD), ticketFk = it, - state = "PREPARED", - callFunction = "ticket_setState" + state = "PREPARED" ) } ////Refactor #4030 @@ -2441,7 +2432,7 @@ class CollectionFragment( Log.d("VERDNATURA", "Entrant en el show scanner al punxar sobre la sale") customDialogInput.setTitle("" + sale.itemFk) .setDescription(getString(R.string.Escaneaelcarroparaelitemseleccionado)) - .setOkButton("Aceptar") { + .setOkButton(getString(R.string.accept)) { if (!customDialogInput.getValue().isNullOrEmpty()) { findSale(customDialogInput.getValue(), index) } @@ -2449,7 +2440,7 @@ class CollectionFragment( scanRequest() customDialogInput.dismiss() hideKeyboards() - }.setKoButton("Cancelar") { + }.setKoButton(getString(R.string.cancel)) { customDialogInput.dismiss() }.setValue("").show() customDialogInput.getEditText().requestFocus() @@ -2484,7 +2475,7 @@ class CollectionFragment( } - customDialogList.setTitle("Causa de error").setKoButton("Cancelar") { + customDialogList.setTitle("Causa de error").setKoButton(getString(R.string.cancel)) { scanRequest() hideKeyboards() customDialogList.dismiss() diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionViewModel.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionViewModel.kt index f50815d9..40828771 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionViewModel.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionViewModel.kt @@ -46,6 +46,10 @@ class CollectionViewModel(context: Context) : BaseViewModel() { val response: LiveData get() = _response + private val _responseParking by lazy { MutableLiveData() } + val responseParking: LiveData + get() = _responseParking + private val _responsePrint by lazy { MutableLiveData() } val responsePrint: LiveData get() = _responsePrint @@ -117,8 +121,7 @@ class CollectionViewModel(context: Context) : BaseViewModel() { password: String, collectionFk: String, sectorFk: String, - type: String, - callFunction: String + type: String ) { getSacadorControladorUserCase.collectionTicketGet( usuario, @@ -163,7 +166,7 @@ class CollectionViewModel(context: Context) : BaseViewModel() { vOriginalQuantity: String, vStateFk: String, vIsChecked: String, - vBuyFk: String, callFunction: String + vBuyFk: String ) { getSacadorControladorUserCase.saleTrackingReplace( usuario, @@ -202,7 +205,7 @@ class CollectionViewModel(context: Context) : BaseViewModel() { password: String, shelvingFk: String, quantity: String, - itemFk: String, callFunction: String + itemFk: String ) { getSacadorControladorUserCase.itemPlacementSupplyAiming( usuario, @@ -287,7 +290,7 @@ class CollectionViewModel(context: Context) : BaseViewModel() { usuario: String, password: String, collectionFk: String, - sectorFk: String, callFunction: String + sectorFk: String ) { getSacadorControladorUserCase.collectionStickerPrint( usuario, @@ -324,8 +327,7 @@ class CollectionViewModel(context: Context) : BaseViewModel() { usuario: String, password: String, ticketFk: String, - usedShelves: String, - callFunction: String + usedShelves: String ) { getSacadorControladorUserCase.ticketCollection_setUsedShelves( usuario, @@ -360,8 +362,7 @@ class CollectionViewModel(context: Context) : BaseViewModel() { usuario: String, password: String, vSelf: String, - vPacking: String, - callFunction: String + vPacking: String ) { getSacadorControladorUserCase.item_updatePackingShelve( usuario, @@ -396,8 +397,7 @@ class CollectionViewModel(context: Context) : BaseViewModel() { fun saleTracking_add( usuario: String, password: String, - saleGroupFk: String, - callFunction: String + saleGroupFk: String ) { getSacadorControladorUserCase.saleTracking_add( usuario, @@ -527,7 +527,7 @@ class CollectionViewModel(context: Context) : BaseViewModel() { quantity: String, type: String, warehouseFk: String, - originalQuantity: String, callFunction: String + originalQuantity: String ) { getSacadorControladorUserCase.collectionMissingTrash( usuario, @@ -593,8 +593,7 @@ class CollectionViewModel(context: Context) : BaseViewModel() { usuario: String, password: String, itemShelvingFk: String, - visible: String, - callFunction: String + visible: String ) { getSacadorControladorUserCase.itemShelving_updateFromSale( usuario, @@ -631,22 +630,21 @@ class CollectionViewModel(context: Context) : BaseViewModel() { usuario: String, password: String, ticketFk: String, - parking: String, - callFunction: String + parking: String ) { getUbicadorUserCase.shelvingPark(usuario, password, ticketFk, parking) - .enqueue(object : Callback { - override fun onFailure(call: Call, t: Throwable) { - _response.value = ResponseItemVO( + .enqueue(object : Callback { + override fun onFailure(call: Call, t: Throwable) { + _responseParking.value = ResponseItemVO( isError = true, errorMessage = getMessageFromAllResponse(nameofFunction(this), t.message!!) ) } - override fun onResponse(call: Call, response: Response) { + override fun onResponse(call: Call, response: Response) { - if (response.body() == null) { - _response.value = ResponseItemVO( + if (!response.isSuccessful) { + _responseParking.value = ResponseItemVO( isError = true, errorMessage = getMessageFromAllResponse( nameofFunction(this), @@ -654,8 +652,8 @@ class CollectionViewModel(context: Context) : BaseViewModel() { ) ) } else { - _response.value = - ResponseItemVO(isError = false, response = response.body()!!) + _responseParking.value = + ResponseItemVO(isError = false, response = response.message()) } } }) @@ -665,7 +663,7 @@ class CollectionViewModel(context: Context) : BaseViewModel() { usuario: String, password: String, ticketFk: String, - state: String, callFunction: String + state: String ) { getSacadorControladorUserCase.ticket_setState(usuario, password, ticketFk, state) .enqueue(object : Callback { @@ -854,7 +852,7 @@ class CollectionViewModel(context: Context) : BaseViewModel() { token: String, saleFk: String, - quantity: String, callFunction: String + quantity: String ) { getSacadorControladorUserCase.collectionIncreaseQuantitySalix( token, @@ -990,8 +988,7 @@ class CollectionViewModel(context: Context) : BaseViewModel() { fun sip_getExtension( usuario: String, password: String, - workerId: String, - callFunction: String + workerId: String ) { getSacadorControladorUserCase.sip_getExtension( usuario, @@ -1030,8 +1027,7 @@ class CollectionViewModel(context: Context) : BaseViewModel() { fun sip_getExtensionSalix( token: String, - workerId: String, - callFunction: String + workerId: String ) { getSacadorControladorUserCase.sip_getExtensionSalix( token, @@ -1090,7 +1086,7 @@ class CollectionViewModel(context: Context) : BaseViewModel() { fun ticket_checkFullyControlled( usuario: String, password: String, - collectionFk: String, callFunction: String + collectionFk: String ) { getSacadorControladorUserCase.ticket_checkFullyControlled( usuario, diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/ShowTicketFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/ShowTicketFragment.kt index 87105bf4..8c12cacc 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/ShowTicketFragment.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/ShowTicketFragment.kt @@ -57,8 +57,7 @@ class CollectionShowTicketFragment( getData(PASSWORD), collection.collectionFk, getData(SECTORFK), - type, - "collection_getTickets" + type ) } @@ -111,8 +110,8 @@ class CollectionShowTicketFragment( usuario = getData(USER), password = getData(PASSWORD), collectionFk = collection.collectionFk, - sectorFk = getData(SECTORFK), - "collectionStickerPrint" + sectorFk = getData(SECTORFK) + ) (getString(R.string.Imprimiendo) + getData(PRINTERNAME)).toast(requireContext()) @@ -137,7 +136,7 @@ class CollectionShowTicketFragment( getData(PASSWORD), binding.scanInput.text.toString(), getData(SECTORFK), - type, "collection_getTickets" + type ) @@ -162,7 +161,7 @@ class CollectionShowTicketFragment( getData(PASSWORD), collection.collectionFk, getData(SECTORFK), - type, "collection_getTickets" + type ) binding.collectionSwipe.isRefreshing = false @@ -254,7 +253,7 @@ class CollectionShowTicketFragment( private fun printObservations(observations: String) { if (observations.trim().isNotEmpty()) { customDialog.setTitle("Observaciones").setDescription(observations) - .setOkButton("Aceptar") { + .setOkButton(getString(R.string.accept)) { customDialog.hide() customDialog.dismiss() }.show() diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/controlador/fragment/ControladorFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/controlador/fragment/ControladorFragment.kt index 1531c477..a3f45585 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/controlador/fragment/ControladorFragment.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/controlador/fragment/ControladorFragment.kt @@ -87,7 +87,7 @@ class ControladorFragment : if (it.isError) { ma.messageWithSound(it.errorMessage,isError = true, isPlayed = false) /*customDialog.setTitle(getString(R.string.error)).setDescription(it.errorMessage) - .setOkButton("Aceptar") { + .setOkButton(getString(R.string.accept)) { customDialog.dismiss() }.show()*/ } else { diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/controlvehiculo/fragment/ControlVehiculoFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/controlvehiculo/fragment/ControlVehiculoFragment.kt index 16f66c6a..9a27aacf 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/controlvehiculo/fragment/ControlVehiculoFragment.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/controlvehiculo/fragment/ControlVehiculoFragment.kt @@ -135,7 +135,7 @@ class ControlVehiculoFragment( private fun showScanner(description: String, action: String) { customDialogInput.setTitle(getString(R.string.vehiclecontrol)).setDescription(description) - .setOkButton("Aceptar") { + .setOkButton(getString(R.string.accept)) { if (customDialogInput.getValue().isNotEmpty()) { // "$description ${customDialogInput.getValue()} OK".toast(requireContext()) insertControlTimeVehicle(customDialogInput.getValue(), action) @@ -146,7 +146,7 @@ class ControlVehiculoFragment( hideKeyboards() } - .setKoButton("Cancelar") { + .setKoButton(getString(R.string.cancel)) { customDialogInput.dismiss() if (tagName.equals(HistoricoVehiculoFragment.TAG)) { ma.onBackPressed() @@ -285,7 +285,7 @@ class ControlVehiculoFragment( } - }.setKoButton("Cancelar") { + }.setKoButton(getString(R.string.cancel)) { scanRequest() customDialogThreeButtons.dismiss() }.show() @@ -307,7 +307,7 @@ class ControlVehiculoFragment( } - }.setKoButton("Cancelar") { + }.setKoButton(getString(R.string.cancel)) { scanRequest() customDialogThreeButtons.dismiss() }.show() diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/diadeventa/fragment/DayOfSaleViewModel.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/diadeventa/fragment/DayOfSaleViewModel.kt index 681f6b60..e74f0580 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/diadeventa/fragment/DayOfSaleViewModel.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/diadeventa/fragment/DayOfSaleViewModel.kt @@ -145,22 +145,22 @@ class DayOfSaleViewModel(context: Context) : BaseViewModel() { fun parking(usuario: String,password: String,scanItem: String,parking:String){ GetDayOfSaleUSerCase.shelvingPark(usuario,password,scanItem,parking).enqueue(object : - Callback { - override fun onFailure(call: Call, t: Throwable) { + Callback { + override fun onFailure(call: Call, t: Throwable) { _response.value = ResponseItemVO(isError = true,errorMessage = getMessageFromAllResponse(nameofFunction(this),t.message!!)) } - override fun onResponse(call: Call, response: Response) { + override fun onResponse(call: Call, response: Response) { - - if (response.body() == null){ +/* + if (response.isSuccessful == null){ _response.value = ResponseItemVO(isError = true,errorMessage = getMessageFromAllResponse(nameofFunction(this),response.message())) - }else{ - if (response.body() == "Finish") - _response.value = ResponseItemVO(isError = false,response = response.body()!!) + }else{*/ + if (response.isSuccessful) + _response.value = ResponseItemVO(isError = false,response = response.message()) else _response.value = ResponseItemVO(isError = true,errorMessage = getMessageFromAllResponse(nameofFunction(this),response.message())) - } + } }) } diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/faltas/fragment/FaltasFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/faltas/fragment/FaltasFragment.kt index 0e27e18d..14f7ecc8 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/faltas/fragment/FaltasFragment.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/faltas/fragment/FaltasFragment.kt @@ -153,7 +153,7 @@ class FaltasFragment : ) changeOfflineValue(item) customDialogInput.dismiss() - }.setKoButton("Cancelar") { + }.setKoButton(getString(R.string.cancel)) { customDialogInput.dismiss() }.setValue("0").show() diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/historicoarticulo/adapter/HistoricoAdapter.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/historicoarticulo/adapter/HistoricoAdapter.kt index d30e353f..ed8e7953 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/historicoarticulo/adapter/HistoricoAdapter.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/historicoarticulo/adapter/HistoricoAdapter.kt @@ -35,6 +35,7 @@ class HistoricoAdapter ( fun bind(item: ItemHistoricoVO) { binding.apply { this.item = item + val sdf = SimpleDateFormat("yyyy-MM-dd") val currentDate = sdf.format(Date()) if (currentDate == item.shipped){ diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/historicovehiculo/adapter/HistoricoVehiculoAdapter.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/historicovehiculo/adapter/HistoricoVehiculoAdapter.kt index 885dc2c3..5541a237 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/historicovehiculo/adapter/HistoricoVehiculoAdapter.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/historicovehiculo/adapter/HistoricoVehiculoAdapter.kt @@ -35,7 +35,7 @@ class HistoricoVehiculoAdapter ( fun bind(item: ItemHistoricoVehiculo) { binding.apply { this.item = item - val sdf = SimpleDateFormat("yyyy-MM-dd") + val sdf = SimpleDateFormat(binding.root.context.getString(R.string.dateFormat)) val currentDate = sdf.format(Date()) if (currentDate == item.inTimed){ historicoDate.setBackgroundColor(ContextCompat.getColor(historicoDate.context,R.color.verdnatura_pumpkin_orange)) diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/historicovehiculo/fragment/HistoricoVehiculoFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/historicovehiculo/fragment/HistoricoVehiculoFragment.kt index c73e921b..3af9c8d4 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/historicovehiculo/fragment/HistoricoVehiculoFragment.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/historicovehiculo/fragment/HistoricoVehiculoFragment.kt @@ -60,10 +60,12 @@ class HistoricoVehiculoFragment ( navigateToToday(it) if (it.list.isEmpty()){ - ma.messageWithSound("Solo puedes visualizar cuando has cogido tu mismo el vehículo a no ser que tengas permisos para ello.",true,true,"Información") + ma.messageWithSound(getString(R.string.lookWithpermission),true,true,getString( + R.string.info)) }else{ if (it.list[0].isError){ - ma.messageWithSound(it.list[0].errorMessage,true,true,"Información") + ma.messageWithSound(it.list[0].errorMessage,true,true,getString( + R.string.info)) } } diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/inventario/fragment/InventaryFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/inventario/fragment/InventaryFragment.kt index 1fd30d59..a913097e 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/inventario/fragment/InventaryFragment.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/inventario/fragment/InventaryFragment.kt @@ -220,7 +220,7 @@ class InventaryFragment : BaseFragment() } val inventaryList: LiveData @@ -55,21 +51,26 @@ class InventaryViewModel(context: Context) : BaseViewModel() { val workerFromMistakeList: LiveData get() = _workerFromMistakeList - private val _mistakeWorkerList by lazy { MutableLiveData()} - val mistakeWorkerList: LiveData + private val _mistakeWorkerList by lazy { MutableLiveData() } + val mistakeWorkerList: LiveData get() = _mistakeWorkerList private val _responseAddMistake by lazy { MutableLiveData() } - val responseAddMistake: LiveData + val responseAddMistake: LiveData get() = _responseAddMistake //sergio para obtener comprador - fun itemShelvingBuyerGet(user:String,password:String){ - getInventaryUserCase.itemShelvingBuyerGet(user,password).enqueue(object : + fun itemShelvingBuyerGet(user: String, password: String) { + getInventaryUserCase.itemShelvingBuyerGet(user, password).enqueue(object : Callback> { override fun onFailure(call: Call>, t: Throwable) { - val listError:ArrayList = ArrayList() - listError.add(BuyerVO(isError = true,errorMessage =getMessageFromAllResponse(nameofFunction(this),t.message!!))) + val listError: ArrayList = ArrayList() + listError.add( + BuyerVO( + isError = true, + errorMessage = getMessageFromAllResponse(nameofFunction(this), t.message!!) + ) + ) _buyersList.value = BuyerListVO(listError) } @@ -77,12 +78,19 @@ class InventaryViewModel(context: Context) : BaseViewModel() { call: Call>, response: Response> ) { - if (response.body() != null){ + if (response.body() != null) { _buyersList.value = response.body()?.let { BuyerListVO(it) } - }else{ - val listError:ArrayList = ArrayList() - listError.add(BuyerVO(isError = true, - errorMessage = getMessageFromAllResponse(nameofFunction(this),response.message()))) + } else { + val listError: ArrayList = ArrayList() + listError.add( + BuyerVO( + isError = true, + errorMessage = getMessageFromAllResponse( + nameofFunction(this), + response.message() + ) + ) + ) _buyersList.value = BuyerListVO(listError) } } @@ -121,35 +129,51 @@ class InventaryViewModel(context: Context) : BaseViewModel() { }) }*/ - fun getInventory(user:String,password:String,buyerFk:String,warehouseFk: String){ - // getInventaryUserCase.itemShelvingRadar(user,password,buyerFk).enqueue(object : - getInventaryUserCase.itemShelvingRadarFilterBuyer(user,password,buyerFk,warehouseFk).enqueue(object : - Callback> { - override fun onFailure(call: Call>, t: Throwable) { - val listError:ArrayList = ArrayList() - listError.add(ItemInventaryVO(isError = true,errorMessage = getMessageFromAllResponse(nameofFunction(this),t.message!!))) - _inventaryList.value = InventaryListVO(listError) - } - - override fun onResponse( - call: Call>, - response: Response> - ) { - if (response.body() != null){ - _inventaryList.value = response.body()?.let { InventaryListVO(it) } - }else{ - val listError:ArrayList = ArrayList() - listError.add(ItemInventaryVO(isError = true,errorMessage = getMessageFromAllResponse(nameofFunction(this),response.message()))) + fun getInventory(user: String, password: String, buyerFk: String, warehouseFk: String) { + // getInventaryUserCase.itemShelvingRadar(user,password,buyerFk).enqueue(object : + getInventaryUserCase.itemShelvingRadarFilterBuyer(user, password, buyerFk, warehouseFk) + .enqueue(object : + Callback> { + override fun onFailure(call: Call>, t: Throwable) { + val listError: ArrayList = ArrayList() + listError.add( + ItemInventaryVO( + isError = true, + errorMessage = getMessageFromAllResponse( + nameofFunction(this), + t.message!! + ) + ) + ) _inventaryList.value = InventaryListVO(listError) - } - } - }) + override fun onResponse( + call: Call>, + response: Response> + ) { + if (response.body() != null) { + _inventaryList.value = response.body()?.let { InventaryListVO(it) } + } else { + val listError: ArrayList = ArrayList() + listError.add( + ItemInventaryVO( + isError = true, + errorMessage = getMessageFromAllResponse( + nameofFunction(this), + response.message() + ) + ) + ) + _inventaryList.value = InventaryListVO(listError) + + } + } + + }) } - /*fun itemStockUpdate(itemFk:String,warehouseFk:String,user:String,password:String,newValue:String,isTrash:String){ //sergio: se modifica por CAU a itemTrash // https://cau.verdnatura.es/scp/tickets.php?id=21043 al nuevo procedimiento itemTrash @@ -173,51 +197,73 @@ class InventaryViewModel(context: Context) : BaseViewModel() { }*/ //sergio: se modifica por CAU a itemTrash - fun itemTrash(itemFk:String,warehouseFk:String,user:String,password:String,newValue:String,isTrash:String){ + fun itemTrash( + itemFk: String, + warehouseFk: String, + user: String, + password: String, + newValue: String, + isTrash: String + ) { - getItemCardUserCase.itemTrash(user,password,itemFk,warehouseFk,newValue,isTrash).enqueue(object : Callback{ + getItemCardUserCase.itemTrash(user, password, itemFk, warehouseFk, newValue, isTrash) + .enqueue(object : Callback { - override fun onFailure(call: Call, t: Throwable) { - _response.value = ResponseItemVO(isError = true,errorMessage = getMessageFromAllResponse(nameofFunction(this),t.message!!)) - } - - override fun onResponse(call: Call, response: Response) { - if (!response.isSuccessful){ - _response.value = ResponseItemVO(isError = true,errorMessage = getMessageFromAllResponse(nameofFunction(this),response.message())) - }else{ - _response.value = ResponseItemVO(isError = false,response = response.message()) + override fun onFailure(call: Call, t: Throwable) { + _response.value = ResponseItemVO( + isError = true, + errorMessage = getMessageFromAllResponse(nameofFunction(this), t.message!!) + ) } - } + override fun onResponse(call: Call, response: Response) { + if (!response.isSuccessful) { + _response.value = ResponseItemVO( + isError = true, + errorMessage = getMessageFromAllResponse( + nameofFunction(this), + response.message() + ) + ) + } else { + _response.value = + ResponseItemVO(isError = false, response = response.message()) + } - }) + } + + }) } - fun department_getHasMistakeSalix(token:String) - { + + fun department_getHasMistakeSalix(token: String) { getWorkerMistakeUserCase.department_getHasMistakeSalix(token) - .enqueue(object : Callback> - { - override fun onFailure(call: Call>, t: Throwable) - { + .enqueue(object : Callback> { + override fun onFailure(call: Call>, t: Throwable) { val listError: ArrayList = ArrayList() - listError.add(DepartmentMistake(isError = true,errorMessage =getMessageFromAllResponse(nameofFunction(this),t.message!!))) + listError.add( + DepartmentMistake( + isError = true, + errorMessage = getMessageFromAllResponse( + nameofFunction(this), + t.message!! + ) + ) + ) _mistakeDepartmentList.value = departmentMistakeList(listError) } override fun onResponse( call: Call>, response: Response> - ) - { - if (response.body() != null) - { - _mistakeDepartmentList.value = response.body()?.let { departmentMistakeList(it) } - } else - { + ) { + if (response.body() != null) { + _mistakeDepartmentList.value = + response.body()?.let { departmentMistakeList(it) } + } else { val listError: ArrayList = ArrayList() listError.add(DepartmentMistake("0", "")) _mistakeDepartmentList.value = departmentMistakeList(listError) @@ -227,29 +273,32 @@ class InventaryViewModel(context: Context) : BaseViewModel() { }) } - fun department_getHasMistake(usuario:String, password:String) - { + fun department_getHasMistake(usuario: String, password: String) { - getWorkerMistakeUserCase.department_getHasMistake(usuario, password) - .enqueue(object : Callback> - { - override fun onFailure(call: Call>, t: Throwable) - { + getWorkerMistakeUserCase.department_getHasMistake(usuario, password) + .enqueue(object : Callback> { + override fun onFailure(call: Call>, t: Throwable) { val listError: ArrayList = ArrayList() - listError.add(DepartmentMistake(isError = true,errorMessage =getMessageFromAllResponse(nameofFunction(this),t.message!!))) + listError.add( + DepartmentMistake( + isError = true, + errorMessage = getMessageFromAllResponse( + nameofFunction(this), + t.message!! + ) + ) + ) _mistakeDepartmentList.value = departmentMistakeList(listError) } override fun onResponse( call: Call>, response: Response> - ) - { - if (response.body() != null) - { - _mistakeDepartmentList.value = response.body()?.let { departmentMistakeList(it) } - } else - { + ) { + if (response.body() != null) { + _mistakeDepartmentList.value = + response.body()?.let { departmentMistakeList(it) } + } else { val listError: ArrayList = ArrayList() listError.add(DepartmentMistake("0", "")) _mistakeDepartmentList.value = departmentMistakeList(listError) @@ -259,56 +308,89 @@ class InventaryViewModel(context: Context) : BaseViewModel() { }) } - fun worker_getFromHasMistake(usuario:String,password:String,departmentFk:String){ - getWorkerMistakeUserCase.worker_getFromHasMistake(usuario,password,departmentFk).enqueue(object : - Callback> { - override fun onFailure(call: Call>, t: Throwable) { - val listError:ArrayList = ArrayList() - listError.add(WorkerFromMistake(isError = true,errorMessage =getMessageFromAllResponse(nameofFunction(this),t.message!!))) - _workerFromMistakeList.value = workerFromMistakeList(listError) - } - - override fun onResponse( - call: Call>, - response: Response> - ) { - if (response.body() != null){ - - _workerFromMistakeList.value = response.body()?.let { workerFromMistakeList(it) } - }else{ - val listError:ArrayList = ArrayList() - listError.add(WorkerFromMistake(isError = true,errorMessage = getMessageFromAllResponse(nameofFunction(this),response.message()))) + fun worker_getFromHasMistake(usuario: String, password: String, departmentFk: String) { + getWorkerMistakeUserCase.worker_getFromHasMistake(usuario, password, departmentFk) + .enqueue(object : + Callback> { + override fun onFailure(call: Call>, t: Throwable) { + val listError: ArrayList = ArrayList() + listError.add( + WorkerFromMistake( + isError = true, + errorMessage = getMessageFromAllResponse( + nameofFunction(this), + t.message!! + ) + ) + ) _workerFromMistakeList.value = workerFromMistakeList(listError) } - } - }) + override fun onResponse( + call: Call>, + response: Response> + ) { + if (response.body() != null) { + + _workerFromMistakeList.value = + response.body()?.let { workerFromMistakeList(it) } + } else { + val listError: ArrayList = ArrayList() + listError.add( + WorkerFromMistake( + isError = true, + errorMessage = getMessageFromAllResponse( + nameofFunction(this), + response.message() + ) + ) + ) + _workerFromMistakeList.value = workerFromMistakeList(listError) + } + } + + }) } - fun workerMistakeType_get(usuario: String, password: String) - { + fun workerMistakeType_get(usuario: String, password: String) { getWorkerMistakeUserCase.workerMistakeType_get(usuario, password) - .enqueue(object : Callback> - { - override fun onFailure(call: Call>, t: Throwable) - { + .enqueue(object : Callback> { + override fun onFailure(call: Call>, t: Throwable) { val listError: ArrayList = ArrayList() - listError.add(MistakeWorkerType(isError=true,errorMessage =getMessageFromAllResponse(nameofFunction(this),t.message!!),id="0", description = "")) + listError.add( + MistakeWorkerType( + isError = true, + errorMessage = getMessageFromAllResponse( + nameofFunction(this), + t.message!! + ), + id = "0", + description = "" + ) + ) _mistakeWorkerList.value = workerMistakeTypeList(listError) } override fun onResponse( call: Call>, response: Response> - ) - { - if (response.body() != null) - { - _mistakeWorkerList.value = response.body()?.let { workerMistakeTypeList(it) } - } else - { + ) { + if (response.body() != null) { + _mistakeWorkerList.value = + response.body()?.let { workerMistakeTypeList(it) } + } else { val listError: ArrayList = ArrayList() - listError.add(MistakeWorkerType(isError=true,errorMessage =getMessageFromAllResponse(nameofFunction(this),response.message()),id="0", description = "")) + listError.add( + MistakeWorkerType( + isError = true, + errorMessage = getMessageFromAllResponse( + nameofFunction(this), + response.message() + ), + id = "0", + description = "" + ) + ) _mistakeWorkerList.value = workerMistakeTypeList(listError) } } @@ -320,47 +402,51 @@ class InventaryViewModel(context: Context) : BaseViewModel() { usuario: String, password: String, vUserFk: String, - vTypeFk: String,callFunction:String - ) - { + vTypeFk: String + ) { getWorkerMistakeUserCase.workerMistake_Add(usuario, password, vUserFk, vTypeFk) .enqueue(object : - Callback - { - override fun onFailure(call: Call, t: Throwable) - { - d("Error message "+t.message) + Callback { + override fun onFailure(call: Call, t: Throwable) { + d("Error message " + t.message) _responseAddMistake.value = ResponseItemVO( isError = true, - errorMessage =getMessageFromAllResponse(nameofFunction(this),t.message!!) + errorMessage = getMessageFromAllResponse(nameofFunction(this), t.message!!) ) } override fun onResponse( call: Call, response: Response - ) - { - if (!response.isSuccessful) - { - if (response.code()==403){ + ) { + if (!response.isSuccessful) { + if (response.code() == 403) { _responseAddMistake.value = ResponseItemVO( isError = true, - errorMessage = getMessageFromAllResponse(nameofFunction(this),"Usuario sin permisos para realizar la acción") + errorMessage = getMessageFromAllResponse( + nameofFunction(this), + "Usuario sin permisos para realizar la acción" + ) ) - }else{ - d("Error message:"+{response.errorBody()}+"-"+response.message()+"-"+response.raw()) - _responseAddMistake.value = ResponseItemVO( - isError = true, - errorMessage = getMessageFromAllResponse(nameofFunction(this),response.message()) - ) - } - } else - { + } else { + d("Error message:" + { response.errorBody() } + "-" + response.message() + "-" + response.raw()) + _responseAddMistake.value = ResponseItemVO( + isError = true, + errorMessage = getMessageFromAllResponse( + nameofFunction(this), + response.message() + ) + ) + } + } else { // sergio:refactor:solo debería haber un mensaje no un response o errorMessage _responseAddMistake.value = - ResponseItemVO(isError = false, response ="Causa del error registrada", errorMessage = "Causa del error registrada") + ResponseItemVO( + isError = false, + response = "Causa del error registrada", + errorMessage = "Causa del error registrada" + ) } } }) 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 4df4d989..ffca5619 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 @@ -57,7 +57,7 @@ class LoginFragment : BaseFragment(LoginVi - binding.edittextServer.setText(getData("base_url")) + binding.edittextServer.setText(getData(getString(R.string.baseurl))) binding.edittextServer.setOnKeyListener { _, keyCode, event -> if (keyCode == KeyEvent.KEYCODE_ENTER && event.action == KeyEvent.ACTION_UP) { @@ -65,6 +65,17 @@ class LoginFragment : BaseFragment(LoginVi "base_url", binding.edittextServer.text.toString() ) + if (binding.edittextServer.text!!.contains("test-app.verdnatura.es")){ + saveData( + "base_urlSalix", + "https://test-salix.verdnatura.es/api/" + ) + }else{ + saveData( + "base_urlSalix", + "https://salix.verdnatura.es/api/" + ) + } this.hideKeyboard() //sergio: deberia lanzar la funcion nueva creada por mi restartapp de BaseFragment. Pero no vuelve a arrancar @@ -139,7 +150,7 @@ class LoginFragment : BaseFragment(LoginVi if (it.IsVersionCritical == 1) { customDialog.setDescription(getString(R.string.updatecritical)) } else { - customDialog.setKoButton("Cancelar") { + customDialog.setKoButton(getString(R.string.cancel)) { customDialog.dismiss() goToMain() } @@ -192,9 +203,9 @@ class LoginFragment : BaseFragment(LoginVi deviceLog_add( binding.edittextUsername.text.toString(), binding.edittextPassword.text.toString(), - "warehouse", + getString(R.string.app_name), getInfoVersionNameApp(), - getData(ANDROID_ID), "deviceLog_add" + getData(ANDROID_ID) ) if (binding.switchRemember.isChecked) { @@ -216,7 +227,7 @@ class LoginFragment : BaseFragment(LoginVi } if (it.vIsAuthorized == "1" && !it.vMessage.isNullOrEmpty()) { binding.splashProgress.visibility = View.GONE - customDialog.setTitle("Mensaje").setDescription(it.vMessage) + customDialog.setTitle(getString(R.string.info)).setDescription(it.vMessage) .setOkButton(getString(R.string.close)) { customDialog.dismiss() /* binding.splashProgress.visibility = View.VISIBLE @@ -254,7 +265,7 @@ class LoginFragment : BaseFragment(LoginVi customDialog.setTitle(getString(R.string.error)) .setDescription(it.errorMessage) .setOkButton( - "Aceptar" + getString(R.string.accept) ) { customDialog.dismiss() getVersion() @@ -284,7 +295,7 @@ class LoginFragment : BaseFragment(LoginVi event.getContentIfNotHandled().notNull { if (it.list.isEmpty()) { - "Tiene que seleccionar impresora.".toast(context) + getString(R.string.selectPrinter).toast(context) } else { if (!it.list.get(0).isError) { saveDataInt(PRINTERFK, it.list.get(0).id!!) @@ -309,7 +320,7 @@ class LoginFragment : BaseFragment(LoginVi // .setDescription(it.errorMessage + ". Puedes continuar pero algunas funcionalidades no estarán disponibles.") .setDescription(it.errorMessage) .setOkButton( - "Entendido" + getString(R.string.accept) ) { customDialog.dismiss() //getVersion() 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 dc5c3d5a..c9b94f9a 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 @@ -236,7 +236,7 @@ class LoginViewModel(context: Context) : BaseViewModel() fun deviceLog_add( - user: String, password: String, app: String, versionApp: String, android_id: String,callFunction: String + user: String, password: String, app: String, versionApp: String, android_id: String ) { getLoginUserCase.deviceLog_add(user, password, app, versionApp, android_id) @@ -248,7 +248,7 @@ class LoginViewModel(context: Context) : BaseViewModel() if (!response.isSuccessful) { - messageError(callFunction,response.message()) + messageError(nameofFunction(this),response.message()) } } @@ -256,7 +256,7 @@ class LoginViewModel(context: Context) : BaseViewModel() override fun onFailure(call: Call, t: Throwable) { - messageError(callFunction,t.message!!) + messageError(nameofFunction(this),t.message!!) } }) diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/main/activity/MainActivity.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/main/activity/MainActivity.kt index 9258f440..79c96c56 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/main/activity/MainActivity.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/main/activity/MainActivity.kt @@ -545,7 +545,7 @@ class MainActivity : BaseActivity(), OnPasillerosItemClickL customDialog.dismiss() finish() - }.setKoButton("Cancelar") { + }.setKoButton(getString(R.string.cancel)) { customDialog.dismiss() }.show() @@ -674,7 +674,7 @@ class MainActivity : BaseActivity(), OnPasillerosItemClickL message.toast(this, Toast.LENGTH_SHORT) } else { customDialog.setTitle(titleWithError).setDescription(message) - .setOkButton("Aceptar") { + .setOkButton(getString(R.string.accept)) { customDialog.dismiss() }.show() } diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionScanFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionScanFragment.kt index 9969ba54..e1097b3f 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionScanFragment.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionScanFragment.kt @@ -170,7 +170,7 @@ class ExpeditionScanFragment ( viewModel.expeditionScanDel(getData(USER), getData(PASSWORD),itemExpeditionScanVO.id) customDialogTwoButtons.dismiss() - }.setKoButton("Cancelar"){ + }.setKoButton(getString(R.string.cancel)){ customDialogTwoButtons.dismiss() }.show() } diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionTruckListFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionTruckListFragment.kt index 0381efe9..a173f687 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionTruckListFragment.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionTruckListFragment.kt @@ -46,7 +46,7 @@ class ExpeditionTruckListFragment : BaseFragment { - override fun onFailure(call: Call, t: Throwable) { + Callback { + override fun onFailure(call: Call, t: Throwable) { _response.value = ResponseItemVO(isError = true,errorMessage = getMessageFromAllResponse(nameofFunction(this),t.message!!)) } - override fun onResponse(call: Call, response: Response) { + override fun onResponse(call: Call, response: Response) { ProgressLoading(GONE) - if (response.body() == null){ + /*if (response.body() == null){ _response.value = ResponseItemVO(isError = true,errorMessage = getMessageFromAllResponse(nameofFunction(this),response.message())) - }else{ - if (response.body() == "Finish") - _response.value = ResponseItemVO(isError = false,response = response.body()!!) + }else{*/ + if (response.isSuccessful) + _response.value = ResponseItemVO(isError = false,response = response.message()) else _response.value = ResponseItemVO(isError = true,errorMessage = getMessageFromAllResponse(nameofFunction(this),response.message())) - } + } }) } diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/parkingSale/fragment/ParkingViewModel.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/parkingSale/fragment/ParkingViewModel.kt index fa42f5cf..e95f2709 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/parkingSale/fragment/ParkingViewModel.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/parkingSale/fragment/ParkingViewModel.kt @@ -48,17 +48,17 @@ class ParkingSaleViewModel(context: Context) : BaseViewModel() { fun parking(usuario: String,password: String,scanItem: String,parking:String){ ProgressLoading(VISIBLE) getUbicadorUserCase.shelvingPark(usuario,password,scanItem,parking).enqueue(object : - Callback { - override fun onFailure(call: Call, t: Throwable) { + Callback { + override fun onFailure(call: Call, t: Throwable) { _response.value = ResponseItemVO(isError = true,errorMessage = getMessageFromAllResponse(nameofFunction(this),t.message!!)) } - override fun onResponse(call: Call, response: Response) { + override fun onResponse(call: Call, response: Response) { ProgressLoading(GONE) if (!response.isSuccessful){ _response.value = ResponseItemVO(isError = true,errorMessage = getMessageFromAllResponse(nameofFunction(this),response.message())) }else{ - _response.value = ResponseItemVO(isError = false,response = "Parking ok") + _response.value = ResponseItemVO(isError = false,response = response.message()) } } }) diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/EndSacadorFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/EndSacadorFragment.kt index 2207cef8..f830f611 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/EndSacadorFragment.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/EndSacadorFragment.kt @@ -214,7 +214,7 @@ class EndSacadorFragment( if (it.isError) { ma.messageWithSound(it.errorMessage, true, false) /* customDialog.setTitle(getString(R.string.error)).setDescription(it.errorMessage) - .setOkButton("Aceptar") { + .setOkButton(getString(R.string.accept)) { customDialog.dismiss() }.show()*/ } @@ -242,7 +242,7 @@ class EndSacadorFragment( if (it.isError) { ma.messageWithSound(it.errorMessage, true, false) /* customDialog.setTitle(getString(R.string.error)).setDescription(it.errorMessage) - .setOkButton("Aceptar") { + .setOkButton(getString(R.string.accept)) { customDialog.dismiss() }.show()*/ } else { @@ -558,7 +558,7 @@ class EndSacadorFragment( binding.splashProgress.visibility = View.VISIBLE viewModel.sectorCollectionSaleGroup_add( getData(USER), getData(PASSWORD), ticketFk, - collection.collectionFk, "sectorCollectionSaleGroup_add" + collection.collectionFk ) } @@ -674,7 +674,7 @@ class EndSacadorFragment( binding.splashProgress.visibility = VISIBLE viewModel.saleTracking_addPrevOK( usuario = getData(USER), password = getData(PASSWORD), - vSectorCollectionFk = collection.collectionFk, callFunction = "saleTracking_addPrevOK" + vSectorCollectionFk = collection.collectionFk ) @@ -777,8 +777,8 @@ class EndSacadorFragment( usuario = getData(USER), password = getData(PASSWORD), vSaleFk = sales[position].idMovimiento, - vIsChecked = if (sales[position].picked == sales[position].quantity) "1" else "0", - callFunction = "saleTracking_updateIsChecked" + vIsChecked = if (sales[position].picked == sales[position].quantity) "1" else "0" + ) } if (sales[position].picked == 0) { @@ -786,8 +786,8 @@ class EndSacadorFragment( usuario = getData(USER), password = getData(PASSWORD), vSaleFk = sales[position].idMovimiento, - vIsChecked = if (sales[position].picked == sales[position].quantity) "1" else "0", - callFunction = "saleTracking_updateIsChecked" + vIsChecked = if (sales[position].picked == sales[position].quantity) "1" else "0" + ) } @@ -819,8 +819,7 @@ class EndSacadorFragment( usuario = getData(USER), password = getData(PASSWORD), saleFk = sales[position].idMovimiento, - visible = sales[position].quantity.toString(), - "itemShelving_updateFromSale" + visible = sales[position].quantity.toString() ) positionUnmarked = position //sergio: anterior previa @@ -834,7 +833,7 @@ class EndSacadorFragment( //setTotalLines() scanRequest() customDialog.dismiss() - }.setKoButton("Cancelar") { + }.setKoButton(getString(R.string.cancel)) { scanRequest() customDialog.dismiss() }.show() @@ -858,8 +857,7 @@ class EndSacadorFragment( password = getData(PASSWORD), itemFk = sales[position].itemFk, quantity = quantityGet, - shelvingFk = sales[position].carros[shelvingPosition].shelving, - callFunction = "itemPlacementSupplyAiming" + shelvingFk = sales[position].carros[shelvingPosition].shelving ) } @@ -1030,7 +1028,7 @@ class EndSacadorFragment( /* private fun showScannerParking(ticket: String) { customDialogInputParking.setTitle("Parking").setDescription("Escanea el parking") - .setOkButton("Aceptar") { + .setOkButton(getString(R.string.accept)) { if (!customDialogInputParking.getValue().isNullOrEmpty()) { //findSale(customDialogInput.getValue(),index) parkingTicket(ticket, customDialogInputParking.getValue()) @@ -1040,7 +1038,7 @@ class EndSacadorFragment( scanRequest() customDialogInputParking.dismiss() hideKeyboards() - }.setKoButton("Cancelar") { + }.setKoButton(getString(R.string.cancel)) { customDialogInputParking.dismiss() }.setValue("").show() customDialogInputParking.getEditText().requestFocus() @@ -1063,7 +1061,7 @@ class EndSacadorFragment( /*private fun showScannerTicket() { customDialogInput.setTitle("Ticket a aparcar").setDescription("Escanea el ticket a aparcar") - .setOkButton("Aceptar") { + .setOkButton(getString(R.string.accept)) { if (!customDialogInput.getValue().isNullOrEmpty()) { showScannerParking(customDialogInput.getValue()) @@ -1072,7 +1070,7 @@ class EndSacadorFragment( scanRequest() customDialogInput.dismiss() hideKeyboards() - }.setKoButton("Cancelar") { + }.setKoButton(getString(R.string.cancel)) { customDialogInput.dismiss() }.setValue("").show() customDialogInput.getEditText().requestFocus() @@ -1096,7 +1094,7 @@ class EndSacadorFragment( private fun showScanner(index: Int, sale: PreSacadorItemVO) { customDialogInput.setTitle("" + sale.itemFk) - .setDescription("Escanea el carro para el item seleccionado").setOkButton("Aceptar") { + .setDescription("Escanea el carro para el item seleccionado").setOkButton(getString(R.string.accept)) { if (!customDialogInput.getValue().isNullOrEmpty()) { findSale(customDialogInput.getValue(), index) } @@ -1104,7 +1102,7 @@ class EndSacadorFragment( scanRequest() customDialogInput.dismiss() hideKeyboards() - }.setKoButton("Cancelar") { + }.setKoButton(getString(R.string.cancel)) { customDialogInput.dismiss() }.setValue("").show() customDialogInput.getEditText().requestFocus() @@ -1264,7 +1262,7 @@ class EndSacadorFragment( getString(R.string.Agregar) ) - }.setKoButton("Cancelar") { + }.setKoButton(getString(R.string.cancel)) { scanRequest() customDialogThreeButtons.dismiss() }.show() @@ -1311,7 +1309,7 @@ class EndSacadorFragment( quantity = totalQuantity.toString(), warehouseFk = getData(WAREHOUSEFK), type = "FALSE", - originalQuantity = quantity, callFunction = "collectionMissingTrash" + originalQuantity = quantity ) } @@ -1361,7 +1359,7 @@ class EndSacadorFragment( scanRequest() customDialogThreeButtons.dismiss() } - }.setKoButton("Cancelar") { + }.setKoButton(getString(R.string.cancel)) { scanRequest() customDialogThreeButtons.dismiss() }.show() @@ -1426,7 +1424,7 @@ class EndSacadorFragment( quantity = totalQuantity.toString(), warehouseFk = getData(WAREHOUSEFK), type = "FALSE", - originalQuantity = quantity, callFunction = "collectionMissingTrash" + originalQuantity = quantity ) //sales[position].originalQuantity = quantity try { @@ -1466,7 +1464,7 @@ class EndSacadorFragment( quantity = totalQuantity.toString(), warehouseFk = getData(WAREHOUSEFK), type = "TRUE", - originalQuantity = quantity, callFunction = "collectionMissingTrash" + originalQuantity = quantity ) //sales[position].originalQuantity = quantity try { @@ -1508,7 +1506,7 @@ class EndSacadorFragment( quantity = totalQuantity.toString(), warehouseFk = getData(WAREHOUSEFK), type = "reject", - originalQuantity = quantity, callFunction = "collectionMissingTrash" + originalQuantity = quantity ) //enviar mensaje a salix @@ -1541,8 +1539,8 @@ class EndSacadorFragment( usuario = getData(USER), password = getData(PASSWORD), saleFk = sales[position].idMovimiento, - quantity = quantity, - callFunction = "collection_increaseQuantity" + quantity = quantity + ) try { @@ -1579,8 +1577,7 @@ class EndSacadorFragment( usuario = getData(USER), password = getData(PASSWORD), saleFk = sales[position].idMovimiento, - quantity = quantity, - callFunction = "collection_increaseQuantity" + quantity = quantity ) diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/InitPreSacadorFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/InitPreSacadorFragment.kt index b3feacc0..27333f1f 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/InitPreSacadorFragment.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/InitPreSacadorFragment.kt @@ -91,7 +91,7 @@ class InitPreSacadorFragment ( iconAdd.drawable -> { binding.splashProgress.visibility = View.VISIBLE viewModel.sectorCollection_new(getData(USER), - getData(PASSWORD),getData(SECTORFK),"sectorCollection_new") + getData(PASSWORD),getData(SECTORFK)) } } @@ -177,7 +177,7 @@ class InitPreSacadorFragment ( } else { customDialog.setTitle("Atención") .setDescription("La colección " + collection + " sigue pendiente de preparar") - .setOkButton("Aceptar") { + .setOkButton(getString(R.string.accept)) { customDialog.dismiss() }.show() } diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/PreSacadorFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/PreSacadorFragment.kt index 5d7fef34..d6de5902 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/PreSacadorFragment.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/PreSacadorFragment.kt @@ -179,7 +179,7 @@ class PreSacadorFragment : if (it.isError) { ma.messageWithSound(it.errorMessage,true,false) /* customDialog.setTitle(getString(R.string.error)).setDescription(it.errorMessage) - .setOkButton("Aceptar") { + .setOkButton(getString(R.string.accept)) { customDialog.dismiss() }.show()*/ } @@ -201,7 +201,7 @@ class PreSacadorFragment : if (it.isError) { ma.messageWithSound(it.errorMessage,true,false) /* customDialog.setTitle(getString(R.string.error)).setDescription(it.errorMessage) - .setOkButton("Aceptar") { + .setOkButton(getString(R.string.accept)) { customDialog.dismiss() }.show()*/ } else { @@ -413,7 +413,7 @@ class PreSacadorFragment : /* customDialog.setTitle("Pre Sacador") .setDescription("No hemos podido obtener movimientos para el ticket escaneado") - .setKoButton("Cancelar") { + .setKoButton(getString(R.string.cancel)) { customDialog.dismiss() }.show()*/ } else { @@ -604,7 +604,7 @@ class PreSacadorFragment : vIsChecked = if (sales[position].picked == sales[position].quantity) "1" else "0", vOriginalQuantity = sales[position].picked.toString(), vStateFk = PRESACADOR, - vBuyFk = originalItemScan, callFunction = "saleTrackingReplace" + vBuyFk = originalItemScan ) @@ -615,7 +615,7 @@ class PreSacadorFragment : vIsChecked = if (sales[position].picked == sales[position].quantity) "1" else "0", vOriginalQuantity = sales[position].picked.toString(), vStateFk = PRESACADOR, - vBuyFk = originalItemScan, callFunction = "saleTrackingReplace" + vBuyFk = originalItemScan ) @@ -640,7 +640,7 @@ class PreSacadorFragment : setTotalLines() scanRequest() customDialog.dismiss() - }.setKoButton("Cancelar") { + }.setKoButton(getString(R.string.cancel)) { scanRequest() customDialog.dismiss() }.show() @@ -664,8 +664,8 @@ class PreSacadorFragment : password = getData(PASSWORD), itemFk = sales[position].itemFk, quantity = quantityGet, - shelvingFk = sales[position].carros[shelvingPosition].shelving, - callFunction = "itemPlacementSupplyAiming" + shelvingFk = sales[position].carros[shelvingPosition].shelving + ) } @@ -830,7 +830,7 @@ class PreSacadorFragment : /* private fun showScannerParking(ticket: String) { customDialogInputParking.setTitle("Parking").setDescription("Escanea el parking") - .setOkButton("Aceptar") { + .setOkButton(getString(R.string.accept)) { if (!customDialogInputParking.getValue().isNullOrEmpty()) { //findSale(customDialogInput.getValue(),index) parkingTicket(ticket, customDialogInputParking.getValue()) @@ -840,7 +840,7 @@ class PreSacadorFragment : scanRequest() customDialogInputParking.dismiss() hideKeyboards() - }.setKoButton("Cancelar") { + }.setKoButton(getString(R.string.cancel)) { customDialogInputParking.dismiss() }.setValue("").show() customDialogInputParking.getEditText().requestFocus() @@ -863,7 +863,7 @@ class PreSacadorFragment : /*private fun showScannerTicket() { customDialogInput.setTitle("Ticket a aparcar").setDescription("Escanea el ticket a aparcar") - .setOkButton("Aceptar") { + .setOkButton(getString(R.string.accept)) { if (!customDialogInput.getValue().isNullOrEmpty()) { showScannerParking(customDialogInput.getValue()) @@ -872,7 +872,7 @@ class PreSacadorFragment : scanRequest() customDialogInput.dismiss() hideKeyboards() - }.setKoButton("Cancelar") { + }.setKoButton(getString(R.string.cancel)) { customDialogInput.dismiss() }.setValue("").show() customDialogInput.getEditText().requestFocus() @@ -896,7 +896,7 @@ class PreSacadorFragment : private fun showScanner(index: Int, sale: PreSacadorItemVO) { customDialogInput.setTitle("" + sale.itemFk) - .setDescription("Escanea el carro para el item seleccionado").setOkButton("Aceptar") { + .setDescription("Escanea el carro para el item seleccionado").setOkButton(getString(R.string.accept)) { if (!customDialogInput.getValue().isNullOrEmpty()) { findSale(customDialogInput.getValue(), index) } @@ -904,7 +904,7 @@ class PreSacadorFragment : scanRequest() customDialogInput.dismiss() hideKeyboards() - }.setKoButton("Cancelar") { + }.setKoButton(getString(R.string.cancel)) { customDialogInput.dismiss() }.setValue("").show() customDialogInput.getEditText().requestFocus() @@ -1055,7 +1055,7 @@ class PreSacadorFragment : getString(R.string.Agregar) ) - }.setKoButton("Cancelar") { + }.setKoButton(getString(R.string.cancel)) { scanRequest() customDialogThreeButtons.dismiss() }.show() @@ -1101,7 +1101,7 @@ class PreSacadorFragment : quantity = totalQuantity.toString(), warehouseFk = getData(WAREHOUSEFK), type = "FALSE", - originalQuantity = quantity, callFunction = "collectionMissingTrash" + originalQuantity = quantity ) } @@ -1151,7 +1151,7 @@ class PreSacadorFragment : scanRequest() customDialogThreeButtons.dismiss() } - }.setKoButton("Cancelar") { + }.setKoButton(getString(R.string.cancel)) { scanRequest() customDialogThreeButtons.dismiss() }.show() @@ -1215,7 +1215,7 @@ class PreSacadorFragment : quantity = totalQuantity.toString(), warehouseFk = getData(WAREHOUSEFK), type = "FALSE", - originalQuantity = quantity, callFunction = "collectionMissingTrash" + originalQuantity = quantity ) //sales[position].originalQuantity = quantity try { @@ -1255,7 +1255,7 @@ class PreSacadorFragment : quantity = totalQuantity.toString(), warehouseFk = getData(WAREHOUSEFK), type = "TRUE", - originalQuantity = quantity, callFunction = "collectionMissingTrash" + originalQuantity = quantity ) //sales[position].originalQuantity = quantity try { @@ -1297,7 +1297,7 @@ class PreSacadorFragment : quantity = totalQuantity.toString(), warehouseFk = getData(WAREHOUSEFK), type = "reject", - originalQuantity = quantity, callFunction = "collectionMissingTrash" + originalQuantity = quantity ) //enviar mensaje a salix @@ -1330,8 +1330,7 @@ class PreSacadorFragment : usuario = getData(USER), password = getData(PASSWORD), saleFk = sales[position].idMovimiento, - quantity = quantity, - callFunction = "collection_increaseQuantity" + quantity = quantity ) try { @@ -1367,8 +1366,7 @@ class PreSacadorFragment : usuario = getData(USER), password = getData(PASSWORD), saleFk = sales[position].idMovimiento, - quantity = quantity, - callFunction = "collection_increaseQuantity" + quantity = quantity ) diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/PreSacadorViewModel.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/PreSacadorViewModel.kt index d45dbd6a..6e7af8c8 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/PreSacadorViewModel.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/PreSacadorViewModel.kt @@ -131,7 +131,7 @@ class PreSacadorViewModel(context: Context) : BaseViewModel() { usuario: String, password: String, collectionFk: String, - sectorFk: String, callFunction: String + sectorFk: String ) { getSacadorControladorUserCase.collectionStickerPrint( usuario, @@ -167,20 +167,19 @@ class PreSacadorViewModel(context: Context) : BaseViewModel() { usuario: String, password: String, ticketFk: String, - parking: String, - callFunction: String + parking: String ) { getUbicadorUserCase.shelvingPark(usuario, password, ticketFk, parking) - .enqueue(object : Callback { - override fun onFailure(call: Call, t: Throwable) { + .enqueue(object : Callback { + override fun onFailure(call: Call, t: Throwable) { _response.value = ResponseItemVO( isError = true, errorMessage = getMessageFromAllResponse(nameofFunction(this), t.message!!) ) } - override fun onResponse(call: Call, response: Response) { - if (response.body() == null) { + override fun onResponse(call: Call, response: Response) { + if (!response.isSuccessful) { _response.value = ResponseItemVO( isError = true, errorMessage = getMessageFromAllResponse( @@ -190,7 +189,7 @@ class PreSacadorViewModel(context: Context) : BaseViewModel() { ) } else { _response.value = - ResponseItemVO(isError = false, response = response.body()!!) + ResponseItemVO(isError = false, response = response.message()) } } }) @@ -232,7 +231,7 @@ class PreSacadorViewModel(context: Context) : BaseViewModel() { password: String, shelvingFk: String, quantity: String, - itemFk: String, callFunction: String + itemFk: String ) { getSacadorControladorUserCase.itemPlacementSupplyAiming( usuario, @@ -321,7 +320,7 @@ class PreSacadorViewModel(context: Context) : BaseViewModel() { vOriginalQuantity: String, vStateFk: String, vIsChecked: String, - vBuyFk: String, callFunction: String + vBuyFk: String ) { //Lo ultimo que se envia //sergio: se quita el 0 que habia por defecto para la previa se añada el buyFk que sera el item escaneado. @@ -458,7 +457,7 @@ class PreSacadorViewModel(context: Context) : BaseViewModel() { quantity: String, type: String, warehouseFk: String, - originalQuantity: String, callFunction: String + originalQuantity: String ) { getSacadorControladorUserCase.collectionMissingTrash( usuario, @@ -497,7 +496,7 @@ class PreSacadorViewModel(context: Context) : BaseViewModel() { usuario: String, password: String, saleFk: String, - quantity: String, callFunction: String + quantity: String ) { getSacadorControladorUserCase.collectionIncreaseQuantity( usuario, @@ -612,8 +611,7 @@ class PreSacadorViewModel(context: Context) : BaseViewModel() { fun sectorCollection_new( usuario: String, password: String, - sectorFk: String, - callFunction: String + sectorFk: String ) { getPreSacadorUseCase.sectorCollection_new(usuario, password, sectorFk).enqueue( object : @@ -710,8 +708,7 @@ class PreSacadorViewModel(context: Context) : BaseViewModel() { usuario: String, password: String, vSaleGroupFk: String, - vSectorCollectionFk: String, - callFunction: String + vSectorCollectionFk: String ) { getPreSacadorUseCase.sectorCollectionSaleGroup_add( usuario, @@ -764,8 +761,7 @@ class PreSacadorViewModel(context: Context) : BaseViewModel() { fun saleTracking_addPrevOK( usuario: String, password: String, - vSectorCollectionFk: String, - callFunction: String + vSectorCollectionFk: String ) { getPreSacadorUseCase.saleTracking_addPrevOK(usuario, password, vSectorCollectionFk).enqueue( object : @@ -815,8 +811,7 @@ class PreSacadorViewModel(context: Context) : BaseViewModel() { usuario: String, password: String, vSaleFk: String, - vIsChecked: String, - callFunction: String + vIsChecked: String ) { getPreSacadorUseCase.saleTracking_updateIsChecked(usuario, password, vSaleFk, vIsChecked) .enqueue( @@ -868,8 +863,7 @@ class PreSacadorViewModel(context: Context) : BaseViewModel() { usuario: String, password: String, saleFk: String, - visible: String, - callFunction: String + visible: String ) { getSacadorControladorUserCase.itemShelving_updateFromSale( usuario, diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/qr/QrFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/qr/QrFragment.kt index c2492e8f..03975d6b 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/qr/QrFragment.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/qr/QrFragment.kt @@ -85,14 +85,14 @@ class QrFragment( // getMessageFromJSON(it.errorMessage) ma.messageWithSound(it.errorMessage+ " "+itemscaned,true,false) /*customDialog.setTitle(getString(R.string.error)).setDescription( it.errorMessage+ " "+itemscaned) - .setOkButton("Aceptar") { + .setOkButton(getString(R.string.accept)) { customDialog.dismiss() }.show()*/ } else { - customDialog.setTitle("Mensaje") - .setDescription("Operación " + itemscaned + ". " + it.response) - .setOkButton("Aceptar") { + customDialog.setTitle(getString(R.string.info)) + .setDescription(getString(R.string.operation) + itemscaned + ". " + it.response) + .setOkButton(getString(R.string.accept)) { customDialog.dismiss() binding.mainToolbar.backButton.performClick() }.show() diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/reposicion/fragment/ReposicionFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/reposicion/fragment/ReposicionFragment.kt index 5f78bbf4..a94a5e94 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/reposicion/fragment/ReposicionFragment.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/reposicion/fragment/ReposicionFragment.kt @@ -105,14 +105,14 @@ class ReposicionFragment : BaseFragment 0) { sales.clear() saleAdapter!!.notifyDataSetChanged() @@ -356,8 +356,7 @@ class ReposicionFragment : BaseFragment { - override fun onFailure(call: Call, t: Throwable) { + .enqueue(object : Callback { + override fun onFailure(call: Call, t: Throwable) { _response.value = ResponseItemVO( isError = true, errorMessage = getMessageFromAllResponse(nameofFunction(this), t.message!!) ) } - override fun onResponse(call: Call, response: Response) { - if (response.body() == null) { + override fun onResponse(call: Call, response: Response) { + if (!response.isSuccessful) { _response.value = ResponseItemVO( isError = true, errorMessage = getMessageFromAllResponse( @@ -97,7 +97,7 @@ class ReposicionViewModel(context: Context) : BaseViewModel() { ) } else { _response.value = - ResponseItemVO(isError = false, response = response.body()!!) + ResponseItemVO(isError = false, response = response.message()) } } }) @@ -108,8 +108,8 @@ class ReposicionViewModel(context: Context) : BaseViewModel() { password: String, shelvingFk: String, quantity: String, - itemFk: String, - callFunction: String + itemFk: String + ) { getSacadorControladorUserCase.itemPlacementSupplyAiming( usuario, @@ -186,8 +186,8 @@ class ReposicionViewModel(context: Context) : BaseViewModel() { password: String, itemShelvingFk: String, itemPlacementSupplyFk: String, - quantity: String, - callFunction: String + quantity: String + ) { getSacadorControladorUserCase.itemShelvingPlacementSupplyAdd( usuario, diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/sacador/fragment/SacadorFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/sacador/fragment/SacadorFragment.kt index 662061a8..c904a01a 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/sacador/fragment/SacadorFragment.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/sacador/fragment/SacadorFragment.kt @@ -207,7 +207,7 @@ class SacadorFragment : /* collectionTicketList.observe(viewLifecycleOwner, Observer { binding.splashProgress_two.visibility = View.GONE if (it.isError){ - customDialog.setTitle(getString(R.string.error)).setDescription(it.errorMessage).setOkButton("Aceptar"){ + customDialog.setTitle(getString(R.string.error)).setDescription(it.errorMessage).setOkButton(getString(R.string.accept)){ customDialog.dismiss() }.show() }else{ @@ -300,7 +300,7 @@ class SacadorFragment : } else { customDialog.setTitle("Atención") .setDescription("La colección " + collection + " sigue pendiente de preparar") - .setOkButton("Aceptar") { + .setOkButton(getString(R.string.accept)) { customDialog.dismiss() }.show() } diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorFragment.kt index e8d4430d..ae88b5db 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorFragment.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorFragment.kt @@ -98,7 +98,7 @@ class UbicadorFragment( if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { iconReload.tooltipText = getTooltip(R.drawable.ic_autorenew_black_24dp) - iconAdd.tooltipText = "Añade item al carro" + iconAdd.tooltipText = getString(R.string.addItemShelving) } listIcons.add(iconAdd) listIcons.add(iconReload) @@ -184,24 +184,24 @@ class UbicadorFragment( entryPoint = shelvingFk ) else - "Escanea una matrícula".toast(requireActivity(), Toast.LENGTH_SHORT) + getString(R.string.scanShelving).toast(requireActivity(), Toast.LENGTH_SHORT) } binding.parkingImg.setOnClickListener { - customDialogInput.setTitle("Aparcar carro").setValue("").setOkButton("Aparcar") { + customDialogInput.setTitle(getString(R.string.parkingShelving)).setValue("").setOkButton(getString( + R.string.parking)) { viewModel.shelvingPark( getData(USER), getData(PASSWORD), shelvingFk, - customDialogInput.getValue(), - "shelvingPark" + customDialogInput.getValue() ) parking = customDialogInput.getValue() binding.mainToolbar.toolbarTitle.text = shelvingFk.uppercase() + " P: " + parking + " E: " + etiquetas if (mpok != null) mpok!!.start() customDialogInput.dismiss() - }.setKoButton("Cancelar") { + }.setKoButton(getString(R.string.cancel)) { customDialogInput.dismiss() }.show() @@ -214,8 +214,7 @@ class UbicadorFragment( getData(USER), getData(PASSWORD), shelvingFk, - customDialogInput.getValue(), - "shelvingPark" + customDialogInput.getValue() ) customDialogInput.dismiss() parking = customDialogInput.getValue() @@ -237,7 +236,7 @@ class UbicadorFragment( } binding.editImg.setOnClickListener { - customDialogInput.setTitle("Cambiar matrícula").setValue("").setOkButton("Guardar") { + customDialogInput.setTitle("Cambiar matrícula").setValue("").setOkButton(getString(R.string.save)) { viewModel.shelvingChange( getData(USER), getData(PASSWORD), @@ -249,7 +248,7 @@ class UbicadorFragment( shelvingFk.uppercase() + " P: " + parking + " E: " + etiquetas if (mpok != null) mpok!!.start() customDialogInput.dismiss() - }.setKoButton("Cancelar") { + }.setKoButton(getString(R.string.cancel)) { customDialogInput.dismiss() }.show() @@ -291,7 +290,7 @@ class UbicadorFragment( adapter!!.notifyDataSetChanged() } customDialog.dismiss() - }.setKoButton("Cancelar") { + }.setKoButton(getString(R.string.cancel)) { customDialog.dismiss() }.show() @@ -302,13 +301,13 @@ class UbicadorFragment( private fun setTooltips() { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { - binding.editImg.tooltipText = "Permite cambiar la matrícula al carro" - binding.deleteImg.tooltipText = "Borra todos los items del carro" + binding.editImg.tooltipText = getTooltip(R.drawable.ic_mode_edit_black_24dp) + binding.deleteImg.tooltipText = getTooltip(R.drawable.ic_delete_forever_black_24dp) binding.editPrioridad.tooltipText = - "Cambia la prioridad de los items del carro. Cuanto más alta antes cogerán los sacadores." - binding.parkingImg.tooltipText = "Permite aparcar el carro" - binding.automaticImg.tooltipText = - "Permite añadir items al carro de manera continuada. No uno a uno" + getString(R.string.changePriority) + binding.parkingImg.tooltipText = getTooltip(R.drawable.ic_local_parking_black_24dp) + binding.automaticImg.tooltipText =getTooltip(R.drawable.ic_flash_auto_black_24dp) + } } @@ -382,6 +381,8 @@ class UbicadorFragment( .setOkButton(getString(R.string.close)) { customDialog.dismiss() }.show()*/ + }else{ + ma.messageWithSound(getString(R.string.Aparcado), it.isError, true) } }) @@ -426,11 +427,11 @@ class UbicadorFragment( itemUbicador: ItemUbicadorVO, grouping: String ) { - var title = "Nuevo Item" - if (delete) title = "Editar item " + itemFk + var title = getString(R.string.newItem) + if (delete) title = getString(R.string.editItem) + itemFk customDialogUbicador.setTitle(title).setItemValue(itemFk).setPackingValue(packing) .setGroupingValue(grouping).setEtiquetaValue(etiquetas).setVisibleValue(visible) - .setOkButton("Guardar") { + .setOkButton(getString(R.string.save)) { var packingUpdate = false if (packing != customDialogUbicador.getPackingValue() || etiquetas != customDialogUbicador.getEtiquetaValue()) { packingUpdate = true @@ -561,7 +562,7 @@ class UbicadorFragment( customDialogUbicador.dismiss() } else { - "Rellena campos obligatorios".toast( + getString(R.string.fillFields).toast( (activity as MainActivity), Toast.LENGTH_LONG ) @@ -628,7 +629,7 @@ class UbicadorFragment( customDialogUbicador.dismiss() } else { - "Rellena campos obligatorios".toast( + getString(R.string.fillFields).toast( (activity as MainActivity), Toast.LENGTH_LONG ) @@ -636,7 +637,7 @@ class UbicadorFragment( } } else { - "Packing obligatorio".toast((activity as MainActivity), Toast.LENGTH_LONG) + getString(R.string.mandatoryPacking).toast((activity as MainActivity), Toast.LENGTH_LONG) } } @@ -670,7 +671,7 @@ class UbicadorFragment( } private fun showMoreOptions(item: ItemUbicadorVO) { - customDialogTwoButtons.setTitle(item.item).setDescription("Selecciona una acción") + customDialogTwoButtons.setTitle(item.item).setDescription(getString(R.string.selectAction)) .setOkButton("Transferir") { customDialogInput.setTitle("Nueva matrícula") .setDescription("Introduce el destino para item: " + item.item).setValue("") @@ -690,7 +691,7 @@ class UbicadorFragment( } - }.setKoButton("Cancelar") { + }.setKoButton(getString(R.string.cancel)) { customDialogInput.dismiss() }.show() customDialogInput.getEditText().requestFocus() @@ -711,10 +712,10 @@ class UbicadorFragment( false } customDialogTwoButtons.dismiss() - }.setOkButtonTwo("Eliminar") { - customDialog.setTitle("Confirmar") + }.setOkButtonTwo(getString(R.string.delete)) { + customDialog.setTitle(getString(R.string.confirm)) .setDescription("Confirmas eliminar el artículo: " + item.item + "?") - .setOkButton("Eliminar") { + .setOkButton(getString(R.string.delete)) { listItems.remove(item) adapter!!.notifyDataSetChanged() viewModel.itemShelvingDelete( @@ -723,12 +724,12 @@ class UbicadorFragment( ) customDialogTwoButtons.dismiss() customDialog.dismiss() - }.setKoButton("Cancelar") { + }.setKoButton(getString(R.string.cancel)) { customDialog.dismiss() customDialogTwoButtons.dismiss() }.show() - }.setKoButton("Cancelar") { + }.setKoButton(getString(R.string.cancel)) { customDialogTwoButtons.dismiss() }.show() } diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorViewModel.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorViewModel.kt index e41ae6f6..c4dc0111 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorViewModel.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorViewModel.kt @@ -229,20 +229,19 @@ class UbicadorViewModel(context: Context) : BaseViewModel() { usuario: String, password: String, shelving: String, - parking: String, - callFunction: String + parking: String ) { getUbicadorUserCase.shelvingPark(usuario, password, shelving, parking) - .enqueue(object : Callback { - override fun onFailure(call: Call, t: Throwable) { + .enqueue(object : Callback { + override fun onFailure(call: Call, t: Throwable) { _response.value = ResponseItemVO( isError = true, errorMessage = getMessageFromAllResponse(nameofFunction(this), t.message!!) ) } - override fun onResponse(call: Call, response: Response) { - if (response.body() == null) { + override fun onResponse(call: Call, response: Response) { + if (!response.isSuccessful) { _response.value = ResponseItemVO( isError = true, errorMessage = getMessageFromAllResponse( @@ -252,7 +251,7 @@ class UbicadorViewModel(context: Context) : BaseViewModel() { ) } else { _response.value = - ResponseItemVO(isError = false, response = response.body()!!) + ResponseItemVO(isError = false, response = response.message()) } } }) diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/workermistake/fragment/WorkermistakeFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/workermistake/fragment/WorkermistakeFragment.kt index 40088e21..cddff3e3 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/workermistake/fragment/WorkermistakeFragment.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/workermistake/fragment/WorkermistakeFragment.kt @@ -210,7 +210,8 @@ class WorkermistakeFragment( var entryPoint: String = "" } - customDialogList.setTitle("Causa de error para : ${workerMistakeName!!.firstName}").setKoButton("Cancelar") { + customDialogList.setTitle(getString(R.string.errorCause)+ workerMistakeName!!.firstName).setKoButton(getString( + R.string.cancel)) { customDialogList.dismiss() }.hideDialog().show() @@ -223,7 +224,7 @@ class WorkermistakeFragment( var entryPoint: String = "" viewModel.workerMistake_Add(usuario = getData(USER), password = getData(PASSWORD), vUserFk = workerMistakeName!!.id, - vTypeFk = it.code, callFunction ="workerMistake_Add" + vTypeFk = it.code ) // "Causa del error registrado".toast(requireContext()) customDialogList.dismiss() diff --git a/app/src/main/res/layout/component_custom_dialog.xml b/app/src/main/res/layout/component_custom_dialog.xml index 3a9b6196..7dc3a199 100644 --- a/app/src/main/res/layout/component_custom_dialog.xml +++ b/app/src/main/res/layout/component_custom_dialog.xml @@ -47,7 +47,7 @@ android:layout_width="match_parent" android:layout_marginTop="@dimen/default_layout_margin" android:visibility="gone" - tools:text="Eliminar" + tools:text="@string/delete" tools:visibility="visible" />