From 86af06b3cecdd534868ee13f9581da85d401e365 Mon Sep 17 00:00:00 2001 From: Sergio De la torre Date: Thu, 12 Dec 2024 16:59:23 +0100 Subject: [PATCH] feat: refs #7146 dated --- app/src/main/java/es/verdnatura/db/database.kt | 4 ++-- .../view/feature/delivery/adapters/RouteAdapter.kt | 11 +++++++++-- .../view/feature/delivery/fragments/RoutesFragment.kt | 3 ++- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/es/verdnatura/db/database.kt b/app/src/main/java/es/verdnatura/db/database.kt index 54fc4f0b..a67b2cb1 100644 --- a/app/src/main/java/es/verdnatura/db/database.kt +++ b/app/src/main/java/es/verdnatura/db/database.kt @@ -113,8 +113,8 @@ interface RoutesDao { @Insert(onConflict = OnConflictStrategy.REPLACE) suspend fun insertLoaded(routeLoaded: RouteLoaded) - - @Query("DELETE FROM routes WHERE created != :today") + + @Query("DELETE FROM routes WHERE dated != :today") suspend fun deleteLoaded(today: String) } diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/adapters/RouteAdapter.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/adapters/RouteAdapter.kt index 53522d35..1fa3b255 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/adapters/RouteAdapter.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/adapters/RouteAdapter.kt @@ -31,9 +31,14 @@ class RouteAdapter( var prevCreated = "" for (route in list) { - if (route.created.toString() != prevCreated) { + //tarea 7146 + /* if (route.created.toString() != prevCreated) { route.header = true prevCreated = route.created.toString() + }*/ + if (route.dated.toString() != prevCreated) { + route.header = true + prevCreated = route.dated.toString() } } return list @@ -90,7 +95,9 @@ class RouteAdapter( if (item.header) { headerRouteLayout.visibility = View.VISIBLE - headerRoute.text = toDateString(item.created) + //tarea7146 + headerRoute.text = toDateString(item.dated) + // headerRoute.text = toDateString(item.created) } else { headerRouteLayout.visibility = View.GONE diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/fragments/RoutesFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/fragments/RoutesFragment.kt index c8e18f24..d1385529 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/fragments/RoutesFragment.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/fragments/RoutesFragment.kt @@ -289,7 +289,8 @@ class RoutesFragment( viewModel.getDataFromExpedition( routeId = routeId.toLong(), expeditionId = expedition.code!!.toLong(), - landed = routeItem!!.created.toString() + // landed = routeItem!!.created.toString() + landed = routeItem!!.dated.toString() ) } customDialogList.dismiss()