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

Fix nameWidget

Browse Source
This commit is contained in:
SJost 2018-09-18 16:54:33 +02:00
parent a467307998
commit 1095bc8a6f
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
models
View File

@ -4,7 +4,7 @@ User json
matrikelnummer Text Maybe matrikelnummer Text Maybe
email (CI Text) email (CI Text)
displayName Text displayName Text
surname Text surname Text -- always use: nameWidget displayName surname
maxFavourites Int default=12 maxFavourites Int default=12
theme Theme default='Default' theme Theme default='Default'
dateTimeFormat DateTimeFormat "default='%a %d %b %Y %R'" dateTimeFormat DateTimeFormat "default='%a %d %b %Y %R'"

11
src/Handler/Utils.hs
View File

@ -39,9 +39,16 @@ nameWidget :: Text -> Text -> Widget
nameWidget displayName surname nameWidget displayName surname
| null surname = toWidget displayName | null surname = toWidget displayName
| otherwise = case reverse $ T.splitOn surname displayName of | otherwise = case reverse $ T.splitOn surname displayName of
[_notContained] -> [whamlet|#{displayName} (<b .surname>#{surname}</b>)|] [_notContained] -> [whamlet|$newline never
#{displayName} (
<b .surname>#{surname}
)|]
(suffix:prefixes) -> (suffix:prefixes) ->
let prefix = T.intercalate surname $ reverse prefixes let prefix = T.intercalate surname $ reverse prefixes
in [whamlet|#{prefix}<b .surname>#{surname}</b>#{suffix}|] in [whamlet|$newline never
#{prefix}
<b .surname>#{surname}
#{suffix}
|]
[] -> error "Data.Text.splitOn returned empty list in violation of specification." [] -> error "Data.Text.splitOn returned empty list in violation of specification."

2
templates/profile.hamlet
View File

@ -2,7 +2,7 @@
<dl .deflist.profile-dl> <dl .deflist.profile-dl>
<dt .deflist__dt> _{MsgName} <dt .deflist__dt> _{MsgName}
<dd .deflist__dd> #{display userDisplayName} <dd .deflist__dd> ^{nameWidget userDisplayName userSurname}
<dt .deflist__dt> _{MsgMatrikelNr} <dt .deflist__dt> _{MsgMatrikelNr}
<dd .deflist__dd> #{display userMatrikelnummer} <dd .deflist__dd> #{display userMatrikelnummer}
<dt .deflist__dt> _{MsgEMail} <dt .deflist__dt> _{MsgEMail}