diff --git a/src/Handler/Profile.hs b/src/Handler/Profile.hs index f615d3899..c67b11abf 100644 --- a/src/Handler/Profile.hs +++ b/src/Handler/Profile.hs @@ -193,7 +193,7 @@ deleteUser duid = do getProfileDataR :: Handler Html getProfileDataR = do (uid, User{..}) <- requireAuthPair - -- mr <- getMessageRender + -- MsgRenderer mr <- getMsgRenderer (admin_rights,lecturer_rights,lecture_corrector,studies) <- runDB $ (,,,) <$> E.select ( E.from $ \(adright `E.InnerJoin` school) -> do @@ -222,14 +222,7 @@ getProfileDataR = do E.where_ $ studyfeat E.^. StudyFeaturesUser E.==. E.val uid E.on $ studyfeat E.^. StudyFeaturesField E.==. studyterms E.^. StudyTermsId E.on $ studyfeat E.^. StudyFeaturesDegree E.==. studydegree E.^. StudyDegreeId - return ( ( studydegree E.^. StudyDegreeName - , studydegree E.^. StudyDegreeKey - ) - , ( studyterms E.^. StudyTermsName - , studyterms E.^. StudyTermsKey - ) - , studyfeat E.^. StudyFeaturesType - , studyfeat E.^. StudyFeaturesSemester) + return (studyfeat, studydegree, studyterms) ) ( (hasRows, ownedCoursesTable) , enrolledCoursesTable diff --git a/src/Utils.hs b/src/Utils.hs index 25142c944..73efb5aa6 100644 --- a/src/Utils.hs +++ b/src/Utils.hs @@ -276,6 +276,21 @@ stepTextCounter text -- Data.Text.groupBy ((==) `on` isDigit) $ Data.Text.pack "12.ProMo Ue3bung00322 34 (H)" -- ["12",".ProMo Ue","3","bung","00322"," ","34"," (H)"] +-- | Ignore warnings for unused variables with a more specific type +notUsedT :: a -> Text +notUsedT = notUsed + + + +------------ +-- Monoid -- +------------ + +-- | Ignore warnings for unused variables +notUsed :: Monoid m => a -> m +notUsed = const mempty + + ------------ -- Tuples -- ------------ diff --git a/templates/profileData.hamlet b/templates/profileData.hamlet index 3360b0afa..341ff3662 100644 --- a/templates/profileData.hamlet +++ b/templates/profileData.hamlet @@ -12,7 +12,7 @@
#{display userIdent}
_{MsgLastLogin}
- $maybe llogin <- lastLogin + $maybe llogin <- lastLogin #{llogin} $nothing _{MsgNever} @@ -45,25 +45,23 @@
-
Abschluss Studiengang + Abschluss Studienart Semester + Aktiv + Update - $forall ((degree, degreeKey),(field, fieldKey),fieldtype,semester) <- studies + + $forall ((Entity _ StudyFeatures{..}), (Entity _ degree), (Entity _ field)) <- studies + $with _ <- notUsedT studyFeaturesUser - - $maybe name <- E.unValue degree - #{display name} - $nothing - #{display degreeKey} - - $maybe name <- E.unValue field - #{display name} - $nothing - #{display fieldKey} - _{E.unValue fieldtype} - #{display semester} + _{field}#{notUsedT studyFeaturesField} + _{degree}#{notUsedT studyFeaturesDegree} + _{studyFeaturesType} + #{display studyFeaturesSemester} + #{hasTickmark studyFeaturesValid} + ^{formatTimeW SelFormatDateTime studyFeaturesUpdated}
$if hasRows