Merge branch 'master' of gitlab.uniworx.de:fradrive/fradrive

This commit is contained in:
Steffen Jost 2023-06-06 14:30:02 +00:00
commit fd936ad046
6 changed files with 8 additions and 11 deletions

View File

@ -534,7 +534,7 @@ mkLicenceTable apidStatus dbtIdent aLic apids = do
dbtProj = dbtProjId -- Simple $ \(userAvs, user, qualUsr, quali) -> return (userAvs, user, qualUsr, quali) dbtProj = dbtProjId -- Simple $ \(userAvs, user, qualUsr, quali) -> return (userAvs, user, qualUsr, quali)
dbtColonnade = mconcat dbtColonnade = mconcat
[ dbSelect (applying _2) id $ return . view (resultUserAvs . _userAvsPersonId) [ dbSelect (applying _2) id $ return . view (resultUserAvs . _userAvsPersonId)
-- $ \DBRow{dbrOutput=(_,_,apid,_)} -> return apid -- return . view resultAvsPID -- does not type due to traversal -- (\DBRow{dbrOutput=(_,_,apid,_)} -> return apid -- return . view resultAvsPID) -- does not type due to traversal
, colUserNameLink AdminUserR , colUserNameLink AdminUserR
, sortable (Just "avspersonno") (i18nCell MsgAvsPersonNo) $ \(view resultUserAvs -> a) -> avsPersonNoLinkedCell a , sortable (Just "avspersonno") (i18nCell MsgAvsPersonNo) $ \(view resultUserAvs -> a) -> avsPersonNoLinkedCell a
-- , colUserCompany -- , colUserCompany

View File

@ -734,4 +734,3 @@ getLmsUserR uuid = do
siteLayout heading $ do siteLayout heading $ do
setTitle $ toHtml userDisplayName setTitle $ toHtml userDisplayName
$(widgetFile "lms-user") $(widgetFile "lms-user")
-- $(i18nWidgetFile "lms-user")

View File

@ -8,8 +8,6 @@
module Handler.Utils.Invitations module Handler.Utils.Invitations
( -- * Procedure ( -- * Procedure
--
-- $procedure
IsInvitableJunction(..) IsInvitableJunction(..)
, Invitation' , Invitation'
, _invitationDBData, _invitationTokenData , _invitationDBData, _invitationTokenData

View File

@ -58,7 +58,7 @@ import Control.Monad.Fail
import Utils.Lang (selectLanguage') import Utils.Lang (selectLanguage')
-- $(timeLocaleMap _) :: [Lang] -> TimeLocale -- Usage like so: $(timeLocaleMap _) :: [Lang] -> TimeLocale
timeLocaleMap :: [(Lang, String)] -- ^ Languages and matching locales, first is taken as default timeLocaleMap :: [(Lang, String)] -- ^ Languages and matching locales, first is taken as default
-> ExpQ -> ExpQ
timeLocaleMap [] = fail "Need at least one (language, locale)-pair" timeLocaleMap [] = fail "Need at least one (language, locale)-pair"

View File

@ -35,7 +35,7 @@ import Utils.PathPiece
-- Alternatively uses lenses: "^. _3" projects the 3rd component of an n-tuple for any n >=3, requires import Control.Lens -- Alternatively uses lenses: "^. _3" projects the 3rd component of an n-tuple for any n >=3, requires import Control.Lens
projNI :: Int -> Int -> ExpQ -- generic projection gives I-th element of N-tuple, i.e. snd3 = $(projNI 3 2) --ghci -fth projNI :: Int -> Int -> ExpQ -- generic projection gives I-th element of N-tuple, i.e. snd3 = $(projNI 3 2) --ghci -fth
-- $(projN n m) :: (t1,..,tn) -> tm (for m<=n) -- Usage like so: $(projN n m) :: (t1,..,tn) -> tm (for m<=n)
projNI n i = do projNI n i = do
x <- newName "x" x <- newName "x"
let rhs = varE x let rhs = varE x