refs #5802 setState

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

@@ -113,6 +113,7 @@ class CollectionFragment(
     private var itemShelvingTracking_mark: Int = 0
     private var recylerViewState: Parcelable? = null
     private var isScanned: Boolean? = null
+    private var canChangeState = true
 
     private lateinit var myGroupList: List<SaleVO>
 
@@ -261,6 +262,7 @@ class CollectionFragment(
     }
 
     private fun updateScreen() {
+        canChangeState = false
         binding.splashProgress.visibility = VISIBLE
         viewModel.collectionTicketGet(
             collection.collectionFk,
@@ -418,7 +420,7 @@ class CollectionFragment(
 
         //LISTA =========
         binding.collectionSwipe.setOnRefreshListener {
-
+            canChangeState = false
             isMarking = false
             binding.collectionSwipe.isRefreshing = false
             // if (type != PRECHECKER) {
@@ -427,7 +429,7 @@ class CollectionFragment(
                 collection.collectionFk,
                 mobileApplication.dataStoreApp.readDataStoreKey(SECTORFK),
                 print = "0",
-                type
+                ""
             )
             buttonPushedGetCollection = false
             binding.collectionSwipe.isRefreshing = false
@@ -842,6 +844,8 @@ class CollectionFragment(
 
             loadResponseItemShelvingUpdate.observe(viewLifecycleOwner) { event ->
                 event.getContentIfNotHandled().notNull {
+
+                    canChangeState = !it.isError
                     if (it.isError) {
                         ma.messageWithSound(it.errorMessage, it.isError, false)
 
@@ -1342,6 +1346,7 @@ class CollectionFragment(
 
     //Tarea #4371
     private fun markLine(position: Int, newType: String) {
+        canChangeState = true
         state = 0
         //////Log.i("VERDNATURA:","Marcamos linea y enviamos saleTracking")
         if (type == SACADOR) {
@@ -1506,6 +1511,7 @@ class CollectionFragment(
     }
 
     private fun unMarkLine(position: Int, newType: String) {
+
         state = 0
         if (sales[position].isPrepared == "1") {
             customDialog.setTitle(getString(R.string.unmarkLine))
@@ -2089,7 +2095,7 @@ class CollectionFragment(
                   ticketCollection_setUsedShelves()
               goBack = false*/
 
-            changeTicketState()
+            if (canChangeState) changeTicketState()
 
         }
     }

app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragmentPicker.kt

@@ -110,6 +110,7 @@ class CollectionFragmentPicker(
     private var isScanned: Boolean? = null
 
     private lateinit var myGroupList: List<SaleVO>
+    private var canChangeState = true
 
     companion object {
         fun newInstance(collection: CollectionVO, type: String) =
@@ -256,6 +257,7 @@ class CollectionFragmentPicker(
     }
 
     private fun updateScreen() {
+        canChangeState = false
         binding.splashProgress.visibility = View.VISIBLE
         viewModel.collectionTicketGet(
             collection.collectionFk,
@@ -413,7 +415,7 @@ class CollectionFragmentPicker(
 
         //LISTA =========
         binding.collectionSwipe.setOnRefreshListener {
-
+            canChangeState = false
             isMarking = false
             binding.collectionSwipe.isRefreshing = false
             // if (type != PRECHECKER) {
@@ -511,7 +513,9 @@ class CollectionFragmentPicker(
                             it.isError, true
                         )
                     } else {
-                        (getString(R.string.Imprimiendo) + mobileApplication.dataStoreApp.readDataStoreKey<String>(PRINTERNAME)).toast(
+                        (getString(R.string.Imprimiendo) + mobileApplication.dataStoreApp.readDataStoreKey<String>(
+                            PRINTERNAME
+                        )).toast(
                             requireContext()
                         )
                     }
@@ -808,7 +812,7 @@ class CollectionFragmentPicker(
 
                         }
                     } else {
-
+                        canChangeState = true
                         viewModel.collectionTicketGet(
                             collection.collectionFk,
                             mobileApplication.dataStoreApp.readDataStoreKey(SECTORFK),
@@ -903,7 +907,6 @@ class CollectionFragmentPicker(
 
                     } else {
                         // pintar línea
-
                         saleAdapter!!.notifyDataSetChanged()
 
                         ReviewQuantityForRefreshingAndSorting(
@@ -1079,9 +1082,11 @@ class CollectionFragmentPicker(
                             var entryPoint = Gson().toJson(
                                 mutableMapOf(
                                     "entryPoint" to sale.ticketFk,
-                                    "web" to "${mobileApplication.dataStoreApp.readDataStoreKey<String>(
+                                    "web" to "${
+                                        mobileApplication.dataStoreApp.readDataStoreKey<String>(
                                             ConstAndValues.BASEURLSALIX
-                                    )}/#!/ticket/${sale.ticketFk}/sale"
+                                        )
+                                    }/#!/ticket/${sale.ticketFk}/sale"
                                 )
                             )
                             ma.onPasillerosItemClickListener(
@@ -1391,6 +1396,7 @@ class CollectionFragmentPicker(
         //setListPosition(position, false)
 
         if (type == SACADOR) {
+            canChangeState = true
             saleTracking_mark(position, newType)
             //nuevo
             var mySale = sales[position].saleFk
@@ -1571,13 +1577,6 @@ class CollectionFragmentPicker(
                         )
                         positionUnmarked = position
 
-                        /*    viewModel.saleTrackingDel(
-                                getData(USER),
-                                getData(PASSWORD),
-                                saleFk = sales[position].saleFk,
-                                "saleTracking_del"
-                            )*/
-
                     }
                     setTotalLines()
                     scanRequest()
@@ -2089,60 +2088,6 @@ class CollectionFragmentPicker(
 
     }
 
-    /* private fun showDisponibility() {
-
-         customDialogInput.setTitle(getString(R.string.Verdisponible))
-             .setDescription(getString(R.string.Escaneaetiqueta))
-             .setOkButton(getString(R.string.Buscar)) {
-                 try {
-                     if (binding.splashProgress != null) {
-                         binding.splashProgress.visibility = View.VISIBLE
-                     }
-
-                 } catch (e: Exception) {
-                 }
-
-                 hideKeyboards()
-                 viewModel.itemGetAvailable(
-                     usuario = user,
-                     password = password,
-                     itemFk = customDialogInput.getValue(),
-                     warehouseFk = warehouseFk,
-                     "item_GetVisibleAvailable"
-                 )
-                 scanRequest()
-                 customDialogInput.dismiss()
-
-             }.setKoButton(getString(R.string.cancel)) {
-             if (binding.splashProgress != null) {
-                 binding.splashProgress.visibility = View.GONE
-             }
-             hideKeyboards()
-             scanRequest()
-             customDialogInput.dismiss()
-         }.setValue("").show()
-         customDialogInput.getEditText().requestFocus()
-         customDialogInput.getEditText().setOnEditorActionListener { v, actionId, event ->
-             if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0) {
-                 if (!customDialogInput.getValue().isNullOrEmpty()) {
-                     if (binding.splashProgress != null) binding.splashProgress.visibility = View.VISIBLE
-                     viewModel.itemGetAvailable(
-                         usuario = user,
-                         password = password,
-                         itemFk = customDialogInput.getValue(),
-                         warehouseFk = warehouseFk
-                     ,"item_GetVisibleAvailable")
-                 }
-                 customDialogInput.setValue("")
-                 scanRequest()
-                 customDialogInput.dismiss()
-                 hideKeyboards()
-                 return@setOnEditorActionListener true
-             }
-             false
-         }
-     }*/
-
     private fun toastDisponibility(item: ItemVO) {
         if (item.available.isNullOrEmpty()) {
             item.available = "0"
@@ -2197,14 +2142,14 @@ class CollectionFragmentPicker(
                 ticketCollection_setUsedShelves()
             goBack = false
 
-            changeTicketState()
+            if (canChangeState) changeTicketState()
 
         }
     }
 
     private fun ticketCollection_setUsedShelves() {
 
-        if (type.equals("CHECKER") && (isMarking && (  mobileApplication.dataStoreApp.readDataStoreKey<String>(
+        if (type.equals("CHECKER") && (isMarking && (mobileApplication.dataStoreApp.readDataStoreKey<String>(
                 SECTORDESCRIP
             ).uppercase() != getString(
                 R.string.sectorALGEMESI
@@ -2454,7 +2399,9 @@ class CollectionFragmentPicker(
                     collectionFk = collection.collectionFk,
                     labelCount = (which + 1)
                 )
-                (getString(R.string.Imprimiendo) + mobileApplication.dataStoreApp.readDataStoreKey<String>(PRINTERNAME)).toast(requireContext())
+                (getString(R.string.Imprimiendo) + mobileApplication.dataStoreApp.readDataStoreKey<String>(
+                    PRINTERNAME
+                )).toast(requireContext())
 
             }
             val dialog = builder.create()

app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionViewModel.kt

@@ -28,15 +28,12 @@ import retrofit2.Response
 
 class CollectionViewModel(val context: Context) : BaseViewModel(context) {
 
-    // val emptyMessage = context.getString(R.string.collectionNoTickets)
-
     private val contextApp = context
 
-    /*  private val getSacadorControladorUserCase: GetSacadorControladorUserCase =
+    private val _responseState by lazy { MutableLiveData<ResponseItemVO>() }
-          GetSacadorControladorUserCase(context)
+    val responseState: LiveData<ResponseItemVO>
-      private val getUbicadorUserCase: GetUbicadorUserCase = GetUbicadorUserCase(context)
+        get() = _responseState
-      private val getLoginUserCase: GetLoginUserCase = GetLoginUserCase(context)
+
-  */
     private val _collectionTicketList by lazy { MutableLiveData<CollectionVO>() }
     val collectionTicketList: LiveData<CollectionVO>
         get() = _collectionTicketList
@@ -169,7 +166,6 @@ class CollectionViewModel(val context: Context) : BaseViewModel(context) {
     val mistakeList: LiveData<MistakeTypeListVO>
         get() = _mistakeList
 
-
     private val _item by lazy { MutableLiveData<ItemVO>() }
     val item: LiveData<ItemVO>
         get() = _item
@@ -874,7 +870,6 @@ class CollectionViewModel(val context: Context) : BaseViewModel(context) {
         })
     }
 
-
     fun saleMistakeAdd(
         saleFk: Int,
         typeFk: Int
@@ -1035,4 +1030,32 @@ class CollectionViewModel(val context: Context) : BaseViewModel(context) {
         })
     }
 
+    fun collection_setState(
+        collectionFk: Int,
+        state: String
+    ) {
+        salix.collectionSetState(
+            params = arrayListOf(
+                collectionFk,
+                state
+            ).formatWithQuotes()
+        )
+            .enqueue(object : SalixCallback<Any?>(context) {
+                override fun onError(t: Throwable) {
+
+                    _responseState.value = ResponseItemVO(
+                        isError = true,
+                        errorMessage = getMessageFromAllResponse(nameofFunction(this), t.message!!)
+                    )
+                    super.onError(t)
+                }
+
+                override fun onSuccess(response: Response<Any?>) {
+                    _responseState.value =
+                        ResponseItemVO(isError = false, response = "")
+                    super.onSuccess(response)
+                }
+            })
+    }
+
 }