fix issue from merge conflicts

ls1intum · Oct 12, 2024 · 782e352 · 782e352
1 parent 9eb9f62
commit 782e352
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/main/webapp/app/exercises/text/participate/text-editor.component.html b/src/main/webapp/app/exercises/text/participate/text-editor.component.html
@@ -137,7 +137,7 @@
                                                 : ('artemisApp.textExercise.assessedSubmissionInstructor' | artemisTranslate)
                                         }}:
                                     </b>
-                                    @if (Result.isAthenaAIResult(result)) {
+                                    @if (isAthenaAIResult(result)) {
                                         <div class="badge bg-warning">{{ 'artemisApp.result.preliminary' | artemisTranslate | uppercase }}</div>
                                     }
                                     <hr />

diff --git a/src/main/webapp/app/exercises/text/participate/text-editor.component.ts b/src/main/webapp/app/exercises/text/participate/text-editor.component.ts
@@ -21,7 +21,7 @@ import { TextSubmission } from 'app/entities/text/text-submission.model';
 import { StringCountService } from 'app/exercises/text/participate/string-count.service';
 import { AccountService } from 'app/core/auth/account.service';
 import { getFirstResultWithComplaint, getLatestSubmissionResult, setLatestSubmissionResult } from 'app/entities/submission.model';
-import { getUnreferencedFeedback } from 'app/exercises/shared/result/result.utils';
+import { getUnreferencedFeedback, isAthenaAIResult } from 'app/exercises/shared/result/result.utils';
 import { onError } from 'app/shared/util/global.utils';
 import { Course } from 'app/entities/course.model';
 import { getCourseFromExercise } from 'app/entities/exercise.model';
@@ -30,7 +30,6 @@ import { faChevronDown, faCircleNotch, faEye, faPenSquare, faTimeline } from '@f
 import { MAX_SUBMISSION_TEXT_LENGTH } from 'app/shared/constants/input.constants';
 import { AssessmentType } from 'app/entities/assessment-type.model';
 import { CourseExerciseService } from 'app/exercises/shared/course-exercises/course-exercise.service';
-import { isAthenaAIResult } from 'app/exercises/shared/result/result.utils';
 @Component({
     selector: 'jhi-text-editor',
     templateUrl: './text-editor.component.html',
@@ -481,4 +480,5 @@ export class TextEditorComponent implements OnInit, OnDestroy, ComponentCanDeact
         const bValue = dayjs(b.submissionDate!).valueOf();
         return aValue - bValue;
     };
+    protected readonly isAthenaAIResult = isAthenaAIResult;
 }