Add logic for accepting and deleting suggestions

ls1intum · Dec 17, 2023 · e2d36d7 · e2d36d7
1 parent c20864c
commit e2d36d7
Show file tree

Hide file tree

Showing 3 changed files with 50 additions and 7 deletions.
diff --git a/Themis/Models/Feedback/AssessmentFeedback.swift b/Themis/Models/Feedback/AssessmentFeedback.swift
@@ -29,12 +29,17 @@ public struct AssessmentFeedback: Identifiable {
     init(
         baseFeedback: Feedback = Feedback(),
         scope: ThemisFeedbackScope,
-        detail: (any FeedbackDetail)? = nil
+        detail: (any FeedbackDetail)? = nil,
+        textPrefix: String? = nil
     ) {
         self.baseFeedback = baseFeedback
         self.scope = scope
         self.detail = detail
         self.detail?.buildArtemisFeedback(feedback: &self.baseFeedback)
+
+        if let textPrefix {
+            self.baseFeedback.text = textPrefix + (self.baseFeedback.text ?? "")
+        }
     }
 
     mutating func setBaseFeedback(to feedback: Feedback) {

diff --git a/Themis/ViewModels/Assessment/Programming/CodeEditorViewModel.swift b/Themis/ViewModels/Assessment/Programming/CodeEditorViewModel.swift
@@ -241,12 +241,18 @@ extension CodeEditorViewModel {
             guard let range = getLineRange(text: code, fromLine: lineStart, toLine: lineEnd) else {
                 return
             }
+            deleteHighlight(for: feedbackSuggestion)
             appendHighlight(feedbackId: feedbackId, range: range, path: file.path)
         }
 
         undoManager.endUndoGrouping() // undo group with addFeedback in AssessmentResult
     }
 
+    @MainActor
+    func deleteHighlight(for feedbackSuggestion: ProgrammingFeedbackSuggestion) {
+        feedbackSuggestions.removeAll(where: { $0.id == feedbackSuggestion.id })
+    }
+
     @MainActor
     func addInlineHighlight(feedbackId: UUID) {
         if let file = selectedFile, let selectedSection = selectedSection {
@@ -414,6 +420,14 @@ extension CodeEditorViewModel: FeedbackDelegate {
         addFeedbackSuggestionInlineHighlight(feedbackSuggestion: suggestion, feedbackId: feedback.id)
     }
 
+    @MainActor
+    func onFeedbackSuggestionDiscard(_ suggestion: any FeedbackSuggestion) {
+        guard let suggestion = suggestion as? ProgrammingFeedbackSuggestion else {
+            return
+        }
+        deleteHighlight(for: suggestion)
+    }
+
     @MainActor
     func onFeedbackCellTap(_ feedback: AssessmentFeedback, participationId: Int?, templateParticipationId: Int?) {
         guard let file = (feedback.detail as? ProgrammingFeedbackDetail)?.file,

diff --git a/Themis/Views/Assessment/CorrectionSidebar/EditFeedback/EditFeedbackViewBase.swift b/Themis/Views/Assessment/CorrectionSidebar/EditFeedback/EditFeedbackViewBase.swift
@@ -178,21 +178,45 @@ struct EditFeedbackViewBase: View {
     }
 
     private func createFeedback() {
+        // We need to add a prefix for programming feedback suggestions
+        var baseFeedbackTextPrefix: String? = nil
+
+        if let feedbackSuggestion = feedbackSuggestion as? ProgrammingFeedbackSuggestion {
+            if detailText == feedbackSuggestion.description && score == feedbackSuggestion.credits {
+                baseFeedbackTextPrefix = Feedback.feedbackSuggestionAcceptedIdentifier
+            } else {
+                baseFeedbackTextPrefix = Feedback.feedbackSuggestionAdaptedIdentifier
+            }
+        }
+
         if scope == .inline {
             let feedback = AssessmentFeedback(baseFeedback: Feedback(detailText: detailText,
                                                                      credits: score,
                                                                      type: .MANUAL,
                                                                      gradingInstruction: linkedGradingInstruction),
                                               scope: scope,
-                                              detail: incompleteFeedback?.detail)
+                                              detail: incompleteFeedback?.detail,
+                                              textPrefix: baseFeedbackTextPrefix)
 
             assessmentResult.addFeedback(feedback: feedback)
-            feedbackDelegate?.onFeedbackCreation(feedback)
+
+            if let feedbackSuggestion {
+                feedbackDelegate?.onFeedbackSuggestionSelection(feedbackSuggestion, feedback)
+            } else {
+                feedbackDelegate?.onFeedbackCreation(feedback)
+            }
         } else {
-            assessmentResult.addFeedback(feedback: AssessmentFeedback(baseFeedback: Feedback(detailText: detailText,
-                                                                                             credits: score,
-                                                                                             type: .MANUAL_UNREFERENCED),
-                                                                      scope: scope))
+            let feedback = AssessmentFeedback(baseFeedback: Feedback(detailText: detailText,
+                                                                     credits: score,
+                                                                     type: .MANUAL_UNREFERENCED),
+                                              scope: scope,
+                                              textPrefix: baseFeedbackTextPrefix)
+
+            assessmentResult.addFeedback(feedback: feedback)
+
+            if let feedbackSuggestion {
+                feedbackDelegate?.onFeedbackSuggestionSelection(feedbackSuggestion, feedback)
+            }
         }
     }