verdnatura/vn-warehouse
verdnatura
/
vn-warehouse
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Se modifica constante CONTROLADOR a CHECKER, era CHECKED

This commit is contained in:
Sergio De la torre 2021-11-18 10:46:59 +01:00
parent 1f6a4278a9
commit 594f249340
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/es/verdnatura/domain/ConstAndValues.kt
View File

@ -2,14 +2,14 @@ package es.verdnatura.domain
object ConstAndValues { object ConstAndValues {
const val SACADOR = "PREPARED" //ITEMPICKER const val SACADOR = "PREPARED" //ITEMPICKER
const val CONTROLADOR = "CHECKED"//CHECKER const val CONTROLADOR = "CHECKER"//ERA CHECKED --REVISADO.
const val OK = "OK" const val OK = "OK"
const val PREPARED = "PREPARED" const val PREPARED = "PREPARED"
const val ON_PREPARATION = "ON_PREPARATION" const val ON_PREPARATION = "ON_PREPARATION"
const val CHECKED = "CHECKED" //const val CHECKED = "CHECKED"
const val PRESACADOR = "PRESACADOR" //PREITEMPICKER const val PRESACADOR = "PRESACADOR" //PREITEMPICKER
const val ON_CHECKING = "ON_CHECKING" const val ON_CHECKING = "ON_CHECKING"
const val PRECHECKER = "PRECHECKER"//PRECHECKER const val PRECHECKER = "PRECHECKER"
const val MAINACTIVITY = "MAIN" const val MAINACTIVITY = "MAIN"
} }

9
app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragment.kt
View File

@ -7,7 +7,6 @@ import android.media.MediaPlayer
import android.os.Bundle import android.os.Bundle
import android.speech.SpeechRecognizer import android.speech.SpeechRecognizer
import android.util.Log import android.util.Log
import android.util.Log.d
import android.view.View import android.view.View
import android.view.inputmethod.EditorInfo import android.view.inputmethod.EditorInfo
import android.view.inputmethod.InputMethodManager import android.view.inputmethod.InputMethodManager
@ -17,13 +16,11 @@ import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.RecyclerView
import es.verdnatura.R import es.verdnatura.R
import es.verdnatura.databinding.FragmentCollectionBinding import es.verdnatura.databinding.FragmentCollectionBinding
import es.verdnatura.domain.ConstAndValues.CHECKED
import es.verdnatura.domain.ConstAndValues.CONTROLADOR import es.verdnatura.domain.ConstAndValues.CONTROLADOR
import es.verdnatura.domain.ConstAndValues.OK import es.verdnatura.domain.ConstAndValues.OK
import es.verdnatura.domain.ConstAndValues.ON_CHECKING import es.verdnatura.domain.ConstAndValues.ON_CHECKING
import es.verdnatura.domain.ConstAndValues.ON_PREPARATION import es.verdnatura.domain.ConstAndValues.ON_PREPARATION
import es.verdnatura.domain.ConstAndValues.PRECHECKER import es.verdnatura.domain.ConstAndValues.PRECHECKER
import es.verdnatura.domain.ConstAndValues.PREPARED
import es.verdnatura.domain.ConstAndValues.SACADOR import es.verdnatura.domain.ConstAndValues.SACADOR
import es.verdnatura.domain.toast import es.verdnatura.domain.toast
import es.verdnatura.presentation.base.BaseFragment import es.verdnatura.presentation.base.BaseFragment
@ -879,7 +876,7 @@ class CollectionFragment(
saleFk = sales[position].saleFk, saleFk = sales[position].saleFk,
vIsChecked = if (type == SACADOR) sales[position].isPrepared else if (type == CONTROLADOR) sales[position].isControlled else "1", vIsChecked = if (type == SACADOR) sales[position].isPrepared else if (type == CONTROLADOR) sales[position].isControlled else "1",
vOriginalQuantity = sales[position].pickedQuantity, vOriginalQuantity = sales[position].pickedQuantity,
vStateFk = type,//type.toString(), vStateFk = if (type==CONTROLADOR) "CHECKED" else type,//type.toString(),
vBuyFk = originalItemScan, vBuyFk = originalItemScan,
callFunction = "saleTrackingReplace" callFunction = "saleTrackingReplace"
) )
@ -1679,7 +1676,7 @@ class CollectionFragment(
} }
//ESTADOS //ESTADOS
private fun changeTicketState() { /* private fun changeTicketState() {
if (type == CONTROLADOR) { if (type == CONTROLADOR) {
tickets.forEach { tickets.forEach {
viewModel.collectionUpdateState( viewModel.collectionUpdateState(
@ -1700,7 +1697,7 @@ class CollectionFragment(
} }
} }
} }*/
private fun changeInitTicketState() { private fun changeInitTicketState() {
if (type == CONTROLADOR) { if (type == CONTROLADOR) {