feat: refs#8276 orderLikeSalix

app/src/main/java/es/verdnatura/presentation/view/feature/historicoarticulo/adapter/HistoricoAdapter.kt

@@ -44,7 +44,7 @@ class HistoricoAdapter(
 
                 historicoDate.setBackgroundColor(
                     ContextCompat.getColor(
-                        historicoDate.context, if (currentDate == item.shipped) {
+                        historicoDate.context, if (item.shipped.contains(currentDate)) {
                             R.color.verdnatura_pumpkin_orange
                         } else {
                             R.color.verdnatura_black_5

app/src/main/java/es/verdnatura/presentation/view/feature/historicoarticulo/fragment/HistoricoArticuloFragment.kt

@@ -13,6 +13,7 @@ import es.verdnatura.R.color.verdnatura_white
 import es.verdnatura.databinding.FragmentHistoricoBinding
 import es.verdnatura.domain.ConstAndValues.WAREHOUSEFK
 import es.verdnatura.domain.notNull
+import es.verdnatura.domain.toast
 import es.verdnatura.presentation.base.BaseFragment
 import es.verdnatura.presentation.common.OnClientHistoricItemClickListener
 import es.verdnatura.presentation.common.OnOptionsSelectedListener
@@ -193,23 +194,27 @@ class HistoricoArticuloFragment(
                 listHistoric.add(it)
             }
         }
-        listHistoric.sortWith { item1, item2 ->
+        /*  listHistoric.sortWith { item1, item2 ->
-            val compareShipped = item1.shipped.compareTo(item2.shipped)
+
-            //comentar con ivanm
+              val date1 = item1.shipped.split(" ")[0]
-            if (compareShipped == 0) {
+              val date2 = item2.shipped.split(" ")[0]
-                if (item1.order == null && item2.order == null) {
+
-                    item2.balance!!.compareTo(item1.balance!!) // Comparar por balance cuando ambos órdenes son nulos
+              val compareShipped = date1.compareTo(date2)
-                } else if (item1.order == null) {
+              //comentar con ivanm
-                    -1
+              if (compareShipped == 0) {
-                } else if (item2.order == null) {
+                  if (item1.order == null && item2.order == null) {
-                    1
+                      item2.balance!!.compareTo(item1.balance!!) // Comparar por balance cuando ambos órdenes son nulos
-                } else {
+                  } else if (item1.order == null) {
-                    item2.order!!.compareTo(item1.order!!) // Invertir el orden
+                      -1
-                }
+                  } else if (item2.order == null) {
-            } else {
+                      1
-                compareShipped
+                  } else {
-            }
+                      item2.order!!.compareTo(item1.order!!) // Invertir el orden
-        }
+                  }
+              } else {
+                  compareShipped
+              }
+          }*/
         adapter = HistoricoAdapter(listHistoric, object : OnClientHistoricItemClickListener {
 
             override fun onClientHistoricItemClickListener(item: ItemHistoricoVO) {
@@ -320,13 +325,22 @@ class HistoricoArticuloFragment(
 
     private fun navigateToToday(it: ItemHistoricoListVO) {
         var positionToday = 0
-        val sdf = SimpleDateFormat(getString(R.string.dateFormat), Locale.getDefault())
+
-        val currentDate = sdf.format(Date())
+        val inputFormat = SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.getDefault())
+        val outputFormat = SimpleDateFormat(getString(R.string.dateFormat), Locale.getDefault())
+        val currentDate = outputFormat.format(Date())
 
         for (item in it.list) {
-            if (currentDate == item.shipped) {
+            try {
-                break
+                val shippedDate = inputFormat.parse(item.shipped)
+                val formattedShippedDate = shippedDate?.let { date -> outputFormat.format(date) }
+                if (currentDate == formattedShippedDate) {
+                    break
+                }
+            } catch (e: Exception) {
+                getString(R.string.errorOrderList).toast(requireContext())
             }
+
             positionToday += 1
         }