From 594f249340bc3b720d3361d65f7e41cea66059e1 Mon Sep 17 00:00:00 2001 From: sergiodt Date: Thu, 18 Nov 2021 10:46:59 +0100 Subject: [PATCH] Se modifica constante CONTROLADOR a CHECKER, era CHECKED --- app/src/main/java/es/verdnatura/domain/ConstAndValues.kt | 6 +++--- .../feature/collection/fragment/CollectionFragment.kt | 9 +++------ 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/es/verdnatura/domain/ConstAndValues.kt b/app/src/main/java/es/verdnatura/domain/ConstAndValues.kt index 83ec88aa..3c3df3ad 100644 --- a/app/src/main/java/es/verdnatura/domain/ConstAndValues.kt +++ b/app/src/main/java/es/verdnatura/domain/ConstAndValues.kt @@ -2,14 +2,14 @@ package es.verdnatura.domain object ConstAndValues { const val SACADOR = "PREPARED" //ITEMPICKER - const val CONTROLADOR = "CHECKED"//CHECKER + const val CONTROLADOR = "CHECKER"//ERA CHECKED --REVISADO. const val OK = "OK" const val PREPARED = "PREPARED" const val ON_PREPARATION = "ON_PREPARATION" - const val CHECKED = "CHECKED" + //const val CHECKED = "CHECKED" const val PRESACADOR = "PRESACADOR" //PREITEMPICKER const val ON_CHECKING = "ON_CHECKING" - const val PRECHECKER = "PRECHECKER"//PRECHECKER + const val PRECHECKER = "PRECHECKER" const val MAINACTIVITY = "MAIN" } 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 326d855b..b59f6598 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 @@ -7,7 +7,6 @@ import android.media.MediaPlayer import android.os.Bundle import android.speech.SpeechRecognizer import android.util.Log -import android.util.Log.d import android.view.View import android.view.inputmethod.EditorInfo import android.view.inputmethod.InputMethodManager @@ -17,13 +16,11 @@ import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import es.verdnatura.R import es.verdnatura.databinding.FragmentCollectionBinding -import es.verdnatura.domain.ConstAndValues.CHECKED import es.verdnatura.domain.ConstAndValues.CONTROLADOR import es.verdnatura.domain.ConstAndValues.OK import es.verdnatura.domain.ConstAndValues.ON_CHECKING import es.verdnatura.domain.ConstAndValues.ON_PREPARATION import es.verdnatura.domain.ConstAndValues.PRECHECKER -import es.verdnatura.domain.ConstAndValues.PREPARED import es.verdnatura.domain.ConstAndValues.SACADOR import es.verdnatura.domain.toast import es.verdnatura.presentation.base.BaseFragment @@ -879,7 +876,7 @@ class CollectionFragment( saleFk = sales[position].saleFk, vIsChecked = if (type == SACADOR) sales[position].isPrepared else if (type == CONTROLADOR) sales[position].isControlled else "1", vOriginalQuantity = sales[position].pickedQuantity, - vStateFk = type,//type.toString(), + vStateFk = if (type==CONTROLADOR) "CHECKED" else type,//type.toString(), vBuyFk = originalItemScan, callFunction = "saleTrackingReplace" ) @@ -1679,7 +1676,7 @@ class CollectionFragment( } //ESTADOS - private fun changeTicketState() { + /* private fun changeTicketState() { if (type == CONTROLADOR) { tickets.forEach { viewModel.collectionUpdateState( @@ -1700,7 +1697,7 @@ class CollectionFragment( } } - } + }*/ private fun changeInitTicketState() { if (type == CONTROLADOR) {