Recommended preparation field

CHANGELOG.md

@@ -6,6 +6,8 @@
 
 ### ✨ New features/enhancements
 
+- Added recommended preparation field to courses and updated the course info modal
+
 ### 🐛 Bug fixes
 
 - Fixed CSS styling of background colour and let the application have full height

app/Database/Tables.hs

@@ -69,6 +69,7 @@ Course
     title T.Text Maybe
     description T.Text Maybe
     prereqs T.Text Maybe
+    prep T.Text Maybe
     exclusions T.Text Maybe
     breadth BreadthId Maybe
     distribution DistributionId Maybe

app/Models/Course.hs

@@ -37,6 +37,7 @@ import Database.Tables (
         courseDescription,
         courseDistribution,
         courseExclusions,
+        coursePrep,
         coursePrereqString,
         courseTitle,
         courseVideoUrls
@@ -63,6 +64,7 @@ data CourseData
     , prereqString :: Maybe T.Text
     , allMeetingTimes :: Maybe [MeetTime']
     , name :: !T.Text
+    , prep :: Maybe T.Text
     , exclusions :: Maybe T.Text
     , distribution :: Maybe T.Text
     , coreqs :: Maybe T.Text
@@ -118,6 +120,7 @@ buildCourse allMeetings course = do
             (coursePrereqString course)
             (Just allMeetings)
             (courseCode course)
+            (coursePrep course)
             (courseExclusions course)
             cDistribution
             (courseCoreqs course)

app/WebParsing/ArtSciParser.hs

@@ -133,8 +133,7 @@ parseCourses tags =
             description = maybe "" ((courseContents !!) . (+ 1)) i1
             prereqString = getValue "Prerequisite:" courseContents
             coreq = getValue "Corequisite:" courseContents
-            -- TODO: add a "recommended preparation" field to the database
-            -- prep = getValue "Recommended Preparation:" courseContents
+            prep = getValue "Recommended Preparation:" courseContents
             exclusion = getValue "Exclusion:" courseContents
             distribution = fromMaybe "" $ getValue "Distribution Requirements:" courseContents
             breadth = fromMaybe "" $ getValue "Breadth Requirements:" courseContents
@@ -143,6 +142,7 @@ parseCourses tags =
                 (Just title)
                 (Just description)
                 (fmap (T.pack . show . parseReqs . T.unpack) prereqString)
+                prep
                 exclusion
                 Nothing
                 Nothing

backend-test/Controllers/GenerateControllerTests.hs

@@ -32,6 +32,7 @@ insertCoursesWithPrerequisites = mapM_ insertCourse
                 , courseTitle = Nothing
                 , courseDescription = Nothing
                 , coursePrereqs = prereqString
+                , coursePrep = Nothing
                 , courseExclusions = Nothing
                 , courseBreadth = Nothing
                 , courseDistribution = Nothing

js/components/common/__tests__/CourseModalUpdate.test.js

@@ -18,6 +18,7 @@ describe("componentDidUpdate", () => {
       title: "Foundations of Computer Science I",
       description: null,
       prereqs: null,
+      prep: null,
       exclusions: null,
       breadth: null,
       distribution: null,

js/components/common/__tests__/InfoModalFields.test.js

@@ -11,6 +11,7 @@ describe("Displays course information fields iff they are non-empty.", () => {
       description: "test description",
       prereqString: ["ABC101H1"],
       coreqs: ["DEF101H1"],
+      prep: ["JKL101H1"],
       exclusions: ["GHI101H1"],
       distribution: "Sciences",
       breadth: "The Physical and Mathematical Universes (5)",
@@ -20,6 +21,7 @@ describe("Displays course information fields iff they are non-empty.", () => {
     await screen.findByText("test description")
     await screen.findByText("ABC101H1")
     await screen.findByText("DEF101H1")
+    await screen.findByText("JKL101H1")
     await screen.findByText("GHI101H1")
     await screen.findByText("Sciences")
     await screen.findByText("The Physical and Mathematical Universes (5)")
@@ -31,6 +33,7 @@ describe("Displays course information fields iff they are non-empty.", () => {
       description: "",
       prereqString: [],
       coreqs: [],
+      prep: [],
       exclusions: [],
       distribution: "",
       breadth: "",
@@ -39,6 +42,7 @@ describe("Displays course information fields iff they are non-empty.", () => {
     render(<Description course={courseInfo} sessions={{}} />)
     expect(screen.queryByText("Prerequisite:")).toBeNull()
     expect(screen.queryByText("Corequisite:")).toBeNull()
+    expect(screen.queryByText("Recommended Preparation:")).toBeNull()
     expect(screen.queryByText("Exclusion:")).toBeNull()
     expect(screen.queryByText("Distribution Requirement Status:")).toBeNull()
     expect(screen.queryByText("Breadth Requirement:")).toBeNull()

js/components/common/react_modal.js.jsx

@@ -107,6 +107,7 @@ class CourseModal extends React.Component {
             description: this.convertToLink(course.description),
             prereqString: this.convertToLink(course.prereqString),
             coreqs: this.convertToLink(course.coreq),
+            prep: this.convertToLink(course.prep),
             exclusions: this.convertToLink(course.exclusions),
           }
 
@@ -374,6 +375,12 @@ class Description extends React.Component {
             {this.props.course.coreqs}
           </p>
         )}
+        {this.props.course.prep?.length > 0 && (
+          <p>
+            <strong>Recommended Preparation: </strong>
+            {this.props.course.prep}
+          </p>
+        )}
         {this.props.course.exclusions?.length > 0 && (
           <p>
             <strong>Exclusion: </strong>

js/components/graph/__mocks__/aaa100-course-info.js

@@ -365,6 +365,7 @@ export default {
   videoUrls: [],
   breadth: "The Physical and Mathematical Universes (5)",
   name: "AAA100H1",
+  prep: "AAA101H1",
   exclusions: "",
   title: "Introduction to AAA Thinking",
   description:

js/components/graph/__mocks__/bbb100-course-info.js

@@ -365,6 +365,7 @@ export default {
   videoUrls: [],
   breadth: "The Physical and Mathematical Universes (5)",
   name: "BBB100H1",
+  prep: "BBB101H1",
   exclusions: "",
   title: "Introduction to BBB Thinking",
   description:

js/components/graph/__mocks__/ccc100-course-info.js

@@ -365,6 +365,7 @@ export default {
   videoUrls: [],
   breadth: "The Physical and Mathematical Universes (5)",
   name: "CCC100H1",
+  prep: "CCC101H1",
   exclusions: "",
   title: "Introduction to CCC Thinking",
   description:

js/components/grid/__tests__/CoursePanel.test.js

@@ -32,6 +32,7 @@ describe("CoursePanel", () => {
       title: "Foundations of Computer Science I",
       description: null,
       prereqs: null,
+      prep: null,
       exclusions: null,
       breadth: null,
       distribution: null,