-
Notifications
You must be signed in to change notification settings - Fork 313
Programming exercises
: Improve integration of Monaco code editor and Athena Preliminary Feedback
#10945
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Draft
LeonWehrhahn
wants to merge
68
commits into
feature/programming-exercises/choose-preliminary-feedback-model
Choose a base branch
from
feature/programming-exercises/athena-feedback-in-code-editor
base: feature/programming-exercises/choose-preliminary-feedback-model
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+861
−3,738
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…ck-model' into feature/programming-exercises/athena-feedback-in-code-editor # Conflicts: # src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseCodeReviewFeedbackService.java # src/main/webapp/app/exercises/programming/participate/code-editor-student-container.component.html # src/main/webapp/app/exercises/programming/participate/code-editor-student-container.component.ts # src/main/webapp/app/exercises/shared/result/updating-result.component.ts
…ck-model' into feature/programming-exercises/athena-feedback-in-code-editor
…g-exercises/athena-feedback-in-code-editor # Conflicts: # src/main/webapp/app/exercises/modeling/manage/modeling-exercise.module.ts # src/main/webapp/app/exercises/programming/assess/code-editor-tutor-assessment-inline-feedback.component.ts # src/main/webapp/app/exercises/programming/shared/code-editor/container/code-editor-container.component.ts # src/main/webapp/app/exercises/programming/shared/code-editor/file-browser/code-editor-file-browser-node.component.ts # src/main/webapp/app/exercises/programming/shared/lifecycle/programming-exercise-lifecycle.module.ts # src/main/webapp/app/exercises/shared/feedback-suggestion/exercise-feedback-suggestion-options.component.ts # src/main/webapp/app/exercises/text/manage/text-exercise/text-exercise.module.ts # src/main/webapp/app/overview/exercise-details/exercise-details-student-actions.component.html # src/main/webapp/i18n/de/exercise.json # src/test/javascript/spec/component/code-editor/code-editor-file-browser.component.spec.ts # src/test/javascript/spec/component/exercises/shared/feedback/feedback-suggestion-option.component.spec.ts # src/test/javascript/spec/component/modeling-exercise/modeling-exercise-update.component.spec.ts # src/test/javascript/spec/component/overview/exercise-details/exercise-details-student-actions.component.spec.ts # src/test/javascript/spec/component/overview/exercise-details/request-feedback-button/request-feedback-button.component.spec.ts # src/test/javascript/spec/component/programming-assessment/code-editor-tutor-assessment-inline-feedback.component.spec.ts # src/test/javascript/spec/component/programming-exercise/programming-exercise-lifecycle.component.spec.ts # src/test/javascript/spec/component/text-exercise/text-exercise-update.component.spec.ts # src/test/javascript/spec/integration/code-editor/code-editor-container.integration.spec.ts
…ck-model' into feature/programming-exercises/athena-feedback-in-code-editor # Conflicts: # src/main/webapp/app/exercises/shared/feedback-suggestion/exercise-feedback-suggestion-options.component.ts # src/main/webapp/app/exercises/shared/preliminary-feedback/exercise-preliminary-feedback-options.component.ts # src/test/javascript/spec/component/overview/exercise-details/exercise-details-student-actions.component.spec.ts # src/test/javascript/spec/component/programming-exercise/programming-exercise-lifecycle.component.spec.ts
…ck-model' into feature/programming-exercises/athena-feedback-in-code-editor
…ck-model' into feature/programming-exercises/athena-feedback-in-code-editor
…ck-model' into feature/programming-exercises/athena-feedback-in-code-editor
…ck-model' into feature/programming-exercises/athena-feedback-in-code-editor
…i components accordingly
Programming exercises:
Improve integration of Monaco code editor and Athena Preliminary FeedbackProgramming exercises
: Improve integration of Monaco code editor and Athena Preliminary Feedback
…ck-model' into feature/programming-exercises/athena-feedback-in-code-editor
…ck-model' into feature/programming-exercises/athena-feedback-in-code-editor
…ck-model' into feature/programming-exercises/athena-feedback-in-code-editor
…ck-model' into feature/programming-exercises/athena-feedback-in-code-editor
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
assessment
Pull requests that affect the corresponding module
athena
Pull requests that affect the corresponding module
client
Pull requests that update TypeScript code. (Added Automatically!)
communication
Pull requests that affect the corresponding module
core
Pull requests that affect the corresponding module
exercise
Pull requests that affect the corresponding module
programming
Pull requests that affect the corresponding module
server
Pull requests that update Java code. (Added Automatically!)
tests
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Please test only on TS3
!!! Contains database migrations !!!
Checklist
General
Server
Client
authorities
to all new routes and checked the course groups for displaying navigation elements (links, buttons).Changes affecting Programming Exercises
Motivation and Context
This PR addresses current limitations in the feedback handling within the online code editor for programming exercises. At the moment, feedback does not refresh reliably, and once feedback is closed, there is no way to reopen it from the file tree.
Description
This PR adds a feedback refresh mechanism, a “Reopen Feedback” button in the file tree, and updates how remaining Athena feedback requests are counted by using a new server endpoint instead of relying on a limited client-side array.
Note: This PR is based on the branch from a previously closed, unmerged PR. It resolves merge conflicts and adds new functionality, including the corrected handling of the limited-size feedback count.
Steps for Testing
Prerequisites
1 Instructor
1 Student
Log in to Artemis.
Verify that:
Exam Mode Testing
Verify that:
Testserver States
You can manage test servers using Helios. Check environment statuses in the environment list. To deploy to a test server, go to the CI/CD page, find your PR or branch, and trigger the deployment.
Review Progress
Performance Review
Code Review
Manual Tests
Exam Mode Test
Performance Tests
Test Coverage
Screenshots