assignment/todos
0
0
Fork 0
Code Issues Pull Requests Activity

Added the order to the sort descriptors inside the initializer for the TodoFetchDescriptor+Inits extensions in the app target.

Browse Source
This commit is contained in:
javier
2026-02-11 15:45:45 +01:00
parent 9c68c5be32
commit 0c8589db27
2 changed files with 75 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
App/Sources/Extensions/TodoFetchDescriptor+Inits.swift
+9 -6
View File
@@ -13,9 +13,12 @@ extension FetchDescriptor where T == Todo {
/// 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 due date (most recent first)
/// - **Today**: Incomplete tasks due today, sorted by due date (earliest first)
/// - **Upcoming**: Incomplete tasks due after today, sorted by due date (earliest 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.
@@ -52,11 +55,11 @@ extension FetchDescriptor where T == Todo {
case .completed:
[.init(\Todo.completed, order: .reverse)]
case .overdue:
[.init(\Todo.due, order: .reverse)]
[.init(\Todo.order, order: .forward), .init(\Todo.due, order: .reverse)]
case .today:
[.init(\Todo.due, order: .forward)]
[.init(\Todo.order, order: .forward), .init(\Todo.due, order: .forward)]
case .upcoming:
[.init(\Todo.due, order: .forward)]
[.init(\Todo.order, order: .forward), .init(\Todo.due, order: .forward)]
}
self.init(