Skip to content

Fix: Weekly view missing days and Today's focus not appearing in graph #203

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sayeedjoy wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix: Weekly view missing days and Today's focus not appearing in graph #203

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 20 additions & 13 deletions app/src/main/java/org/nsh07/pomodoro/ui/statsScreen/viewModel/StatsViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ class StatsViewModel(

private val yearDayFormatter = DateTimeFormatter.ofPattern("d MMM")

private val lastWeekStatsFlow = statRepository.getLastNDaysStats(7).filter { it.isNotEmpty() }
private val lastWeekStatsFlow = statRepository.getLastNDaysStats(7)
private val lastMonthStatsFlow = statRepository.getLastNDaysStats(31).filter { it.isNotEmpty() }
private val lastYearStatsFlow = statRepository.getLastNDaysStats(365).filter { it.isNotEmpty() }

Expand All @@ -91,15 +91,17 @@ class StatsViewModel(
val lastWeekMainChartData: StateFlow<Pair<CartesianChartModelProducer, ExtraStore.Key<List<String>>>> =
lastWeekStatsFlow
.map { list ->
// reversing is required because we need ascending order while the DB returns descending order
val reversed = list.reversed()
val keys = reversed.map {
it.date.dayOfWeek.getDisplayName(
val today = LocalDate.now()
val last7Days = (0..6).map { today.minusDays(it.toLong()) }.reversed()
val statsMap = list.associateBy { it.date }

val keys = last7Days.map {
it.dayOfWeek.getDisplayName(
TextStyle.NARROW,
Locale.getDefault()
)
}
val values = reversed.map { it.totalFocusTime() }
val values = last7Days.map { statsMap[it]?.totalFocusTime() ?: 0L }
lastWeekSummary.first.runTransaction {
columnSeries { series(values) }
extras { it[lastWeekSummary.second] = keys }
Expand All @@ -115,18 +117,23 @@ class StatsViewModel(

val lastWeekFocusHistoryValues: StateFlow<List<Pair<String, List<Long>>>> =
lastWeekStatsFlow
.map { value ->
value.reversed().map {
.map { list ->
val today = LocalDate.now()
val last7Days = (0..6).map { today.minusDays(it.toLong()) }.reversed()
val statsMap = list.associateBy { it.date }

last7Days.map { date ->
val stat = statsMap[date]
Pair(
it.date.dayOfWeek.getDisplayName(
date.dayOfWeek.getDisplayName(
TextStyle.NARROW,
Locale.getDefault()
),
listOf(
it.focusTimeQ1,
it.focusTimeQ2,
it.focusTimeQ3,
it.focusTimeQ4
stat?.focusTimeQ1 ?: 0L,
stat?.focusTimeQ2 ?: 0L,
stat?.focusTimeQ3 ?: 0L,
stat?.focusTimeQ4 ?: 0L
)
)
}
Expand Down
Loading