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

feat(course-teaser): working link to course pages

Browse Source
This commit is contained in:
Sarah Vaupel 2019-07-22 16:39:24 +02:00
parent 3b6e700531
commit 8a49979ecc
4 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
messages/uniworx/de.msg
View File

@ -152,6 +152,8 @@ NoSuchSchool ssh@SchoolId: Institut #{ssh} gibt es nicht.
NoSuchCourseShorthand csh@CourseShorthand: Kein Kurs mit Kürzel #{csh} bekannt. NoSuchCourseShorthand csh@CourseShorthand: Kein Kurs mit Kürzel #{csh} bekannt.
NoSuchCourse: Keinen passenden Kurs gefunden. NoSuchCourse: Keinen passenden Kurs gefunden.
NoCourseDescription: Zu diesem Kurs ist keine Beschreibung verfügbar.
Sheet: Blatt Sheet: Blatt
SheetList tid@TermId ssh@SchoolId csh@CourseShorthand: #{tid}-#{ssh}-#{csh} Übersicht Übungsblätter SheetList tid@TermId ssh@SchoolId csh@CourseShorthand: #{tid}-#{ssh}-#{csh} Übersicht Übungsblätter
SheetNewHeading tid@TermId ssh@SchoolId csh@CourseShorthand: #{tid}-#{ssh}-#{csh} Neues Übungsblatt anlegen SheetNewHeading tid@TermId ssh@SchoolId csh@CourseShorthand: #{tid}-#{ssh}-#{csh} Neues Übungsblatt anlegen
@ -507,6 +509,8 @@ ForSchools n@Int: für #{pluralDE n "Institut" "Institute"}
UserListTitle: Komprehensive Benutzerliste UserListTitle: Komprehensive Benutzerliste
AccessRightsSaved: Berechtigungsänderungen wurden gespeichert. AccessRightsSaved: Berechtigungsänderungen wurden gespeichert.
LecturersForN n@Int: #{pluralDE n "Dozent" "Dozenten"}
Date: Datum Date: Datum
DateTimeFormat: Datums- und Uhrzeitformat DateTimeFormat: Datums- und Uhrzeitformat
DateFormat: Datumsformat DateFormat: Datumsformat

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

@ -853,8 +853,8 @@ dbTable PSValidator{..} dbtable@DBTable{ dbtIdent = dbtIdent'@(toPathPiece -> db
wRows <- forM (zip [0..length rows] rows) $ \(cid, row') -> let wRows <- forM (zip [0..length rows] rows) $ \(cid, row') -> let
Course{..} = row' ^. c . _entityVal Course{..} = row' ^. c . _entityVal
lecturers = toListOf l row' lecturerUsers = toListOf l row'
courseLecturers = intercalate ", " $ userSurname . entityVal <$> lecturers courseLecturers = userSurname . entityVal <$> lecturerUsers
isRegistered = row' ^. r isRegistered = row' ^. r
courseSchoolName = unSchoolKey courseSchool courseSchoolName = unSchoolKey courseSchool
courseId = tshow cid courseId = tshow cid

2
templates/table/course/colonnade.hamlet
View File

@ -9,4 +9,4 @@ $newline never
$else $else
$forall row <- wRows $forall row <- wRows
<tr .table__row> <tr .table__row>
^{row} ^{row}

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

@ -2,10 +2,15 @@
<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>
<a href=@{AdminTestR}>_{courseName} <a href=@{CourseR courseTerm courseSchool courseShorthand CShowR}>_{courseName}
<div .course-teaser__registration>_{MsgRegistered} <div .course-teaser__registration>_{MsgRegistered}
<div .course-teaser__lecturer-label>_{MsgLecturerFor} <div .course-teaser__lecturer-label>
<div .course-teaser__lecturer-value>_{courseLecturers} _{MsgLecturersForN (length courseLecturers)}
<div .course-teaser__lecturer-value>
<ul .list--inline .list--comma-separated>
$forall lecturer <- courseLecturers
<li>
#{lecturer}
<div .course-teaser__duedate-label>_{MsgRegisterTo} <div .course-teaser__duedate-label>_{MsgRegisterTo}
$maybe regTo <- courseRegisterTo $maybe regTo <- courseRegisterTo
<div .course-teaser__duedate-value>^{formatTimeW SelFormatDateTime regTo} <div .course-teaser__duedate-value>^{formatTimeW SelFormatDateTime regTo}
@ -16,4 +21,4 @@
$maybe desc <- courseDescription $maybe desc <- courseDescription
#{desc} #{desc}
$nothing $nothing
No description available. _{MsgNoCourseDescription}