RenderMessage & Display instanzen für SheetFileType

messages/de.msg

@@ -1,4 +1,4 @@
-SummerTerm year@Integer: Sommersemester #{tshow year}
+  SummerTerm year@Integer: Sommersemester #{tshow year}
 WinterTerm year@Integer: Wintersemester #{tshow year}/#{tshow $ succ year}
 PSLimitNonPositive: “pagesize” muss größer als null sein
 Page n@Int64: #{tshow n}
@@ -70,3 +70,8 @@ Theme: Oberflächen Design
 Favoriten: Anzahl gespeicherter Favoriten
 Plugin: Plugin
 Ident: Identifizierung
+
+SheetExercise: Aufgsabenstellung
+SheetHint: Hinweise
+SheetSolution: Lösung
+SheetMarking: Korrekturhinweise

src/Foundation.hs

@@ -154,6 +154,13 @@ instance RenderMessage UniWorX TermIdentifier where
     Winter -> renderMessage' $ MsgWinterTerm year
     where renderMessage' = renderMessage foundation ls
 
+instance RenderMessage UniWorX SheetFileType where
+  renderMessage foundation ls = \case
+      SheetExercise -> renderMessage' MsgSheetExercise
+      SheetHint     -> renderMessage' MsgSheetHint
+      SheetSolution -> renderMessage' MsgSheetSolution
+      SheetMarking  -> renderMessage' MsgSheetMarking
+    where renderMessage' = renderMessage foundation ls
 
 -- Access Control
 data AccessPredicate

src/Handler/Sheet.hs

@@ -212,7 +212,7 @@ getSShowR tid csh shn = do
         -- return desired columns
         return $ (file E.^. FileTitle, file E.^. FileModified, sheetFile E.^. SheetFileType)
   let colonnadeFiles = mconcat
-        [ sortable (Just "type") "Typ" $ \(_,_, E.Value ftype) -> textCell $ toPathPiece ftype
+        [ sortable (Just "type") "Typ" $ \(_,_, E.Value ftype) -> cell $ [whamlet| _{ftype}|]
         , sortable (Just "path") "Dateiname" $ anchorCell (\(E.Value fName,_,E.Value fType) -> CSheetR tid csh shn (SFileR fType fName))
                                                           (\(E.Value fName,_,_) -> str2widget fName)
         , sortable (Just "time") "Modifikation" $ \(_,E.Value modified,_) -> stringCell $ formatTimeGerWDT (modified :: UTCTime)

src/Model/Types.hs

@@ -75,6 +75,13 @@ instance PathPiece SheetFileType where
   fromPathPiece t =
     lookup (CI.mk t) [(CI.mk $ toPathPiece ty,ty) | ty <- [minBound..maxBound]]
 
+-- $(deriveSimpleWith ''DisplayAble 'display (drop 17) ''SheetFileType)
+instance DisplayAble SheetFileType where -- deprecated, see RenderMessage instance in Foundation
+  display SheetExercise = "Aufgabenstellung"
+  display SheetHint     = "Hinweise"
+  display SheetSolution = "Musterlösung"
+  display SheetMarking  = "Korrekturhinweise"
+
 data ExamStatus = Attended | NoShow | Voided
   deriving (Show, Read, Eq, Ord, Enum, Bounded)
 derivePersistField "ExamStatus"

src/Utils/Common.hs

@@ -55,6 +55,9 @@ altFun perm = lamE pat rhs
 deriveShowWith :: (String -> String) -> Name -> Q [Dec]
 deriveShowWith = deriveSimpleWith ''Show 'show
 
+-- deriveDisplayWith :: (String -> String) -> Name -> Q [Dec]
+-- deriveDisplayWith = deriveSimpleWith ''DisplayAble 'display
+
 deriveSimpleWith ::  Name -> Name -> (String -> String) -> Name -> Q [Dec]
 deriveSimpleWith cls fun strOp ty = do
     (TyConI tyCon)  <- reify ty