From 4f9d814abee394f7bc802cb9ee106e8cd7d45608 Mon Sep 17 00:00:00 2001
From: Sol Dubock <94075844+sjd210@users.noreply.github.com>
Date: Wed, 21 Aug 2024 17:11:04 +0100
Subject: [PATCH 1/3] Apply front-end warning to reassigning tests

---
 .../components/elements/modals/QuizSettingModal.tsx   | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/app/components/elements/modals/QuizSettingModal.tsx b/src/app/components/elements/modals/QuizSettingModal.tsx
index e6c87d7f6e..42bebe1ff2 100644
--- a/src/app/components/elements/modals/QuizSettingModal.tsx
+++ b/src/app/components/elements/modals/QuizSettingModal.tsx
@@ -7,7 +7,8 @@ import {
     useAppDispatch,
     useAppSelector,
     useAssignQuizMutation,
-    useGetGroupsQuery
+    useGetGroupsQuery,
+    useGetQuizAssignmentsSetByMeQuery,
 } from "../../../state";
 import {assignMultipleQuiz, isDefined, Item, selectOnChange, TODAY} from "../../../services";
 import range from "lodash/range";
@@ -59,6 +60,8 @@ export function QuizSettingModal({quiz, dueDate: initialDueDate, scheduledStartD
     const [scheduledStartDate, setScheduledStartDate] = useState<Date | null>(initialScheduledStartDate ?? null);
     const [feedbackMode, setFeedbackMode] = useState<QuizFeedbackMode | null>(initialFeedbackMode ?? null);
 
+    const allQuizAssignments = useGetQuizAssignmentsSetByMeQuery().data;
+
     const yearRange = range(currentYear, currentYear + 5);
 
     function addValidated(what: ControlName) {
@@ -86,7 +89,7 @@ export function QuizSettingModal({quiz, dueDate: initialDueDate, scheduledStartD
         });
     }
 
-    const groupInvalid = validated.has('group') && selectedGroups.length === 0;
+    const groupInvalid = validated.has('group') && selectedGroups.length === 0 || selectedGroups.some(group => allQuizAssignments?.some(assignment => assignment.quizId === quiz.id && assignment.groupId === group.value));
     const dueDateInvalid = isDefined(dueDate) && ((scheduledStartDate ? scheduledStartDate.valueOf() > dueDate.valueOf() : false) || dueDate.valueOf() < Date.now());
     const scheduledStartDateInvalid = isDefined(scheduledStartDate) && scheduledStartDate.valueOf() < TODAY().valueOf();
     const feedbackModeInvalid = validated.has('feedbackMode') && feedbackMode === null;
@@ -117,7 +120,7 @@ export function QuizSettingModal({quiz, dueDate: initialDueDate, scheduledStartD
                     />;
                 }}
             />
-            {groupInvalid && <FormFeedback className="d-block" valid={false}>You must select a group</FormFeedback>}
+            {groupInvalid && (selectedGroups.length === 0 ? <FormFeedback className="d-block" valid={false}>You must select a group</FormFeedback> : <FormFeedback className="d-block" valid={false}>You cannot reassign a test to this group(s) until the due date has passed.</FormFeedback>)}
         </Label>
         <Label className="w-100 mb-4">What level of feedback should students get:<br/>
             <StyledSelect
@@ -168,7 +171,7 @@ export function QuizSettingModal({quiz, dueDate: initialDueDate, scheduledStartD
             </Button>
             <Button
                 className={"float-end mb-4"}
-                disabled={selectedGroups.length === 0 || !feedbackMode || isAssigning || dueDateInvalid || scheduledStartDateInvalid}
+                disabled={groupInvalid || !feedbackMode || isAssigning || dueDateInvalid || scheduledStartDateInvalid}
                 onMouseEnter={() => setValidated(new Set(['group', 'feedbackMode']))}
                 onClick={assign}
             >

From 36b2c21cb5c406dab059a12017dbca5168d857be Mon Sep 17 00:00:00 2001
From: Sol Dubock <94075844+sjd210@users.noreply.github.com>
Date: Wed, 21 Aug 2024 17:14:54 +0100
Subject: [PATCH 2/3] Remove Set Test database polling

---
 src/app/components/elements/modals/QuizSettingModal.tsx | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/app/components/elements/modals/QuizSettingModal.tsx b/src/app/components/elements/modals/QuizSettingModal.tsx
index 42bebe1ff2..110ddb01c6 100644
--- a/src/app/components/elements/modals/QuizSettingModal.tsx
+++ b/src/app/components/elements/modals/QuizSettingModal.tsx
@@ -1,5 +1,5 @@
 import React, {ChangeEvent, useState} from "react";
-import {ContentSummaryDTO, IsaacQuizDTO, QuizFeedbackMode} from "../../../../IsaacApiTypes";
+import {ContentSummaryDTO, IsaacQuizDTO, QuizAssignmentDTO, QuizFeedbackMode} from "../../../../IsaacApiTypes";
 import {
     AppDispatch,
     closeActiveModal,
@@ -47,6 +47,8 @@ interface QuizSettingModalProps {
     feedbackMode?: QuizFeedbackMode | null;
 }
 
+let allQuizAssignments: QuizAssignmentDTO[] | undefined;
+
 export function QuizSettingModal({quiz, dueDate: initialDueDate, scheduledStartDate: initialScheduledStartDate, feedbackMode: initialFeedbackMode}: QuizSettingModalProps) {
     const dispatch: AppDispatch = useAppDispatch();
     const groupsQuery = useGetGroupsQuery(false);
@@ -60,7 +62,7 @@ export function QuizSettingModal({quiz, dueDate: initialDueDate, scheduledStartD
     const [scheduledStartDate, setScheduledStartDate] = useState<Date | null>(initialScheduledStartDate ?? null);
     const [feedbackMode, setFeedbackMode] = useState<QuizFeedbackMode | null>(initialFeedbackMode ?? null);
 
-    const allQuizAssignments = useGetQuizAssignmentsSetByMeQuery().data;
+    allQuizAssignments = !allQuizAssignments ? useGetQuizAssignmentsSetByMeQuery().data : allQuizAssignments;
 
     const yearRange = range(currentYear, currentYear + 5);
 
@@ -85,6 +87,7 @@ export function QuizSettingModal({quiz, dueDate: initialDueDate, scheduledStartD
                 setDueDate(null);
                 setScheduledStartDate(null);
                 setFeedbackMode(null);
+                allQuizAssignments = undefined;
             }
         });
     }

From 328d4fab9487fdccbad847504383e246847c40fd Mon Sep 17 00:00:00 2001
From: Sol Dubock <94075844+sjd210@users.noreply.github.com>
Date: Wed, 28 Aug 2024 16:59:53 +0100
Subject: [PATCH 3/3] Disable already assigned groups in select

---
 .../elements/modals/QuizSettingModal.tsx      | 22 +++++++++++++------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/app/components/elements/modals/QuizSettingModal.tsx b/src/app/components/elements/modals/QuizSettingModal.tsx
index 110ddb01c6..7446119876 100644
--- a/src/app/components/elements/modals/QuizSettingModal.tsx
+++ b/src/app/components/elements/modals/QuizSettingModal.tsx
@@ -17,6 +17,7 @@ import {IsaacSpinner} from "../../handlers/IsaacSpinner";
 import {ShowLoadingQuery} from "../../handlers/ShowLoadingQuery";
 import {StyledSelect} from "../inputs/StyledSelect";
 import {Button, FormFeedback, Label, UncontrolledTooltip} from "reactstrap";
+import { AppGroup } from "../../../../IsaacAppTypes";
 
 
 type QuizFeedbackOption = Item<QuizFeedbackMode>;
@@ -47,8 +48,6 @@ interface QuizSettingModalProps {
     feedbackMode?: QuizFeedbackMode | null;
 }
 
-let allQuizAssignments: QuizAssignmentDTO[] | undefined;
-
 export function QuizSettingModal({quiz, dueDate: initialDueDate, scheduledStartDate: initialScheduledStartDate, feedbackMode: initialFeedbackMode}: QuizSettingModalProps) {
     const dispatch: AppDispatch = useAppDispatch();
     const groupsQuery = useGetGroupsQuery(false);
@@ -61,8 +60,7 @@ export function QuizSettingModal({quiz, dueDate: initialDueDate, scheduledStartD
     const [dueDate, setDueDate] = useState<Date | null>(initialDueDate ?? null);
     const [scheduledStartDate, setScheduledStartDate] = useState<Date | null>(initialScheduledStartDate ?? null);
     const [feedbackMode, setFeedbackMode] = useState<QuizFeedbackMode | null>(initialFeedbackMode ?? null);
-
-    allQuizAssignments = !allQuizAssignments ? useGetQuizAssignmentsSetByMeQuery().data : allQuizAssignments;
+    const {data: quizAssignments} = useGetQuizAssignmentsSetByMeQuery();
 
     const yearRange = range(currentYear, currentYear + 5);
 
@@ -87,12 +85,14 @@ export function QuizSettingModal({quiz, dueDate: initialDueDate, scheduledStartD
                 setDueDate(null);
                 setScheduledStartDate(null);
                 setFeedbackMode(null);
-                allQuizAssignments = undefined;
             }
         });
     }
 
-    const groupInvalid = validated.has('group') && selectedGroups.length === 0 || selectedGroups.some(group => allQuizAssignments?.some(assignment => assignment.quizId === quiz.id && assignment.groupId === group.value));
+    const isAssignmentSetToThisGroup = (group: Item<number>, assignment?: QuizAssignmentDTO) => assignment ? (assignment.quizId === quiz.id && assignment.groupId === group.value && (assignment.dueDate ? assignment.dueDate.valueOf() < Date.now() : true)) : false;
+    const alreadyAssignedToAGroup = selectedGroups.some(group => quizAssignments?.some(assignment => isAssignmentSetToThisGroup(group, assignment)));
+    
+    const groupInvalid = validated.has('group') && selectedGroups.length === 0 || alreadyAssignedToAGroup;    
     const dueDateInvalid = isDefined(dueDate) && ((scheduledStartDate ? scheduledStartDate.valueOf() > dueDate.valueOf() : false) || dueDate.valueOf() < Date.now());
     const scheduledStartDateInvalid = isDefined(scheduledStartDate) && scheduledStartDate.valueOf() < TODAY().valueOf();
     const feedbackModeInvalid = validated.has('feedbackMode') && feedbackMode === null;
@@ -105,7 +105,11 @@ export function QuizSettingModal({quiz, dueDate: initialDueDate, scheduledStartD
                 query={groupsQuery}
                 defaultErrorTitle={"Error fetching groups"}
                 thenRender={groups => {
-                    const groupOptions: Item<number>[] = groups.map(g => ({label: g.groupName as string, value: g.id as number}));
+                    function appGroupToItem(g: AppGroup): Item<number> {return {label: g.groupName as string, value: g.id as number}; }
+                    function quizToAssignment(g: AppGroup): QuizAssignmentDTO | undefined { return quizAssignments?.find(assignment => assignment.quizId === quiz.id && assignment.groupId === g.id); }
+                    
+                    const groupOptions = groups.map((g: AppGroup) => ({...appGroupToItem(g), isDisabled: isAssignmentSetToThisGroup(appGroupToItem(g), quizToAssignment(g))}));
+
                     return <StyledSelect isMulti placeholder="Select groups"
                         options={groupOptions}
                         onChange={(s) => {
@@ -117,6 +121,10 @@ export function QuizSettingModal({quiz, dueDate: initialDueDate, scheduledStartD
                         isSearchable
                         menuPortalTarget={document.body}
                         styles={{
+                            option: (base, selectProps) => ({
+                                ...base,
+                                backgroundColor: selectProps.isFocused && selectProps.isDisabled ? 'transparent' : base.backgroundColor
+                            }),
                             control: (styles) => ({...styles, ...(groupInvalid ? {borderColor: '#dc3545'} : {})}),
                             menuPortal: base => ({...base, zIndex: 9999}),
                         }}