From 03b3ac7a8105356267c50c6425fde2ccb31c9a71 Mon Sep 17 00:00:00 2001
From: Sergio De la torre <sergiodt@verdnatura.es>
Date: Tue, 23 Jul 2024 08:48:13 +0200
Subject: [PATCH] feat reservas refs #6861

---
 .../fragment/SectorCollectionReserveFragment.kt  |  4 ++--
 .../sacador/fragment/SacadorFragmentNew.kt       | 16 +++++++++++++++-
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/SectorCollectionReserveFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/SectorCollectionReserveFragment.kt
index c0ed6a06..8d0d973a 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/SectorCollectionReserveFragment.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/SectorCollectionReserveFragment.kt
@@ -59,8 +59,8 @@ class SectorCollectionReserveFragment(
     }
 
     override fun onResume() {
-         onBack = true
-        super.onPause()
+        onBack = true
+        super.onResume()
     }
 
     override fun init() {
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/sacador/fragment/SacadorFragmentNew.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/sacador/fragment/SacadorFragmentNew.kt
index 7ef9010f..b01ee0ea 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/sacador/fragment/SacadorFragmentNew.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/sacador/fragment/SacadorFragmentNew.kt
@@ -17,10 +17,13 @@ import es.verdnatura.presentation.common.OnCollectionTicketSelectedListener
 import es.verdnatura.presentation.common.OnOptionsSelectedListener
 import es.verdnatura.presentation.common.TAG
 import es.verdnatura.presentation.common.ToolBarAdapterTooltip
+import es.verdnatura.presentation.common.convertToDateString
 import es.verdnatura.presentation.view.component.CustomDialog
 import es.verdnatura.presentation.view.component.CustomDialogInput
 import es.verdnatura.presentation.view.feature.sacador.adapter.CollectionAdapterNew
 import es.verdnatura.presentation.view.feature.sacador.model.CollectionTicket
+import java.text.SimpleDateFormat
+import java.util.Calendar
 
 class SacadorFragmentNew(
     var type: String
@@ -219,7 +222,8 @@ class SacadorFragmentNew(
                 it.list.forEach {
                     //lolass
 
-                    if (!it.created.contains("17 Jul")) {
+                    var myDate = getCalendarForDateMinusOneDay(requireContext()).convertToDateString()
+                    if (!it.created.contains(myDate)) {
                         myCollectionsList.add(CollectionTicket(it.collectionFk, it.created))
                     }
                 }
@@ -265,6 +269,16 @@ class SacadorFragmentNew(
         }
     }
 
+    fun getCalendarForDateMinusOneDay(context: Context): Calendar {
+        val cal = Calendar.getInstance()
+        cal.add(Calendar.DAY_OF_YEAR, -1)
+        val sdf = SimpleDateFormat(context.getString(R.string.dateFormat))
+        val formattedDate = sdf.format(cal.time)
+        val resultCal = Calendar.getInstance()
+        resultCal.time = sdf.parse(formattedDate)!!
+        return resultCal
+    }
+
     private fun createCollectionList(collections: List<CollectionTicket>) {
         collectionsList = ArrayList()