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

feat: refs #7146 dated

This commit is contained in:
Sergio De la torre 2024-12-12 16:59:23 +01:00
parent 19adf86f9f
commit 86af06b3ce
3 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/es/verdnatura/db/database.kt
View File

@ -113,8 +113,8 @@ interface RoutesDao {
@Insert(onConflict = OnConflictStrategy.REPLACE) @Insert(onConflict = OnConflictStrategy.REPLACE)
suspend fun insertLoaded(routeLoaded: RouteLoaded) suspend fun insertLoaded(routeLoaded: RouteLoaded)
@Query("DELETE FROM routes WHERE created != :today") @Query("DELETE FROM routes WHERE dated != :today")
suspend fun deleteLoaded(today: String) suspend fun deleteLoaded(today: String)
} }

11
app/src/main/java/es/verdnatura/presentation/view/feature/delivery/adapters/RouteAdapter.kt
View File

@ -31,9 +31,14 @@ class RouteAdapter(
var prevCreated = "" var prevCreated = ""
for (route in list) { for (route in list) {
if (route.created.toString() != prevCreated) { //tarea 7146
/* if (route.created.toString() != prevCreated) {
route.header = true route.header = true
prevCreated = route.created.toString() prevCreated = route.created.toString()
}*/
if (route.dated.toString() != prevCreated) {
route.header = true
prevCreated = route.dated.toString()
} }
} }
return list return list
@ -90,7 +95,9 @@ class RouteAdapter(
if (item.header) { if (item.header) {
headerRouteLayout.visibility = View.VISIBLE headerRouteLayout.visibility = View.VISIBLE
headerRoute.text = toDateString(item.created) //tarea7146
headerRoute.text = toDateString(item.dated)
// headerRoute.text = toDateString(item.created)
} else { } else {
headerRouteLayout.visibility = View.GONE headerRouteLayout.visibility = View.GONE

3
app/src/main/java/es/verdnatura/presentation/view/feature/delivery/fragments/RoutesFragment.kt
View File

@ -289,7 +289,8 @@ class RoutesFragment(
viewModel.getDataFromExpedition( viewModel.getDataFromExpedition(
routeId = routeId.toLong(), routeId = routeId.toLong(),
expeditionId = expedition.code!!.toLong(), expeditionId = expedition.code!!.toLong(),
landed = routeItem!!.created.toString() // landed = routeItem!!.created.toString()
landed = routeItem!!.dated.toString()
) )
} }
customDialogList.dismiss() customDialogList.dismiss()