Merge pull request #178 from aapis/bugfix/project-compare-exception-fix

[Project compare] exception fix
aapis · Sep 1, 2023 · 19d7c83 · 19d7c83
2 parents 3a75979 + 8849ba6
commit 19d7c83
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 8 deletions.
diff --git a/DLPrototype.xcodeproj/project.pbxproj b/DLPrototype.xcodeproj/project.pbxproj
@@ -1450,7 +1450,7 @@
 				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 142;
+				CURRENT_PROJECT_VERSION = 143;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_ASSET_PATHS = "\"DLPrototype/Preview Content\"";
 				DEVELOPMENT_TEAM = 6DT7L2N5X6;
@@ -1485,7 +1485,7 @@
 				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 142;
+				CURRENT_PROJECT_VERSION = 143;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_ASSET_PATHS = "\"DLPrototype/Preview Content\"";
 				DEVELOPMENT_TEAM = 6DT7L2N5X6;

diff --git a/DLPrototype/DLPrototype.swift b/DLPrototype/DLPrototype.swift
@@ -6,7 +6,6 @@
 //  Copyright © 2020 YegCollective. All rights reserved.
 //
 
-import Foundation
 import SwiftUI
 
 @main

diff --git a/DLPrototype/Models/CoreData/CoreDataTasks.swift b/DLPrototype/Models/CoreData/CoreDataTasks.swift
@@ -28,7 +28,6 @@ public class CoreDataTasks {
 
     static public func recentTasksWidgetData(limit: Int? = 1500) -> FetchRequest<LogTask> {
         let descriptors: [NSSortDescriptor] = [
-            NSSortDescriptor(keyPath: \LogTask.owner?.project, ascending: true),
             NSSortDescriptor(keyPath: \LogTask.owner?.jid, ascending: false)
         ]
 

diff --git a/DLPrototype/Views/Shared/AppSidebar/SidebarItem.swift b/DLPrototype/Views/Shared/AppSidebar/SidebarItem.swift
@@ -93,9 +93,6 @@ struct SidebarItem: View, Identifiable {
             }
         }
         .border(.black.opacity(0.2), width: (showBorder ? 1 : 0))
-        .mask(
-            RoundedRectangle(cornerRadius: 4)
-        )
         .onAppear(perform: actionOnAppear)
         .contextMenu {
             Button("Copy \(data)") {

diff --git a/DLPrototype/Views/Tasks/TaskListView.swift b/DLPrototype/Views/Tasks/TaskListView.swift
@@ -16,6 +16,7 @@ struct TaskListView: View {
 
     @Environment(\.managedObjectContext) var moc
     @EnvironmentObject public var updater: ViewUpdater
+    @EnvironmentObject public var nav: Navigation
 
     private var tasks: [LogTask] {
         let ordered = job.tasks!.sortedArray(using: [
@@ -92,10 +93,11 @@ struct TaskListView: View {
         task.id = UUID()
         task.content = entryText
         task.owner = job
+        task.lastUpdate = task.created
 
         entryText = ""
         updater.update()
-        
+
         PersistenceController.shared.save()
     }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,7 +6,6 @@ @@
     //  Copyright © 2020 YegCollective. All rights reserved.
     //
-    import Foundation
     import SwiftUI
     @main
@@ Expand Down @@