Revert "Merge from master to my branch (#680)"

This reverts commit 3f49f69.

.github/workflows/ci.yaml

@@ -8,7 +8,7 @@ on:
 jobs:
   backend-unit-tests:
     name: pytest
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-18.04
     timeout-minutes: 5
     container: python:3.8
 

.github/workflows/prod-update.yaml

@@ -11,7 +11,7 @@ jobs:
 
     strategy:
       matrix:
-        semester: [summer-2023]
+        semester: [spring-2023]
 
     steps:
       - name: Checkout repository

rpi_data/modules/build_semester.py

@@ -1,7 +1,7 @@
 import os
 
 if __name__ == '__main__':
-	os.system("SOURCE_URL=https://sis.rpi.edu/reg/zs20230501.htm DEST=out1.csv HEADERS=True python rpi-parse.py")
-	os.system("SOURCE_URL=https://sis.rpi.edu/reg/zs20230502.htm DEST=out2.csv HEADERS=False python rpi-parse.py")
-	os.system("SOURCE_URL=https://sis.rpi.edu/reg/zs20230503.htm DEST=out3.csv HEADERS=False python rpi-parse.py")
+	os.system("SOURCE_URL=https://sis.rpi.edu/reg/zs20200501.htm DEST=out1.csv HEADERS=True python rpi-parse.py")
+	os.system("SOURCE_URL=https://sis.rpi.edu/reg/zs20200502.htm DEST=out2.csv HEADERS=False python rpi-parse.py")
+	os.system("SOURCE_URL=https://sis.rpi.edu/reg/zs20200503.htm DEST=out3.csv HEADERS=False python rpi-parse.py")
 	os.system("cat out1.csv out2.csv out3.csv > out.csv")

src/web/src/assets/dark.scss

@@ -123,9 +123,6 @@
   .dropdown-item {
     color: var(--dark-text-primary) !important;
   }
-  .dropdown-item:hover {
-    background-color: var(--dark-border-primary) !important;
-  }
 
   .link {
     color: var(--dark-text-primary) !important;

src/web/src/components/CourseListing.vue

@@ -45,7 +45,7 @@
           <b-list-group-item
             class="selected"
             button
-            v-for="section in sortedSections"
+            v-for="section in course.sections"
             :key="section.crn"
             @click.stop="toggleCourseSection(section)"
             :style="{
@@ -66,8 +66,7 @@
           >
             <b-row class="mb-2" align-h="between">
               <b-col cols="auto">
-                {{ section.crn }} - {{ section.sessions[0].section }} -
-                {{ getInstructor(section.sessions) }}
+                {{ section.crn }} - {{ section.sessions[0].section }}
               </b-col>
               <b-col v-if="section.seats_total > 0" cols="auto">
                 <course-section-seats-badge
@@ -100,16 +99,21 @@
 
 <script>
 import "@/typedef";
+
 import { DAY_SHORTNAMES, readableTime, readableDate } from "@/utils";
+
 import { getBackgroundColor, getBorderColor } from "@/services/ColorService";
+
 import {
   faTimes,
   faPlus,
   faChevronDown,
   faChevronUp,
 } from "@fortawesome/free-solid-svg-icons";
+
 import CourseSectionSeatsBadge from "./CourseSectionSeatsBadge.vue";
 import CourseSectionsOpenBadge from "./CourseSectionsOpenBadge.vue";
+
 // Course Listing by default is a collapsible display of a course and its
 // sections and sessions
 // However, there are slots available to customize the information displayed
@@ -124,6 +128,7 @@ export default {
   },
   props: {
     course: Object,
+
     // If true, collapse is open when created
     // If lazyLoadCollapse is true, this is ignored
     openInitial: {
@@ -137,6 +142,7 @@ export default {
       type: Boolean,
       default: false,
     },
+
     // Method name of default action
     // When body of CourseListing is clicked on, the
     // defaultAction is called
@@ -146,6 +152,7 @@ export default {
       type: String,
       default: "toggleCollapse",
     },
+
     //if this is false the add course + button wont appear
     //this is useful for the course explorer
     showAddButton: {
@@ -160,12 +167,15 @@ export default {
       faChevronDown,
       faChevronUp,
       DAY_SHORTNAMES,
+
       // v-model with collapse
       // true or false for open or close respectively collapse
       showCollapse: !this.lazyLoadCollapse && this.openInitial,
+
       // initially false, set to true on first collapse toggle
       // Used for lazy loading
       loaded: false,
+
       showAdd: this.showAddButton,
     };
   },
@@ -174,10 +184,12 @@ export default {
     readableDate,
     getBackgroundColor,
     getBorderColor,
+
     // Just a wrapper, can't call `[defaultAction]()` in html
     callDefaultAction() {
       this[this.defaultAction]();
     },
+
     /**
      * Toggle collapse state
      * @param {boolean} collapse If provided, set collapse state
@@ -186,9 +198,11 @@ export default {
       if (!this.loaded) {
         this.loaded = true;
       }
+
       this.showCollapse =
         collapse !== undefined ? collapse : !this.showCollapse;
     },
+
     /**
      * Toggle course selected state
      * Emits removeCourse and addCourse events
@@ -215,24 +229,11 @@ export default {
         this.$emit("addCourseSection", this.course, section);
       }
     },
+
     //used in the course explorer to show a courses info modal
     showInfoModal() {
       this.$emit("showCourseInfo", this.course);
     },
-    getInstructor(sessions) {
-      for (let i = 0; i < sessions.length; i++) {
-        if (sessions[i].instructor !== "Staff") {
-          return sessions[i].instructor;
-        }
-      }
-    },
-  },
-  computed: {
-    sortedSections() {
-      return this.course.sections
-        .slice()
-        .sort((a, b) => a.sessions[0].section - b.sessions[0].section);
-    },
   },
 };
 </script>

src/web/src/components/DepartmentList.vue

@@ -15,7 +15,7 @@
               params: { subject: major },
             }"
           >
-            <b class="majorShort">{{ major }}</b>
+            <b>{{ major }}</b>
             - {{ getLongName(major) }}
           </b-button>
         </div>
@@ -69,8 +69,4 @@ export default {
   //important because when you click the color changes and thats annoying
   background: rgba(108, 90, 90, 0.15) !important;
 }
-
-.majorShort {
-  color: #3395ff;
-}
 </style>