javier
ac0e0f6556
This PR contains the work done to add support for manual todo task reordering in the *Task list* view Reviewed-on: rock-n-code/todos-app#6 Co-authored-by: Javier Cicchelli <javier@rock-n-code.com> Co-committed-by: Javier Cicchelli <javier@rock-n-code.com>
72 lines
3.3 KiB
Swift
72 lines
3.3 KiB
Swift
import Foundation
|
|
import SwiftData
|
|
|
|
/// Extension providing convenient initializers for fetching todos by group category.
|
|
///
|
|
/// This extension allows creating fetch descriptors that automatically filter and sort todos
|
|
/// based on their completion status and due dates according to the specified `TodoGroup`.
|
|
extension FetchDescriptor where T == Todo {
|
|
|
|
/// Creates a fetch descriptor for todos filtered and sorted by a specific group.
|
|
///
|
|
/// This initializer provides a convenient way to fetch todos categorized by their temporal
|
|
/// relevance and completion status. Each group applies appropriate predicates and sort orders:
|
|
///
|
|
/// - **Completed**: All tasks marked as done, sorted by completion date (most recent first)
|
|
/// - **Overdue**: Incomplete tasks with due dates before today, sorted by user-defined order, then by due date (most recent first)
|
|
/// - **Today**: Incomplete tasks due today, sorted by user-defined order, then by due date (earliest first)
|
|
/// - **Upcoming**: Incomplete tasks due after today, sorted by user-defined order, then by due date (earliest first)
|
|
///
|
|
/// The user-defined order allows tasks to be manually reordered within each group through drag and drop,
|
|
/// while maintaining a secondary sort by date for tasks with the same order value.
|
|
///
|
|
/// - Parameters:
|
|
/// - group: The todo group category to filter by.
|
|
/// - showCompleted: Whether to include completed tasks. Only applies to groups other than `.completed`.
|
|
/// - calendar: The calendar to use for date calculations. Defaults to `.current`.
|
|
init(
|
|
group: TodoGroup,
|
|
showCompleted: Bool,
|
|
calendar: Calendar = .current
|
|
) {
|
|
let predicate: Predicate<Todo>
|
|
let today = calendar.startOfDay(for: .now)
|
|
let tomorrow = calendar.date(byAdding: .day, value: 1, to: today) ?? today
|
|
|
|
switch group {
|
|
case .completed:
|
|
predicate = #Predicate { $0.completed != nil }
|
|
case .overdue:
|
|
predicate = showCompleted
|
|
? #Predicate { $0.due < today }
|
|
: #Predicate { $0.completed == nil && $0.due < today }
|
|
case .today:
|
|
predicate = showCompleted
|
|
? #Predicate { $0.due >= today && $0.due < tomorrow }
|
|
: #Predicate { $0.completed == nil && $0.due >= today && $0.due < tomorrow }
|
|
case .upcoming:
|
|
predicate = showCompleted
|
|
? #Predicate { $0.due >= tomorrow }
|
|
: #Predicate { $0.completed == nil && $0.due >= tomorrow }
|
|
}
|
|
|
|
let sortDescriptors: [SortDescriptor] =
|
|
switch group {
|
|
case .completed:
|
|
[.init(\Todo.completed, order: .reverse)]
|
|
case .overdue:
|
|
[.init(\Todo.order, order: .forward), .init(\Todo.due, order: .reverse)]
|
|
case .today:
|
|
[.init(\Todo.order, order: .forward), .init(\Todo.due, order: .forward)]
|
|
case .upcoming:
|
|
[.init(\Todo.order, order: .forward), .init(\Todo.due, order: .forward)]
|
|
}
|
|
|
|
self.init(
|
|
predicate: predicate,
|
|
sortBy: sortDescriptors
|
|
)
|
|
}
|
|
|
|
}
|