Skip to content

Commit 40b706a

Browse files
committed
fix stat detail previews showing when no records in selected range
1 parent 04248b9 commit 40b706a

3 files changed

Lines changed: 8 additions & 3 deletions

File tree

features/feature_notification/src/main/java/com/example/util/simpletimetracker/feature_notification/recordType/controller/NotificationTypeBroadcastController.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ class NotificationTypeBroadcastController @Inject constructor(
136136
}
137137

138138
private fun safeLaunch(
139-
block: suspend CoroutineScope.() -> Unit
139+
block: suspend CoroutineScope.() -> Unit,
140140
) {
141141
allowDiskRead { MainScope() }.launch(block = block)
142142
}

features/feature_statistics_detail/src/main/java/com/example/util/simpletimetracker/feature_statistics_detail/viewModel/StatisticsDetailViewModel.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -308,6 +308,7 @@ class StatisticsDetailViewModel @Inject constructor(
308308
}
309309

310310
private fun updateViewData() {
311+
previewDelegate.updateViewData()
311312
statsDelegate.updateViewData()
312313
streaksDelegate.updateStreaksViewData()
313314
chartDelegate.updateViewData()

features/feature_statistics_detail/src/main/java/com/example/util/simpletimetracker/feature_statistics_detail/viewModel/delegate/StatisticsDetailPreviewViewModelDelegate.kt

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import com.example.util.simpletimetracker.feature_statistics_detail.viewData.Sta
1313
import com.example.util.simpletimetracker.feature_statistics_detail.viewData.StatisticsDetailPreviewViewData
1414
import kotlinx.coroutines.launch
1515
import javax.inject.Inject
16+
import kotlin.collections.plus
1617

1718
class StatisticsDetailPreviewViewModelDelegate @Inject constructor(
1819
private val previewInteractor: StatisticsDetailPreviewInteractor,
@@ -48,16 +49,19 @@ class StatisticsDetailPreviewViewModelDelegate @Inject constructor(
4849
private suspend fun loadViewData(): StatisticsDetailPreviewCompositeViewData? {
4950
val parent = parent ?: return null
5051
val currentFilter = parent.filter
52+
val dateFilter = parent.getDateFilter()
5153
val total = totalRecordsSelectedInteractor.execute(currentFilter)
5254

5355
val data = previewInteractor.getPreviewData(
54-
filterParams = currentFilter,
56+
filterParams = currentFilter.takeIf { it.isNotEmpty() }
57+
?.plus(dateFilter).orEmpty(),
5558
total = total,
5659
isExpanded = previewsExpanded,
5760
isForComparison = false,
5861
)
5962
val comparisonData = previewInteractor.getPreviewData(
60-
filterParams = parent.comparisonFilter,
63+
filterParams = parent.comparisonFilter.takeIf { it.isNotEmpty() }
64+
?.plus(dateFilter).orEmpty(),
6165
total = false,
6266
isExpanded = previewsComparisonExpanded,
6367
isForComparison = true,

0 commit comments

Comments
 (0)