Solving the course detective tab not coloring conflict courses to yel…

…low issue
CelleryLin · Aug 30, 2024 · 9d4596c · 9d4596c
1 parent 7b7e00c
commit 9d4596c
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
diff --git a/app/src/components/SelectorSetting/CourseDetective.jsx b/app/src/components/SelectorSetting/CourseDetective.jsx
@@ -185,15 +185,14 @@ class CourseDetective extends Component {
     const {
       selectedCourses,
       isCollapsed,
-      displayConflictCourses,
+      // displayConflictCourses,
       detectTimeConflict,
       calculateTotalCreditsAndHours,
       hoveredCourseId,
       onCourseSelect,
       onCourseHover,
     } = this.props;
     const { orderElements, filteredCourses } = this.state;
-
     return (
       <>
         <Card className='h-100'>
@@ -221,7 +220,7 @@ class CourseDetective extends Component {
               isCollapsed={isCollapsed}
               courses={filteredCourses}
               selectedCourses={selectedCourses}
-              displayConflictCourses={displayConflictCourses}
+              displayConflictCourses={true} // Cellery: restrict to true to avoid not coloring conflict courses to yellow
               detectTimeConflict={detectTimeConflict}
               hoveredCourseId={hoveredCourseId}
               onCourseSelect={onCourseSelect}

diff --git a/app/src/components/SelectorSetting/CourseDetective/ListInformation.jsx b/app/src/components/SelectorSetting/CourseDetective/ListInformation.jsx
@@ -50,6 +50,7 @@ function ListInformation({
   selectedCourses,
   toggleElementEnable,
 }) {
+  // const [displayConflictCourses, setDisplayConflictCourses] = useState(false);
   const [show, setShow] = useState(false);
   const sensors = useSensors(
     useSensor(PointerSensor, {
@@ -64,6 +65,10 @@ function ListInformation({
 
   const handleCloseOrderElement = () => setShow(false);
   const handleToggleOrderElement = () => setShow(!show);
+
+  // const handleShowSelectedCourses = () => {
+  //   setDisplayConflictCourses(prevState => !prevState);
+  // };
 
   const handleDragEnd = (event) => {
     const { active, over } = event;
@@ -89,6 +94,16 @@ function ListInformation({
           <InputGroup.Text>{totalCredits} 學分</InputGroup.Text>
           <InputGroup.Text>{totalHours} 小時</InputGroup.Text>
         </InputGroup>
+        {/* <StyledButton
+          id='toggle-show-conflict-courses'
+          type='checkbox'
+          variant='outline-success'
+          onClick={handleShowSelectedCourses}
+          value='show'
+          checked={displayConflictCourses}
+        >
+          {displayConflictCourses ? '隱藏衝堂' : '顯示衝堂'}
+        </StyledButton> */}
         <StyledButton
           className='ms-auto'
           variant='success'