fraport/fradrive-old
Archived
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(course-teaser): reintroduced courseId and course-teaser.julius

Browse Source
This commit is contained in:
Sarah Vaupel 2019-07-22 15:15:12 +02:00
parent 9a9792578d
commit 3b6e700531
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Handler/Utils/Table/Pagination.hs
View File

@ -851,12 +851,13 @@ dbTable PSValidator{..} dbtable@DBTable{ dbtIdent = dbtIdent'@(toPathPiece -> db
columnCount :: Int64 columnCount :: Int64
columnCount = olength64 $ getColonnade dbtColonnade columnCount = olength64 $ getColonnade dbtColonnade
wRows <- forM rows $ \row' -> let wRows <- forM (zip [0..length rows] rows) $ \(cid, row') -> let
Course{..} = row' ^. c . _entityVal Course{..} = row' ^. c . _entityVal
lecturers = toListOf l row' lecturers = toListOf l row'
courseLecturers = intercalate ", " $ userSurname . entityVal <$> lecturers courseLecturers = intercalate ", " $ userSurname . entityVal <$> lecturers
isRegistered = row' ^. r isRegistered = row' ^. r
courseSchoolName = unSchoolKey courseSchool courseSchoolName = unSchoolKey courseSchool
courseId = tshow cid
in return $(widgetFile "table/course/course-teaser") in return $(widgetFile "table/course/course-teaser")
return $(widgetFile "table/course/colonnade") return $(widgetFile "table/course/colonnade")

2
templates/table/course/course-teaser.hamlet
View File

@ -1,4 +1,4 @@
<div .course-teaser :isRegistered:.course-teaser--registered tabindex='1'> <div .course-teaser :isRegistered:.course-teaser--registered #courseteaser-#{courseId} tabindex='1'>
<div .course-teaser__chevron> <div .course-teaser__chevron>
<div .course-teaser__shorthand>_{courseShorthand} <div .course-teaser__shorthand>_{courseShorthand}
<div .course-teaser__title> <div .course-teaser__title>

2
templates/table/course/course-teaser_old.julius → templates/table/course/course-teaser.julius
View File

@ -3,7 +3,7 @@ var COURSE_TEASER_CHEVRON_CLASS = 'course-chevron';
document.addEventListener('DOMContentLoaded', function() { document.addEventListener('DOMContentLoaded', function() {
var courseTeaserId = #{String courseId}; var courseTeaserId = #{String courseId};
var courseTeaser = document.querySelector('#course-' + courseTeaserId); var courseTeaser = document.querySelector('#courseteaser-' + courseTeaserId);
courseTeaser.addEventListener('click', function(event) { courseTeaser.addEventListener('click', function(event) {
var isLink = event.target.tagName.toLowerCase() === 'a'; var isLink = event.target.tagName.toLowerCase() === 'a';