exam filter

Author: MatiasSinisalo

src/client/V2/filterContext.tsx

@@ -68,6 +68,8 @@ interface FilterContextType {
   setMultiPeriod: (s: string) => void
   strictFilters: string[]
   setStrictFilters: (s: string[]) => void
+  exam: string
+  setExam: (s: string) => void
 }
 
 export const filterConfigMap = (filters: any) => new Map([
@@ -172,6 +174,11 @@ export const filterConfigMap = (filters: any) => new Map([
     setState: filters.setMultiPeriod,
     superToggle: false
   }],
+  ['exam', {
+    state: filters.exam,
+    setState: filters.setExam,
+    superToggle: false
+  }],
 ])
 
 // Map coordinate keys to filter IDs for recommendation reasons
@@ -269,7 +276,8 @@ export const FilterContextProvider = ({ children }: { children: ReactNode }) =>
   const [mooc, setMooc] = useState('')
   const [collaboration, setCollaboration] = useState('')
   const [multiPeriod, setMultiPeriod] = useState('')
-  const [strictFilters, setStrictFilters] = useState<string[]>(['collaboration'])
+  const [exam, setExam] = useState('0')
+  const [strictFilters, setStrictFilters] = useState<string[]>(['collaboration', 'exam'])
 
 
   const [uiVariant, setUiVariant] = useState([
@@ -355,6 +363,7 @@ export const FilterContextProvider = ({ children }: { children: ReactNode }) =>
       'mooc': getTrueFilterValue(mooc, 'mooc'),
       'collaboration': getTrueFilterValue(collaboration, 'collaboration'),
       'multi-period': getTrueFilterValue(multiPeriod, 'multi-period'),
+      'exam': getTrueFilterValue(exam, 'exam'),
     }
 
     const answerData = Object.fromEntries(
@@ -398,6 +407,7 @@ export const FilterContextProvider = ({ children }: { children: ReactNode }) =>
     mooc,
     collaboration,
     multiPeriod,
+    exam,
     strictFilters,
   ])
 
@@ -459,6 +469,8 @@ export const FilterContextProvider = ({ children }: { children: ReactNode }) =>
         setCollaboration,
         multiPeriod,
         setMultiPeriod,
+        exam,
+        setExam,
         strictFilters,
         setStrictFilters,
       }}

src/client/hooks/useQuestions.tsx

@@ -563,6 +563,22 @@ const useQuestions = () => {
         },
       ],
     },
+    {
+      number: '',
+      mandatory: false,
+      id: 'exam',
+      shortName: t('filterShortName:Exam'),
+      effects: 'none',
+      type: 'multi',
+      variants: [
+        {
+          name: 'default',
+          question: t('form:examQuestion'),
+          skipped: false,
+          options: generateGeneralYesNoOptions(true),
+        },
+      ],
+    },
   ]
   return(questions)
 

src/client/locales/en.ts

@@ -27,6 +27,7 @@ export default {
     'moocQuestion': 'Do you want to search for MOOCs (Massive Open Online Courses)?',
     'collaborationQuestion': 'Show collaboration partner courses',
     'multiPeriodQuestion': 'Search for courses that span multiple periods',
+    'examQuestion': 'Do you want to see courses with an exam as the completion method?',
     'finnish': 'finnish',
     'swedish': 'swedish',
     'english': 'english',
@@ -147,5 +148,6 @@ export default {
     'MOOC': 'MOOC',
     'Yhteistyo': 'Collaboration',
     'Kurssinpituus': 'Course Duration',
+    'Exam': 'Exam',
   }
 }

src/client/locales/fi.ts

@@ -27,6 +27,7 @@ export default {
     'moocQuestion': 'Haluatko etsiä MOOC-kursseja (Massive Open Online Courses)?',
     'collaborationQuestion': 'Näytä yhteistyökumppanien kursseja',
     'multiPeriodQuestion': 'Hae kursseja jotka kestävät usean periodin ajan',
+    'examQuestion': 'Haluatko nähdä kursseilla tentti suoritustapana?',
     'finnish': 'suomi',
     'swedish': 'ruotsi',
     'english': 'englanti',
@@ -147,5 +148,6 @@ export default {
     'MOOC': 'MOOC',
     'Yhteistyo': 'Yhteistyö',
     'Kurssinpituus': 'Kurssin pituus',
+    'Exam': 'Tentti',
   }
 }

src/client/locales/sv.ts

@@ -25,7 +25,8 @@ export default {
     'independentQuestion': 'Jag vill arbeta självständigt eller autonomt.',
     'flexibleQuestion': 'Jag vill ta en kurs med ett flexibelt schema.',
     'moocQuestion': 'Vill du söka efter MOOCs (Massive Open Online Courses)?',
-    'collaborationQuestion': 'Visa samarbetspartnerkurser',    'multiPeriodQuestion': 'Sök kurser som sträcker sig över flera perioder',    'finnish': 'finska',
+    'collaborationQuestion': 'Visa samarbetspartnerkurser',    'multiPeriodQuestion': 'Sök kurser som sträcker sig över flera perioder',
+    'examQuestion': 'Vill du se kurser med tentamen som slutförandemetod?',    'finnish': 'finska',
     'swedish': 'svenska',
     'english': 'engelska',
     'yes': 'Ja',
@@ -141,5 +142,6 @@ export default {
     'MOOC': 'MOOC',
     'Yhteistyo': 'Samarbete',
     'Kurssinpituus': 'Kurslängd',
+    'Exam': 'Tentamen',
   }
 }

src/common/types.ts

@@ -70,6 +70,7 @@ export type CourseCoordinates = {
   studyYear?: string | null;
   studyPeriod?: string[] | null;
   multiPeriod?: number | null;
+  exam?: number | null;
 }
 
 export type UserCoordinates = CourseCoordinates;
@@ -156,6 +157,7 @@ export type AnswerData = {
   'primary-language': string;
   'primary-language-specification': string;
   'multi-period': string;
+  'exam': string;
 };
 
 

src/server/util/pointRecommendCourses.ts

@@ -58,16 +58,6 @@ function calculatePointsForCourse (c: CourseRecommendation, userCoordinates: Use
 //this is different from the distance based sorting where two opposing coordinates seem to counter each other.
 //In this point based one a difference does not punish as much as it gets 'ignored'
 function pointRecommendedCourses(courses: CourseRecommendation[], userCoordinates: UserCoordinates, strictFields: any): CourseRecommendation[]{
-  //we want to ignore all exams except those that are replacement
-  const noExams = courses.filter(c =>
-  {
-    const isExam = c.course.name.fi?.toLowerCase().includes('tentti')
-    const isReplacementCourse = c.coordinates.replacement > 0
-    if(isReplacementCourse || !isExam){
-      return true
-    }
-    return false
-  })
 
   const comparisons = [
     {
@@ -149,9 +139,13 @@ function pointRecommendedCourses(courses: CourseRecommendation[], userCoordinate
       field: 'multiPeriod',
       filterOnFail: strictFields.includes('multi-period'),
     },
+    {
+      field: 'exam',
+      filterOnFail: strictFields.includes('exam'),
+    },
   ]
 
-  const recommendationWithPoints = noExams.map((c) => {
+  const recommendationWithPoints = courses.map((c) => {
     const points = calculatePointsForCourse(c, userCoordinates, comparisons)
 
 

src/server/util/recommender.ts

@@ -78,6 +78,7 @@ function calculateUserCoordinates(answerData: AnswerData) {
     studyYear: readAnswer(answerData, 'study-year'),
     studyPeriod: readAsStringArr(readAnswer(answerData, 'study-period')),
     multiPeriod: commonCoordinateFromAnswerData(readAnswer(answerData, 'multi-period'), correctValue, incorrectValue, null),
+    exam: commonCoordinateFromAnswerData(readAnswer(answerData, 'exam'), correctValue, incorrectValue, null),
   }
   return userCoordinates
 }
@@ -227,7 +228,8 @@ async function calculateCourseCoordinates(course: CourseData, userCoordinates: U
     flexible: hasFlexibleCodeUrn ? correctValue : incorrectValue,
     mooc: hasMoocCodeUrn ? correctValue : incorrectValue,
     collaboration: isCollaboration ? correctValue : incorrectValue,
-    multiPeriod: isMultiPeriod ? correctValue : incorrectValue
+    multiPeriod: isMultiPeriod ? correctValue : incorrectValue,
+    exam: course.name.fi?.toLowerCase().includes('tentti') ? correctValue : incorrectValue,
   }