From 80bc832b3a69390063da20478906fdb38bc009ed Mon Sep 17 00:00:00 2001 From: Trey t Date: Mon, 17 Jan 2022 16:06:57 -0600 Subject: [PATCH] closed #25 --- Shared/Models/FilterViewModel.swift | 11 +++++++++++ Shared/views/FilterView.swift | 3 ++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/Shared/Models/FilterViewModel.swift b/Shared/Models/FilterViewModel.swift index 4dc6f94..df2e815 100644 --- a/Shared/Models/FilterViewModel.swift +++ b/Shared/Models/FilterViewModel.swift @@ -21,6 +21,17 @@ class FilterViewModel: ObservableObject { } } + init() { + let filteredEntries = PersistenceController.shared.getData(startDate: Date(timeIntervalSince1970: 0), + endDate: Date(), + includedDays: selectedDays) + + if let fuckingDAte = filteredEntries.sorted(by: { $0.forDate! < $1.forDate! }).first?.forDate { + self.entryStartDate = fuckingDAte + } + self.entryEndDate = Date() + } + private let chartViewBuilder = DayChartViewChartBuilder() public func filterEntries(startDate: Date, endDate: Date) { diff --git a/Shared/views/FilterView.swift b/Shared/views/FilterView.swift index 4331b7f..7757f89 100644 --- a/Shared/views/FilterView.swift +++ b/Shared/views/FilterView.swift @@ -158,7 +158,8 @@ struct FilterView: View { } else { viewModel.selectedDays.append(value) } - viewModel.filterEntries(startDate: viewModel.entryStartDate, endDate: viewModel.entryEndDate) + viewModel.filterEntries(startDate: viewModel.entryStartDate, + endDate: viewModel.entryEndDate) }) .frame(maxWidth: .infinity) .foregroundColor(viewModel.selectedDays.contains(value) || viewModel.selectedDays.isEmpty ? .green : .red)