Reject and reset button for manual review (#1571)

* Reject and reset button for manual review

* Small fixes

* New course with peer review to seed, test fix and message to user when answer has been reset

* Little improvements

* Fix indent

---------

Co-authored-by: Maija Y <[email protected]>

Author: Maijjay

services/course-material/src/components/ContentRenderer/moocfi/ExerciseBlock/GradingState.tsx

@@ -16,18 +16,28 @@ interface GradingStateProps {
   reviewingStage: ReviewingStage
   peerOrSelfReviewConfig: CourseMaterialPeerOrSelfReviewConfig | null
   exercise: Exercise
+  shouldSeeResetMessage: boolean
 }
 const GradingState: React.FC<React.PropsWithChildren<GradingStateProps>> = ({
   gradingProgress,
   reviewingStage,
   peerOrSelfReviewConfig,
   exercise,
+  shouldSeeResetMessage,
 }) => {
   const { t } = useTranslation()
 
   const text = useMemo(
-    () => getText(reviewingStage, gradingProgress, peerOrSelfReviewConfig, exercise, t),
-    [gradingProgress, peerOrSelfReviewConfig, reviewingStage, exercise, t],
+    () =>
+      getText(
+        reviewingStage,
+        gradingProgress,
+        peerOrSelfReviewConfig,
+        exercise,
+        shouldSeeResetMessage,
+        t,
+      ),
+    [gradingProgress, peerOrSelfReviewConfig, reviewingStage, exercise, shouldSeeResetMessage, t],
   )
 
   if (text === null) {
@@ -46,8 +56,12 @@ const getText = (
   gradingProgress: GradingProgress,
   peerOrSelfReviewConfig: CourseMaterialPeerOrSelfReviewConfig | null,
   exercise: Exercise,
+  shouldSeeResetMessage: boolean,
   t: TFunction<Namespace<"course-material">, Namespace<"course-material">>,
 ): string | null => {
+  if (shouldSeeResetMessage && reviewingStage === "NotStarted") {
+    return t("help-text-exercise-involves-reject-and-reset")
+  }
   if (peerOrSelfReviewConfig && reviewingStage === "NotStarted") {
     if (exercise.needs_peer_review && exercise.needs_self_review) {
       return t("help-text-exercise-involves-peer-review-and-self-review", {
@@ -90,5 +104,4 @@ const getText = (
       return null
   }
 }
-
 export default GradingState

services/course-material/src/components/ContentRenderer/moocfi/ExerciseBlock/index.tsx

@@ -575,6 +575,7 @@ const ExerciseBlock: React.FC<
                 reviewingStage={reviewingStage}
                 peerOrSelfReviewConfig={getCourseMaterialExercise.data.peer_or_self_review_config}
                 exercise={getCourseMaterialExercise.data.exercise}
+                shouldSeeResetMessage={getCourseMaterialExercise.data.should_show_reset_message}
               />
             )}
           {/* Reviewing stage seems to be undefined at least for exams */}

services/headless-lms/migrations/20250930132848_add_reject_and_reopen_to_teacher_grading_decisions.down.sql

@@ -0,0 +1,23 @@
+-- Replace enum value 'reject-and-reset' with 'custom-points'
+-- to ensure compatibility with the original teacher_decision_type definition
+UPDATE teacher_grading_decisions
+SET teacher_decision = 'custom-points'
+WHERE teacher_decision = 'reject-and-reset';
+
+-- Rename the old enum
+ALTER TYPE teacher_decision_type
+RENAME TO teacher_decision_type_old;
+
+-- Create a new enum without 'reject-and-reset'
+CREATE TYPE teacher_decision_type AS ENUM (
+  'full-points',
+  'zero-points',
+  'custom-points',
+  'suspected-plagiarism'
+);
+
+-- Change the column to use the new enum
+ALTER TABLE teacher_grading_decisions
+ALTER COLUMN teacher_decision TYPE teacher_decision_type USING teacher_decision::text::teacher_decision_type;
+
+DROP TYPE teacher_decision_type_old;

services/headless-lms/migrations/20250930132848_add_reject_and_reopen_to_teacher_grading_decisions.up.sql

@@ -0,0 +1,2 @@
+ALTER TYPE teacher_decision_type
+ADD VALUE IF NOT EXISTS 'reject-and-reset';