added logic to auto add selected courses from rsearch to reqpanel, fi…

…xed bug where user could add course to any rule field
pennlabs · Dec 8, 2024 · bfd5804 · bfd5804
1 parent 29f3edb
commit bfd5804
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 7 deletions.
diff --git a/backend/degree/serializers.py b/backend/degree/serializers.py
@@ -160,9 +160,12 @@ def validate(self, data):
                     identical_rules.append(curr_rule)
             else: # parent rule
                 bfs_queue.extend(curr_rule.children.all())
+        try:
+            rules.extend(identical_rules)
+            data["rules"] = rules
+        except:
+            pass
 
-        rules.extend(identical_rules)
-        data["rules"] = rules
 
         # TODO: check that rules belong to this degree plan
         for rule in rules:

diff --git a/frontend/degree-plan/components/Requirements/Rule.tsx b/frontend/degree-plan/components/Requirements/Rule.tsx
@@ -46,7 +46,10 @@ const RuleLeafWrapper = styled.div<{$isDroppable:boolean, $isOver: boolean}>`
   justify-content: space-between;
   gap: .5rem;
   align-items: center;
-  box-shadow: ${props => props.$isOver ? '0px 0px 4px 2px var(--selected-color);' : props.$isDroppable ? '0px 0px 4px 2px var(--primary-color-dark);' : 'rgba(0, 0, 0, 0.05);'}
+  box-shadow: ${props => props.$isOver && props.$isDroppable ? '0px 0px 4px 2px var(--selected-color);' : props.$isDroppable ? '0px 0px 4px 2px var(--primary-color-dark);' : 'rgba(0, 0, 0, 0.05);'};
+  // background-color: ${props => props.$isOver ? props.$isDroppable ? null : 'lightgray' : null};
+  // cursor: ${props => props.$isOver ? props.$isDroppable ? "not-allowed" : "not-allowed" : "not-allowed"};
+  cursor: not-allowed;
 `
 
 const CusCourses = styled.div`
@@ -167,7 +170,9 @@ const RuleComponent = (ruleTree : RuleTree) => {
           createOrUpdate({ rules: course.rules !== undefined ? [...course.rules, rule.id] : [rule.id] }, course.full_code);
           return undefined;
         }, // TODO: this doesn't handle fulfillments that already have a rule
-        canDrop: () => { return !satisfied && !!rule.q },
+        canDrop: (item, monitor) => { 
+          return !satisfied && !!rule.q && (item.rule_id === rule.id)
+        },
         collect: monitor => ({
           isOver: !!monitor.isOver() && !satisfied,
           canDrop: !!monitor.canDrop()

diff --git a/frontend/degree-plan/components/Search/CourseInSearch.tsx b/frontend/degree-plan/components/Search/CourseInSearch.tsx
@@ -139,6 +139,8 @@ interface CourseProps {
     isStar?: boolean;
 }
 
+
+
 export default function Course({
     course,
     ruleId,
@@ -148,9 +150,10 @@ export default function Course({
     isStar,
 }: CourseProps) {
     /** React dnd */
+
     const [{ isDragging }, drag] = useDrag<DnDCourse, never, { isDragging: boolean }>(() => ({
         type: ItemTypes.COURSE_IN_PLAN,
-        item: {full_code: course.id},
+        item: {full_code: course.id, rule_id: ruleId == null ? undefined : ruleId},
         collect: (monitor) => ({
           isDragging: !!monitor.isDragging()
         })

diff --git a/frontend/degree-plan/components/Search/ResultsList.tsx b/frontend/degree-plan/components/Search/ResultsList.tsx
@@ -62,11 +62,12 @@ const ResultsList = ({
     isLoading
 }: ResultListProps) => {
     // TODO: what if activeDegreeplan is not defined
+
     const { createOrUpdate: createOrUpdateFulfillment } = useSWRCrud<Fulfillment>(
         `/api/degree/degreeplans/${activeDegreeplanId}/fulfillments`,
         { 
             idKey: "full_code",
-            createDefaultOptimisticData: { semester: null, rules: [] }
+            createDefaultOptimisticData: { semester: null, rules: [ruleId] }
         }
     );
     const { createOrUpdate: createOrUpdateDockedCourse } = useSWRCrud<DockedCourse>(`/api/degree/docked`, { idKey: 'full_code' });

diff --git a/frontend/degree-plan/components/Search/SearchPanel.tsx b/frontend/degree-plan/components/Search/SearchPanel.tsx
@@ -106,6 +106,8 @@ export const SearchPanel = ({ activeDegreeplanId }: SearchPanelProp) => {
         setSearchRuleId(null);
     }
 
+    // console.log(ruleId)
+
     return (
         <PanelContainer>
             <SearchPanelHeader>

diff --git a/frontend/degree-plan/pages/OnboardingPage.tsx b/frontend/degree-plan/pages/OnboardingPage.tsx
@@ -642,9 +642,19 @@ const OnboardingPage = ({
             separatedCourses[currentSem] = [];
           } else {
             let courseMatch = line.match(/\b\w+\s\d{3,4}\b/);
+
             if (courseMatch) {
-              separatedCourses[currentSem].push(courseMatch[0]);
+              // Check if course didn't get an F or a W. If current sem's courses are empty, remove sem key from separatedCourses
+              if ((line[line.length -1] == "f" || line[line.length -1] == "w") && separatedCourses[currentSem].length == 0) {
+                  delete separatedCourses[currentSem];
+              }
+              else {
+                separatedCourses[currentSem].push(courseMatch[0]);
+              }
             }
+
+
+
           }
         }
         separatedCourses = Object.keys(separatedCourses).map(