diff --git a/.gitignore b/.gitignore index 1f068434..2bf3015d 100644 --- a/.gitignore +++ b/.gitignore @@ -9,6 +9,7 @@ /.idea/assetWizardSettings.xml .DS_Store /build +/app/release /captures .externalNativeBuild .cxx diff --git a/.idea/misc.xml b/.idea/misc.xml index f6be540e..aa4aa967 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -3,6 +3,7 @@ - - - - + + + + + - + + + + + + - + + + + + - - + + + + + + + + + + + + + - - - - - + + + + + - - - - - + + + + @@ -245,9 +265,10 @@ + - + @@ -280,7 +301,7 @@ - + @@ -433,13 +454,6 @@ @@ -878,7 +899,6 @@ @@ -914,20 +935,16 @@ + diff --git a/app/build.gradle b/app/build.gradle index d28ec1d9..c1aefb23 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -13,13 +13,12 @@ android { applicationId "es.verdnatura" minSdkVersion 21 //21 targetSdkVersion 30 - versionCode 143 - versionName = "9.5Beta" - //versionName = "9.3.1" versionCode 142 - //versionName = "9.4.2Beta" versionCode 142 - //versionName = "9.4Beta" versionCode 140 - //versionName = 9.2 - //versionName = "9.3.2Beta" versionCode 139 + versionCode 144 + //versionName = "9.4" versionCode 143 + //versionName = "9.5Beta" versionCode 143 + versionName = "9.6Beta" + + diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json index 51890a09..5a310009 100644 --- a/app/release/output-metadata.json +++ b/app/release/output-metadata.json @@ -11,8 +11,8 @@ "type": "SINGLE", "filters": [], "attributes": [], - "versionCode": 142, - "versionName": "9.3.1", + "versionCode": 143, + "versionName": "9.4", "outputFile": "app-release.apk" } ], diff --git a/app/src/main/java/es/verdnatura/MobileApplication.kt b/app/src/main/java/es/verdnatura/MobileApplication.kt index 17eb00f2..d31b0e69 100644 --- a/app/src/main/java/es/verdnatura/MobileApplication.kt +++ b/app/src/main/java/es/verdnatura/MobileApplication.kt @@ -2,25 +2,33 @@ package es.verdnatura import android.app.Application import android.content.SharedPreferences +import android.media.MediaPlayer import es.verdnatura.di.viewModelModule import es.verdnatura.domain.RestClient import es.verdnatura.domain.SalixService import es.verdnatura.domain.VerdnaturaService +import es.verdnatura.presentation.view.component.CustomDialogMainActivity import org.koin.android.ext.koin.androidContext import org.koin.core.context.loadKoinModules import org.koin.core.context.startKoin -class MobileApplication: Application() { +class MobileApplication : Application() { lateinit var silex: VerdnaturaService lateinit var salix: SalixService var userId: Int? = null + var mperror: MediaPlayer? = null + var mpok: MediaPlayer? = null + private lateinit var customDialog: CustomDialogMainActivity + protected val PREFS_USER = "es.verdnatura.user.prefs" override fun onCreate() { super.onCreate() - - startKoin { androidContext(this@MobileApplication) + mperror = MediaPlayer.create((this), R.raw.error) + mpok = MediaPlayer.create((this), R.raw.ok) + startKoin { + androidContext(this@MobileApplication) val moduleList = listOf(viewModelModule) loadKoinModules(moduleList) } @@ -34,4 +42,5 @@ class MobileApplication: Application() { val prefs: SharedPreferences = getSharedPreferences(PREFS_USER, 0) return prefs.edit() } + } \ No newline at end of file diff --git a/app/src/main/java/es/verdnatura/domain/ApiSalixUtils.kt b/app/src/main/java/es/verdnatura/domain/ApiSalixUtils.kt index fb40d72d..0565cc3a 100644 --- a/app/src/main/java/es/verdnatura/domain/ApiSalixUtils.kt +++ b/app/src/main/java/es/verdnatura/domain/ApiSalixUtils.kt @@ -2,8 +2,10 @@ package es.verdnatura.domain import android.content.Context import androidx.preference.PreferenceManager +import okhttp3.OkHttpClient import retrofit2.Retrofit import retrofit2.converter.gson.GsonConverterFactory +import java.util.concurrent.TimeUnit class ApiSalixUtils { companion object { @@ -12,9 +14,30 @@ class ApiSalixUtils { const val BASE_URL: String = "https://salix.verdnatura.es/api/" fun getApiService(context: Context): SalixService { - val salixRetrofit = Retrofit.Builder().baseUrl(getBaseUrlLocal(context = context)).addConverterFactory( + + var salixClient = OkHttpClient.Builder() + .addInterceptor(SalixInterceptor(context)) + .connectTimeout(10, TimeUnit.SECONDS) + .writeTimeout(10, TimeUnit.SECONDS) + .readTimeout(40, TimeUnit.SECONDS) + .build() + + /* val salixRetrofit = Retrofit.Builder() + .baseUrl(ApiUtils.getBaseUrlLocal(context)) + .addConverterFactory(GsonConverterFactory.create()) + .client(salixClient) + .build() + + return salixRetrofit.create(SalixService::class.java)*/ + + + val salixRetrofit = Retrofit.Builder() + .client(salixClient) + .baseUrl(getBaseUrlLocal(context = context)) + .addConverterFactory( GsonConverterFactory.create() ).build() + //d("VERDNATURA::","El server Salix es "+getBaseUrlLocal(context = context)) return salixRetrofit.create(SalixService::class.java) } diff --git a/app/src/main/java/es/verdnatura/domain/GetAjustesUserCase.kt b/app/src/main/java/es/verdnatura/domain/GetAjustesUserCase.kt index f6ece6db..c3434146 100644 --- a/app/src/main/java/es/verdnatura/domain/GetAjustesUserCase.kt +++ b/app/src/main/java/es/verdnatura/domain/GetAjustesUserCase.kt @@ -8,51 +8,62 @@ import retrofit2.Call class GetAjustesUserCase(context: Context) : RestClient(context) { - fun getSectors(usuario: String, password: String): Call> { - return restClient!!.getSectors("json", "1", usuario, password, "application/json") + fun getSectors(): Call> { + return restClient!!.getSectors() } - fun getSectorsSalix(token:String): Call> { - return salixClient!!.getSectorsSalix(content_type = "application/json", authorization = token) + fun getSectorsSalix(): Call> { + return salixClient!!.getSectorsSalix( + ) } - fun worker_updateSector(usuario: String, password: String,sectorFk:String): Call { + + fun worker_updateSector(sectorFk: String): Call { val params: ArrayList = ArrayList() params.add(sectorFk) - return restClient!!.worker_updateSector("json", "1", usuario, password, "application/json",params) + return restClient!!.worker_updateSector( + params + ) } - fun operator_updateItemPackingType(usuario: String, password: String,itemPackingTypeFk:String): Call { + + fun operator_updateItemPackingType( + itemPackingTypeFk: String + ): Call { val params: ArrayList = ArrayList() params.add(itemPackingTypeFk) - return restClient!!.operator_updateItemPackingType("json", "1", usuario, password, "application/json",params) - } - fun worker_updatePrinter(usuario: String, password: String,labelerFk:String): Call { - val params: ArrayList = ArrayList() - params.add(labelerFk) - return restClient!!.worker_updatePrinter("json", "1", usuario, password, "application/json",params) + return restClient!!.operator_updateItemPackingType( + params + ) } - fun printer_get(usuario: String, password: String): Call> { - return restClient!!.printer_get("json", "1", usuario, password, "application/json") - } - fun train_get(usuario: String, password: String): Call> { - return restClient!!.train_get("json", "1", usuario, password, "application/json") - } - fun operator_getTrain(usuario: String, password: String): Call { + fun worker_updatePrinter(labelerFk: String): Call { - return restClient!!.operator_getTrain("json", "1", usuario, password, "application/json") - } - fun operator_getItemPackingType(usuario: String, password: String): Call { - - return restClient!!.operator_getItemPackingType("json", "1", usuario, password, "application/json") - } - fun worker_isF11Allowed(usuario: String, password: String): Call { - - return restClient!!.worker_isF11Allowed("json", "1", usuario, password, "application/json") + return restClient!!.worker_updatePrinter( + labelerFk + ) } - fun operator_updateTrain(usuario: String, password: String,trainFk:String): Call { - val params: ArrayList = ArrayList() - params.add(trainFk) - return restClient!!.operator_updateTrain("json", "1", usuario, password, "application/json",params) + fun printer_get(): Call> { + return restClient!!.printer_get() + } + + fun train_get(): Call> { + return restClient!!.train_get() + } + + fun operator_getTrain(): Call { + return restClient!!.operator_getTrain() + } + + fun operator_getItemPackingType(): Call { + return restClient!!.operator_getItemPackingType() + } + + fun worker_isF11Allowed(): Call { + return restClient!!.worker_isF11Allowed() + } + fun operator_updateTrain( trainFk: String): Call { + return restClient!!.operator_updateTrain( + trainFk + ) } } \ No newline at end of file diff --git a/app/src/main/java/es/verdnatura/domain/GetInventaryUserCase.kt b/app/src/main/java/es/verdnatura/domain/GetInventaryUserCase.kt index 5c105507..c0c947e1 100644 --- a/app/src/main/java/es/verdnatura/domain/GetInventaryUserCase.kt +++ b/app/src/main/java/es/verdnatura/domain/GetInventaryUserCase.kt @@ -8,39 +8,15 @@ import retrofit2.Call class GetInventaryUserCase(context: Context) : RestClient(context) { - /* fun itemShelvingRadar( - usuario: String, - password: String, - sectorFk: String - ): Call> { - val params: ArrayList = ArrayList() - params.add(sectorFk) - return restClient!!.itemShelvingRadar( - "json", - "1", - usuario, - password, - "application/json", - params = params - ) - }*/ - fun itemShelvingRadarFilterBuyer( - usuario: String, - password: String, - buyerFk: String, - warehouseFk: String + buyerFk: Int, + warehouseFk: Int ): Call> { - val params: ArrayList = ArrayList() + val params: ArrayList = ArrayList() params.add(buyerFk) params.add(warehouseFk) return restClient!!.itemShelvingRadarFilterBuyer( - "json", - "1", - usuario, - password, - "application/json", - params = params + buyerFk, warehouseFk ) } diff --git a/app/src/main/java/es/verdnatura/domain/GetItemCardUserCase.kt b/app/src/main/java/es/verdnatura/domain/GetItemCardUserCase.kt index 7aac30fc..7e5f895e 100644 --- a/app/src/main/java/es/verdnatura/domain/GetItemCardUserCase.kt +++ b/app/src/main/java/es/verdnatura/domain/GetItemCardUserCase.kt @@ -66,10 +66,8 @@ class GetItemCardUserCase(context: Context) : RestClient(context) { ) } - fun getItemPackingTypeSalix(token: String): Call> { + fun getItemPackingTypeSalix(): Call> { return salixClient!!.get_ItemPackingType( - content_type = "application/json", - authorization = token ) } diff --git a/app/src/main/java/es/verdnatura/domain/GetLoginUserCase.kt b/app/src/main/java/es/verdnatura/domain/GetLoginUserCase.kt index a963aaeb..fc44ff1f 100644 --- a/app/src/main/java/es/verdnatura/domain/GetLoginUserCase.kt +++ b/app/src/main/java/es/verdnatura/domain/GetLoginUserCase.kt @@ -6,53 +6,33 @@ import es.verdnatura.presentation.view.feature.ajustes.model.SectorItemVO import es.verdnatura.presentation.view.feature.login.model.* import retrofit2.Call -class GetLoginUserCase(context: Context) : RestClient(context) -{ +class GetLoginUserCase(context: Context) : RestClient(context) { fun device_checkLogin( usuario: String, - password: String, android_id: String - ): Call - { - val params: ArrayList = ArrayList() - params.add(usuario) - params.add(android_id) - + ): Call { return restClient!!.device_checkLogin( - "json", - "1", - usuario, - password, - "application/json", - params - ) + usuario, android_id + ) } fun deviceLog_add( - usuario: String, - password: String, app: String, versionApp: String, android_id: String - ): Call - { + ): Call { val params: ArrayList = ArrayList() params.add(app) params.add(versionApp) params.add(android_id) return restClient!!.deviceLog_add( - "json", - "1", - usuario, - password, - "application/json", + params - ) + ) } - fun salixLogin(usuario: String, password: String): Call - { + fun salixLogin(usuario: String, password: String): Call { return salixClient!!.login("application/json", LoginSalixVO(usuario, password)) } //NODEJS TEST @@ -72,50 +52,49 @@ class GetLoginUserCase(context: Context) : RestClient(context) // SE CAMBIA VARIABLE A TRUE/FALSE -fun sendChekingPresence(token:String,workerId:Int,message:String) : Call{ + fun sendChekingPresence(token: String, workerId: Int, message: String): Call { - var working_in_test=false // Enviar a grupo test Android o a los usuarios - if (!working_in_test) { + var working_in_test = false // Enviar a grupo test Android o a los usuarios + if (!working_in_test) { - return salixClient!!.sendChekingPresence( - content_type = "application/json", - authorization = token, - params = SalixMessageVO(workerId = workerId, message = message) - ) - }else{ + return salixClient!!.sendChekingPresence( + content_type = "application/json", + authorization = token, + params = SalixMessageVO(workerId = workerId, message = message) + ) + } else { - return salixClientSend!!.sendGroup( - content_type = "application/json", - authorization = token, - params = SalixGrupo(to = "#android-test", message = message)) - } + return salixClientSend!!.sendGroup( + content_type = "application/json", + authorization = token, + params = SalixGrupo(to = "#android-test", message = message) + ) + } } - /*fun sendChekingPresence(token: String, workerId: Int, message: String): Call -{ - return salixClient!!.sendGroup( - content_type = "application/json", - authorization = token, - params = SalixGrupo(to = "#android-test", message = message) - ) -}*/ + /*fun sendChekingPresence(token: String, workerId: Int, message: String): Call + { + return salixClient!!.sendGroup( + content_type = "application/json", + authorization = token, + params = SalixGrupo(to = "#android-test", message = message) + ) + }*/ + + fun checkVersion(nameApp: String): Call { + return restClient!!.getVersion(nameApp) + } -fun checkVersion(usuario: String, password: String, nameApp: String): Call -{ -val params: ArrayList = ArrayList() -params.add(nameApp) -return restClient!!.getVersion("json", "1", usuario, password, "application/json", params) -} fun worker_getSector(usuario: String, password: String): Call { return restClient!!.worker_getSector("json", "1", usuario, password, "application/json") } - fun operator_getNumberOfWagons(usuario: String, password: String): Call { - - return restClient!!.operator_getNumberOfWagons("json", "1", usuario, password, "application/json") + fun operator_getNumberOfWagons(): Call { + return restClient!!.operator_getNumberOfWagons( + ) } fun operator_add(usuario: String, password: String): Call { diff --git a/app/src/main/java/es/verdnatura/domain/GetPaletizadoresUserCase.kt b/app/src/main/java/es/verdnatura/domain/GetPaletizadoresUserCase.kt index 911f6865..b878de48 100644 --- a/app/src/main/java/es/verdnatura/domain/GetPaletizadoresUserCase.kt +++ b/app/src/main/java/es/verdnatura/domain/GetPaletizadoresUserCase.kt @@ -280,8 +280,6 @@ class GetPaletizadoresUserCase(context: Context) : RestClient(context) { password: String, vPalletFk: String - - ): Call { val params: ArrayList = ArrayList() params.add(vPalletFk) diff --git a/app/src/main/java/es/verdnatura/domain/GetSacadorControladorUserCase.kt b/app/src/main/java/es/verdnatura/domain/GetSacadorControladorUserCase.kt index 28cd7b11..13733bbf 100644 --- a/app/src/main/java/es/verdnatura/domain/GetSacadorControladorUserCase.kt +++ b/app/src/main/java/es/verdnatura/domain/GetSacadorControladorUserCase.kt @@ -1,7 +1,9 @@ package es.verdnatura.domain import android.content.Context -import es.verdnatura.presentation.view.feature.collection.* +import es.verdnatura.presentation.view.feature.collection.SalixSaleQuantity +import es.verdnatura.presentation.view.feature.collection.listSaleSalix +import es.verdnatura.presentation.view.feature.collection.saleSalix import es.verdnatura.presentation.view.feature.sacador.model.CollectionVO import es.verdnatura.presentation.view.feature.sacador.model.MistakeTypeVO import es.verdnatura.presentation.view.feature.sacador.model.PlacementSupplyVO @@ -101,6 +103,7 @@ class GetSacadorControladorUserCase(context: Context) : RestClient(context) { params ) } + fun collection_getUncheckedTicket( usuario: String, password: String, @@ -119,16 +122,8 @@ class GetSacadorControladorUserCase(context: Context) : RestClient(context) { } fun collection_assign( - usuario: String, - password: String ): Call { - return restClient!!.collection_assign( - "json", - "1", - usuario, - password, - "application/json" ) } @@ -176,16 +171,18 @@ class GetSacadorControladorUserCase(context: Context) : RestClient(context) { } - fun collectionGet(usuario: String, password: String): Call> { + fun collectionGet(): Call> { // val params:ArrayList = ArrayList() - return restClient!!.collectionGet("json", "1", usuario, password, "application/json") + return restClient!!.collectionGet() } - - fun collectionGetSalix(token:String): Call> { + fun collectionGetSalix(token: String): Call> { // val params:ArrayList = ArrayList() - return salixClient!!.getCollectionSalix(content_type = "application/json", authorization = token) + return salixClient!!.getCollectionSalix( + content_type = "application/json", + authorization = token + ) } fun saleTrackingReplace( @@ -221,8 +218,8 @@ class GetSacadorControladorUserCase(context: Context) : RestClient(context) { vStateFk: String, vIsChecked: String, vBuyFk: String, - vItemShelvingFk:String, - vQuantity:String + vItemShelvingFk: String, + vQuantity: String ): Call { val params: ArrayList = ArrayList() params.add(saleFk) @@ -310,11 +307,11 @@ class GetSacadorControladorUserCase(context: Context) : RestClient(context) { usuario: String, password: String, collectionFk: String, - sectorFk: String + labelCount: String ): Call { val params: ArrayList = ArrayList() params.add(collectionFk) - params.add(sectorFk) + if (labelCount.isNotEmpty()) params.add(labelCount) return restClient!!.collectionStickerPrint( "json", "1", @@ -347,8 +344,8 @@ class GetSacadorControladorUserCase(context: Context) : RestClient(context) { fun item_updatePackingShelve( usuario: String, password: String, - vSelf : String, - vPacking : String + vSelf: String, + vPacking: String ): Call { val params: ArrayList = ArrayList() params.add(vSelf) @@ -474,6 +471,7 @@ class GetSacadorControladorUserCase(context: Context) : RestClient(context) { params ) } + fun itemShelving_updateFromSale(usuario: String, password: String, saleFk: String): Call { val params: ArrayList = ArrayList() params.add(saleFk) @@ -486,6 +484,7 @@ class GetSacadorControladorUserCase(context: Context) : RestClient(context) { params ) } + fun ticket_setState( usuario: String, password: String, @@ -504,23 +503,17 @@ class GetSacadorControladorUserCase(context: Context) : RestClient(context) { params ) } - fun debug_add( - usuario: String, - password: String, - buyFk: String, - message: String - ): Call { - val params: ArrayList = ArrayList() - params.add(buyFk) - params.add(message) - return restClient!!.debug_add( - "json", - "1", - usuario, - password, - "application/json", - params - ) + + fun debug_add( + buyFk: String, + message: String + ): Call { + val params: ArrayList = ArrayList() + params.add(buyFk) + params.add(message) + return restClient!!.debug_add( + params + ) } @@ -543,7 +536,7 @@ class GetSacadorControladorUserCase(context: Context) : RestClient(context) { return salixClient!!.barcodes_toitem( "application/json", authorization = token, - barCodeValue=barCodeValue + barCodeValue = barCodeValue ) } @@ -570,11 +563,11 @@ class GetSacadorControladorUserCase(context: Context) : RestClient(context) { fun transferSalesSalix( token: String, - ticketFk:String, + ticketFk: String, saleFk: String, quantity: String, - ): Call { + ): Call { var saleTransfer = listSaleSalix(mutableListOf()) saleTransfer.sales.add(saleSalix(id = saleFk.toInt(), quantity = quantity.toInt())) diff --git a/app/src/main/java/es/verdnatura/domain/GetUbicadorUserCase.kt b/app/src/main/java/es/verdnatura/domain/GetUbicadorUserCase.kt index aebd28de..7f199d55 100644 --- a/app/src/main/java/es/verdnatura/domain/GetUbicadorUserCase.kt +++ b/app/src/main/java/es/verdnatura/domain/GetUbicadorUserCase.kt @@ -32,15 +32,15 @@ class GetUbicadorUserCase(context: Context) : RestClient(context) { quantity: String, packing: String?, warehouse: String, - grouping:String? + grouping: String? ): Call { val params: ArrayList = ArrayList() params.add(shelving) params.add(item) params.add(quantity) - if (packing!=null) params.add(packing) + if (packing != null) params.add(packing) params.add(warehouse) - if (grouping!=null)params.add(grouping) + if (grouping != null) params.add(grouping) return restClient!!.itemShelvingMake( "json", "1", @@ -62,7 +62,7 @@ class GetUbicadorUserCase(context: Context) : RestClient(context) { warehouse: String, level: String, itemShelvingFk: String, - grouping:String + grouping: String ): Call { val params: ArrayList = ArrayList() @@ -111,7 +111,7 @@ class GetUbicadorUserCase(context: Context) : RestClient(context) { password: String, shelving: String, items: Any, - isChecking:Boolean, + isChecking: Boolean, warehouse: Int ): Call { val params: ArrayList = ArrayList() @@ -128,39 +128,29 @@ class GetUbicadorUserCase(context: Context) : RestClient(context) { params ) } - /* fun itemShelving_addList( - usuario: String, - password: String, - item:itemShelvingListObject - ): Call { - val params: itemShelvingListObject = item + /* fun itemShelving_addList( + usuario: String, + password: String, + item:itemShelvingListObject + ): Call { + val params: itemShelvingListObject = item - return restClient!!.itemShelving_addList( - "json", - "1", - usuario, - password, - "application/json", - params - ) - }*/ + return restClient!!.itemShelving_addList( + "json", + "1", + usuario, + password, + "application/json", + params + ) + }*/ fun shelvingPriorityUpdate( - usuario: String, - password: String, priority: String, shelving: String ): Call { - val params: ArrayList = ArrayList() - params.add(priority) - params.add(shelving) - return restClient!!.shelvingPriorityUpdate( - "json", - "1", - usuario, - password, - "application/json", - params + return restClient!!.shelvingPriorityUpdate( + priority,shelving ) } @@ -176,17 +166,6 @@ class GetUbicadorUserCase(context: Context) : RestClient(context) { return restClient!!.shelvingPark("json", "1", usuario, password, "application/json", params) } - /* fun saleParking_add( - usuario: String, - password: String, - sales:List, - parking: String - ): Call { - val params: ArrayList = ArrayList() - params.add(sales) - params.add(parking) - return restClient!!.saleParking_add("json", "1", usuario, password, "application/json", params) - }*/ fun shelvingChange( usuario: String, @@ -258,6 +237,7 @@ class GetUbicadorUserCase(context: Context) : RestClient(context) { params ) } + fun itemShelving_merge( usuario: String, password: String, diff --git a/app/src/main/java/es/verdnatura/domain/GetVehicleControlTimeUserCase.kt b/app/src/main/java/es/verdnatura/domain/GetVehicleControlTimeUserCase.kt index fcca77d6..337404eb 100644 --- a/app/src/main/java/es/verdnatura/domain/GetVehicleControlTimeUserCase.kt +++ b/app/src/main/java/es/verdnatura/domain/GetVehicleControlTimeUserCase.kt @@ -71,35 +71,21 @@ class GetVehicleControlTimeUserCase(context: Context) : RestClient(context) { } fun deviceProductionUser_getWorker( - usuario: String, - password: String, - userFk: String + android_id: String ): Call { val params: ArrayList = ArrayList() - params.add(userFk) + params.add(android_id) return restClient!!.deviceProductionUser_getWorker( - "json", - "1", - usuario, - password, - "application/json", params ) } fun deviceProduction_getnameDevice( - usuario: String, - password: String, android_id: String ): Call { val params: ArrayList = ArrayList() params.add(android_id) return restClient!!.deviceProduction_getnameDevice( - "json", - "1", - usuario, - password, - "application/json", params ) } diff --git a/app/src/main/java/es/verdnatura/domain/GetWokerMistakeUSerCase.kt b/app/src/main/java/es/verdnatura/domain/GetWokerMistakeUSerCase.kt index 51ac9446..332db322 100644 --- a/app/src/main/java/es/verdnatura/domain/GetWokerMistakeUSerCase.kt +++ b/app/src/main/java/es/verdnatura/domain/GetWokerMistakeUSerCase.kt @@ -3,7 +3,6 @@ package es.verdnatura.domain import android.content.Context import es.verdnatura.presentation.view.feature.sacador.model.CollectionVO -import es.verdnatura.presentation.view.feature.sacador.model.MistakeTypeVO import es.verdnatura.presentation.view.feature.workermistake.model.DepartmentMistake import es.verdnatura.presentation.view.feature.workermistake.model.MistakeWorkerType import es.verdnatura.presentation.view.feature.workermistake.model.WorkerFromMistake @@ -12,14 +11,14 @@ import retrofit2.Call class GetWokerMistakeUSerCase(context: Context) : RestClient(context) { - - fun collectionGet(usuario: String, password: String): Call> { + fun collectionGet(): Call> { // val params:ArrayList = ArrayList() - return restClient!!.collectionGet("json", "1", usuario, password, "application/json") + return restClient!!.collectionGet() } - fun collectionGetSalix(token:String): Call> { + + fun collectionGetSalix(token: String): Call> { // val params:ArrayList = ArrayList() - return salixClient!!.getCollectionSalix(content_type = "application/json",token) + return salixClient!!.getCollectionSalix(content_type = "application/json", token) } @@ -41,16 +40,50 @@ class GetWokerMistakeUSerCase(context: Context) : RestClient(context) { params ) } + fun expeditionMistake_add( - usuario: String, - password: String, - vExpeditionFk: String, + vExpeditionFk: Int, vTypeFk: String ): Call { - val params: ArrayList = ArrayList() - params.add(vExpeditionFk) - params.add(vTypeFk) return restClient!!.expeditionMistake_add( + vExpeditionFk, vTypeFk, + ) + } + + fun workerMistakeType_get(usuario: String, password: String): Call> { + return restClient!!.workerMistakeType_get( + "json", + "1", + usuario, + password, + "application/json" + ) + } + + fun expeditionMistakeType_get(): Call> { + return restClient!!.expeditionMistakeType_get() + } + + fun department_getHasMistake(): Call> { + return restClient!!.department_getHasMistake() + } + + fun department_getHasMistakeSalix(token: String): Call> { + return salixClient!!.department_getHasMistake( + content_type = "application/json", + authorization = token + ) + } + + + fun worker_getFromHasMistake( + usuario: String, + password: String, + department: String + ): Call> { + val params: ArrayList = ArrayList() + params.add(department) + return restClient!!.worker_getFromHasMistake( "json", "1", usuario, @@ -59,26 +92,5 @@ class GetWokerMistakeUSerCase(context: Context) : RestClient(context) { params ) } - fun workerMistakeType_get(usuario: String, password: String): Call> { - return restClient!!.workerMistakeType_get("json", "1", usuario, password, "application/json") - } - - fun expeditionMistakeType_get(usuario: String, password: String): Call> { - return restClient!!.expeditionMistakeType_get("json", "1", usuario, password, "application/json") - } - - fun department_getHasMistake(usuario: String, password: String): Call> { - return restClient!!.department_getHasMistake("json", "1", usuario, password, "application/json") - } - fun department_getHasMistakeSalix(token:String): Call> { - return salixClient!!.department_getHasMistake(content_type = "application/json", authorization = token) - } - - - fun worker_getFromHasMistake(usuario: String, password: String, department:String): Call> { - val params: ArrayList = ArrayList() - params.add(department) - return restClient!!.worker_getFromHasMistake("json", "1", usuario, password, "application/json",params) - } } diff --git a/app/src/main/java/es/verdnatura/domain/SalixInterceptor.kt b/app/src/main/java/es/verdnatura/domain/SalixInterceptor.kt new file mode 100644 index 00000000..bab45507 --- /dev/null +++ b/app/src/main/java/es/verdnatura/domain/SalixInterceptor.kt @@ -0,0 +1,36 @@ +package es.verdnatura.domain + +import android.content.Context +import android.content.SharedPreferences +import android.util.Log.d +import okhttp3.Interceptor +import okhttp3.Response +import java.io.IOException + +class SalixInterceptor : Interceptor { + private var context: Context + + constructor(context: Context) { + this.context = context + } + + @Throws(IOException::class) + override fun intercept(chain: Interceptor.Chain): Response { + + val prefs: SharedPreferences = + this.context.getSharedPreferences("es.verdnatura.user.prefs", 0) + val request = chain.request() + //sergio: condición para que añada o no headers según se vaya quitando de las llamadas + //no quitar condición hasta que estén quitados + if (request.headers().toString().isEmpty()) { + val newRequest = request.newBuilder() + .addHeader("Content-Type", "application/json") + .addHeader("Authorization", prefs.getString("token", "")) + .build() + d("VERDNATURA::", newRequest.headers().toString() + newRequest.url()) + return chain.proceed(newRequest) + } else + return chain.proceed(request) + + } +} diff --git a/app/src/main/java/es/verdnatura/domain/SalixService.kt b/app/src/main/java/es/verdnatura/domain/SalixService.kt index c38efd8a..e5ffd7aa 100644 --- a/app/src/main/java/es/verdnatura/domain/SalixService.kt +++ b/app/src/main/java/es/verdnatura/domain/SalixService.kt @@ -46,9 +46,6 @@ interface SalixService { @GET("collections/getSectors") fun getSectorsSalix( - @Header("Content-Type") content_type: String, - @Header("Authorization") authorization: String, - ): Call> @@ -121,11 +118,9 @@ interface SalixService { ): Call - //Fins que Salix 8.3 no puje no descomentar + @GET("ItemPackingTypes") fun get_ItemPackingType( - @Header("Content-Type") content_type: String, - @Header("Authorization") authorization: String, ): Call> diff --git a/app/src/main/java/es/verdnatura/domain/SilexCallback.kt b/app/src/main/java/es/verdnatura/domain/SilexCallback.kt index 1e3692cf..47b75359 100644 --- a/app/src/main/java/es/verdnatura/domain/SilexCallback.kt +++ b/app/src/main/java/es/verdnatura/domain/SilexCallback.kt @@ -1,6 +1,11 @@ package es.verdnatura.domain -import android.util.Log +import android.app.Activity +import android.content.Context +import android.util.Log.d +import android.widget.Toast +import es.verdnatura.MobileApplication +import es.verdnatura.presentation.view.feature.main.activity.MainActivity import org.json.JSONObject import retrofit2.Call import retrofit2.Callback @@ -16,26 +21,46 @@ import retrofit2.Response // do_actions-> Haz acciones del fallo // throw e -> De esta manera se consigue llegar al catch. El error se propaga a la llamada superior. -//Falta pasarle al CAllback el tipo que queramos y poder lanzar el toast -abstract class SilexCallback : Callback { - override fun onResponse(call: Call, response: Response) { - try { - if (response.isSuccessful) { - onSuccess(response) - } else if (response.code() == 555) { - var message = JSONObject(response.message()).getString("Message") - //Toast.makeText(context, message, Toast.LENGTH_LONG).show() - onError(Error(message)) +//Falta pasarle al Callback el tipo que queramos y poder lanzar el toast + + +abstract class SilexCallback(val context: Context) : Callback { + + override fun onResponse(call: Call, response: Response) { + if (response.isSuccessful) { + onSuccess(response) + } else { + try { + if (response.code() == 555) { + var message = JSONObject(response.message()).getString("Message") + onError(Error(message)) + } else { + onError(Error(response.message().toString())) + } + } catch (t: Throwable) { + defaultErrorHandler(t) } - } catch(err: Error) { - Log.d("VERDNATURA::", "onResponse" + err.message) } } - override fun onFailure(call: Call, t: Throwable) { - Log.d("VERDNATURA::", "onFailure" + t.message) + + override fun onFailure(call: Call, t: Throwable) { + try { + onError(t) + } catch (t: Throwable) { + defaultErrorHandler(t) + } } - abstract fun onSuccess(response: Response) - open fun onError(err: Error) { - throw err + + fun defaultErrorHandler(t: Throwable) { + // Reemplazar por Toast + t.message!!.toast(context) + d("VERDNATURA::SilexError", t.message!!) } + + abstract fun onSuccess(response: Response) + open fun onError(t: Throwable) { + throw t + } + + } \ No newline at end of file diff --git a/app/src/main/java/es/verdnatura/domain/VerdnaturaService.kt b/app/src/main/java/es/verdnatura/domain/VerdnaturaService.kt index 3e3f1a99..a2ccca78 100644 --- a/app/src/main/java/es/verdnatura/domain/VerdnaturaService.kt +++ b/app/src/main/java/es/verdnatura/domain/VerdnaturaService.kt @@ -33,7 +33,6 @@ import es.verdnatura.presentation.view.feature.ubicador.model.ItemUbicadorVO import es.verdnatura.presentation.view.feature.workermistake.model.DepartmentMistake import es.verdnatura.presentation.view.feature.workermistake.model.MistakeWorkerType import es.verdnatura.presentation.view.feature.workermistake.model.WorkerFromMistake -import org.json.JSONObject import retrofit2.Call import retrofit2.http.Body import retrofit2.http.Header @@ -56,79 +55,44 @@ interface VerdnaturaService { @POST("security/device_checkLogin")//REVISADA fun device_checkLogin( - @Header("aplicacion") aplicacion: String, - @Header("version") version: String, - @Header("user") user: String, - @Header("pass") pass: String, - @Header("Content-Type") content_type: String, - @Body params: List + @Body vararg params: Any ): Call @POST("almacennew/worker_getId")//REVISADA - fun worker_getId(@Body vararg params: Any): Call + fun worker_getId(@Body vararg params: Any): + Call @POST("almacennew/deviceLog_add")//REVISADA fun deviceLog_add( - @Header("aplicacion") aplicacion: String, - @Header("version") version: String, - @Header("user") user: String, - @Header("pass") pass: String, - @Header("Content-Type") content_type: String, - @Body params: List + /* @Header("aplicacion") aplicacion: String, + @Header("version") version: String, + @Header("user") user: String, + @Header("pass") pass: String, + @Header("Content-Type") content_type: String,*/ + @Body vararg params: Any ): Call - @POST("almacennew/version")//REVISADA - fun version( - @Header("aplicacion") aplicacion: String, - @Header("version") version: String, - @Header("user") user: String, - @Header("pass") pass: String, - @Header("Content-Type") content_type: String, - @Body params: List - ): - Call @POST("/security/getVersion")//REVISADA fun getVersion( - @Header("aplicacion") aplicacion: String, - @Header("version") version: String, - @Header("user") user: String, - @Header("pass") pass: String, - @Header("Content-Type") content_type: String, - @Body params: List + + @Body vararg params: Any ): Call //AJUSTES ========================================================================> @POST("almacennew/sector_get")//SALIX - fun getSectors( - @Header("aplicacion") aplicacion: String, - @Header("version") version: String, - @Header("user") user: String, - @Header("pass") pass: String, - @Header("Content-Type") content_type: String - ): + fun getSectors(): Call> @POST("almacennew/printer_get")//NO SALIX - fun printer_get( - @Header("aplicacion") aplicacion: String, - @Header("version") version: String, - @Header("user") user: String, - @Header("pass") pass: String, - @Header("Content-Type") content_type: String - ): + fun printer_get(): Call> @POST("almacennew/train_get")//NO SALIX fun train_get( - @Header("aplicacion") aplicacion: String, - @Header("version") version: String, - @Header("user") user: String, - @Header("pass") pass: String, - @Header("Content-Type") content_type: String ): Call> @@ -145,45 +109,25 @@ interface VerdnaturaService { @POST("almacennew/worker_updatePrinter")//NO SALIX fun worker_updatePrinter( - @Header("aplicacion") aplicacion: String, - @Header("version") version: String, - @Header("user") user: String, - @Header("pass") pass: String, - @Header("Content-Type") content_type: String, - @Body params: List + @Body vararg params: Any ): Call @POST("almacennew/worker_updateSector")//NO SALIX fun worker_updateSector( - @Header("aplicacion") aplicacion: String, - @Header("version") version: String, - @Header("user") user: String, - @Header("pass") pass: String, - @Header("Content-Type") content_type: String, - @Body params: List + @Body vararg params: Any ): Call @POST("almacennew/operator_updateItemPackingType")//NO SALIX fun operator_updateItemPackingType( - @Header("aplicacion") aplicacion: String, - @Header("version") version: String, - @Header("user") user: String, - @Header("pass") pass: String, - @Header("Content-Type") content_type: String, - @Body params: List + @Body vararg params: Any ): Call @POST("almacennew/operator_updateTrain")//NO SALIX fun operator_updateTrain( - @Header("aplicacion") aplicacion: String, - @Header("version") version: String, - @Header("user") user: String, - @Header("pass") pass: String, - @Header("Content-Type") content_type: String, - @Body params: List + @Body vararg params: Any ): Call @@ -199,11 +143,7 @@ interface VerdnaturaService { @POST("almacennew/operator_getNumberOfWagons")//NO SALIX fun operator_getNumberOfWagons( - @Header("aplicacion") aplicacion: String, - @Header("version") version: String, - @Header("user") user: String, - @Header("pass") pass: String, - @Header("Content-Type") content_type: String + ): Call @@ -266,11 +206,6 @@ interface VerdnaturaService { //SACADORES / CONTROLADORES ========================================================================> @POST("almacennew/collectionGet") //NO SALIX fun collectionGet( - @Header("aplicacion") aplicacion: String, - @Header("version") version: String, - @Header("user") user: String, - @Header("pass") pass: String, - @Header("Content-Type") content_type: String ): Call> @@ -298,41 +233,21 @@ interface VerdnaturaService { @POST("almacennew/collection_assign")//NO SALIX fun collection_assign( - @Header("aplicacion") aplicacion: String, - @Header("version") version: String, - @Header("user") user: String, - @Header("pass") pass: String, - @Header("Content-Type") content_type: String ): Call @POST("almacennew/operator_getItemPackingType")//NO SALIX fun operator_getItemPackingType( - @Header("aplicacion") aplicacion: String, - @Header("version") version: String, - @Header("user") user: String, - @Header("pass") pass: String, - @Header("Content-Type") content_type: String ): Call @POST("almacennew/worker_isF11Allowed")//NO SALIX fun worker_isF11Allowed( - @Header("aplicacion") aplicacion: String, - @Header("version") version: String, - @Header("user") user: String, - @Header("pass") pass: String, - @Header("Content-Type") content_type: String ): Call @POST("almacennew/operator_getTrain")//NO SALIX fun operator_getTrain( - @Header("aplicacion") aplicacion: String, - @Header("version") version: String, - @Header("user") user: String, - @Header("pass") pass: String, - @Header("Content-Type") content_type: String ): Call @@ -570,18 +485,6 @@ interface VerdnaturaService { ): Call - /*sergio:modificada en el caso de que quiera utilizarse por item_Card - @POST("almacennew/itemGetAvailable")//REVISADA - fun itemGetAvailable( - @Header("aplicacion") aplicacion: String, - @Header("version") version: String, - @Header("user") user: String, - @Header("pass") pass: String, - @Header("Content-Type") content_type: String, - @Body params: List - ): - Call*/ - @POST("almacennew/collectionAddItem")//REVISADA fun collectionAddItem( @Header("aplicacion") aplicacion: String, @@ -651,11 +554,6 @@ interface VerdnaturaService { @POST("almacennew/debug_add")//REVISADA fun debug_add( - @Header("aplicacion") aplicacion: String, - @Header("version") version: String, - @Header("user") user: String, - @Header("pass") pass: String, - @Header("Content-Type") content_type: String, @Body params: List ): Call @@ -717,12 +615,7 @@ interface VerdnaturaService { @POST("almacennew/expeditionMistake_add")//REVISADA fun expeditionMistake_add( - @Header("aplicacion") aplicacion: String, - @Header("version") version: String, - @Header("user") user: String, - @Header("pass") pass: String, - @Header("Content-Type") content_type: String, - @Body params: List + @Body vararg params: Any ): Call @@ -749,23 +642,12 @@ interface VerdnaturaService { @POST("almacennew/expeditionMistakeType_get")//REVISADA fun expeditionMistakeType_get( - @Header("aplicacion") aplicacion: String, - @Header("version") version: String, - @Header("user") user: String, - @Header("pass") pass: String, - @Header("Content-Type") content_type: String ): Call> @POST("almacennew/department_getHasMistake")//REVISADA fun department_getHasMistake( - @Header("aplicacion") aplicacion: String, - @Header("version") version: String, - @Header("user") user: String, - @Header("pass") pass: String, - @Header("Content-Type") content_type: String, - - ): + ): Call> @POST("almacennew/worker_getFromHasMistake")//REVISADA @@ -826,16 +708,6 @@ interface VerdnaturaService { ): Call> - /* @POST("almacennew/itemStockUpdate")//REVISADA - fun itemStockUpdate( - @Header("aplicacion") aplicacion: String, - @Header("version") version: String, - @Header("user") user: String, - @Header("pass") pass: String, - @Header("Content-Type") content_type: String, - @Body params: List - ): - Call*/ @POST("almacennew/itemTrash")//REVISADA fun itemTrash( @@ -848,16 +720,6 @@ interface VerdnaturaService { ): Call - /* @POST("almacennew/item_placement_save")//REVISADA - fun itemPlacementSave( - @Header("aplicacion") aplicacion: String, - @Header("version") version: String, - @Header("user") user: String, - @Header("pass") pass: String, - @Header("Content-Type") content_type: String, - @Body params: List - ): - Call*/ @POST("almacennew/buy_updateGrouping")//REVISADA fun updateGrouping( @@ -881,16 +743,6 @@ interface VerdnaturaService { ): Call - /* @POST("almacennew/update_ItemPackingType")//REVISADA - fun updatePackingType( - @Header("aplicacion") aplicacion: String, - @Header("version") version: String, - @Header("user") user: String, - @Header("pass") pass: String, - @Header("Content-Type") content_type: String, - @Body params: List - ): - Call*/ @POST("almacennew/item_saveStems")//REVISADA fun item_saveStems( @@ -937,40 +789,12 @@ interface VerdnaturaService { ): Call> - // BUSCAR ITEM ALL -/* @POST("almacennew/getItemUbication")//REVISADAc - fun searchItemsUbicadorAll( - @Header("aplicacion") aplicacion: String, - @Header("version") version: String, - @Header("user") user: String, - @Header("pass") pass: String, - @Header("Content-Type") content_type: String, - @Body params: List - ): - Call>*/ - //INVENTARIO ========================================================================> - /* @POST("almacennew/itemShelvingRadar")//REVISADA - fun itemShelvingRadar( - @Header("aplicacion") aplicacion: String, - @Header("version") version: String, - @Header("user") user: String, - @Header("pass") pass: String, - @Header("Content-Type") content_type: String, - @Body params: List - ): - Call> - */ @POST("almacennew/itemShelving_filterBuyer")//REVISADA fun itemShelvingRadarFilterBuyer( - @Header("aplicacion") aplicacion: String, - @Header("version") version: String, - @Header("user") user: String, - @Header("pass") pass: String, - @Header("Content-Type") content_type: String, - @Body params: List + @Body vararg params: Any ): Call> @@ -1045,22 +869,12 @@ interface VerdnaturaService { @POST("almacennew/deviceProduction_getnameDevice")//REVISADA fun deviceProduction_getnameDevice( - @Header("aplicacion") aplicacion: String, - @Header("version") version: String, - @Header("user") user: String, - @Header("pass") pass: String, - @Header("Content-Type") content_type: String, @Body params: List ): Call @POST("almacennew/deviceProductionUser_getWorker")//REVISADA fun deviceProductionUser_getWorker( - @Header("aplicacion") aplicacion: String, - @Header("version") version: String, - @Header("user") user: String, - @Header("pass") pass: String, - @Header("Content-Type") content_type: String, @Body params: List ): Call @@ -1102,12 +916,7 @@ interface VerdnaturaService { @POST("almacennew/shelvingPriorityUpdate")//REVISADA fun shelvingPriorityUpdate( - @Header("aplicacion") aplicacion: String, - @Header("version") version: String, - @Header("user") user: String, - @Header("pass") pass: String, - @Header("Content-Type") content_type: String, - @Body params: List + @Body vararg params: Any ): Call @@ -1595,6 +1404,7 @@ interface VerdnaturaService { @Body params: List ): Call + //SUPPLIERS @POST("almacennew/supplier_getItems")//REVISADA fun supplier_getItems( diff --git a/app/src/main/java/es/verdnatura/domain/itemShelvingLogUSerCase.kt b/app/src/main/java/es/verdnatura/domain/itemShelvingLogUSerCase.kt index 36ed1295..2b97dfb1 100644 --- a/app/src/main/java/es/verdnatura/domain/itemShelvingLogUSerCase.kt +++ b/app/src/main/java/es/verdnatura/domain/itemShelvingLogUSerCase.kt @@ -59,10 +59,8 @@ class itemShelvingLogUSerCase(context: Context) : RestClient(context) { ) } - fun getSectorsSalix(token: String): Call> { + fun getSectorsSalix(): Call> { return salixClient!!.getSectorsSalix( - content_type = "application/json", - authorization = token ) } 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 c8a88acf..e165f82d 100644 --- a/app/src/main/java/es/verdnatura/presentation/base/BaseFragment.kt +++ b/app/src/main/java/es/verdnatura/presentation/base/BaseFragment.kt @@ -151,12 +151,6 @@ abstract class BaseFragment(viewModelCla open fun getBundleArguments() {} open fun addBindingVariables() {} - /*open fun setSpeak() { - //VOZ - // textToSpeech = TextToSpeech(requireContext(), this) - // mAudioManager = requireActivity().getSystemService(Context.AUDIO_SERVICE) as AudioManager - }*/ - open fun restartapp(f: Fragment) { val mStartActivity = Intent(context, f::class.java) val mPendingIntentId = 123456 @@ -172,28 +166,6 @@ abstract class BaseFragment(viewModelCla } - /* open fun initialize() { - //ESCUCHA - try { - mSpeechRecognizer = SpeechRecognizer.createSpeechRecognizer(requireContext()) - mSpeechRecognizerIntent = Intent(RecognizerIntent.ACTION_RECOGNIZE_SPEECH) - mSpeechRecognizerIntent!!.putExtra( - RecognizerIntent.EXTRA_LANGUAGE_MODEL, - RecognizerIntent.LANGUAGE_MODEL_FREE_FORM - ) - mSpeechRecognizerIntent!!.putExtra( - RecognizerIntent.EXTRA_LANGUAGE, - Locale.getDefault() - ) - mSpeechRecognizerIntent!!.putExtra(RecognizerIntent.EXTRA_PREFER_OFFLINE, false) - mSpeechRecognizer?.setRecognitionListener(this) - isOnReadyForSpeech = false - startListening() - } catch (e: Exception) { - cancelSpeech() - } - - }*/ private fun initDataBinding() { binding = DataBindingUtil.bind(requireView())!! diff --git a/app/src/main/java/es/verdnatura/presentation/base/BaseViewModel.kt b/app/src/main/java/es/verdnatura/presentation/base/BaseViewModel.kt index 581c3f4c..0a51b168 100644 --- a/app/src/main/java/es/verdnatura/presentation/base/BaseViewModel.kt +++ b/app/src/main/java/es/verdnatura/presentation/base/BaseViewModel.kt @@ -6,6 +6,7 @@ import androidx.lifecycle.ViewModel import es.verdnatura.MobileApplication import es.verdnatura.domain.SalixService import es.verdnatura.domain.VerdnaturaService +import es.verdnatura.presentation.view.feature.main.activity.MainActivity import org.json.JSONObject abstract class BaseViewModel : ViewModel, LifecycleObserver { diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/ajustes/fragment/AjustesFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/ajustes/fragment/AjustesFragment.kt index 76c8054b..05b1ac0f 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/ajustes/fragment/AjustesFragment.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/ajustes/fragment/AjustesFragment.kt @@ -35,7 +35,7 @@ class AjustesFragment : private var ajustesAdapter: AjustesAdapter? = null private var isWorkerAllowed: Boolean = false private var itemPackingList: List = listOf() - private var messagePrinter:String? = null + private var messagePrinter: String? = null //añadido private var wagonList: List = listOf() @@ -44,25 +44,21 @@ class AjustesFragment : companion object { fun newInstance() = AjustesFragment() } - override fun getLayoutId(): Int = R.layout.fragment_ajustes - override fun onCreate(savedInstanceState: Bundle?) { prefs = requireActivity().getSharedPreferences(PREFS_USER, 0) customDialog = CustomDialog(requireContext()) - super.onCreate(savedInstanceState) } - override fun init() { binding.mainToolbar.toolbarTitle.text = getString(R.string.settings) - binding.splashProgress.visibility = View.VISIBLE + binding.splashProgress.visibility = VISIBLE hideBackButton(binding.mainToolbar) - viewModel.worker_isF11Allowed(getData(USER), getData(PASSWORD)) + viewModel.worker_isF11Allowed() binding.userText.setText(getData(USER)) val versionName = requireActivity().packageManager.getPackageInfo( @@ -84,11 +80,8 @@ class AjustesFragment : fun setEvents() { binding.androididText.setOnClickListener { copyanddrag(binding.androididText.text.toString()) } binding.androididText.setOnLongClickListener { copyanddrag(binding.androididText.text.toString()) } - - } - override fun observeViewModel() { with(viewModel) { ajustesAdapter = AjustesAdapter(ajustesitem, object : OnAjustesItemClickListener { @@ -97,9 +90,9 @@ class AjustesFragment : if (item.action) { if (item.id == 0) { - binding.splashProgress.visibility = View.VISIBLE + binding.splashProgress.visibility =VISIBLE // viewModel.getSectors(getData(USER),getData(PASSWORD)) - viewModel.getSectorsSalix(getData(TOKEN)) + viewModel.getSectorsSalix() } else if (item.id == 5) { requireActivity().onBackPressed() } else if (item.id == 1) { @@ -112,28 +105,14 @@ class AjustesFragment : "Información", false ) - /* val listCarros: ArrayList = ArrayList() - listCarros.add("1") - listCarros.add("2") - listCarros.add("3") - listCarros.add("4") - listCarros.add("5") - listCarros.add("6") - wagonList = listCarros - - val array = arrayOfNulls(listCarros.size) - - showDialogCarros(array = listCarros.toArray(array))*/ } else if (item.id == 2) { - messagePrinter=getString(R.string.Selecccionaimpresoara) - viewModel.printer_get(getData(USER), getData(PASSWORD)) - + messagePrinter = getString(R.string.Selecccionaimpresoara) + viewModel.printer_get() } else if (item.id == 3) { val listTagsType: ArrayList = ArrayList() listTagsType.add(getString(R.string.stickers)) - // listTagsType.add(getString(R.string.smarttags)) tagsList = listTagsType val array = arrayOfNulls(listTagsType.size) showItemPickerType(array = listTagsType.toArray(array)) @@ -145,9 +124,9 @@ class AjustesFragment : ) } else if (item.id == 6) { - viewModel.train_get(getData(USER), getData(PASSWORD)) + viewModel.train_get() } else if (item.id == 7) { - viewModel.getItemPackingTypeSalix(getData(TOKEN)) + viewModel.getItemPackingTypeSalix() } } @@ -174,7 +153,7 @@ class AjustesFragment : ma.messageWithSound(it.errorMessage, it.isError, true) } else { - saveData(TRAINNAME, it.response!!) + saveData(TRAINNAME, it.response) } setSettings(isWorkerAllowed) @@ -187,17 +166,16 @@ class AjustesFragment : ma.messageWithSound(it.errorMessage, it.isError, true) } else { - saveData(ITEMPACKING, it.response!!) - + saveData(ITEMPACKING, it.response) } setSettings(isWorkerAllowed) } workerAllowedResponse.observe(viewLifecycleOwner) { binding.splashProgress.visibility = View.GONE - viewModel.operator_getNumberOfWagons(getData(USER), getData(PASSWORD)) - viewModel.operator_getTrain(getData(USER), getData(PASSWORD)) - viewModel.operator_getItemPackingType(getData(USER), getData(PASSWORD)) + viewModel.operator_getNumberOfWagons() + viewModel.operator_getTrain() + viewModel.operator_getItemPackingType() if (it.isError) { ma.messageWithSound(it.errorMessage, it.isError, true) @@ -206,7 +184,6 @@ class AjustesFragment : } setSettings(isWorkerAllowed) - } actionUpdate.observe(viewLifecycleOwner) { @@ -219,12 +196,19 @@ class AjustesFragment : ) binding.splashProgress.visibility = VISIBLE - messagePrinter=getString(R.string.Selecccionaimpresoara)+"\n"+getString(R.string.printerRemoved) - viewModel.printer_get(getData(USER), getData(PASSWORD)) - // viewModel.worker_isF11Allowed(getData(USER), getData(PASSWORD)) - + messagePrinter = + getString(R.string.Selecccionaimpresoara) + "\n" + getString(R.string.printerRemoved) + viewModel.printer_get() } + actionUpdatePacking.observe(viewLifecycleOwner) { + binding.splashProgress.visibility = View.GONE + + ma.messageWithSound( + if (it.isError) it.errorMessage else { + getString(R.string.itemUpdated) + }, it.isError, false + )} workerupdatePrinter.observe(viewLifecycleOwner) { binding.splashProgress.visibility = View.GONE @@ -376,7 +360,6 @@ class AjustesFragment : getData(SECTORFK).toInt(), getData(WAREHOUSEFK).toInt(), getData(NUMBEROFWAGONS), - getData(TAGSTYPE), getData(PRINTERFK).toInt(), getData(PRINTERNAME), getData(TRAINNAME), @@ -391,7 +374,7 @@ class AjustesFragment : builder.setTitle(messagePrinter) - // builder.setMessage("La impresora que tenía se ha eliminado ") + // builder.setMessage("La impresora que tenía se ha eliminado ") builder.setItems(array) { _, which -> val selected = array[which] printersList.forEach { @@ -403,14 +386,11 @@ class AjustesFragment : viewModel.ajustesitem.get(2).selected = it.name viewModel.worker_updatePrinter( - getData(USER), - getData(PASSWORD), - it.id.toString() + it.id!! ) ajustesAdapter!!.notifyDataSetChanged() ajustesAdapter - return@forEach } } @@ -436,9 +416,7 @@ class AjustesFragment : viewModel.ajustesitem[3].selected = it.name viewModel.operator_updateTrain( - getData(USER), - getData(PASSWORD), - it.id.toString() + it.id!! ) ajustesAdapter!!.notifyDataSetChanged() @@ -476,9 +454,7 @@ class AjustesFragment : viewModel.ajustesitem.get(0).warehouse = it.warehouseFk viewModel.ajustesitem.get(0).selected = it.description viewModel.worker_updateSector( - getData(USER), - getData(PASSWORD), - it.id.toString() + it.id ) ajustesAdapter!!.notifyDataSetChanged() @@ -494,7 +470,6 @@ class AjustesFragment : private fun showDialog(array: Array) { val builder = AlertDialog.Builder(this.context) - builder.setTitle(getString(R.string.settingsTitleItemPacking)) builder.setItems(array) { _, which -> val selected = array[which] @@ -505,8 +480,6 @@ class AjustesFragment : editor.apply() viewModel.ajustesitem[4].selected = it.description viewModel.operator_updateItemPackingType( - getData(USER), - getData(PASSWORD), it.code ) ajustesAdapter!!.notifyDataSetChanged() @@ -530,15 +503,12 @@ class AjustesFragment : val editor = prefs!!.edit() editor.putInt(WAGON, it.toInt()) editor.apply() - viewModel.ajustesitem.get(1).selected = it ajustesAdapter!!.notifyDataSetChanged() return@forEach } } - - } val dialog = builder.create() diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/ajustes/fragment/AjustesViewModel.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/ajustes/fragment/AjustesViewModel.kt index 8d518f5b..04c82ce4 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/ajustes/fragment/AjustesViewModel.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/ajustes/fragment/AjustesViewModel.kt @@ -6,9 +6,6 @@ import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import androidx.lifecycle.Transformations import es.verdnatura.R -import es.verdnatura.domain.GetAjustesUserCase -import es.verdnatura.domain.GetItemCardUserCase -import es.verdnatura.domain.GetLoginUserCase import es.verdnatura.presentation.base.BaseViewModel import es.verdnatura.presentation.base.getMessageFromAllResponse import es.verdnatura.presentation.base.nameofFunction @@ -23,15 +20,11 @@ import retrofit2.Callback import retrofit2.Response -class AjustesViewModel(context: Context) : BaseViewModel() { +class AjustesViewModel(val context: Context) : BaseViewModel(context) { - private val contextApp = context - - private val getAjustesUserCase: GetAjustesUserCase = GetAjustesUserCase(context) - private val getLoginUserCase: GetLoginUserCase = GetLoginUserCase(context) - private val getItemCardUserCase: GetItemCardUserCase = GetItemCardUserCase(context) - - val version: String = "5.0.0" + // private val getAjustesUserCase: GetAjustesUserCase = GetAjustesUserCase(context) + // private val getLoginUserCase: GetLoginUserCase = GetLoginUserCase(context) + //private val getItemCardUserCase: GetItemCardUserCase = GetItemCardUserCase(context) private val _ajustesitem by lazy { ArrayList() } val ajustesitem: List @@ -45,6 +38,15 @@ class AjustesViewModel(context: Context) : BaseViewModel() { val actionUpdate: LiveData get() = _actionUpdate + private val _actionUpdateTrain by lazy { MutableLiveData() } + val actionUpdateTrain: LiveData + get() = _actionUpdateTrain + + + private val _actionUpdatePacking by lazy { MutableLiveData() } + val actionUpdatePacking: LiveData + get() = _actionUpdatePacking + private val _workerupdatePrinter by lazy { MutableLiveData() } val workerupdatePrinter: LiveData get() = _workerupdatePrinter @@ -87,7 +89,6 @@ class AjustesViewModel(context: Context) : BaseViewModel() { sectorFk: Int, warehouseFk: Int, carroDescrip: String, - TypeTags: String, printerFk: Int, printerSelected: String, train: String?, @@ -98,7 +99,7 @@ class AjustesViewModel(context: Context) : BaseViewModel() { _ajustesitem.add( AjustesItemVO( 0, - contextApp.getString(R.string.sector), + context.getString(R.string.sector), sectorDescrip, sectorFk, warehouseFk, @@ -112,18 +113,18 @@ class AjustesViewModel(context: Context) : BaseViewModel() { _ajustesitem.add( AjustesItemVO( 1, - contextApp.getString(R.string.wagoons), + context.getString(R.string.wagoons), carroDescrip, 0, 0, - 0, contextApp.getString(R.string.printerWithout), + 0, context.getString(R.string.printerWithout), false ) ) _ajustesitem.add( AjustesItemVO( 2, - contextApp.getString(R.string.printerLabel), + context.getString(R.string.printerLabel), printerSelected, 0, 0, @@ -135,23 +136,23 @@ class AjustesViewModel(context: Context) : BaseViewModel() { _ajustesitem.add( AjustesItemVO( 6, - contextApp.getString(R.string.settingsTitleTrain), + context.getString(R.string.settingsTitleTrain), train, 0, 0, 0, - action=actionIsAllowed + action = actionIsAllowed ) ) _ajustesitem.add( AjustesItemVO( 7, - contextApp.getString(R.string.settingsTitleItemPacking), + context.getString(R.string.settingsTitleItemPacking), itemPackingType, 0, 0, 0, - action=actionIsAllowed + action = actionIsAllowed ) ) /* _ajustesitem.add( @@ -167,63 +168,31 @@ class AjustesViewModel(context: Context) : BaseViewModel() { _ajustesitem.add( AjustesItemVO( 4, - contextApp.getString(R.string.vehicleControl), + context.getString(R.string.vehicleControl), "", 0, 0, - 0, contextApp.getString(R.string.printerWithout), + 0, context.getString(R.string.printerWithout), true ) ) _ajustesitem.add( AjustesItemVO( 5, - contextApp.getString(R.string.closeSession), + context.getString(R.string.closeSession), "", 0, 0, - 0, contextApp.getString(R.string.printerWithout), + 0, context.getString(R.string.printerWithout), true ) ) } - /* fun getSectors(user: String, password: String) { - getAjustesUserCase.getSectors(user, password) - .enqueue(object : Callback> { - override fun onFailure(call: Call>, t: Throwable) { - val listError: ArrayList = ArrayList() - listError.add(SectorItemVO(0, "", 0, true, t.message!!)) - _sectorList.value = SectorListVO(listError) - } - override fun onResponse( - call: Call>, - response: Response> - ) { - if (response.body() != null) { - _sectorList.value = response.body()?.let { SectorListVO(it) } - } else { - val listError: ArrayList = ArrayList() - listError.add( - SectorItemVO( - 0, - "", - 0, - true, - "Error en la llamada sector_get" - ) - ) - _sectorList.value = SectorListVO(listError) - } - } - - }) - }*/ - - fun getItemPackingTypeSalix(token: String) { - getItemCardUserCase.getItemPackingTypeSalix(token).enqueue(object : + fun getItemPackingTypeSalix() { + salix!!.get_ItemPackingType().enqueue(object : Callback> { override fun onFailure(call: Call>, t: Throwable) { val listError: ArrayList = ArrayList() @@ -261,8 +230,8 @@ class AjustesViewModel(context: Context) : BaseViewModel() { }) } - fun getSectorsSalix(token: String) { - getAjustesUserCase.getSectorsSalix(token).enqueue(object : Callback> { + fun getSectorsSalix() { + salix!!.getSectorsSalix().enqueue(object : Callback> { override fun onFailure(call: Call>, t: Throwable) { val listError: ArrayList = ArrayList() listError.add(SectorItemVO(0, "", 0, true, t.message!!)) @@ -292,8 +261,8 @@ class AjustesViewModel(context: Context) : BaseViewModel() { }) } - fun printer_get(user: String, password: String) { - getAjustesUserCase.printer_get(user, password).enqueue(object : Callback> { + fun printer_get() { + silex!!.printer_get().enqueue(object : Callback> { override fun onFailure(call: Call>, t: Throwable) { val listError: ArrayList = ArrayList() listError.add(Printers(0, "", true, t.message!!)) @@ -324,8 +293,8 @@ class AjustesViewModel(context: Context) : BaseViewModel() { }) } - fun train_get(user: String, password: String) { - getAjustesUserCase.train_get(user, password).enqueue(object : Callback> { + fun train_get() { + silex!!.train_get().enqueue(object : Callback> { override fun onFailure(call: Call>, t: Throwable) { val listError: ArrayList = ArrayList() listError.add(Train(0, "", true, t.message!!)) @@ -356,9 +325,9 @@ class AjustesViewModel(context: Context) : BaseViewModel() { }) } - fun worker_updateSector(user: String, password: String, sectorFk: String) { + fun worker_updateSector(sectorFk: Int) { - getAjustesUserCase.worker_updateSector(user, password, sectorFk) + silex!!.worker_updateSector(sectorFk) .enqueue(object : Callback { override fun onFailure(call: Call, t: Throwable) { @@ -396,13 +365,13 @@ class AjustesViewModel(context: Context) : BaseViewModel() { }) } - fun operator_updateItemPackingType(user: String, password: String, sectorFk: String) { + fun operator_updateItemPackingType(itemPackingTypeFk: String) { - getAjustesUserCase.operator_updateItemPackingType(user, password, sectorFk) + silex!!.operator_updateItemPackingType(itemPackingTypeFk) .enqueue(object : Callback { override fun onFailure(call: Call, t: Throwable) { - _actionUpdate.value = ResponseItemVO( + _actionUpdatePacking.value = ResponseItemVO( isError = true, errorMessage = getMessageFromAllResponse(nameofFunction(this), t.message!!) ) @@ -414,7 +383,7 @@ class AjustesViewModel(context: Context) : BaseViewModel() { ) { if (!response.isSuccessful) { - _actionUpdate.value = ResponseItemVO( + _actionUpdatePacking.value = ResponseItemVO( isError = true, errorMessage = getMessageFromAllResponse( nameofFunction(this), @@ -422,7 +391,7 @@ class AjustesViewModel(context: Context) : BaseViewModel() { ) ) } else { - _actionUpdate.value = ResponseItemVO( + _actionUpdatePacking.value = ResponseItemVO( response = response.message(), isError = false, errorMessage = "" @@ -436,9 +405,9 @@ class AjustesViewModel(context: Context) : BaseViewModel() { }) } - fun operator_getNumberOfWagons(user: String, password: String) { + fun operator_getNumberOfWagons() { - getLoginUserCase.operator_getNumberOfWagons(user, password) + silex!!.operator_getNumberOfWagons() .enqueue(object : Callback { override fun onFailure(call: Call, t: Throwable) { @@ -476,9 +445,9 @@ class AjustesViewModel(context: Context) : BaseViewModel() { }) } - fun operator_getTrain(user: String, password: String) { + fun operator_getTrain() { - getAjustesUserCase.operator_getTrain(user, password) + silex!!.operator_getTrain() .enqueue(object : Callback { override fun onFailure(call: Call, t: Throwable) { @@ -504,7 +473,11 @@ class AjustesViewModel(context: Context) : BaseViewModel() { } else { _operatorGetTrainResponse.value = - ResponseItemVO(if (response.body().toString()=="false")"" else{response.body().toString()}, false) + ResponseItemVO( + if (response.body().toString() == "false") "" else { + response.body().toString() + }, false + ) } @@ -513,9 +486,9 @@ class AjustesViewModel(context: Context) : BaseViewModel() { }) } - fun operator_getItemPackingType(user: String, password: String) { + fun operator_getItemPackingType() { - getAjustesUserCase.operator_getItemPackingType(user, password) + silex!!.operator_getItemPackingType() .enqueue(object : Callback { override fun onFailure(call: Call, t: Throwable) { @@ -541,7 +514,11 @@ class AjustesViewModel(context: Context) : BaseViewModel() { } else { _operatorGetItemPackingType.value = - ResponseItemVO(if (response.body().toString()=="false")"" else{response.body().toString()}, false) + ResponseItemVO( + if (response.body().toString() == "false") "" else { + response.body().toString() + }, false + ) } @@ -550,9 +527,9 @@ class AjustesViewModel(context: Context) : BaseViewModel() { }) } - fun worker_isF11Allowed(user: String, password: String) { + fun worker_isF11Allowed() { - getAjustesUserCase.worker_isF11Allowed(user, password) + silex!!.worker_isF11Allowed() .enqueue(object : Callback { override fun onFailure(call: Call, t: Throwable) { @@ -587,9 +564,8 @@ class AjustesViewModel(context: Context) : BaseViewModel() { }) } - fun worker_updatePrinter(user: String, password: String, printerFk: String) { - //d("La impresora marcada " + printerFk) - getAjustesUserCase.worker_updatePrinter(user, password, printerFk) + fun worker_updatePrinter(printerFk: Int) { + silex!!.worker_updatePrinter(printerFk) .enqueue(object : Callback { override fun onFailure(call: Call, t: Throwable) { @@ -626,13 +602,13 @@ class AjustesViewModel(context: Context) : BaseViewModel() { }) } - fun operator_updateTrain(user: String, password: String, trainFk: String) { + fun operator_updateTrain(trainFk: Int) { - getAjustesUserCase.operator_updateTrain(user, password, trainFk) + silex!!.operator_updateTrain(trainFk) .enqueue(object : Callback { override fun onFailure(call: Call, t: Throwable) { - _actionUpdate.value = ResponseItemVO( + _actionUpdatePacking.value = ResponseItemVO( isError = true, errorMessage = getMessageFromAllResponse(nameofFunction(this), t.message!!) ) @@ -644,7 +620,7 @@ class AjustesViewModel(context: Context) : BaseViewModel() { ) { if (!response.isSuccessful) { - _actionUpdate.value = ResponseItemVO( + _actionUpdatePacking.value = ResponseItemVO( isError = true, errorMessage = getMessageFromAllResponse( nameofFunction(this), @@ -652,7 +628,7 @@ class AjustesViewModel(context: Context) : BaseViewModel() { ) ) } else { - _actionUpdate.value = ResponseItemVO( + _actionUpdatePacking.value = ResponseItemVO( response = response.message(), isError = false, errorMessage = "" @@ -666,3 +642,4 @@ class AjustesViewModel(context: Context) : BaseViewModel() { }) } } + 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 f492d854..aec2fd83 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 @@ -196,7 +196,7 @@ class ItemCardFragment( var working_in_test = false //sergio:No posar a true fins que Salix puje versió 8.3 if (working_in_test) { - viewModel.getItemPackingTypeSalix(getData(TOKEN)) + viewModel.getItemPackingTypeSalix() } else { viewModel.getItemPackingType(getData(USER), getData(PASSWORD)) } 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 e1ed69c9..baa1c0a5 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 @@ -171,8 +171,8 @@ class ItemCardViewModel(context: Context) : BaseViewModel() { }) } - fun getItemPackingTypeSalix(token: String) { - getItemCardUserCase.getItemPackingTypeSalix(token).enqueue(object : + fun getItemPackingTypeSalix() { + getItemCardUserCase.getItemPackingTypeSalix().enqueue(object : Callback> { override fun onFailure(call: Call>, t: Throwable) { val listError: ArrayList = ArrayList() diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/buscaritem/fragment/BuscarItemFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/buscaritem/fragment/BuscarItemFragment.kt index d1d6698a..07604323 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/buscaritem/fragment/BuscarItemFragment.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/buscaritem/fragment/BuscarItemFragment.kt @@ -49,6 +49,7 @@ class BuscarItemFragment( binding.editItemFk.requestFocus() binding.editItemFk.setOnEditorActionListener { _, actionId, _ -> if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0 || actionId == 5) { + if (!binding.editItemFk.text.toString().isNullOrEmpty()) getLocations(binding.editItemFk.text.toString()) binding.editItemFk.setText("") 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 af1464c1..308e16f8 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 @@ -1,5 +1,6 @@ package es.verdnatura.presentation.view.feature.collection.fragment +import android.app.AlertDialog import android.content.Context import android.content.Intent import android.graphics.drawable.Drawable @@ -8,6 +9,7 @@ import android.net.Uri import android.os.Build import android.os.Bundle import android.os.Parcelable +import android.util.Log.d import android.view.View import android.view.View.GONE import android.view.View.VISIBLE @@ -38,7 +40,7 @@ import es.verdnatura.presentation.view.feature.collection.adapter.SaleAdapter import es.verdnatura.presentation.view.feature.main.activity.MainActivity import es.verdnatura.presentation.view.feature.pasillero.model.PasillerosItemVO import es.verdnatura.presentation.view.feature.sacador.model.* -import timber.log.Timber +import java.sql.Types.NULL @Suppress("UNUSED_ANONYMOUS_PARAMETER") @@ -115,12 +117,12 @@ class CollectionFragment( if (type.equals(CONTROLADOR)) { //sergio: comprueba si viene de la pantalla de controlador //Tarea #4280 cambiar a ticket_isOutClosureZone - /* viewModel.ticket_checkFullyControlled( - getData(USER), - getData(PASSWORD), - collection.collectionFk + /* viewModel.ticket_checkFullyControlled( + getData(USER), + getData(PASSWORD), + collection.collectionFk - )*/ + )*/ workerFkFromTicket = collection.tickets.get(0).sales.get(0).workerFk } @@ -185,6 +187,8 @@ class CollectionFragment( iconPhone.setImageResource(R.drawable.phone_call) val iconParking = ImageView(context) iconParking.setImageResource(R.drawable.ic_local_parking_black_24dp) + val iconUpdate = ImageView(context) + iconUpdate.setImageResource(R.drawable.ic_autorenew_black_24dp) if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { iconPrint.tooltipText = getTooltip(R.drawable.ic_print_black_24dp) @@ -192,6 +196,8 @@ class CollectionFragment( iconViewCollection.tooltipText = getTooltip(R.drawable.ic_collection) iconPhone.tooltipText = getTooltip(R.drawable.phone_call) iconParking.tooltipText = getTooltip(R.drawable.ic_local_parking_black_24dp) + iconUpdate.tooltipText = getTooltip(R.drawable.ic_autorenew_black_24dp) + } listIcons.add(iconPrint) if (type == CONTROLADOR) { @@ -200,11 +206,17 @@ class CollectionFragment( binding.previaButton.setOnClickListener { showPrevia() } + listIcons.add(iconWorker) } - listIcons.add(iconAdd) - listIcons.add(iconWorker) - if (type.equals(PRECHECKER)) { + listIcons.add(iconAdd) + + if (type==SACADOR){ + listIcons.add(iconUpdate) + listIcons.remove(iconWorker) + } + + if (type==PRECHECKER) { listIcons.add(iconParking) listIcons.remove(iconPrint) } @@ -218,6 +230,7 @@ class CollectionFragment( iconPrint.drawable -> print() iconAdd.drawable -> addItem() iconWorker.drawable -> showUser() + iconUpdate.drawable-> updateScreen() iconParking.drawable -> pasillerosItemClickListener?.onPasillerosItemClickListener( PasillerosItemVO( title = getString(R.string.Parking) @@ -231,16 +244,24 @@ class CollectionFragment( LinearLayoutManager(requireContext(), LinearLayoutManager.HORIZONTAL, false) } + + private fun updateScreen(){ + binding.splashProgress.visibility=VISIBLE + viewModel.collectionTicketGet( + getData(USER), + getData(PASSWORD), + collection.collectionFk, + getData(SECTORFK), + type) + } + + private fun showPrevia() { customDialogList.setTitle(getString(R.string.scanPreviousTicket)) .setOkButton(getString(R.string.end)) { - ma.hideKeyboard(customDialogList.getEditText()) - customDialogList.dismiss() - requireActivity().onBackPressed() - }.setValue("").show() @@ -576,8 +597,6 @@ class CollectionFragment( if (it.response.isEmpty()) { showErrorMessage(getString(R.string.codeNotExist)) viewModel.debug_add( - getData(USER), - getData(PASSWORD), "buy_deletedFromApp", value + "-" + sales[storedPosition].itemFk + "-" + getData( USERFK @@ -612,20 +631,20 @@ class CollectionFragment( }) //Tarea 4280 - /* responseTicketClosure.observe(viewLifecycleOwner, Observer { - binding.splashProgress.visibility = GONE - if (!goBack) { - if (it.response.toBoolean()) { - var customDialogWarning = CustomDialog(requireContext()) - customDialogWarning.setTitle(getString(R.string.urgentWarning)) - customDialogWarning.setDescription(getString(R.string.ticketWarning)) - .setOkButton(getString(R.string.aware)) { - customDialogWarning.dismiss() - }.show() - } - } + /* responseTicketClosure.observe(viewLifecycleOwner, Observer { + binding.splashProgress.visibility = GONE + if (!goBack) { + if (it.response.toBoolean()) { + var customDialogWarning = CustomDialog(requireContext()) + customDialogWarning.setTitle(getString(R.string.urgentWarning)) + customDialogWarning.setDescription(getString(R.string.ticketWarning)) + .setOkButton(getString(R.string.aware)) { + customDialogWarning.dismiss() + }.show() + } + } - })*/ + })*/ responseIncQuantity.observe(viewLifecycleOwner, Observer { @@ -870,7 +889,7 @@ class CollectionFragment( // pintar línea saleAdapter!!.notifyDataSetChanged() setListPosition(storedPosition, false) - + ReviewQuantityForRefreshingAndSorting(sales[storedPosition].quantity!!.toInt(),sales[storedPosition].pickedQuantity.toInt()) goBack = false } }) @@ -995,8 +1014,7 @@ class CollectionFragment( salesList.add(saleVO) if (tickets.firstOrNull { it == saleVO.ticketFk }.isNullOrEmpty()) tickets.add(saleVO.ticketFk) - } - else if (type == PRECHECKER) { + } else if (type == PRECHECKER) { if (saleVO.saleGroupFk != "") { salesList.add(saleVO) if (tickets.firstOrNull { it == saleVO.ticketFk }.isNullOrEmpty()) @@ -1097,7 +1115,7 @@ class CollectionFragment( if (type == SACADOR) { for (indice in sales.indices) { if (sales[indice].isPrepared == "0") { - setListPosition(position = indice, isFromBack = true) + setListPosition(position = indice, isFromBack = true) break } @@ -1274,13 +1292,13 @@ class CollectionFragment( ) if (type.equals(CONTROLADOR)) { - //Tarea #4280 cambiar a ticket_isOutClosureZone - /* viewModel.ticket_checkFullyControlled( - getData(USER), - getData(PASSWORD), - txtscan + //Tarea #4280 cambiar a ticket_isOutClosureZone + /* viewModel.ticket_checkFullyControlled( + getData(USER), + getData(PASSWORD), + txtscan - )*/ + )*/ } } @@ -1558,11 +1576,12 @@ class CollectionFragment( onQuantityOfShelvingSelected(itemShelvingFk) //Log.i("VERDNATURA:","Cantidad seleccionada") mpok?.start() + /* Se quita para comprobar al final de saleTracking_mark ReviewQuantityForRefreshingAndSorting( customDialogList.getValue().toInt(), sales[storedPosition].quantity!!.toInt(), sales[storedPosition].pickedQuantity.toInt() - ) + )*/ customDialogList.dismiss() } else { itemShelvingFkStored = itemShelvingFk @@ -1636,11 +1655,11 @@ class CollectionFragment( if (checkItemScan(customDialogList.getValueTwo())) { onQuantityOfShelvingSelected(itemShelvingFk) mpok?.start() - ReviewQuantityForRefreshingAndSorting( + /* ReviewQuantityForRefreshingAndSorting( customDialogList.getValue().toInt(), sales[storedPosition].quantity!!.toInt(), sales[storedPosition].pickedQuantity.toInt() - ) + )*/ // SalesSorter(sales) customDialogList.dismiss() @@ -1707,19 +1726,12 @@ class CollectionFragment( } private fun ReviewQuantityForRefreshingAndSorting( - quantityPicking: Int, quantityTotal: Int, quantityPicked: Int ) { - /* Log.i("VERDNATURA::","Picking"+quantityPicking) - Log.i("VERDNATURA::","Total"+quantityTotal) - Log.i("VERDNATURA::","Now picked"+quantityPicked)*/ - if (quantityPicked < quantityTotal) { - // SalesSorter() - // Log.i("VERDNATURA::","Lanzamos collection para que refresque adaptador y ordene") viewModel.collectionTicketGet( getData(USER), getData(PASSWORD), @@ -1813,14 +1825,10 @@ class CollectionFragment( //OPTIONS private fun print() { + if (ma.havePrinter() && ma.haveSector()) { - viewModel.collectionStickerPrint( - getData(USER), - getData(PASSWORD), - collectionFk = collection.collectionFk, - sectorFk = getData(SECTORFK) - ) - (getString(R.string.Imprimiendo) + getData(PRINTERNAME)).toast(requireContext()) + showDialogLabelCount() + } else { ma.messageWithSound( @@ -2203,7 +2211,8 @@ class CollectionFragment( private fun showQuantityDialog(position: Int) { - customDialogThreeButtons.setDescription(getString(R.string.txtnuevacantidad)).setValue("") + customDialogThreeButtons.setDescription(getString(R.string.txtnuevacantidad)) + .setValue("") //Tarea4495 // if (type != SACADOR) { @@ -2271,7 +2280,11 @@ class CollectionFragment( value.toInt(), "FALSE" ) - getString(R.string.Reject) -> TrashMissingReject(position, value.toInt(), "reject") + getString(R.string.Reject) -> TrashMissingReject( + position, + value.toInt(), + "reject" + ) getString(R.string.Split) -> split(position, value.toInt()) } @@ -2509,6 +2522,43 @@ class CollectionFragment( }.show() } + private fun showDialogLabelCount() { + //tarea#4672 + var isTicket = false + /* for (t in collection.tickets) { + if (!t.ticketFk.equals(collection.collectionFk)) { + isTicket = false + break + } + }*/ + if (isTicket){ + val builder = AlertDialog.Builder(context) + builder.setTitle(getString(R.string.selectLabeltoPrint)) + val labelCount = arrayOf("1", "2", "3", "4", "5","6","7","8","9","10") + builder.setItems(labelCount) { dialog, which -> + d("VERDNATURA::", "EL ELEGIDO ES" + which) + viewModel.collectionStickerPrint( + getData(USER), + getData(PASSWORD), + collectionFk = collection.collectionFk, + labelCount = (which+1).toString() + ) + (getString(R.string.Imprimiendo) + getData(PRINTERNAME)).toast(requireContext()) + } + val dialog = builder.create() + dialog.show() + }else{ + viewModel.collectionStickerPrint( + getData(USER), + getData(PASSWORD), + collectionFk = collection.collectionFk, + labelCount = "" + ) + (getString(R.string.Imprimiendo) + getData(PRINTERNAME)).toast(requireContext()) + } + + + } private fun showMistakeList(list: List) { binding.splashProgress.visibility = GONE listPlacementSupply = ArrayList() @@ -2517,12 +2567,16 @@ class CollectionFragment( } + + customDialogList.setTitle(getString(R.string.errorCause)) .setKoButton(getString(R.string.cancel)) { scanRequest() hideKeyboards() + listPlacementSupply.clear() customDialogList.dismiss() - }.hideDialog().show() + + }.show() placementSupplyAdapter = @@ -2562,6 +2616,8 @@ class CollectionFragment( return false } } + + } 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 0dcf41cd..90b063f5 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 @@ -407,13 +407,13 @@ class CollectionViewModel(context: Context) : BaseViewModel() { usuario: String, password: String, collectionFk: String, - sectorFk: String + labelCount: String ) { getSacadorControladorUserCase.collectionStickerPrint( usuario, password, collectionFk, - sectorFk + labelCount ).enqueue(object : Callback { override fun onFailure(call: Call, t: Throwable) { _responsePrint.value = ResponseItemVO( @@ -841,12 +841,11 @@ class CollectionViewModel(context: Context) : BaseViewModel() { } fun debug_add( - usuario: String, - password: String, + buyFk: String, message: String ) { - getSacadorControladorUserCase.debug_add(usuario, password, buyFk, message) + getSacadorControladorUserCase.debug_add(buyFk, message) .enqueue(object : Callback { override fun onFailure(call: Call, t: Throwable) { _response.value = ResponseItemVO( 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 1a319748..b102b66b 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 @@ -1,5 +1,6 @@ package es.verdnatura.presentation.view.feature.collection.fragment +import android.app.AlertDialog import android.content.Context import android.graphics.drawable.Drawable import android.os.Build @@ -140,12 +141,47 @@ class CollectionShowTicketFragment( private fun print() { + //tarea#4672 + var isTicket = false + /* for (t in collection.tickets) { + if (!t.ticketFk.equals(collection.collectionFk)) { + isTicket = false + break + } + }*/ + if (isTicket){ + val builder = AlertDialog.Builder(context) + builder.setTitle(getString(R.string.selectLabeltoPrint)) + val labelCount = arrayOf("1", "2", "3", "4", "5","6","7","8","9","10") + builder.setItems(labelCount) { dialog, which -> + viewModel.collectionStickerPrint( + getData(USER), + getData(PASSWORD), + collectionFk = collection.collectionFk, + labelCount = (which+1).toString() + ) + (getString(R.string.Imprimiendo) + getData(PRINTERNAME)).toast(requireContext()) + } + val dialog = builder.create() + dialog.show() + }else{ + viewModel.collectionStickerPrint( + getData(USER), + getData(PASSWORD), + collectionFk = collection.collectionFk, + labelCount = "" + ) + (getString(R.string.Imprimiendo) + getData(PRINTERNAME)).toast(requireContext()) + + + } + if (ma.havePrinter() && ma.haveSector()) { viewModel.collectionStickerPrint( usuario = getData(USER), password = getData(PASSWORD), collectionFk = collection.collectionFk, - sectorFk = getData(SECTORFK) + labelCount = getData(SECTORFK) ) diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/controlvehiculo/fragment/ControlVehiculoUsuarioFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/controlvehiculo/fragment/ControlVehiculoUsuarioFragment.kt index be4fb1e4..da60ede1 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/controlvehiculo/fragment/ControlVehiculoUsuarioFragment.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/controlvehiculo/fragment/ControlVehiculoUsuarioFragment.kt @@ -41,6 +41,7 @@ class ControlVehiculoUsuarioFragment( binding.splashProgress.visibility = GONE setEvents() setToolBar() + d("VERDNATURA::","el worker es"+vUserFK) setControlVehicleUser() super.init() } @@ -85,7 +86,6 @@ class ControlVehiculoUsuarioFragment( } private fun setControlVehicleUser() { - userFk = getData(USERFK) if (userFk.equals(vUserFK)) { @@ -93,13 +93,9 @@ class ControlVehiculoUsuarioFragment( binding.splashProgress.visibility = VISIBLE viewModel.machine_getWorkerPlate(getData(USER), getData(PASSWORD)) viewModel.deviceProduction_getnameDevice( - getData(USER), - getData(PASSWORD), getData(ANDROID_ID) ) viewModel.deviceProductionUser_getWorker( - getData(USER), - getData(PASSWORD), getData(ANDROID_ID) ) diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/controlvehiculo/fragment/ControlVehiculoViewModel.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/controlvehiculo/fragment/ControlVehiculoViewModel.kt index 3b9fafb8..50ea4f1a 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/controlvehiculo/fragment/ControlVehiculoViewModel.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/controlvehiculo/fragment/ControlVehiculoViewModel.kt @@ -148,10 +148,8 @@ class ControlVehiculoViewModel(context: Context) : BaseViewModel() { - fun deviceProduction_getnameDevice(usuario: String, password: String, android_id: String) { + fun deviceProduction_getnameDevice(android_id: String) { getVehicleControlTimeUserCase.deviceProduction_getnameDevice( - usuario, - password, android_id ).enqueue(object : Callback { override fun onFailure(call: Call, t: Throwable) { @@ -178,11 +176,9 @@ class ControlVehiculoViewModel(context: Context) : BaseViewModel() { }) } - fun deviceProductionUser_getWorker(usuario: String, password: String, userFk: String) { + fun deviceProductionUser_getWorker(android_id: String) { getVehicleControlTimeUserCase.deviceProductionUser_getWorker( - usuario, - password, - userFk + android_id ).enqueue(object : Callback { override fun onFailure(call: Call, t: Throwable) { _responsemachine.value = ResponseItemMachineControl( 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 6f5f9184..e5cdfe67 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 @@ -69,7 +69,7 @@ class InventaryFragment : buyerId = getData(BUYERID) if (!buyerId.isBlank()) { binding.splashProgress.visibility = View.VISIBLE - viewModel.getInventory(getData(USER), getData(PASSWORD), buyerId, getData(WAREHOUSEFK)) + viewModel.getInventory( buyerId.toInt(), getData(WAREHOUSEFK).toInt()) } binding.filterBuyer.setOnClickListener { //SimpleSearchDialogCompat(context,getString(R.string.compradores),getString(R.string.escribirparteNombre),null,initData(), @@ -85,10 +85,8 @@ class InventaryFragment : saveBuyerId(nombre.getBuyerId()) buyerId = nombre.getBuyerId() viewModel.getInventory( - getData(USER), - getData(PASSWORD), - nombre.getBuyerId(), - getData(WAREHOUSEFK) + nombre.getBuyerId().toInt(), + getData(WAREHOUSEFK).toInt() ) binding.splashProgress.visibility = View.VISIBLE baseSearchDialogCompat.dismiss() @@ -128,10 +126,8 @@ class InventaryFragment : binding.splashProgress.visibility = View.VISIBLE firstVisiblePosition = layoutManager?.findFirstVisibleItemPosition() ?: 0 viewModel.getInventory( - getData(USER), - getData(PASSWORD), - buyerId, - getData(WAREHOUSEFK) + buyerId.toInt(), + getData(WAREHOUSEFK).toInt() ) } diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/inventario/fragment/InventaryViewModel.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/inventario/fragment/InventaryViewModel.kt index 73ce1627..763eeead 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/inventario/fragment/InventaryViewModel.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/inventario/fragment/InventaryViewModel.kt @@ -99,37 +99,8 @@ class InventaryViewModel(context: Context) : BaseViewModel() { val loadInventaryList = Transformations.map(_inventaryList) { Event(it) } -//sergio: borrar. En 6.1.3 ya no se utiliza - /*fun getInventory(user:String,password:String,buyerFk:String){ - - getInventaryUserCase.itemShelvingRadar(user,password,buyerFk).enqueue(object : - Callback> { - override fun onFailure(call: Call>, t: Throwable) { - val listError:ArrayList = ArrayList() - listError.add(ItemInventaryVO(isError = true,errorMessage = 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 = "Error en la llamada de itemShelvingRadar")) - _inventaryList.value = InventaryListVO(listError) - - } - } - - }) - }*/ - - fun getInventory(user: String, password: String, buyerFk: String, warehouseFk: String) { - // getInventaryUserCase.itemShelvingRadar(user,password,buyerFk).enqueue(object : - getInventaryUserCase.itemShelvingRadarFilterBuyer(user, password, buyerFk, warehouseFk) + fun getInventory( buyerFk: Int, warehouseFk: Int) { + getInventaryUserCase.itemShelvingRadarFilterBuyer( buyerFk, warehouseFk) .enqueue(object : Callback> { override fun onFailure(call: Call>, t: Throwable) { @@ -249,9 +220,9 @@ class InventaryViewModel(context: Context) : BaseViewModel() { }) } - fun department_getHasMistake(usuario: String, password: String) { + fun department_getHasMistake() { - getWorkerMistakeUserCase.department_getHasMistake(usuario, password) + getWorkerMistakeUserCase.department_getHasMistake() .enqueue(object : Callback> { override fun onFailure(call: Call>, t: Throwable) { val listError: ArrayList = ArrayList() @@ -420,12 +391,10 @@ class InventaryViewModel(context: Context) : BaseViewModel() { }) } fun expeditionMistake_add( - usuario: String, - password: String, - vExpeditionFk: String, + vExpeditionFk: Int, vTypeFk: String ) { - getWorkerMistakeUserCase.expeditionMistake_add(usuario, password, vExpeditionFk, vTypeFk) + getWorkerMistakeUserCase.expeditionMistake_add(vExpeditionFk, vTypeFk) .enqueue(object : Callback { override fun onFailure(call: Call, t: Throwable) { @@ -462,8 +431,8 @@ class InventaryViewModel(context: Context) : BaseViewModel() { } }) } - fun expeditionMistakeType_get(usuario: String, password: String) { - getWorkerMistakeUserCase.expeditionMistakeType_get(usuario, password) + fun expeditionMistakeType_get() { + getWorkerMistakeUserCase.expeditionMistakeType_get() .enqueue(object : Callback> { override fun onFailure(call: Call>, t: Throwable) { val listError: ArrayList = ArrayList() diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/login/activity/LoginActivity.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/login/activity/LoginActivity.kt index 8d17a3e1..5f0dd55a 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/login/activity/LoginActivity.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/login/activity/LoginActivity.kt @@ -33,7 +33,6 @@ class LoginActivity : BaseActivity() { fun goToMain() { val intent = Intent(this, MainActivity::class.java) startActivity(intent) - //splash_progress.visibility=View.GONE finish() } 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 56528064..68eb5c65 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 @@ -350,8 +350,6 @@ class LoginFragment : BaseFragment(LoginVi deviceLog_add( - binding.edittextUsername.text.toString(), - binding.edittextPassword.text.toString(), getString(R.string.logAppName), getInfoVersionNameApp(), getData(ANDROID_ID) @@ -413,11 +411,10 @@ class LoginFragment : BaseFragment(LoginVi } viewModel.device_checkLogin( - binding.edittextUsername.text.toString(), - binding.edittextPassword.text.toString(), + getData(USER), getData(ANDROID_ID) ) - viewModel.operator_getNumberOfWagons(getData(USER), getData(PASSWORD)) + viewModel.operator_getNumberOfWagons() } operatorGetNumberOfWagons.observe(viewLifecycleOwner) { @@ -517,12 +514,6 @@ class LoginFragment : BaseFragment(LoginVi //Tarea 4351 quitar el if y poner e device_checkLogin a continuación del response de operator_add viewModel.operator_add(getData(USER), getData(PASSWORD)) - /* viewModel.device_checkLogin( - binding.edittextUsername.text.toString(), - binding.edittextPassword.text.toString(), - getData(ANDROID_ID) - )*/ - } } @@ -575,29 +566,11 @@ class LoginFragment : BaseFragment(LoginVi private fun getVersion() { binding.splashProgress.visibility = View.VISIBLE viewModel.checkVersion( - user = binding.edittextUsername.text.toString(), - password = binding.edittextPassword.text.toString(), nameApp = getString(R.string.nameApp) ) } - /*fun setDefaults(key: String?, value: String?, context: Context?) { - - val preferences: SharedPreferences = PreferenceManager.getDefaultSharedPreferences(context) - val editor = preferences.edit() - editor.putString(key, value) - editor.commit() - }*/ - - /* fun getDefaults(key: String?, context: Context?): String? { - val preferences = PreferenceManager.getDefaultSharedPreferences(context) - return preferences.getString(key, null) - }*/ - - // sergio:creada restart en BaseFragment para AjustesFragment... - - } 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 efd4108b..d90e196e 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 @@ -1,8 +1,6 @@ package es.verdnatura.presentation.view.feature.login.fragment -import android.app.Activity import android.content.Context -import android.content.SharedPreferences import android.util.Log.d import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData @@ -10,10 +8,8 @@ import androidx.lifecycle.Transformations import com.google.gson.Gson import com.google.gson.JsonObject import com.google.gson.reflect.TypeToken -import es.verdnatura.MobileApplication import es.verdnatura.domain.GetLoginUserCase import es.verdnatura.domain.NodeJsService -import es.verdnatura.domain.RestClient import es.verdnatura.domain.SilexCallback import es.verdnatura.presentation.base.BaseViewModel import es.verdnatura.presentation.base.getMessageFromAllResponse @@ -28,15 +24,12 @@ import es.verdnatura.presentation.view.feature.login.model.LoginDevice import es.verdnatura.presentation.view.feature.login.model.LoginSalixVO import es.verdnatura.presentation.view.feature.login.model.versionApp import es.verdnatura.presentation.view.feature.login.model.workerId -import es.verdnatura.presentation.view.feature.main.activity.MainActivity import es.verdnatura.presentation.view.feature.paletizador.model.itemsExpeditionDynamics -import org.json.JSONObject import retrofit2.Call import retrofit2.Callback import retrofit2.Response -import java.lang.Error -class LoginViewModel(context: Context) : BaseViewModel(context) { +class LoginViewModel(var context: Context) : BaseViewModel(context) { private val getLoginUserCase: GetLoginUserCase = GetLoginUserCase(context) private val _loginsalixitem by lazy { MutableLiveData() } @@ -133,15 +126,14 @@ class LoginViewModel(context: Context) : BaseViewModel(context) { }) } - fun device_checkLogin(user: String, password: String, android_id: String) { + fun device_checkLogin(user: String, android_id: String) { - getLoginUserCase.device_checkLogin(user, password, android_id) + getLoginUserCase.device_checkLogin(user, android_id) .enqueue(object : Callback { override fun onResponse(call: Call, response: Response) { val loginDevice: LoginDevice? - if (!response.isSuccessful) { loginDevice = LoginDevice( isError = true, @@ -196,24 +188,44 @@ class LoginViewModel(context: Context) : BaseViewModel(context) { } fun worker_getId() { - silex!!.worker_getId().enqueue(object : SilexCallback() { + + silex!!.worker_getId().enqueue(object : SilexCallback(context) { override fun onSuccess(response: Response) { - var prefs = app!!.getPrefs() - response.body()?.let { prefs.putInt("userFk", it) } - prefs.apply() + val prefs = app!!.getPrefs() + //de moment string , a revisar casos ja que si no dona problemes + response.body()?.let { prefs.putString("userFk", it.toString()) } + prefs.commit() } - override fun onError(err: Error) { - d("VERDNATURA::","Entramos al fallo"+err.message) - throw err + override fun onError(t: Throwable) { + d("VERDNATURA::", "Entramos al fallo" + t.message!!) + throw t } + }) + } - fun deviceLog_add( - user: String, password: String, app: String, versionApp: String, android_id: String + fun deviceLog_add(app: String, versionApp: String, android_id: String ) { - getLoginUserCase.deviceLog_add(user, password, app, versionApp, android_id) + + silex!!.deviceLog_add(app,versionApp,android_id).enqueue(object : SilexCallback(context) { + + + override fun onError(t: Throwable) { + //d("VERDNATURA::", "Entramos al fallo" + t.message!!) + //throw t + throw Error(nameofFunction((this))+"->"+t.message) + } + + override fun onSuccess(response: Response) { + + } + + + }) + + /* getLoginUserCase.deviceLog_add(user, password, app, versionApp, android_id) .enqueue(object : Callback { override fun onResponse(call: Call, response: Response) { @@ -229,7 +241,7 @@ class LoginViewModel(context: Context) : BaseViewModel(context) { messageError(nameofFunction(this), t.message!!) } - }) + })*/ } fun messageError(callFunction: String, message: String) { @@ -240,8 +252,8 @@ class LoginViewModel(context: Context) : BaseViewModel(context) { } - fun checkVersion(user: String, password: String, nameApp: String) { - getLoginUserCase.checkVersion(user, password, nameApp) + fun checkVersion(nameApp: String) { + getLoginUserCase.checkVersion(nameApp) .enqueue(object : Callback { override fun onResponse(call: Call, response: Response) { @@ -264,8 +276,8 @@ class LoginViewModel(context: Context) : BaseViewModel(context) { } else { _versionappitem.value = versionApp( - user, - password, + "", + "", isError = true, errorMessage = getMessageFromAllResponse( nameofFunction(this), @@ -412,9 +424,9 @@ class LoginViewModel(context: Context) : BaseViewModel(context) { }) } - fun operator_getNumberOfWagons(user: String, password: String) { + fun operator_getNumberOfWagons() { - getLoginUserCase.operator_getNumberOfWagons(user, password) + silex!!.operator_getNumberOfWagons() .enqueue(object : Callback { override fun onFailure(call: Call, t: Throwable) { @@ -530,7 +542,6 @@ class LoginViewModel(context: Context) : BaseViewModel(context) { } - } }) 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 54d4aa00..06c2c2b7 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 @@ -3,7 +3,6 @@ package es.verdnatura.presentation.view.feature.main.activity import android.content.SharedPreferences import android.media.MediaPlayer -import android.util.Log import android.view.Menu import android.widget.Toast import androidx.core.content.ContextCompat @@ -86,8 +85,6 @@ class MainActivity : BaseActivity(), OnPasillerosItemClickL private lateinit var customDialog: CustomDialogMainActivity var firstItem: ItemMenuVO? = null var fm = supportFragmentManager - - //var TAG = "MainActivity" var mperror: MediaPlayer? = null var mpok: MediaPlayer? = null override fun getLayoutId(): Int = R.layout.activity_main @@ -442,11 +439,11 @@ class MainActivity : BaseActivity(), OnPasillerosItemClickL addFragmentOnTop(UbicadorFragment.newInstance(entryPoint)) } getString(R.string.titleAuto) -> { - addFragmentOnTop(AutomaticAddItemFragment.newInstance(entryPoint,item.title)) + addFragmentOnTop(AutomaticAddItemFragment.newInstance(entryPoint, item.title)) } getString(R.string.titleChecker) -> { - addFragmentOnTop(AutomaticAddItemFragment.newInstance(entryPoint,item.title)) + addFragmentOnTop(AutomaticAddItemFragment.newInstance(entryPoint, item.title)) } getString(R.string.titleQuality) -> { @@ -529,7 +526,7 @@ class MainActivity : BaseActivity(), OnPasillerosItemClickL addFragmentOnTop(SupplierFragment.newInstance(item.title)) } - getString(R.string.titlePackagingCount) -> { + getString(R.string.titlePackagingCount) -> { addFragmentOnTop(PackagingCountFragment.newInstance(item.title)) } @@ -559,7 +556,7 @@ class MainActivity : BaseActivity(), OnPasillerosItemClickL override fun onBackPressed() { var index = supportFragmentManager.backStackEntryCount - 1 - var backEntry ="" + var backEntry = "" if (index >= 0) { backEntry = supportFragmentManager.getBackStackEntryAt(index).name.toString() //Log.d("VERDNATURA::", "El fragment es " + backEntry) @@ -567,184 +564,179 @@ class MainActivity : BaseActivity(), OnPasillerosItemClickL - try { - fm.executePendingTransactions() - } catch (e: Exception) { - } - - if (fm.backStackEntryCount > 0) { - - fm.popBackStackImmediate() - - if (!backEntry.isNullOrBlank()) - if (backEntry!!.contains("fragment.ExpeditionPalletDetailFragment.Companion")) { - addFragmentOnTop(ExpeditionTruckListFragment.newInstance()) - } - } else { - customDialog.setTitle(getString(R.string.closeSession)) - .setDescription(getString(R.string.sureCloseSession)) - .setOkButton(getString(R.string.exit)) { - customDialog.dismiss() - finish() - - }.setKoButton(getString(R.string.cancel)) { - customDialog.dismiss() - }.show() - - } + try { + fm.executePendingTransactions() + } catch (e: Exception) { } - override fun onTruckClickListener(item: ItemExpeditionTruckVO, entryPoint: String) { - //Log.d("VERDNATURA","Pulsdo item"+item.truckFk) - addFragmentOnTop(ExpeditionPalletFragment.newInstance(item)) + if (fm.backStackEntryCount > 0) { - } + fm.popBackStackImmediate() - override fun onPalletClickListener( - itemTruck: ItemExpeditionTruckVO, - itemPallet: ItemPalletVO - ) { - //Tarea #4125 - //Log.d("VERDNATURA::","Entrando en pallet2") - addFragmentOnTop(ExpeditionScanFragment.newInstance(itemTruck, itemPallet)) - - } - - - override fun onComprobarPalletViewClickListener( - itemTruck: ItemExpeditionTruckVO, - itemPallet: ItemPalletVO - ) { - - addFragmentOnTop(ExpeditionPalletDetailFragment.newInstance(itemTruck, itemPallet)) - - } - - fun onComprobarPalletFromPalletScan( - itemTruck: ItemExpeditionTruckVO, - itemPallet: ItemPalletVO - ) { - fm.popBackStack(null, FragmentManager.POP_BACK_STACK_INCLUSIVE) - - addFragment( - ExpeditionPalletDetailFragment.newInstance(itemTruck, itemPallet), - R.id.main_frame_layout, - ExpeditionPalletDetailFragment.TAG, - true - ) - - } - - /* fun onParkingSaleSelected(sales: SaleVO) { - addFragmentOnTop(ParkingSaleFragment.newInstance(SaleVO = sales)) - }*/ - - - override fun onCollectionSelected(collection: CollectionVO, type: String) { - - when (type) { - PREITEMPICKER -> { - - addFragmentOnTop(EndSacadorFragment.newInstance(collection, type)) - } - "SHOWTICKET" -> { - addFragmentOnTop(CollectionShowTicketFragment.newInstance(collection, type)) + if (!backEntry.isNullOrBlank()) + if (backEntry!!.contains("fragment.ExpeditionPalletDetailFragment.Companion")) { + addFragmentOnTop(ExpeditionTruckListFragment.newInstance()) } + } else { + customDialog.setTitle(getString(R.string.closeSession)) + .setDescription(getString(R.string.sureCloseSession)) + .setOkButton(getString(R.string.exit)) { + customDialog.dismiss() + finish() - else -> { - addFragmentOnTop(CollectionFragment.newInstance(collection, type)) - } - } - - - } - - override fun onBuyerSelected(userFk: String) { - addFragmentOnTop(QaualityFragment.newInstance(userFk)) - } - - - //sergio:se llama al pulsar sobre el coche IN desde Sacador - fun onVehicleSelected(tag: String) { - fm.popBackStack(null, FragmentManager.POP_BACK_STACK_INCLUSIVE) - - // se pone a true en la pila para que cuando se vuelva atrás permanezca ya que se borran todos los fragmentos desde otras opciones - addFragment( - ControlVehiculoFragment.newInstance(tag), - R.id.main_frame_layout, - ControlVehiculoFragment.TAG, - true - ) - //sergio: de esta manera la llamada del fragment no se vuelve a repetir. - // addFragmentOnTop(ControlVehiculoFragment.newInstance(tag)) - } - - fun openFragmentPickers(delete: Boolean) { - //delete_Fragments() - fm.popBackStack(null, FragmentManager.POP_BACK_STACK_INCLUSIVE) - if (delete) { - delete_Fragments() - } - addFragment( - SacadorFragment.newInstance(), - R.id.main_frame_layout, - SacadorFragment.TAG, - true - - - ) - //addFragmentOnTop(SacadorFragment.newInstance()) - - } - - fun openFragmentExpeditionState() { - //delete_Fragments() - // fm.popBackStack(null,FragmentManager.POP_BACK_STACK_INCLUSIVE) - // addFragment(ExpeditionStateFragment.newInstance("main"),R.id.main_frame_layout, ExpeditionStateFragment.TAG,false) - - addFragmentOnTop(ExpeditionStateFragment.newInstance(getString(R.string.titleExpeditionState))) - - } - - fun openFragmentReubications(list: MutableList, shelving: String) { - - addFragmentOnTop(ReubicationCollectionFragment.newInstance(list, shelving)) - - } - - fun hideBottomNavigation(visible: Int) { - binding.mainBottomNavigation.visibility = visible - } - - - fun messageWithSound( - message: String, - isError: Boolean, - isPlayed: Boolean?, - titleWithError: String = getString(R.string.error), - isToasted: Boolean? = true - ) { - - if (!isError) { - - if (isPlayed == true) (mpok?.start()) - if (isToasted!!) message.toast(this, Toast.LENGTH_SHORT) - } else { - - if (isPlayed == true) (mperror?.start()) - - if (isToasted == true) { - message.toast(this, Toast.LENGTH_SHORT) - } else { - customDialog.setTitle(titleWithError).setDescription(message) - .setOkButton(getString(R.string.accept)) { - customDialog.dismiss() - }.show() - } - - - } - + }.setKoButton(getString(R.string.cancel)) { + customDialog.dismiss() + }.show() } } + + override fun onTruckClickListener(item: ItemExpeditionTruckVO, entryPoint: String) { + //Log.d("VERDNATURA","Pulsdo item"+item.truckFk) + addFragmentOnTop(ExpeditionPalletFragment.newInstance(item)) + + } + + override fun onPalletClickListener( + itemTruck: ItemExpeditionTruckVO, + itemPallet: ItemPalletVO + ) { + //Tarea #4125 + //Log.d("VERDNATURA::","Entrando en pallet2") + addFragmentOnTop(ExpeditionScanFragment.newInstance(itemTruck, itemPallet)) + + } + + + override fun onComprobarPalletViewClickListener( + itemTruck: ItemExpeditionTruckVO, + itemPallet: ItemPalletVO + ) { + + addFragmentOnTop(ExpeditionPalletDetailFragment.newInstance(itemTruck, itemPallet)) + + } + + fun onComprobarPalletFromPalletScan( + itemTruck: ItemExpeditionTruckVO, + itemPallet: ItemPalletVO + ) { + fm.popBackStack(null, FragmentManager.POP_BACK_STACK_INCLUSIVE) + + addFragment( + ExpeditionPalletDetailFragment.newInstance(itemTruck, itemPallet), + R.id.main_frame_layout, + ExpeditionPalletDetailFragment.TAG, + true + ) + + } + + override fun onCollectionSelected(collection: CollectionVO, type: String) { + + when (type) { + PREITEMPICKER -> { + + addFragmentOnTop(EndSacadorFragment.newInstance(collection, type)) + } + "SHOWTICKET" -> { + addFragmentOnTop(CollectionShowTicketFragment.newInstance(collection, type)) + } + + else -> { + addFragmentOnTop(CollectionFragment.newInstance(collection, type)) + } + } + + + } + + override fun onBuyerSelected(userFk: String) { + addFragmentOnTop(QaualityFragment.newInstance(userFk)) + } + + + //sergio:se llama al pulsar sobre el coche IN desde Sacador + fun onVehicleSelected(tag: String) { + fm.popBackStack(null, FragmentManager.POP_BACK_STACK_INCLUSIVE) + + // se pone a true en la pila para que cuando se vuelva atrás permanezca ya que se borran todos los fragmentos desde otras opciones + addFragment( + ControlVehiculoFragment.newInstance(tag), + R.id.main_frame_layout, + ControlVehiculoFragment.TAG, + true + ) + //sergio: de esta manera la llamada del fragment no se vuelve a repetir. + // addFragmentOnTop(ControlVehiculoFragment.newInstance(tag)) + } + + fun openFragmentPickers(delete: Boolean) { + //delete_Fragments() + fm.popBackStack(null, FragmentManager.POP_BACK_STACK_INCLUSIVE) + if (delete) { + delete_Fragments() + } + addFragment( + SacadorFragment.newInstance(), + R.id.main_frame_layout, + SacadorFragment.TAG, + true + + + ) + //addFragmentOnTop(SacadorFragment.newInstance()) + + } + + fun openFragmentExpeditionState() { + //delete_Fragments() + // fm.popBackStack(null,FragmentManager.POP_BACK_STACK_INCLUSIVE) + // addFragment(ExpeditionStateFragment.newInstance("main"),R.id.main_frame_layout, ExpeditionStateFragment.TAG,false) + + addFragmentOnTop(ExpeditionStateFragment.newInstance(getString(R.string.titleExpeditionState))) + + } + + fun openFragmentReubications(list: MutableList, shelving: String) { + + addFragmentOnTop(ReubicationCollectionFragment.newInstance(list, shelving)) + + } + + fun hideBottomNavigation(visible: Int) { + binding.mainBottomNavigation.visibility = visible + } + + + fun messageWithSound( + message: String, + isError: Boolean, + isPlayed: Boolean?, + titleWithError: String = getString(R.string.error), + isToasted: Boolean? = true + ) { + + if (!isError) { + + if (isPlayed == true) (mpok?.start()) + if (isToasted!!) message.toast(this, Toast.LENGTH_SHORT) + } else { + + if (isPlayed == true) (mperror?.start()) + + if (isToasted == true) { + message.toast(this, Toast.LENGTH_SHORT) + } else { + customDialog.setTitle(titleWithError).setDescription(message) + .setOkButton(getString(R.string.accept)) { + customDialog.dismiss() + }.show() + } + + + } + + + } +} 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 00215ce2..92110c20 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 @@ -5,7 +5,6 @@ import android.graphics.drawable.Drawable import android.media.MediaPlayer import android.os.Build import android.os.Bundle -import android.util.Log import android.view.View import android.view.View.GONE import android.view.View.VISIBLE @@ -105,7 +104,7 @@ class EndSacadorFragment( customDialogInput = CustomDialogInput(requireContext()) customDialogInputParking = CustomDialogInput(requireContext()) customDialogThreeButtons = CustomDialogThreeButtons(requireContext()) - binding.splashProgress.visibility =GONE + binding.splashProgress.visibility = GONE binding.mainToolbar.toolbarTitle.text = getString(R.string.getticketpre) setToolBar() setEvents() @@ -172,7 +171,7 @@ class EndSacadorFragment( override fun observeViewModel() { with(viewModel) { salesList.observe(viewLifecycleOwner, Observer { - binding.splashProgress.visibility =GONE + binding.splashProgress.visibility = GONE createSaleList(it) }) @@ -200,7 +199,7 @@ class EndSacadorFragment( }) placementSuppleyList.observe(viewLifecycleOwner, Observer { - binding.splashProgress.visibility =GONE + binding.splashProgress.visibility = GONE if (!goBack) printShelvingResult(it) goBack = false }) @@ -394,7 +393,7 @@ class EndSacadorFragment( }) responseCode.observe(viewLifecycleOwner, Observer { - binding.splashProgress.visibility =GONE + binding.splashProgress.visibility = GONE if (!goBack2) { if (it.isError) { customDialog.setTitle(getString(R.string.error)) @@ -472,7 +471,11 @@ class EndSacadorFragment( val ticket = "[" + sales[positionIncreaseQuantity].id + "](https://salix.verdnatura.es/#!/ticket/" + sales[positionIncreaseQuantity].id + "/summary)" val message = - getString(R.string.modifiedQuantityPrevious) + sales[positionIncreaseQuantity].quantity + getString(R.string.fromItem) + sales[positionIncreaseQuantity].itemFk + getString(R.string.toNewQuantity) + quantityIncrease + getString(R.string.fromTicket) + ticket + getString(R.string.modifiedQuantityPrevious) + sales[positionIncreaseQuantity].quantity + getString( + R.string.fromItem + ) + sales[positionIncreaseQuantity].itemFk + getString(R.string.toNewQuantity) + quantityIncrease + getString( + R.string.fromTicket + ) + ticket @@ -624,7 +627,7 @@ class EndSacadorFragment( } - // var sortedSales = sales.sortedBy { it.pickingOrder } + // var sortedSales = sales.sortedBy { it.pickingOrder } //sergio: Se ordena las sales por ellas mismas con With sales.sortWith(compareBy({ it.pickingOrder })) @@ -970,7 +973,7 @@ class EndSacadorFragment( customDialogList.dismiss() } } else { - getString(R.string.scanItemValidate) .toast(requireContext()) + getString(R.string.scanItemValidate).toast(requireContext()) } scanRequest() hideKeyboards() @@ -1335,57 +1338,6 @@ class EndSacadorFragment( } - //FALTAS / BASURA / SPLIT - /* private fun showQuantityDialogOld(position: Int) { - customDialogThreeButtons.setDescription(getString(R.string.txtnuevacantidad)).setValue("") - .setOkButton(getString(R.string.titleFaults)) { - if (customDialogThreeButtons.getValue().trim().isNullOrEmpty()) { - getString(R.string.Indicanuevacantidad).toast(requireContext()) - } else { - trash(position, customDialogThreeButtons.getValue()) - scanRequest() - customDialogThreeButtons.dismiss() - } - }.setOkButtonTwo(getString(R.string.BasuraRechazar)) { - if (customDialogThreeButtons.getValue().trim().isNullOrEmpty()) { - getString(R.string.Indicanuevacantidad).toast(requireContext()) - } else { - missing(position, customDialogThreeButtons.getValue()) - scanRequest() - customDialogThreeButtons.dismiss() - } - }.setOkButtonThree(getString(R.string.Reject)) { - if (customDialogThreeButtons.getValue().trim().isNullOrEmpty()) { - getString(R.string.Indicanuevacantidad).toast(requireContext()) - } else { - reject(position, customDialogThreeButtons.getValue()) - scanRequest() - customDialogThreeButtons.dismiss() - } - - }.setOkButtonFour(getString(R.string.Split)) { - if (customDialogThreeButtons.getValue().trim().isNullOrEmpty()) { - getString(R.string.Indicanuevacantidad).toast(requireContext()) - } else { - split(position, customDialogThreeButtons.getValue()) - scanRequest() - customDialogThreeButtons.dismiss() - } - - }.setOkButtonAdd(getString(R.string.Agregar)) { - if (customDialogThreeButtons.getValue().trim().isNullOrEmpty()) { - getString(R.string.Indicanuevacantidad).toast(requireContext()) - } else { - increaseQuantity(position, customDialogThreeButtons.getValue()) - scanRequest() - customDialogThreeButtons.dismiss() - } - }.setKoButton(getString(R.string.cancel)) { - scanRequest() - customDialogThreeButtons.dismiss() - }.show() - }*/ - private fun split(position: Int, quantity: String) { positionCollectionSplit = position @@ -1406,197 +1358,16 @@ class EndSacadorFragment( quantity = totalQuantity.toString() ) - /* - try { - sales[position].saldo = quantity.toInt() - } catch (e: Exception) { - sales[position].saldo = 0 - } - - - if (quantity == "0") - markLine(position) - saleAdapter!!.notifyDataSetChanged() - - - //enviar mensaje a salix - val ticket = - "[" + sales[position].id + "](https://salix.verdnatura.es/#!/ticket/" + sales[position].id + "/summary)" - val message = - "Se ha enviado a Split el articulo " + sales[position].itemFk + " del ticket " + ticket - viewModel.sendChekingPresence( - token = getData(TOKEN), - workerId = sales[position].salesPersonFk, - message = message, - "sendChekingPresence" - ) - */ } - /* private fun trash(position: Int, quantity: String) { - var totalQuantity: Int = 0 - try { - totalQuantity = sales[position].saldo.toInt() - quantity.toInt() - } catch (e: Exception) { - } - viewModel.collectionMissingTrash( - usuario = getData(USER), - password = getData(PASSWORD), - saleFk = sales[position].idMovimiento, - quantity = totalQuantity.toString(), - warehouseFk = getData(WAREHOUSEFK), - type = "FALSE", - originalQuantity = quantity - ) - //sales[position].originalQuantity = quantity - try { - sales[position].saldo = quantity.toInt() - } catch (e: Exception) { - sales[position].saldo = 0 - } - //sales[position].startQuantity = quantity - saleAdapter!!.notifyDataSetChanged() - if (quantity == "0") - markLine(position) - - - //enviar mensaje a salix - val ticket = - "[" + sales[position].id + "](https://salix.verdnatura.es/#!/ticket/" + sales[position].id + "/summary)" - val message = - "Se ha enviado a Faltas la cantidad de " + totalQuantity + getString(R.string.fromItem) + sales[position].itemFk + " ticket " + ticket - viewModel.sendChekingPresence( - token = getData(TOKEN), - workerId = sales[position].salesPersonFk, - message = message - ) - } - - private fun missing(position: Int, quantity: String) { - var totalQuantity: Int = 0 - try { - totalQuantity = sales[position].saldo.toInt() - quantity.toInt() - } catch (e: Exception) { - } - viewModel.collectionMissingTrash( - usuario = getData(USER), - password = getData(PASSWORD), - saleFk = sales[position].idMovimiento, - quantity = totalQuantity.toString(), - warehouseFk = getData(WAREHOUSEFK), - type = "TRUE", - originalQuantity = quantity - ) - //sales[position].originalQuantity = quantity - try { - sales[position].saldo = quantity.toInt() - } catch (e: Exception) { - sales[position].saldo = 0 - } - - //sales[position].startQuantity = quantity - - if (quantity == "0") - markLine(position) - saleAdapter!!.notifyDataSetChanged() - - - //enviar mensaje a salix - val ticket = - "[" + sales[position].id + "](https://salix.verdnatura.es/#!/ticket/" + sales[position].id + "/summary)" - val message = - "Se ha enviado a Basura " + totalQuantity + getString(R.string.fromItem) + sales[position].itemFk + " ticket " + ticket - viewModel.sendChekingPresence( - token = getData(TOKEN), - workerId = sales[position].salesPersonFk, - message = message - ) - } - - private fun reject(position: Int, quantity: String) { - var totalQuantity: Int = 0 - try { - totalQuantity = sales[position].saldo.toInt() - quantity.toInt() - } catch (e: Exception) { - } - viewModel.collectionMissingTrash( - usuario = getData(USER), - password = getData(PASSWORD), - saleFk = sales[position].idMovimiento, - quantity = totalQuantity.toString(), - warehouseFk = getData(WAREHOUSEFK), - type = "reject", - originalQuantity = quantity - ) - - //enviar mensaje a salix - *//* val ticket = - "[" + ticketFk + "](https://salix.verdnatura.es/#!/ticket/" + ticketFk + "/summary)" - val message = - "Se ha modificado la cantidad original desde previa" + sales[position].saldo + " del artículo " + sales[position].itemFk + " a nueva cantidad: " + quantity + " del ticket " + ticket - viewModel.sendChekingPresence( - token = getData(TOKEN), - workerId = sales[position].salesPersonFk, - message = message, - "sendChekingPresence" - )*//* - - try { - sales[position].saldo = quantity.toInt() - } catch (e: Exception) { - sales[position].saldo = 0 - } - //sales[position].startQuantity = quantity - saleAdapter!!.notifyDataSetChanged() - if (quantity == "0") - markLine(position) - - - } - - private fun increaseQuantityOld(position: Int, quantity: String) { - viewModel.collectionIncreaseQuantity( - usuario = getData(USER), - password = getData(PASSWORD), - saleFk = sales[position].idMovimiento, - quantity = quantity - - ) - try { - - //enviar mensaje a salix - val ticket = - "[" + sales[position].id + "](https://salix.verdnatura.es/#!/ticket/" + sales[position].id + "/summary)" - val message = - "Se ha modificado la cantidad original " + sales[position].saldo + " del artículo " + sales[position].itemFk + " a nueva cantidad: " + quantity + " del ticket " + ticket - viewModel.sendChekingPresence( - token = getData(TOKEN), - workerId = sales[position].salesPersonFk, - message = message - - ) - - //Timber.d("VERDNATURA").d("el trabajador es " + sales[position].salesPersonFk) - try { - sales[position].saldo = quantity.toInt() - } catch (e: Exception) { - sales[position].saldo = 0 - } - } catch (e: Exception) { - } - saleAdapter?.notifyDataSetChanged() - - - }*/ private fun increaseQuantity(position: Int, quantity: String) { positionIncreaseQuantity = position quantityIncrease = quantity viewModel.collectionIncreaseQuantity( - usuario = getData(USER), - password = getData(PASSWORD), + token = getData(TOKEN), saleFk = sales[position].idMovimiento, quantity = quantity ) 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 97c84e13..bee38278 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 @@ -1333,46 +1333,15 @@ class PreSacadorFragment : } - private fun increaseQuantityOld(position: Int, quantity: String) { - viewModel.collectionIncreaseQuantity( - usuario = getData(USER), - password = getData(PASSWORD), - saleFk = sales[position].idMovimiento, - quantity = quantity - ) - try { - //enviar mensaje a salix - val ticket = - "[" + sales[position].id + "](https://salix.verdnatura.es/#!/ticket/" + sales[position].id + "/summary)" - val message = - "Se ha modificado la cantidad original " + sales[position].saldo + " del artículo " + sales[position].itemFk + " a nueva cantidad: " + quantity + " del ticket " + ticket - viewModel.sendChekingPresence( - token = getData(TOKEN), - workerId = sales[position].salesPersonFk, - message = message - ) - - //Log.d("VERDNATURA","el trabajador es "+sales[position].salesPersonFk) - try { - sales[position].saldo = quantity.toInt() - } catch (e: Exception) { - sales[position].saldo = 0 - } - } catch (e: Exception) { - } - saleAdapter?.notifyDataSetChanged() - - - } private fun increaseQuantity(position: Int, quantity: String) { positionIncreaseQuantity = position quantityIncrease = quantity viewModel.collectionIncreaseQuantity( - usuario = getData(USER), - password = getData(PASSWORD), + // usuario = getData(USER), + token = getData(PASSWORD), saleFk = sales[position].idMovimiento, 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 b43c3100..1cab7803 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 @@ -499,6 +499,40 @@ class PreSacadorViewModel(context: Context) : BaseViewModel() { } fun collectionIncreaseQuantity( + token: String, + saleFk: String, + quantity: String + ) { + getSacadorControladorUserCase.collectionIncreaseQuantitySalix( + token, + saleFk, + quantity + ).enqueue(object : Callback { + override fun onFailure(call: Call, t: Throwable) { + _responseIncQuantity.value = ResponseItemVO( + isError = true, + errorMessage = getMessageFromAllResponse(nameofFunction(this), t.message!!) + ) + } + + override fun onResponse(call: Call, response: Response) { + if (!response.isSuccessful) { + _responseIncQuantity.value = ResponseItemVO( + isError = true, + errorMessage = getMessageFromAllResponse( + nameofFunction(this), + response.message() + ) + ) + } else { + _responseIncQuantity.value = + ResponseItemVO(isError = false, response = response.message()) + } + } + }) + } + + fun collectionIncreaseQuantitySilex( usuario: String, password: String, saleFk: String, @@ -534,6 +568,7 @@ class PreSacadorViewModel(context: Context) : BaseViewModel() { }) } + fun sendChekingPresence( token: String, workerId: String, 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 df0d5dce..3b64cc99 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 @@ -65,13 +65,11 @@ class SacadorFragment : ) } else { - val working_in_test = false //sergio: Ok en app + val working_in_test = true //sergio: Ok en app if (!working_in_test) { viewModel.collectionGetSalix(token = getData(TOKEN)) } else { viewModel.collectionGet( - getData(USER), - getData(PASSWORD) ) } @@ -140,17 +138,8 @@ class SacadorFragment : // checkTagsMode() //Tarea 4351 cambiar getData(WAGON) por getData(NUMBEROFWAGONS) - //Tarea 4130 - /* viewModel.collectionNew( - getData(USER), - getData(PASSWORD), - getData(SECTORFK), - getData(NUMBEROFWAGONS) - )*/ //Tarea 4520 viewModel.collection_assign( - getData(USER), - getData(PASSWORD), ) } @@ -166,10 +155,6 @@ class SacadorFragment : private fun setEvents() { binding.sacadorSwipe.setOnRefreshListener { viewModel.collectionGetSalix(token = getData(TOKEN)) - /* viewModel.collectionGet( - getData(USER), - getData(PASSWORD) - )*/ binding.sacadorSwipe.isRefreshing = false } } @@ -246,7 +231,7 @@ class SacadorFragment : if (!working_in_test) { viewModel.collectionGetSalix(token = getData(TOKEN)) } else { - viewModel.collectionGet(getData(USER), getData(PASSWORD)) + viewModel.collectionGet() } diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/sacador/fragment/SacadorViewModel.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/sacador/fragment/SacadorViewModel.kt index b0dca1c0..c16f2832 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/sacador/fragment/SacadorViewModel.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/sacador/fragment/SacadorViewModel.kt @@ -128,8 +128,8 @@ class SacadorViewModel(context: Context) : BaseViewModel() { } - fun collection_assign(usuario: String, password: String){ - getSacadorControladorUserCase.collection_assign(usuario, password).enqueue( + fun collection_assign(){ + getSacadorControladorUserCase.collection_assign().enqueue( object : Callback { override fun onFailure(call: Call, t: Throwable) { @@ -220,9 +220,8 @@ class SacadorViewModel(context: Context) : BaseViewModel() { }) }*/ - fun collectionGet(usuario: String, password: String){ - //////Log.i("VERDNATURA:","collectionGet para coger tickets") - getSacadorControladorUserCase.collectionGet(usuario, password).enqueue(object : + fun collectionGet(){ + getSacadorControladorUserCase.collectionGet().enqueue(object : Callback> { override fun onFailure(call: Call>, t: Throwable) { val listError: ArrayList = ArrayList() diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/adapter/UbicadorAdapter.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/adapter/UbicadorAdapter.kt index c7f280f3..8a56d59b 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/adapter/UbicadorAdapter.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/adapter/UbicadorAdapter.kt @@ -88,7 +88,7 @@ class UbicadorAdapter( ) } - /* if (item.checked) { + if (item.checked) { itemRowLayout.setBackgroundColor( ContextCompat.getColor( visibleText.context, @@ -109,9 +109,9 @@ class UbicadorAdapter( visibleText.context, R.color.verdnatura_red_salix )) - }*/ + } - when (item.isChecked) { + /* when (item.isChecked) { 1 -> { itemRowLayout.setBackgroundColor( ContextCompat.getColor( @@ -138,7 +138,7 @@ class UbicadorAdapter( ) } - } + }*/ 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 dc582525..ff32e152 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 @@ -136,7 +136,7 @@ class UbicadorFragment( } listIcons.add(iconAdd) listIcons.add(iconReload) - // listIcons.add(iconChecker) + // listIcons.add(iconChecker) binding.mainToolbar.toolbarIcons.adapter = @@ -148,6 +148,7 @@ class UbicadorFragment( iconReload.drawable -> { if (!shelvingFk.isNullOrEmpty()) { + binding.editPrioridad.setText("") binding.splashProgress.visibility = VISIBLE viewModel.itemShelvingList( getData(USER), @@ -200,6 +201,7 @@ class UbicadorFragment( binding.mainToolbar.toolbarTitle.text = binding.editMatricula.text.toString() shelvingFk = binding.editMatricula.text.toString() + binding.editPrioridad.setText("") binding.splashProgress.visibility = VISIBLE viewModel.itemShelvingList( getData(USER), @@ -228,8 +230,6 @@ class UbicadorFragment( if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0 || actionId == 5) { if (!binding.editPrioridad.text.toString().isNullOrEmpty()) { viewModel.shelvingPriorityUpdate( - getData(USER), - getData(PASSWORD), binding.editPrioridad.text.toString(), shelvingFk ) @@ -435,83 +435,96 @@ class UbicadorFragment( event.getContentIfNotHandled().notNull { deep = it.list.size - listItems = ArrayList() - var contEtiquetas = 0 - it.list.forEach { item -> - try { - contEtiquetas += item.stickers.toInt() - } catch (e: Exception) { + if (it.list.isNotEmpty() && it.list.get(0).isError) { + binding.splashProgress.visibility = View.GONE + ma.messageWithSound( + it.list.get(0).errorMessage, + it.list.get(0).isError, + isPlayed = false + ) + } else { + listItems = ArrayList() + var contEtiquetas = 0 + it.list.forEach { item -> + try { + contEtiquetas += item.stickers.toInt() + } catch (e: Exception) { + } + + parking = item.code.uppercase() + + listItems.add(item) + + } - - parking = item.code.uppercase() - - listItems.add(item) + etiquetas = contEtiquetas.toString() + binding.mainToolbar.toolbarTitle.text = + shelvingFk.uppercase() + getString(R.string.pUppercase) + parking + getString( + R.string.label + ) + etiquetas + if (it.list.size > 0) + binding.editPrioridad.setText(it.list[0].priority) + binding.splashProgress.visibility = View.GONE - } - etiquetas = contEtiquetas.toString() - binding.mainToolbar.toolbarTitle.text = - shelvingFk.uppercase() + getString(R.string.pUppercase) + parking + getString( - R.string.label - ) + etiquetas - if (it.list.size > 0) - binding.editPrioridad.setText(it.list[0].priority) - binding.splashProgress.visibility = View.GONE + for (item in listItems) { + for (localItem in listLocalItems) { + if (item.item == localItem.item) { + item.isNew = localItem.isNew + item.checked = localItem.checked + if (item.isNew && item.visible != "0") { + item.isNew = false + item.checked = true + } - - for (item in listItems) { - for (localItem in listLocalItems) { - if (item.item == localItem.item) { - item.isNew = localItem.isNew - item.checked = localItem.checked - if (item.isNew && item.visible != "0") { - item.isNew = false - item.checked = true + binding.locationRecyclerview.postInvalidate() } - binding.locationRecyclerview.postInvalidate() } - } + + adapter = UbicadorAdapter( + listItems, + onPasillerosItemClickListener = pasillerosItemClickListener!!, + onVisibleClickListener = object : OnVisibleClickListener { + override fun onVisibleClickListener(item: ItemUbicadorVO) { + + showAddItem( + item.item, + item.packing, + item.stickers, + item.visible, + true, + item, + grouping = if (item.grouping.isNullOrEmpty()) { + "" + } else item.grouping + ) + + } + + }, + onMoreClickListener = object : OnMoreClickListener { + override fun onMoreClickListener(item: ItemUbicadorVO) { + showMoreOptions(item) + } + + }) + + binding.locationRecyclerview.adapter = adapter + binding.locationRecyclerview.layoutManager = + LinearLayoutManager( + requireContext(), + LinearLayoutManager.VERTICAL, + true + ) + + if (isShelvinLogfromMainScreen) { + //tarea 4454 + viewModel.shelvinLog_add(getData(USER), getData(PASSWORD), shelvingFk) + } + } - - adapter = UbicadorAdapter( - listItems, - onPasillerosItemClickListener = pasillerosItemClickListener!!, - onVisibleClickListener = object : OnVisibleClickListener { - override fun onVisibleClickListener(item: ItemUbicadorVO) { - - showAddItem( - item.item, - item.packing, - item.stickers, - item.visible, - true, - item, - grouping = if (item.grouping.isNullOrEmpty()) { - "" - } else item.grouping - ) - - } - - }, - onMoreClickListener = object : OnMoreClickListener { - override fun onMoreClickListener(item: ItemUbicadorVO) { - showMoreOptions(item) - } - - }) - - binding.locationRecyclerview.adapter = adapter - binding.locationRecyclerview.layoutManager = - LinearLayoutManager(requireContext(), LinearLayoutManager.VERTICAL, true) - - if (isShelvinLogfromMainScreen) { - //tarea 4454 - viewModel.shelvinLog_add(getData(USER), getData(PASSWORD), shelvingFk) - } - } }) 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 801c1acc..35af0275 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 @@ -1,7 +1,6 @@ package es.verdnatura.presentation.view.feature.ubicador.fragment import android.content.Context -import android.util.Log import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import androidx.lifecycle.Transformations @@ -20,10 +19,11 @@ import retrofit2.Call import retrofit2.Callback import retrofit2.Response -class UbicadorViewModel(context: Context) : BaseViewModel() { +class UbicadorViewModel(context: Context) : BaseViewModel(context) { private val getUbicadorUserCase: GetUbicadorUserCase = GetUbicadorUserCase(context) - private val getSacadorControladorUserCase: GetSacadorControladorUserCase = GetSacadorControladorUserCase(context) + private val getSacadorControladorUserCase: GetSacadorControladorUserCase = + GetSacadorControladorUserCase(context) private val _shelvingList by lazy { MutableLiveData() } private val _response by lazy { MutableLiveData() } val response: LiveData @@ -92,13 +92,11 @@ class UbicadorViewModel(context: Context) : BaseViewModel() { } fun shelvingPriorityUpdate( - usuario: String, - password: String, priority: String, shelving: String ) { - getUbicadorUserCase.shelvingPriorityUpdate(usuario, password, priority, shelving) + silex!!.shelvingPriorityUpdate(priority, shelving) .enqueue(object : Callback { override fun onFailure(call: Call, t: Throwable) { _responsepriority.value = ResponseItemVO( @@ -324,7 +322,6 @@ class UbicadorViewModel(context: Context) : BaseViewModel() { } - fun shelvinLog_add( usuario: String, password: String, @@ -372,7 +369,7 @@ class UbicadorViewModel(context: Context) : BaseViewModel() { nameofFunction(this), t.message!!, - ) + ) ) ) _reubicationList.value = ReubicationList(listError) @@ -382,7 +379,7 @@ class UbicadorViewModel(context: Context) : BaseViewModel() { call: Call>, response: Response> ) { - if (response.body()==null) { + if (response.body() == null) { val listError: ArrayList = ArrayList() listError.add( Reubication( diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/workermistake/fragment/PackingMistakeFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/workermistake/fragment/PackingMistakeFragment.kt index ac19da74..36b0413f 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/workermistake/fragment/PackingMistakeFragment.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/workermistake/fragment/PackingMistakeFragment.kt @@ -2,7 +2,6 @@ package es.verdnatura.presentation.view.feature.workermistake.fragment import android.content.Context import android.os.Bundle -import android.util.Log.d import android.view.View import android.view.View.GONE import android.view.View.VISIBLE @@ -82,12 +81,7 @@ class PackingMistakeFragment(var menuOrigin: String) : if (!binding.scanInput.text.isNullOrEmpty()) { binding.splashProgress.visibility = View.VISIBLE expeditionScan = binding.scanInput.text.toString() - - viewModel.expeditionMistakeType_get( - usuario = getData(USER), - password = getData(PASSWORD), - - ) + viewModel.expeditionMistakeType_get() } binding.scanInput.setText("") ma.hideKeyboard(binding.scanInput) @@ -148,13 +142,21 @@ class PackingMistakeFragment(var menuOrigin: String) : if (it.description == item.text) { binding.splashProgress.visibility = VISIBLE - d("VERDNATURA::", "el code es " + item.code + it.description) - viewModel.expeditionMistake_add( - usuario = getData(USER), - password = getData(PASSWORD), - vExpeditionFk = expeditionScan, - vTypeFk = item.code.toString() - ) + try { + viewModel.expeditionMistake_add( + vExpeditionFk = expeditionScan.toInt(), + vTypeFk = item.code.toString() + ) + } catch (ex: Exception) { + binding.splashProgress.visibility = GONE + ma.messageWithSound( + getString(R.string.formatError), + true, + true, + "", + true + ) + } customDialogList.dismiss() } } 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 25067a3f..3fe43afe 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 @@ -67,8 +67,6 @@ class WorkermistakeFragment( if (!working_in_test) { viewModel.department_getHasMistake( - usuario = getData(USER), - password = getData(PASSWORD) ) } else { viewModel.department_getHasMistakeSalix(getData(TOKEN)) diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/workermistake/fragment/WorkermistakeViewModel.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/workermistake/fragment/WorkermistakeViewModel.kt index b6f546b0..0847ce05 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/workermistake/fragment/WorkermistakeViewModel.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/workermistake/fragment/WorkermistakeViewModel.kt @@ -54,9 +54,9 @@ class WorkermistakeViewModel (context: Context) : BaseViewModel() { }) }*/ - fun department_getHasMistake(usuario: String, password: String) + fun department_getHasMistake() { - getWorkerMistakeUserCase.department_getHasMistake(usuario, password) + getWorkerMistakeUserCase.department_getHasMistake() .enqueue(object : Callback> { override fun onFailure(call: Call>, t: Throwable) diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index f791cf2c..d0ab2bc1 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -523,5 +523,7 @@ Código QR o PALLET Código QR o CMR Escanea los valores: + Selecciona etiqueta a imprimir + Formato expedición no válido diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 07881467..c85e929c 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -521,6 +521,8 @@ Code QR or CMR Scan values : Check items + Select label to print + Expedition format no valid