Merge pull request #698 from UTDNebula/develop

Sync with develop

Author: akevinge

.github/workflows/versioning.yml

@@ -0,0 +1,30 @@
+name: Scheduled Versioning
+
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: '0 0 15 8 *'
+
+jobs:
+  versioning:
+    name: Versioning System
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - uses: actions/setup-python@v4
+        with:
+          python-version: '3.10'
+
+      - name: Install dependencies
+        working-directory: validator
+        run: |
+          pip3 install -r requirements.txt
+
+      - name: Execute versioning script
+        env:
+          JIRA_API_KEY: ${{ secrets.JIRA_API_KEY }}
+        working-directory: ./validator/scripts
+        run: python diff.py

public/index.css

@@ -76,13 +76,13 @@ header a:hover {
  */
 
 .login {
-  background-color: #3772ff;
-  border-color: #3772ff;
+  background-color: #6266F9;
+  border-color: #6266F9;
   color: #fff !important;
 }
 
 .login:hover {
-  background-color: #2956c5;
+  background-color: #474bb6;
   color: #fff;
 }
 

src/components/planner/CourseInfoHoverCard.tsx

@@ -44,7 +44,6 @@ export const CourseInfoHoverCard: FC<CourseInfoHoverCardProps> = ({
           </Link>
         </h3>
         <CourseDescription description={description} />
-
         <HoverCard.Arrow className="fill-primary" />
       </HoverCard.Content>
     </HoverCard.Portal>
@@ -60,10 +59,15 @@ export default CourseInfoHoverCard;
  */
 const CourseDescription = ({ description }: { description: string }) => {
   const [showMore, setShowMore] = useState(false);
+  const boldDescription = description.replaceAll(/(\b[A-Z]{2,4} \d{4}\b)/gi, '<b>$1</b>');
   return (
     <span>
       <p className="text-xs">
-        {!showMore ? `${description.substring(0, 200)}... ` : `${description} `}
+        <span
+          dangerouslySetInnerHTML={{
+            __html: !showMore ? boldDescription.substring(0, 200) + '...' : boldDescription,
+          }}
+        />{' '}
         <button
           className={`${showMore ? '' : 'inline'} font-medium text-primary`}
           onClick={(e) => {

src/components/planner/Planner.tsx

@@ -93,6 +93,9 @@ export default function Planner({
   // Course that is currently being dragged
   const [activeCourse, setActiveCourse] = useState<ActiveDragData | null>(null);
 
+  // Controls drag locking for the sidebar
+  const [isCourseDragging, setIsCourseDragging] = useState(false);
+
   // Delay necessary so events inside draggables propagate
   // valid sensors: https://github.com/clauderic/dnd-kit/discussions/82#discussioncomment-347608
   const sensors = useSensors(
@@ -116,6 +119,7 @@ export default function Planner({
   const handleOnDragStart = ({ active }: { active: Active }) => {
     const originData = active.data.current as DragEventOriginData;
     setActiveCourse({ from: originData.from, course: originData.course });
+    setIsCourseDragging(true);
   };
 
   const handleOnDragEnd = ({ active, over }: { active: Active; over: Over | null }) => {
@@ -143,15 +147,16 @@ export default function Planner({
         );
       }
     }
+
+    setIsCourseDragging(false);
   };
 
   const ref = useRef<HTMLDivElement>(null);
   // TODO: Use resizeobserver to change column count based on screen size
 
   return (
     <DndContext
-      // Enabling autoScroll causes odd behavior when dragging outside of a scrollable container (eg. Sidebar)
-      autoScroll={false}
+      autoScroll={true}
       sensors={sensors}
       collisionDetection={pointerWithin}
       onDragStart={handleOnDragStart}
@@ -218,6 +223,7 @@ export default function Planner({
           transferCredits={transferCredits}
           getSearchedDragId={(course) => `course-list-searched-${course.id}`}
           getRequirementDragId={(course) => `course-list-requirement-${course.id}`}
+          courseDragged={isCourseDragging}
         />
       </div>
     </DndContext>

src/components/planner/Sidebar/Sidebar.tsx

@@ -25,6 +25,7 @@ export interface CourseSelectorContainerProps {
   transferCredits: string[];
   getSearchedDragId: GetDragIdByCourse;
   getRequirementDragId: GetDragIdByCourse;
+  courseDragged: boolean;
 }
 
 function CourseSelectorContainer({
@@ -33,6 +34,7 @@ function CourseSelectorContainer({
   transferCredits,
   getSearchedDragId,
   getRequirementDragId,
+  courseDragged,
 }: CourseSelectorContainerProps) {
   const {
     data: validationData,
@@ -119,7 +121,9 @@ function CourseSelectorContainer({
       {open ? (
         <div
           id="tutorial-editor-1"
-          className="z-0 h-screen w-[30%] min-w-[30%] overflow-x-hidden overflow-y-scroll"
+          className={`z-0 h-screen w-[30%] min-w-[30%] overflow-x-hidden ${
+            courseDragged ? 'overflow-y-hidden' : 'overflow-y-scroll'
+          }`}
         >
           <div className="flex h-fit min-h-screen w-full flex-col gap-y-4 bg-white p-4">
             <div className="flex flex-col">

src/components/planner/Tiles/SemesterTile.tsx

@@ -208,6 +208,7 @@ const DroppableSemesterTile: FC<DroppableSemesterTileProps> = ({
   const { setNodeRef } = useDroppable({
     id: dropId,
     data: { to: 'semester-tile', semester } as DragDataToSemesterTile,
+    disabled: semester.locked,
   });
 
   return (

validator/degree_solver.py

@@ -1,16 +1,17 @@
 from __future__ import annotations
 from enum import Enum
 from glob import glob
+from collections import Counter
 
 from pydantic import Json
 
 from typing import Any
 
 import core
-from major.requirements import AbstractRequirement
+from major.requirements import AbstractRequirement, FreeElectiveRequirement
 from dataclasses import dataclass
 
-from major.requirements.map import REQUIREMENTS_MAP
+from major.requirements import loader
 import json
 
 from major.requirements.shared import (
@@ -19,6 +20,7 @@
 )
 from course import Course
 
+LOADER = loader.Loader()
 
 # Read all degree plan JSON files and store their contents in a hashmap
 # This is so that we can avoid reading all the files each time we want to get the data for a certain course
@@ -144,7 +146,7 @@ def __init__(
         requirements: DegreeRequirementsInput,
         bypasses: BypassInput,
     ) -> None:
-        self.courses = set(courses)
+        self.courses = set([Course.from_name(course) for course in courses])
         self.degree_requirements = self.load_requirements(requirements)
         self.solved_core: core.store.AssignmentStore | None = None
         self.bypasses = bypasses
@@ -187,9 +189,7 @@ def load_requirements(
 
             # Add requirements
             for req_data in requirements_data:
-                major_req.requirements.append(
-                    REQUIREMENTS_MAP[req_data["matcher"]].from_json(req_data)
-                )
+                major_req.requirements.append(LOADER.requirement_from_json(req_data))
             degree_requirements.append(major_req)
             # We don't need to check the other JSON files
             break
@@ -201,23 +201,28 @@ def load_requirements(
     def solve(self) -> DegreeRequirementsSolver:
         # Run for core
         core_solver = self.load_core()
-        self.solved_core = core_solver.solve(
-            [Course.from_name(course) for course in self.courses], []
-        )
-        # Set of the core courses that are fulfilled, so they won't be considered as free electives
-        used_core_courses = set()
+        self.solved_core = core_solver.solve(list(self.courses), [])
+
+        # Counter of the core courses and their used hours, so they won't be considered as free electives.
+        used_core_courses: Counter[Course] = Counter()
         if self.solved_core is not None:
             for req_fill in self.solved_core.reqs_to_courses.values():
-                used_core_courses.update([course.name for course in req_fill.keys()])
+                used_core_courses.update(req_fill)
 
         # Run for major
         for degree_req in self.degree_requirements:
             for course in self.courses:
-                # Make sure it's not a core course
-                if course in used_core_courses:
-                    continue
                 for requirement in degree_req.requirements:
-                    if requirement.attempt_fulfill(course):
+                    # Free elective requirements are special, since they can take left over hours from core courses.
+                    if type(requirement) == FreeElectiveRequirement:
+                        if requirement.attempt_fulfill(
+                            course.name,
+                            available_hours=(
+                                int(course.hours) - used_core_courses[course]
+                            ),
+                        ):
+                            break
+                    elif requirement.attempt_fulfill(course.name):
                         break
 
             # Handle requirements bypasses for major

validator/gen_schema.py

@@ -6,7 +6,7 @@
 from types import GenericAlias
 from typing import Any, ForwardRef
 from jsonschema import Draft7Validator
-from major.requirements import REQUIREMENTS_MAP
+from major.requirements import loader
 
 schema: dict[str, Any] = {
     "$schema": Draft7Validator.META_SCHEMA["$id"],
@@ -89,8 +89,9 @@ def forward_ref_to_schema(ref: ForwardRef) -> dict[str, Any]:
         raise Exception("Expected type, got", type(ref_type), ref_type)
 
 
-for req_name in REQUIREMENTS_MAP:
-    req = REQUIREMENTS_MAP[req_name]
+req_loader = loader.Loader()
+for req_name in req_loader.REQUIREMENTS_MAP:
+    req = req_loader.REQUIREMENTS_MAP[req_name]
     requirement_schema_props: dict[str, Any] = {"matcher": {"const": req_name}}
 
     for prop_name, prop_type in req.JSON.__annotations__.items():

validator/major/requirements/__init__.py

@@ -1,3 +1,3 @@
 from .base import AbstractRequirement
 from .shared import *
-from .map import *
+from . import loader

validator/major/requirements/base.py

@@ -3,7 +3,6 @@
 from __future__ import annotations
 from abc import abstractmethod, ABC
 from dataclasses import dataclass
-
 from typing import Any
 
 from pydantic import Json
@@ -19,6 +18,7 @@ class AbstractRequirement(ABC):
     def attempt_fulfill(
         self,
         course: str,
+        available_hours: int = 0,
     ) -> bool:
         pass