Skip to content

Commit

Permalink
update screenshots and improve wording a bit
Browse files Browse the repository at this point in the history
  • Loading branch information
tobias-lippert committed Oct 8, 2023
1 parent ce6615f commit 733127a
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 2 deletions.
2 changes: 1 addition & 1 deletion docs/user/exams/instructors_guide.rst
Original file line number Diff line number Diff line change
Expand Up @@ -349,7 +349,7 @@ The exam conduction starts when the exam becomes visible to the students and end

Updating an Exercise during the Exam
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
In case you have to update the exercise during an exam for programming, modeling, text, or file-upload exercises, you can go to the exercise details page and click on |edit| to edit the exercise. At the bottom of this page, you can enter a notification text that is shown to the students in the exam mode. The screenshot below shows an example notification. You can see how the updated problem statement looks for the student in :ref:`Updated Problem Statement during the Exam <updated_problem_statement>`.
In case you have to update the exercise during an exam for programming, modeling, text, or file-upload exercises, you can go to the exercise details page and click on |edit| to edit the exercise. At the bottom of the exercise edit page, you can enter a notification text that is shown to the students in the exam mode. The screenshot below shows an example notification. You can see how the updated problem statement looks for the student in :ref:`Updated Problem Statement during the Exam <updated_problem_statement>`.

.. figure:: instructor/exercise-notification.png
:alt: Exercise Notification
Expand Down
Binary file modified docs/user/exams/student/problem-statement-diff-view.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/user/exams/student/problem-statement-normal-view.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/user/exams/student/student-notification.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 4 additions & 1 deletion docs/user/exams/students_guide.rst
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,10 @@ Participating in Programming Exercises

If you work in the online code editor and a merge conflict occurs, the file browser will display the conflict state |conflict_state|.
You can use the |resolve_conflict| button, which is then displayed instead of the submit button, to resolve the conflict within the online code editor.
This will reset your changes to the latest commit. Manual merging is not possible with the online code editor.
This will reset your changes to the latest commit.

.. warning::
Manual merging is not possible with the online code editor.

.. _updated_problem_statement:

Expand Down

0 comments on commit 733127a

Please sign in to comment.