_{MsgErrorResponseEncrypted} +
+ #{ciphertext} + |] + | otherwise -> plaintext --- let isParent :: Route UniWorX -> Bool --- isParent r = r == (fst parents) + errPage = case err of + NotFound -> [whamlet|_{MsgErrorResponseNotFound}|] + InternalError err' -> encrypted err' [whamlet|#{err'}|] + InvalidArgs errs -> [whamlet| +
_{MsgErrorResponseNotFound}|] + InternalError err' -> encrypted err' [whamlet|
#{err'}|] + InvalidArgs errs -> [whamlet| +
_{MsgErrorResponseNotAuthenticated}|] + PermissionDenied err' -> [whamlet|
#{err'}|] + BadMethod method -> [whamlet|
_{MsgErrorResponseBadMethod (decodeUtf8 method)}|] + fmap toTypedContent . siteLayout (Just . toHtml . mr $ ErrorResponseTitle err) $ do + toWidget + [cassius| + .errMsg + white-space: pre-wrap + font-family: monospace + |] + errPage - let menu = defaultLinks ++ maybe [] pageActions mcurrentRoute - - menuTypes <- filterM (menuItemAccessCallback . menuItem) menu - - isAuth <- isJust <$> maybeAuthId - - -- Lookup Favourites & Theme if possible -- TODO: cache this info in a cookie?! - (favourites', currentTheme) <- do - muid <- maybeAuthPair - case muid of - Nothing -> return ([],userDefaultTheme) - (Just (uid,user)) -> do - favs <- runDB $ E.select . E.from $ \(course `E.InnerJoin` courseFavourite) -> do - E.on (course E.^. CourseId E.==. courseFavourite E.^. CourseFavouriteCourse) - E.where_ (courseFavourite E.^. CourseFavouriteUser E.==. E.val uid) - E.orderBy [ E.asc $ course E.^. CourseShorthand ] - return course - return (favs, userTheme user) - favourites <- forM favourites' $ \(Entity _ c@Course{..}) - -> let - courseRoute = CourseR courseTerm courseSchool courseShorthand CShowR - in (c, courseRoute, ) <$> filterM (menuItemAccessCallback . menuItem) (pageActions courseRoute) - - let highlight :: Route UniWorX -> Bool -- highlight last route in breadcrumbs, favorites taking priority - highlight = let crumbs = mcons mcurrentRoute $ fst <$> reverse parents - navItems = map snd3 favourites ++ map (menuItemRoute . menuItem) menuTypes - highR = find (`elem` navItems) . uncurry (++) $ partition (`elem` map snd3 favourites) crumbs - in \r -> Just r == highR - favouriteTerms :: [TermIdentifier] - favouriteTerms = Set.toDescList $ foldMap (\(Course{..}, _, _) -> Set.singleton $ unTermKey courseTerm) favourites - favouriteTerm :: TermIdentifier -> [(Course, Route UniWorX, [MenuTypes])] - favouriteTerm tid = filter (\(Course{..}, _, _) -> unTermKey courseTerm == tid) favourites - - -- We break up the default layout into two components: - -- default-layout is the contents of the body tag, and - -- default-layout-wrapper is the entire page. Since the final - -- value passed to hamletToRepHtml cannot be a widget, this allows - -- you to use normal widget features in default-layout. - - - let - navbar :: Widget - navbar = $(widgetFile "widgets/navbar") - asidenav :: Widget - asidenav = $(widgetFile "widgets/asidenav") - contentHeadline :: Maybe Widget - contentHeadline = pageHeading =<< mcurrentRoute - breadcrumbs :: Widget - breadcrumbs = $(widgetFile "widgets/breadcrumbs") - pageactionprime :: Widget - pageactionprime = $(widgetFile "widgets/pageactionprime") -- TODO: rename, since it also shows secondary pageActions now - -- functions to determine if there are page-actions (primary or secondary) - isPageActionPrime :: MenuTypes -> Bool - isPageActionPrime (PageActionPrime _) = True - isPageActionPrime (PageActionSecondary _) = True - isPageActionPrime _ = False - hasPageActions :: Bool - hasPageActions = any isPageActionPrime menuTypes - - pc <- widgetToPageContent $ do - addStylesheetRemote "https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,600,800,900|Roboto:300,400,600" - addScript $ StaticR js_zepto_js - addScript $ StaticR js_fetchPolyfill_js - addScript $ StaticR js_urlPolyfill_js - addScript $ StaticR js_featureChecker_js - addScript $ StaticR js_flatpickr_js - addScript $ StaticR js_tabber_js - addStylesheet $ StaticR css_flatpickr_css - addStylesheet $ StaticR css_tabber_css - addStylesheet $ StaticR css_fonts_css - addStylesheet $ StaticR css_fontawesome_css - $(widgetFile "default-layout") - $(widgetFile "standalone/modal") - $(widgetFile "standalone/showHide") - $(widgetFile "standalone/inputs") - $(widgetFile "standalone/tooltip") - $(widgetFile "standalone/tabber") - $(widgetFile "standalone/alerts") - $(widgetFile "standalone/datepicker") - withUrlRenderer $(hamletFile "templates/default-layout-wrapper.hamlet") + defaultLayout = siteLayout Nothing -- The page to be redirected to when authentication is required. authRoute _ = Just $ AuthR LoginR isAuthorized = evalAccess - -- This function creates static content files in the static folder - -- and names them based on a hash of their content. This allows - -- expiration dates to be set far in the future without worry of - -- users receiving stale content. - addStaticContent ext mime content = do - master <- getYesod - let staticDir = appStaticDir $ appSettings master - addStaticContentExternal - minifym - genFileName - staticDir - (StaticR . flip StaticRoute []) - ext - mime - content + addStaticContent ext _mime content = do + UniWorX{appWidgetMemcached, appSettings} <- getYesod + for ((,) <$> appWidgetMemcached <*> appWidgetMemcachedConf appSettings) $ \(mConn, WidgetMemcachedConf{ widgetMemcachedConnectInfo = _, .. }) -> do + let expiry = (maybe 0 ceiling widgetMemcachedExpiry) + touch = liftIO $ Memcached.touch expiry (encodeUtf8 $ pack fileName) mConn + add = liftIO $ Memcached.add zeroBits expiry (encodeUtf8 $ pack fileName) content mConn + absoluteLink = unpack widgetMemcachedBaseUrl fileName + C.catchIf Memcached.isKeyNotFound touch $ \_ -> + C.handleIf Memcached.isKeyExists (\_ -> return ()) add + return . Left $ pack absoluteLink where -- Generate a unique filename based on the content itself, this is used -- for deduplication so a collision resistant hash function is required @@ -655,20 +869,157 @@ instance Yesod UniWorX where -- -- Length of hash is 144 bits instead of MD5's 128, so as to avoid -- padding after base64-conversion - genFileName lbs = Text.unpack - . Text.decodeUtf8 - . Base64.encode - . (convert :: Digest (SHAKE256 144) -> ByteString) - . runIdentity - $ sourceList (Lazy.ByteString.toChunks lbs) $$ sinkHash + fileName = (<.> unpack ext) + . unpack + . decodeUtf8 + . Base64.encode + . (convert :: Digest (SHAKE256 144) -> ByteString) + . runIdentity + $ sourceList (Lazy.ByteString.toChunks content) $$ sinkHash -- What messages should be logged. The following includes all messages when -- in development, and warnings and errors in production. - shouldLog app _source level = appShouldLogAll (appSettings app) || level >= appMinimumLogLevel (appSettings app) + shouldLog _ _ _ = error "Must use shouldLogIO" + shouldLogIO app _source level = do + LogSettings{..} <- readTVarIO $ appLogSettings app + return $ logAll || level >= logMinimumLevel - makeLogger = return . appLogger + makeLogger = readTVarIO . snd . appLogger +siteLayout :: Maybe Html -- ^ Optionally override `pageHeading` + -> Widget -> Handler Html +siteLayout headingOverride widget = do + master <- getYesod + let AppSettings { appUserDefaults = UserDefaultConf{..}, .. } = appSettings master + + isModal <- hasCustomHeader HeaderIsModal + + mcurrentRoute <- getCurrentRoute + + -- Get the breadcrumbs, as defined in the YesodBreadcrumbs instance. + (title, parents) <- breadcrumbs + + -- let isParent :: Route UniWorX -> Bool + -- isParent r = r == (fst parents) + + defaultLinks' <- defaultLinks + let menu :: [MenuItem] + menu = defaultLinks' ++ maybe [] pageActions mcurrentRoute + + menuTypes <- mapM (\x -> (,,) <$> pure x <*> newIdent <*> toTextUrl x) =<< filterM menuItemAccessCallback menu + + isAuth <- isJust <$> maybeAuthId + + -- Lookup Favourites & Theme if possible -- TODO: cache this info in a cookie?! + (favourites', currentTheme) <- do + muid <- maybeAuthPair + case muid of + Nothing -> return ([],userDefaultTheme) + (Just (uid,user)) -> do + favs <- runDB $ E.select . E.from $ \(course `E.InnerJoin` courseFavourite) -> do + E.on (course E.^. CourseId E.==. courseFavourite E.^. CourseFavouriteCourse) + E.where_ (courseFavourite E.^. CourseFavouriteUser E.==. E.val uid) + E.orderBy [ E.asc $ course E.^. CourseShorthand ] + return course + return (favs, userTheme user) + favourites <- forM favourites' $ \(Entity _ c@Course{..}) + -> let courseRoute = CourseR courseTerm courseSchool courseShorthand CShowR + in do + items <- filterM menuItemAccessCallback (pageActions courseRoute) + items' <- forM items $ \i -> (i, ) <$> toTextUrl i + return (c, courseRoute, items') + + mmsgs <- if + | isModal -> getMessages + | otherwise -> do + applySystemMessages + authTagPivots <- fromMaybe Set.empty <$> getSessionJson SessionInactiveAuthTags + forM_ authTagPivots $ + \authTag -> addMessageWidget Info $ modal [whamlet|_{MsgUnauthorizedDisabledTag authTag}|] (Left $ SomeRoute (AuthPredsR, catMaybes [(toPathPiece GetReferer, ) . toPathPiece <$> mcurrentRoute])) + getMessages + + let highlight :: Route UniWorX -> Bool -- highlight last route in breadcrumbs, favorites taking priority + highlight = let crumbs = mcons mcurrentRoute $ fst <$> reverse parents + navItems = map snd3 favourites ++ map (urlRoute . menuItemRoute . view _1) menuTypes + highR = find (`elem` navItems) . uncurry (++) $ partition (`elem` map snd3 favourites) crumbs + in \r -> Just r == highR + favouriteTerms :: [TermIdentifier] + favouriteTerms = Set.toDescList $ foldMap (\(Course{..}, _, _) -> Set.singleton $ unTermKey courseTerm) favourites + favouriteTerm :: TermIdentifier -> [(Course, Route UniWorX, [(MenuItem, Text)])] + favouriteTerm tid = filter (\(Course{..}, _, _) -> unTermKey courseTerm == tid) favourites + + -- We break up the default layout into two components: + -- default-layout is the contents of the body tag, and + -- default-layout-wrapper is the entire page. Since the final + -- value passed to hamletToRepHtml cannot be a widget, this allows + -- you to use normal widget features in default-layout. + + navbar :: Widget + navbar = $(widgetFile "widgets/navbar") + asidenav :: Widget + asidenav = $(widgetFile "widgets/asidenav") + footer :: Widget + footer = $(widgetFile "widgets/footer") + contentHeadline :: Maybe Widget + contentHeadline = (toWidget <$> headingOverride) <|> (pageHeading =<< mcurrentRoute) + breadcrumbsWgt :: Widget + breadcrumbsWgt = $(widgetFile "widgets/breadcrumbs") + pageaction :: Widget + pageaction = $(widgetFile "widgets/pageaction") + -- functions to determine if there are page-actions (primary or secondary) + hasPageActions, hasSecondaryPageActions, hasPrimaryPageActions :: Bool + hasPageActions = hasPrimaryPageActions || hasSecondaryPageActions + hasSecondaryPageActions = any (is _PageActionSecondary) $ toListOf (traverse . _1 . _menuItemType) menuTypes + hasPrimaryPageActions = any (is _PageActionPrime) $ toListOf (traverse . _1 . _menuItemType) menuTypes + + pc <- widgetToPageContent $ do + addScript $ StaticR js_zepto_js + addScript $ StaticR js_fetchPolyfill_js + addScript $ StaticR js_urlPolyfill_js + addScript $ StaticR js_featureChecker_js + addScript $ StaticR js_flatpickr_js + addScript $ StaticR js_tabber_js + addStylesheet $ StaticR css_flatpickr_css + addStylesheet $ StaticR css_tabber_css + addStylesheet $ StaticR css_fonts_css + addStylesheet $ StaticR css_fontawesome_css + $(widgetFile "default-layout") + $(widgetFile "standalone/modal") + $(widgetFile "standalone/showHide") + $(widgetFile "standalone/inputs") + $(widgetFile "standalone/tooltip") + $(widgetFile "standalone/tabber") + $(widgetFile "standalone/alerts") + $(widgetFile "standalone/datepicker") + withUrlRenderer $(hamletFile "templates/default-layout-wrapper.hamlet") + + +applySystemMessages :: (MonadHandler m, HandlerSite m ~ UniWorX) => m () +applySystemMessages = liftHandlerT . runDB . runConduit $ selectSource [] [] .| C.mapM_ applyMessage + where + applyMessage (Entity smId SystemMessage{..}) = maybeT_ $ do + cID <- encrypt smId + void . assertM (== Authorized) . lift $ evalAccessDB (MessageR cID) False + + let sessionKey = "sm-" <> tshow (ciphertext cID) + _ <- assertM isNothing $ lookupSessionJson sessionKey :: MaybeT (YesodDB UniWorX) (Maybe ()) + setSessionJson sessionKey () + + (_, smTrans) <- MaybeT $ getSystemMessage appLanguages smId + let + (summary, content) = case smTrans of + Nothing -> (systemMessageSummary, systemMessageContent) + Just SystemMessageTranslation{..} -> (systemMessageTranslationSummary, systemMessageTranslationContent) + case summary of + Just s -> do + html <- withUrlRenderer [hamlet| + + #{s} + |] + addMessage systemMessageSeverity html + Nothing -> addMessage systemMessageSeverity content + -- Define breadcrumbs. instance YesodBreadcrumbs UniWorX where breadcrumb (AuthR _) = return ("Login" , Just HomeR) @@ -713,6 +1064,12 @@ instance YesodBreadcrumbs UniWorX where -- Others breadcrumb (CorrectionsR) = return ("Korrekturen", Just HomeR) breadcrumb (CorrectionsUploadR) = return ("Hochladen", Just CorrectionsR) + breadcrumb (MessageR _) = do + mayList <- (== Authorized) <$> evalAccess MessageListR False + return $ if + | mayList -> ("Statusmeldung", Just MessageListR) + | otherwise -> ("Statusmeldung", Just HomeR) + breadcrumb (MessageListR) = return ("Statusmeldungen", Just HomeR) breadcrumb _ = return ("Uni2work", Nothing) -- Default is no breadcrumb at all submissionList :: TermId -> CourseShorthand -> SheetName -> UserId -> DB [E.Value SubmissionId] @@ -730,66 +1087,95 @@ submissionList tid csh shn uid = E.select . E.from $ \(course `E.InnerJoin` shee -defaultLinks :: [MenuTypes] -defaultLinks = -- Define the menu items of the header. - [ NavbarAside $ MenuItem - { menuItemLabel = "Home" +defaultLinks :: (MonadHandler m, HandlerSite m ~ UniWorX) => m [MenuItem] +defaultLinks = fmap catMaybes . mapM runMaybeT $ -- Define the menu items of the header. + [ return MenuItem + { menuItemType = NavbarAside + , menuItemLabel = MsgMenuHome , menuItemIcon = Just "home" - , menuItemRoute = HomeR + , menuItemRoute = SomeRoute HomeR + , menuItemModal = False , menuItemAccessCallback' = return True } - , NavbarRight $ MenuItem - { menuItemLabel = "Impressum" + , return MenuItem + { menuItemType = Footer + , menuItemLabel = MsgMenuVersion , menuItemIcon = Just "book" - , menuItemRoute = VersionR + , menuItemRoute = SomeRoute VersionR + , menuItemModal = False , menuItemAccessCallback' = return True } - , NavbarRight $ MenuItem - { menuItemLabel = "Profil" + , do + mCurrentRoute <- getCurrentRoute + + return MenuItem + { menuItemType = NavbarRight + , menuItemLabel = MsgMenuHelp + , menuItemIcon = Just "question" + , menuItemRoute = SomeRoute (HelpR, catMaybes [(toPathPiece GetReferer, ) . toPathPiece <$> mCurrentRoute]) + , menuItemModal = True + , menuItemAccessCallback' = return True + } + , return MenuItem + { menuItemType = NavbarRight + , menuItemLabel = MsgMenuProfile , menuItemIcon = Just "cogs" - , menuItemRoute = ProfileR + , menuItemRoute = SomeRoute ProfileR + , menuItemModal = False , menuItemAccessCallback' = isJust <$> maybeAuthPair } - , NavbarSecondary $ MenuItem - { menuItemLabel = "Login" + , return MenuItem + { menuItemType = NavbarSecondary + , menuItemLabel = MsgMenuLogin , menuItemIcon = Just "sign-in-alt" - , menuItemRoute = AuthR LoginR + , menuItemRoute = SomeRoute $ AuthR LoginR + , menuItemModal = True , menuItemAccessCallback' = isNothing <$> maybeAuthPair } - , NavbarSecondary $ MenuItem - { menuItemLabel = "Logout" + , return MenuItem + { menuItemType = NavbarSecondary + , menuItemLabel = MsgMenuLogout , menuItemIcon = Just "sign-out-alt" - , menuItemRoute = AuthR LogoutR + , menuItemRoute = SomeRoute $ AuthR LogoutR + , menuItemModal = False , menuItemAccessCallback' = isJust <$> maybeAuthPair } - , NavbarAside $ MenuItem - { menuItemLabel = "Kurse" + , return MenuItem + { menuItemType = NavbarAside + , menuItemLabel = MsgMenuCourseList , menuItemIcon = Just "calendar-alt" - , menuItemRoute = CourseListR + , menuItemRoute = SomeRoute CourseListR + , menuItemModal = False , menuItemAccessCallback' = return True } - , NavbarAside $ MenuItem - { menuItemLabel = "Semester" + , return MenuItem + { menuItemType = NavbarAside + , menuItemLabel = MsgMenuTermShow , menuItemIcon = Just "graduation-cap" - , menuItemRoute = TermShowR + , menuItemRoute = SomeRoute TermShowR + , menuItemModal = False , menuItemAccessCallback' = return True } - , NavbarAside $ MenuItem - { menuItemLabel = "Korrekturen" + , return MenuItem + { menuItemType = NavbarAside + , menuItemLabel = MsgMenuCorrections , menuItemIcon = Just "check" - , menuItemRoute = CorrectionsR + , menuItemRoute = SomeRoute CorrectionsR + , menuItemModal = False , menuItemAccessCallback' = return True } - , NavbarAside $ MenuItem - { menuItemLabel = "Benutzer" + , return MenuItem + { menuItemType = NavbarAside + , menuItemLabel = MsgMenuUsers , menuItemIcon = Just "users" - , menuItemRoute = UsersR + , menuItemRoute = SomeRoute UsersR + , menuItemModal = False , menuItemAccessCallback' = return True -- Creates a LOOP: (Authorized ==) <$> isAuthorized UsersR False } ] -pageActions :: Route UniWorX -> [MenuTypes] +pageActions :: Route UniWorX -> [MenuItem] {- Icons: https://fontawesome.com/icons?d=gallery Guideline: use icons without boxes/frames, only non-pro @@ -805,58 +1191,96 @@ pageActions (HomeR) = -- , menuItemAccessCallback' = return True -- } -- , - NavbarAside $ MenuItem - { menuItemLabel = "AdminDemo" + MenuItem + { menuItemType = PageActionPrime + , menuItemLabel = MsgMenuAdminTest , menuItemIcon = Just "screwdriver" - , menuItemRoute = AdminTestR + , menuItemRoute = SomeRoute AdminTestR + , menuItemModal = False + , menuItemAccessCallback' = return True + } + , MenuItem + { menuItemType = PageActionPrime + , menuItemLabel = MsgMenuMessageList + , menuItemIcon = Nothing + , menuItemRoute = SomeRoute MessageListR + , menuItemModal = False + , menuItemAccessCallback' = return True + } + , MenuItem + { menuItemType = PageActionPrime + , menuItemLabel = MsgMenuAdminErrMsg + , menuItemIcon = Nothing + , menuItemRoute = SomeRoute AdminErrMsgR + , menuItemModal = False , menuItemAccessCallback' = return True } ] pageActions (ProfileR) = - [ PageActionPrime $ MenuItem - { menuItemLabel = "Gespeicherte Daten anzeigen" + [ MenuItem + { menuItemType = PageActionPrime + , menuItemLabel = MsgMenuProfileData , menuItemIcon = Just "book" - , menuItemRoute = ProfileDataR + , menuItemRoute = SomeRoute ProfileDataR + , menuItemModal = False , menuItemAccessCallback' = return True } + -- , MenuItem + -- { menuItemType = PageActionSecondary + -- , menuItemLabel = MsgMenuAuthPreds + -- , menuItemIcon = Nothing + -- , menuItemRoute = SomeRoute AuthPredsR + -- , menuItemModal = True + -- , menuItemAccessCallback' = return True + -- } ] pageActions TermShowR = - [ PageActionPrime $ MenuItem - { menuItemLabel = "Neues Semester anlegen" + [ MenuItem + { menuItemType = PageActionPrime + , menuItemLabel = MsgMenuTermCreate , menuItemIcon = Nothing - , menuItemRoute = TermEditR + , menuItemRoute = SomeRoute TermEditR + , menuItemModal = False , menuItemAccessCallback' = return True } ] pageActions (TermCourseListR tid) = - [ PageActionPrime $ MenuItem - { menuItemLabel = "Neuen Kurs anlegen" + [ MenuItem + { menuItemType = PageActionPrime + , menuItemLabel = MsgMenuCourseNew , menuItemIcon = Just "book" - , menuItemRoute = CourseNewR + , menuItemRoute = SomeRoute CourseNewR + , menuItemModal = False , menuItemAccessCallback' = return True } - , PageActionPrime $ MenuItem - { menuItemLabel = "Semster editieren" + , MenuItem + { menuItemType = PageActionPrime + , menuItemLabel = MsgMenuTermEdit , menuItemIcon = Nothing - , menuItemRoute = TermEditExistR tid + , menuItemRoute = SomeRoute $ TermEditExistR tid + , menuItemModal = False , menuItemAccessCallback' = return True } ] pageActions (CourseListR) = - [ PageActionPrime $ MenuItem - { menuItemLabel = "Neuen Kurs anlegen" + [ MenuItem + { menuItemType = PageActionPrime + , menuItemLabel = MsgMenuCourseNew , menuItemIcon = Just "book" - , menuItemRoute = CourseNewR + , menuItemRoute = SomeRoute CourseNewR + , menuItemModal = False , menuItemAccessCallback' = return True } ] pageActions (CourseR tid ssh csh CShowR) = - [ PageActionPrime $ MenuItem - { menuItemLabel = "Übungsblätter" + [ MenuItem + { menuItemType = PageActionPrime + , menuItemLabel = MsgMenuSheetList , menuItemIcon = Nothing - , menuItemRoute = CourseR tid ssh csh SheetListR + , menuItemRoute = SomeRoute $ CourseR tid ssh csh SheetListR + , menuItemModal = False , menuItemAccessCallback' = do --TODO always show for lecturer - let sheetRouteAccess shn = (== Authorized) <$> (isAuthorized (CSheetR tid ssh csh shn SShowR) False) + let sheetRouteAccess shn = (== Authorized) <$> evalAccess (CSheetR tid ssh csh shn SShowR) False muid <- maybeAuthId (sheets,lecturer) <- runDB $ do cid <- getKeyBy404 $ TermSchoolCourseShort tid ssh csh @@ -867,116 +1291,306 @@ pageActions (CourseR tid ssh csh CShowR) = return (sheets,lecturer) or2M (return lecturer) $ anyM sheets sheetRouteAccess } - , PageActionPrime $ MenuItem - { menuItemLabel = "Abgaben" - , menuItemIcon = Nothing - , menuItemRoute = CourseR tid ssh csh CCorrectionsR + ] ++ pageActions (CourseR tid ssh csh SheetListR) ++ + [ MenuItem + { menuItemType = PageActionSecondary + , menuItemLabel = MsgMenuCourseEdit + , menuItemIcon = Nothing + , menuItemRoute = SomeRoute $ CourseR tid ssh csh CEditR + , menuItemModal = False , menuItemAccessCallback' = return True } - , PageActionPrime $ MenuItem - { menuItemLabel = "Neues Übungsblatt anlegen" - , menuItemIcon = Nothing - , menuItemRoute = CourseR tid ssh csh SheetNewR + , MenuItem + { menuItemType = PageActionSecondary + , menuItemLabel = MsgMenuCourseClone + , menuItemIcon = Just "copy" + , menuItemRoute = SomeRoute (CourseNewR, [("tid", toPathPiece tid), ("ssh", toPathPiece ssh), ("csh", toPathPiece csh)]) + , menuItemModal = False , menuItemAccessCallback' = return True } - , PageActionSecondary $ MenuItem - { menuItemLabel = "Kurs editieren" - , menuItemIcon = Nothing - , menuItemRoute = CourseR tid ssh csh CEditR - , menuItemAccessCallback' = return True - } - , PageActionSecondary $ MenuItem - { menuItemLabel = "Neuen Kurs klonen" - , menuItemIcon = Nothing - , menuItemRoute = CourseNewTemplateR (Just tid) (Just ssh) (Just csh) + , MenuItem + { menuItemType = PageActionSecondary + , menuItemLabel = MsgMenuCourseDelete + , menuItemIcon = Just "trash" + , menuItemRoute = SomeRoute $ CourseR tid ssh csh CDeleteR + , menuItemModal = False , menuItemAccessCallback' = return True } ] pageActions (CourseR tid ssh csh SheetListR) = - [ PageActionPrime $ MenuItem - { menuItemLabel = "Neues Übungsblatt anlegen" + [ MenuItem + { menuItemType = PageActionPrime + , menuItemLabel = MsgMenuSheetCurrent , menuItemIcon = Nothing - , menuItemRoute = CourseR tid ssh csh SheetNewR + , menuItemRoute = SomeRoute $ CourseR tid ssh csh SheetCurrentR + , menuItemModal = False + , menuItemAccessCallback' = runDB . maybeT (return False) $ do + void . MaybeT $ sheetCurrent tid ssh csh + return True + } + , MenuItem + { menuItemType = PageActionPrime + , menuItemLabel = MsgMenuSheetOldUnassigned + , menuItemIcon = Nothing + , menuItemRoute = SomeRoute $ CourseR tid ssh csh SheetOldUnassigned + , menuItemModal = False + , menuItemAccessCallback' = runDB . maybeT (return False) $ do + void . MaybeT $ sheetOldUnassigned tid ssh csh + return True + } + , MenuItem + { menuItemType = PageActionPrime + , menuItemLabel = MsgMenuSubmissions + , menuItemIcon = Nothing + , menuItemRoute = SomeRoute $ CourseR tid ssh csh CCorrectionsR + , menuItemModal = False + , menuItemAccessCallback' = return True + } + , MenuItem + { menuItemType = PageActionPrime + , menuItemLabel = MsgMenuCorrectionsOwn + , menuItemIcon = Nothing + , menuItemRoute = SomeRoute (CorrectionsR, [ ("corrections-term" , termToText $ unTermKey tid) + , ("corrections-school", CI.original $ unSchoolKey ssh) + , ("corrections-course", CI.original csh) + ]) + , menuItemModal = False + , menuItemAccessCallback' = do + muid <- maybeAuthId + case muid of + Nothing -> return False + (Just uid) -> do + [E.Value ok] <- runDB . E.select . return . E.exists . E.from $ \(course `E.InnerJoin` sheet `E.InnerJoin` submission) -> do + E.on $ submission E.^. SubmissionSheet E.==. sheet E.^. SheetId + E.on $ sheet E.^. SheetCourse E.==. course E.^. CourseId + E.where_ $ submission E.^. SubmissionRatingBy E.==. E.just (E.val uid) + E.&&. course E.^. CourseTerm E.==. E.val tid + E.&&. course E.^. CourseSchool E.==. E.val ssh + E.&&. course E.^. CourseShorthand E.==. E.val csh + return ok + } + , MenuItem + { menuItemType = PageActionPrime + , menuItemLabel = MsgMenuSheetNew + , menuItemIcon = Nothing + , menuItemRoute = SomeRoute $ CourseR tid ssh csh SheetNewR + , menuItemModal = False , menuItemAccessCallback' = return True } ] pageActions (CSheetR tid ssh csh shn SShowR) = - [ PageActionPrime $ MenuItem - { menuItemLabel = "Abgabe anlegen" + [ MenuItem + { menuItemType = PageActionPrime + , menuItemLabel = MsgMenuSubmissionNew , menuItemIcon = Nothing - , menuItemRoute = CSheetR tid ssh csh shn SubmissionNewR + , menuItemRoute = SomeRoute $ CSheetR tid ssh csh shn SubmissionNewR + , menuItemModal = True , menuItemAccessCallback' = runDB . maybeT (return False) $ do uid <- MaybeT $ liftHandlerT maybeAuthId submissions <- lift $ submissionList tid csh shn uid guard $ null submissions return True } - , PageActionPrime $ MenuItem - { menuItemLabel = "Abgabe ansehen" + , MenuItem + { menuItemType = PageActionPrime + , menuItemLabel = MsgMenuSubmissionOwn , menuItemIcon = Nothing - , menuItemRoute = CSheetR tid ssh csh shn SubmissionOwnR + , menuItemRoute = SomeRoute $ CSheetR tid ssh csh shn SubmissionOwnR + , menuItemModal = False , menuItemAccessCallback' = runDB . maybeT (return False) $ do uid <- MaybeT $ liftHandlerT maybeAuthId submissions <- lift $ submissionList tid csh shn uid guard . not $ null submissions return True } - , PageActionPrime $ MenuItem - { menuItemLabel = "Korrektoren" + , MenuItem + { menuItemType = PageActionPrime + , menuItemLabel = MsgMenuCorrectionsOwn , menuItemIcon = Nothing - , menuItemRoute = CSheetR tid ssh csh shn SCorrR + , menuItemRoute = SomeRoute (CorrectionsR, [ ("corrections-term" , termToText $ unTermKey tid) + , ("corrections-school", CI.original $ unSchoolKey ssh) + , ("corrections-course", CI.original csh) + , ("corrections-sheet" , CI.original shn) + ]) + , menuItemModal = False + , menuItemAccessCallback' = (== Authorized) <$> evalAccessCorrector tid ssh csh + } + , MenuItem + { menuItemType = PageActionPrime + , menuItemLabel = MsgMenuCorrectors + , menuItemIcon = Nothing + , menuItemRoute = SomeRoute $ CSheetR tid ssh csh shn SCorrR + , menuItemModal = False , menuItemAccessCallback' = return True } - , PageActionPrime $ MenuItem - { menuItemLabel = "Abgaben" + , MenuItem + { menuItemType = PageActionPrime + , menuItemLabel = MsgMenuSubmissions , menuItemIcon = Nothing - , menuItemRoute = CSheetR tid ssh csh shn SSubsR + , menuItemRoute = SomeRoute $ CSheetR tid ssh csh shn SSubsR + , menuItemModal = False , menuItemAccessCallback' = return True } - , PageActionPrime $ MenuItem - { menuItemLabel = "Blatt Editieren" + , MenuItem + { menuItemType = PageActionPrime + , menuItemLabel = MsgMenuSheetEdit , menuItemIcon = Nothing - , menuItemRoute = CSheetR tid ssh csh shn SEditR + , menuItemRoute = SomeRoute $ CSheetR tid ssh csh shn SEditR + , menuItemModal = False + , menuItemAccessCallback' = return True + } + , MenuItem + { menuItemType = PageActionSecondary + , menuItemLabel = MsgMenuSheetClone + , menuItemIcon = Just "copy" + , menuItemRoute = SomeRoute (CourseR tid ssh csh SheetNewR, [("shn", toPathPiece shn)]) + , menuItemModal = False + , menuItemAccessCallback' = return True + } + , MenuItem + { menuItemType = PageActionSecondary + , menuItemLabel = MsgMenuSheetDelete + , menuItemIcon = Just "trash" + , menuItemRoute = SomeRoute $ CSheetR tid ssh csh shn SDelR + , menuItemModal = False , menuItemAccessCallback' = return True } ] pageActions (CSheetR tid ssh csh shn SSubsR) = - [ PageActionPrime $ MenuItem - { menuItemLabel = "Korrektoren" + [ MenuItem + { menuItemType = PageActionPrime + , menuItemLabel = MsgMenuCorrectors , menuItemIcon = Nothing - , menuItemRoute = CSheetR tid ssh csh shn SCorrR + , menuItemRoute = SomeRoute $ CSheetR tid ssh csh shn SCorrR + , menuItemModal = False , menuItemAccessCallback' = return True } ] pageActions (CSubmissionR tid ssh csh shn cid SubShowR) = - [ PageActionPrime $ MenuItem - { menuItemLabel = "Korrektur" + [ MenuItem + { menuItemType = PageActionPrime + , menuItemLabel = MsgMenuCorrection , menuItemIcon = Nothing - , menuItemRoute = CSubmissionR tid ssh csh shn cid CorrectionR + , menuItemRoute = SomeRoute $ CSubmissionR tid ssh csh shn cid CorrectionR + , menuItemModal = False + , menuItemAccessCallback' = return True + } + , MenuItem + { menuItemType = PageActionPrime + , menuItemLabel = MsgCorrectorAssignTitle + , menuItemIcon = Nothing + , menuItemRoute = SomeRoute $ CSubmissionR tid ssh csh shn cid SAssignR + , menuItemModal = True + , menuItemAccessCallback' = return True + } + , MenuItem + { menuItemType = PageActionSecondary + , menuItemLabel = MsgMenuSubmissionDelete + , menuItemIcon = Just "trash" + , menuItemRoute = SomeRoute $ CSubmissionR tid ssh csh shn cid SubDelR + , menuItemModal = False + , menuItemAccessCallback' = return True + } + ] +pageActions (CSubmissionR tid ssh csh shn cid CorrectionR) = + [ MenuItem + { menuItemType = PageActionSecondary + , menuItemLabel = MsgMenuSubmissionDelete + , menuItemIcon = Nothing + , menuItemRoute = SomeRoute $ CSubmissionR tid ssh csh shn cid SubDelR + , menuItemModal = False , menuItemAccessCallback' = return True } ] pageActions (CSheetR tid ssh csh shn SCorrR) = - [ PageActionPrime $ MenuItem - { menuItemLabel = "Abgaben" + [ MenuItem + { menuItemType = PageActionPrime + , menuItemLabel = MsgMenuSubmissions , menuItemIcon = Nothing - , menuItemRoute = CSheetR tid ssh csh shn SSubsR + , menuItemRoute = SomeRoute $ CSheetR tid ssh csh shn SSubsR + , menuItemModal = False , menuItemAccessCallback' = return True } - , PageActionSecondary $ MenuItem - { menuItemLabel = "Edit " <> (CI.original shn) + , MenuItem + { menuItemType = PageActionSecondary + , menuItemLabel = MsgMenuSheetEdit , menuItemIcon = Nothing - , menuItemRoute = CSheetR tid ssh csh shn SEditR + , menuItemRoute = SomeRoute $ CSheetR tid ssh csh shn SEditR + , menuItemModal = False , menuItemAccessCallback' = return True } ] pageActions (CorrectionsR) = - [ PageActionPrime $ MenuItem - { menuItemLabel = "Korrekturen hochladen" + [ MenuItem + { menuItemType = PageActionPrime + , menuItemLabel = MsgMenuCorrectionsUpload , menuItemIcon = Nothing - , menuItemRoute = CorrectionsUploadR + , menuItemRoute = SomeRoute CorrectionsUploadR + , menuItemModal = True , menuItemAccessCallback' = return True } + , MenuItem + { menuItemType = PageActionPrime + , menuItemLabel = MsgMenuCorrectionsCreate + , menuItemIcon = Nothing + , menuItemRoute = SomeRoute CorrectionsCreateR + , menuItemModal = False + , menuItemAccessCallback' = runDB . maybeT (return False) $ do + uid <- MaybeT $ liftHandlerT maybeAuthId + [E.Value sheetCount] <- lift . E.select . E.from $ \(course `E.InnerJoin` sheet) -> do + E.on $ course E.^. CourseId E.==. sheet E.^. SheetCourse + let + isCorrector' = E.exists . E.from $ \sheetCorrector -> E.where_ + $ sheetCorrector E.^. SheetCorrectorUser E.==. E.val uid + E.&&. sheetCorrector E.^. SheetCorrectorSheet E.==. sheet E.^. SheetId + isLecturer = E.exists . E.from $ \lecturer -> E.where_ + $ lecturer E.^. LecturerUser E.==. E.val uid + E.&&. lecturer E.^. LecturerCourse E.==. course E.^. CourseId + E.where_ $ sheet E.^. SheetSubmissionMode E.==. E.val CorrectorSubmissions + E.&&. ( isCorrector' E.||. isLecturer ) + return E.countRows + return $ (sheetCount :: Int) /= 0 + } + , MenuItem + { menuItemType = PageActionPrime + , menuItemLabel = MsgMenuCorrectionsGrade + , menuItemIcon = Nothing + , menuItemRoute = SomeRoute CorrectionsGradeR + , menuItemModal = False + , menuItemAccessCallback' = return True + } + ] +pageActions (CorrectionsGradeR) = + [ MenuItem + { menuItemType = PageActionPrime + , menuItemLabel = MsgMenuCorrectionsUpload + , menuItemIcon = Nothing + , menuItemRoute = SomeRoute CorrectionsUploadR + , menuItemModal = True + , menuItemAccessCallback' = return True + } + , MenuItem + { menuItemType = PageActionPrime + , menuItemLabel = MsgMenuCorrectionsCreate + , menuItemIcon = Nothing + , menuItemRoute = SomeRoute CorrectionsCreateR + , menuItemModal = False + , menuItemAccessCallback' = runDB . maybeT (return False) $ do + uid <- MaybeT $ liftHandlerT maybeAuthId + [E.Value sheetCount] <- lift . E.select . E.from $ \(course `E.InnerJoin` sheet) -> do + E.on $ course E.^. CourseId E.==. sheet E.^. SheetCourse + let + isCorrector' = E.exists . E.from $ \sheetCorrector -> E.where_ + $ sheetCorrector E.^. SheetCorrectorUser E.==. E.val uid + E.&&. sheetCorrector E.^. SheetCorrectorSheet E.==. sheet E.^. SheetId + isLecturer = E.exists . E.from $ \lecturer -> E.where_ + $ lecturer E.^. LecturerUser E.==. E.val uid + E.&&. lecturer E.^. LecturerCourse E.==. course E.^. CourseId + E.where_ $ sheet E.^. SheetSubmissionMode E.==. E.val CorrectorSubmissions + E.&&. ( isCorrector' E.||. isLecturer ) + return E.countRows + return $ (sheetCount :: Int) /= 0 + } ] pageActions _ = [] @@ -995,8 +1609,12 @@ pageHeading (AdminTestR) = Just $ [whamlet|Internal Code Demonstration Page|] pageHeading (AdminUserR _) = Just $ [whamlet|User Display for Admin|] +pageHeading (AdminErrMsgR) + = Just $ i18nHeading MsgErrMsgHeading pageHeading (VersionR) = Just $ i18nHeading MsgImpressumHeading +pageHeading (HelpR) + = Just $ i18nHeading MsgHelpRequest pageHeading ProfileR = Just $ i18nHeading MsgProfileHeading @@ -1048,7 +1666,7 @@ pageHeading (CSheetR tid ssh csh shn SEditR) = Just $ i18nHeading $ MsgSheetEditHead tid ssh csh shn pageHeading (CSheetR tid ssh csh shn SDelR) = Just $ i18nHeading $ MsgSheetDelHead tid ssh csh shn -pageHeading (CSheetR tid ssh csh shn SSubsR) +pageHeading (CSheetR _tid _ssh _csh shn SSubsR) = Just $ i18nHeading $ MsgSubmissionsSheet shn pageHeading (CSheetR tid ssh csh shn SubmissionNewR) = Just $ i18nHeading $ MsgSubmissionEditHead tid ssh csh shn @@ -1060,7 +1678,7 @@ pageHeading (CSubmissionR tid ssh csh shn _ SubShowR) -- TODO: Rethink this one! pageHeading (CSubmissionR tid ssh csh shn cid CorrectionR) = Just $ i18nHeading $ MsgCorrectionHead tid ssh csh shn cid -- (CSubmissionR tid csh shn cid SubDownloadR) -- just a download -pageHeading (CSheetR tid ssh csh shn SCorrR) +pageHeading (CSheetR _tid _ssh _csh shn SCorrR) = Just $ i18nHeading $ MsgCorrectorsHead shn -- (CSheetR tid ssh csh shn SFileR) -- just for Downloads @@ -1068,6 +1686,14 @@ pageHeading CorrectionsR = Just $ i18nHeading MsgCorrectionsTitle pageHeading CorrectionsUploadR = Just $ i18nHeading MsgCorrUpload +pageHeading CorrectionsCreateR + = Just $ i18nHeading MsgCorrCreate +pageHeading CorrectionsGradeR + = Just $ i18nHeading MsgCorrGrade +pageHeading (MessageR _) + = Just $ i18nHeading MsgSystemMessageHeading +pageHeading MessageListR + = Just $ i18nHeading MsgSystemMessageListHeading -- TODO: add headings for more single course- and single term-pages pageHeading _ @@ -1080,6 +1706,7 @@ routeNormalizers = , ncSchool , ncCourse , ncSheet + , verifySubmission ] where normalizeRender route = route <$ do @@ -1117,8 +1744,17 @@ routeNormalizers = Entity _ Sheet{..} <- MaybeT . lift . getBy $ CourseSheet cid shn hasChanged shn sheetName return $ CSheetR tid ssh csh sheetName subRoute + verifySubmission = maybeOrig $ \route -> do + CSubmissionR _tid _ssh _csh _shn cID sr <- return route + sId <- decrypt cID + Submission{submissionSheet} <- lift . lift $ get404 sId + Sheet{sheetCourse, sheetName} <- lift . lift $ get404 submissionSheet + Course{courseTerm, courseSchool, courseShorthand} <- lift . lift $ get404 sheetCourse + let newRoute = CSubmissionR courseTerm courseSchool courseShorthand sheetName cID sr + tell . Any $ route /= newRoute + return newRoute + - -- How to run database actions. instance YesodPersist UniWorX where type YesodPersistBackend UniWorX = SqlBackend @@ -1176,11 +1812,11 @@ instance YesodAuth UniWorX where acceptExisting = maybe (UserError $ IdentifierNotFound credsIdent) (Authenticated . entityKey) <$> getBy uAuth $logDebugS "auth" $ tshow Creds{..} - AppSettings{ appUserDefaults = UserDefaultConf{..}, ..} <- getsYesod appSettings + UniWorX{ appSettings = AppSettings{ appUserDefaults = UserDefaultConf{..}, ..}, .. } <- getYesod - flip catches excHandlers $ case appLdapConf of - Just ldapConf -> fmap (either id id) . runExceptT $ do - ldapData <- campusUser ldapConf $ Creds credsPlugin (CI.original userIdent) credsExtra + flip catches excHandlers $ case (,) <$> appLdapConf <*> appLdapPool of + Just (ldapConf, ldapPool) -> fmap (either id id) . runExceptT $ do + ldapData <- campusUser ldapConf ldapPool $ Creds credsPlugin (CI.original userIdent) credsExtra $logDebugS "LDAP" $ "Successful LDAP lookup: " <> tshow ldapData let @@ -1188,7 +1824,7 @@ instance YesodAuth UniWorX where userEmail' = lookup (Attr "mail") ldapData userDisplayName' = lookup (Attr "displayName") ldapData userSurname' = lookup (Attr "sn") ldapData - + userAuthentication | isPWHash = error "PWHash should only work for users that are already known" | otherwise = AuthLDAP @@ -1222,12 +1858,14 @@ instance YesodAuth UniWorX where let newUser = User - { userMaxFavourites = userDefaultMaxFavourites - , userTheme = userDefaultTheme - , userDateTimeFormat = userDefaultDateTimeFormat - , userDateFormat = userDefaultDateFormat - , userTimeFormat = userDefaultTimeFormat - , userDownloadFiles = userDefaultDownloadFiles + { userMaxFavourites = userDefaultMaxFavourites + , userTheme = userDefaultTheme + , userDateTimeFormat = userDefaultDateTimeFormat + , userDateFormat = userDefaultDateFormat + , userTimeFormat = userDefaultTimeFormat + , userDownloadFiles = userDefaultDownloadFiles + , userNotificationSettings = def + , userMailLanguages = def , .. } userUpdate = [ UserMatrikelnummer =. userMatrikelnummer @@ -1262,14 +1900,16 @@ instance YesodAuth UniWorX where where insertMaybe key val = get key >>= maybe (insert_ val) (\_ -> return ()) - authPlugins (appSettings -> AppSettings{..}) = catMaybes - [ campusLogin <$> appLdapConf + authPlugins (UniWorX{ appSettings = AppSettings{..}, appLdapPool }) = catMaybes + [ campusLogin <$> appLdapConf <*> appLdapPool , Just . hashLogin $ pwHashAlgorithm appAuthPWHash , dummyLogin <$ guard appAuthDummyLogin ] authHttpManager = getHttpManager + renderAuthMessage _ _ = Auth.germanMessage -- TODO + instance YesodAuthPersist UniWorX -- Useful when writing code that is re-usable outside of the Handler context. @@ -1279,13 +1919,37 @@ instance HasHttpManager UniWorX where getHttpManager = appHttpManager unsafeHandler :: UniWorX -> Handler a -> IO a -unsafeHandler = Unsafe.fakeHandlerGetLogger appLogger +unsafeHandler f h = do + logger <- makeLogger f + Unsafe.fakeHandlerGetLogger (const logger) f h + + +instance YesodMail UniWorX where + defaultFromAddress = getsYesod $ appMailFrom . appSettings + mailObjectIdDomain = getsYesod $ appMailObjectDomain . appSettings + mailVerp = getsYesod $ appMailVerp . appSettings + mailDateTZ = return appTZ + mailSmtp act = do + pool <- maybe (throwM MailNotAvailable) return =<< getsYesod appSmtpPool + withResource pool act + mailT ctx mail = defMailT ctx $ do + void setMailObjectId + setDateCurrent + replaceMailHeader "Auto-Submitted" $ Just "auto-generated" + + ret <- mail + + setMailSmtpData + return ret instance (MonadThrow m, MonadHandler m, HandlerSite m ~ UniWorX) => MonadCrypto m where type MonadCryptoKey m = CryptoIDKey cryptoIDKey f = getsYesod appCryptoIDKey >>= f +instance {-# OVERLAPPING #-} (Monad m, MonadHandler m, HandlerSite m ~ UniWorX) => MonadSecretBox m where + secretBoxKey = getsYesod appSecretBoxKey + -- Note: Some functionality previously present in the scaffolding has been -- moved to documentation in the Wiki. Following are some hopefully helpful -- links: diff --git a/src/Handler/Admin.hs b/src/Handler/Admin.hs index 156961629..17bc943b9 100644 --- a/src/Handler/Admin.hs +++ b/src/Handler/Admin.hs @@ -1,24 +1,19 @@ -{-# LANGUAGE RecordWildCards #-} -{-# LANGUAGE NoImplicitPrelude #-} -{-# LANGUAGE OverloadedStrings #-} -{-# LANGUAGE ViewPatterns #-} -{-# LANGUAGE TemplateHaskell #-} -{-# LANGUAGE QuasiQuotes #-} -{-# LANGUAGE MultiParamTypeClasses #-} -{-# LANGUAGE TypeFamilies #-} -{-# LANGUAGE FlexibleContexts #-} - module Handler.Admin where import Import import Handler.Utils +import Jobs + +import Data.Aeson.Encode.Pretty (encodePrettyToTextBuilder) + +import Control.Monad.Trans.Except -- import Data.Time -- import qualified Data.Text as T -- import Data.Function ((&)) -- import Yesod.Form.Bootstrap3 -import Web.PathPieces (showToPathPiece, readFromPathPiece) +import Database.Persist.Sql (fromSqlKey) -- import Colonnade hiding (fromMaybe) -- import Yesod.Colonnade @@ -26,46 +21,96 @@ import Web.PathPieces (showToPathPiece, readFromPathPiece) -- import qualified Data.UUID.Cryptographic as UUID -- BEGIN - Buttons needed only here -data CreateButton = CreateMath | CreateInf -- Dummy for Example - deriving (Enum, Eq, Ord, Bounded, Read, Show) +data ButtonCreate = CreateMath | CreateInf -- Dummy for Example + deriving (Enum, Eq, Ord, Bounded, Read, Show, Generic, Typeable) +instance Universe ButtonCreate +instance Finite ButtonCreate -instance PathPiece CreateButton where -- for displaying the button only, not really for paths - toPathPiece = showToPathPiece - fromPathPiece = readFromPathPiece +nullaryPathPiece ''ButtonCreate camelToPathPiece -instance Button UniWorX CreateButton where - label CreateMath = [whamlet|Mathematik|] - label CreateInf = "Informatik" +instance Button UniWorX ButtonCreate where + btnLabel CreateMath = [whamlet|Mathematik|] + btnLabel CreateInf = "Informatik" - cssClass CreateMath = BCInfo - cssClass CreateInf = BCPrimary + btnClasses CreateMath = [BCIsButton, BCInfo] + btnClasses CreateInf = [BCIsButton, BCPrimary] -- END Button needed here +emailTestForm :: AForm (HandlerT UniWorX IO) (Email, MailContext) +emailTestForm = (,) + <$> areq emailField (fslI MsgMailTestFormEmail) Nothing + <*> ( MailContext + <$> (MailLanguages <$> areq (reorderField appLanguagesOpts) (fslI MsgMailTestFormLanguages) Nothing) + <*> (toMailDateTimeFormat + <$> areq (selectField $ dateTimeFormatOptions SelFormatDateTime) (fslI MsgDateTimeFormat) Nothing + <*> areq (selectField $ dateTimeFormatOptions SelFormatDate) (fslI MsgDateFormat) Nothing + <*> areq (selectField $ dateTimeFormatOptions SelFormatTime) (fslI MsgTimeFormat) Nothing + ) + ) + <* submitButton + where + toMailDateTimeFormat dt d t = \case + SelFormatDateTime -> dt + SelFormatDate -> d + SelFormatTime -> t -getAdminTestR :: Handler Html -- Demo Page. Referenzimplementierungen sollte hier gezeigt werden! -getAdminTestR = do - (btnWdgt, btnEnctype) <- generateFormPost (buttonForm :: Form CreateButton) - defaultLayout $ do - -- setTitle "Uni2work Admin Testpage" - $(widgetFile "adminTest") -postAdminTestR :: Handler Html +getAdminTestR, postAdminTestR :: Handler Html -- Demo Page. Referenzimplementierungen sollte hier gezeigt werden! +getAdminTestR = postAdminTestR postAdminTestR = do - ((btnResult,_), _) <- runFormPost $ buttonForm + ((btnResult, btnWdgt), btnEnctype) <- runFormPost $ identifyForm "buttons" (buttonForm :: Form ButtonCreate) case btnResult of (FormSuccess CreateInf) -> addMessage Info "Informatik-Knopf gedrückt" (FormSuccess CreateMath) -> addMessage Warning "Knopf Mathematik erkannt" + FormMissing -> return () _other -> addMessage Warning "KEIN Knopf erkannt" - getAdminTestR + + ((emailResult, emailWidget), emailEnctype) <- runFormPost . identifyForm "email" $ renderAForm FormStandard emailTestForm + case emailResult of + (FormSuccess (email, ls)) -> do + jId <- runDB $ do + jId <- queueJob $ JobSendTestEmail email ls + addMessage Success [shamlet|Email-test gestartet (Job ##{tshow (fromSqlKey jId)})|] + return jId + writeJobCtl $ JobCtlPerform jId + FormMissing -> return () + (FormFailure errs) -> forM_ errs $ addMessage Error . toHtml + + let emailWidget' = [whamlet| + + ^{emailWidget} + |] + + defaultLayout $ + -- setTitle "Uni2work Admin Testpage" + $(widgetFile "adminTest") getAdminUserR :: CryptoUUIDUser -> Handler Html getAdminUserR uuid = do uid <- decrypt uuid User{..} <- runDB $ get404 uid - defaultLayout $ + defaultLayout [whamlet| TODO Admin Page for User ^{nameWidget userDisplayName userSurname} |] +getAdminErrMsgR, postAdminErrMsgR :: Handler Html +getAdminErrMsgR = postAdminErrMsgR +postAdminErrMsgR = do + ((ctResult, ctView), ctEncoding) <- runFormPost . renderAForm FormStandard $ + (unTextarea <$> areq textareaField (fslpI MsgErrMsgCiphertext "Ciphertext") Nothing) + <* submitButton + + plaintext <- formResultMaybe ctResult $ exceptT (\err -> Nothing <$ addMessageI Error err) (return . Just) . (encodedSecretBoxOpen :: Text -> ExceptT EncodedSecretBoxException Handler Value) + + defaultLayout + [whamlet| + $maybe t <- plaintext + + #{encodePrettyToTextBuilder t} + + + ^{ctView} + |] diff --git a/src/Handler/Common.hs b/src/Handler/Common.hs index 2119bfb06..54eddd1c3 100644 --- a/src/Handler/Common.hs +++ b/src/Handler/Common.hs @@ -1,13 +1,8 @@ -{-# LANGUAGE NoImplicitPrelude #-} -{-# LANGUAGE OverloadedStrings #-} -{-# LANGUAGE TemplateHaskell #-} -{-# LANGUAGE MultiParamTypeClasses #-} -{-# LANGUAGE TypeFamilies #-} -- | Common handler functions. module Handler.Common where import Data.FileEmbed (embedFile) -import Import +import Import hiding (embedFile) -- These handlers embed files in the executable at compile time to avoid a -- runtime dependency, and for efficiency. @@ -15,8 +10,8 @@ import Import getFaviconR :: Handler TypedContent getFaviconR = do cacheSeconds $ 60 * 60 * 24 * 30 -- cache for a month return $ TypedContent "image/x-icon" - $ toContent $(embedFile "embedded/favicon.ico") + $ toContent $(embedFile "static/favicon.ico") getRobotsR :: Handler TypedContent getRobotsR = return $ TypedContent typePlain - $ toContent $(embedFile "embedded/robots.txt") + $ toContent $(embedFile "static/robots.txt") diff --git a/src/Handler/Corrections.hs b/src/Handler/Corrections.hs index 94aab5738..1fece3778 100644 --- a/src/Handler/Corrections.hs +++ b/src/Handler/Corrections.hs @@ -1,43 +1,35 @@ -{-# LANGUAGE NoImplicitPrelude #-} -{-# LANGUAGE MultiWayIf, LambdaCase #-} -{-# LANGUAGE OverloadedStrings #-} -{-# LANGUAGE OverloadedLists #-} -{-# LANGUAGE PartialTypeSignatures #-} -{-# LANGUAGE RecordWildCards, NamedFieldPuns, TupleSections #-} -{-# LANGUAGE TemplateHaskell #-} -{-# LANGUAGE QuasiQuotes #-} -{-# LANGUAGE MultiParamTypeClasses #-} -{-# LANGUAGE TypeFamilies #-} -{-# LANGUAGE RankNTypes #-} -{-# LANGUAGE FlexibleContexts #-} -{-# LANGUAGE FlexibleInstances #-} -{-# LANGUAGE TypeOperators #-} -{-# LANGUAGE ViewPatterns #-} -{-# LANGUAGE ScopedTypeVariables #-} -{-# LANGUAGE MultiWayIf #-} - module Handler.Corrections where import Import -- import System.FilePath (takeFileName) +import Jobs import Handler.Utils import Handler.Utils.Submission import Handler.Utils.Table.Cells +import Handler.Utils.SheetType +import Handler.Utils.Delete -- import Handler.Utils.Zip +import Utils.Lens + +import Data.List (nub) import Data.Set (Set) import qualified Data.Set as Set -import Data.Map (Map) +import Data.Map (Map, (!)) import qualified Data.Map as Map import qualified Data.Text as Text +import qualified Data.CaseInsensitive as CI +import Data.CaseInsensitive (CI) + +import Data.Semigroup (Sum(..)) +import Data.Monoid (All(..)) -- import Data.Time --- import qualified Data.Text as T -- import Data.Function ((&)) -- -import Colonnade hiding (fromMaybe, singleton, bool) +-- import Colonnade hiding (fromMaybe, singleton, bool) -- import Yesod.Colonnade -- -- import qualified Data.UUID.Cryptographic as UUID @@ -46,51 +38,67 @@ import Colonnade hiding (fromMaybe, singleton, bool) import qualified Database.Esqueleto as E -- import qualified Database.Esqueleto.Internal.Sql as E -import Control.Lens -- import Control.Monad.Writer (MonadWriter(..), execWriterT) -- import Network.Mime -import Web.PathPieces - import Text.Hamlet (ihamletFile) -import Text.Blaze.Html (preEscapedToHtml) import Database.Persist.Sql (updateWhereCount) import Data.List (genericLength) +import Control.Monad.Trans.Writer (WriterT(..), runWriter, execWriterT) +import Control.Monad.Trans.Reader (mapReaderT) + +import Control.Monad.Trans.State (State, runState) +import qualified Control.Monad.State.Class as State + +import Data.Foldable (foldrM) -type CorrectionsWhere = forall query expr backend . (E.Esqueleto query expr backend) => - (expr (Entity Course), expr (Entity Sheet), expr (Entity Submission)) - -> expr (E.Value Bool) -ratedBy :: Key User -> CorrectionsWhere -ratedBy uid (_course,_sheet,submission) = submission E.^. SubmissionRatingBy E.==. E.just (E.val uid) +type CorrectionTableExpr = (E.SqlExpr (Entity Course) `E.InnerJoin` E.SqlExpr (Entity Sheet) `E.InnerJoin` E.SqlExpr (Entity Submission)) `E.LeftOuterJoin` E.SqlExpr (Maybe (Entity User)) +type CorrectionTableWhere = CorrectionTableExpr -> E.SqlExpr (E.Value Bool) +type CorrectionTableData = DBRow (Entity Submission, Entity Sheet, (CourseName, CourseShorthand, Key Term, Key School), Maybe (Entity User), Map UserId (User, Maybe Pseudonym)) -courseIs :: Key Course -> CorrectionsWhere -courseIs cid (course,_sheet,_submission) = course E.^. CourseId E.==. E.val cid +correctionsTableQuery :: CorrectionTableWhere -> (CorrectionTableExpr -> v) -> CorrectionTableExpr -> E.SqlQuery v +correctionsTableQuery whereClause returnStatement t@((course `E.InnerJoin` sheet `E.InnerJoin` submission) `E.LeftOuterJoin` corrector) = do + E.on $ corrector E.?. UserId E.==. submission E.^. SubmissionRatingBy + E.on $ sheet E.^. SheetId E.==. submission E.^. SubmissionSheet + E.on $ course E.^. CourseId E.==. sheet E.^. SheetCourse + E.where_ $ whereClause t + return $ returnStatement t -sheetIs :: Key Sheet -> CorrectionsWhere -sheetIs shid (_course,sheet,_submission) = sheet E.^. SheetId E.==. E.val shid +-- Where Clauses +ratedBy :: UserId -> CorrectionTableWhere +ratedBy uid ((_course `E.InnerJoin` _sheet `E.InnerJoin` submission) `E.LeftOuterJoin` _corrector) = submission E.^. SubmissionRatingBy E.==. E.just (E.val uid) + +courseIs :: CourseId -> CorrectionTableWhere +courseIs cid (( course `E.InnerJoin` _sheet `E.InnerJoin` _submission) `E.LeftOuterJoin` _corrector) = course E.^. CourseId E.==. E.val cid + +sheetIs :: Key Sheet -> CorrectionTableWhere +sheetIs shid ((_course `E.InnerJoin` sheet `E.InnerJoin` _submission) `E.LeftOuterJoin` _corrector) = sheet E.^. SheetId E.==. E.val shid + +submissionModeIs :: SheetSubmissionMode -> CorrectionTableWhere +submissionModeIs sMode ((_course `E.InnerJoin` sheet `E.InnerJoin` _submission) `E.LeftOuterJoin` _corrector) = sheet E.^. SheetSubmissionMode E.==. E.val sMode -type CorrectionTableData = DBRow (Entity Submission, Entity Sheet, (CourseName, CourseShorthand, Key Term, Key School), Maybe (Entity User), Map UserId User) - +-- Columns colTerm :: IsDBTable m a => Colonnade _ CorrectionTableData (DBCell m a) colTerm = sortable (Just "term") (i18nCell MsgTerm) $ \DBRow{ dbrOutput=(_, _, course, _, _) } -> -- cell [whamlet| _{untermKey $ course ^. _3}|] -- lange, internationale Semester textCell $ termToText $ unTermKey $ course ^. _3 -- kurze Semsterkürzel +colSchool :: IsDBTable m a => Colonnade _ CorrectionTableData (DBCell m a) +colSchool = sortable (Just "school") (i18nCell MsgCourseSchool) + $ \DBRow{ dbrOutput=(_, _, course, _, _) } -> + anchorCell (TermSchoolCourseListR (course ^. _3) (course ^. _4)) [whamlet|#{unSchoolKey (course ^. _4)}|] + colCourse :: IsDBTable m a => Colonnade _ CorrectionTableData (DBCell m a) colCourse = sortable (Just "course") (i18nCell MsgCourse) - $ \DBRow{ dbrOutput=(_, _, course, _, _) } -> - let tid = course ^. _3 - ssh = course ^. _4 - csh = course ^. _2 - in anchorCell (CourseR tid ssh csh CShowR) [whamlet|#{display csh}|] + $ \DBRow{ dbrOutput=(_, _, (_,csh,tid,sid), _, _) } -> courseCellCL (tid,sid,csh) colSheet :: IsDBTable m a => Colonnade _ CorrectionTableData (DBCell m a) colSheet = sortable (Just "sheet") (i18nCell MsgSheet) @@ -101,6 +109,10 @@ colSheet = sortable (Just "sheet") (i18nCell MsgSheet) shn = sheetName $ entityVal sheet in anchorCell (CSheetR tid ssh csh shn SShowR) [whamlet|#{display shn}|] +colSheetType :: IsDBTable m a => Colonnade _ CorrectionTableData (DBCell m a) +colSheetType = sortable (toNothing "sheetType") (i18nCell MsgSheetType) + $ \DBRow{ dbrOutput=(_, sheet, _, _, _) } -> i18nCell . sheetType $ entityVal sheet + colCorrector :: IsDBTable m a => Colonnade _ CorrectionTableData (DBCell m a) colCorrector = sortable (Just "corrector") (i18nCell MsgCorrector) $ \case DBRow{ dbrOutput = (_, _, _, Nothing , _) } -> cell mempty @@ -119,34 +131,44 @@ colSubmissionLink = sortable Nothing (i18nCell MsgSubmission) return $ CSubmissionR tid ssh csh shn cid SubShowR in anchorCellM mkRoute (mkCid >>= \cid -> [whamlet|#{display cid}|]) -colSelect :: Colonnade _ CorrectionTableData (DBCell _ (FormResult (DBFormResult CorrectionTableData CryptoFileNameSubmission Bool))) -colSelect = dbSelect id $ \DBRow{ dbrOutput=(Entity subId _, _, _, _, _) } -> encrypt subId +colSelect :: forall act h. (Monoid act, Headedness h) => Colonnade h CorrectionTableData (DBCell _ (FormResult (act, DBFormResult CryptoFileNameSubmission Bool CorrectionTableData), SheetTypeSummary)) +colSelect = dbSelect (_1 . applying _2) id $ \DBRow{ dbrOutput=(Entity subId _, _, _, _, _) } -> encrypt subId colSubmittors :: IsDBTable m a => Colonnade _ CorrectionTableData (DBCell m a) -colSubmittors = sortable Nothing (i18nCell MsgSubmissionUsers) $ \DBRow{ dbrOutput=(_, _, course, _, users) } -> let +colSubmittors = sortable (Just "submittors") (i18nCell MsgSubmissionUsers) $ \DBRow{ dbrOutput=(_, _, course, _, users) } -> let csh = course ^. _2 tid = course ^. _3 ssh = course ^. _4 link cid = CourseR tid ssh csh $ CUserR cid - cell = listCell (Map.toList users) $ \(userId, User{..}) -> do - anchorCellM (link <$> encrypt userId) (nameWidget userDisplayName userSurname) - in cell & cellAttrs <>~ [("class", "list--inline list--comma-separated")] + protoCell = listCell (Map.toList users) $ \(userId, (User{..}, mPseudo)) -> + anchorCellM (link <$> encrypt userId) $ case mPseudo of + Nothing -> nameWidget userDisplayName userSurname + Just p -> [whamlet|^{nameWidget userDisplayName userSurname} (#{review _PseudonymText p})|] + in protoCell & cellAttrs <>~ [("class", "list--inline list--comma-separated")] colSMatrikel :: IsDBTable m a => Colonnade _ CorrectionTableData (DBCell m a) colSMatrikel = sortable Nothing (i18nCell MsgMatrikelNr) $ \DBRow{ dbrOutput=(_, _, _, _, users) } -> let - cell = listCell (Map.toList users) $ \(userId, User{..}) -> anchorCellM (AdminUserR <$> encrypt userId) (maybe mempty toWidget userMatrikelnummer) - in cell & cellAttrs <>~ [("class", "list--inline list--comma-separated")] - -colRating :: IsDBTable m a => Colonnade _ CorrectionTableData (DBCell m a) -colRating = sortable (Just "rating") (i18nCell MsgRating) $ \DBRow{ dbrOutput=(Entity subId Submission{..}, Entity _ Sheet{..}, course, _, _) } -> + protoCell = listCell (Map.toList users) $ \(userId, (User{..}, _)) -> anchorCellM (AdminUserR <$> encrypt userId) (maybe mempty toWidget userMatrikelnummer) + in protoCell & cellAttrs <>~ [("class", "list--inline list--comma-separated")] + +colRating :: forall m a. IsDBTable m (a, SheetTypeSummary) => Colonnade Sortable CorrectionTableData (DBCell m (a, SheetTypeSummary)) +colRating = sortable (Just "rating") (i18nCell MsgRating) $ \DBRow{ dbrOutput=(Entity subId sub@Submission{..}, Entity _ Sheet{..}, course, _, _) } -> let csh = course ^. _2 tid = course ^. _3 ssh = course ^. _4 -- shn = sheetName + mkRoute = do cid <- encrypt subId return $ CSubmissionR tid ssh csh sheetName cid CorrectionR - in anchorCellM mkRoute $(widgetFile "widgets/rating") + in mconcat + [ anchorCellM mkRoute $(widgetFile "widgets/rating") + , writerCell $ do + let + summary :: SheetTypeSummary + summary = sheetTypeSum sheetType $ submissionRatingPoints <* guard (submissionRatingDone sub) + scribe (_2 :: Lens' (a, SheetTypeSummary) SheetTypeSummary) summary + ] colAssigned :: IsDBTable m a => Colonnade _ CorrectionTableData (DBCell m a) colAssigned = sortable (Just "assignedtime") (i18nCell MsgAssignedTime) $ \DBRow{ dbrOutput=(Entity _subId Submission{..}, _sheet, _course, _, _) } -> @@ -156,107 +178,191 @@ colRated :: IsDBTable m a => Colonnade _ CorrectionTableData (DBCell m a) colRated = sortable (Just "ratingtime") (i18nCell MsgRatingTime) $ \DBRow{ dbrOutput=(Entity _subId Submission{..}, _sheet, _course, _, _) } -> maybe mempty timeCell submissionRatingTime +colPseudonyms :: IsDBTable m a => Colonnade _ CorrectionTableData (DBCell m a) +colPseudonyms = sortable Nothing (i18nCell MsgPseudonyms) $ \DBRow{ dbrOutput=(_, _, _, _, users) } -> let + lCell = listCell (catMaybes $ snd . snd <$> Map.toList users) $ \pseudo -> + cell [whamlet|#{review _PseudonymText pseudo}|] + in lCell & cellAttrs <>~ [("class", "list--inline list--comma-separated")] + +colRatedField :: Colonnade _ CorrectionTableData (DBCell _ (FormResult (DBFormResult SubmissionId (Bool, a, b) CorrectionTableData))) +colRatedField = sortable Nothing (i18nCell MsgRatingDone) $ formCell id + (\DBRow{ dbrOutput=(Entity subId _, _, _, _, _) } -> return subId) + (\DBRow{ dbrOutput=(Entity _ (submissionRatingDone -> done), _, _, _, _) } mkUnique -> over (_1.mapped) (_1 .~) . over _2 fvInput <$> mreq checkBoxField (fsUniq mkUnique "rated") (Just done)) + +colPointsField :: Colonnade _ CorrectionTableData (DBCell _ (FormResult (DBFormResult SubmissionId (a, Maybe Points, b) CorrectionTableData))) +colPointsField = sortable (Just "rating") (i18nCell MsgColumnRatingPoints) $ formCell id + (\DBRow{ dbrOutput=(Entity subId _, _, _, _, _) } -> return subId) + (\DBRow{ dbrOutput=(Entity _ Submission{..}, Entity _ Sheet{..}, _, _, _) } mkUnique -> case sheetType of + NotGraded -> over (_1.mapped) (_2 .~) <$> pure (FormSuccess Nothing, mempty) + _other -> over (_1.mapped) (_2 .~) . over _2 fvInput <$> mopt pointsField (fsUniq mkUnique "points") (Just submissionRatingPoints) + ) + +colCommentField :: Colonnade _ CorrectionTableData (DBCell _ (FormResult (DBFormResult SubmissionId (a, b, Maybe Text) CorrectionTableData))) +colCommentField = sortable Nothing (i18nCell MsgRatingComment) $ formCell id + (\DBRow{ dbrOutput=(Entity subId _, _, _, _, _) } -> return subId) + (\DBRow{ dbrOutput=(Entity _ Submission{..}, _, _, _, _) } mkUnique -> over (_1.mapped) ((_3 .~) . assertM (not . null) . fmap (Text.strip . unTextarea)) . over _2 fvInput <$> mopt textareaField (fsUniq mkUnique "comment") (Just $ Textarea <$> submissionRatingComment)) -type CorrectionTableExpr = (E.SqlExpr (Entity Course) `E.InnerJoin` E.SqlExpr (Entity Sheet) `E.InnerJoin` E.SqlExpr (Entity Submission)) `E.LeftOuterJoin` E.SqlExpr (Maybe (Entity User)) - makeCorrectionsTable :: ( IsDBTable m x, ToSortable h, Functor h ) - => _ -> Colonnade h CorrectionTableData (DBCell m x) -> PSValidator m x -> Handler (DBResult m x) -makeCorrectionsTable whereClause colChoices psValidator = do + => CorrectionTableWhere -> Colonnade h CorrectionTableData (DBCell m x) -> _ -> PSValidator m x -> _ -> DBParams m x -> DB (DBResult m x) +makeCorrectionsTable whereClause dbtColonnade dbtFilterUI psValidator dbtProj' dbtParams = do let dbtSQLQuery :: CorrectionTableExpr -> E.SqlQuery _ - dbtSQLQuery ((course `E.InnerJoin` sheet `E.InnerJoin` submission) `E.LeftOuterJoin` corrector) = do - E.on $ corrector E.?. UserId E.==. submission E.^. SubmissionRatingBy - E.on $ sheet E.^. SheetId E.==. submission E.^. SubmissionSheet - E.on $ course E.^. CourseId E.==. sheet E.^. SheetCourse - E.where_ $ whereClause (course,sheet,submission) - let crse = ( course E.^. CourseName :: E.SqlExpr (E.Value CourseName) - , course E.^. CourseShorthand - , course E.^. CourseTerm - , course E.^. CourseSchool :: E.SqlExpr (E.Value SchoolId) - ) - return (submission, sheet, crse, corrector) + dbtSQLQuery = correctionsTableQuery whereClause + (\((course `E.InnerJoin` sheet `E.InnerJoin` submission) `E.LeftOuterJoin` corrector) -> + let crse = ( course E.^. CourseName :: E.SqlExpr (E.Value CourseName) + , course E.^. CourseShorthand + , course E.^. CourseTerm + , course E.^. CourseSchool :: E.SqlExpr (E.Value SchoolId) + ) + in (submission, sheet, crse, corrector) + ) dbtProj :: DBRow _ -> MaybeT (ReaderT SqlBackend (HandlerT UniWorX IO)) CorrectionTableData - dbtProj = traverse $ \(submission@(Entity sId _), sheet, (E.Value courseName, E.Value courseShorthand, E.Value courseTerm, E.Value courseSchool), mCorrector) -> do - submittors <- lift . E.select . E.from $ \(submissionUser `E.InnerJoin` user) -> do + dbtProj = traverse $ \(submission@(Entity sId _), sheet@(Entity shId _), (E.Value courseName, E.Value courseShorthand, E.Value courseTerm, E.Value courseSchool), mCorrector) -> do + submittors <- lift . E.select . E.from $ \((submissionUser `E.InnerJoin` user) `E.LeftOuterJoin` pseudonym) -> do + E.on $ pseudonym E.?. SheetPseudonymUser E.==. E.just (user E.^. UserId) + E.&&. pseudonym E.?. SheetPseudonymSheet E.==. E.just (E.val shId) E.on $ submissionUser E.^. SubmissionUserUser E.==. user E.^. UserId E.where_ $ submissionUser E.^. SubmissionUserSubmission E.==. E.val sId - E.orderBy [E.asc $ user E.^. UserId] - return user + E.orderBy [E.asc $ user E.^. UserDisplayName] + return (user, pseudonym E.?. SheetPseudonymPseudonym) let - submittorMap = foldr (\(Entity userId user) -> Map.insert userId user) Map.empty submittors - return (submission, sheet, (courseName, courseShorthand, courseTerm, courseSchool), mCorrector, submittorMap) - dbTable psValidator $ DBTable + submittorMap = foldr (\(Entity userId user, E.Value pseudo) -> Map.insert userId (user, pseudo)) Map.empty submittors + dbtProj' (submission, sheet, (courseName, courseShorthand, courseTerm, courseSchool), mCorrector, submittorMap) + dbTable psValidator DBTable { dbtSQLQuery - , dbtColonnade = colChoices + , dbtRowKey = \((_ `E.InnerJoin` _ `E.InnerJoin` submission) `E.LeftOuterJoin` _ :: CorrectionTableExpr) -> submission E.^. SubmissionId + , dbtColonnade , dbtProj - , dbtSorting = [ ( "term" - , SortColumn $ \((course `E.InnerJoin` _ `E.InnerJoin` _) `E.LeftOuterJoin` _) -> course E.^. CourseTerm - ) - , ( "course" - , SortColumn $ \((course `E.InnerJoin` _ `E.InnerJoin` _) `E.LeftOuterJoin` _) -> course E.^. CourseShorthand - ) - , ( "sheet" - , SortColumn $ \((_ `E.InnerJoin` sheet `E.InnerJoin` _) `E.LeftOuterJoin` _) -> sheet E.^. SheetName - ) - , ( "corrector" - , SortColumn $ \((_ `E.InnerJoin` _ `E.InnerJoin` _) `E.LeftOuterJoin` corrector) -> corrector E.?. UserSurname - ) - , ( "rating" - , SortColumn $ \((_ `E.InnerJoin` _ `E.InnerJoin` submission) `E.LeftOuterJoin` _) -> submission E.^. SubmissionRatingPoints - ) - ] - , dbtFilter = [ ( "term" - , FilterColumn $ \((course `E.InnerJoin` _ `E.InnerJoin` _) `E.LeftOuterJoin` _ :: CorrectionTableExpr) tids -> if - | Set.null tids -> E.val True :: E.SqlExpr (E.Value Bool) - | otherwise -> course E.^. CourseTerm `E.in_` E.valList (Set.toList tids) - ) - , ( "course" - , FilterColumn $ \((course `E.InnerJoin` _ `E.InnerJoin` _) `E.LeftOuterJoin` _ :: CorrectionTableExpr) cshs -> if - | Set.null cshs -> E.val True :: E.SqlExpr (E.Value Bool) - | otherwise -> course E.^. CourseShorthand `E.in_` E.valList (Set.toList cshs) - ) - , ( "sheet" - , FilterColumn $ \((_ `E.InnerJoin` sheet `E.InnerJoin` _) `E.LeftOuterJoin` _ :: CorrectionTableExpr) shns -> if - | Set.null shns -> E.val True :: E.SqlExpr (E.Value Bool) - | otherwise -> sheet E.^. SheetName `E.in_` E.valList (Set.toList shns) - ) - , ( "corrector" - , FilterColumn $ \((_ `E.InnerJoin` _ `E.InnerJoin` _) `E.LeftOuterJoin` corrector :: CorrectionTableExpr) emails -> if - | Set.null emails -> E.val True :: E.SqlExpr (E.Value Bool) - | otherwise -> corrector E.?. UserEmail `E.in_` E.justList (E.valList . catMaybes $ Set.toList emails) - E.||. (if Nothing `Set.member` emails then E.isNothing (corrector E.?. UserEmail) else E.val False) - ) - ] - , dbtStyle = def + , dbtSorting = Map.fromList + [ ( "term" + , SortColumn $ \((course `E.InnerJoin` _ `E.InnerJoin` _) `E.LeftOuterJoin` _) -> course E.^. CourseTerm + ) + , ( "course" + , SortColumn $ \((course `E.InnerJoin` _ `E.InnerJoin` _) `E.LeftOuterJoin` _) -> course E.^. CourseShorthand + ) + , ( "sheet" + , SortColumn $ \((_ `E.InnerJoin` sheet `E.InnerJoin` _) `E.LeftOuterJoin` _) -> sheet E.^. SheetName + ) + , ( "corrector" + , SortColumn $ \((_ `E.InnerJoin` _ `E.InnerJoin` _) `E.LeftOuterJoin` corrector) -> corrector E.?. UserSurname + ) + , ( "rating" + , SortColumn $ \((_ `E.InnerJoin` _ `E.InnerJoin` submission) `E.LeftOuterJoin` _) -> submission E.^. SubmissionRatingPoints + ) + , ( "israted" + , SortColumn $ \((_ `E.InnerJoin` _ `E.InnerJoin` submission) `E.LeftOuterJoin` _) -> E.not_ . E.isNothing $ submission E.^. SubmissionRatingTime + ) + , ( "ratingtime" + , SortColumn $ \((_ `E.InnerJoin` _ `E.InnerJoin` submission) `E.LeftOuterJoin` _) -> submission E.^. SubmissionRatingTime + ) + , ( "assignedtime" + , SortColumn $ \((_ `E.InnerJoin` _ `E.InnerJoin` submission) `E.LeftOuterJoin` _) -> submission E.^. SubmissionRatingAssigned + ) + , ( "submittors" + , SortColumn $ \((_ `E.InnerJoin` _ `E.InnerJoin` submission) `E.LeftOuterJoin` _) -> + E.sub_select . E.from $ \(submissionUser `E.InnerJoin` user) -> do + E.on $ submissionUser E.^. SubmissionUserUser E.==. user E.^. UserId + E.where_ $ submissionUser E.^. SubmissionUserSubmission E.==. submission E.^. SubmissionId + E.orderBy [E.asc $ user E.^. UserSurname] + E.limit 1 + return (user E.^. UserSurname) + ) + ] + , dbtFilter = Map.fromList + [ ( "term" + , FilterColumn $ \((course `E.InnerJoin` _ `E.InnerJoin` _) `E.LeftOuterJoin` _ :: CorrectionTableExpr) tids -> if + | Set.null tids -> E.val True :: E.SqlExpr (E.Value Bool) + | otherwise -> course E.^. CourseTerm `E.in_` E.valList (Set.toList tids) + ) + , ( "school" + , FilterColumn $ \((course `E.InnerJoin` _ `E.InnerJoin` _) `E.LeftOuterJoin` _ :: CorrectionTableExpr) sids -> if + | Set.null sids -> E.val True :: E.SqlExpr (E.Value Bool) + | otherwise -> course E.^. CourseSchool `E.in_` E.valList (Set.toList sids) + ) + , ( "course" + , FilterColumn $ \((course `E.InnerJoin` _ `E.InnerJoin` _) `E.LeftOuterJoin` _ :: CorrectionTableExpr) cshs -> if + | Set.null cshs -> E.val True :: E.SqlExpr (E.Value Bool) + | otherwise -> course E.^. CourseShorthand `E.in_` E.valList (Set.toList cshs) + ) + , ( "sheet" + , FilterColumn $ \((_ `E.InnerJoin` sheet `E.InnerJoin` _) `E.LeftOuterJoin` _ :: CorrectionTableExpr) shns -> if + | Set.null shns -> E.val True :: E.SqlExpr (E.Value Bool) + | otherwise -> sheet E.^. SheetName `E.in_` E.valList (Set.toList shns) + ) + , ( "sheet-search" + , FilterColumn $ \((_ `E.InnerJoin` sheet `E.InnerJoin` _) `E.LeftOuterJoin` _ :: CorrectionTableExpr) shns -> case getLast (shns :: Last (CI Text)) of + Nothing -> E.val True :: E.SqlExpr (E.Value Bool) + Just needle -> sheet E.^. SheetName `E.ilike` (E.%) E.++. E.val needle E.++. (E.%) + ) + , ( "corrector" + , FilterColumn $ \((_ `E.InnerJoin` _ `E.InnerJoin` _) `E.LeftOuterJoin` corrector :: CorrectionTableExpr) emails -> if + | Set.null emails -> E.val True :: E.SqlExpr (E.Value Bool) + | otherwise -> corrector E.?. UserEmail `E.in_` E.justList (E.valList . catMaybes $ Set.toList emails) + E.||. (if Nothing `Set.member` emails then E.isNothing (corrector E.?. UserEmail) else E.val False) + ) + , ( "israted" + , FilterColumn $ \((_ `E.InnerJoin` _ `E.InnerJoin` submission) `E.LeftOuterJoin` _ :: CorrectionTableExpr) criterion -> case getLast (criterion :: Last Bool) of + Nothing -> E.val True :: E.SqlExpr (E.Value Bool) + Just True -> E.not_ . E.isNothing $ submission E.^. SubmissionRatingTime + Just False-> E.isNothing $ submission E.^. SubmissionRatingTime + ) + ] + , dbtFilterUI = fromMaybe mempty dbtFilterUI + , dbtStyle = def { dbsFilterLayout = maybe (\_ _ _ -> id) (\_ -> defaultDBSFilterLayout) dbtFilterUI } + , dbtParams , dbtIdent = "corrections" :: Text } data ActionCorrections = CorrDownload | CorrSetCorrector | CorrAutoSetCorrector + | CorrDelete deriving (Eq, Ord, Read, Show, Enum, Bounded) -instance PathPiece ActionCorrections where - fromPathPiece = readFromPathPiece - toPathPiece = showToPathPiece -instance RenderMessage UniWorX ActionCorrections where - renderMessage m ls CorrDownload = renderMessage m ls MsgCorrDownload - renderMessage m ls CorrSetCorrector = renderMessage m ls MsgCorrSetCorrector - renderMessage m ls CorrAutoSetCorrector = renderMessage m ls MsgCorrAutoSetCorrector +instance Universe ActionCorrections +instance Finite ActionCorrections + +nullaryPathPiece ''ActionCorrections $ camelToPathPiece' 1 +embedRenderMessage ''UniWorX ''ActionCorrections id data ActionCorrectionsData = CorrDownloadData | CorrSetCorrectorData (Maybe UserId) | CorrAutoSetCorrectorData SheetId + | CorrDeleteData -correctionsR :: _ -> _ -> _ -> Map ActionCorrections (MForm (HandlerT UniWorX IO) (FormResult ActionCorrectionsData, Maybe Widget)) -> Handler TypedContent -correctionsR whereClause (formColonnade -> displayColumns) psValidator actions = do - tableForm <- makeCorrectionsTable whereClause displayColumns psValidator - ((actionRes, table), tableEncoding) <- runFormPost $ \csrf -> do - ((fmap (Map.keysSet . Map.filter id . getDBFormResult (const False)) -> selectionRes), table) <- tableForm csrf - (actionRes, action) <- multiAction actions - return ((,) <$> actionRes <*> selectionRes, table <> action) - +correctionsR :: _ -> _ -> _ -> _ -> Map ActionCorrections (AForm (HandlerT UniWorX IO) ActionCorrectionsData) -> Handler TypedContent +correctionsR whereClause displayColumns dbtFilterUI psValidator actions = do Just currentRoute <- getCurrentRoute -- This should never be called from a 404 handler + + postDeleteR $ \drRecords -> (submissionDeleteRoute drRecords) + { drAbort = SomeRoute currentRoute + , drSuccess = SomeRoute currentRoute + } + + ((actionRes', statistics), table) <- runDB $ + makeCorrectionsTable whereClause displayColumns dbtFilterUI psValidator return DBParamsForm + { dbParamsFormMethod = POST + , dbParamsFormAction = Just $ SomeRoute currentRoute + , dbParamsFormAttrs = [] + , dbParamsFormAddSubmit = True + , dbParamsFormAdditional = \frag -> do + (actionRes, action) <- multiAction actions Nothing + return ((, mempty) . Last . Just <$> actionRes, toWidget frag <> action) + , dbParamsFormEvaluate = liftHandlerT . runFormPost + , dbParamsFormResult = _1 + } + -- -- Similar Query for Statistics over alle possible Table elements (not just the ones shown) + -- gradingSummary <- do + -- let getTypePoints ((_course `E.InnerJoin` sheet `E.InnerJoin` submission) `E.LeftOuterJoin` _corrector) = (sheet E.^. SheetType, submission E.^. SubmissionRatingPoints, submission E.^. SubmissionRatingTime) + -- points <- E.select . E.from $ correctionsTableQuery whereClause getTypePoints + -- -- points <- E.select . E.from $ t@((course `E.InnerJoin` sheet `E.InnerJoin` submission) `E.LeftOuterJoin` corrector) -> (correctionsTableQuery whereClause getTypePoints t) <* E.distinctOn [] + -- return $ foldMap (\(E.Value stype, E.Value srpoints, E.Value srtime) -> sheetTypeSum stype (srpoints <* srtime)) points + -- let statistics = gradeSummaryWidget MsgSubmissionGradingSummaryTitle gradingSummary + -- return (tableRes, statistics) + + let actionRes = actionRes' & mapped._2 %~ Map.keysSet . Map.filter id . getDBFormResult (const False) + & mapped._1 %~ fromMaybe (error "By consctruction the form should always return an action") . getLast + case actionRes of FormFailure errs -> mapM_ (addMessage Warning . toHtml) errs FormMissing -> return () @@ -269,13 +375,18 @@ correctionsR whereClause (formColonnade -> displayColumns) psValidator actions = now <- liftIO getCurrentTime runDB $ do alreadyAssigned <- selectList [SubmissionId <-. subs, SubmissionRatingBy !=. Nothing] [] - when (not $ null alreadyAssigned) $ do + unless (null alreadyAssigned) $ do mr <- (toHtml . ) <$> getMessageRender - alreadyAssigned' <- forM alreadyAssigned $ \Entity{..} -> (, entityVal) <$> (encrypt entityKey :: DB CryptoFileNameSubmission) + alreadyAssigned' <- forM alreadyAssigned $ \Entity{..} -> (, entityVal) <$> (encrypt entityKey :: DB CryptoFileNameSubmission) addMessage Warning =<< withUrlRenderer ($(ihamletFile "templates/messages/submissionsAlreadyAssigned.hamlet") mr) let unassigned = Set.fromList subs `Set.difference` Set.fromList (entityKey <$> alreadyAssigned) - when (not $ null unassigned) $ do - num <- updateWhereCount [SubmissionId <-. Set.toList unassigned] + (unassignedAuth, unassignedUnauth) <- partitionM authorizedToAssign unassigned + unless (null unassignedUnauth) $ do + let submissionEncrypt = encrypt :: SubmissionId -> DB CryptoFileNameSubmission + unassignedUnauth' <- mapM submissionEncrypt $ Set.toList unassignedUnauth + $(addMessageFile Warning "templates/messages/submissionsAssignUnauthorized.hamlet") + unless (null unassignedAuth) $ do + num <- updateWhereCount [SubmissionId <-. Set.toList unassignedAuth] [ SubmissionRatingBy =. Just uid , SubmissionRatingAssigned =. Just now -- save, since only applies to unassigned ] @@ -287,15 +398,15 @@ correctionsR whereClause (formColonnade -> displayColumns) psValidator actions = return (E.countRows :: E.SqlExpr (E.Value Int64)) when (selfCorrectors > 0) $ addMessageI Warning $ MsgSelfCorrectors selfCorrectors redirect currentRoute - FormSuccess (CorrSetCorrectorData Nothing, subs') -> do + FormSuccess (CorrSetCorrectorData Nothing, subs') -> do -- delete corrections subs <- mapM decrypt $ Set.toList subs' runDB $ do num <- updateWhereCount [SubmissionId <-. subs] - [ SubmissionRatingPoints =. Nothing - , SubmissionRatingComment =. Nothing - , SubmissionRatingBy =. Nothing + [ SubmissionRatingBy =. Nothing , SubmissionRatingAssigned =. Nothing , SubmissionRatingTime =. Nothing + -- , SubmissionRatingPoints =. Nothing -- Kept for easy reassignment by 2nd corrector + -- , SubmissionRatingComment =. Nothing -- Kept for easy reassignment by 2nd corrector ] addMessageI Success $ MsgRemovedCorrections num redirect currentRoute @@ -303,57 +414,80 @@ correctionsR whereClause (formColonnade -> displayColumns) psValidator actions = subs <- mapM decrypt $ Set.toList subs' runDB $ do alreadyAssigned <- selectList [SubmissionId <-. subs, SubmissionRatingBy !=. Nothing] [] - when (not $ null alreadyAssigned) $ do + unless (null alreadyAssigned) $ do mr <- (toHtml . ) <$> getMessageRender - alreadyAssigned' <- forM alreadyAssigned $ \Entity{..} -> (, entityVal) <$> (encrypt entityKey :: DB CryptoFileNameSubmission) + alreadyAssigned' <- forM alreadyAssigned $ \Entity{..} -> (, entityVal) <$> (encrypt entityKey :: DB CryptoFileNameSubmission) addMessage Warning =<< withUrlRenderer ($(ihamletFile "templates/messages/submissionsAlreadyAssigned.hamlet") mr) let unassigned = Set.fromList subs `Set.difference` Set.fromList (entityKey <$> alreadyAssigned) - when (not $ null unassigned) $ do - (assigned, unassigned) <- assignSubmissions shid (Just unassigned) - when (not $ null assigned) $ + (unassignedAuth, unassignedUnauth) <- partitionM authorizedToAssign unassigned + unless (null unassignedUnauth) $ do + let submissionEncrypt = encrypt :: SubmissionId -> DB CryptoFileNameSubmission + unassignedUnauth' <- mapM submissionEncrypt $ Set.toList unassignedUnauth + $(addMessageFile Warning "templates/messages/submissionsAssignUnauthorized.hamlet") + unless (null unassignedAuth) $ do + (assigned, stillUnassigned) <- assignSubmissions shid (Just unassignedAuth) + unless (null assigned) $ addMessageI Success $ MsgUpdatedAssignedCorrectorsAuto (fromIntegral $ Set.size assigned) - when (not $ null unassigned) $ do + unless (null stillUnassigned) $ do mr <- (toHtml . ) <$> getMessageRender - unassigned' <- forM (Set.toList unassigned) $ \sid -> (encrypt sid :: DB CryptoFileNameSubmission) + unassigned' <- forM (Set.toList stillUnassigned) $ \sid -> encrypt sid :: DB CryptoFileNameSubmission addMessage Warning =<< withUrlRenderer ($(ihamletFile "templates/messages/submissionsNotAssignedAuto.hamlet") mr) redirect currentRoute + FormSuccess (CorrDeleteData, subs) -> do + subs' <- Set.fromList <$> forM (Set.toList subs) decrypt -- Set is not traversable + getDeleteR (submissionDeleteRoute subs') + { drAbort = SomeRoute currentRoute + , drSuccess = SomeRoute currentRoute + } fmap toTypedContent . defaultLayout $ do setTitleI MsgCourseCorrectionsTitle $(widgetFile "corrections") + where + authorizedToAssign :: SubmissionId -> DB Bool + authorizedToAssign sId = do + [(E.Value tid, E.Value ssh, E.Value csh, E.Value shn)] <- + E.select . E.from $ \(course `E.InnerJoin` sheet `E.InnerJoin` submission ) -> do + E.on $ sheet E.^. SheetId E.==. submission E.^. SubmissionSheet + E.on $ course E.^. CourseId E.==. sheet E.^. SheetCourse + E.where_ $ submission E.^. SubmissionId E.==. E.val sId + return (course E.^. CourseTerm, course E.^. CourseSchool, course E.^. CourseShorthand, sheet E.^. SheetName) + cID <- encrypt sId + let route = CSubmissionR tid ssh csh shn cID SAssignR + (== Authorized) <$> evalAccessDB route True -type ActionCorrections' = (ActionCorrections, MForm (HandlerT UniWorX IO) (FormResult ActionCorrectionsData, Maybe Widget)) - -downloadAction :: ActionCorrections' +type ActionCorrections' = (ActionCorrections, AForm (HandlerT UniWorX IO) ActionCorrectionsData) + +downloadAction, deleteAction :: ActionCorrections' downloadAction = ( CorrDownload - , return (pure CorrDownloadData, Nothing) + , pure CorrDownloadData ) +deleteAction = ( CorrDelete + , pure CorrDeleteData + ) assignAction :: Either CourseId SheetId -> ActionCorrections' assignAction selId = ( CorrSetCorrector - , over (mapped._2) Just $ do + , wFormToAForm $ do correctors <- liftHandlerT . runDB . E.select . E.from $ \(course `E.InnerJoin` sheet `E.InnerJoin` sheetCorrector `E.InnerJoin` user) -> do - E.on $ user E.^. UserId E.==. sheetCorrector E.^. SheetCorrectorUser - E.on $ sheet E.^. SheetId E.==. sheetCorrector E.^. SheetCorrectorSheet + E.on $ user E.^. UserId E.==. sheetCorrector E.^. SheetCorrectorUser + E.on $ sheet E.^. SheetId E.==. sheetCorrector E.^. SheetCorrectorSheet E.on $ course E.^. CourseId E.==. sheet E.^. SheetCourse E.where_ $ either (\cId -> course E.^. CourseId E.==. E.val cId) (\shId -> sheet E.^. SheetId E.==. E.val shId) selId - return user + E.distinct $ return user - mr <- getMessageRender + correctors' <- forM correctors $ \Entity{ entityKey, entityVal = User{..} } -> (SomeMessage userDisplayName, ) <$> encrypt entityKey - correctors' <- fmap ((mr MsgNoCorrector, Nothing) :) . forM correctors $ \Entity{ entityKey, entityVal = User{..} } -> (display userDisplayName, ) . Just <$> encrypt entityKey - - ($ mempty) . renderAForm FormStandard . wFormToAForm $ do - cId <- wreq (selectFieldList correctors' :: Field (HandlerT UniWorX IO) (Maybe CryptoUUIDUser)) (fslI MsgCorrector) Nothing - fmap CorrSetCorrectorData <$> (traverse.traverse) decrypt cId + cId <- wopt (selectFieldList correctors' :: Field (HandlerT UniWorX IO) CryptoUUIDUser) (fslI MsgCorrector) Nothing + fmap CorrSetCorrectorData <$> (traverse.traverse) decrypt cId ) autoAssignAction :: SheetId -> ActionCorrections' autoAssignAction shid = ( CorrAutoSetCorrector - , return (pure $ CorrAutoSetCorrectorData shid, Nothing) + , pure $ CorrAutoSetCorrectorData shid ) getCorrectionsR, postCorrectionsR :: Handler TypedContent @@ -364,18 +498,38 @@ postCorrectionsR = do colonnade = mconcat [ colSelect , dbRow + , colSchool , colTerm , colCourse , colSheet + , colPseudonyms , colSubmissionLink , colAssigned , colRating , colRated ] -- Continue here + filterUI = Just $ \mPrev -> mconcat + [ prismAForm (singletonFilter "course" ) mPrev $ aopt (lift `hoistField` selectField courseOptions) (fslI MsgCourse) + , prismAForm (singletonFilter "term" ) mPrev $ aopt (lift `hoistField` selectField termOptions) (fslI MsgTerm) + , prismAForm (singletonFilter "school" ) mPrev $ aopt (lift `hoistField` selectField schoolOptions) (fslI MsgCourseSchool) + , Map.singleton "sheet-search" . maybeToList <$> aopt (lift `hoistField` searchField False) (fslI MsgSheet) (Just <$> listToMaybe =<< ((Map.lookup "sheet-search" =<< mPrev) <|> (Map.lookup "sheet" =<< mPrev))) + , prismAForm (singletonFilter "israted" . maybePrism _PathPiece) mPrev $ aopt boolField (fslI MsgRatingTime) + ] + courseOptions = runDB $ do + courses <- selectList [] [Asc CourseShorthand] >>= filterM (\(Entity _ Course{..}) -> (== Authorized) <$> evalAccessCorrector courseTerm courseSchool courseShorthand) + optionsPairs $ map (id &&& id) $ nub $ map (CI.original . courseShorthand . entityVal) courses + termOptions = runDB $ do + courses <- selectList [] [Asc CourseTerm] >>= filterM (\(Entity _ Course{..}) -> (== Authorized) <$> evalAccessCorrector courseTerm courseSchool courseShorthand) + optionsPairs $ map (id &&& id) $ nub $ map (termToText . unTermKey . courseTerm . entityVal) courses + schoolOptions = runDB $ do + courses <- selectList [] [Asc CourseSchool] >>= filterM (\(Entity _ Course{..}) -> (== Authorized) <$> evalAccessCorrector courseTerm courseSchool courseShorthand) + optionsPairs $ map (id &&& id) $ nub $ map (CI.original . unSchoolKey . courseSchool . entityVal) courses + psValidator = def & restrictFilter (\name _ -> name /= "corrector") -- We need to be careful to restrict allowed sorting/filter to not expose sensitive information & restrictSorting (\name _ -> name /= "corrector") - correctionsR whereClause colonnade psValidator $ Map.fromList + & defaultSorting [SortAscBy "israted", SortDescBy "ratingTime", SortAscBy "assignedtime" ] + correctionsR whereClause colonnade filterUI psValidator $ Map.fromList [ downloadAction ] @@ -397,9 +551,10 @@ postCCorrectionsR tid ssh csh = do , colAssigned ] -- Continue here psValidator = def - correctionsR whereClause colonnade psValidator $ Map.fromList + correctionsR whereClause colonnade Nothing psValidator $ Map.fromList [ downloadAction , assignAction (Left cid) + , deleteAction ] getSSubsR, postSSubsR :: TermId -> SchoolId -> CourseShorthand -> SheetName -> Handler TypedContent @@ -419,10 +574,11 @@ postSSubsR tid ssh csh shn = do , colAssigned ] psValidator = def - correctionsR whereClause colonnade psValidator $ Map.fromList + correctionsR whereClause colonnade Nothing psValidator $ Map.fromList [ downloadAction , assignAction (Right shid) , autoAssignAction shid + , deleteAction ] correctionData :: TermId -> SchoolId -> CourseShorthand -> SheetName -> _ -- CryptoFileNameSubmission -> _ @@ -449,9 +605,15 @@ postCorrectionR tid ssh csh shn cid = do case results of [(Entity _ Course{..}, Entity _ Sheet{..}, Entity _ Submission{..}, corrector)] -> do let ratingComment = fmap Text.strip submissionRatingComment >>= (\c -> c <$ guard (not $ null c)) + pointsForm = case sheetType of + NotGraded -> pure Nothing + _otherwise -> aopt (pointsFieldMax $ preview (_grading . _maxPoints) sheetType) + (fslpI MsgRatingPoints "Punktezahl") + (Just submissionRatingPoints) - ((corrResult, corrForm), corrEncoding) <- runFormPost . identForm FIDcorrection . renderAForm FormStandard $ (,) - <$> aopt pointsField (fslpI MsgRatingPoints "Punktezahl" & setTooltip MsgRatingPointsDone) (Just $ submissionRatingPoints) + ((corrResult, corrForm), corrEncoding) <- runFormPost . identForm FIDcorrection . renderAForm FormStandard $ (,,) + <$> areq checkBoxField (fslI MsgRatingDone) (Just $ submissionRatingDone Submission{..}) + <*> pointsForm <*> (((\t -> t <$ guard (not $ null t)) =<<) . fmap (Text.strip . unTextarea) <$> aopt textareaField (fslI MsgRatingComment) (Just $ Textarea <$> submissionRatingComment)) <* submitButton @@ -462,53 +624,69 @@ postCorrectionR tid ssh csh shn cid = do case corrResult of FormMissing -> return () FormFailure errs -> mapM_ (addMessage Error . toHtml) errs - FormSuccess (ratingPoints, ratingComment) -> do - runDB $ do - uid <- liftHandlerT requireAuthId - now <- liftIO getCurrentTime + FormSuccess (rated, ratingPoints', ratingComment') -> do + uid <- liftHandlerT requireAuthId + now <- liftIO getCurrentTime - let rated = isJust $ void ratingPoints <|> void ratingComment - - update sub [ SubmissionRatingBy =. (uid <$ guard rated) --- SJ: I don't think we need to update AssignedTime here, since this is just for correction upload --- , SubmissionRatingAssigned +=. (Just now) -- TODO: Should submissionRatingAssigned change here if userId changes? - , SubmissionRatingTime =. (now <$ guard rated) - , SubmissionRatingPoints =. ratingPoints - , SubmissionRatingComment =. ratingComment - ] + if + | errs <- validateRating sheetType Rating' + { ratingPoints = ratingPoints' + , ratingComment = ratingComment' + , ratingTime = (now <$ guard rated) + } + , not $ null errs + -> mapM_ (addMessageI Error) errs + | otherwise -> runDBJobs $ do + update sub [ SubmissionRatingBy =. Just uid + , SubmissionRatingTime =. (now <$ guard rated) + , SubmissionRatingPoints =. ratingPoints' + , SubmissionRatingComment =. ratingComment' + ] + + addMessageI Success $ bool MsgRatingDeleted MsgRatingUpdated rated + + when (rated && isNothing submissionRatingTime) $ do + $logDebugS "CorrectionR" [st|Rated #{tshow sub}|] + queueDBJob . JobQueueNotification $ NotificationSubmissionRated sub - addMessageI Success $ bool MsgRatingDeleted MsgRatingUpdated rated redirect $ CSubmissionR tid ssh csh shn cid CorrectionR case uploadResult of FormMissing -> return () FormFailure errs -> mapM_ (addMessage Error . toHtml) errs - FormSuccess fileSource -> do + FormSuccess fileUploads -> do uid <- requireAuthId - - runDB . runConduit $ transPipe lift fileSource .| extractRatingsMsg .| sinkSubmission uid (Right sub) True - addMessageI Success MsgRatingFilesUpdated - redirect $ CSubmissionR tid ssh csh shn cid CorrectionR + res <- msgSubmissionErrors . runDBJobs . runConduit $ transPipe (lift . lift) fileUploads .| extractRatingsMsg .| sinkSubmission uid (Right sub) True + case res of + Nothing -> return () -- ErrorMessages are already added by msgSubmissionErrors + (Just _) -> do + addMessageI Success MsgRatingFilesUpdated + redirect $ CSubmissionR tid ssh csh shn cid CorrectionR + mr <- getMessageRender + let sheetTypeDesc = mr sheetType defaultLayout $ do let userCorrection = $(widgetFile "correction-user") $(widgetFile "correction") _ -> notFound + + getCorrectionUserR tid ssh csh shn cid = do sub <- decrypt cid - + results <- runDB $ correctionData tid ssh csh shn sub case results of [(Entity _ Course{..}, Entity _ Sheet{..}, Entity _ Submission{..}, corrector@(Just _))] -> do + mr <- getMessageRender let ratingComment = fmap Text.strip submissionRatingComment >>= (\c -> c <$ guard (not $ null c)) - - defaultLayout $ do + sheetTypeDesc = mr sheetType + defaultLayout $ $(widgetFile "correction-user") _ -> notFound - + getCorrectionsUploadR, postCorrectionsUploadR :: Handler Html getCorrectionsUploadR = postCorrectionsUploadR postCorrectionsUploadR = do @@ -521,14 +699,245 @@ postCorrectionsUploadR = do FormFailure errs -> mapM_ (addMessage Error . toHtml) errs FormSuccess files -> do uid <- requireAuthId - subs <- runDB . runConduit $ transPipe lift files .| extractRatingsMsg .| sinkMultiSubmission uid True - if - | null subs -> addMessageI Warning MsgNoCorrectionsUploaded - | otherwise -> do - subs' <- traverse encrypt $ Set.toList subs :: Handler [CryptoFileNameSubmission] - mr <- (toHtml .) <$> getMessageRender - addMessage Success =<< withUrlRenderer ($(ihamletFile "templates/messages/correctionsUploaded.hamlet") mr) - + mbSubs <- msgSubmissionErrors . runDBJobs . runConduit $ transPipe (lift . lift) files .| extractRatingsMsg .| sinkMultiSubmission uid True + case mbSubs of + Nothing -> return () + (Just subs) + | null subs -> addMessageI Warning MsgNoCorrectionsUploaded + | otherwise -> do + subs' <- traverse encrypt $ Set.toList subs :: Handler [CryptoFileNameSubmission] + mr <- (toHtml .) <$> getMessageRender + addMessage Success =<< withUrlRenderer ($(ihamletFile "templates/messages/correctionsUploaded.hamlet") mr) - defaultLayout $ do + + defaultLayout $ $(widgetFile "corrections-upload") + +getCorrectionsCreateR, postCorrectionsCreateR :: Handler Html +getCorrectionsCreateR = postCorrectionsCreateR +postCorrectionsCreateR = do + uid <- requireAuthId + let sheetOptions = mkOptList <=< runDB $ E.select . E.from $ \(course `E.InnerJoin` sheet) -> do + E.on $ course E.^. CourseId E.==. sheet E.^. SheetCourse + let + isCorrector = E.exists . E.from $ \sheetCorrector -> E.where_ + $ sheetCorrector E.^. SheetCorrectorUser E.==. E.val uid + E.&&. sheetCorrector E.^. SheetCorrectorSheet E.==. sheet E.^. SheetId + isLecturer = E.exists . E.from $ \lecturer -> E.where_ + $ lecturer E.^. LecturerUser E.==. E.val uid + E.&&. lecturer E.^. LecturerCourse E.==. course E.^. CourseId + E.where_ $ sheet E.^. SheetSubmissionMode E.==. E.val CorrectorSubmissions + E.&&. ( isCorrector E.||. isLecturer ) + E.orderBy [E.desc $ course E.^. CourseTerm, E.asc $ course E.^. CourseShorthand, E.desc $ sheet E.^. SheetActiveFrom] + return (sheet E.^. SheetId, course E.^. CourseTerm, course E.^. CourseShorthand, sheet E.^. SheetName) + mkOptList :: [(E.Value SheetId, E.Value TermId, E.Value CourseShorthand, E.Value SheetName)] -> Handler (OptionList SheetId) + mkOptList opts = do + opts' <- mapM (\v@(E.Value sid, _, _, _) -> (, v) <$> encrypt sid) opts + MsgRenderer mr <- getMsgRenderer + return . mkOptionList $ do + (cID, (E.Value sid, E.Value tid, E.Value csh, E.Value shn)) <- opts' + let tid' = mr $ ShortTermIdentifier (unTermKey tid) + return Option + { optionDisplay = mr $ MsgCorrectionPseudonymSheet tid' csh shn + , optionInternalValue = sid + , optionExternalValue = toPathPiece (cID :: CryptoUUIDSheet) + } + ((pseudonymRes, pseudonymWidget), pseudonymEncoding) <- runFormPost . renderAForm FormStandard $ (,) + <$> areq (selectField sheetOptions) (fslI MsgPseudonymSheet) Nothing + <*> (textToList <$> areq textareaField (fslpI MsgCorrectionPseudonyms "Pseudonyme" & setTooltip MsgCorrectionPseudonymsTip) Nothing) + <* submitButton + + case pseudonymRes of + FormMissing -> return () + FormFailure errs -> forM_ errs $ addMessage Error . toHtml + FormSuccess (sid, (pss, invalids)) -> do + allDone <- fmap getAll . execWriterT $ do + forM_ (Map.toList invalids) $ \((oPseudonyms, iPseudonym), alts) -> $(addMessageFile Error "templates/messages/ignoredInvalidPseudonym.hamlet") + tell . All $ null invalids + + WriterT . runDB . mapReaderT runWriterT $ do + Sheet{..} <- get404 sid + (sps, unknown) <- fmap partitionEithers' . forM pss . mapM $ \p -> maybe (Left p) Right <$> getBy (UniqueSheetPseudonym sid p) + forM_ unknown $ addMessageI Error . MsgUnknownPseudonym . review _PseudonymText + tell . All $ null unknown + now <- liftIO getCurrentTime + let + sps' :: [[SheetPseudonym]] + duplicate :: Set Pseudonym + ( sps' + , Map.keysSet . Map.filter (\(getSum -> n) -> n > 1) -> duplicate + ) = flip runState Map.empty . forM sps . flip (foldrM :: (Entity SheetPseudonym -> [SheetPseudonym] -> State (Map Pseudonym (Sum Integer)) [SheetPseudonym]) -> [SheetPseudonym] -> [Entity SheetPseudonym] -> State (Map Pseudonym (Sum Integer)) [SheetPseudonym]) [] $ \(Entity _ p@SheetPseudonym{sheetPseudonymPseudonym}) ps -> do + known <- State.gets $ Map.member sheetPseudonymPseudonym + State.modify $ Map.insertWith (<>) sheetPseudonymPseudonym (Sum 1) + return $ bool (p :) id known ps + submissionPrototype = Submission + { submissionSheet = sid + , submissionRatingPoints = Nothing + , submissionRatingComment = Nothing + , submissionRatingBy = Just uid + , submissionRatingAssigned = Just now + , submissionRatingTime = Nothing + } + unless (null duplicate) + $(addMessageFile Warning "templates/messages/submissionCreateDuplicates.hamlet") + existingSubUsers <- E.select . E.from $ \(submissionUser `E.InnerJoin` submission) -> do + E.on $ submission E.^. SubmissionId E.==. submissionUser E.^. SubmissionUserSubmission + E.where_ $ submissionUser E.^. SubmissionUserUser `E.in_` E.valList (sheetPseudonymUser <$> concat sps') + E.&&. submission E.^. SubmissionSheet E.==. E.val sid + return submissionUser + unless (null existingSubUsers) . mapReaderT lift $ do + (Map.toList -> subs) <- foldrM (\(Entity _ SubmissionUser{..}) mp -> Map.insertWith (<>) <$> (encrypt submissionUserSubmission :: DB CryptoFileNameSubmission) <*> pure (Set.fromList . map sheetPseudonymPseudonym . filter (\SheetPseudonym{..} -> sheetPseudonymUser == submissionUserUser) $ concat sps') <*> pure mp) Map.empty existingSubUsers + $(addMessageFile Warning "templates/messages/submissionCreateExisting.hamlet") + let sps'' = filter (not . null) $ filter (\spGroup -> not . flip any spGroup $ \SheetPseudonym{sheetPseudonymUser} -> sheetPseudonymUser `elem` map (submissionUserUser . entityVal) existingSubUsers) sps' + forM_ sps'' $ \spGroup + -> let + sheetGroupDesc = Text.intercalate ", " $ map (review _PseudonymText . sheetPseudonymPseudonym) spGroup + in case sheetGrouping of + Arbitrary maxSize -> do + subId <- insert submissionPrototype + void . insert $ SubmissionEdit uid now subId + insertMany_ . flip map spGroup $ \SheetPseudonym{sheetPseudonymUser} -> SubmissionUser + { submissionUserUser = sheetPseudonymUser + , submissionUserSubmission = subId + } + when (genericLength spGroup > maxSize) $ + addMessageI Warning $ MsgSheetGroupTooLarge sheetGroupDesc + RegisteredGroups -> do + let spGroup' = Map.fromList $ map (sheetPseudonymUser &&& id) spGroup + groups <- E.select . E.from $ \submissionGroup -> do + E.where_ . E.exists . E.from $ \submissionGroupUser -> + E.where_ $ submissionGroupUser E.^. SubmissionGroupUserUser `E.in_` E.valList (map sheetPseudonymUser spGroup) + return $ submissionGroup E.^. SubmissionGroupId + groupUsers <- fmap (Set.fromList . map E.unValue) . E.select . E.from $ \submissionGroupUser -> do + E.where_ $ submissionGroupUser E.^. SubmissionGroupUserSubmissionGroup `E.in_` E.valList (map E.unValue groups) + return $ submissionGroupUser E.^. SubmissionGroupUserUser + if + | [_] <- groups + , Map.keysSet spGroup' `Set.isSubsetOf` groupUsers + -> do + subId <- insert submissionPrototype + void . insert $ SubmissionEdit uid now subId + insertMany_ . flip map (Set.toList groupUsers) $ \sheetUser -> SubmissionUser + { submissionUserUser = sheetUser + , submissionUserSubmission = subId + } + when (null groups) $ + addMessageI Warning $ MsgSheetNoRegisteredGroup sheetGroupDesc + | length groups < 2 + -> do + forM_ (Set.toList (Map.keysSet spGroup' `Set.difference` groupUsers)) $ \((spGroup' !) -> SheetPseudonym{sheetPseudonymPseudonym}) -> do + addMessageI Error $ MsgSheetNoRegisteredGroup (review _PseudonymText sheetPseudonymPseudonym) + tell $ All False + | otherwise -> + addMessageI Error $ MsgSheetAmbiguousRegisteredGroup sheetGroupDesc + NoGroups -> do + subId <- insert submissionPrototype + void . insert $ SubmissionEdit uid now subId + insertMany_ . flip map spGroup $ \SheetPseudonym{sheetPseudonymUser} -> SubmissionUser + { submissionUserUser = sheetPseudonymUser + , submissionUserSubmission = subId + } + when (length spGroup > 1) $ + addMessageI Warning $ MsgSheetNoGroupSubmission sheetGroupDesc + when allDone $ + redirect CorrectionsGradeR + + + defaultLayout $ + $(widgetFile "corrections-create") + where + partitionEithers' :: [[Either a b]] -> ([[b]], [a]) + partitionEithers' = runWriter . mapM (WriterT . Identity . swap . partitionEithers) + + textToList :: Textarea -> ([[Pseudonym]], Map (Text, Text) [Pseudonym]) + textToList (map (map Text.strip . Text.splitOn ",") . filter (not . Text.null) . map Text.strip . Text.lines . unTextarea -> ws) + = runWriter . fmap (mapMaybe sequence) $ mapM (\ws' -> mapM (toPseudonym ws') ws') ws + where + toPseudonym w' w + | Just res <- w ^? _PseudonymText = return $ Just res + | otherwise = Nothing <$ tell (Map.singleton (Text.intercalate ", " w', w) $ w ^.. pseudonymFragments . _PseudonymWords) + +getCorrectionsGradeR, postCorrectionsGradeR :: Handler Html +getCorrectionsGradeR = postCorrectionsGradeR +postCorrectionsGradeR = do + uid <- requireAuthId + let whereClause = ratedBy uid + displayColumns = mconcat -- should match getSSubsR for consistent UX + [ dbRow + , colSchool + , colTerm + , colCourse + , colSheet + , colPseudonyms + , colSubmissionLink + , colRated + , colRatedField + , colPointsField + , colCommentField + ] -- Continue here + psValidator = def + & defaultSorting [SortDescBy "ratingtime"] :: PSValidator (MForm (HandlerT UniWorX IO)) (FormResult (DBFormResult SubmissionId (Bool, Maybe Points, Maybe Text) CorrectionTableData)) + unFormResult = getDBFormResult $ \DBRow{ dbrOutput = (Entity _ sub@Submission{..}, _, _, _, _) } -> (submissionRatingDone sub, submissionRatingPoints, submissionRatingComment) + dbtProj' i@(Entity subId _, Entity _ Sheet{ sheetName = shn }, (_, csh, tid, ssh), _, _) = do + cID <- encrypt subId + void . assertM (== Authorized) . lift $ evalAccessDB (CSubmissionR tid ssh csh shn cID CorrectionR) True + return i + + (fmap unFormResult -> tableRes, table) <- runDB $ makeCorrectionsTable whereClause displayColumns mempty psValidator dbtProj' $ def + { dbParamsFormAction = Just $ SomeRoute CorrectionsGradeR + , dbParamsFormAddSubmit = True + } + + case tableRes of + FormMissing -> return () + FormFailure errs -> forM_ errs $ addMessage Error . toHtml + FormSuccess resMap -> do + now <- liftIO getCurrentTime + subs <- fmap catMaybes . runDB . forM (Map.toList resMap) $ \(subId, (rated, mPoints, mComment)) -> do + s@Submission{..} <- get404 subId + if + | submissionRatingPoints /= mPoints || submissionRatingComment /= mComment || rated /= submissionRatingDone s + -> Just subId <$ update subId [ SubmissionRatingPoints =. mPoints + , SubmissionRatingComment =. mComment + , SubmissionRatingBy =. Just uid + , SubmissionRatingTime =. now <$ guard rated + ] + | otherwise -> return Nothing + subs' <- traverse encrypt subs :: Handler [CryptoFileNameSubmission] + unless (null subs') $(addMessageFile Success "templates/messages/correctionsUploaded.hamlet") + + defaultLayout $ + $(widgetFile "corrections-grade") + + +getSAssignR, postSAssignR :: TermId -> SchoolId -> CourseShorthand -> SheetName -> CryptoFileNameSubmission -> Handler Html +getSAssignR = postSAssignR +postSAssignR tid ssh csh shn cID = do + let actionUrl = CSubmissionR tid ssh csh shn cID SAssignR + sId <- decrypt cID + (currentCorrector, sheetCorrectors) <- runDB $ do + Submission{submissionRatingBy, submissionSheet} <- get404 sId + sheetCorrectors <- map (sheetCorrectorUser . entityVal) <$> selectList [SheetCorrectorSheet ==. submissionSheet] [] + userCorrector <- traverse getJustEntity submissionRatingBy + return (userCorrector, maybe id (:) submissionRatingBy sheetCorrectors) + + $logDebugS "SAssignR" $ tshow currentCorrector + let correctorField = selectField $ optionsPersistCryptoId [UserId <-. sheetCorrectors] [Asc UserSurname, Asc UserDisplayName] userDisplayName + ((corrResult, corrForm), corrEncoding) <- runFormPost . renderAForm FormStandard $ + aopt correctorField (fslI MsgCorrector) (Just currentCorrector) + <* submitButton + formResult corrResult $ \(fmap entityKey -> mbUserId) -> do + when (mbUserId /= fmap entityKey currentCorrector) . runDB $ do + now <- liftIO getCurrentTime + update sId [ SubmissionRatingBy =. mbUserId + , SubmissionRatingAssigned =. (now <$ mbUserId) + ] + addMessageI Success MsgCorrectorUpdated + redirect actionUrl + defaultLayout $ do + setTitleI MsgCorrectorAssignTitle + $(widgetFile "submission-assign") + + + + diff --git a/src/Handler/Course.hs b/src/Handler/Course.hs index 300c6d3ff..81f69adc1 100644 --- a/src/Handler/Course.hs +++ b/src/Handler/Course.hs @@ -1,54 +1,34 @@ -{-# LANGUAGE RecordWildCards, NamedFieldPuns #-} -{-# LANGUAGE NoImplicitPrelude #-} -{-# LANGUAGE OverloadedStrings #-} -{-# LANGUAGE MultiWayIf #-} -{-# LANGUAGE PartialTypeSignatures #-} -{-# LANGUAGE RecordWildCards, NamedFieldPuns, TupleSections #-} -{-# LANGUAGE ViewPatterns #-} -{-# LANGUAGE ScopedTypeVariables #-} -{-# LANGUAGE TemplateHaskell #-} -{-# LANGUAGE QuasiQuotes #-} -{-# LANGUAGE MultiParamTypeClasses #-} -{-# LANGUAGE TypeFamilies #-} -{-# LANGUAGE TypeOperators #-} -{-# LANGUAGE FlexibleContexts #-} - module Handler.Course where -import Import hiding (catMaybes) +import Import -import Control.Lens import Utils.Lens -import Utils.TH -- import Utils.DB import Handler.Utils import Handler.Utils.Table.Cells +import Handler.Utils.Course +import Handler.Utils.Delete -- import Data.Time import qualified Data.Text as T import Data.Function ((&)) -- import Yesod.Form.Bootstrap3 -import Data.Maybe +import Data.Monoid (Last(..)) + +import Data.Maybe (fromJust) import qualified Data.Set as Set import qualified Data.Map as Map -import qualified Data.CaseInsensitive as CI - - -import Colonnade hiding (fromMaybe,bool) --- import Yesod.Colonnade - import qualified Database.Esqueleto as E -import qualified Data.UUID.Cryptographic as UUID -- NOTE: Outdated way to use dbTable; see ProfileDataR Handler for a more recent method. type CourseTableData = DBRow (Entity Course, Int64, Bool, Entity School) colCourse :: IsDBTable m a => Colonnade _ CourseTableData (DBCell m a) colCourse = sortable (Just "course") (i18nCell MsgCourse) - $ \DBRow{ dbrOutput=(Entity cid Course{..}, _, _, _) } -> + $ \DBRow{ dbrOutput=(Entity _ Course{..}, _, _, _) } -> anchorCell (CourseR courseTerm courseSchool courseShorthand CShowR) [whamlet|#{display courseName}|] @@ -59,19 +39,19 @@ colCourseDescr = sortable (Just "course") (i18nCell MsgCourse) $ do colDescription :: IsDBTable m a => Colonnade Sortable CourseTableData (DBCell m a) colDescription = sortable Nothing (i18nCell MsgCourseDescription) - $ \DBRow{ dbrOutput=(Entity cid Course{..}, _, _, _) } -> + $ \DBRow{ dbrOutput=(Entity _ Course{..}, _, _, _) } -> case courseDescription of Nothing -> mempty (Just descr) -> cell $ modal "Beschreibung" (Right $ toWidget descr) colCShort :: IsDBTable m a => Colonnade _ CourseTableData (DBCell m a) colCShort = sortable (Just "cshort") (i18nCell MsgCourseShort) - $ \DBRow{ dbrOutput=(Entity cid Course{..}, _, _, _) } -> + $ \DBRow{ dbrOutput=(Entity _ Course{..}, _, _, _) } -> anchorCell (CourseR courseTerm courseSchool courseShorthand CShowR) [whamlet|#{display courseShorthand}|] colCShortDescr :: IsDBTable m a => Colonnade _ CourseTableData (DBCell m a) colCShortDescr = sortable (Just "cshort") (i18nCell MsgCourseShort) - $ \DBRow{ dbrOutput=(Entity cid Course{..}, _, _, _) } -> mappend + $ \DBRow{ dbrOutput=(Entity _ Course{..}, _, _, _) } -> mappend ( anchorCell (CourseR courseTerm courseSchool courseShorthand CShowR) [whamlet|#{display courseShorthand}|] ) ( case courseDescription of Nothing -> mempty @@ -85,7 +65,7 @@ colCShortDescr = sortable (Just "cshort") (i18nCell MsgCourseShort) colTerm :: IsDBTable m a => Colonnade _ CourseTableData (DBCell m a) colTerm = sortable (Just "term") (i18nCell MsgTerm) - $ \DBRow{ dbrOutput=(Entity cid Course{..}, _, _, _) } -> + $ \DBRow{ dbrOutput=(Entity _ Course{..}, _, _, _) } -> anchorCell (TermCourseListR courseTerm) [whamlet|#{display courseTerm}|] colSchool :: IsDBTable m a => Colonnade _ CourseTableData (DBCell m a) @@ -100,24 +80,24 @@ colSchoolShort = sortable (Just "schoolshort") (i18nCell MsgCourseSchoolShort) colRegFrom :: IsDBTable m a => Colonnade _ CourseTableData (DBCell m a) colRegFrom = sortable (Just "register-from") (i18nCell MsgRegisterFrom) - $ \DBRow{ dbrOutput=(Entity cid Course{..}, _, _, _) } -> + $ \DBRow{ dbrOutput=(Entity _ Course{..}, _, _, _) } -> maybe mempty timeCell courseRegisterFrom -- cell $ traverse (formatTime SelFormatDateTime) courseRegisterFrom >>= maybe mempty toWidget colRegTo :: IsDBTable m a => Colonnade _ CourseTableData (DBCell m a) colRegTo = sortable (Just "register-to") (i18nCell MsgRegisterTo) - $ \DBRow{ dbrOutput=(Entity cid Course{..}, _, _, _) } -> - cell $ traverse (formatTime SelFormatDateTime) courseRegisterTo >>= maybe mempty toWidget + $ \DBRow{ dbrOutput=(Entity _ Course{..}, _, _, _) } -> + maybe mempty timeCell courseRegisterTo colParticipants :: IsDBTable m a => Colonnade _ CourseTableData (DBCell m a) colParticipants = sortable (Just "participants") (i18nCell MsgCourseMembers) - $ \DBRow{ dbrOutput=(Entity cid Course{..}, currentParticipants, _, _) } -> i18nCell $ case courseCapacity of + $ \DBRow{ dbrOutput=(Entity _ Course{..}, currentParticipants, _, _) } -> i18nCell $ case courseCapacity of Nothing -> MsgCourseMembersCount currentParticipants - Just max -> MsgCourseMembersCountLimited currentParticipants max + Just limit -> MsgCourseMembersCountLimited currentParticipants limit colRegistered :: IsDBTable m a => Colonnade _ CourseTableData (DBCell m a) colRegistered = sortable (Just "registered") (i18nCell MsgRegistered) - $ \DBRow{ dbrOutput=(Entity cid Course{..}, _, registered, _) } -> tickmarkCell registered + $ \DBRow{ dbrOutput=(_, _, registered, _) } -> tickmarkCell registered type CourseTableExpr = E.SqlExpr (Entity Course) `E.InnerJoin` E.SqlExpr (Entity School) @@ -127,14 +107,14 @@ course2Participants (course `E.InnerJoin` _school) = E.sub_select . E.from $ \co return (E.countRows :: E.SqlExpr (E.Value Int64)) course2Registered :: Maybe UserId -> CourseTableExpr -> E.SqlExpr (E.Value Bool) -course2Registered muid (course `E.InnerJoin` _school) = E.exists . E.from $ \courseParticipant -> do +course2Registered muid (course `E.InnerJoin` _school) = E.exists . E.from $ \courseParticipant -> E.where_ $ courseParticipant E.^. CourseParticipantCourse E.==. course E.^. CourseId E.&&. E.just (courseParticipant E.^. CourseParticipantUser) E.==. E.val muid -makeCourseTable :: ( IsDBTable m x, ToSortable h, Functor h ) - => _ -> Colonnade h CourseTableData (DBCell m x) -> PSValidator m x -> Handler (DBResult m x) +makeCourseTable :: ( IsDBTable m x, ToSortable h, Functor h, DBResult m x ~ ((), Widget) ) + => _ -> Colonnade h CourseTableData (DBCell m x) -> PSValidator m x -> DB Widget makeCourseTable whereClause colChoices psValidator = do - muid <- maybeAuthId + muid <- lift maybeAuthId let dbtSQLQuery :: CourseTableExpr -> E.SqlQuery _ dbtSQLQuery qin@(course `E.InnerJoin` school) = do E.on $ course E.^. CourseSchool E.==. school E.^. SchoolId @@ -144,8 +124,9 @@ makeCourseTable whereClause colChoices psValidator = do return (course, participants, registered, school) dbtProj :: DBRow _ -> MaybeT (ReaderT SqlBackend (HandlerT UniWorX IO)) CourseTableData dbtProj = traverse $ \(course, E.Value participants, E.Value registered, school) -> return (course, participants, registered, school) - dbTable psValidator $ DBTable + snd <$> dbTable psValidator DBTable { dbtSQLQuery + , dbtRowKey = \(course `E.InnerJoin` _) -> course E.^. CourseId , dbtColonnade = colChoices , dbtProj , dbtSorting = Map.fromList -- OverloadedLists does not work with the templates here @@ -156,7 +137,7 @@ makeCourseTable whereClause colChoices psValidator = do , ( "schoolshort", SortColumn $ \(_course `E.InnerJoin` school) -> school E.^. SchoolShorthand) , ( "register-from", SortColumn $ \(course `E.InnerJoin` _school) -> course E.^. CourseRegisterFrom) , ( "register-to", SortColumn $ \(course `E.InnerJoin` _school) -> course E.^. CourseRegisterTo) - , ( "participants", SortColumn $ course2Participants ) + , ( "participants", SortColumn course2Participants ) , ( "registered", SortColumn $ course2Registered muid) ] , dbtFilter = Map.fromList -- OverloadedLists does not work with the templates here @@ -183,28 +164,43 @@ makeCourseTable whereClause colChoices psValidator = do | Set.null criterias -> E.val True :: E.SqlExpr (E.Value Bool) | otherwise -> school E.^. SchoolShorthand `E.in_` E.valList (Set.toList criterias) ) + , ( "registered", FilterColumn $ \tExpr criterion -> case getLast (criterion :: Last Bool) of + Nothing -> E.val True :: E.SqlExpr (E.Value Bool) + Just needle -> course2Registered muid tExpr E.==. E.val needle + ) + , ( "search", FilterColumn $ \(course `E.InnerJoin` _school :: CourseTableExpr) criterion -> case getLast (criterion :: Last Text) of + Nothing -> E.val True :: E.SqlExpr (E.Value Bool) + Just needle -> (E.castString (course E.^. CourseName) `E.ilike` (E.%) E.++. E.val needle E.++. (E.%)) + E.||. (E.castString (course E.^. CourseShorthand) `E.ilike` (E.%) E.++. E.val needle E.++. (E.%)) + E.||. (E.castString (course E.^. CourseDescription) `E.ilike` (E.%) E.++. E.val needle E.++. (E.%)) + ) ] - , dbtStyle = def + , dbtFilterUI = \mPrev -> mconcat $ catMaybes + [ Just $ prismAForm (singletonFilter "search") mPrev $ aopt (searchField True) (fslI MsgCourseFilterSearch) + , muid $> prismAForm (singletonFilter "registered" . maybePrism _PathPiece) mPrev (aopt boolField (fslI MsgCourseFilterRegistered)) + ] + , dbtStyle = def { dbsFilterLayout = defaultDBSFilterLayout } + , dbtParams = def , dbtIdent = "courses" :: Text } getCourseListR :: Handler Html -getCourseListR = do -- TODO: Suchfunktion für Kurse und Kürzel!!! +getCourseListR = do muid <- maybeAuthId let colonnade = widgetColonnade $ mconcat [ colCourseDescr - , colCShort + , colSchoolShort , colTerm + , colCShort , maybe mempty (const colRegistered) muid - , colSchool + ] whereClause = const $ E.val True validator = def - & defaultSorting [("course", SortAsc), ("term", SortDesc)] - ((), coursesTable) <- makeCourseTable whereClause colonnade validator + & defaultSorting [SortAscBy "course", SortDescBy "term"] + coursesTable <- runDB $ makeCourseTable whereClause colonnade validator defaultLayout $ do setTitleI MsgCourseListTitle - [whamlet|TODO: Such-/Filterfunktion hier einbauen|] -- TODO $(widgetFile "courses") getTermCurrentR :: Handler Html @@ -228,12 +224,12 @@ getTermSchoolCourseListR tid ssh = do , colParticipants , maybe mempty (const colRegistered) muid ] - whereClause = \(course, _, _) -> - course E.^. CourseTerm E.==. E.val tid - E.&&. course E.^. CourseSchool E.==. E.val ssh + whereClause (course, _, _) = + course E.^. CourseTerm E.==. E.val tid + E.&&. course E.^. CourseSchool E.==. E.val ssh validator = def - & defaultSorting [("cshort", SortAsc)] - ((), coursesTable) <- makeCourseTable whereClause colonnade validator + & defaultSorting [SortAscBy "cshort"] + coursesTable <- runDB $ makeCourseTable whereClause colonnade validator defaultLayout $ do setTitleI $ MsgTermSchoolCourseListTitle tid school $(widgetFile "courses") @@ -252,10 +248,10 @@ getTermCourseListR tid = do , colParticipants , maybe mempty (const colRegistered) muid ] - whereClause = \(course, _, _) -> course E.^. CourseTerm E.==. E.val tid + whereClause (course, _, _) = course E.^. CourseTerm E.==. E.val tid validator = def - & defaultSorting [("cshort", SortAsc)] - ((), coursesTable) <- makeCourseTable whereClause colonnade validator + & defaultSorting [SortAscBy "cshort"] + coursesTable <- runDB $ makeCourseTable whereClause colonnade validator defaultLayout $ do setTitleI . MsgTermCourseListTitle $ tid $(widgetFile "courses") @@ -263,34 +259,40 @@ getTermCourseListR tid = do getCShowR :: TermId -> SchoolId -> CourseShorthand -> Handler Html getCShowR tid ssh csh = do mbAid <- maybeAuthId - (courseEnt,(schoolMB,participants,registered),lecturers) <- runDB $ do - courseEnt@(Entity cid course) <- getBy404 $ TermSchoolCourseShort tid ssh csh - dependent <- (,,) - <$> get (courseSchool course) -- join -- just fetch full school name here - <*> count [CourseParticipantCourse ==. cid] -- join - <*> (case mbAid of -- TODO: Someone please refactor this late-night mess here! - Nothing -> return False - (Just aid) -> do regL <- getBy (UniqueParticipant aid cid) - return $ isJust regL) - lecturers <- E.select $ E.from $ \(lecturer `E.InnerJoin` user) -> do - E.on $ lecturer E.^. LecturerUser E.==. user E.^. UserId - E.where_ $ lecturer E.^. LecturerCourse E.==. E.val cid - return $ user E.^. UserDisplayName - return $ (courseEnt,dependent,E.unValue <$> lecturers) - let course = entityVal courseEnt - (regWidget, regEnctype) <- generateFormPost $ identifyForm "registerBtn" $ registerForm registered $ courseRegisterSecret course + (course,schoolName,participants,registered,lecturers) <- runDB . maybeT notFound $ do + [(E.Entity cid course, E.Value schoolName, E.Value participants, E.Value registered)] + <- lift . E.select . E.from $ + \((school `E.InnerJoin` course) `E.LeftOuterJoin` participant) -> do + E.on $ E.just (course E.^. CourseId) E.==. participant E.?. CourseParticipantCourse + E.&&. E.val mbAid E.==. participant E.?. CourseParticipantUser + E.on $ course E.^. CourseSchool E.==. school E.^. SchoolId + E.where_ $ course E.^. CourseTerm E.==. E.val tid + E.&&. course E.^. CourseSchool E.==. E.val ssh + E.&&. course E.^. CourseShorthand E.==. E.val csh + let numParticipants = E.sub_select . E.from $ \part -> do + E.where_ $ part E.^. CourseParticipantCourse E.==. course E.^. CourseId + return ( E.countRows :: E.SqlExpr (E.Value Int64)) + return (course,school E.^. SchoolName, numParticipants, participant E.?. CourseParticipantRegistration) + lecturers <- lift . E.select $ E.from $ \(lecturer `E.InnerJoin` user) -> do + E.on $ lecturer E.^. LecturerUser E.==. user E.^. UserId + E.where_ $ lecturer E.^. LecturerCourse E.==. E.val cid + return $ user E.^. UserDisplayName + return (course,schoolName,participants,registered,map E.unValue lecturers) + mRegFrom <- traverse (formatTime SelFormatDateTime) $ courseRegisterFrom course + mRegTo <- traverse (formatTime SelFormatDateTime) $ courseRegisterTo course + mDereg <- traverse (formatTime SelFormatDateTime) $ courseDeregisterUntil course + mRegAt <- traverse (formatTime SelFormatDateTime) registered + (regWidget, regEnctype) <- generateFormPost $ identifyForm "registerBtn" $ registerForm (isJust mRegAt) $ courseRegisterSecret course registrationOpen <- (==Authorized) <$> isAuthorized (CourseR tid ssh csh CRegisterR) True - mRegFrom <- traverse (formatTime SelFormatDateTime) $ courseRegisterFrom course - mRegTo <- traverse (formatTime SelFormatDateTime) $ courseRegisterTo course defaultLayout $ do - setTitle $ [shamlet| #{toPathPiece tid} - #{csh}|] + setTitle [shamlet| #{toPathPiece tid} - #{csh}|] $(widgetFile "course") registerForm :: Bool -> Maybe Text -> Form Bool registerForm registered msecret extra = do (msecretRes', msecretView) <- case msecret of - (Just _) | not registered -> bimap Just Just <$> (mreq textField (fslpI MsgCourseSecret "Code") Nothing) + (Just _) | not registered -> bimap Just Just <$> mreq textField (fslpI MsgCourseSecret "Code") Nothing _ -> return (Nothing,Nothing) (btnRes, btnView) <- mreq (buttonField $ bool BtnRegister BtnDeregister registered) "buttonField ignores settings anyway" Nothing let widget = $(widgetFile "widgets/registerForm") @@ -304,7 +306,7 @@ postCRegisterR tid ssh csh = do aid <- requireAuthId (cid, course, registered) <- runDB $ do (Entity cid course) <- getBy404 $ TermSchoolCourseShort tid ssh csh - registered <- isJust <$> (getBy $ UniqueParticipant aid cid) + registered <- isJust <$> getBy (UniqueParticipant aid cid) return (cid, course, registered) ((regResult,_), _) <- runFormPost $ identifyForm "registerBtn" $ registerForm registered $ courseRegisterSecret course case regResult of @@ -313,21 +315,14 @@ postCRegisterR tid ssh csh = do runDB $ deleteBy $ UniqueParticipant aid cid addMessageI Info MsgCourseDeregisterOk | codeOk -> do - actTime <- liftIO $ getCurrentTime + actTime <- liftIO getCurrentTime regOk <- runDB $ insertUnique $ CourseParticipant cid aid actTime when (isJust regOk) $ addMessageI Success MsgCourseRegisterOk | otherwise -> addMessageI Warning MsgCourseSecretWrong - (_other) -> return () -- TODO check this! + _other -> return () -- TODO check this! redirect $ CourseR tid ssh csh CShowR -getCourseNewTemplateR :: Maybe TermId -> Maybe SchoolId -> Maybe CourseShorthand -> Handler Html -getCourseNewTemplateR mbTid mbSsh mbCsh = - redirect (CourseNewR, catMaybes [ ("tid",).termToText.unTermKey <$> mbTid - , ("ssh",).CI.original.unSchoolKey <$> mbSsh - , ("csh",).CI.original <$> mbCsh - ]) - getCourseNewR :: Handler Html -- call via toTextUrl getCourseNewR = do uid <- requireAuthId @@ -338,21 +333,20 @@ getCourseNewR = do let noTemplateAction = courseEditHandler True Nothing case params of -- DO NOT REMOVE: without this distinction, lecturers would never see an empty newCourseForm any more! FormMissing -> noTemplateAction - FormFailure msgs -> forM_ msgs ((addMessage Error) . toHtml) >> + FormFailure msgs -> forM_ msgs (addMessage Error . toHtml) >> noTemplateAction FormSuccess (fmap TermKey -> mbTid, fmap SchoolKey -> mbSsh, mbCsh) -> do - uid <- requireAuthId - oldCourses <- runDB $ do + oldCourses <- runDB $ E.select $ E.from $ \course -> do whenIsJust mbTid $ \tid -> E.where_ $ course E.^. CourseTerm E.==. E.val tid whenIsJust mbSsh $ \ssh -> E.where_ $ course E.^. CourseSchool E.==. E.val ssh whenIsJust mbCsh $ \csh -> E.where_ $ course E.^. CourseShorthand E.==. E.val csh let lecturersCourse = - E.exists $ E.from $ \lecturer -> do + E.exists $ E.from $ \lecturer -> E.where_ $ lecturer E.^. LecturerUser E.==. E.val uid E.&&. lecturer E.^. LecturerCourse E.==. course E.^. CourseId let lecturersSchool = - E.exists $ E.from $ \user -> do + E.exists $ E.from $ \user -> E.where_ $ user E.^. UserLecturerUser E.==. E.val uid E.&&. user E.^. UserLecturerSchool E.==. course E.^. CourseSchool let courseCreated c = @@ -366,7 +360,7 @@ getCourseNewR = do return course template <- case listToMaybe oldCourses of (Just oldTemplate) -> - let newTemplate = (courseToForm oldTemplate) in + let newTemplate = courseToForm oldTemplate in return $ Just $ newTemplate { cfCourseId = Nothing , cfTerm = TermKey $ TermIdentifier 0 Winter -- invalid, will be ignored; undefined won't work due to strictness @@ -378,7 +372,7 @@ getCourseNewR = do (tidOk,sshOk,cshOk) <- runDB $ (,,) <$> ifMaybeM mbTid True existsKey <*> ifMaybeM mbSsh True existsKey - <*> ifMaybeM mbCsh True (\csh -> (not . null) <$> selectKeysList [CourseShorthand ==. csh] [LimitTo 1]) + <*> ifMaybeM mbCsh True (\csh -> not . null <$> selectKeysList [CourseShorthand ==. csh] [LimitTo 1]) unless tidOk $ addMessageI Warning $ MsgNoSuchTerm $ fromJust mbTid -- safe, since tidOk==True otherwise unless sshOk $ addMessageI Warning $ MsgNoSuchSchool $ fromJust mbSsh -- safe, since sshOk==True otherwise unless cshOk $ addMessageI Warning $ MsgNoSuchCourseShorthand $ fromJust mbCsh @@ -401,36 +395,32 @@ pgCEditR isGetReq tid ssh csh = do courseEditHandler isGetReq $ courseToForm <$> course -getCDeleteR :: TermId -> SchoolId -> CourseShorthand -> Handler Html -getCDeleteR = error "TODO: implement getCDeleteR" -postCDeleteR :: TermId -> SchoolId -> CourseShorthand -> Handler Html -postCDeleteR = error "TODO: implement getCDeleteR" -{- TODO - | False -- DELETE -- TODO: This no longer works that way!!! See new way in Handler.Term.termEditHandler - , Just cid <- cfCourseId res -> do - runDB $ deleteCascade cid -- TODO Sicherheitsabfrage einbauen! - let cti = toPathPiece $ cfTerm res - addMessage Info [shamlet| Kurs #{cti}/#{cfShort res} wurde gelöscht!|] - redirect $ TermCourseListR $ cfTerm res --} +getCDeleteR, postCDeleteR :: TermId -> SchoolId -> CourseShorthand -> Handler Html +getCDeleteR = postCDeleteR +postCDeleteR tid ssh csh = do + Entity cId _ <- runDB . getBy404 $ TermSchoolCourseShort tid ssh csh + deleteR $ (courseDeleteRoute $ Set.singleton cId) + { drAbort = SomeRoute $ CourseR tid ssh csh CShowR + , drSuccess = SomeRoute $ TermSchoolCourseListR tid ssh + } -- | Course Creation and Editing -- | IMPORTANT: in case of Edit, Post/Get Request is provided with the same CourseForm template (cannot be Nothing), -- | since an edit is identified via cfCourseId which is not contained in the received form data for security reasons! -courseEditHandler :: Bool -> Maybe CourseForm -> Handler Html -courseEditHandler isGet mbCourseForm = do +courseEditHandler :: Bool -> Maybe CourseForm -> Handler Html -- FIXME: _isGet is not used +courseEditHandler _isGet mbCourseForm = do aid <- requireAuthId -- TODO: Verify that Editor is owner of the Course to be Edited!!! ((result, formWidget), formEnctype) <- runFormPost $ newCourseForm mbCourseForm case result of - (FormSuccess res@( - CourseForm { cfCourseId = Nothing - , cfShort = csh - , cfSchool = ssh - , cfTerm = tid - })) -> do -- create new course + (FormSuccess res@CourseForm + { cfCourseId = Nothing + , cfShort = csh + , cfSchool = ssh + , cfTerm = tid + }) -> do -- create new course now <- liftIO getCurrentTime - insertOkay <- runDB $ insertUnique $ Course + insertOkay <- runDB $ insertUnique Course { courseName = cfName res , courseDescription = cfDesc res , courseLinkExternal = cfLink res @@ -454,34 +444,33 @@ courseEditHandler isGet mbCourseForm = do Nothing -> addMessageI Warning $ MsgCourseNewDupShort tid ssh csh - (FormSuccess res@( - CourseForm { cfCourseId = Just cid - , cfShort = csh - , cfSchool = ssh - , cfTerm = tid - })) -> do -- edit existing course + (FormSuccess res@CourseForm + { cfCourseId = Just cid + , cfShort = csh + , cfSchool = ssh + , cfTerm = tid + }) -> do -- edit existing course now <- liftIO getCurrentTime -- addMessage "debug" [shamlet| #{show res}|] success <- runDB $ do old <- get cid case old of Nothing -> addMessageI Error MsgInvalidInput $> False - (Just oldCourse) -> do - updOkay <- myReplaceUnique cid ( -- replaceUnique requires Eq Course, which we cannot have - Course { courseName = cfName res - , courseDescription = cfDesc res - , courseLinkExternal = cfLink res - , courseShorthand = cfShort res - , courseTerm = cfTerm res -- dangerous - , courseSchool = cfSchool res - , courseCapacity = cfCapacity res - , courseRegisterSecret = cfSecret res - , courseMaterialFree = cfMatFree res - , courseRegisterFrom = cfRegFrom res - , courseRegisterTo = cfRegTo res - , courseDeregisterUntil = cfDeRegUntil res - } - ) + (Just _) -> do + updOkay <- myReplaceUnique cid Course + { courseName = cfName res + , courseDescription = cfDesc res + , courseLinkExternal = cfLink res + , courseShorthand = cfShort res + , courseTerm = cfTerm res -- dangerous + , courseSchool = cfSchool res + , courseCapacity = cfCapacity res + , courseRegisterSecret = cfSecret res + , courseMaterialFree = cfMatFree res + , courseRegisterFrom = cfRegFrom res + , courseRegisterTo = cfRegTo res + , courseDeregisterUntil = cfDeRegUntil res + } case updOkay of (Just _) -> addMessageI Warning (MsgCourseEditDupShort tid ssh csh) $> False Nothing -> do @@ -491,7 +480,7 @@ courseEditHandler isGet mbCourseForm = do when success $ redirect $ CourseR tid ssh csh CShowR (FormFailure _) -> addMessageI Warning MsgInvalidInput - (FormMissing) -> return () + FormMissing -> return () actionUrl <- fromMaybe CourseNewR <$> getCurrentRoute defaultLayout $ do setTitleI MsgCourseEditTitle @@ -593,7 +582,7 @@ newCourseForm template = identForm FIDcourse $ \html -> do validateCourse :: CourseForm -> [Text] -validateCourse (CourseForm{..}) = +validateCourse CourseForm{..} = [ msg | (False, msg) <- [ ( NTop cfRegFrom <= NTop cfRegTo @@ -613,18 +602,32 @@ validateCourse (CourseForm{..}) = getCUsersR :: TermId -> SchoolId -> CourseShorthand -> Handler Html -getCUsersR tid ssh csh = undefined -- TODO +getCUsersR = error "CUsersR: Not implemented" getCUserR :: TermId -> SchoolId -> CourseShorthand -> CryptoUUIDUser -> Handler Html -getCUserR tid ssh csh uuid = do - uid <- decrypt uuid +getCUserR _tid _ssh _csh uCId = do + -- Has authorization checks (OR): + -- + -- - User is current member of course + -- - User has submitted in course + -- - User is member of registered group for course + -- - User is member of a tutorial for course + -- - User is corrector for course + -- - User is a tutor for course + -- - User is a lecturer for course + uid <- decrypt uCId User{..} <- runDB $ get404 uid - defaultLayout $ + -- USE src/utils/Form.formResult + defaultLayout -- TODO [whamlet| - TODO - Lecturer's Page for User ^{nameWidget userDisplayName userSurname} + ^{nameWidget userDisplayName userSurname} |] getCHiWisR :: TermId -> SchoolId -> CourseShorthand -> Handler Html -getCHiWisR tid ssh csh = undefined -- TODO +getCHiWisR = error "CHiWisR: Not implemented" + +getCNotesR, postCNotesR :: TermId -> SchoolId -> CourseShorthand -> Handler Html +-- NOTE: The route getNotesR is abused for correctorORlecturer access rights! +getCNotesR = error "CNotesR: Not implemented" +postCNotesR = error "CNotesR: Not implemented" diff --git a/src/Handler/CryptoIDDispatch.hs b/src/Handler/CryptoIDDispatch.hs index 9a744f208..54c2ec760 100644 --- a/src/Handler/CryptoIDDispatch.hs +++ b/src/Handler/CryptoIDDispatch.hs @@ -1,23 +1,9 @@ -{-# LANGUAGE NoImplicitPrelude - , DataKinds - , KindSignatures - , TypeFamilies - , FlexibleInstances - , TypeOperators - , RankNTypes - , PolyKinds - , RecordWildCards - , MultiParamTypeClasses - , ScopedTypeVariables - , ViewPatterns - #-} - module Handler.CryptoIDDispatch ( getCryptoUUIDDispatchR , getCryptoFileNameDispatchR ) where -import Import hiding (Proxy) +import Import import Data.Proxy diff --git a/src/Handler/Home.hs b/src/Handler/Home.hs index 73aa370d2..ae3691266 100644 --- a/src/Handler/Home.hs +++ b/src/Handler/Home.hs @@ -1,48 +1,15 @@ -{-# LANGUAGE RecordWildCards #-} -{-# LANGUAGE NoImplicitPrelude #-} -{-# LANGUAGE OverloadedStrings #-} -{-# LANGUAGE TemplateHaskell #-} -{-# LANGUAGE QuasiQuotes #-} -{-# LANGUAGE MultiParamTypeClasses #-} -{-# LANGUAGE IncoherentInstances #-} -- why is this needed? Instance for "display deadline" ought to be clear -{-# LANGUAGE TypeFamilies #-} -{-# LANGUAGE FlexibleContexts #-} -{-# LANGUAGE PartialTypeSignatures #-} - module Handler.Home where import Import import Handler.Utils import qualified Data.Map as Map - -import Data.Time hiding (formatTime) --- import qualified Data.Text as T --- import Yesod.Form.Bootstrap3 - --- import Web.PathPieces (showToPathPiece, readFromPathPiece) - --- import Control.Lens --- import Colonnade hiding (fromMaybe, singleton) --- import Yesod.Colonnade +import qualified Data.Set as Set import qualified Database.Esqueleto as E --- import Text.Shakespeare.Text - +import Jobs import Development.GitRev --- import qualified Data.UUID.Cryptographic as UUID - - --- CONSTANTS: TODO: make configurable elsewhere -offSheetDeadlines :: NominalDiffTime -offSheetDeadlines = 15 -offCourseDeadlines :: NominalDiffTime -offCourseDeadlines = 15 ---offExamDeadlines :: NominalDiffTime ---offExamDeadlines = 15 - - getHomeR :: Handler Html getHomeR = do @@ -58,43 +25,45 @@ homeAnonymous = do let tableData :: E.SqlExpr (Entity Course) -> E.SqlQuery (E.SqlExpr (Entity Course)) tableData course = do - E.where_ $ (E.not_ $ E.isNothing $ course E.^. CourseRegisterFrom) -- DO: do this with isAuthorized in dbtProj + E.where_ $ E.not_ (E.isNothing $ course E.^. CourseRegisterFrom) -- DO: do this with isAuthorized in dbtProj E.&&. (course E.^. CourseRegisterFrom E.<=. E.val (Just cTime)) - E.&&. ((E.isNothing $ course E.^. CourseRegisterTo) - E.||. (course E.^. CourseRegisterTo E.>=. E.val (Just cTime))) + E.&&. ( E.isNothing (course E.^. CourseRegisterTo) + E.||. course E.^. CourseRegisterTo E.>=. E.val (Just cTime) + ) return course colonnade :: Colonnade Sortable (DBRow (Entity Course)) (DBCell (HandlerT UniWorX IO) ()) colonnade = mconcat [ -- dbRow - sortable (Just "term") (i18nCell MsgTerm) $ \DBRow{ dbrOutput=(Entity {entityVal = course}) } -> + sortable (Just "term") (i18nCell MsgTerm) $ \DBRow{ dbrOutput=Entity{entityVal = course} } -> textCell $ display $ courseTerm course - , sortable (Just "school") (i18nCell MsgCourseSchool) $ \DBRow{ dbrOutput=(Entity {entityVal = course}) } -> do + , sortable (Just "school") (i18nCell MsgCourseSchool) $ \DBRow{ dbrOutput=Entity{entityVal = course} } -> textCell $ display $ courseSchool course - , sortable (Just "course") (i18nCell MsgCourse) $ \DBRow{ dbrOutput=(Entity {entityVal = course}) } -> do + , sortable (Just "course") (i18nCell MsgCourse) $ \DBRow{ dbrOutput=Entity{entityVal = course} } -> do let tid = courseTerm course ssh = courseSchool course csh = courseShorthand course anchorCell (CourseR tid ssh csh CShowR) (toWidget $ display csh) - , sortable (Just "deadline") (i18nCell MsgRegisterTo) $ \DBRow{ dbrOutput=(Entity {entityVal = course}) } -> + , sortable (Just "deadline") (i18nCell MsgRegisterTo) $ \DBRow{ dbrOutput=Entity{entityVal = course} } -> cell $ traverse (formatTime SelFormatDateTime) (courseRegisterTo course) >>= maybe mempty toWidget ] - ((), courseTable) <- dbTable def $ DBTable + courseTable <- runDB $ dbTableWidget' def DBTable { dbtSQLQuery = tableData + , dbtRowKey = (E.^. CourseId) , dbtColonnade = colonnade , dbtProj = return , dbtSorting = Map.fromList [ ( "term" - , SortColumn $ \(course) -> course E.^. CourseTerm + , SortColumn $ \course -> course E.^. CourseTerm ) , ( "school" - , SortColumn $ \(course) -> course E.^. CourseSchool + , SortColumn $ \course -> course E.^. CourseSchool ) , ( "course" - , SortColumn $ \(course) -> course E.^. CourseShorthand + , SortColumn $ \course -> course E.^. CourseShorthand ) , ( "deadline" - , SortColumn $ \(course) -> course E.^. CourseRegisterTo + , SortColumn $ \course -> course E.^. CourseRegisterTo ) ] , dbtFilter = mempty {- [ ( "term" @@ -103,24 +72,24 @@ homeAnonymous = do | otherwise -> course E.^. CourseTerm `E.in_` E.valList (Set.toList tids) ) ] -} + , dbtFilterUI = mempty , dbtStyle = def + , dbtParams = def , dbtIdent = "upcomingdeadlines" :: Text } - let features = $(widgetFile "featureList") - addMessage Warning "Vorabversion! Die Implementierung von Uni2work ist noch nicht abgeschlossen!" - defaultLayout $ do - $(widgetFile "dsgvDisclaimer") + -- let features = $(widgetFile "featureList") + -- addMessage Warning "Vorabversion! Die Implementierung von Uni2work ist noch nicht abgeschlossen!" + defaultLayout + -- (widgetFile "dsgvDisclaimer") $(widgetFile "home") homeUser :: Key User -> Handler Html homeUser uid = do cTime <- liftIO getCurrentTime - let fTime = addUTCTime (offSheetDeadlines * nominalDay) cTime - - tableData :: -- E.InnerJoin (E.InnerJoin (E.SqlExpr (Entity CourseParticipant)) - -- (E.SqlExpr (Entity Course ))) - -- (E.SqlExpr (Entity Sheet )) - _ -> E.SqlQuery ( E.SqlExpr (E.Value (Key Term)) + let tableData :: E.LeftOuterJoin + (E.InnerJoin (E.InnerJoin (E.SqlExpr (Entity CourseParticipant)) (E.SqlExpr (Entity Course))) (E.SqlExpr (Entity Sheet))) + (E.InnerJoin (E.SqlExpr (Maybe (Entity Submission))) (E.SqlExpr (Maybe (Entity SubmissionUser)))) + -> E.SqlQuery ( E.SqlExpr (E.Value (Key Term)) , E.SqlExpr (E.Value SchoolId) , E.SqlExpr (E.Value CourseShorthand) , E.SqlExpr (E.Value SheetName) @@ -128,14 +97,12 @@ homeUser uid = do , E.SqlExpr (E.Value (Maybe SubmissionId))) tableData ((participant `E.InnerJoin` course `E.InnerJoin` sheet) `E.LeftOuterJoin` (submission `E.InnerJoin` subuser)) = do E.on $ submission E.?. SubmissionId E.==. subuser E.?. SubmissionUserSubmission - E.&&. (E.just $ E.val uid) E.==. subuser E.?. SubmissionUserUser + E.&&. E.just (E.val uid) E.==. subuser E.?. SubmissionUserUser E.on $ submission E.?. SubmissionSheet E.==. E.just(sheet E.^. SheetId) E.on $ course E.^. CourseId E.==. sheet E.^. SheetCourse E.on $ course E.^. CourseId E.==. participant E.^. CourseParticipantCourse E.where_ $ participant E.^. CourseParticipantUser E.==. E.val uid E.&&. sheet E.^. SheetActiveTo E.>=. E.val cTime - E.&&. sheet E.^. SheetActiveTo E.<=. E.val fTime - -- E.limit nrSheetDeadlines -- arbitrary limits are not intuitive return ( course E.^. CourseTerm , course E.^. CourseSchool @@ -166,15 +133,16 @@ homeUser uid = do anchorCell (CSheetR tid ssh csh shn SShowR) (toWidget $ display shn) , sortable (Just "deadline") (i18nCell MsgDeadline) $ \DBRow{ dbrOutput=(_, _, _, _, E.Value deadline, _) } -> cell $ formatTime SelFormatDateTime deadline >>= toWidget - , sortable (Just "done") (i18nCell MsgDone) $ \(DBRow{ dbrOutput=(E.Value tid, E.Value ssh, E.Value csh, E.Value shn, _, E.Value mbsid) }) -> + , sortable (Just "done") (i18nCell MsgDone) $ \DBRow{ dbrOutput=(E.Value tid, E.Value ssh, E.Value csh, E.Value shn, _, E.Value mbsid) } -> case mbsid of Nothing -> mempty (Just sid) -> anchorCellM (CSubmissionR tid ssh csh shn <$> encrypt sid <*> pure SubShowR) tickmark ] - let validator = def & defaultSorting [("done",SortDesc), ("deadline",SortDesc)] - ((), sheetTable) <- dbTable validator $ DBTable + let validator = def & defaultSorting [SortDescBy "done", SortAscBy "deadline"] + sheetTable <- runDB $ dbTableWidget' validator DBTable { dbtSQLQuery = tableData + , dbtRowKey = \((_ `E.InnerJoin` _ `E.InnerJoin` sheet) `E.LeftOuterJoin` _) -> sheet E.^. SheetId , dbtColonnade = colonnade , dbtProj = \row@DBRow{ dbrOutput = (E.Value tid, E.Value ssh, E.Value csh, E.Value shn, _, _) } -> row <$ guardM (lift $ (== Authorized) <$> evalAccessDB (CSheetR tid ssh csh shn SShowR) False) @@ -204,14 +172,16 @@ homeUser uid = do | otherwise -> course E.^. CourseTerm `E.in_` E.valList (Set.toList tids) ) ] -} + , dbtFilterUI = mempty , dbtStyle = def { dbsEmptyStyle = DBESNoHeading, dbsEmptyMessage = MsgNoUpcomingSheetDeadlines } + , dbtParams = def , dbtIdent = "upcomingdeadlines" :: Text } - addMessage Warning "Vorabversion! Die Implementierung von Uni2work ist noch nicht abgeschlossen." - defaultLayout $ do + -- addMessage Warning "Vorabversion! Die Implementierung von Uni2work ist noch nicht abgeschlossen." + defaultLayout $ -- setTitle "Willkommen zum Uni2work Test!" $(widgetFile "homeUser") - $(widgetFile "dsgvDisclaimer") + -- (widgetFile "dsgvDisclaimer") getVersionR :: Handler TypedContent @@ -224,3 +194,93 @@ getVersionR = selectRep $ do $(widgetFile "versionHistory") provideRep $ return ($gitDescribe :: Text) + + + + +data HelpIdentOptions = HIUser | HIEmail | HIAnonymous + deriving (Eq, Ord, Bounded, Enum, Show, Read) + +instance Universe HelpIdentOptions +instance Finite HelpIdentOptions + +nullaryPathPiece ''HelpIdentOptions (camelToPathPiece' 1) +embedRenderMessage ''UniWorX ''HelpIdentOptions (("Help" <>) . dropPrefix "HI") + +data HelpForm = HelpForm + { hfReferer:: Maybe (Route UniWorX) + , hfUserId :: Either (Maybe Address) UserId + , hfRequest:: Text + } + +helpForm :: Maybe (Route UniWorX) -> Maybe UserId -> AForm _ HelpForm +helpForm mReferer mUid = HelpForm + <$> aopt routeField (fslI MsgHelpProblemPage & inputReadonly) (Just <$> mReferer) + <*> multiActionA (fslI MsgHelpAnswer) identActions (HIUser <$ mUid) + <*> (unTextarea <$> areq textareaField (fslI MsgHelpRequest) Nothing) + <* submitButton + where + identActions :: Map _ (AForm _ (Either (Maybe Address) UserId)) + identActions = Map.fromList $ case mUid of + (Just uid) -> (HIUser, pure $ Right uid):defaultActions + Nothing -> defaultActions + + defaultActions = + [ (HIEmail, Left . Just <$> (Address <$> aopt textField (fslI MsgName) Nothing <*> apreq emailField (fslI MsgEMail) Nothing)) + , (HIAnonymous, pure $ Left Nothing) + ] + +getHelpR, postHelpR :: Handler Html +getHelpR = postHelpR +postHelpR = do + mUid <- maybeAuthId + mReferer <- flip formResultMaybe return <=< runInputGetResult $ iopt routeField (toPathPiece GetReferer) + + ((res,formWidget),formEnctype) <- runFormPost $ renderAForm FormStandard $ helpForm mReferer mUid + + formResultModal res HelpR $ \HelpForm{..} -> do + now <- liftIO getCurrentTime + hfReferer' <- traverse toTextUrl hfReferer + queueJob' JobHelpRequest + { jSender = hfUserId + , jHelpRequest = hfRequest + , jRequestTime = now + , jReferer = hfReferer' + } + tell . pure =<< messageI Success MsgHelpSent + + defaultLayout $ do + setTitle "Hilfe" -- TODO: International + isModal <- hasCustomHeader HeaderIsModal + $(widgetFile "help") + + +getAuthPredsR, postAuthPredsR :: Handler Html +getAuthPredsR = postAuthPredsR +postAuthPredsR = do + (AuthTagActive authTagCurrentActive) <- fromMaybe def <$> lookupSessionJson SessionActiveAuthTags + + let + blacklist = Set.fromList [ AuthFree, AuthDevelopment, AuthDeprecated ] + taForm authTag + | authTag `Set.member` blacklist = aforced checkBoxField (fslI authTag) (authTagIsActive def authTag) + | otherwise = fromMaybe False <$> aopt checkBoxField (fslI authTag) (Just . Just $ authTagCurrentActive authTag) + + ((authActiveRes, authActiveWidget), authActiveEnctype) <- runFormPost . renderAForm FormStandard + $ AuthTagActive + <$> (submitButton -- for convenience, avoids frequent scrolling + *> funcForm taForm (fslI MsgActiveAuthTags) True) + <* submitButton + + mReferer <- runMaybeT $ do + param <- MaybeT (lookupGetParam $ toPathPiece GetReferer) <|> MaybeT (lookupPostParam $ toPathPiece GetReferer) + MaybeT . return $ fromPathPiece param + formResult authActiveRes $ \authTagActive -> do + setSessionJson SessionActiveAuthTags authTagActive + modifySessionJson SessionInactiveAuthTags . fmap $ Set.filter (not . authTagIsActive authTagActive) + addMessageI Success MsgAuthPredsActiveChanged + redirect $ fromMaybe AuthPredsR mReferer + + defaultLayout $ do + setTitleI MsgAuthPredsActive + $(widgetFile "authpreds") diff --git a/src/Handler/Profile.hs b/src/Handler/Profile.hs index 874971fec..38f064dd8 100644 --- a/src/Handler/Profile.hs +++ b/src/Handler/Profile.hs @@ -1,17 +1,3 @@ -{-# LANGUAGE NoImplicitPrelude #-} -{-# LANGUAGE MultiWayIf, LambdaCase #-} -{-# LANGUAGE OverloadedStrings #-} -{-# LANGUAGE RecordWildCards #-} -{-# LANGUAGE PatternSynonyms #-} -{-# LANGUAGE PartialTypeSignatures #-} -{-# LANGUAGE ScopedTypeVariables #-} -{-# LANGUAGE QuasiQuotes #-} -{-# LANGUAGE TemplateHaskell #-} -{-# LANGUAGE MultiParamTypeClasses #-} -{-# LANGUAGE TypeFamilies #-} -{-# LANGUAGE TypeOperators #-} -{-# LANGUAGE FlexibleInstances #-} - module Handler.Profile where import Import @@ -37,6 +23,7 @@ data SettingsForm = SettingsForm , stgDate :: DateTimeFormat , stgTime :: DateTimeFormat , stgDownloadFiles :: Bool + , stgNotificationSettings :: NotificationSettings } makeSettingForm :: Maybe SettingsForm -> Form SettingsForm @@ -53,21 +40,25 @@ makeSettingForm template = identForm FIDsettings $ \html -> do <*> areq checkBoxField (fslI MsgDownloadFiles & setTooltip MsgDownloadFilesTip ) (stgDownloadFiles <$> template) + <*> (NotificationSettings <$> funcForm nsForm (fslI MsgNotificationSettings) True) <* submitButton return (result, widget) -- no validation required here + where + nsForm nt = fromMaybe False <$> aopt checkBoxField (fslI nt) (Just $ flip notificationAllowed nt . stgNotificationSettings <$> template) - -getProfileR :: Handler Html -getProfileR = do +getProfileR, postProfileR :: Handler Html +getProfileR = postProfileR +postProfileR = do (uid, User{..}) <- requireAuthPair - let settingsTemplate = Just $ SettingsForm + let settingsTemplate = Just SettingsForm { stgMaxFavourties = userMaxFavourites , stgTheme = userTheme , stgDateTime = userDateTimeFormat , stgDate = userDateFormat , stgTime = userTimeFormat , stgDownloadFiles = userDownloadFiles + , stgNotificationSettings = userNotificationSettings } ((res,formWidget), formEnctype) <- runFormPost $ makeSettingForm settingsTemplate case res of @@ -79,146 +70,167 @@ getProfileR = do , UserDateFormat =. stgDate , UserTimeFormat =. stgTime , UserDownloadFiles =. stgDownloadFiles + , UserNotificationSettings =. stgNotificationSettings ] when (stgMaxFavourties < userMaxFavourites) $ do -- prune Favourites to user-defined size oldFavs <- selectKeysList [ CourseFavouriteUser ==. uid] [ Desc CourseFavouriteTime - , OffsetBy $ stgMaxFavourties + , OffsetBy stgMaxFavourties ] mapM_ delete oldFavs - addMessageI Info $ MsgSettingsUpdate + addMessageI Info MsgSettingsUpdate redirect ProfileR -- TODO: them change does not happen without redirect - (FormFailure msgs) -> forM_ msgs $ (addMessage Warning) . toHtml + (FormFailure msgs) -> forM_ msgs $ addMessage Warning . toHtml _ -> return () - - (admin_rights,lecturer_rights,lecture_corrector,studies) <- runDB $ (,,,) <$> - (E.select $ E.from $ \(adright `E.InnerJoin` school) -> do - E.where_ $ adright E.^. UserAdminUser E.==. E.val uid - E.on $ adright E.^. UserAdminSchool E.==. school E.^. SchoolId - return (school E.^. SchoolShorthand) - ) - <*> - (E.select $ E.from $ \(lecright `E.InnerJoin` school) -> do - E.where_ $ lecright E.^. UserLecturerUser E.==. E.val uid - E.on $ lecright E.^. UserLecturerSchool E.==. school E.^. SchoolId - return (school E.^. SchoolShorthand) - ) - <*> - (E.select $ E.distinct $ E.from $ \(sheet `E.InnerJoin` corrector `E.InnerJoin` course) -> do - E.on $ sheet E.^. SheetCourse E.==. course E.^. CourseId - E.on $ sheet E.^. SheetId E.==. corrector E.^. SheetCorrectorSheet - E.where_ $ corrector E.^. SheetCorrectorUser E.==. E.val uid - return (course E.^. CourseTerm, course E.^. CourseSchool, course E.^. CourseShorthand) - ) - <*> - (E.select $ E.from $ \(studydegree `E.InnerJoin` studyfeat `E.InnerJoin` studyterms) -> 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) - ) - let formText = Just MsgSettings + let formText = Nothing :: Maybe UniWorXMessage actionUrl = ProfileR - settingsForm = $(widgetFile "formPageI18n") defaultLayout $ do setTitle . toHtml $ userIdent <> "'s User page" - $(widgetFile "profile") - $(widgetFile "dsgvDisclaimer") - -postProfileR :: Handler Html -postProfileR = do - -- TODO - getProfileR + $(widgetFile "formPageI18n") postProfileDataR :: Handler Html postProfileDataR = do - ((btnResult,_), _) <- runFormPost $ buttonForm + ((btnResult,_), _) <- runFormPost buttonForm case btnResult of (FormSuccess BtnDelete) -> do (uid, User{..}) <- requireAuthPair - addMessage Warning "Delete-Knopf gedrückt" - addMessage Error "Löschen der Daten wurde noch nicht implementiert." - -- first determine all submission that solely depend on this user: - -- SubmissionGroup / SubmissionGroupUser - -- Submission / SubmissionUser - -- runDB $ deleteCascade uid - (FormSuccess BtnAbort ) -> do - addMessageI Info MsgAborted - redirect ProfileDataR - _other -> return () - getProfileDataR + clearCreds False -- Logout-User + ((deletedSubmissions,groupSubmissions),deletedSubmissionGroups) <- runDB $ deleteUser uid + -- addMessageIHamlet + $(addMessageFile Success "templates/deletedUser.hamlet") -- USE THIS ONE + -- addMessageI Success $ MsgDeleteUser deletedSubmissions + -- when (groupSubmissions > 0) $ addMessageI Info $ MsgDeleteUserGroupSubmissions groupSubmissions + defaultLayout + $(widgetFile "deletedUser") + + -- (FormSuccess BtnAbort ) -> do + -- addMessageI Info MsgAborted + -- redirect ProfileDataR + _other -> getProfileDataR -getProfileDataR :: Handler Html +deleteUser :: UserId -> DB ((Int,Int),Int64) -- TODO: Restrict deletions for lecturers, tutors and students in course that won't allow deregistration +deleteUser duid = do + -- E.deleteCount for submissions is not cascading, hence we first select and then delete manually + -- We delete all files tied to submissions where the user is the lone submissionUser + + -- Do not deleteCascade submissions where duid is the corrector: + updateWhere [SubmissionRatingBy ==. Just duid] [SubmissionRatingBy =. Nothing] + + groupSubmissions <- selectSubmissionsWhere (\numBuddies -> numBuddies E.>. E.val (0::Int64)) + singleSubmissions <- selectSubmissionsWhere (\numBuddies -> numBuddies E.==. E.val (0::Int64)) + deleteCascade duid + forM_ singleSubmissions $ \(E.Value submissionId) -> do + deleteFileIds <- map E.unValue <$> getSubmissionFiles submissionId + deleteCascade submissionId + deleteCascadeWhere [FileId <-. deleteFileIds] -- TODO: throws exception for de-duplicated files + + deletedSubmissionGroups <- deleteSingleSubmissionGroups + return ((length singleSubmissions, length groupSubmissions),deletedSubmissionGroups) + where + selectSubmissionsWhere :: (E.SqlExpr (E.Value Int64) -> E.SqlExpr (E.Value Bool)) -> DB [E.Value (Key Submission)] + selectSubmissionsWhere whereBuddies = E.select $ E.from $ \(submission `E.InnerJoin` suser) -> do + E.on $ submission E.^. SubmissionId E.==. suser E.^. SubmissionUserSubmission + let numBuddies = E.sub_select $ E.from $ \subUsers -> do + E.where_ $ subUsers E.^. SubmissionUserSubmission E.==. submission E.^. SubmissionId + E.&&. subUsers E.^. SubmissionUserUser E.!=. E.val duid + return E.countRows + E.where_ $ suser E.^. SubmissionUserUser E.==. E.val duid + E.&&. whereBuddies numBuddies + return $ submission E.^. SubmissionId + + getSubmissionFiles :: SubmissionId -> DB [E.Value (Key File)] + getSubmissionFiles subId = E.select $ E.from $ \file -> do + E.where_ $ E.exists $ E.from $ \submissionFile -> + E.where_ $ submissionFile E.^. SubmissionFileSubmission E.==. E.val subId + E.&&. submissionFile E.^. SubmissionFileFile E.==. file E.^. FileId + return $ file E.^. FileId + + deleteSingleSubmissionGroups = E.deleteCount $ E.from $ \submissionGroup -> do + E.where_ $ E.exists $ E.from $ \subGroupUser -> + E.where_ $ subGroupUser E.^. SubmissionGroupUserSubmissionGroup E.==. submissionGroup E.^. SubmissionGroupId + E.&&. subGroupUser E.^. SubmissionGroupUserUser E.==. E.val duid + E.where_ $ E.notExists $ E.from $ \subGroupUser -> + E.where_ $ subGroupUser E.^. SubmissionGroupUserSubmissionGroup E.==. submissionGroup E.^. SubmissionGroupId + E.&&. subGroupUser E.^. SubmissionGroupUserUser E.!=. E.val duid + + + + + + +getProfileDataR :: Handler Html getProfileDataR = do (uid, User{..}) <- requireAuthPair -- mr <- getMessageRender - -- Tabelle mit eigenen Kursen - (hasRows, ownedCoursesTable) <- mkOwnedCoursesTable uid - -- Tabelle mit allen Teilnehmer: Kurs (link), Datum - enrolledCoursesTable <- mkEnrolledCoursesTable uid - -- Tabelle mit allen Klausuren und Noten - examTable <- return [whamlet| Klausuren werden momentan leider noch nicht unterstützt.|] - -- Tabelle mit allen Abgaben und Abgabe-Gruppen - submissionTable <- mkSubmissionTable uid - -- Tabelle mit allen Abgabegruppen - submissionGroupTable <- mkSubmissionGroupTable uid - -- Tabelle mit allen Korrektor-Aufgaben - correctionsTable <- mkCorrectionsTable uid - -- Tabelle mit allen eigenen Tutorials - ownTutorialTable <- return [whamlet| Übungsgruppen werden momentan leider noch nicht unterstützt.|] - -- Tabelle mit allen Tutorials - tutorialTable <- return [whamlet| Übungsgruppen werden momentan leider noch nicht unterstützt.|] + (admin_rights,lecturer_rights,lecture_corrector,studies) <- runDB $ (,,,) <$> + E.select + ( E.from $ \(adright `E.InnerJoin` school) -> do + E.where_ $ adright E.^. UserAdminUser E.==. E.val uid + E.on $ adright E.^. UserAdminSchool E.==. school E.^. SchoolId + return (school E.^. SchoolShorthand) + ) + <*> + E.select + ( E.from $ \(lecright `E.InnerJoin` school) -> do + E.where_ $ lecright E.^. UserLecturerUser E.==. E.val uid + E.on $ lecright E.^. UserLecturerSchool E.==. school E.^. SchoolId + return (school E.^. SchoolShorthand) + ) + <*> + E.select + ( E.distinct $ E.from $ \(sheet `E.InnerJoin` corrector `E.InnerJoin` course) -> do + E.on $ sheet E.^. SheetCourse E.==. course E.^. CourseId + E.on $ sheet E.^. SheetId E.==. corrector E.^. SheetCorrectorSheet + E.where_ $ corrector E.^. SheetCorrectorUser E.==. E.val uid + return (course E.^. CourseTerm, course E.^. CourseSchool, course E.^. CourseShorthand) + ) + <*> + E.select + ( E.from $ \(studydegree `E.InnerJoin` studyfeat `E.InnerJoin` studyterms) -> 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) + ) + ( (hasRows, ownedCoursesTable) + , enrolledCoursesTable + , submissionTable + , submissionGroupTable + , correctionsTable + ) <- runDB $ (,,,,) + <$> mkOwnedCoursesTable uid -- Tabelle mit eigenen Kursen + <*> mkEnrolledCoursesTable uid -- Tabelle mit allen Teilnehmer: Kurs (link), Datum + <*> mkSubmissionTable uid -- Tabelle mit allen Abgaben und Abgabe-Gruppen + <*> mkSubmissionGroupTable uid -- Tabelle mit allen Abgabegruppen + <*> mkCorrectionsTable uid -- Tabelle mit allen Korrektor-Aufgaben + + + let examTable = [whamlet| Klausuren werden momentan leider noch nicht unterstützt.|] + let ownTutorialTable = [whamlet|Übungsgruppen werden momentan leider noch nicht unterstützt.|] + let tutorialTable = [whamlet|Übungsgruppen werden momentan leider noch nicht unterstützt.|] + -- Delete Button - (btnWdgt, btnEnctype) <- generateFormPost (buttonForm :: Form BtnDelete) - -- TODO: move this into a Message and/or Widget-File - let delWdgt = [whamlet| - - - Sind Sie sich absolut sicher, alle Ihre in Uni2work gespeicherten Daten zu löschen? - - Während der Testphase von Uni2work können Sie hiermit - Ihren Account bei Uni2work vollständig löschen. - Mit Ihrem Campus-Account können Sie sich aber danach - jederzeit erneut einloggen, wodurch wieder ein leerer Account erstellt wird. - - Hochgeladene Hausaufgaben-Dateien werden unabhhängig vom Urherber nur dann gelöscht, - wenn die Dateien ausschließlich Ihnen zugeordnet sind. - Dateien aus Gruppenabgaben werden also erst dann gelöscht, - wenn alle Gruppenmitglieder Ihren Account gelöscht haben. - - Achtung: - Auch abgegebene Hausübungen werden gelöscht! - Falls ein Veranstalter Informationen darüber nicht anderweitig gespeichert hat, - kann dadurch ein etwaiger Hausaufgabenbonus verloren gehen. - (Verbuchte Noten sollten dadurch nicht betroffen sein, aber in einem etwaigen - Streitfall konnen die per Uni2work verwalteten Hausaufgaben dann - auch nicht mehr rekonstruiert/berücksichtigt werden.) - - Nach der Testphase von Uni2work wird das Löschen eines Accounts etwas - eingeschränkt werden, da z.B. Klausurnoten 5 Jahre bis nach Exmatrikulation - aufbewahrt werden müssen. - - ^{btnWdgt} - |] + (btnWdgt, btnEnctype) <- generateFormPost (buttonForm :: Form ButtonDelete) defaultLayout $ do + let delWdgt = $(widgetFile "widgets/data-delete") $(widgetFile "profileData") $(widgetFile "dsgvDisclaimer") -mkOwnedCoursesTable :: UserId -> Handler (Bool, Widget) +mkOwnedCoursesTable :: UserId -> DB (Bool, Widget) -- Table listing all courses that the given user is a lecturer for mkOwnedCoursesTable = let dbtIdent = "courseOwnership" :: Text @@ -228,14 +240,15 @@ mkOwnedCoursesTable = -> ((E.SqlExpr (Entity Course) `E.InnerJoin` E.SqlExpr (Entity Lecturer)) -> a) withType = id - dbtSQLQuery' uid = \(course `E.InnerJoin` lecturer) -> do + dbtSQLQuery' uid (course `E.InnerJoin` lecturer) = do E.on $ course E.^. CourseId E.==. lecturer E.^. LecturerCourse E.where_ $ lecturer E.^. LecturerUser E.==. E.val uid return ( course E.^. CourseTerm , course E.^. CourseSchool , course E.^. CourseShorthand ) - dbtProj = \x -> return $ x & _dbrOutput %~ (\(E.Value tid, E.Value ssh, E.Value csh) -> (tid,ssh,csh)) + dbtRowKey (course `E.InnerJoin` _) = course E.^. CourseId + dbtProj = return . (_dbrOutput %~ (\(E.Value tid, E.Value ssh, E.Value csh) -> (tid,ssh,csh))) dbtColonnade = mconcat [ dbRow @@ -247,10 +260,10 @@ mkOwnedCoursesTable = schoolCell <$> view (_dbrOutput . _1 . re _Just) <*> view (_dbrOutput . _2 ) , sortable (Just "course") (i18nCell MsgCourse) $ - courseCellCL <$> view (_dbrOutput) + courseCellCL <$> view _dbrOutput ] - validator = def & defaultSorting [("term",SortDesc),("school",SortAsc),("course",SortAsc)] + validator = def & defaultSorting [ SortDescBy "term", SortAscBy "school", SortAscBy "course" ] dbtSorting = Map.fromList [ ( "course", SortColumn $ withType $ \(crse `E.InnerJoin` _) -> crse E.^. CourseShorthand) , ( "term" , SortColumn $ withType $ \(crse `E.InnerJoin` _) -> crse E.^. CourseTerm ) @@ -261,18 +274,20 @@ mkOwnedCoursesTable = , ( "term", FilterColumn $ withType $ \(crse `E.InnerJoin` _) -> emptyOrIn $ crse E.^. CourseTerm ) , ( "school", FilterColumn $ withType $ \(crse `E.InnerJoin` _) -> emptyOrIn $ crse E.^. CourseSchool ) ] - in \uid -> let dbtSQLQuery = dbtSQLQuery' uid in (_1 %~ getAny) <$> (dbTableWidget validator DBTable{..}) + dbtFilterUI = mempty + dbtParams = def + in \uid -> let dbtSQLQuery = dbtSQLQuery' uid in (_1 %~ getAny) <$> dbTableWidget validator DBTable{..} -mkEnrolledCoursesTable :: UserId -> Handler Widget +mkEnrolledCoursesTable :: UserId -> DB Widget -- Table listing all courses that the given user is enrolled in mkEnrolledCoursesTable = let withType :: ((E.SqlExpr (Entity Course) `E.InnerJoin` E.SqlExpr (Entity CourseParticipant)) -> a) -> ((E.SqlExpr (Entity Course) `E.InnerJoin` E.SqlExpr (Entity CourseParticipant)) -> a) withType = id - validator = def & defaultSorting [("time",SortDesc)] + validator = def & defaultSorting [SortDescBy "time"] in \uid -> dbTableWidget' validator DBTable @@ -281,6 +296,7 @@ mkEnrolledCoursesTable = E.on $ course E.^. CourseId E.==. participant E.^. CourseParticipantCourse E.where_ $ participant E.^. CourseParticipantUser E.==. E.val uid return (course, participant E.^. CourseParticipantRegistration) + , dbtRowKey = \(course `E.InnerJoin` _) -> course E.^. CourseId , dbtProj = \x -> return $ x & _dbrOutput . _2 %~ E.unValue , dbtColonnade = mconcat [ dbRow @@ -288,7 +304,7 @@ mkEnrolledCoursesTable = termCell <$> view (_dbrOutput . _1 . _entityVal . _courseTerm) , sortable (Just "school") (i18nCell MsgCourseSchool) . magnify (_dbrOutput . _1 . _entityVal) $ schoolCell <$> view ( _courseTerm . re _Just) - <*> view ( _courseSchool ) + <*> view _courseSchool , sortable (Just "course") (i18nCell MsgCourse) $ courseCell <$> view (_dbrOutput . _1 . _entityVal) , sortable (Just "time") (i18nCell MsgRegistered) $ do @@ -307,12 +323,14 @@ mkEnrolledCoursesTable = , ( "school", FilterColumn $ withType $ \(crse `E.InnerJoin` _) -> emptyOrIn $ crse E.^. CourseSchool) -- , ( "time" , FilterColumn $ \(_ `E.InnerJoin` part :: CourseTableData) -> emptyOrIn $ part E.^. CourseParticipantRegistration ) ] + , dbtFilterUI = mempty , dbtStyle = def + , dbtParams = def } -mkSubmissionTable :: UserId -> Handler Widget +mkSubmissionTable :: UserId -> DB Widget -- Table listing all submissions for the given user mkSubmissionTable = let dbtIdent = "submissions" :: Text @@ -322,18 +340,18 @@ mkSubmissionTable = -> ((E.SqlExpr (Entity Course) `E.InnerJoin` E.SqlExpr (Entity Sheet) `E.InnerJoin` E.SqlExpr (Entity Submission)`E.InnerJoin` E.SqlExpr (Entity SubmissionUser) )->a) withType = id - dbtSQLQuery' uid = \(course `E.InnerJoin` sheet `E.InnerJoin` submission `E.InnerJoin` subUser) -> do + dbtSQLQuery' uid (course `E.InnerJoin` sheet `E.InnerJoin` submission `E.InnerJoin` subUser) = do E.on $ submission E.^. SubmissionId E.==. subUser E.^. SubmissionUserSubmission E.on $ sheet E.^. SheetId E.==. submission E.^. SubmissionSheet E.on $ course E.^. CourseId E.==. sheet E.^. SheetCourse E.where_ $ subUser E.^. SubmissionUserUser E.==. E.val uid - let crse = ( course E.^. CourseTerm - , course E.^. CourseSchool - , course E.^. CourseShorthand - ) - let sht = ( sheet E.^. SheetName - ) + let crse = ( course E.^. CourseTerm + , course E.^. CourseSchool + , course E.^. CourseShorthand + ) + let sht = sheet E.^. SheetName return (crse, sht, submission, lastSubEdit uid submission) + dbtRowKey (_ `E.InnerJoin` _ `E.InnerJoin` submission `E.InnerJoin` _) = submission E.^. SubmissionId lastSubEdit uid submission = -- latest Edit-Time of this user for submission E.sub_select . E.from $ \subEdit -> do @@ -341,7 +359,7 @@ mkSubmissionTable = E.&&. subEdit E.^. SubmissionEditUser E.==. E.val uid return . E.max_ $ subEdit E.^. SubmissionEditTime - dbtProj = \x -> return $ x + dbtProj x = return $ x & _dbrOutput . _1 %~ (\(E.Value tid, E.Value ssh, E.Value csh) -> (tid,ssh,csh)) & _dbrOutput . _2 %~ E.unValue & _dbrOutput . _4 %~ E.unValue @@ -352,7 +370,7 @@ mkSubmissionTable = termCell <$> view (_dbrOutput . _1 . _1) , sortable (Just "school") (i18nCell MsgCourseSchool) . magnify (_dbrOutput . _1 ) $ schoolCell <$> view ( _1. re _Just) - <*> view ( _2 ) + <*> view _2 , sortable (Just "course") (i18nCell MsgCourse) $ courseCellCL <$> view (_dbrOutput . _1) , sortable (Just "sheet") (i18nCell MsgSheet) . magnify _dbrOutput $ @@ -372,7 +390,7 @@ mkSubmissionTable = validator = def -- DUPLICATED CODE: Handler.Corrections & restrictFilter (\name _ -> name /= "corrector") -- We need to be careful to restrict allowed sorting/filter to not expose sensitive information & restrictSorting (\name _ -> name /= "corrector") - & defaultSorting [("edit",SortDesc)] + & defaultSorting [SortDescBy "edit"] dbtSorting' uid = Map.fromList [ ( "course", SortColumn $ withType $ \(crse `E.InnerJoin` _ `E.InnerJoin` _ `E.InnerJoin` _) -> crse E.^. CourseShorthand) , ( "term" , SortColumn $ withType $ \(crse `E.InnerJoin` _ `E.InnerJoin` _ `E.InnerJoin` _) -> crse E.^. CourseTerm ) @@ -385,16 +403,18 @@ mkSubmissionTable = , ( "term", FilterColumn $ withType $ \(crse `E.InnerJoin` _ `E.InnerJoin` _ `E.InnerJoin` _) -> emptyOrIn $ crse E.^. CourseTerm ) , ( "school", FilterColumn $ withType $ \(crse `E.InnerJoin` _ `E.InnerJoin` _ `E.InnerJoin` _) -> emptyOrIn $ crse E.^. CourseSchool ) ] + dbtFilterUI = mempty + dbtParams = def in \uid -> let dbtSQLQuery = dbtSQLQuery' uid dbtSorting = dbtSorting' uid - in dbTableWidget' validator $ DBTable {..} + in dbTableWidget' validator DBTable{..} -- in do dbtSQLQuery <- dbtSQLQuery' -- dbtSorting <- dbtSorting' -- return $ dbTableWidget' validator $ DBTable {..} -mkSubmissionGroupTable :: UserId -> Handler Widget +mkSubmissionGroupTable :: UserId -> DB Widget -- Table listing all submissions for the given user mkSubmissionGroupTable = let dbtIdent = "subGroups" :: Text @@ -403,7 +423,7 @@ mkSubmissionGroupTable = -> ((E.SqlExpr (Entity Course) `E.InnerJoin` E.SqlExpr (Entity SubmissionGroup) `E.InnerJoin` E.SqlExpr (Entity SubmissionGroupUser) )->a) withType = id - dbtSQLQuery' uid = \(course `E.InnerJoin` sgroup `E.InnerJoin` sguser) -> do + dbtSQLQuery' uid (course `E.InnerJoin` sgroup `E.InnerJoin` sguser) = do E.on $ sguser E.^. SubmissionGroupUserSubmissionGroup E.==. sgroup E.^. SubmissionGroupId E.on $ sgroup E.^. SubmissionGroupCourse E.==. course E.^. CourseId E.where_ $ sguser E.^. SubmissionGroupUserUser E.==. E.val uid @@ -412,6 +432,7 @@ mkSubmissionGroupTable = , course E.^. CourseShorthand ) return (crse, sgroup, lastSGEdit sgroup) + dbtRowKey (_ `E.InnerJoin` sgroup `E.InnerJoin` _) = sgroup E.^. SubmissionGroupId lastSGEdit sgroup = -- latest Edit-Time of this Submission Group by a user E.sub_select . E.from $ \(user `E.InnerJoin` sgEdit) -> do @@ -419,7 +440,7 @@ mkSubmissionGroupTable = E.where_ $ sgEdit E.^. SubmissionGroupEditSubmissionGroup E.==. sgroup E.^. SubmissionGroupId return . E.max_ $ sgEdit E.^. SubmissionGroupEditTime - dbtProj = \x -> return $ x + dbtProj x = return $ x & _dbrOutput . _1 %~ (\(E.Value tid, E.Value ssh, E.Value csh) -> (tid,ssh,csh)) & _dbrOutput . _3 %~ E.unValue @@ -429,7 +450,7 @@ mkSubmissionGroupTable = termCell <$> view (_dbrOutput . _1 . _1) , sortable (Just "school") (i18nCell MsgCourseSchool) . magnify (_dbrOutput . _1 ) $ schoolCell <$> view ( _1. re _Just) - <*> view ( _2 ) + <*> view _2 , sortable (Just "course") (i18nCell MsgCourse) $ courseCellCL <$> view (_dbrOutput . _1) , sortable (Just "submissiongroup") (i18nCell MsgSubmissionGroupName) . magnify (_dbrOutput . _2 . _entityVal) $ @@ -441,7 +462,7 @@ mkSubmissionGroupTable = validator = def -- DUPLICATED CODE: Handler.Corrections & restrictFilter (\name _ -> name /= "corrector") -- We need to be careful to restrict allowed sorting/filter to not expose sensitive information & restrictSorting (\name _ -> name /= "corrector") - & defaultSorting [("edit",SortDesc)] + & defaultSorting [SortDescBy "edit"] dbtSorting = Map.fromList [ ( "course", SortColumn $ withType $ \(crse `E.InnerJoin` _ `E.InnerJoin` _ ) -> crse E.^. CourseShorthand) , ( "term" , SortColumn $ withType $ \(crse `E.InnerJoin` _ `E.InnerJoin` _ ) -> crse E.^. CourseTerm ) @@ -454,12 +475,14 @@ mkSubmissionGroupTable = , ( "term", FilterColumn $ withType $ \(crse `E.InnerJoin` _ `E.InnerJoin` _) -> emptyOrIn $ crse E.^. CourseTerm ) , ( "school", FilterColumn $ withType $ \(crse `E.InnerJoin` _ `E.InnerJoin` _) -> emptyOrIn $ crse E.^. CourseSchool ) ] + dbtFilterUI = mempty + dbtParams = def in \uid -> let dbtSQLQuery = dbtSQLQuery' uid - in dbTableWidget' validator $ DBTable {..} + in dbTableWidget' validator DBTable{..} -mkCorrectionsTable :: UserId -> Handler Widget +mkCorrectionsTable :: UserId -> DB Widget -- Table listing sum of corrections made by the given user per sheet mkCorrectionsTable = let dbtIdent = "corrections" :: Text @@ -472,15 +495,15 @@ mkCorrectionsTable = corrsAssigned uid sheet = E.sub_select . E.from $ \submission -> do E.where_ $ submission E.^. SubmissionSheet E.==. sheet E.^. SheetId E.&&. submission E.^. SubmissionRatingBy E.==. E.just (E.val uid) - return $ E.countRows + return E.countRows corrsCorrected uid sheet = E.sub_select . E.from $ \submission -> do E.where_ $ submission E.^. SubmissionSheet E.==. sheet E.^. SheetId - E.&&. submission E.^. SubmissionRatingBy E.==. E.just (E.val uid) - E.&&. (E.not_ $ E.isNothing $ submission E.^. SubmissionRatingTime) - return $ E.countRows + E.&&. submission E.^. SubmissionRatingBy E.==. E.just (E.val uid) + E.&&. E.not_ (E.isNothing $ submission E.^. SubmissionRatingTime) + return E.countRows - dbtSQLQuery' uid = \(course `E.InnerJoin` sheet `E.InnerJoin` corrector) -> do + dbtSQLQuery' uid (course `E.InnerJoin` sheet `E.InnerJoin` corrector) = do E.on $ sheet E.^. SheetId E.==. corrector E.^. SheetCorrectorSheet E.on $ sheet E.^. SheetCourse E.==. course E.^. CourseId E.where_ $ corrector E.^. SheetCorrectorUser E.==. E.val uid @@ -489,8 +512,9 @@ mkCorrectionsTable = , course E.^. CourseShorthand ) return (crse, sheet E.^. SheetName, corrector, (corrsAssigned uid sheet, corrsCorrected uid sheet)) + dbtRowKey (_ `E.InnerJoin` sheet `E.InnerJoin` _) = sheet E.^. SheetId - dbtProj = \x -> return $ x + dbtProj x = return $ x & _dbrOutput . _1 %~ (\(E.Value tid, E.Value ssh, E.Value csh) -> (tid,ssh,csh)) & _dbrOutput . _2 %~ E.unValue @@ -514,7 +538,7 @@ mkCorrectionsTable = int64Cell <$> view (_dbrOutput . _4 . _2 . _unValue) ] - validator = def & defaultSorting [("term",SortDesc),("school",SortAsc),("course",SortAsc),("sheet",SortAsc)] + validator = def & defaultSorting [SortDescBy "term", SortAscBy "school", SortAscBy "course", SortAscBy "sheet"] dbtSorting = Map.fromList [ ( "term" , SortColumn $ withType $ \(crse `E.InnerJoin` _ `E.InnerJoin` _ ) -> crse E.^. CourseTerm ) , ( "school", SortColumn $ withType $ \(crse `E.InnerJoin` _ `E.InnerJoin` _ ) -> crse E.^. CourseSchool ) @@ -527,6 +551,8 @@ mkCorrectionsTable = , ( "school", FilterColumn $ withType $ \(crse `E.InnerJoin` _ `E.InnerJoin` _) -> emptyOrIn $ crse E.^. CourseSchool ) , ( "course", FilterColumn $ withType $ \(crse `E.InnerJoin` _ `E.InnerJoin` _) -> emptyOrIn $ crse E.^. CourseShorthand) ] + dbtFilterUI = mempty + dbtParams = def in \uid -> let dbtSQLQuery = dbtSQLQuery' uid - in dbTableWidget' validator $ DBTable {..} + in dbTableWidget' validator DBTable{..} diff --git a/src/Handler/School.hs b/src/Handler/School.hs index 9952a682d..9dad647e0 100644 --- a/src/Handler/School.hs +++ b/src/Handler/School.hs @@ -1,53 +1,10 @@ -{-# LANGUAGE RecordWildCards, NamedFieldPuns #-} -{-# LANGUAGE NoImplicitPrelude #-} -{-# LANGUAGE OverloadedStrings #-} -{-# LANGUAGE MultiWayIf #-} -{-# LANGUAGE PartialTypeSignatures #-} -{-# LANGUAGE RecordWildCards, NamedFieldPuns, TupleSections #-} -{-# LANGUAGE ViewPatterns #-} -{-# LANGUAGE ScopedTypeVariables #-} -{-# LANGUAGE TemplateHaskell #-} -{-# LANGUAGE QuasiQuotes #-} -{-# LANGUAGE MultiParamTypeClasses #-} -{-# LANGUAGE TypeFamilies #-} -{-# LANGUAGE TypeOperators #-} -{-# LANGUAGE FlexibleContexts #-} - module Handler.School where import Import --- import Control.Lens --- import Utils.Lens --- import Utils.TH --- import Handler.Utils --- import Handler.Utils.Table.Cells --- --- -- import Data.Time --- import qualified Data.Text as T --- import Data.Function ((&)) --- -- import Yesod.Form.Bootstrap3 --- --- import qualified Data.Set as Set --- import qualified Data.Map as Map --- --- import Colonnade hiding (fromMaybe,bool) --- --- import qualified Database.Esqueleto as E --- --- import qualified Data.UUID.Cryptographic as UUID - - getSchoolListR :: Handler Html -getSchoolListR = do - -- muid <- maybeAuthId - defaultLayout $ do - [whamlet|TODO: Liste aller Institute |] -- TODO - +getSchoolListR = error "getSchoolListR: Not implemented" getSchoolShowR :: SchoolId -> Handler Html -getSchoolShowR ssh = do -- TODO - -- muid <- maybeAuthId - defaultLayout $ do - [whamlet|TODO: Informationen zu einem Institut |] -- TODO +getSchoolShowR = error "getSchoolShowR: Not implemented" diff --git a/src/Handler/Sheet.hs b/src/Handler/Sheet.hs index 510e92117..615fa91e1 100644 --- a/src/Handler/Sheet.hs +++ b/src/Handler/Sheet.hs @@ -1,28 +1,14 @@ -{-# LANGUAGE NoImplicitPrelude #-} -{-# LANGUAGE OverloadedStrings #-} -{-# LANGUAGE OverloadedLists #-} -{-# LANGUAGE PartialTypeSignatures #-} -{-# LANGUAGE RecordWildCards #-} -{-# LANGUAGE TemplateHaskell #-} -{-# LANGUAGE QuasiQuotes #-} -{-# LANGUAGE MultiParamTypeClasses #-} -{-# LANGUAGE TypeFamilies #-} -{-# LANGUAGE FlexibleContexts #-} -{-# LANGUAGE FlexibleInstances #-} -{-# LANGUAGE ViewPatterns #-} -{-# LANGUAGE RankNTypes #-} -{-# LANGUAGE TypeOperators #-} -{-# LANGUAGE MultiWayIf, LambdaCase #-} -{-# LANGUAGE TupleSections #-} - module Handler.Sheet where import Import import System.FilePath (takeFileName) +import Utils.Sheet import Handler.Utils -- import Handler.Utils.Zip import Handler.Utils.Table.Cells +import Handler.Utils.SheetType +import Handler.Utils.Delete -- import Data.Time -- import qualified Data.Text as T @@ -48,24 +34,26 @@ import Control.Monad.Writer (MonadWriter(..), execWriterT) -- import qualified Data.List as List +import Control.Monad.Trans.Except (runExceptT, mapExceptT, throwE) + import Network.Mime import Data.Set (Set) import qualified Data.Set as Set import qualified Data.Map as Map -import Data.Map (Map, (!), (!?)) -import qualified Data.Map as Map +import Data.Map (Map, (!?)) -import Data.Monoid (Sum(..)) +import Data.Monoid (Any(..)) -import Control.Lens --- import Utils.Lens +-- import Control.Lens +import Utils.Lens +--import qualified Data.Aeson as Aeson + +import Control.Monad.Random.Class (MonadRandom(..)) +import Utils.Sql -instance Eq (Unique Sheet) where - (CourseSheet cid1 name1) == (CourseSheet cid2 name2) = - cid1 == cid2 && name1 == name2 {- * Implement Handlers @@ -78,10 +66,10 @@ data SheetForm = SheetForm , sfDescription :: Maybe Html , sfType :: SheetType , sfGrouping :: SheetGroup - , sfMarkingText :: Maybe Html , sfVisibleFrom :: Maybe UTCTime , sfActiveFrom :: UTCTime , sfActiveTo :: UTCTime + , sfSubmissionMode :: SheetSubmissionMode , sfUploadMode :: UploadMode , sfSheetF :: Maybe (Source Handler (Either FileId File)) , sfHintFrom :: Maybe UTCTime @@ -89,6 +77,7 @@ data SheetForm = SheetForm , sfSolutionFrom :: Maybe UTCTime , sfSolutionF :: Maybe (Source Handler (Either FileId File)) , sfMarkingF :: Maybe (Source Handler (Either FileId File)) + , sfMarkingText :: Maybe Html -- Keine SheetId im Formular! } @@ -110,9 +99,10 @@ makeSheetForm msId template = identForm FIDsheet $ \html -> do (result, widget) <- flip (renderAForm FormStandard) html $ SheetForm <$> areq ciField (fslI MsgSheetName) (sfName <$> template) <*> aopt htmlField (fslI MsgSheetDescription) (sfDescription <$> template) - <*> sheetTypeAFormReq (fslI MsgSheetType) (sfType <$> template) + <*> sheetTypeAFormReq (fslI MsgSheetType + & setTooltip (uniworxMessages [MsgSheetTypeInfoBonus,MsgSheetTypeInfoNotGraded])) + (sfType <$> template) <*> sheetGroupAFormReq (fslI MsgSheetGroup) (sfGrouping <$> template) - <*> aopt htmlField (fslI MsgSheetMarking) (sfMarkingText <$> template) <*> aopt utcTimeField (fslI MsgSheetVisibleFrom & setTooltip MsgSheetVisibleFromTip) ((sfVisibleFrom <$> template) <|> pure (Just ctime)) @@ -120,6 +110,7 @@ makeSheetForm msId template = identForm FIDsheet $ \html -> do & setTooltip MsgSheetActiveFromTip) (sfActiveFrom <$> template) <*> areq utcTimeField (fslI MsgSheetActiveTo) (sfActiveTo <$> template) + <*> areq submissionModeField (fslI MsgSheetSubmissionMode) ((sfSubmissionMode <$> template) <|> pure UserSubmissions) <*> areq uploadModeField (fslI MsgSheetUploadMode) ((sfUploadMode <$> template) <|> pure (Upload True)) <*> aopt (multiFileField $ oldFileIds SheetExercise) (fslI MsgSheetExercise) (sfSheetF <$> template) <*> aopt utcTimeField (fslpI MsgSheetHintFrom "Datum, sonst nur für Korrektoren" @@ -131,6 +122,7 @@ makeSheetForm msId template = identForm FIDsheet $ \html -> do <*> aopt (multiFileField $ oldFileIds SheetSolution) (fslI MsgSheetSolution) (sfSolutionF <$> template) <*> aopt (multiFileField $ oldFileIds SheetMarking) (fslI MsgSheetMarking & setTooltip MsgSheetMarkingTip) (sfMarkingF <$> template) + <*> aopt htmlField (fslI MsgSheetMarking) (sfMarkingText <$> template) <* submitButton return $ case result of FormSuccess sheetResult @@ -148,6 +140,19 @@ makeSheetForm msId template = identForm FIDsheet $ \html -> do , ( NTop sfSolutionFrom >= NTop (Just sfActiveTo) , render MsgSheetErrSolutionEarly) ] ] + +getSheetCurrentR :: TermId -> SchoolId -> CourseShorthand -> Handler Html +getSheetCurrentR tid ssh csh = runDB $ do + let redi shn = redirectAccess $ CSheetR tid ssh csh shn SShowR + shn <- sheetCurrent tid ssh csh + maybe notFound redi shn + +getSheetOldUnassigned :: TermId -> SchoolId -> CourseShorthand -> Handler () +getSheetOldUnassigned tid ssh csh = runDB $ do + let redi shn = redirectAccess $ CSheetR tid ssh csh shn SSubsR + shn <- sheetOldUnassigned tid ssh csh + maybe notFound redi shn + getSheetListR :: TermId -> SchoolId -> CourseShorthand -> Handler Html getSheetListR tid ssh csh = do muid <- maybeAuthId @@ -156,26 +161,33 @@ getSheetListR tid ssh csh = do lastSheetEdit sheet = E.sub_select . E.from $ \sheetEdit -> do E.where_ $ sheetEdit E.^. SheetEditSheet E.==. sheet E.^. SheetId return . E.max_ $ sheetEdit E.^. SheetEditTime - sheetData :: E.SqlExpr (Entity Sheet) `E.LeftOuterJoin` (E.SqlExpr (Maybe (Entity Submission)) `E.InnerJoin` (E.SqlExpr (Maybe (Entity SubmissionUser)))) -> E.SqlQuery (E.SqlExpr (Entity Sheet), E.SqlExpr (E.Value (Maybe UTCTime)),E.SqlExpr (Maybe (Entity Submission))) + + sheetData :: E.SqlExpr (Entity Sheet) `E.LeftOuterJoin` (E.SqlExpr (Maybe (Entity Submission)) `E.InnerJoin` (E.SqlExpr (Maybe (Entity SubmissionUser)))) -> E.SqlQuery () sheetData (sheet `E.LeftOuterJoin` (submission `E.InnerJoin` submissionUser)) = do E.on $ submission E.?. SubmissionId E.==. submissionUser E.?. SubmissionUserSubmission E.on $ (E.just $ sheet E.^. SheetId) E.==. submission E.?. SubmissionSheet E.&&. submissionUser E.?. SubmissionUserUser E.==. E.val muid E.where_ $ sheet E.^. SheetCourse E.==. E.val cid - return (sheet, lastSheetEdit sheet, submission) + + sheetFilter :: SheetName -> DB Bool + sheetFilter sheetName = (== Authorized) <$> evalAccessDB (CSheetR tid ssh csh sheetName SShowR) False + sheetCol = widgetColonnade . mconcat $ - [ sortable (Just "name") (i18nCell MsgSheet) - $ \(Entity _ Sheet{..}, _, _) -> anchorCell (CSheetR tid ssh csh sheetName SShowR) (toWidget sheetName) + [ dbRow + , sortable (Just "name") (i18nCell MsgSheet) + $ \DBRow{dbrOutput=(Entity _ Sheet{..}, _, _)} -> anchorCell (CSheetR tid ssh csh sheetName SShowR) (toWidget sheetName) , sortable (Just "last-edit") (i18nCell MsgLastEdit) - $ \(_, E.Value mEditTime, _) -> maybe mempty timeCell mEditTime + $ \DBRow{dbrOutput=(_, E.Value mEditTime, _)} -> maybe mempty timeCell mEditTime + , sortable (Just "visible-from") (i18nCell MsgSheetVisibleFrom) + $ \DBRow{dbrOutput=(Entity _ Sheet{..}, _, _)} -> maybe mempty timeCell sheetVisibleFrom , sortable (Just "submission-since") (i18nCell MsgSheetActiveFrom) - $ \(Entity _ Sheet{..}, _, _) -> timeCell sheetActiveFrom + $ \DBRow{dbrOutput=(Entity _ Sheet{..}, _, _)} -> timeCell sheetActiveFrom , sortable (Just "submission-until") (i18nCell MsgSheetActiveTo) - $ \(Entity _ Sheet{..}, _, _) -> timeCell sheetActiveTo + $ \DBRow{dbrOutput=(Entity _ Sheet{..}, _, _)} -> timeCell sheetActiveTo , sortable Nothing (i18nCell MsgSheetType) - $ \(Entity _ Sheet{..}, _, _) -> textCell $ display sheetType + $ \DBRow{dbrOutput=(Entity _ Sheet{..}, _, _)} -> i18nCell sheetType , sortable Nothing (i18nCell MsgSubmission) - $ \(Entity _ Sheet{..}, _, mbSub) -> case mbSub of + $ \DBRow{dbrOutput=(Entity _ Sheet{..}, _, mbSub)} -> case mbSub of Nothing -> mempty (Just (Entity sid Submission{..})) -> let mkCid = encrypt sid -- TODO: executed twice @@ -184,72 +196,101 @@ getSheetListR tid ssh csh = do return $ CSubmissionR tid ssh csh sheetName cid' SubShowR in anchorCellM mkRoute (mkCid >>= \cid2 -> [whamlet|#{display cid2}|]) , sortable (Just "rating") (i18nCell MsgRating) - $ \(Entity _ Sheet{..}, _, mbSub) -> case mbSub of - Nothing -> mempty + $ \DBRow{dbrOutput=(Entity _ Sheet{..}, _, mbSub)} -> + let stats = sheetTypeSum sheetType in -- for statistics over all shown rows + case mbSub of + Nothing -> cellTell mempty $ stats Nothing (Just (Entity sid Submission{..})) -> let mkCid = encrypt sid mkRoute = do - cid <- mkCid - return $ CSubmissionR tid ssh csh sheetName cid CorrectionR - protoCell = anchorCellM mkRoute $(widgetFile "widgets/rating") - in protoCell & cellContents %~ (<* tell (sheetTypeSum (sheetType, submissionRatingPoints))) + cid' <- mkCid + return $ CSubmissionR tid ssh csh sheetName cid' CorrectionR + acell = anchorCellM mkRoute $(widgetFile "widgets/rating") + in cellTell acell $ stats submissionRatingPoints + , sortable Nothing -- (Just "percent") (i18nCell MsgRatingPercent) - $ \(Entity _ Sheet{sheetType=sType}, _, mbSub) -> case mbSub of + $ \DBRow{dbrOutput=(Entity _ Sheet{sheetType=sType}, _, mbSub)} -> case mbSub of (Just (Entity _ Submission{submissionRatingPoints=Just sPoints})) -> - case sType of - NotGraded -> mempty - _ | maxPoints sType > 0 -> - let percent = sPoints / maxPoints sType + case preview (_grading . _maxPoints) sType of + Just maxPoints + | maxPoints /= 0 -> + let percent = sPoints / maxPoints in textCell $ textPercent $ realToFrac percent _other -> mempty _other -> mempty ] + psValidator = def - & defaultSorting [("submission-since", SortAsc)] - (SheetTypeSummary{..}, table) <- dbTable psValidator $ DBTable - { dbtSQLQuery = sheetData - , dbtColonnade = sheetCol - , dbtProj = \DBRow{ dbrOutput = dbrOutput@(Entity _ Sheet{..}, _, _) } - -> dbrOutput <$ guardM (lift $ (== Authorized) <$> evalAccessDB (CSheetR tid ssh csh sheetName SShowR) False) - , dbtSorting = Map.fromList - [ ( "name" - , SortColumn $ \(sheet `E.LeftOuterJoin` _) -> sheet E.^. SheetName - ) - , ( "last-edit" - , SortColumn $ \(sheet `E.LeftOuterJoin` _) -> lastSheetEdit sheet - ) - , ( "submission-since" - , SortColumn $ \(sheet `E.LeftOuterJoin` _) -> sheet E.^. SheetActiveFrom - ) - , ( "submission-until" - , SortColumn $ \(sheet `E.LeftOuterJoin` _) -> sheet E.^. SheetActiveTo - ) - , ( "rating" - , SortColumn $ \(_ `E.LeftOuterJoin` (submission `E.InnerJoin` submissionUser)) -> submission E.?. SubmissionRatingPoints - ) --- GitLab Issue $143: HOW TO SORT? --- , ( "percent" --- , SortColumn $ \(sheet `E.LeftOuterJoin` (submission `E.InnerJoin` _submissionUser)) -> --- case sheetType of -- no Haskell inside Esqueleto, right? --- (submission E.?. SubmissionRatingPoints) E./. (sheet E.^. SheetType) --- ) - ] - , dbtFilter = Map.fromList - [] - , dbtStyle = def - , dbtIdent = "sheets" :: Text - } + & defaultSorting [SortDescBy "submission-since"] + + (raw_statistics,table) <- runDB $ dbTableWidget psValidator DBTable + { dbtColonnade = sheetCol + , dbtSQLQuery = \dt@(sheet `E.LeftOuterJoin` (submission `E.InnerJoin` _submissionUser)) + -> sheetData dt *> return (sheet, lastSheetEdit sheet, submission) + , dbtRowKey = \(sheet `E.LeftOuterJoin` _) -> sheet E.^. SheetId + , dbtProj = \dbr@DBRow{ dbrOutput=(Entity _ Sheet{..}, _, _) } + -> dbr <$ guardM (lift $ sheetFilter sheetName) + , dbtSorting = Map.fromList + [ ( "name" + , SortColumn $ \(sheet `E.LeftOuterJoin` _) -> sheet E.^. SheetName + ) + , ( "last-edit" + , SortColumn $ \(sheet `E.LeftOuterJoin` _) -> lastSheetEdit sheet + ) + , ( "visible-from" + , SortColumn $ \(sheet `E.LeftOuterJoin` _) -> sheet E.^. SheetVisibleFrom + ) + , ( "submission-since" + , SortColumn $ \(sheet `E.LeftOuterJoin` _) -> sheet E.^. SheetActiveFrom + ) + , ( "submission-until" + , SortColumn $ \(sheet `E.LeftOuterJoin` _) -> sheet E.^. SheetActiveTo + ) + , ( "rating" + , SortColumn $ \(_sheet `E.LeftOuterJoin` (submission `E.InnerJoin` _submissionUser)) -> submission E.?. SubmissionRatingPoints + ) + -- GitLab Issue $143: HOW TO SORT? + -- , ( "percent" + -- , SortColumn $ \(sheet `E.LeftOuterJoin` (submission `E.InnerJoin` _submissionUser)) -> + -- case sheetType of -- no Haskell inside Esqueleto, right? + -- (submission E.?. SubmissionRatingPoints) E./. (sheet E.^. SheetType) + -- ) + ] + , dbtFilter = mempty + , dbtFilterUI = mempty + , dbtStyle = def + , dbtParams = def + , dbtIdent = "sheets" :: Text + } + -- ) ( -- !!!DEPRECTAED!!! Summary only over shown rows !!! + -- -- Collect summary over all Sheets, not just the ones shown due to pagination: + -- do + -- rows <- E.select $ E.from $ \dt@(sheet `E.LeftOuterJoin` (submission `E.InnerJoin` _submissionUser)) -> + -- sheetData dt *> return (sheet E.^. SheetName, sheet E.^. SheetType, submission E.?. SubmissionRatingPoints) + -- flip filterM rows (\(E.Value sheetName, _, _) -> sheetFilter sheetName) + -- ) + + let statistics = gradeSummaryWidget MsgSheetGradingSummaryTitle raw_statistics -- only over shown rows + -- foldMap (\(_, E.Value sheetType, E.Value mbPts) -> sheetTypeSum sheetType (join mbPts)) defaultLayout $ do $(widgetFile "sheetList") - $(widgetFile "widgets/sheetTypeSummary") + +data ButtonGeneratePseudonym = BtnGenerate + deriving (Enum, Eq, Ord, Bounded, Read, Show, Generic, Typeable) +instance Universe ButtonGeneratePseudonym +instance Finite ButtonGeneratePseudonym + +nullaryPathPiece ''ButtonGeneratePseudonym (camelToPathPiece' 1) + +instance Button UniWorX ButtonGeneratePseudonym where + btnLabel BtnGenerate = [whamlet|_{MsgSheetGeneratePseudonym}|] + btnClasses BtnGenerate = [BCIsButton, BCDefault] -- Show single sheet getSShowR :: TermId -> SchoolId -> CourseShorthand -> SheetName -> Handler Html getSShowR tid ssh csh shn = do - entSheet <- runDB $ fetchSheet tid ssh csh shn - let sheet = entityVal entSheet - sid = entityKey entSheet + Entity sid sheet <- runDB $ fetchSheet tid ssh csh shn -- without Colonnade -- fileNameTypes <- runDB $ E.select $ E.from $ -- \(sheet `E.InnerJoin` sheetFile `E.InnerJoin` file) -> do @@ -263,41 +304,46 @@ getSShowR tid ssh csh shn = do -- let fileLinks = map (\(E.Value fName, E.Value modified, E.Value fType) -> (CSheetR tid ssh csh (SheetFileR shn fType fName),modified)) fileNameTypes -- with Colonnade - let fileData (sheet `E.InnerJoin` sheetFile `E.InnerJoin` file) = do + let fileData (sheet' `E.InnerJoin` sheetFile `E.InnerJoin` file) = do -- Restrict to consistent rows that correspond to each other E.on (file E.^. FileId E.==. sheetFile E.^. SheetFileFile) - E.on (sheetFile E.^. SheetFileSheet E.==. sheet E.^. SheetId) + E.on (sheetFile E.^. SheetFileSheet E.==. sheet' E.^. SheetId) -- filter to requested file - E.where_ $ sheet E.^. SheetId E.==. E.val sid + E.where_ $ sheet' E.^. SheetId E.==. E.val sid E.&&. E.not_ (E.isNothing $ file E.^. FileContent) -- return desired columns return $ (file E.^. FileTitle, file E.^. FileModified, sheetFile E.^. SheetFileType) let colonnadeFiles = widgetColonnade $ mconcat - [ sortable (Just "type") "Typ" $ \(_,_, E.Value ftype) -> i18nCell ftype - , sortable (Just "path") "Dateiname" $ anchorCell' (\(E.Value fName,_,E.Value fType) -> CSheetR tid ssh csh shn (SFileR fType fName)) - (\(E.Value fName,_,_) -> str2widget fName) + [ sortable (Just "type") "Typ" $ \(_,_, E.Value ftype) -> i18nCell ftype & cellContents %~ (\act -> act <* tell (Any True)) + , sortable (Just "path") "Dateiname" $ \(E.Value fName,_,E.Value fType) -> anchorCell + (CSheetR tid ssh csh shn (SFileR fType fName)) + (str2widget fName) , sortable (Just "time") "Modifikation" $ \(_,E.Value modified,_) -> cell $ formatTime SelFormatDateTime (modified :: UTCTime) >>= toWidget ] let psValidator = def - & defaultSorting [("type", SortAsc), ("path", SortAsc)] - ((), fileTable) <- dbTable psValidator $ DBTable + & defaultSorting [SortAscBy "type", SortAscBy "path"] + (Any hasFiles, fileTable) <- runDB $ dbTable psValidator DBTable { dbtSQLQuery = fileData + , dbtRowKey = \(_ `E.InnerJoin` _ `E.InnerJoin` file) -> file E.^. FileId , dbtColonnade = colonnadeFiles , dbtProj = \DBRow{ dbrOutput = dbrOutput@(E.Value fName, _, E.Value fType) } -> dbrOutput <$ guardM (lift $ (== Authorized) <$> evalAccessDB (CSheetR tid ssh csh shn $ SFileR fType fName) False) , dbtStyle = def - , dbtFilter = Map.empty + , dbtFilter = mempty + , dbtFilterUI = mempty , dbtIdent = "files" :: Text - , dbtSorting = [ ( "type" - , SortColumn $ \(sheet `E.InnerJoin` sheetFile `E.InnerJoin` file) -> sheetFile E.^. SheetFileType - ) - , ( "path" - , SortColumn $ \(sheet `E.InnerJoin` sheetFile `E.InnerJoin` file) -> file E.^. FileTitle - ) - , ( "time" - , SortColumn $ \(sheet `E.InnerJoin` sheetFile `E.InnerJoin` file) -> file E.^. FileModified - ) - ] + , dbtSorting = Map.fromList + [ ( "type" + , SortColumn $ \(_sheet `E.InnerJoin` sheetFile `E.InnerJoin` _file) -> sheetFile E.^. SheetFileType + ) + , ( "path" + , SortColumn $ \(_sheet `E.InnerJoin` _sheetFile `E.InnerJoin` file) -> file E.^. FileTitle + ) + , ( "time" + , SortColumn $ \(_sheet `E.InnerJoin` _sheetFile `E.InnerJoin` file) -> file E.^. FileModified + ) + ] + , dbtParams = def } (hasHints, hasSolution) <- runDB $ do hasHints <- (/= 0) <$> count [ SheetFileSheet ==. sid, SheetFileType ==. SheetHint ] @@ -307,14 +353,46 @@ getSShowR tid ssh csh shn = do visibleFrom <- traverse (formatTime SelFormatDateTime) $ sheetVisibleFrom sheet when (NTop (sheetVisibleFrom sheet) >= NTop cTime) $ addMessageI Warning $ maybe MsgSheetInvisible MsgSheetInvisibleUntil visibleFrom + mPseudonym <- runMaybeT $ do + uid <- MaybeT maybeAuthId + Entity _ SheetPseudonym{sheetPseudonymPseudonym} <- MaybeT . runDB . getBy $ UniqueSheetPseudonymUser sid uid + return $ review _PseudonymText sheetPseudonymPseudonym + (generateWidget, generateEnctype) <- generateFormPost $ \csrf -> + over _2 ((toWidget csrf <>) . fvInput) <$> mreq (buttonField BtnGenerate) "" Nothing defaultLayout $ do setTitleI $ MsgSheetTitle tid ssh csh shn sheetFrom <- formatTime SelFormatDateTime $ sheetActiveFrom sheet sheetTo <- formatTime SelFormatDateTime $ sheetActiveTo sheet hintsFrom <- traverse (formatTime SelFormatDateTime) $ sheetHintFrom sheet solutionFrom <- traverse (formatTime SelFormatDateTime) $ sheetSolutionFrom sheet + markingText <- runMaybeT $ assertM_ (Authorized ==) (evalAccessCorrector tid ssh csh) >> hoistMaybe (sheetMarkingText sheet) $(widgetFile "sheetShow") +getSPseudonymR, postSPseudonymR :: TermId -> SchoolId -> CourseShorthand -> SheetName -> Handler TypedContent +getSPseudonymR = postSPseudonymR +postSPseudonymR tid ssh csh shn = do + uid <- requireAuthId + shId <- runDB $ fetchSheetId tid ssh csh shn + let + genPseudonym = do + inserted <- runExceptT . mapExceptT (runDB . setSerializable) $ do + candidate <- liftIO getRandom + existing <- lift . getBy $ UniqueSheetPseudonymUser shId uid + case existing of + Just (Entity _ SheetPseudonym{sheetPseudonymPseudonym}) -> throwE sheetPseudonymPseudonym + Nothing + -> lift $ fmap (const candidate) <$> insertUnique (SheetPseudonym shId candidate uid) + case inserted of + Right Nothing -> genPseudonym + Right (Just ps) -> return ps + Left ps -> return ps + ps <- genPseudonym + selectRep $ do + provideRep . return $ review _PseudonymText ps + provideJson ps + provideRep (redirect $ CSheetR tid ssh csh shn SShowR :#: ("pseudonym" :: Text) :: Handler Html) + + getSFileR :: TermId -> SchoolId -> CourseShorthand -> SheetName -> SheetFileType -> FilePath -> Handler TypedContent getSFileR tid ssh csh shn typ title = do results <- runDB $ E.select $ E.from $ @@ -333,7 +411,6 @@ getSFileR tid ssh csh shn typ title = do ) -- return desired columns return $ (file E.^. FileTitle, file E.^. FileContent) - let mimeType = defaultMimeLookup $ pack title case results of [(E.Value fileTitle, E.Value fileContent)] | Just fileContent' <- fileContent -> do @@ -348,32 +425,47 @@ getSFileR tid ssh csh shn typ title = do getSheetNewR :: TermId -> SchoolId -> CourseShorthand -> Handler Html getSheetNewR tid ssh csh = do + parShn <- runInputGetResult $ iopt ciField "shn" + let searchShn sheet = case parShn of + (FormSuccess (Just shn)) -> E.where_ $ sheet E.^. SheetName E.==. E.val shn + -- (FormFailure msgs) -> -- not in MonadHandler anymore -- forM_ msgs (addMessage Error . toHtml) + _other -> return () lastSheets <- runDB $ E.select . E.from $ \(course `E.InnerJoin` sheet) -> do E.on $ course E.^. CourseId E.==. sheet E.^. SheetCourse E.where_ $ course E.^. CourseTerm E.==. E.val tid E.&&. course E.^. CourseSchool E.==. E.val ssh E.&&. course E.^. CourseShorthand E.==. E.val csh + searchShn sheet + -- let lastSheetEdit = E.sub_select . E.from $ \sheetEdit -> do + -- E.where_ $ sheetEdit E.^. SheetEditSheet E.==. sheet E.^. SheetId + -- return . E.max_ $ sheetEdit E.^. SheetEditTime + -- Preferring last edited sheet may lead to suggesting duplicated sheet name numbers + -- E.orderBy [E.desc lastSheetEdit, E.desc (sheet E.^. SheetActiveFrom)] E.orderBy [E.desc (sheet E.^. SheetActiveFrom)] E.limit 1 return sheet + now <- liftIO getCurrentTime let template = case lastSheets of - ((Entity {entityVal=Sheet{..}}):_) -> Just $ SheetForm - { sfName = stepTextCounterCI sheetName - , sfDescription = sheetDescription - , sfType = sheetType - , sfGrouping = sheetGrouping - , sfMarkingText = sheetMarkingText - , sfVisibleFrom = addOneWeek <$> sheetVisibleFrom - , sfActiveFrom = addOneWeek sheetActiveFrom - , sfActiveTo = addOneWeek sheetActiveTo - , sfUploadMode = sheetUploadMode - , sfSheetF = Nothing - , sfHintFrom = addOneWeek <$> sheetHintFrom - , sfHintF = Nothing - , sfSolutionFrom = addOneWeek <$> sheetSolutionFrom - , sfSolutionF = Nothing - , sfMarkingF = Nothing - } + ((Entity {entityVal=Sheet{..}}):_) -> + let addTime = addWeeks $ max 1 $ weeksToAdd sheetActiveTo now + in Just $ SheetForm + { sfName = stepTextCounterCI sheetName + , sfDescription = sheetDescription + , sfType = sheetType + , sfGrouping = sheetGrouping + , sfVisibleFrom = addTime <$> sheetVisibleFrom + , sfActiveFrom = addTime sheetActiveFrom + , sfActiveTo = addTime sheetActiveTo + , sfSubmissionMode = sheetSubmissionMode + , sfUploadMode = sheetUploadMode + , sfSheetF = Nothing + , sfHintFrom = addTime <$> sheetHintFrom + , sfHintF = Nothing + , sfSolutionFrom = addTime <$> sheetSolutionFrom + , sfSolutionF = Nothing + , sfMarkingF = Nothing + , sfMarkingText = sheetMarkingText + } _other -> Nothing let action newSheet = -- More specific error message for new sheet could go here, if insertUnique returns Nothing insertUnique $ newSheet @@ -385,21 +477,19 @@ postSheetNewR = getSheetNewR getSEditR :: TermId -> SchoolId -> CourseShorthand -> SheetName -> Handler Html getSEditR tid ssh csh shn = do - (sheetEnt, sheetFileIds) <- runDB $ do + (Entity sid Sheet{..}, sheetFileIds) <- runDB $ do ent <- fetchSheet tid ssh csh shn fti <- getFtIdMap $ entityKey ent return (ent, fti) - let sid = entityKey sheetEnt - let oldSheet@(Sheet {..}) = entityVal sheetEnt let template = Just $ SheetForm { sfName = sheetName , sfDescription = sheetDescription , sfType = sheetType , sfGrouping = sheetGrouping - , sfMarkingText = sheetMarkingText , sfVisibleFrom = sheetVisibleFrom , sfActiveFrom = sheetActiveFrom , sfActiveTo = sheetActiveTo + , sfSubmissionMode = sheetSubmissionMode , sfUploadMode = sheetUploadMode , sfSheetF = Just . yieldMany . map Left . Set.elems $ sheetFileIds SheetExercise , sfHintFrom = sheetHintFrom @@ -407,6 +497,7 @@ getSEditR tid ssh csh shn = do , sfSolutionFrom = sheetSolutionFrom , sfSolutionF = Just . yieldMany . map Left . Set.elems $ sheetFileIds SheetSolution , sfMarkingF = Just . yieldMany . map Left . Set.elems $ sheetFileIds SheetMarking + , sfMarkingText = sheetMarkingText } let action newSheet = do replaceRes <- myReplaceUnique sid $ newSheet @@ -428,19 +519,22 @@ handleSheetEdit tid ssh csh msId template dbAction = do saveOkay <- runDB $ do actTime <- liftIO getCurrentTime cid <- getKeyBy404 $ TermSchoolCourseShort tid ssh csh + oldAutoDistribute <- fmap sheetAutoDistribute . join <$> traverse get msId let newSheet = Sheet - { sheetCourse = cid - , sheetName = sfName - , sheetDescription = sfDescription - , sheetType = sfType - , sheetGrouping = sfGrouping - , sheetMarkingText = sfMarkingText - , sheetVisibleFrom = sfVisibleFrom - , sheetActiveFrom = sfActiveFrom - , sheetActiveTo = sfActiveTo - , sheetHintFrom = sfHintFrom - , sheetSolutionFrom = sfSolutionFrom - , sheetUploadMode = sfUploadMode + { sheetCourse = cid + , sheetName = sfName + , sheetDescription = sfDescription + , sheetType = sfType + , sheetGrouping = sfGrouping + , sheetMarkingText = sfMarkingText + , sheetVisibleFrom = sfVisibleFrom + , sheetActiveFrom = sfActiveFrom + , sheetActiveTo = sfActiveTo + , sheetHintFrom = sfHintFrom + , sheetSolutionFrom = sfSolutionFrom + , sheetUploadMode = sfUploadMode + , sheetSubmissionMode = sfSubmissionMode + , sheetAutoDistribute = fromMaybe False oldAutoDistribute } mbsid <- dbAction newSheet case mbsid of @@ -472,31 +566,14 @@ handleSheetEdit tid ssh csh msId template dbAction = do $(widgetFile "formPageI18n") - -getSDelR :: TermId -> SchoolId -> CourseShorthand -> SheetName -> Handler Html -getSDelR tid ssh csh shn = do - ((result,formWidget), formEnctype) <- runFormPost (buttonForm :: Form BtnDelete) - case result of - (FormSuccess BtnAbort) -> redirectUltDest $ CSheetR tid ssh csh shn SShowR - (FormSuccess BtnDelete) -> do - runDB $ fetchSheetId tid ssh csh shn >>= deleteCascade - -- TODO: deleteCascade löscht aber nicht die hochgeladenen Dateien!!! - addMessageI Info $ MsgSheetDelOk tid ssh csh shn - redirect $ CourseR tid ssh csh SheetListR - _other -> do - submissionno <- runDB $ do - sid <- fetchSheetId tid ssh csh shn - count [SubmissionSheet ==. sid] - let formTitle = MsgSheetDelHead tid ssh csh shn - let formText = Just $ MsgSheetDelText submissionno - let actionUrl = CSheetR tid ssh csh shn SDelR - defaultLayout $ do - setTitleI $ MsgSheetTitle tid ssh csh shn - $(widgetFile "formPageI18n") - -postSDelR :: TermId -> SchoolId -> CourseShorthand -> SheetName -> Handler Html -postSDelR = getSDelR - +getSDelR, postSDelR :: TermId -> SchoolId -> CourseShorthand -> SheetName -> Handler Html +getSDelR = postSDelR +postSDelR tid ssh csh shn = do + sid <- runDB $ fetchSheetId tid ssh csh shn + deleteR $ (sheetDeleteRoute $ Set.singleton sid) + { drAbort = SomeRoute $ CSheetR tid ssh csh shn SShowR + , drSuccess = SomeRoute $ CourseR tid ssh csh SheetListR + } insertSheetFile :: SheetId -> SheetFileType -> FileInfo -> YesodDB UniWorX () @@ -556,20 +633,20 @@ defaultLoads shid = do toMap = foldMap $ \(E.Value uid, E.Value load, E.Value state) -> Map.singleton uid (state, load) -correctorForm :: SheetId -> MForm Handler (FormResult (Set SheetCorrector), [FieldView UniWorX]) +correctorForm :: SheetId -> MForm Handler (FormResult (Bool, Set SheetCorrector), [FieldView UniWorX]) correctorForm shid = do cListIdent <- newFormIdent let guardNonDeleted :: UserId -> Handler (Maybe UserId) guardNonDeleted uid = do - cID@CryptoID{..} <- encrypt uid :: Handler CryptoUUIDUser + CryptoID{ciphertext} <- encrypt uid :: Handler CryptoUUIDUser deleted <- lookupPostParam $ tshow ciphertext <> "-" <> "del" return $ bool Just (const Nothing) (isJust deleted) uid formCIDs <- mapM decrypt =<< catMaybes <$> liftHandlerT (map fromPathPiece <$> lookupPostParams cListIdent :: Handler [Maybe CryptoUUIDUser]) let currentLoads :: DB Loads currentLoads = foldMap (\(Entity _ SheetCorrector{..}) -> Map.singleton sheetCorrectorUser (sheetCorrectorState, sheetCorrectorLoad)) <$> selectList [ SheetCorrectorSheet ==. shid ] [] - (defaultLoads', currentLoads') <- lift . runDB $ (,) <$> defaultLoads shid <*> currentLoads + (autoDistribute, defaultLoads', currentLoads') <- lift . runDB $ (,,) <$> (sheetAutoDistribute <$> getJust shid) <*> defaultLoads shid <*> currentLoads loads' <- fmap (Map.fromList [(uid, (CorrectorNormal, mempty)) | uid <- formCIDs] `Map.union`) $ if | Map.null currentLoads' , null formCIDs -> defaultLoads' <$ when (not $ Map.null defaultLoads') (addMessageI Warning MsgCorrectorsDefaulted) @@ -581,10 +658,11 @@ correctorForm shid = do didDelete = any (flip Set.member deletions) formCIDs (countTutRes, countTutView) <- mreq checkBoxField (fsm MsgCountTutProp) . Just $ any (\(_, Load{..}) -> fromMaybe False byTutorial) $ Map.elems loads' + (autoDistributeRes, autoDistributeView) <- mreq checkBoxField (fsm MsgAutoAssignCorrs) (Just autoDistribute) let tutorField :: Field Handler [UserEmail] tutorField = convertField (map CI.mk) (map CI.original) $ multiEmailField - { fieldView = \theId name attrs val isReq -> asWidgetT $ do + { fieldView = \theId name attrs _val isReq -> asWidgetT $ do listIdent <- newIdent userId <- handlerToWidget requireAuthId previousCorrectors <- handlerToWidget . runDB . E.select . E.from $ \(user `E.InnerJoin` sheetCorrector `E.InnerJoin` sheet `E.InnerJoin` course `E.InnerJoin` lecturer) -> E.distinctOnOrderBy [E.asc $ user E.^. UserEmail ] $ do @@ -624,14 +702,14 @@ correctorForm shid = do let constructFields :: (UserId, Text, (CorrectorState, Load)) -> MForm Handler CorrectorForm constructFields (uid, uname, (state, Load{..})) = do - cID@CryptoID{..} <- encrypt uid :: MForm Handler CryptoUUIDUser + CryptoID{ciphertext} <- encrypt uid :: MForm Handler CryptoUUIDUser let fs name = "" { fsName = Just $ tshow ciphertext <> "-" <> name } rationalField = convertField toRational fromRational doubleField - (stateRes, cfViewState) <- mreq (selectField $ optionsFinite id) (fs "state") (Just state) + (stateRes, cfViewState) <- mreq (selectField optionsFinite) (fs "state") (Just state) (byTutRes, cfViewByTut) <- mreq checkBoxField (fs "bytut") (Just $ isJust byTutorial) (propRes, cfViewProp) <- mreq (checkBool (>= 0) MsgProportionNegative $ rationalField) (fs "prop") (Just byProportion) (_, cfViewDel) <- mreq checkBoxField (fs "del") (Just False) @@ -674,23 +752,25 @@ correctorForm shid = do cID <- encrypt uid :: WidgetT UniWorX IO CryptoUUIDUser toWidget [hamlet||] - return (corrResults, [ countTutView - , FieldView - { fvLabel = text $ mr MsgCorrectors - , fvTooltip = Nothing - , fvId = "" - , fvInput = Yesod.encodeCellTable tableDefault corrColonnade corrData >> mapM_ idField corrData >> mapM_ delField deletions - , fvErrors = Nothing - , fvRequired = True - } - , addTutView - { fvInput = [whamlet| - - ^{fvInput addTutView} - Hinzufügen - |] - } - ]) + return ( (,) <$> autoDistributeRes <*> corrResults + , [ autoDistributeView + , countTutView + , FieldView + { fvLabel = text $ mr MsgCorrectors + , fvTooltip = Just $ toHtml $ mr MsgCorrectorStateTip + , fvId = "" + , fvInput = Yesod.encodeCellTable tableDefault corrColonnade corrData >> mapM_ idField corrData >> mapM_ delField deletions' + , fvErrors = Nothing + , fvRequired = True + } + , addTutView + { fvInput = [whamlet| + + ^{fvInput addTutView} + Hinzufügen + |] + } + ]) -- Eingabebox für Korrektor hinzufügen -- Eingabe für Korrekt ausgefüllt: FormMissing zurückschicken um dann Feld hinzuzufügen @@ -704,9 +784,10 @@ getSCorrR tid ssh csh shn = do case res of FormFailure errs -> mapM_ (addMessage Error . toHtml) errs - FormSuccess res -> runDB $ do + FormSuccess (autoDistribute, res') -> runDB $ do + update shid [ SheetAutoDistribute =. autoDistribute ] deleteWhere [SheetCorrectorSheet ==. shid] - insertMany_ $ Set.toList res + insertMany_ $ Set.toList res' addMessageI Success MsgCorrectorsUpdated FormMissing -> return () diff --git a/src/Handler/Submission.hs b/src/Handler/Submission.hs index b64be4126..d3d624d86 100644 --- a/src/Handler/Submission.hs +++ b/src/Handler/Submission.hs @@ -1,28 +1,14 @@ -{-# LANGUAGE RecordWildCards, NamedFieldPuns #-} -{-# LANGUAGE NoImplicitPrelude #-} -{-# LANGUAGE OverloadedStrings #-} -{-# LANGUAGE OverloadedLists #-} -{-# LANGUAGE ParallelListComp #-} -{-# LANGUAGE TemplateHaskell #-} -{-# LANGUAGE QuasiQuotes #-} -{-# LANGUAGE MultiParamTypeClasses #-} -{-# LANGUAGE TypeFamilies #-} -{-# LANGUAGE FlexibleContexts #-} -{-# LANGUAGE TupleSections #-} -{-# LANGUAGE LambdaCase #-} -{-# LANGUAGE ViewPatterns #-} -{-# LANGUAGE PatternGuards #-} -{-# LANGUAGE TypeOperators #-} -{-# LANGUAGE PartialTypeSignatures #-} -{-# LANGUAGE MultiWayIf #-} - module Handler.Submission where -import Import hiding (joinPath) +import Import --- import Yesod.Form.Bootstrap3 +import Jobs + +-- import Yesod.Form.Bootstrap3 import Handler.Utils +import Handler.Utils.Delete +import Handler.Utils.Submission import Handler.Utils.Table.Cells import Network.Mime @@ -34,7 +20,6 @@ import Network.Mime import Data.Monoid (Any(..)) import Data.Maybe (fromJust) -- import qualified Data.Maybe -import qualified Data.Text as Text import qualified Data.Text.Encoding as Text import Data.CaseInsensitive (CI) @@ -63,22 +48,27 @@ import System.FilePath -- numberOfSubmissionEditDates = 3 -- for debugging only, should be 1 in production. -makeSubmissionForm :: Maybe SubmissionId -> UploadMode -> SheetGroup -> [UserEmail] -> Form (Maybe (Source Handler File), [UserEmail]) -makeSubmissionForm msmid uploadMode grouping buddies = identForm FIDsubmission $ \html -> do +makeSubmissionForm :: Maybe SubmissionId -> UploadMode -> SheetGroup -> NonEmpty UserEmail -> Form (Maybe (Source Handler File), NonEmpty UserEmail) +makeSubmissionForm msmid uploadMode grouping (self :| buddies) = identForm FIDsubmission $ \html -> do let - fileUpload = case uploadMode of + fileUploadForm = case uploadMode of NoUpload -> pure Nothing (Upload unpackZips) -> (bool (\f fs _ -> Just <$> areq f fs Nothing) aopt $ isJust msmid) (zipFileField unpackZips) (fsm $ bool MsgSubmissionFile MsgSubmissionArchive unpackZips) Nothing flip (renderAForm FormStandard) html $ (,) - <$> fileUpload - <*> (catMaybes <$> sequenceA [bool aforced' aopt editableBuddies ciField (fslpI (MsgSubmissionMember g) "user@campus.lmu.de" ) buddy - | g <- [1..(max groupNr $ length buddies)] -- groupNr might have decreased meanwhile - | buddy <- map (Just . Just) buddies ++ repeat Nothing -- show current buddies - ]) + <$> fileUploadForm + <*> ( (:|) + -- #227 Part I: change aforced to areq if the user is the lecturer or an admin (lecturer can upload for students) + <$> aforced ciField (fslpI (MsgSubmissionMember 1) "user@campus.lmu.de" ) self + <*> (catMaybes <$> sequenceA [bool aforced' aopt editableBuddies ciField (fslpI (MsgSubmissionMember g) "user@campus.lmu.de" ) buddy + | g <- [2..(fromIntegral groupNr)] + | buddy <- map (Just . Just) buddies ++ repeat Nothing -- show current buddies + ]) + ) <* submitButton where (groupNr, editableBuddies) - | Arbitrary{..} <- grouping = (pred maxParticipants, True) -- pred to account for the person submitting + | Arbitrary{..} <- grouping = (maxParticipants, True) + | RegisteredGroups <- grouping = (fromIntegral $ length buddies, False) | otherwise = (0, False) aforced' f fs (Just (Just v)) = Just <$> aforced f fs v @@ -104,14 +94,14 @@ getSubmissionOwnR tid ssh csh shn = do E.&&. submission E.^. SubmissionSheet E.==. E.val shid return $ submission E.^. SubmissionId case submissions of - ((E.Value sid):_) -> return sid + (E.Value sid : _) -> return sid [] -> notFound cID <- encrypt sid redirect $ CSubmissionR tid ssh csh shn cID SubShowR submissionHelper :: TermId -> SchoolId -> CourseShorthand -> SheetName -> SubmissionMode -> Handler Html submissionHelper tid ssh csh shn (SubmissionMode mcid) = do - uid <- requireAuthId + (Entity uid userData) <- requireAuth msmid <- traverse decrypt mcid actionUrl <- Data.Maybe.fromJust <$> getCurrentRoute maySubmit <- (== Authorized) <$> isAuthorized actionUrl True -- affects visibility of Edit-Dates, Submission-Button, etc. @@ -125,7 +115,7 @@ submissionHelper tid ssh csh shn (SubmissionMode mcid) = do E.where_ $ submissionUser E.^. SubmissionUserUser E.==. E.val uid E.&&. submission E.^. SubmissionSheet E.==. E.val shid return $ submission E.^. SubmissionId - -- $logDebugS "Submission.DUPLICATENEW" (tshow submissions) + -- logDebugS "Submission.DUPLICATENEW" (tshow submissions) case submissions of [] -> do -- fetch buddies from previous submission in this course @@ -147,23 +137,25 @@ submissionHelper tid ssh csh shn (SubmissionMode mcid) = do return (csheet, map E.unValue buddies, []) (E.Value smid:_) -> do cID <- encrypt smid - addMessageI Info $ MsgSubmissionAlreadyExists + addMessageI Info MsgSubmissionAlreadyExists redirect $ CSubmissionR tid ssh csh shn cID SubShowR (Just smid) -> do void $ submissionMatchesSheet tid ssh csh shn (fromJust mcid) - + shid' <- submissionSheet <$> get404 smid + unless (shid == shid') $ + invalidArgsI [MsgSubmissionWrongSheet] -- fetch buddies from current submission (Any isOwner, buddies) <- do - submittors <- E.select . E.from $ \(submissionUser `E.InnerJoin` user) -> do + submitters <- E.select . E.from $ \(submissionUser `E.InnerJoin` user) -> do E.on (submissionUser E.^. SubmissionUserUser E.==. user E.^. UserId) E.where_ $ submissionUser E.^. SubmissionUserSubmission E.==. E.val smid E.orderBy [E.asc $ user E.^. UserEmail] - return $ (user E.^. UserId, user E.^. UserEmail) + return (user E.^. UserId, user E.^. UserEmail) let breakUserFromBuddies (E.Value userID, E.Value email) | uid == userID = (Any True , []) | otherwise = (Any False, [email]) - return $ foldMap breakUserFromBuddies submittors + return $ foldMap breakUserFromBuddies submitters lastEdits <- do raw <- E.select . E.from $ \(user `E.InnerJoin` submissionEdit) -> do @@ -174,17 +166,18 @@ submissionHelper tid ssh csh shn (SubmissionMode mcid) = do let userName = if isOwner || maySubmit then E.just $ user E.^. UserDisplayName else E.nothing - return $ (userName, submissionEdit E.^. SubmissionEditTime) + return (userName, submissionEdit E.^. SubmissionEditTime) forM raw $ \(E.Value name, E.Value time) -> (name, ) <$> formatTime SelFormatDateTime time return (csheet,buddies,lastEdits) - ((res,formWidget), formEnctype) <- runFormPost $ makeSubmissionForm msmid sheetUploadMode sheetGrouping buddies - mCID <- runDB $ do + ((res,formWidget), formEnctype) <- runFormPost $ makeSubmissionForm msmid sheetUploadMode sheetGrouping (userEmail userData :| buddies) + mCID <- fmap join . msgSubmissionErrors . runDBJobs $ do res' <- case res of - (FormMissing ) -> return $ FormMissing + FormMissing -> return FormMissing (FormFailure failmsgs) -> return $ FormFailure failmsgs - (FormSuccess (mFiles,[])) -> return $ FormSuccess (mFiles,[]) -- Type change - (FormSuccess (mFiles,gEMails@(_:_))) -- Validate AdHoc Group Members - | (Arbitrary {..}) <- sheetGrouping -> do + -- #227 Part II: no longer ignore submitter, if the user is lecturer or admin (allow lecturers to submit for their students) + (FormSuccess (mFiles,_submitter:|[])) -> return $ FormSuccess (mFiles,[]) -- Type change + (FormSuccess (mFiles,_submitter:|gEMails@(_:_))) -- Validate AdHoc Group Members + | Arbitrary{..} <- sheetGrouping -> do -- , length gEMails < maxParticipants -> do -- < since submitting user is already accounted for let prep :: [(E.Value UserEmail, (E.Value UserId, E.Value Bool, E.Value Bool))] -> Map (CI Text) (Maybe (UserId, Bool, Bool)) prep ps = Map.filter (maybe True $ \(i,_,_) -> i /= uid) . Map.fromList $ map (, Nothing) gEMails ++ [(m, Just (i,p,s))|(E.Value m, (E.Value i, E.Value p, E.Value s)) <- ps] @@ -201,7 +194,7 @@ submissionHelper tid ssh csh shn (SubmissionMode mcid) = do E.&&. submission E.^. SubmissionSheet E.==. E.val shid case msmid of -- Multiple `E.where_`-Statements are merged with `&&` in esqueleto 2.5.3 Nothing -> return () - Just smid -> E.where_ $ submission E.^. SubmissionId E.!=. E.val smid + Just smid -> E.where_ $ submission E.^. SubmissionId E.!=. E.val smid return $ E.countRows E.>. E.val (0 :: Int64) return (user E.^. UserEmail, (user E.^. UserId, isParticipant, hasSubmitted)) @@ -215,7 +208,7 @@ submissionHelper tid ssh csh shn (SubmissionMode mcid) = do (Just (_,False,_)) -> pure . mr $ MsgNotAParticipant email tid csh (Just (_,_, True)) -> pure . mr $ MsgSubmissionAlreadyExistsFor email _other -> mempty - , case length participants `compare` maxParticipants of + , case fromIntegral (length participants) `compare` maxParticipants of LT -> mempty _ -> pure $ mr MsgTooManyParticipants ] @@ -226,14 +219,13 @@ submissionHelper tid ssh csh shn (SubmissionMode mcid) = do case res' of - (FormSuccess (mFiles,(setFromList -> adhocIds))) -> do - now <- liftIO $ getCurrentTime + (FormSuccess (mFiles, setFromList -> adhocIds)) -> do smid <- do smid <- case (mFiles, msmid) of (Nothing, Just smid) -- no new files, existing submission partners updated -> return smid - (Just files, _) -- new files - -> runConduit $ transPipe lift files .| extractRatingsMsg .| sinkSubmission uid (maybe (Left shid) Right msmid) False + (Just files, _) -> -- new files + runConduit $ transPipe (lift . lift) files .| extractRatingsMsg .| sinkSubmission uid (maybe (Left shid) Right msmid) False (Nothing, Nothing) -- new submission, no file upload requested -> insert Submission { submissionSheet = shid @@ -261,7 +253,7 @@ submissionHelper tid ssh csh shn (SubmissionMode mcid) = do return $ Just cID (FormFailure msgs) -> Nothing <$ forM_ msgs (addMessage Warning . toHtml) _other -> return Nothing - + case mCID of Just cID -> redirect $ CSubmissionR tid ssh csh shn cID SubShowR Nothing -> return () @@ -276,13 +268,13 @@ submissionHelper tid ssh csh shn (SubmissionMode mcid) = do Just isFile = origIsFile <|> corrIsFile in if | Just True <- origIsFile -> anchorCell (CSubmissionR tid ssh csh shn cid $ SubDownloadR SubmissionOriginal fileTitle') - ([whamlet|#{fileTitle'}|]) + [whamlet|#{fileTitle'}|] | otherwise -> textCell $ bool (<> "/") id isFile fileTitle' , sortable (toNothing "state") (i18nCell MsgCorState) $ \(coalesce -> (_, mCorr)) -> case mCorr of Nothing -> cell mempty Just (_, Entity _ File{..}) | isJust fileContent -> anchorCell (CSubmissionR tid ssh csh shn cid $ SubDownloadR SubmissionCorrected fileTitle) - ([whamlet|_{MsgFileCorrected}|]) + [whamlet|_{MsgFileCorrected}|] | otherwise -> i18nCell MsgCorrected , sortable (Just "time") (i18nCell MsgFileModified) $ \(coalesce -> (mOrig, mCorr)) -> let origTime = fileModified . entityVal . snd <$> mOrig @@ -290,7 +282,7 @@ submissionHelper tid ssh csh shn (SubmissionMode mcid) = do Just fileTime = (max <$> origTime <*> corrTime) <|> origTime <|> corrTime in timeCell fileTime ] - coalesce :: ((Maybe (Entity SubmissionFile), Maybe (Entity File)), (Maybe (Entity SubmissionFile), Maybe (Entity File))) -> (Maybe (Entity SubmissionFile, Entity File), Maybe (Entity SubmissionFile, Entity File)) + coalesce :: ((Maybe (Entity SubmissionFile), Maybe (Entity File)), (Maybe (Entity SubmissionFile), Maybe (Entity File))) -> (Maybe (Entity SubmissionFile, Entity File), Maybe (Entity SubmissionFile, Entity File)) coalesce ((ma, mb), (mc, md)) = ((,) <$> ma <*> mb, (,) <$> mc <*> md) submissionFiles :: _ -> _ -> E.SqlQuery _ submissionFiles smid ((sf1 `E.InnerJoin` f1) `E.FullOuterJoin` (sf2 `E.InnerJoin` f2)) = do @@ -307,20 +299,24 @@ submissionHelper tid ssh csh shn (SubmissionMode mcid) = do return ((sf1, f1), (sf2, f2)) smid2ArchiveTable (smid,cid) = DBTable { dbtSQLQuery = submissionFiles smid + , dbtRowKey = \((_ `E.InnerJoin` f1) `E.FullOuterJoin` (_ `E.InnerJoin` f2)) -> (f1 E.?. FileId, f2 E.?. FileId) , dbtColonnade = colonnadeFiles cid , dbtProj = return . dbrOutput , dbtStyle = def , dbtIdent = "files" :: Text - , dbtSorting = [ ( "path" - , SortColumn $ \((sf1 `E.InnerJoin` f1) `E.FullOuterJoin` (sf2 `E.InnerJoin` f2)) -> E.coalesce [f1 E.?. FileTitle, f2 E.?. FileTitle] - ) - , ( "time" - , SortColumn $ \((sf1 `E.InnerJoin` f1) `E.FullOuterJoin` (sf2 `E.InnerJoin` f2)) -> (E.unsafeSqlFunction "GREATEST" ([f1 E.?. FileModified, f2 E.?. FileModified] :: [E.SqlExpr (E.Value (Maybe UTCTime))]) :: E.SqlExpr (E.Value (Maybe UTCTime))) - ) - ] - , dbtFilter = [] + , dbtSorting = Map.fromList + [ ( "path" + , SortColumn $ \((_sf1 `E.InnerJoin` f1) `E.FullOuterJoin` (_sf2 `E.InnerJoin` f2)) -> E.coalesce [f1 E.?. FileTitle, f2 E.?. FileTitle] + ) + , ( "time" + , SortColumn $ \((_sf1 `E.InnerJoin` f1) `E.FullOuterJoin` (_sf2 `E.InnerJoin` f2)) -> (E.unsafeSqlFunction "GREATEST" ([f1 E.?. FileModified, f2 E.?. FileModified] :: [E.SqlExpr (E.Value (Maybe UTCTime))]) :: E.SqlExpr (E.Value (Maybe UTCTime))) + ) + ] + , dbtFilter = mempty + , dbtFilterUI = mempty + , dbtParams = def } - mFileTable <- traverse (fmap snd . dbTable def) . fmap smid2ArchiveTable $ (,) <$> msmid <*> mcid + mFileTable <- traverse (runDB . dbTableWidget' def) . fmap smid2ArchiveTable $ (,) <$> msmid <*> mcid defaultLayout $ do setTitleI $ MsgSubmissionEditHead tid ssh csh shn @@ -330,58 +326,56 @@ submissionHelper tid ssh csh shn (SubmissionMode mcid) = do getSubDownloadR :: TermId -> SchoolId -> CourseShorthand -> SheetName -> CryptoFileNameSubmission -> SubmissionFileType -> FilePath -> Handler TypedContent -getSubDownloadR tid ssh csh shn cID (submissionFileTypeIsUpdate -> isUpdate) path = do - runDB $ do - submissionID <- submissionMatchesSheet tid ssh csh shn cID +getSubDownloadR tid ssh csh shn cID (submissionFileTypeIsUpdate -> isUpdate) path = runDB $ do + submissionID <- submissionMatchesSheet tid ssh csh shn cID - isRating <- maybe False (== submissionID) <$> isRatingFile path + isRating <- (== Just submissionID) <$> isRatingFile path - when (isUpdate || isRating) $ - guardAuthResult =<< evalAccessDB (CSubmissionR tid ssh csh shn cID CorrectionR) False - - case isRating of - True - | isUpdate -> do - file <- runMaybeT $ lift . ratingFile cID =<< MaybeT (getRating submissionID) - maybe notFound (return . toTypedContent . Text.decodeUtf8) $ fileContent =<< file - | otherwise -> notFound - False -> do - results <- E.select . E.from $ \(sf `E.InnerJoin` f) -> do - E.on (f E.^. FileId E.==. sf E.^. SubmissionFileFile) - E.where_ $ sf E.^. SubmissionFileSubmission E.==. E.val submissionID - E.&&. f E.^. FileTitle E.==. E.val path - E.&&. E.not_ (sf E.^. SubmissionFileIsDeletion) - E.&&. sf E.^. SubmissionFileIsUpdate E.==. E.val isUpdate - -- E.&&. E.not_ (E.isNothing $ f E.^. FileContent) -- This is fine, we just return 204 - return f + when (isUpdate || isRating) $ + guardAuthResult =<< evalAccessDB (CSubmissionR tid ssh csh shn cID CorrectionR) False - let fileName = Text.pack $ takeFileName path - case results of - [Entity _ File{ fileContent = Just c, fileTitle }] -> do - whenM downloadFiles $ - addHeader "Content-Disposition" [st|attachment; filename="#{takeFileName fileTitle}"|] - return $ TypedContent (defaultMimeLookup (pack fileTitle) <> "; charset=utf-8") (toContent c) - [Entity _ File{ fileContent = Nothing }] -> sendResponseStatus noContent204 () - other -> do - $logErrorS "SubDownloadR" $ "Multiple matching files: " <> tshow other - error "Multiple matching files found." + case isRating of + True + | isUpdate -> do + file <- runMaybeT $ lift . ratingFile cID =<< MaybeT (getRating submissionID) + maybe notFound (return . toTypedContent . Text.decodeUtf8) $ fileContent =<< file + | otherwise -> notFound + False -> do + results <- E.select . E.from $ \(sf `E.InnerJoin` f) -> do + E.on (f E.^. FileId E.==. sf E.^. SubmissionFileFile) + E.where_ $ sf E.^. SubmissionFileSubmission E.==. E.val submissionID + E.&&. f E.^. FileTitle E.==. E.val path + E.&&. E.not_ (sf E.^. SubmissionFileIsDeletion) + E.&&. sf E.^. SubmissionFileIsUpdate E.==. E.val isUpdate + -- E.&&. E.not_ (E.isNothing $ f E.^. FileContent) -- This is fine, we just return 204 + return f + + case results of + [Entity _ File{ fileContent = Just c, fileTitle }] -> do + whenM downloadFiles $ + addHeader "Content-Disposition" [st|attachment; filename="#{takeFileName fileTitle}"|] + return $ TypedContent (defaultMimeLookup (pack fileTitle) <> "; charset=utf-8") (toContent c) + [Entity _ File{ fileContent = Nothing }] -> sendResponseStatus noContent204 () + other -> do + $logErrorS "SubDownloadR" $ "Multiple matching files: " <> tshow other + error "Multiple matching files found." getSubArchiveR :: TermId -> SchoolId -> CourseShorthand -> SheetName -> CryptoFileNameSubmission -> ZIPArchiveName SubmissionFileType -> Handler TypedContent getSubArchiveR tid ssh csh shn cID (ZIPArchiveName sfType) = do - when (sfType == SubmissionCorrected) $ + when (sfType == SubmissionCorrected) $ guardAuthResult =<< evalAccess (CSubmissionR tid ssh csh shn cID CorrectionR) False let filename | SubmissionOriginal <- sfType = ZIPArchiveName $ toPathPiece cID <> "-" <> toPathPiece sfType | otherwise = ZIPArchiveName $ toPathPiece cID - + addHeader "Content-Disposition" [st|attachment; filename="#{toPathPiece filename}"|] respondSourceDB "application/zip" $ do submissionID <- lift $ submissionMatchesSheet tid ssh csh shn cID rating <- lift $ getRating submissionID let - fileSource = case sfType of + fileSelect = case sfType of SubmissionOriginal -> E.selectSource . E.from $ \(sf `E.InnerJoin` f) -> do E.on $ f E.^. FileId E.==. sf E.^. SubmissionFileFile E.where_ $ sf E.^. SubmissionFileSubmission E.==. E.val submissionID @@ -390,10 +384,19 @@ getSubArchiveR tid ssh csh shn cID (ZIPArchiveName sfType) = do _ -> submissionFileSource submissionID fileSource' = do - fileSource .| Conduit.map entityVal + fileSelect .| Conduit.map entityVal when (sfType == SubmissionCorrected) $ maybe (return ()) (yieldM . ratingFile cID) rating zipComment = Text.encodeUtf8 $ toPathPiece cID fileSource' .| produceZip ZipInfo{..} .| Conduit.map toFlushBuilder + +getSubDelR, postSubDelR :: TermId -> SchoolId -> CourseShorthand -> SheetName -> CryptoFileNameSubmission -> Handler Html +getSubDelR = postSubDelR +postSubDelR tid ssh csh shn cID = do + subId <- runDB $ submissionMatchesSheet tid ssh csh shn cID + deleteR $ (submissionDeleteRoute $ Set.singleton subId) + { drAbort = SomeRoute $ CSubmissionR tid ssh csh shn cID SubShowR + , drSuccess = SomeRoute $ CSheetR tid ssh csh shn SShowR + } diff --git a/src/Handler/SystemMessage.hs b/src/Handler/SystemMessage.hs new file mode 100644 index 000000000..4727540e0 --- /dev/null +++ b/src/Handler/SystemMessage.hs @@ -0,0 +1,268 @@ +module Handler.SystemMessage where + +import Import + +import qualified Data.Map.Lazy as Map +import qualified Data.Text as Text + +import qualified Data.Set as Set + +import qualified Data.List.NonEmpty as NonEmpty + +import Handler.Utils + +import Utils.Lens + +import qualified Database.Esqueleto as E + + +htmlField' :: Field (HandlerT UniWorX IO) Html +htmlField' = htmlField + { fieldParse = \vs fis -> fieldParse htmlField (map Text.strip vs) fis + } + + + +getMessageR, postMessageR :: CryptoUUIDSystemMessage -> Handler Html +getMessageR = postMessageR +postMessageR cID = do + smId <- decrypt cID + (SystemMessage{..}, translation) <- runDB $ maybe notFound return =<< getSystemMessage appLanguages smId + let (summary, content) = case translation of + Nothing -> (systemMessageSummary, systemMessageContent) + Just SystemMessageTranslation{..} -> (systemMessageTranslationSummary, systemMessageTranslationContent) + + let + mkForm = do + ((modifyRes, modifyView), modifyEnctype) <- runFormPost . identForm FIDSystemMessageModify . renderAForm FormStandard + $ SystemMessage + <$> aopt utcTimeField (fslI MsgSystemMessageFrom) (Just systemMessageFrom) + <*> aopt utcTimeField (fslI MsgSystemMessageTo) (Just systemMessageTo) + <*> areq checkBoxField (fslI MsgSystemMessageAuthenticatedOnly) (Just systemMessageAuthenticatedOnly) + <*> areq (selectField optionsFinite) (fslI MsgSystemMessageSeverity) (Just systemMessageSeverity) + <*> areq (langField False) (fslpI MsgSystemMessageLanguage "RFC1766-Sprachcode") (Just systemMessageDefaultLanguage) + <*> areq htmlField' (fslpI MsgSystemMessageContent "HTML") (Just systemMessageContent) + <*> aopt htmlField' (fslpI MsgSystemMessageSummary "HTML") (Just systemMessageSummary) + <* submitButton + + ts <- runDB $ selectList [ SystemMessageTranslationMessage ==. smId ] [Asc SystemMessageTranslationLanguage] + let ts' = Map.fromList $ (systemMessageTranslationLanguage . entityVal &&& id) <$> ts + + modifyTranss' <- forM ts' $ \(Entity tId SystemMessageTranslation{..}) -> do + cID' <- encrypt tId + runFormPost . identForm (FIDSystemMessageModifyTranslation $ ciphertext cID') . renderAForm FormStandard + $ (,) + <$> fmap (Entity tId) + ( SystemMessageTranslation + <$> pure systemMessageTranslationMessage + <*> areq (langField False) (fslpI MsgSystemMessageLanguage "RFC1766-Sprachcode") (Just systemMessageTranslationLanguage) + <*> areq htmlField' (fslpI MsgSystemMessageContent "HTML") (Just systemMessageTranslationContent) + <*> aopt htmlField' (fslpI MsgSystemMessageSummary "HTML") (Just systemMessageTranslationSummary) + ) + <*> combinedButtonFieldF "" + + let modifyTranss = Map.map (view $ _1._1) modifyTranss' + + ((addTransRes, addTransView), addTransEnctype) <- runFormPost . identForm FIDSystemMessageAddTranslation . renderAForm FormStandard + $ SystemMessageTranslation + <$> pure smId + <*> areq (langField False) (fslpI MsgSystemMessageLanguage "RFC1766-Sprachcode") Nothing + <*> areq htmlField' (fslpI MsgSystemMessageContent "HTML") Nothing + <*> aopt htmlField' (fslpI MsgSystemMessageSummary "HTML") Nothing + <* submitButton + + formResult modifyRes $ modifySystemMessage smId + + formResult addTransRes addTranslation + + forM_ modifyTranss . flip formResult $ \(Entity tId SystemMessageTranslation{..}, catMaybes -> acts) -> case acts of + [BtnDelete'] -> do + runDB $ delete tId + addMessageI Success MsgSystemMessageDeleteTranslationSuccess + redirect $ MessageR cID + _other -> do + runDB $ update tId + [ SystemMessageTranslationLanguage =. systemMessageTranslationLanguage + , SystemMessageTranslationContent =. systemMessageTranslationContent + , SystemMessageTranslationSummary =. systemMessageTranslationSummary + ] + addMessageI Success MsgSystemMessageEditTranslationSuccess + redirect $ MessageR cID + + let + messageEditModal = modal [whamlet|_{MsgSystemMessageEdit}|] $ Right + [whamlet| + + ^{modifyView} + |] + translationAddModal = modal [whamlet|_{MsgSystemMessageAddTranslation}|] $ Right + [whamlet| + + ^{addTransView} + |] + translationsEditModal + | not $ null modifyTranss' = modal [whamlet|_{MsgSystemMessageEditTranslations}|] $ Right + [whamlet| + $forall ((_, transView), transEnctype) <- modifyTranss' + + + ^{transView} + |] + | otherwise = mempty + return (messageEditModal, translationAddModal, translationsEditModal) + + maySubmit <- (== Authorized) <$> evalAccess (MessageR cID) True + forms <- traverse (const mkForm) $ () <$ guard maySubmit + + defaultLayout + $(widgetFile "system-message") + where + modifySystemMessage smId SystemMessage{..} = do + runDB $ update smId + [ SystemMessageFrom =. systemMessageFrom + , SystemMessageTo =. systemMessageTo + , SystemMessageAuthenticatedOnly =. systemMessageAuthenticatedOnly + , SystemMessageSeverity =. systemMessageSeverity + , SystemMessageDefaultLanguage =. systemMessageDefaultLanguage + , SystemMessageContent =. systemMessageContent + , SystemMessageSummary =. systemMessageSummary + ] + addMessageI Success MsgSystemMessageEditSuccess + redirect $ MessageR cID + + addTranslation translation = do + runDB . void $ insert translation + addMessageI Success MsgSystemMessageAddTranslationSuccess + redirect $ MessageR cID + +type MessageListData = DBRow (Entity SystemMessage, Maybe SystemMessageTranslation) + +data ActionSystemMessage = SMDelete | SMActivate | SMDeactivate + deriving (Eq, Ord, Enum, Bounded, Show, Read) +instance Universe ActionSystemMessage +instance Finite ActionSystemMessage + +nullaryPathPiece ''ActionSystemMessage (camelToPathPiece' 1) +embedRenderMessage ''UniWorX ''ActionSystemMessage (("SystemMessage" <>) . dropPrefix "SM") + +data ActionSystemMessageData = SMDDelete + | SMDActivate (Maybe UTCTime) + | SMDDeactivate (Maybe UTCTime) + deriving (Eq, Show, Read) + +getMessageListR, postMessageListR :: Handler Html +getMessageListR = postMessageListR +postMessageListR = do + let + dbtSQLQuery = return + dbtColonnade = mconcat + [ dbSelect (applying _2) id $ \DBRow{ dbrOutput = (Entity smId _, _) } -> encrypt smId + , dbRow + , sortable Nothing (i18nCell MsgSystemMessageId) $ \DBRow{ dbrOutput = (Entity smId _, _) } -> anchorCellM' (encrypt smId) MessageR (toWidget . tshow . ciphertext) + , sortable (Just "from") (i18nCell MsgSystemMessageFrom) $ \DBRow{ dbrOutput = (Entity _ SystemMessage{..}, _) } -> cell $ maybe mempty (formatTimeW SelFormatDateTime) systemMessageFrom + , sortable (Just "to") (i18nCell MsgSystemMessageTo) $ \DBRow{ dbrOutput = (Entity _ SystemMessage{..}, _) } -> cell $ maybe mempty (formatTimeW SelFormatDateTime) systemMessageTo + , sortable (Just "authenticated") (i18nCell MsgSystemMessageAuthenticatedOnly) $ \DBRow{ dbrOutput = (Entity _ SystemMessage{..}, _) } -> tickmarkCell systemMessageAuthenticatedOnly + , sortable (Just "severity") (i18nCell MsgSystemMessageSeverity) $ \DBRow{ dbrOutput = (Entity _ SystemMessage{..}, _) } -> i18nCell systemMessageSeverity + , sortable Nothing (i18nCell MsgSystemMessageSummaryContent) $ \DBRow{ dbrOutput = (Entity _ SystemMessage{..}, smT) } -> let + (summary, content) = case smT of + Nothing -> (systemMessageSummary, systemMessageContent) + Just SystemMessageTranslation{..} -> (systemMessageTranslationSummary, systemMessageTranslationContent) + in cell . toWidget $ fromMaybe content summary + ] + dbtProj DBRow{ dbrOutput = smE@(Entity smId _), .. } = do + Just (_, smT) <- lift $ getSystemMessage appLanguages smId + return DBRow + { dbrOutput = (smE, smT) + , .. + } + psValidator = def :: PSValidator (MForm (HandlerT UniWorX IO)) (FormResult (Last ActionSystemMessageData, DBFormResult CryptoUUIDSystemMessage Bool MessageListData)) + (tableRes', tableView) <- runDB $ dbTable psValidator DBTable + { dbtSQLQuery + , dbtRowKey = (E.^. SystemMessageId) + , dbtColonnade + , dbtProj + , dbtSorting = Map.fromList + [ ( "from" + , SortColumn $ \systemMessage -> systemMessage E.^. SystemMessageFrom + ) + , ( "to" + , SortColumn $ \systemMessage -> systemMessage E.^. SystemMessageTo + ) + , ( "authenticated" + , SortColumn $ \systemMessage -> systemMessage E.^. SystemMessageAuthenticatedOnly + ) + , ( "severity" + , SortColumn $ \systemMessage -> systemMessage E.^. SystemMessageSeverity + ) + ] + , dbtFilter = mempty + , dbtFilterUI = mempty + , dbtStyle = def + , dbtParams = DBParamsForm + { dbParamsFormMethod = POST + , dbParamsFormAction = Just $ SomeRoute MessageListR + , dbParamsFormAttrs = [] + , dbParamsFormAddSubmit = True + , dbParamsFormAdditional = \frag -> do + now <- liftIO getCurrentTime + let actions = Map.fromList + [ (SMDelete, pure SMDDelete) + , (SMActivate, SMDActivate <$> aopt utcTimeField (fslI MsgSystemMessageTimestamp) (Just $ Just now)) + , (SMDeactivate, SMDDeactivate <$> aopt utcTimeField (fslI MsgSystemMessageTimestamp) (Just Nothing)) + ] + (actionRes, action) <- multiAction actions (Just SMActivate) + return ((, mempty) . Last . Just <$> actionRes, toWidget frag <> action) + , dbParamsFormEvaluate = liftHandlerT . runFormPost + , dbParamsFormResult = id + } + , dbtIdent = "messages" :: Text + } + + let tableRes = tableRes' & mapped._2 %~ Map.keysSet . Map.filter id . getDBFormResult (const False) + & mapped._1 %~ fromMaybe (error "By construction the form should always return an action") . getLast + + case tableRes of + FormMissing -> return () + FormFailure errs -> forM_ errs $ addMessage Error . toHtml + FormSuccess (SMDDelete, selection) + | not $ null selection -> do + selection' <- traverse decrypt $ Set.toList selection + runDB $ deleteCascadeWhere [ SystemMessageId <-. selection' ] + $(addMessageFile Success "templates/messages/systemMessagesDeleted.hamlet") + redirect MessageListR + FormSuccess (SMDActivate ts, selection) + | not $ null selection -> do + selection' <- traverse decrypt $ Set.toList selection + runDB $ updateWhere [ SystemMessageId <-. selection' ] [ SystemMessageFrom =. ts ] + $(addMessageFile Success "templates/messages/systemMessagesSetFrom.hamlet") + redirect MessageListR + FormSuccess (SMDDeactivate ts, selection) + | not $ null selection -> do + selection' <- traverse decrypt $ Set.toList selection + runDB $ updateWhere [ SystemMessageId <-. selection' ] [ SystemMessageTo =. ts ] + $(addMessageFile Success "templates/messages/systemMessagesSetTo.hamlet") + redirect MessageListR + FormSuccess (_, _selection) -- prop> null _selection + -> addMessageI Error MsgSystemMessageEmptySelection + + ((addRes, addView), addEncoding) <- runFormPost . identForm FIDSystemMessageAdd . renderAForm FormStandard $ SystemMessage + <$> aopt utcTimeField (fslI MsgSystemMessageFrom) Nothing + <*> aopt utcTimeField (fslI MsgSystemMessageTo) Nothing + <*> areq checkBoxField (fslI MsgSystemMessageAuthenticatedOnly) Nothing + <*> areq (selectField optionsFinite) (fslI MsgSystemMessageSeverity) Nothing + <*> areq (langField False) (fslpI MsgSystemMessageLanguage "RFC1766-Sprachcode") (Just $ NonEmpty.head appLanguages) + <*> areq htmlField' (fslpI MsgSystemMessageContent "HTML") Nothing + <*> aopt htmlField' (fslpI MsgSystemMessageSummary "HTML") Nothing + <* submitButton + + case addRes of + FormMissing -> return () + FormFailure errs -> forM_ errs $ addMessage Error . toHtml + FormSuccess sysMsg -> do + sId <- runDB $ insert sysMsg + cID <- encrypt sId :: Handler CryptoUUIDSystemMessage + addMessageI Success $ MsgSystemMessageAdded cID + redirect $ MessageR cID + + defaultLayout + $(widgetFile "system-message-list") diff --git a/src/Handler/Term.hs b/src/Handler/Term.hs index 1720eec1f..0f9da91a8 100644 --- a/src/Handler/Term.hs +++ b/src/Handler/Term.hs @@ -1,19 +1,8 @@ -{-# LANGUAGE NoImplicitPrelude - , OverloadedStrings - , OverloadedLists - , RecordWildCards - , TemplateHaskell - , QuasiQuotes - , MultiParamTypeClasses - , TypeFamilies - , FlexibleContexts - , PartialTypeSignatures - #-} - module Handler.Term where import Import import Handler.Utils +import qualified Data.Map as Map -- import qualified Data.Text as T import Yesod.Form.Bootstrap3 @@ -21,10 +10,17 @@ import Yesod.Form.Bootstrap3 import qualified Database.Esqueleto as E +-- | Default start day of term for season, +-- @True@: start of term, @False@: end of term +defaultDay :: Bool -> Season -> Day +defaultDay True Winter = fromGregorian 2020 10 1 +defaultDay False Winter = fromGregorian 2020 3 31 +defaultDay True Summer = fromGregorian 2020 4 1 +defaultDay False Summer = fromGregorian 2020 9 30 validateTerm :: Term -> [Text] -validateTerm (Term{..}) = +validateTerm Term{..} = [ msg | (False, msg) <- [ --startOk ( termStart `withinTerm` termName @@ -71,15 +67,15 @@ getTermShowR = do provideRep $ toJSON . map fst <$> runDB (E.select $ E.from termData) provideRep $ do let colonnadeTerms = widgetColonnade $ mconcat - [ sortable Nothing "Kürzel" $ - anchorCell' (\(Entity tid _, _) -> TermCourseListR tid) - (\(Entity tid _, _) -> [whamlet|#{toPathPiece tid}|]) + [ sortable Nothing "Kürzel" $ \(Entity tid _, _) -> anchorCell + (TermCourseListR tid) + [whamlet|#{toPathPiece tid}|] , sortable (Just "lecture-start") (i18nCell MsgLectureStart) $ \(Entity _ Term{..},_) -> cell $ formatTime SelFormatDate termLectureStart >>= toWidget , sortable (Just "lecture-end") "Ende Vorlesungen" $ \(Entity _ Term{..},_) -> cell $ formatTime SelFormatDate termLectureEnd >>= toWidget , sortable Nothing "Aktiv" $ \(Entity _ Term{..},_) -> - textCell $ (bool "" tickmark termActive :: Text) + textCell (bool "" tickmark termActive :: Text) , sortable Nothing "Kurse" $ \(_, E.Value numCourses) -> cell [whamlet|_{MsgNumCourses numCourses}|] , sortable (Just "start") "Semesteranfang" $ \(Entity _ Term{..},_) -> @@ -107,35 +103,40 @@ getTermShowR = do -- #{termToText termName} -- |] -- ] - ((), table) <- dbTable def $ DBTable + table <- runDB $ dbTableWidget' def DBTable { dbtSQLQuery = termData + , dbtRowKey = (E.^. TermId) , dbtColonnade = colonnadeTerms , dbtProj = return . dbrOutput - , dbtSorting = [ ( "start" - , SortColumn $ \term -> term E.^. TermStart - ) - , ( "end" - , SortColumn $ \term -> term E.^. TermEnd - ) - , ( "lecture-start" - , SortColumn $ \term -> term E.^. TermLectureStart - ) - , ( "lecture-end" - , SortColumn $ \term -> term E.^. TermLectureEnd - ) - ] - , dbtFilter = [ ( "active" - , FilterColumn $ \term -> (term E.^. TermActive :: E.SqlExpr (E.Value Bool)) - ) - , ( "course" - , FilterColumn $ \term csh -> case csh of -- FilterColumn-Lambdas are - [] -> E.val True :: E.SqlExpr (E.Value Bool) - cshs -> E.exists . E.from $ \course -> do - E.where_ $ course E.^. CourseTerm E.==. term E.^. TermId - E.&&. course E.^. CourseShorthand `E.in_` E.valList cshs - ) - ] + , dbtSorting = Map.fromList + [ ( "start" + , SortColumn $ \term -> term E.^. TermStart + ) + , ( "end" + , SortColumn $ \term -> term E.^. TermEnd + ) + , ( "lecture-start" + , SortColumn $ \term -> term E.^. TermLectureStart + ) + , ( "lecture-end" + , SortColumn $ \term -> term E.^. TermLectureEnd + ) + ] + , dbtFilter = Map.fromList + [ ( "active" + , FilterColumn $ \term -> term E.^. TermActive :: E.SqlExpr (E.Value Bool) + ) + , ( "course" + , FilterColumn $ \term csh -> case csh of -- FilterColumn-Lambdas are + [] -> E.val True :: E.SqlExpr (E.Value Bool) + cshs -> E.exists . E.from $ \course -> + E.where_ $ course E.^. CourseTerm E.==. term E.^. TermId + E.&&. course E.^. CourseShorthand `E.in_` E.valList cshs + ) + ] + , dbtFilterUI = mempty , dbtStyle = def + , dbtParams = def , dbtIdent = "terms" :: Text } defaultLayout $ do @@ -144,19 +145,31 @@ getTermShowR = do getTermEditR :: Handler Html getTermEditR = do - -- TODO: Defaults für Semester hier ermitteln und übergeben - termEditHandler Nothing + mbLastTerm <- runDB $ selectFirst [] [Desc TermName] + let template = case mbLastTerm of + Nothing -> mempty + (Just (Entity { entityVal=Term{..} })) -> let + ntid = succ termName + seas = season ntid + yr = year ntid + yr' = if seas == Summer then yr else succ yr + in mempty + { tftName = Just $ ntid + , tftStart = Just $ defaultDay True seas & setYear yr + , tftEnd = Just $ defaultDay False seas & setYear yr' + } + termEditHandler template postTermEditR :: Handler Html -postTermEditR = termEditHandler Nothing +postTermEditR = termEditHandler mempty getTermEditExistR :: TermId -> Handler Html getTermEditExistR tid = do term <- runDB $ get tid - termEditHandler term + termEditHandler $ termToTemplate term -termEditHandler :: Maybe Term -> Handler Html +termEditHandler :: TermFormTemplate -> Handler Html termEditHandler term = do ((result, formWidget), formEnctype) <- runFormPost $ newTermForm term case result of @@ -171,24 +184,70 @@ termEditHandler term = do -- MIT INTERNATIONALISIERUNG: addMessageI Success $ MsgTermEdited tid redirect TermShowR - (FormMissing ) -> return () + FormMissing -> return () (FormFailure _) -> addMessageI Warning MsgInvalidInput let actionUrl = TermEditR defaultLayout $ do setTitleI MsgTermEditHeading $(widgetFile "formPage") -newTermForm :: Maybe Term -> Form Term +data TermFormTemplate = TermFormTemplate + { tftName :: Maybe TermIdentifier + , tftStart :: Maybe Day + , tftEnd :: Maybe Day + , tftHolidays :: Maybe [Day] + , tftLectureStart :: Maybe Day + , tftLectureEnd :: Maybe Day + , tftActive :: Maybe Bool + } + +-- | TermFormTemplates form a pointwise-left biased Semigroup +instance Semigroup TermFormTemplate where + left <> right = TermFormTemplate + { tftName = tftName left <|> tftName right + , tftStart = tftStart left <|> tftStart right + , tftEnd = tftEnd left <|> tftEnd right + , tftHolidays = tftHolidays left <|> tftHolidays right + , tftLectureStart = tftLectureStart left <|> tftLectureStart right + , tftLectureEnd = tftLectureEnd left <|> tftLectureEnd right + , tftActive = tftActive left <|> tftActive right + } + +instance Monoid TermFormTemplate where + mappend = (<>) + mempty = TermFormTemplate + { tftName = Nothing + , tftStart = Nothing + , tftEnd = Nothing + , tftHolidays = Nothing + , tftLectureStart = Nothing + , tftLectureEnd = Nothing + , tftActive = Nothing + } + +termToTemplate ::Maybe Term -> TermFormTemplate +termToTemplate Nothing = mempty +termToTemplate (Just Term{..}) = TermFormTemplate + { tftName = Just termName + , tftStart = Just termStart + , tftEnd = Just termEnd + , tftHolidays = Just termHolidays + , tftLectureStart = Just termLectureStart + , tftLectureEnd = Just termLectureEnd + , tftActive = Just termActive + } + +newTermForm :: TermFormTemplate -> Form Term newTermForm template html = do mr <- getMessageRender (result, widget) <- flip (renderAForm FormStandard) html $ Term - <$> areq termNewField (fslpI MsgTerm (mr MsgTermPlaceholder)) (termName <$> template) - <*> areq dayField (fsl ("Erster Tag" :: Text)) (termStart <$> template) - <*> areq dayField (fsl ("Letzer Tag" :: Text)) (termEnd <$> template) + <$> areq termNewField (fslpI MsgTerm (mr MsgTermPlaceholder)) (tftName template) + <*> areq dayField (fslI MsgTermStartDay & setTooltip MsgTermStartDayTooltip) (tftStart template) + <*> areq dayField (fslI MsgTermEndDay & setTooltip MsgTermEndDayTooltip) (tftEnd template) <*> pure [] -- TODO: List of Day field required, must probably be done as its own form and then combined - <*> areq dayField (fsl "Beginn Vorlesungen") (termLectureStart <$> template) - <*> areq dayField (fsl ("Ende Vorlesungen" :: Text)) (termLectureEnd <$> template) - <*> areq checkBoxField (bfs ("Aktiv" :: Text)) (termActive <$> template) + <*> areq dayField (fslI MsgTermLectureStart) (tftLectureStart template) + <*> areq dayField (fslI MsgTermLectureEnd & setTooltip MsgTermLectureEndTooltip) (tftLectureEnd template) + <*> areq checkBoxField (bfs ("Aktiv" :: Text)) (tftActive template) <* submitButton return $ case result of FormSuccess termResult diff --git a/src/Handler/Users.hs b/src/Handler/Users.hs index 8208d1a1f..a2c21ec9f 100644 --- a/src/Handler/Users.hs +++ b/src/Handler/Users.hs @@ -1,11 +1,3 @@ -{-# LANGUAGE NoImplicitPrelude #-} -{-# LANGUAGE OverloadedStrings #-} -{-# LANGUAGE TemplateHaskell #-} -{-# LANGUAGE QuasiQuotes #-} -{-# LANGUAGE MultiParamTypeClasses #-} -{-# LANGUAGE TypeFamilies #-} -{-# LANGUAGE RecordWildCards, NamedFieldPuns #-} - module Handler.Users where import Import @@ -17,18 +9,16 @@ import Utils.Lens import qualified Data.CaseInsensitive as CI import qualified Data.Map as Map -import qualified Data.Set as Set import qualified Database.Esqueleto as E -hijackUserForm :: UserId -> Form UserId -hijackUserForm uid csrf = do - cID <- encrypt uid +hijackUserForm :: CryptoUUIDUser -> Form () +hijackUserForm cID csrf = do (uidResult, uidView) <- mforced hiddenField "" (cID :: CryptoUUIDUser) (btnResult, btnView) <- mreq (buttonField BtnHijack) "" Nothing - return (uid <$ uidResult <* btnResult, mconcat [toWidget csrf, fvInput uidView, fvInput btnView]) + return (() <$ uidResult <* btnResult, mconcat [toWidget csrf, fvInput uidView, fvInput btnView]) getUsersR :: Handler Html getUsersR = do @@ -67,18 +57,22 @@ getUsersR = do #{sh} |] , sortable Nothing mempty $ \DBRow{ dbrOutput = Entity uid _ } -> cell $ do - (hijackView, hijackEnctype) <- liftHandlerT . generateFormPost $ hijackUserForm uid cID <- encrypt uid - [whamlet| - - ^{hijackView} - |] + mayHijack <- (== Authorized) <$> evalAccess (AdminHijackUserR cID) True + myUid <- liftHandlerT maybeAuthId + when (mayHijack && Just uid /= myUid) $ do + (hijackView, hijackEnctype) <- liftHandlerT . generateFormPost $ hijackUserForm cID + [whamlet| + + ^{hijackView} + |] ] psValidator = def - & defaultSorting [("name", SortAsc),("display-name", SortAsc)] + & defaultSorting [SortAscBy "name", SortAscBy "display-name"] - ((), userList) <- dbTable psValidator $ DBTable + ((), userList) <- runDB $ dbTable psValidator DBTable { dbtSQLQuery = return :: E.SqlExpr (Entity User) -> E.SqlQuery (E.SqlExpr (Entity User)) + , dbtRowKey = (E.^. UserId) , dbtColonnade , dbtProj = return , dbtSorting = Map.fromList @@ -93,7 +87,9 @@ getUsersR = do ) ] , dbtFilter = mempty + , dbtFilterUI = mempty , dbtStyle = def + , dbtParams = def , dbtIdent = "users" :: Text } @@ -104,21 +100,10 @@ getUsersR = do postAdminHijackUserR :: CryptoUUIDUser -> Handler TypedContent postAdminHijackUserR cID = do uid <- decrypt cID - ((hijackRes, _), _) <- runFormPost $ hijackUserForm uid + ((hijackRes, _), _) <- runFormPost $ hijackUserForm cID - case hijackRes of - FormSuccess uid' - | uid' == uid -> do - myUid <- requireAuthId - User{..} <- runDB $ do - otherSchoolsAdmin <- Set.fromList . map (userAdminSchool . entityVal) <$> selectList [UserAdminUser ==. uid] [] - otherSchoolsLecturer <- Set.fromList . map (userLecturerSchool . entityVal) <$> selectList [UserLecturerUser ==. uid] [] - mySchools <- Set.fromList . map (userAdminSchool . entityVal) <$> selectList [UserAdminUser ==. myUid] [] - when (not $ (otherSchoolsAdmin `Set.union` otherSchoolsLecturer) `Set.isSubsetOf` mySchools) $ - permissionDenied "Cannot escalate admin status to additional schools" + ret <- formResultMaybe hijackRes $ \() -> Just <$> do + User{userIdent} <- runDB $ get404 uid + setCredsRedirect $ Creds "dummy" (CI.original userIdent) [] - get404 uid - setCredsRedirect $ Creds "dummy" (CI.original userIdent) [] - | otherwise -> error "This should be impossible by definition of `hijackUserForm`" - FormFailure errs -> toTypedContent <$> mapM_ (addMessage Error . toHtml) errs - FormMissing -> return $ toTypedContent () + maybe (redirect UsersR) return ret diff --git a/src/Handler/Utils.hs b/src/Handler/Utils.hs index 394359b27..3ecc4b932 100644 --- a/src/Handler/Utils.hs +++ b/src/Handler/Utils.hs @@ -1,10 +1,3 @@ -{-# LANGUAGE NoImplicitPrelude #-} -{-# LANGUAGE OverloadedStrings #-} -{-# LANGUAGE TypeFamilies, FlexibleContexts, ConstraintKinds #-} -{-# LANGUAGE QuasiQuotes #-} -{-# LANGUAGE RecordWildCards #-} - - module Handler.Utils ( module Handler.Utils ) where @@ -22,9 +15,10 @@ import Handler.Utils.Table.Pagination as Handler.Utils import Handler.Utils.Zip as Handler.Utils import Handler.Utils.Rating as Handler.Utils hiding (extractRatings) -import Handler.Utils.Submission as Handler.Utils +-- import Handler.Utils.Submission as Handler.Utils import Handler.Utils.Sheet as Handler.Utils import Handler.Utils.Templates as Handler.Utils +import Handler.Utils.Mail as Handler.Utils downloadFiles :: (MonadHandler m, HandlerSite m ~ UniWorX) => m Bool @@ -37,22 +31,25 @@ downloadFiles = do return userDefaultDownloadFiles tidFromText :: Text -> Maybe TermId -tidFromText = (fmap TermKey) . maybeRight . termFromText +tidFromText = fmap TermKey . maybeRight . termFromText simpleLink :: Widget -> Route UniWorX -> Widget simpleLink lbl url = [whamlet|^{lbl}|] nameWidget :: Text -> Text -> Widget -nameWidget displayName surname - | null surname = toWidget displayName +nameWidget displayName surname = toWidget $ nameHtml displayName surname + +nameHtml :: Text -> Text -> Html +nameHtml displayName surname + | null surname = toHtml displayName | otherwise = case reverse $ T.splitOn surname displayName of - [_notContained] -> [whamlet|$newline never + [_notContained] -> [shamlet|$newline never #{displayName} ( #{surname} )|] (suffix:prefixes) -> let prefix = T.intercalate surname $ reverse prefixes - in [whamlet|$newline never + in [shamlet|$newline never #{prefix} #{surname} #{suffix} @@ -73,3 +70,7 @@ warnTermDays tid times = do forM_ outoflecture $ warnI MsgDayIsOutOfLecture forM_ outoftermdays $ warnI MsgDayIsOutOfTerm +visibleWidget :: Bool -> Widget +-- ^ @visibleWidget False@ is an icon that denotes that something™ is not visible +visibleWidget True = mempty +visibleWidget False = [whamlet||] diff --git a/src/Handler/Utils/Course.hs b/src/Handler/Utils/Course.hs new file mode 100644 index 000000000..c95df004e --- /dev/null +++ b/src/Handler/Utils/Course.hs @@ -0,0 +1,27 @@ +module Handler.Utils.Course where + +import Import +import Handler.Utils.Delete + +import qualified Database.Esqueleto as E + + +courseDeleteRoute :: Set CourseId -> DeleteRoute Course +courseDeleteRoute drRecords = DeleteRoute + { drRecords + , drGetInfo = \(course `E.InnerJoin` school) -> do + E.on $ course E.^. CourseSchool E.==. school E.^. SchoolId + E.orderBy [E.asc $ course E.^. CourseName] + return (course E.^. CourseName, school E.^. SchoolShorthand, school E.^. SchoolName, course E.^. CourseTerm) + , drUnjoin = \(course `E.InnerJoin` _) -> course + , drRenderRecord = \(E.Value cName, _, E.Value sName, E.Value tid') -> + return [whamlet| + #{cName} (_{ShortTermIdentifier (unTermKey tid')}, #{sName}) + |] + , drRecordConfirmString = \(E.Value cName, E.Value ssh', _, E.Value tid') -> + return [st|#{termToText (unTermKey tid')}/#{ssh'}/#{cName}|] + , drCaption = SomeMessage MsgCourseDeleteQuestion + , drSuccessMessage = SomeMessage MsgCourseDeleted + , drAbort = error "drAbort undefined" + , drSuccess = error "drSuccess undefined" + } diff --git a/src/Handler/Utils/DateTime.hs b/src/Handler/Utils/DateTime.hs index 679539202..1d31051fa 100644 --- a/src/Handler/Utils/DateTime.hs +++ b/src/Handler/Utils/DateTime.hs @@ -1,31 +1,28 @@ -{-# LANGUAGE NoImplicitPrelude - , TemplateHaskell - , OverloadedStrings - , RecordWildCards - , TypeFamilies - #-} - module Handler.Utils.DateTime ( utcToLocalTime , localTimeToUTC, TZ.LocalToUTCResult(..) , formatTime, formatTime', formatTimeW , getTimeLocale, getDateTimeFormat , validDateTimeFormats, dateTimeFormatOptions - , addOneWeek + , formatTimeMail + , addOneWeek, addWeeks + , weekDiff, weeksToAdd + , setYear ) where import Import -import Data.Time.Zones hiding (localTimeToUTCFull) +import Data.Time.Zones import qualified Data.Time.Zones as TZ import Data.Time hiding (formatTime, localTimeToUTC, utcToLocalTime) -import Data.Time.Clock (addUTCTime,nominalDay) +-- import Data.Time.Clock (addUTCTime,nominalDay) import qualified Data.Time.Format as Time import Data.Set (Set) import qualified Data.Set as Set + utcToLocalTime :: UTCTime -> LocalTime utcToLocalTime = TZ.utcToLocalTimeTZ appTZ @@ -42,7 +39,7 @@ instance HasLocalTime Day where toLocalTime d = LocalTime d midnight instance HasLocalTime UTCTime where - toLocalTime t = utcToLocalTime t + toLocalTime = utcToLocalTime formatTime' :: (HasLocalTime t, MonadHandler m, HandlerSite m ~ UniWorX) => String -> t -> m Text formatTime' fmtStr t = fmap fromString $ Time.formatTime <$> getTimeLocale <*> pure fmtStr <*> pure (toLocalTime t) @@ -58,6 +55,9 @@ formatTime proj t = flip formatTime' t =<< (unDateTimeFormat <$> getDateTimeForm formatTimeW :: (HasLocalTime t) => SelDateTimeFormat -> t -> Widget formatTimeW s t = toWidget =<< formatTime s t +formatTimeMail :: (MonadMail m, HasLocalTime t) => SelDateTimeFormat -> t -> m Text +formatTimeMail sel t = fmap fromString $ Time.formatTime <$> (getTimeLocale' . mailLanguages <$> askMailLanguages) <*> (unDateTimeFormat <$> askMailDateTimeFormat sel) <*> pure (toLocalTime t) + getTimeLocale :: (MonadHandler m, HandlerSite m ~ UniWorX) => m TimeLocale getTimeLocale = getTimeLocale' <$> languages @@ -81,7 +81,7 @@ getDateTimeFormat sel = do validDateTimeFormats :: TimeLocale -> SelDateTimeFormat -> Set DateTimeFormat -- ^ We use a whitelist instead of just letting the user specify their own format string since vulnerabilities in printf-like functions are not uncommon -validDateTimeFormats _ SelFormatDateTime = Set.fromList $ +validDateTimeFormats _ SelFormatDateTime = Set.fromList [ DateTimeFormat "%a %d %b %Y %R" , DateTimeFormat "%a %b %d %Y %R" , DateTimeFormat "%A, %d %B %Y %R" @@ -98,7 +98,7 @@ validDateTimeFormats _ SelFormatDateTime = Set.fromList $ , DateTimeFormat "%Y-%m-%d %T" , DateTimeFormat "%Y-%m-%dT%T" ] -validDateTimeFormats _ SelFormatDate = Set.fromList $ +validDateTimeFormats _ SelFormatDate = Set.fromList [ DateTimeFormat "%a %d %b %Y" , DateTimeFormat "%a %b %d %Y" , DateTimeFormat "%A, %d %B %Y" @@ -128,14 +128,42 @@ dateTimeFormatOptions sel = do let toOption fmt@DateTimeFormat{..} = do - dateTime <- formatTime' unDateTimeFormat now - return $ (dateTime, fmt) - - optionsPairs <=< mapM toOption . Set.toList $ validDateTimeFormats tl sel + dateTime <- formatTime' unDateTimeFormat now + return (dateTime, fmt) + + optionsPairs <=< mapM toOption . Set.toList $ validDateTimeFormats tl sel addOneWeek :: UTCTime -> UTCTime -addOneWeek = addUTCTime (7 * nominalDay) +addOneWeek = addWeeks 1 --- addOneTerm? -> Move Handler.Utils.DateTime +addWeeks :: Integer -> UTCTime -> UTCTime +addWeeks n utct = utct { utctDay = newDay } + where + oldDay = utctDay utct + -- newDay = addGregorianDurationRollOver $ stimes n calendarWeek -- only available in newer version 1.9 of Data.Time.Calendar + newDay = addDays (7*n) oldDay +weekDiff :: UTCTime -> UTCTime -> Integer +-- ^ Difference between times, rounded down to weeks +weekDiff old new = dayDiff `div` 7 + where + dayOld = utctDay old + dayNew = utctDay new + dayDiff = diffDays dayNew dayOld + +weeksToAdd :: UTCTime -> UTCTime -> Integer +-- ^ Number of weeks needed to add so that first +-- time occurs later than second time +-- (loop avoids off-by-one error with weekDiff corner cases) +weeksToAdd old new = loop 0 old + where + loop n t + | t > new = n + | otherwise = loop (succ n) (addOneWeek t) + + +setYear :: Integer -> Day -> Day +setYear year date = fromGregorian year month day + where + (_,month,day) = toGregorian date \ No newline at end of file diff --git a/src/Handler/Utils/Delete.hs b/src/Handler/Utils/Delete.hs new file mode 100644 index 000000000..c35d2a14f --- /dev/null +++ b/src/Handler/Utils/Delete.hs @@ -0,0 +1,102 @@ +module Handler.Utils.Delete + ( DeleteRoute(..) + , deleteR + , postDeleteR, getDeleteR + ) where + +import Import +import Handler.Utils.Form + +import Utils.Lens + +import qualified Data.Text as Text +import qualified Data.Set as Set + +import qualified Data.CaseInsensitive as CI + +import Data.Char (isAlphaNum) + +import qualified Database.Esqueleto as E +import qualified Database.Esqueleto.Internal.Sql as E (SqlSelect) +import qualified Database.Esqueleto.Internal.Language as E (From) + + +data DeleteRoute record = forall tables infoExpr info. (E.SqlSelect infoExpr info, E.From E.SqlQuery E.SqlExpr SqlBackend tables) => DeleteRoute + { drRecords :: Set (Key record) + , drUnjoin :: tables -> E.SqlExpr (Entity record) + , drGetInfo :: tables -> E.SqlQuery infoExpr + , drRenderRecord :: info -> ReaderT SqlBackend (HandlerT UniWorX IO) Widget + , drRecordConfirmString :: info -> ReaderT SqlBackend (HandlerT UniWorX IO) Text + , drCaption + , drSuccessMessage :: SomeMessage UniWorX + , drAbort + , drSuccess :: SomeRoute UniWorX + } + +confirmForm :: ( MonadHandler m, HandlerSite m ~ UniWorX ) + => Text -- ^ Confirmation string + -> AForm m Bool +confirmForm confirmString = flip traverseAForm aform $ \(inpConfirmStr, BtnDelete) -> if + | ((==) `on` map (CI.mk . filter isAlphaNum) . Text.words) confirmString inpConfirmStr + -> return $ pure True + | otherwise + -> formFailure [MsgDeleteConfirmationWrong] + where + aform = (,) + <$> areq confirmField (fslI MsgDeleteConfirmation) Nothing + <*> disambiguateButtons (combinedButtonFieldF "") + confirmField + | multiple = convertField unTextarea Textarea textareaField + | otherwise = textField + multiple = length (filter (not . Text.null . Text.strip) $ Text.lines confirmString) > 1 + +confirmForm' :: PersistEntity record => Set (Key record) -> Text -> Form Bool +confirmForm' drRecords confirmString = addDeleteTargets . identForm FIDDelete . renderAForm FormStandard $ confirmForm confirmString + where + addDeleteTargets :: Form a -> Form a + addDeleteTargets form csrf = do + (_, fvTargets) <- mreq secretJsonField ("" & addName (toPathPiece PostDeleteTarget)) (Just drRecords) + over _2 (mappend $ fvInput fvTargets) <$> form csrf + + +postDeleteR :: ( DeleteCascade record SqlBackend ) + => (Set (Key record) -> DeleteRoute record) -- ^ Construct `DeleteRoute` based on incoming record keys + -> Handler () +-- | Perform deletion +postDeleteR mkRoute = do + drResult <- fmap (fmap mkRoute) . runInputPost . iopt secretJsonField $ toPathPiece PostDeleteTarget + + void . for drResult $ \DeleteRoute{..} -> do + confirmString <- fmap Text.unlines . runDB $ mapM drRecordConfirmString <=< E.select . E.from $ \t -> drGetInfo t <* E.where_ (drUnjoin t E.^. persistIdField `E.in_` E.valList (Set.toList drRecords)) + + ((confirmRes, _), _) <- runFormPost $ confirmForm' drRecords confirmString + + formResult confirmRes $ \case + True -> do + runDB $ do + forM_ drRecords deleteCascade + addMessageI Success drSuccessMessage + redirect drSuccess + False -> + redirect drAbort + + +getDeleteR :: (DeleteCascade record SqlBackend) => DeleteRoute record -> Handler a +getDeleteR DeleteRoute{..} = do + targets <- runDB $ mapM (\i -> (,) <$> drRenderRecord i <*> drRecordConfirmString i) <=< E.select . E.from $ \t -> drGetInfo t <* E.where_ (drUnjoin t E.^. persistIdField `E.in_` E.valList (Set.toList drRecords)) + + let confirmString = Text.unlines $ view _2 <$> targets + + (deleteFormWdgt, deleteFormEnctype) <- generateFormPost $ confirmForm' drRecords confirmString + + Just targetRoute <- getCurrentRoute + + sendResponse =<< + defaultLayout $(widgetFile "widgets/delete-confirmation") + + + +deleteR :: (DeleteCascade record SqlBackend) => DeleteRoute record -> Handler Html +deleteR dr = do + postDeleteR $ \drRecords -> dr {drRecords} + getDeleteR dr diff --git a/src/Handler/Utils/Form.hs b/src/Handler/Utils/Form.hs index a6efd53ff..152d53186 100644 --- a/src/Handler/Utils/Form.hs +++ b/src/Handler/Utils/Form.hs @@ -1,108 +1,103 @@ -{-# LANGUAGE NoImplicitPrelude #-} -{-# LANGUAGE OverloadedStrings #-} -{-# LANGUAGE NamedFieldPuns #-} -{-# LANGUAGE TemplateHaskell #-} -{-# LANGUAGE QuasiQuotes #-} -{-# LANGUAGE MultiParamTypeClasses #-} -{-# LANGUAGE TypeFamilies #-} -{-# LANGUAGE FlexibleContexts #-} -{-# LANGUAGE ViewPatterns #-} -{-# LANGUAGE PatternGuards #-} -{-# LANGUAGE RecordWildCards #-} -{-# LANGUAGE ScopedTypeVariables #-} -{-# LANGUAGE LambdaCase #-} - module Handler.Utils.Form ( module Handler.Utils.Form , module Utils.Form + , MonadWriter(..) ) where import Utils.Form import Handler.Utils.Form.Types -import Handler.Utils.Templates import Handler.Utils.DateTime -import qualified Data.Time as Time -import Import +import Import hiding (cons) import qualified Data.Char as Char -import Data.String (IsString(..)) -import Data.CaseInsensitive (CI) import qualified Data.CaseInsensitive as CI -import qualified Data.Foldable as Foldable - -- import Yesod.Core import qualified Data.Text as T -- import Yesod.Form.Types import Yesod.Form.Functions (parseHelper) import Yesod.Form.Bootstrap3 -import Web.PathPieces (showToPathPiece, readFromPathPiece) - import Handler.Utils.Zip import qualified Data.Conduit.List as C import qualified Database.Esqueleto as E -import qualified Database.Esqueleto.Internal.Sql as E import Data.Set (Set) import qualified Data.Set as Set -import Data.Map (Map) +import Data.Map (Map, (!)) import qualified Data.Map as Map +import Control.Monad.Trans.Writer (execWriterT, WriterT) +import Control.Monad.Except (runExceptT) import Control.Monad.Writer.Class import Data.Scientific (Scientific) import Data.Ratio import Text.Read (readMaybe) +import Utils.Lens + +import Data.Aeson (eitherDecodeStrict') +import Data.Aeson.Text (encodeToLazyText) + ---------------------------- -- Buttons (new version ) -- ---------------------------- -data BtnDelete = BtnDelete | BtnAbort - deriving (Enum, Eq, Ord, Bounded, Read, Show) +data ButtonDelete = BtnDelete + deriving (Enum, Eq, Ord, Bounded, Read, Show, Generic, Typeable) +instance Universe ButtonDelete +instance Finite ButtonDelete -instance PathPiece BtnDelete where -- for displaying the button only, not really for paths - toPathPiece = showToPathPiece - fromPathPiece = readFromPathPiece +nullaryPathPiece ''ButtonDelete $ camelToPathPiece' 1 -instance Button UniWorX BtnDelete where - label BtnDelete = [whamlet|_{MsgBtnDelete}|] - label BtnAbort = [whamlet|_{MsgBtnAbort}|] +embedRenderMessage ''UniWorX ''ButtonDelete id +instance Button UniWorX ButtonDelete where + btnClasses BtnDelete = [BCIsButton, BCDanger] - cssClass BtnDelete = BCDanger - cssClass BtnAbort = BCDefault +data ButtonRegister = BtnRegister | BtnDeregister + deriving (Enum, Eq, Ord, Bounded, Read, Show, Generic, Typeable) +instance Universe ButtonRegister +instance Finite ButtonRegister -data RegisterButton = BtnRegister | BtnDeregister - deriving (Enum, Eq, Ord, Bounded, Read, Show) +nullaryPathPiece ''ButtonRegister $ camelToPathPiece' 1 -instance PathPiece RegisterButton where - toPathPiece = showToPathPiece - fromPathPiece = readFromPathPiece +embedRenderMessage ''UniWorX ''ButtonRegister id +instance Button UniWorX ButtonRegister where + btnClasses BtnRegister = [BCIsButton, BCPrimary] + btnClasses BtnDeregister = [BCIsButton, BCDanger] -instance Button UniWorX RegisterButton where - label BtnRegister = [whamlet|_{MsgBtnRegister}|] - label BtnDeregister = [whamlet|_{MsgBtnDeregister}|] +data ButtonHijack = BtnHijack + deriving (Enum, Eq, Ord, Bounded, Read, Show, Generic, Typeable) +instance Universe ButtonHijack +instance Finite ButtonHijack - cssClass BtnRegister = BCPrimary - cssClass BtnDeregister = BCDanger +nullaryPathPiece ''ButtonHijack $ camelToPathPiece' 1 -data AdminHijackUserButton = BtnHijack - deriving (Enum, Eq, Ord, Bounded, Read, Show) +embedRenderMessage ''UniWorX ''ButtonHijack id +instance Button UniWorX ButtonHijack where + btnClasses BtnHijack = [BCIsButton, BCDefault] -instance PathPiece AdminHijackUserButton where - toPathPiece = showToPathPiece - fromPathPiece = readFromPathPiece +data ButtonSubmitDelete = BtnSubmit' | BtnDelete' + deriving (Enum, Eq, Ord, Bounded, Read, Show, Generic, Typeable) -instance Button UniWorX AdminHijackUserButton where - label BtnHijack = [whamlet|_{MsgBtnHijack}|] +instance Universe ButtonSubmitDelete +instance Finite ButtonSubmitDelete - cssClass BtnHijack = BCDefault +embedRenderMessage ''UniWorX ''ButtonSubmitDelete $ dropSuffix "'" +instance Button UniWorX ButtonSubmitDelete where + btnClasses BtnSubmit' = [BCIsButton, BCPrimary] + btnClasses BtnDelete' = [BCIsButton, BCDanger] + + btnValidate _ BtnSubmit' = True + btnValidate _ BtnDelete' = False + +nullaryPathPiece ''ButtonSubmitDelete $ camelToPathPiece' 1 . dropSuffix "'" -- -- Looks like a button, but is just a link (e.g. for create course, etc.) @@ -112,8 +107,14 @@ instance Button UniWorX AdminHijackUserButton where -- instance PathPiece LinkButton where -- LinkButton route = ??? -linkButton :: Widget -> ButtonCssClass UniWorX -> Route UniWorX -> Widget -- Alternative: Handler.Utils.simpleLink -linkButton lbl cls url = [whamlet| ^{lbl} |] +linkButton :: Widget -> [ButtonClass UniWorX] -> SomeRoute UniWorX -> Widget -- Alternative: Handler.Utils.simpleLink +linkButton lbl cls url = do + url' <- toTextUrl url + [whamlet| + $newline never + + ^{lbl} + |] -- [whamlet| -- -- @@ -122,31 +123,16 @@ linkButton lbl cls url = [whamlet| --- buttonForm :: Button a => Markup -> MForm (HandlerT UniWorX IO) (FormResult a, (WidgetT UniWorX IO ())) -buttonForm :: (Button UniWorX a, Show a) => Form a +-- buttonForm :: (Button UniWorX a, Finite a) => Markup -> MForm (HandlerT UniWorX IO) (FormResult a, Widget) +buttonForm :: (Button UniWorX a, Finite a) => Form a buttonForm csrf = do - buttonIdent <- newFormIdent - let button b = mopt (buttonField b) ("n/a"{ fsName = Just buttonIdent }) Nothing - (results, btnViews) <- unzip <$> mapM button [minBound..maxBound] - let widget = do - [whamlet| - #{csrf} - $forall bView <- btnViews - ^{fvInput bView} - |] - return (accResult results,widget) - where - accResult :: Foldable f => f (FormResult (Maybe a)) -> FormResult a - accResult = Foldable.foldr accResult' FormMissing - - accResult' :: FormResult (Maybe a) -> FormResult a -> FormResult a - -- Find the single FormSuccess Just _; Expected behaviour: all buttons deliver FormFailure, except for one. - accResult' (FormSuccess (Just _)) (FormSuccess _) = FormFailure ["Ambiguous button parse"] - accResult' (FormSuccess (Just x)) _ = FormSuccess x - accResult' _ x@(FormSuccess _) = x --Safe: most buttons deliver FormFailure, one delivers FormSuccess - accResult' (FormSuccess Nothing) x = x - accResult' FormMissing _ = FormMissing - accResult' (FormFailure errs) _ = FormFailure errs + (res, ($ []) -> fViews) <- aFormToForm . disambiguateButtons $ combinedButtonFieldF "" + return (res, [whamlet| + $newline never + #{csrf} + $forall bView <- fViews + ^{fvInput bView} + |]) @@ -156,20 +142,25 @@ buttonForm csrf = do -- ciField moved to Utils.Form +routeField :: ( Monad m + , HandlerSite m ~ UniWorX + ) => Field m (Route UniWorX) +routeField = checkMMap (return . maybe (Left MsgInvalidRoute) Right . fromPathPiece) toPathPiece textField + natFieldI :: (Monad m, Integral i, RenderMessage (HandlerSite m) msg, RenderMessage (HandlerSite m) FormMessage) => msg -> Field m i natFieldI msg = checkBool (>= 0) msg intField natField :: (Monad m, Integral i, RenderMessage (HandlerSite m) FormMessage) => Text -> Field m i -natField d = checkBool (>= 0) (T.append d " muss eine natürliche Zahl sein.") $ intField +natField d = checkBool (>= 0) (T.append d " muss eine natürliche Zahl sein.") intField natIntField ::(Monad m, RenderMessage (HandlerSite m) FormMessage) => Text -> Field m Integer natIntField = natField posIntField :: (Monad m, Integral i, RenderMessage (HandlerSite m) FormMessage) => Text -> Field m i -posIntField d = checkBool (>= 1) (T.append d " muss eine positive Zahl sein.") $ intField +posIntField d = checkBool (>= 1) (T.append d " muss eine positive Zahl sein.") intField minIntField :: (Monad m, Integral i, Show i, RenderMessage (HandlerSite m) FormMessage) => i -> Text -> Field m i -minIntField m d = checkBool (>= m) (T.concat [d," muss größer als ", T.pack $ show m, " sein."]) $ intField +minIntField m d = checkBool (>= m) (T.concat [d," muss größer als ", T.pack $ show m, " sein."]) intField pointsField :: (Monad m, HandlerSite m ~ UniWorX) => Field m Points --TODO allow fractions pointsField = checkBool (>= 0) MsgPointsNotPositive Field{..} @@ -184,6 +175,9 @@ pointsField = checkBool (>= 0) MsgPointsNotPositive Field{..} sci <- maybe (Left $ MsgInvalidNumber t) Right (readMaybe $ unpack t :: Maybe Scientific) return . fromRational $ round (sci * 100) % 100 +pointsFieldMax :: (Monad m, HandlerSite m ~ UniWorX) => Maybe Points -> Field m Points --TODO allow fractions +pointsFieldMax Nothing = pointsField +pointsFieldMax (Just maxp) = checkBool (<= maxp) (MsgPointsTooHigh maxp) pointsField termsActiveField :: Field Handler TermId termsActiveField = selectField $ optionsPersistKey [TermActive ==. True] [Desc TermStart] termName @@ -218,11 +212,19 @@ schoolFieldFor :: [SchoolId] -> Field Handler SchoolId schoolFieldFor userSchools = selectField $ optionsPersistKey [SchoolShorthand <-. map unSchoolKey userSchools] [Asc SchoolName] schoolName uploadModeField :: Field Handler UploadMode -uploadModeField = selectFieldList - [ (MsgUploadModeNone , NoUpload ) - , (MsgUploadModeNoUnpack, Upload False) - , (MsgUploadModeUnpack , Upload True ) - ] +uploadModeField = selectField optionsFinite + +submissionModeField :: Field Handler SheetSubmissionMode +submissionModeField = selectField optionsFinite + +pseudonymWordField :: Field Handler PseudonymWord +pseudonymWordField = checkMMap doCheck CI.original $ textField & addDatalist (return $ map CI.original pseudonymWordlist) + where + doCheck (CI.mk -> w) + | Just w' <- find (== w) pseudonymWordlist + = return $ Right w' + | otherwise + = return . Left $ MsgUnknownPseudonymWord (CI.original w) zipFileField :: Bool -- ^ Unpack zips? -> Field Handler (Source Handler File) @@ -233,7 +235,7 @@ zipFileField doUnpack = Field{..} | [f] <- files = return . Right . Just $ bool (yieldM . acceptFile) sourceFiles doUnpack f | null files = return $ Right Nothing | otherwise = return . Left $ SomeMessage MsgOnlyUploadOneFile - fieldView fieldId fieldName attrs _ req = do + fieldView fieldId fieldName attrs _ req = [whamlet| $newline never @@ -243,29 +245,26 @@ multiFileField :: Handler (Set FileId) -> Field Handler (Source Handler (Either multiFileField permittedFiles' = Field{..} where fieldEnctype = Multipart - fieldParse vals files - | null files - , null vals = return $ Right Nothing - | otherwise = return . Right . Just $ do - pVals <- lift permittedFiles' - let - decrypt' :: CryptoUUIDFile -> Handler (Maybe FileId) - decrypt' = fmap (either (\(_ :: CryptoIDError) -> Nothing) Just) . try . decrypt - yieldMany vals - .| C.filter (/= unpackZips) - .| C.map fromPathPiece .| C.catMaybes - .| C.mapMaybeM decrypt' - .| C.filter (`elem` pVals) - .| C.map Left - let - handleFile :: FileInfo -> Source Handler File - handleFile - | doUnpack = sourceFiles - | otherwise = yieldM . acceptFile - mapM_ handleFile files .| C.map Right + fieldParse vals files = return . Right . Just $ do + pVals <- lift permittedFiles' + let + decrypt' :: CryptoUUIDFile -> Handler (Maybe FileId) + decrypt' = fmap (either (\(_ :: CryptoIDError) -> Nothing) Just) . try . decrypt + yieldMany vals + .| C.filter (/= unpackZips) + .| C.map fromPathPiece .| C.catMaybes + .| C.mapMaybeM decrypt' + .| C.filter (`elem` pVals) + .| C.map Left + let + handleFile :: FileInfo -> Source Handler File + handleFile + | doUnpack = sourceFiles + | otherwise = yieldM . acceptFile + mapM_ handleFile files .| C.map Right where doUnpack = unpackZips `elem` vals - fieldView fieldId fieldName attrs val req = do + fieldView fieldId fieldName _attrs val req = do pVals <- handlerToWidget permittedFiles' sentVals <- for val $ \src -> handlerToWidget . sourceToList $ src .| takeLefts let @@ -275,7 +274,7 @@ multiFileField permittedFiles' = Field{..} let fuiChecked | Right sentVals' <- sentVals = fuiId' `elem` sentVals' | otherwise = True - return FileUploadInfo{..} + return FileUploadInfo{..} fileInfos <- mapM toFUI <=< handlerToWidget . runDB . E.select . E.from $ \file -> do E.where_ $ file E.^. FileId `E.in_` E.valList (setToList pVals) E.orderBy [E.asc $ file E.^. FileTitle] @@ -288,23 +287,108 @@ multiFileField permittedFiles' = Field{..} Right _ -> return () Left r -> yield r -sheetTypeAFormReq :: FieldSettings UniWorX -> Maybe SheetType -> AForm Handler SheetType -sheetTypeAFormReq d Nothing = - -- TODO, offer options to choose between Normal/Bonus/Pass - (Normal . toPoints) <$> areq (natField "Punkte") d Nothing -sheetTypeAFormReq d (Just (Normal p)) = - -- TODO, offer options to choose between Normal/Bonus/Pass - (Normal . toPoints) <$> areq (natField "Punkte") d (Just $ fromPoints p) -sheetTypeAFormReq d (Just (NotGraded)) = pure NotGraded +data SheetGrading' = Points' | PassPoints' | PassBinary' + deriving (Eq, Ord, Read, Show, Enum, Bounded) + +instance Universe SheetGrading' +instance Finite SheetGrading' + +nullaryPathPiece ''SheetGrading' (camelToPathPiece . dropSuffix "'") +embedRenderMessage ''UniWorX ''SheetGrading' ("SheetGrading" <>) + + +data SheetType' = NotGraded' | Normal' | Bonus' | Informational' + deriving (Eq, Ord, Read, Show, Enum, Bounded) + +instance Universe SheetType' +instance Finite SheetType' + +nullaryPathPiece ''SheetType' (camelToPathPiece . dropSuffix "'") +embedRenderMessage ''UniWorX ''SheetType' ("SheetType" <>) + + +data SheetGroup' = NoGroups' | Arbitrary' | RegisteredGroups' + deriving (Eq, Ord, Read, Show, Enum, Bounded) + +instance Universe SheetGroup' +instance Finite SheetGroup' + +nullaryPathPiece ''SheetGroup' (camelToPathPiece . dropSuffix "'") +embedRenderMessage ''UniWorX ''SheetGroup' (("SheetGroup" <>) . dropSuffix "'") + +sheetGradingAFormReq :: FieldSettings UniWorX -> Maybe SheetGrading -> AForm Handler SheetGrading +sheetGradingAFormReq fs template = multiActionA fs selOptions (classify' <$> template) + where + selOptions = Map.fromList + [ ( Points', Points <$> maxPointsReq ) + , ( PassPoints', PassPoints <$> maxPointsReq <*> passPointsReq ) + , ( PassBinary', pure PassBinary) + ] + classify' :: SheetGrading -> SheetGrading' + classify' = \case + Points {} -> Points' + PassPoints {} -> PassPoints' + PassBinary {} -> PassBinary' + + maxPointsReq = apreq pointsField (fslI MsgSheetGradingMaxPoints) (template >>= preview _maxPoints) + passPointsReq = apreq pointsField (fslI MsgSheetGradingPassingPoints) (template >>= preview _passingPoints) + + +sheetTypeAFormReq :: FieldSettings UniWorX -> Maybe SheetType -> AForm Handler SheetType +sheetTypeAFormReq fs template = multiActionA fs selOptions (classify' <$> template) + where + selOptions = Map.fromList + [ ( Normal', Normal <$> gradingReq ) + , ( Bonus' , Bonus <$> gradingReq ) + , ( Informational', Informational <$> gradingReq ) + , ( NotGraded', pure NotGraded ) + ] + gradingReq = sheetGradingAFormReq (fslI MsgSheetGrading + & setTooltip MsgSheetGradingInfo) (template >>= preview _grading) + + classify' :: SheetType -> SheetType' + classify' = \case + Bonus {} -> Bonus' + Normal {} -> Normal' + Informational {} -> Informational' + NotGraded -> NotGraded' sheetGroupAFormReq :: FieldSettings UniWorX -> Maybe SheetGroup -> AForm Handler SheetGroup -sheetGroupAFormReq d (Just (Arbitrary n)) | n >= 1 = - -- TODO, offer options to choose between Arbitrary/Registered/NoGroups - Arbitrary <$> areq (natField "Abgabegruppengröße") d (Just n) -sheetGroupAFormReq d _other = -- TODO - -- TODO, offer options to choose between Arbitrary/Registered/NoGroups - Arbitrary <$> areq (natField "Abgabegruppengröße") d (Just 1) +sheetGroupAFormReq FieldSettings{..} template = formToAForm $ do + let + selOptions = Map.fromList + [ ( Arbitrary', Arbitrary + <$> apreq (natField "Gruppengröße") (fslI MsgSheetGroupMaxGroupsize & noValidate) (preview _maxParticipants =<< template) + ) + , ( RegisteredGroups', pure RegisteredGroups ) + , ( NoGroups', pure NoGroups ) + ] + (res, selView) <- multiAction selOptions (classify' <$> template) + + fvId <- maybe newIdent return fsId + MsgRenderer mr <- getMsgRenderer + + return (res, + [ FieldView + { fvLabel = toHtml $ mr fsLabel + , fvTooltip = toHtml . mr <$> fsTooltip + , fvId + , fvInput = selView + , fvErrors = case res of + FormFailure [e] -> Just $ toHtml e + _ -> Nothing + , fvRequired = True + } + ]) + + where + classify' :: SheetGroup -> SheetGroup' + classify' = \case + Arbitrary _ -> Arbitrary' + RegisteredGroups -> RegisteredGroups' + NoGroups -> NoGroups' + {- dayTimeField :: FieldSettings UniWorX -> Maybe UTCTime -> Form Handler UTCTime @@ -329,7 +413,7 @@ utcTimeField :: (MonadHandler m, HandlerSite m ~ UniWorX) => Field m UTCTime -- StackOverflow: dayToUTC <$> (areq (jqueryDayField def {...}) settings Nothing) -- Browser returns LocalTime utcTimeField = Field - { fieldParse = parseHelperGen $ readTime + { fieldParse = parseHelperGen readTime , fieldView = \theId name attrs val isReq -> do val' <- either id id <$> traverse (formatTime' fieldTimeFormat) val [whamlet| @@ -342,15 +426,84 @@ utcTimeField = Field fieldTimeFormat :: String --fieldTimeFormat = "%e.%m.%y %k:%M" fieldTimeFormat = "%Y-%m-%dT%H:%M" - - -- `defaultTimeLocale` is okay here, since `fieldTimeFormat` does not contain any + + -- `defaultTimeLocale` is okay here, since `fieldTimeFormat` does not contain any readTime :: Text -> Either UniWorXMessage UTCTime readTime t = case localTimeToUTC <$> parseTimeM True defaultTimeLocale fieldTimeFormat (T.unpack t) of - (Just (LTUUnique time _)) -> Right time - (Just (LTUNone _ _)) -> Left MsgIllDefinedUTCTime - (Just (LTUAmbiguous _ _ _ _)) -> Left MsgAmbiguousUTCTime - Nothing -> Left MsgInvalidDateTimeFormat + Just LTUUnique{_ltuResult} -> Right _ltuResult + Just LTUNone{} -> Left MsgIllDefinedUTCTime + Just LTUAmbiguous{} -> Left MsgAmbiguousUTCTime + Nothing -> Left MsgInvalidDateTimeFormat + +langField :: Bool -- ^ Only allow values from `appLanguages` + -> Field (HandlerT UniWorX IO) Lang +langField False = checkBool (all ((&&) <$> not . null <*> T.all Char.isAlpha) . T.splitOn "-") MsgInvalidLangFormat $ textField & addDatalist (return $ toList appLanguages) +langField True = selectField . optionsPairs . map (MsgLanguage &&& id) $ toList appLanguages + +jsonField :: ( ToJSON a, FromJSON a + , MonadHandler m + , RenderMessage (HandlerSite m) UniWorXMessage + , RenderMessage (HandlerSite m) FormMessage + ) + => Bool {-^ Hidden? -} + -> Field m a +jsonField hide = Field{..} + where + inputType :: Text + inputType + | hide = "hidden" + | otherwise = "text" + fieldParse [v] [] = return . bimap (SomeMessage . MsgJSONFieldDecodeFailure) Just . eitherDecodeStrict' $ encodeUtf8 v + fieldParse [] [] = return $ Right Nothing + fieldParse _ _ = return . Left $ SomeMessage MsgValueRequired + fieldView theId name attrs val isReq = liftWidgetT [whamlet| + + |] + fieldEnctype = UrlEncoded + +secretJsonField :: ( ToJSON a, FromJSON a + , MonadHandler m + , HandlerSite m ~ UniWorX + ) + => Field m a +secretJsonField = Field{..} + where + fieldParse [v] [] = bimap (\_ -> SomeMessage MsgSecretJSONFieldDecryptFailure) Just <$> runExceptT (encodedSecretBoxOpen v) + fieldParse [] [] = return $ Right Nothing + fieldParse _ _ = return . Left $ SomeMessage MsgValueRequired + fieldView theId name attrs val _isReq = do + val' <- traverse (encodedSecretBox SecretBoxShort) val + [whamlet| + + |] + fieldEnctype = UrlEncoded + + +funcForm :: forall k v m. + ( Finite k, Ord k + , MonadHandler m + , HandlerSite m ~ UniWorX + ) + => (k -> AForm m v) -> FieldSettings UniWorX -> Bool -> AForm m (k -> v) +funcForm mkForm FieldSettings{fsName = _, fsAttrs = _, ..} isRequired = formToAForm $ funcFieldView =<< renderAForm FormStandard funcForm' mempty + where + funcForm' :: AForm m (k -> v) + funcForm' = fmap (!) . sequenceA . Map.fromSet mkForm $ Set.fromList universeF + funcFieldView :: (FormResult (k -> v), Widget) -> MForm m (FormResult (k -> v), [FieldView UniWorX]) + funcFieldView (res, fvInput) = do + mr <- getMessageRender + let fvLabel = toHtml $ mr fsLabel + fvTooltip = fmap (toHtml . mr) fsTooltip + fvRequired = isRequired + fvErrors + | FormFailure (err:_) <- res = Just $ toHtml err + | otherwise = Nothing + fvId <- maybe newIdent return fsId + return (res, pure FieldView{..}) + -- areq nsField (fslI MsgNotificationSettings) (stgNotficationSettings <$> template) + + fsm :: RenderMessage UniWorX msg => msg -> FieldSettings UniWorX -- DEPRECATED @@ -359,6 +512,10 @@ fsm = bfs -- TODO: get rid of Bootstrap fsb :: Text -> FieldSettings site -- DEPRECATED fsb = bfs -- Just to avoid annoying Ambiguous Type Errors +fsUniq :: (Text -> Text) -> Text -> FieldSettings site +fsUniq mkUnique seed = "" { fsName = Just $ mkUnique seed } + + optionsPersistCryptoId :: forall site backend a msg. ( YesodPersist site , PersistQueryRead backend @@ -375,24 +532,12 @@ optionsPersistCryptoId filts ords toDisplay = fmap mkOptionList $ do mr <- getMessageRender pairs <- runDB $ selectList filts ords cPairs <- forM pairs $ \e@(Entity key _) -> (,) <$> encrypt key <*> pure e - return $ map (\(cId, e@(Entity key value)) -> Option + return $ map (\(cId, e@(Entity _key value)) -> Option { optionDisplay = mr (toDisplay value) , optionInternalValue = e , optionExternalValue = toPathPiece (cId :: CryptoID UUID (Key a)) }) cPairs -optionsFinite :: ( MonadHandler m, Finite a, RenderMessage site msg, HandlerSite m ~ site, PathPiece a ) - => (a -> msg) -> m (OptionList a) -optionsFinite toMsg = do - mr <- getMessageRender - let - mkOption a = Option - { optionDisplay = mr $ toMsg a - , optionInternalValue = a - , optionExternalValue = toPathPiece a - } - return . mkOptionList $ mkOption <$> universeF - mforced :: (site ~ HandlerSite m, MonadHandler m) => Field m a -> FieldSettings site -> a -> MForm m (FormResult a, FieldView site) mforced Field{..} FieldSettings{..} val = do @@ -416,15 +561,72 @@ aforced :: (RenderMessage site FormMessage, HandlerSite m ~ site, MonadHandler m => Field m a -> FieldSettings site -> a -> AForm m a aforced field settings val = formToAForm $ second pure <$> mforced field settings val +apreq :: (RenderMessage site FormMessage, HandlerSite m ~ site, MonadHandler m) + => Field m a -> FieldSettings site -> Maybe a -> AForm m a +-- ^ Pseudo required +apreq f fs mx = formToAForm $ do + mr <- getMessageRender + over _1 (maybe (FormFailure [mr MsgValueRequired]) return =<<) . over _2 (pure . (\fv -> fv { fvRequired = True } )) <$> mopt f fs (Just <$> mx) + +wpreq :: (RenderMessage site FormMessage, HandlerSite m ~ site, MonadHandler m) + => Field m a -> FieldSettings site -> Maybe a -> WForm m (FormResult a) +wpreq f fs mx = mFormToWForm $ do + mr <- getMessageRender + over _1 (maybe (FormFailure [mr MsgValueRequired]) return =<<) . over _2 (\fv -> fv { fvRequired = True } ) <$> mopt f fs (Just <$> mx) + multiAction :: (RenderMessage UniWorX action, PathPiece action, Ord action, Eq action) - => Map action (MForm (HandlerT UniWorX IO) (FormResult a, Maybe Widget)) + => Map action (AForm (HandlerT UniWorX IO) a) + -> Maybe action -> MForm (HandlerT UniWorX IO) (FormResult a, Widget) -multiAction acts = do +multiAction acts defAction = do mr <- getMessageRender let options = OptionList [ Option (mr a) a (toPathPiece a) | a <- Map.keys acts ] fromPathPiece - (actionRes, actionView) <- mreq (selectField $ return options) "" Nothing - results <- sequence acts - let actionWidgets = Map.foldrWithKey (\act -> \case (_, Just w) -> ($(widgetFile "widgets/multiAction") :); (_, Nothing) -> id) [] results + (actionRes, actionView) <- mreq (selectField $ return options) "" defAction + results <- mapM (fmap (over _2 ($ [])) . aFormToForm) acts + let mToWidget (_, []) = return Nothing + mToWidget aForm = Just . snd <$> renderAForm FormStandard (formToAForm $ return aForm) mempty + widgets <- mapM mToWidget results + let actionWidgets = Map.foldrWithKey accWidget [] widgets + accWidget _act Nothing = id + accWidget act (Just w) = cons $(widgetFile "widgets/multiAction") actionResults = Map.map fst results return ((actionResults Map.!) =<< actionRes, $(widgetFile "widgets/multiActionCollect")) + +multiActionA :: (RenderMessage UniWorX action, PathPiece action, Ord action, Eq action) + => FieldSettings UniWorX + -> Map action (AForm (HandlerT UniWorX IO) a) + -> Maybe action + -> AForm (HandlerT UniWorX IO) a +multiActionA FieldSettings{..} acts defAction = formToAForm $ do + (res, selView) <- multiAction acts defAction + + fvId <- maybe newIdent return fsId + MsgRenderer mr <- getMsgRenderer + + return (res, + [ FieldView + { fvLabel = toHtml $ mr fsLabel + , fvTooltip = toHtml . mr <$> fsTooltip + , fvId + , fvInput = selView + , fvErrors = case res of + FormFailure [e] -> Just $ toHtml e + _ -> Nothing + , fvRequired = True + } + ]) + +formResultModal :: (MonadHandler m, RedirectUrl (HandlerSite m) route) => FormResult a -> route -> (a -> WriterT [Message] m ()) -> m () +formResultModal res finalDest handler = maybeT_ $ do + messages <- case res of + FormMissing -> mzero + FormFailure errs -> mapM_ (addMessage Error . toHtml) errs >> mzero + FormSuccess val -> lift . execWriterT $ handler val + + isModal <- hasCustomHeader HeaderIsModal + if + | isModal -> sendResponse $ toJSON messages + | otherwise -> do + forM_ messages $ \Message{..} -> addMessage messageClass messageContent + redirect finalDest diff --git a/src/Handler/Utils/Form/Types.hs b/src/Handler/Utils/Form/Types.hs index 386f029a0..16c8f0af6 100644 --- a/src/Handler/Utils/Form/Types.hs +++ b/src/Handler/Utils/Form/Types.hs @@ -1,5 +1,3 @@ -{-# LANGUAGE NoImplicitPrelude #-} - module Handler.Utils.Form.Types where import Import diff --git a/src/Handler/Utils/Mail.hs b/src/Handler/Utils/Mail.hs new file mode 100644 index 000000000..5c35dd4aa --- /dev/null +++ b/src/Handler/Utils/Mail.hs @@ -0,0 +1,72 @@ +module Handler.Utils.Mail + ( addRecipientsDB + , userMailT + , addFileDB + ) where + +import Import + +import Utils.Lens hiding (snoc) + +import qualified Data.CaseInsensitive as CI + +import qualified Data.ByteString.Lazy as LBS + +import qualified Data.Conduit.List as C + +import System.FilePath (takeBaseName) +import Network.Mime (defaultMimeLookup) + +import Control.Monad.Trans.State (StateT) + + +addRecipientsDB :: ( MonadMail m + , MonadHandler m + , HandlerSite m ~ UniWorX + ) => [Filter User] -> m () +-- ^ @setRecipientId uid@ throws an exception if @uid@ does not refer to an existing user +addRecipientsDB uFilter = runConduit $ transPipe (liftHandlerT . runDB) (selectSource uFilter [Asc UserDisplayName]) .| C.mapM_ addRecipient + where + addRecipient (Entity _ User{userEmail, userDisplayName}) = do + let addr = Address (Just userDisplayName) $ CI.original userEmail + _mailTo %= flip snoc addr + +userMailT :: ( MonadHandler m + , HandlerSite m ~ UniWorX + , MonadBaseControl IO m + , MonadLogger m + ) => UserId -> MailT m a -> m a +userMailT uid mAct = do + User + { userEmail + , userDisplayName + , userMailLanguages + , userDateTimeFormat + , userDateFormat + , userTimeFormat + } <- liftHandlerT . runDB $ getJust uid + let + addr = Address (Just userDisplayName) $ CI.original userEmail + ctx = MailContext + { mcLanguages = userMailLanguages + , mcDateTimeFormat = \case + SelFormatDateTime -> userDateTimeFormat + SelFormatDate -> userDateFormat + SelFormatTime -> userTimeFormat + } + mailT ctx $ do + _mailTo .= pure addr + mAct + +addFileDB :: ( MonadMail m + , MonadHandler m + , HandlerSite m ~ UniWorX + ) => FileId -> m MailObjectId +addFileDB fId = do + File{fileTitle = pack . takeBaseName -> fileName, fileContent = Just fileContent} <- liftHandlerT . runDB $ getJust fId + addPart $ do + _partType .= decodeUtf8 (defaultMimeLookup fileName) + _partEncoding .= Base64 + _partFilename .= Just fileName + _partContent .= LBS.fromStrict fileContent + setMailObjectId' fId :: StateT Part (HandlerT UniWorX IO) MailObjectId diff --git a/src/Handler/Utils/Rating.hs b/src/Handler/Utils/Rating.hs index 7702a7d52..fc4e88574 100644 --- a/src/Handler/Utils/Rating.hs +++ b/src/Handler/Utils/Rating.hs @@ -1,19 +1,8 @@ -{-# LANGUAGE TemplateHaskell #-} -{-# LANGUAGE NoImplicitPrelude #-} -{-# LANGUAGE RecordWildCards #-} -{-# LANGUAGE NamedFieldPuns #-} -{-# LANGUAGE ViewPatterns #-} -{-# LANGUAGE OverloadedStrings #-} -{-# LANGUAGE TupleSections #-} -{-# LANGUAGE TypeFamilies #-} -{-# LANGUAGE LambdaCase #-} -{-# LANGUAGE DeriveGeneric, DeriveDataTypeable #-} - {-# OPTIONS_GHC -fno-warn-orphans #-} -{-# OPTIONS_GHC -fno-warn-name-shadowing #-} module Handler.Utils.Rating ( Rating(..), Rating'(..) + , validateRating , getRating , formatRating , ratingFile @@ -25,14 +14,12 @@ module Handler.Utils.Rating , extractRatings ) where -import Import hiding (()) - +import Import import Text.PrettyPrint.Leijen.Text hiding ((<$>)) import Control.Monad.Trans.Maybe -import Data.Text (Text) import qualified Data.Text as Text import qualified Data.Text.Encoding as Text import Data.Text.Encoding.Error (UnicodeException(..)) @@ -47,9 +34,6 @@ import qualified Data.ByteString.Lazy as Lazy.ByteString import Text.Read (readEither) -import GHC.Generics (Generic) -import Data.Typeable (Typeable) - import System.FilePath import qualified System.FilePath.Cryptographic as FilePath (decrypt) @@ -57,6 +41,8 @@ import qualified Database.Esqueleto as E import qualified Data.Conduit.List as Conduit +import Utils.Lens + instance HasResolution prec => Pretty (Fixed prec) where pretty = pretty . show @@ -65,29 +51,25 @@ instance Pretty x => Pretty (CI x) where pretty = pretty . CI.original -data Rating = Rating - { ratingCourseName :: CourseName - , ratingSheetName :: SheetName - , ratingCorrectorName :: Maybe Text - , ratingSheetType :: SheetType - , ratingValues :: Rating' - } deriving (Read, Show, Eq, Generic, Typeable) +instance Pretty SheetGrading where + pretty Points{..} = pretty ( show maxPoints <> " Punkte" :: String) + pretty PassPoints{..} = pretty ( show maxPoints <> " Punkte, bestanden ab " <> show passingPoints <> " Punkte" :: String ) + pretty PassBinary = pretty ( "Bestanden (1) / Nicht bestanden (0)" :: String ) -data Rating' = Rating' - { ratingPoints :: Maybe Points - , ratingComment :: Maybe Text - , ratingTime :: Maybe UTCTime - } deriving (Read, Show, Eq, Generic, Typeable) - -data RatingException = RatingNotUnicode UnicodeException -- ^ Rating failed to parse as unicode - | RatingMissingSeparator -- ^ Could not split rating header from comments - | RatingMultiple -- ^ Encountered multiple point values in rating - | RatingInvalid String -- ^ Failed to parse rating point value - | RatingFileIsDirectory -- ^ We do not expect this to, it's included for totality - deriving (Show, Eq, Generic, Typeable) - -instance Exception RatingException +validateRating :: SheetType -> Rating' -> [RatingException] +validateRating ratingSheetType Rating'{ratingPoints=Just rp, ..} + | rp < 0 + = [RatingNegative] + | NotGraded <- ratingSheetType + = [RatingNotExpected] + | (Just maxPoints ) <- ratingSheetType ^? _grading . _maxPoints + , rp > maxPoints + = [RatingExceedsMax] + | (Just PassBinary) <- ratingSheetType ^? _grading + , not (rp == 0 || rp == 1) + = [RatingBinaryExpected] +validateRating _ _ = [] getRating :: SubmissionId -> YesodDB UniWorX (Maybe Rating) getRating submissionId = runMaybeT $ do @@ -116,7 +98,7 @@ getRating submissionId = runMaybeT $ do , E.unValue -> ratingComment , E.unValue -> ratingTime ) ] <- lift query - + return Rating{ ratingValues = Rating'{..}, .. } formatRating :: CryptoFileNameSubmission -> Rating -> Lazy.ByteString @@ -131,7 +113,7 @@ formatRating cID Rating{ ratingValues = Rating'{..}, ..} = let [ Just $ "Veranstaltung:" <+> pretty ratingCourseName , Just $ "Blatt:" <+> pretty ratingSheetName , ("Korrektor:" <+>) . pretty <$> ratingCorrectorName - , Just $ "Bewertung:" <+> pretty (display ratingSheetType) + , ("Bewertung:" <+>) . pretty <$> (ratingSheetType ^? _grading) ] , "Abgabe-Id:" <+> pretty (Text.unpack $ toPathPiece cID) , "=============================================" @@ -142,10 +124,10 @@ formatRating cID Rating{ ratingValues = Rating'{..}, ..} = let in Lazy.Text.encodeUtf8 . (<> "\n") $ displayT doc ratingFile :: MonadIO m => CryptoFileNameSubmission -> Rating -> m File -ratingFile cID rating@(Rating{ ratingValues = Rating'{..}, .. }) = do +ratingFile cID rating@Rating{ ratingValues = Rating'{..}, .. } = do fileModified <- maybe (liftIO getCurrentTime) return ratingTime let - fileTitle = "bewertung_" <> (Text.unpack $ toPathPiece (cID :: CryptoFileNameSubmission)) <.> "txt" + fileTitle = "bewertung_" <> Text.unpack (toPathPiece cID) <.> "txt" fileContent = Just . Lazy.ByteString.toStrict $ formatRating cID rating return File{..} @@ -153,10 +135,10 @@ parseRating :: MonadThrow m => File -> m Rating' parseRating File{ fileContent = Just input, .. } = do inputText <- either (throw . RatingNotUnicode) return $ Text.decodeUtf8' input let - (headerLines', commentLines) = break (sep `Text.isInfixOf`) $ Text.lines inputText - (reverse -> ratingLines, reverse -> headerLines) = break (sep' `Text.isInfixOf`) $ reverse headerLines' + (headerLines', commentLines) = break (commentSep `Text.isInfixOf`) $ Text.lines inputText + (reverse -> ratingLines, reverse -> _headerLines) = break (sep' `Text.isInfixOf`) $ reverse headerLines' ratingLines' = filter (rating `Text.isInfixOf`) ratingLines - sep = "Beginn der Kommentare" + commentSep = "Beginn der Kommentare" sep' = Text.pack $ replicate 40 '=' rating = "Bewertung:" comment' <- case commentLines of @@ -166,7 +148,7 @@ parseRating File{ fileContent = Just input, .. } = do ratingComment | Text.null comment' = Nothing | otherwise = Just comment' - ratingLine' <- case ratingLines of + ratingLine' <- case ratingLines' of [l] -> return l _ -> throw RatingMultiple let diff --git a/src/Handler/Utils/Sheet.hs b/src/Handler/Utils/Sheet.hs index d38d2e10a..baea1b6a4 100644 --- a/src/Handler/Utils/Sheet.hs +++ b/src/Handler/Utils/Sheet.hs @@ -1,23 +1,12 @@ -{-# LANGUAGE NoImplicitPrelude #-} -{-# LANGUAGE OverloadedStrings #-} -{-# LANGUAGE RecordWildCards #-} -{-# LANGUAGE TemplateHaskell #-} -{-# LANGUAGE QuasiQuotes #-} -{-# LANGUAGE MultiParamTypeClasses #-} -{-# LANGUAGE TypeFamilies #-} -{-# LANGUAGE FlexibleContexts #-} -{-# LANGUAGE FlexibleInstances #-} - module Handler.Utils.Sheet where import Import +import Handler.Utils.Delete import qualified Database.Esqueleto as E import qualified Database.Esqueleto.Internal.Sql as E - - fetchSheetAux :: ( BaseBackend backend ~ SqlBackend , E.SqlSelect b a , Typeable a, MonadHandler m, IsPersistBackend backend @@ -51,3 +40,31 @@ fetchSheetId tid ssh cid shn = E.unValue <$> fetchSheetAux (E.^. SheetId) tid ss fetchSheetIdCourseId :: TermId -> SchoolId -> CourseShorthand -> SheetName -> YesodDB UniWorX (Key Sheet, Key Course) fetchSheetIdCourseId tid ssh cid shn = bimap E.unValue E.unValue <$> fetchSheetAux ((,) <$> (E.^. SheetId) <*> (E.^. SheetCourse)) tid ssh cid shn + + +sheetDeleteRoute :: Set SheetId -> DeleteRoute Sheet +sheetDeleteRoute drRecords = DeleteRoute + { drRecords + , drGetInfo = \(sheet `E.InnerJoin` course `E.InnerJoin` school) -> do + E.on $ school E.^. SchoolId E.==. course E.^. CourseSchool + E.on $ course E.^. CourseId E.==. sheet E.^. SheetCourse + let submissions = E.sub_select . E.from $ \submission -> do + E.where_ $ submission E.^. SubmissionSheet E.==. sheet E.^. SheetId + return E.countRows + E.orderBy [E.asc $ sheet E.^. SheetName] + return (submissions, sheet E.^. SheetName, course E.^. CourseShorthand, course E.^. CourseName, school E.^. SchoolShorthand, school E.^. SchoolName, course E.^. CourseTerm) + , drUnjoin = \(sheet `E.InnerJoin` _ `E.InnerJoin` _) -> sheet + , drRenderRecord = \(E.Value submissions, E.Value shn', _, E.Value cName, _, E.Value sName, E.Value tid') -> + return [whamlet| + $newline never + #{shn'} (_{SomeMessage $ ShortTermIdentifier (unTermKey tid')}, #{sName}, #{cName}) + $if submissions /= 0 + _{SomeMessage $ MsgSheetDelHasSubmissions submissions} + |] + , drRecordConfirmString = \(E.Value submissions, E.Value shn', E.Value csh', _, E.Value ssh', _, E.Value tid') -> + return $ [st|#{termToText (unTermKey tid')}/#{ssh'}/#{csh'}/#{shn'}|] <> bool mempty [st| + #{tshow submissions} Subs|] (submissions /= 0) + , drCaption = SomeMessage MsgSheetDeleteQuestion + , drSuccessMessage = SomeMessage MsgSheetDeleted + , drAbort = error "drAbort undefined" + , drSuccess = error "drSuccess undefined" + } diff --git a/src/Handler/Utils/SheetType.hs b/src/Handler/Utils/SheetType.hs new file mode 100644 index 000000000..43b98a92f --- /dev/null +++ b/src/Handler/Utils/SheetType.hs @@ -0,0 +1,36 @@ +module Handler.Utils.SheetType + ( + gradeSummaryWidget + ) where + +import Import +import Data.Monoid (Sum(..)) +import Utils.Lens + +addBonusToPoints :: SheetTypeSummary -> SheetTypeSummary +addBonusToPoints sts = + sts & _normalSummary . _achievedPasses %~ (min passmax . (passbonus +)) + & _normalSummary . _achievedPoints %~ (min ptsmax . (ptsbonus +)) + where + passmax = sts ^. _normalSummary . _numMarkedPasses + passbonus = sts ^. _bonusSummary . _achievedPasses + ptsmax = sts ^. _normalSummary . _sumMarkedPoints + ptsbonus = sts ^. _bonusSummary . _achievedPoints + +gradeSummaryWidget :: RenderMessage UniWorX msg => (Integer -> msg) -> SheetTypeSummary -> Widget +gradeSummaryWidget title sts = + let SheetTypeSummary{..} = addBonusToPoints sts + sumSummaries = normalSummary <> bonusSummary <> informationalSummary & _numSheets %~ (<> numNotGraded) + hasPasses = positiveSum $ numSheetsPasses sumSummaries + hasMarkedPasses = positiveSum $ numMarkedPasses sumSummaries + hasPoints = positiveSum $ numSheetsPoints sumSummaries + hasMarkedPoints = positiveSum $ numMarkedPoints sumSummaries + rowWdgts = [ $(widgetFile "widgets/gradingSummaryRow") + | (sumHeader,summary) <- + [ (MsgSheetTypeNormal' ,normalSummary) + , (MsgSheetTypeBonus' ,bonusSummary) + , (MsgSheetTypeInformational' ,informationalSummary) + ] ] + in if 0 == numSheets sumSummaries + then mempty + else $(widgetFile "widgets/gradingSummary") diff --git a/src/Handler/Utils/StudyFeatures.hs b/src/Handler/Utils/StudyFeatures.hs index e4e8b38c7..9dbce258a 100644 --- a/src/Handler/Utils/StudyFeatures.hs +++ b/src/Handler/Utils/StudyFeatures.hs @@ -1,7 +1,3 @@ -{-# LANGUAGE NoImplicitPrelude - , RecordWildCards - #-} - module Handler.Utils.StudyFeatures ( parseStudyFeatures ) where @@ -41,8 +37,8 @@ pKey :: Parser Int pKey = decimal pType :: Parser StudyFieldType -pType = FieldPrimary <$ (try $ string "HF") - <|> FieldSecondary <$ (try $ string "NF") +pType = FieldPrimary <$ try (string "HF") + <|> FieldSecondary <$ try (string "NF") decimal :: Parser Int decimal = foldl' (\now next -> now * 10 + next) 0 <$> many1 digit' diff --git a/src/Handler/Utils/Submission.hs b/src/Handler/Utils/Submission.hs index 32b9e4d65..124da1b83 100644 --- a/src/Handler/Utils/Submission.hs +++ b/src/Handler/Utils/Submission.hs @@ -1,35 +1,21 @@ -{-# LANGUAGE NoImplicitPrelude #-} -{-# LANGUAGE RecordWildCards #-} -{-# LANGUAGE NamedFieldPuns #-} -{-# LANGUAGE ViewPatterns #-} -{-# LANGUAGE OverloadedStrings #-} -{-# LANGUAGE TupleSections #-} -{-# LANGUAGE TypeFamilies #-} -{-# LANGUAGE LambdaCase #-} -{-# LANGUAGE TemplateHaskell #-} -{-# LANGUAGE DeriveGeneric, DeriveDataTypeable #-} -{-# LANGUAGE TypeOperators #-} -{-# LANGUAGE PartialTypeSignatures #-} -{-# LANGUAGE FlexibleContexts #-} - - module Handler.Utils.Submission ( AssignSubmissionException(..) , assignSubmissions , submissionBlacklist, filterSubmission, extractRatings, extractRatingsMsg , submissionFileSource, submissionFileQuery - , submissionMultiArchive + , submissionMultiArchive , SubmissionSinkException(..) + , msgSubmissionErrors -- wrap around sinkSubmission/sinkMultiSubmission, but outside of runDB! , sinkSubmission, sinkMultiSubmission , submissionMatchesSheet + , submissionDeleteRoute ) where -import Import hiding ((.=), joinPath) +import Import hiding (joinPath) +import Jobs.Queue import Prelude (lcm) import Yesod.Core.Types (HandlerContents(..), ErrorResponse(..)) -import Control.Lens -import Control.Lens.Extras (is) import Utils.Lens import Control.Monad.State hiding (forM_, mapM_,foldM) @@ -38,32 +24,27 @@ import Control.Monad.RWS.Lazy (RWST) import qualified Control.Monad.Random as Rand import qualified System.Random.Shuffle as Rand (shuffleM) -import Data.Maybe +import Data.Maybe () import qualified Data.List as List import Data.Set (Set) import qualified Data.Set as Set -import Data.Map (Map, (!?)) +import Data.Map (Map) import qualified Data.Map as Map import qualified Data.Text as Text import Data.Ratio -import Data.CaseInsensitive (CI) -import qualified Data.CaseInsensitive as CI - import Data.Monoid (Monoid, Any(..), Sum(..)) import Generics.Deriving.Monoid (memptydefault, mappenddefault) -import Handler.Utils.Rating hiding (extractRatings) +import Handler.Utils import qualified Handler.Utils.Rating as Rating (extractRatings) -import Handler.Utils.Zip -import Handler.Utils.Sheet import Handler.Utils.Submission.TH +import Handler.Utils.Delete import qualified Database.Esqueleto as E -import Data.Conduit import qualified Data.Conduit.List as Conduit import Data.Conduit.ResumableSink @@ -83,14 +64,14 @@ instance Exception AssignSubmissionException -- | Assigns all submissions according to sheet corrector loads assignSubmissions :: SheetId -- ^ Sheet do distribute to correction -> Maybe (Set SubmissionId) -- ^ Optionally restrict submission to consider - -> YesodDB UniWorX ( Set SubmissionId -- ^ assigned submissions - , Set SubmissionId -- ^ unassigend submissions (no tutors by load) - ) + -> YesodDB UniWorX ( Set SubmissionId + , Set SubmissionId + ) -- ^ Returns assigned and unassigned submissions; unassigned submissions occur only if no tutors have an assigned load assignSubmissions sid restriction = do Sheet{..} <- getJust sid correctors <- selectList [ SheetCorrectorSheet ==. sid, SheetCorrectorState ==. CorrectorNormal ] [] let - byTutorial' uid = join . Map.lookup uid $ Map.fromList [ (sheetCorrectorUser, byTutorial sheetCorrectorLoad) | Entity _ SheetCorrector{..} <- corrsTutorial ] + -- byTutorial' uid = join . Map.lookup uid $ Map.fromList [ (sheetCorrectorUser, byTutorial sheetCorrectorLoad) | Entity _ SheetCorrector{..} <- corrsTutorial ] corrsTutorial = filter hasTutorialLoad correctors -- needed as List within Esqueleto corrsProp = filter hasPositiveLoad correctors countsToLoad' :: UserId -> Bool @@ -132,7 +113,7 @@ assignSubmissions sid restriction = do let prevSubs' :: Map SheetId (Map UserId (Rational, Integer)) prevSubs' = Map.unionsWith (Map.unionWith $ \(prop, n) (_, n') -> (prop, n + n')) $ do - (Entity _ sc@SheetCorrector{ sheetCorrectorLoad = Load{..}, .. }, E.Value isByTutorial, E.Value isPlaceholder) <- prevSubs + (Entity _ SheetCorrector{ sheetCorrectorLoad = Load{..}, .. }, E.Value isByTutorial, E.Value isPlaceholder) <- prevSubs guard $ maybe True (not isByTutorial ||) byTutorial let proportion | CorrectorExcused <- sheetCorrectorState = 0 @@ -149,7 +130,9 @@ assignSubmissions sid restriction = do props = getSum $ foldMap (Sum . fst) assignments toDeficit' (prop, assigned) = let - target = round $ fromInteger assigned' * (prop / props) + target + | props == 0 = 0 + | otherwise = round $ fromInteger assigned' * (prop / props) in target - assigned $logDebugS "assignSubmissions" $ "Previous submissions: " <> tshow prevSubs' @@ -162,9 +145,9 @@ assignSubmissions sid restriction = do wholeProps = Map.fromList [ ( sheetCorrectorUser, round $ byProportion * fromInteger lcd ) | Entity _ SheetCorrector{ sheetCorrectorLoad = Load{..}, .. } <- corrsProp ] detQueueLength = fromIntegral (Map.size $ Map.filter (\tuts -> all countsToLoad' tuts) subTutor') - sum deficit detQueue = concat . List.genericReplicate (detQueueLength `div` sum wholeProps) . concatMap (uncurry $ flip List.genericReplicate) $ Map.toList wholeProps - + $logDebugS "assignSubmissions" $ "Deterministic Queue: " <> tshow detQueue - + queue <- liftIO . Rand.evalRandIO . execWriterT $ do tell $ map Just detQueue forever $ @@ -182,11 +165,11 @@ assignSubmissions sid restriction = do maximumDeficit :: (MonadState (_a, _b, Map UserId Integer) m, MonadIO m) => m (Maybe UserId) maximumDeficit = do - transposed <- uses _3 invertMap + transposed <- uses _3 invertMap traverse (liftIO . Rand.evalRandIO . Rand.uniform . snd) (Map.lookupMax transposed) subTutor'' <- liftIO . Rand.evalRandIO . Rand.shuffleM $ Map.toList subTutor' - + subTutor <- fmap (view _1) . flip execStateT (Map.empty, queue, deficit) . forM_ subTutor'' $ \(smid, tuts) -> do let restrictTuts @@ -197,7 +180,7 @@ assignSubmissions sid restriction = do Just q' -> do $logDebugS "assignSubmissions" $ tshow smid <> " -> " <> tshow q' <> " (byDeficit)" assignSubmission False smid q' - Nothing + Nothing | Set.null tuts -> do q <- preuse $ _2 . _head . _Just case q of @@ -214,7 +197,7 @@ assignSubmissions sid restriction = do forM_ (Map.toList subTutor) $ \(smid, tutid) -> update smid [ SubmissionRatingBy =. Just tutid , SubmissionRatingAssigned =. Just now ] - + let assignedSubmissions = Map.keysSet subTutor unassigendSubmissions = Map.keysSet subTutor' \\ assignedSubmissions return (assignedSubmissions, unassigendSubmissions) @@ -242,7 +225,7 @@ submissionMultiArchive (Set.toList -> ids) = do ratedSubmissions <- runDBRunner dbrunner $ do submissions <- selectList [ SubmissionId <-. ids ] [] forM submissions $ \s@(Entity submissionId _) -> maybe (invalidArgs ["Invalid submission numbers"]) (return . (, s)) =<< getRating submissionId - + (<* cleanup) . respondSource "application/zip" . transPipe (runDBRunner dbrunner) $ do let fileEntitySource' :: (Rating, Entity Submission) -> Source (YesodDB UniWorX) File @@ -251,7 +234,7 @@ submissionMultiArchive (Set.toList -> ids) = do let directoryName = Text.unpack $ toPathPiece (cID :: CryptoFileNameSubmission) - + fileEntitySource = do submissionFileSource submissionID =$= Conduit.map entityVal yieldM (ratingFile cID rating) @@ -269,7 +252,7 @@ submissionMultiArchive (Set.toList -> ids) = do } fileEntitySource =$= mapC withinDirectory - + mapM_ fileEntitySource' ratedSubmissions =$= produceZip def =$= Conduit.map toFlushBuilder @@ -279,6 +262,7 @@ submissionMultiArchive (Set.toList -> ids) = do data SubmissionSinkState = SubmissionSinkState { sinkSeenRating :: Any , sinkSubmissionTouched :: Any + , sinkSubmissionNotifyRating :: Any , sinkFilenames :: Set FilePath } deriving (Show, Eq, Generic, Typeable) @@ -286,14 +270,6 @@ instance Monoid SubmissionSinkState where mempty = memptydefault mappend = mappenddefault -data SubmissionSinkException = DuplicateFileTitle FilePath - | DuplicateRating - | RatingWithoutUpdate - | ForeignRating CryptoFileNameSubmission - deriving (Typeable, Show) - -instance Exception SubmissionSinkException - submissionBlacklist :: [Pattern] submissionBlacklist = $(patternFile compDefault "config/submission-blacklist") @@ -324,16 +300,28 @@ extractRatingsMsg :: ( MonadHandler m ) => Conduit File m SubmissionContent extractRatingsMsg = do ignored' <- filterSubmission `fuseUpstream` Rating.extractRatings - let ignored :: Set (Either CryptoFileNameSubmission FilePath) - ignored = Right `Set.map` ignored' - unless (null ignored) $ do + let ignoredFiles :: Set (Either CryptoFileNameSubmission FilePath) + ignoredFiles = Right `Set.map` ignored' + unless (null ignoredFiles) $ do mr <- (toHtml . ) <$> getMessageRender addMessage Warning =<< withUrlRenderer ($(ihamletFile "templates/messages/submissionFilesIgnored.hamlet") mr) +-- Nicht innerhalb von runDB aufrufen, damit das DB Rollback passieren kann! +msgSubmissionErrors :: (MonadHandler m, MonadCatch m, HandlerSite m ~ UniWorX) => m a -> m (Maybe a) +msgSubmissionErrors = flip catches + [ E.Handler $ \e -> Nothing <$ addMessageI Error (e :: RatingException) + , E.Handler $ \e -> Nothing <$ addMessageI Error (e :: SubmissionSinkException) + , E.Handler $ \(SubmissionSinkException sinkId _ sinkEx) -> do + mr <- getMessageRender + addMessageI Error $ MsgMultiSinkException (toPathPiece sinkId) (mr sinkEx) + return Nothing + ] . fmap Just + + sinkSubmission :: UserId -> Either SheetId SubmissionId -> Bool -- ^ Is this a correction - -> Sink SubmissionContent (YesodDB UniWorX) SubmissionId + -> Sink SubmissionContent (YesodJobDB UniWorX) SubmissionId -- ^ Replace the currently saved files for the given submission (either -- corrected files or original ones, depending on arguments) with the supplied -- 'SubmissionContent'. @@ -359,20 +347,19 @@ sinkSubmission userId mExists isUpdate = do return sId Right sId -> return sId - sId <$ sinkSubmission' sId isUpdate + sId <$ sinkSubmission' sId where - tell = modify . mappend + tellSt = modify . mappend sinkSubmission' :: SubmissionId - -> Bool -- ^ Is this a correction - -> Sink SubmissionContent (YesodDB UniWorX) () - sinkSubmission' submissionId isUpdate = lift . finalize <=< execStateLC mempty . Conduit.mapM_ $ \case + -> Sink SubmissionContent (YesodJobDB UniWorX) () + sinkSubmission' submissionId = lift . finalize <=< execStateLC mempty . Conduit.mapM_ $ \case Left file@(File{..}) -> do $logDebugS "sinkSubmission" . tshow $ (submissionId, fileTitle) alreadySeen <- gets (Set.member fileTitle . sinkFilenames) when alreadySeen . throwM $ DuplicateFileTitle fileTitle - tell $ mempty{ sinkFilenames = Set.singleton fileTitle } + tellSt $ mempty{ sinkFilenames = Set.singleton fileTitle } otherVersions <- lift . E.select . E.from $ \(sf `E.InnerJoin` f) -> do E.on $ sf E.^. SubmissionFileFile E.==. f E.^. FileId @@ -394,7 +381,7 @@ sinkSubmission userId mExists isUpdate = do | not (null underlyingFiles) = all (~~ file) [ f | (Entity _ f, Entity _ _sf) <- underlyingFiles ] | otherwise = False undoneDeletion = any submissionFileIsDeletion [ sf | (_, Entity _ sf) <- collidingFiles ] - + when anyChanges $ do touchSubmission when (not $ null collidingFiles) $ @@ -414,32 +401,36 @@ sinkSubmission userId mExists isUpdate = do when undoneDeletion $ do touchSubmission lift $ deleteWhere [ SubmissionFileId <-. [ sfId | (_, Entity sfId sf) <- collidingFiles, submissionFileIsDeletion sf ] ] - - Right (submissionId', Rating'{..}) -> do + + Right (submissionId', r'@Rating'{..}) -> do $logDebugS "sinkSubmission" $ tshow submissionId' unless (submissionId' == submissionId) $ do cID <- encrypt submissionId' throwM $ ForeignRating cID - + alreadySeen <- gets $ getAny . sinkSeenRating when alreadySeen $ throwM DuplicateRating - tell $ mempty{ sinkSeenRating = Any True } + tellSt $ mempty{ sinkSeenRating = Any True } unless isUpdate $ throwM RatingWithoutUpdate Submission{..} <- lift $ getJust submissionId - let anyChanges = or $ + let anyChanges = or $ [ submissionRatingPoints /= ratingPoints , submissionRatingComment /= ratingComment ] -- 'ratingTime' is ignored for consistency with 'File's: - -- + -- -- 'fileModified' is simply stored and never inspected while -- 'submissionChanged' is always set to @now@. - when anyChanges $ do + + Sheet{..} <- lift $ getJust submissionSheet + --TODO: should display errorMessages + mapM_ throwM $ validateRating sheetType r' + touchSubmission lift $ update submissionId [ SubmissionRatingPoints =. ratingPoints @@ -463,18 +454,21 @@ sinkSubmission userId mExists isUpdate = do -- The check whether the new version matches the underlying file is -- more lenient, considering only filename and -content. - touchSubmission :: StateT SubmissionSinkState (YesodDB UniWorX) () + touchSubmission :: StateT SubmissionSinkState (YesodJobDB UniWorX) () touchSubmission = do alreadyTouched <- gets $ getAny . sinkSubmissionTouched when (not alreadyTouched) $ do now <- liftIO getCurrentTime - lift $ case isUpdate of - False -> insert_ $ SubmissionEdit userId now submissionId - True -> update submissionId [ SubmissionRatingBy =. Just userId, SubmissionRatingTime =. Just now ] - -- TODO: Should submissionRatingAssigned change here if userId changes? - tell $ mempty{ sinkSubmissionTouched = Any True } + case isUpdate of + False -> lift . insert_ $ SubmissionEdit userId now submissionId + True -> do + Submission{submissionRatingTime} <- lift $ getJust submissionId + when (isNothing submissionRatingTime) $ tellSt mempty { sinkSubmissionNotifyRating = Any True } + lift $ update submissionId [ SubmissionRatingBy =. Just userId, SubmissionRatingTime =. Just now ] + -- TODO: Should submissionRatingAssigned change here if userId changes? + tellSt $ mempty{ sinkSubmissionTouched = Any True } - finalize :: SubmissionSinkState -> YesodDB UniWorX () + finalize :: SubmissionSinkState -> YesodJobDB UniWorX () finalize SubmissionSinkState{..} = do missingFiles <- E.select . E.from $ \(sf `E.InnerJoin` f) -> E.distinctOnOrderBy [E.asc $ f E.^. FileTitle] $ do E.on $ sf E.^. SubmissionFileFile E.==. f E.^. FileId @@ -509,28 +503,25 @@ sinkSubmission userId mExists isUpdate = do update sfId [ SubmissionFileFile =. f, SubmissionFileIsDeletion =. True ] deleteCascade fileId - when (isUpdate && not (getAny sinkSeenRating)) $ - update submissionId + if + | isUpdate + , not $ getAny sinkSeenRating + -> update submissionId [ SubmissionRatingTime =. Nothing , SubmissionRatingPoints =. Nothing , SubmissionRatingBy =. Nothing , SubmissionRatingComment =. Nothing ] + | isUpdate + , getAny sinkSubmissionNotifyRating + -> queueDBJob . JobQueueNotification $ NotificationSubmissionRated submissionId + | otherwise -> return () -data SubmissionMultiSinkException - = SubmissionSinkException - { submissionSinkId :: CryptoFileNameSubmission - , submissionSinkFedFile :: Maybe FilePath - , submissionSinkException :: SubmissionSinkException - } - deriving (Typeable, Show) - -instance Exception SubmissionMultiSinkException sinkMultiSubmission :: UserId -> Bool {-^ Are these corrections -} - -> Sink SubmissionContent (YesodDB UniWorX) (Set SubmissionId) - + -> Sink SubmissionContent (YesodJobDB UniWorX) (Set SubmissionId) + -- ^ Expects all supplied 'SubmissionContent' to contain an encrypted 'SubmissionId' and replaces the currently saved files for the respective submissions (either corrected files or original ones, depending on arguments) with the supplied 'SubmissionContent'. -- -- Files that don't occur in the 'SubmissionContent' but are in the database are deleted (or marked as deleted in the case of this being a correction). @@ -543,8 +534,8 @@ sinkMultiSubmission userId isUpdate = do -> RWST () _ - (Map SubmissionId (ResumableSink SubmissionContent (YesodDB UniWorX) SubmissionId)) - (YesodDB UniWorX) + (Map SubmissionId (ResumableSink SubmissionContent (YesodJobDB UniWorX) SubmissionId)) + (YesodJobDB UniWorX) () feed sId val = do mSink <- gets $ Map.lookup sId @@ -553,7 +544,7 @@ sinkMultiSubmission userId isUpdate = do Nothing -> do lift $ do cID <- encrypt sId - $(logDebugS) "sinkMultiSubmission" $ "Doing auth checks for " <> toPathPiece cID + $(logDebugS) "sinkMultiSubmission" $ "Doing auth checks for " <> toPathPiece cID Submission{..} <- get404 sId Sheet{..} <- get404 submissionSheet Course{..} <- get404 sheetCourse @@ -563,7 +554,7 @@ sinkMultiSubmission userId isUpdate = do case sink' of Left _ -> error "sinkSubmission returned prematurely" Right nSink -> modify $ Map.insert sId nSink - (sinks, ignored) <- execRWSLC () Map.empty . awaitForever $ \case + (sinks, ignoredFiles) <- execRWSLC () Map.empty . awaitForever $ \case v@(Right (sId, _)) -> do cID <- encrypt sId $logDebugS "sinkMultiSubmission" $ "Feeding rating for " <> toPathPiece cID @@ -590,20 +581,20 @@ sinkMultiSubmission userId isUpdate = do cID <- encrypt sId handle (throwM . SubmissionSinkException cID (Just fileTitle)) $ lift . feed sId $ Left f{ fileTitle = fileTitle' } - when (not $ null ignored) $ do + when (not $ null ignoredFiles) $ do mr <- (toHtml .) <$> getMessageRender addMessage Warning =<< withUrlRenderer ($(ihamletFile "templates/messages/submissionFilesIgnored.hamlet") mr) - fmap Map.keysSet . lift . sequence $ flip Map.mapWithKey sinks $ \sId sink -> do + lift . fmap Set.fromList . forM (Map.toList sinks) $ \(sId, sink) -> do cID <- encrypt sId handle (throwM . SubmissionSinkException cID Nothing) $ - void $ closeResumableSink sink + closeResumableSink sink where handleHCError :: Either CryptoFileNameSubmission FilePath -> HandlerContents -> _ (Maybe a) handleHCError ident (HCError NotFound) = Nothing <$ tell (Set.singleton ident) handleHCError _ e = throwM e handleCryptoID :: CryptoIDError -> _ (Maybe a) handleCryptoID _ = return Nothing - + submissionMatchesSheet :: TermId -> SchoolId -> CourseShorthand -> SheetName -> CryptoFileNameSubmission -> DB SubmissionId submissionMatchesSheet tid ssh csh shn cid = do @@ -612,3 +603,38 @@ submissionMatchesSheet tid ssh csh shn cid = do Submission{..} <- get404 sid when (shid /= submissionSheet) $ invalidArgsI [MsgSubmissionWrongSheet] return sid + + +submissionDeleteRoute :: Set SubmissionId -> DeleteRoute Submission +submissionDeleteRoute drRecords = DeleteRoute + { drRecords + , drUnjoin = \(submission `E.InnerJoin` _ `E.InnerJoin` _ `E.InnerJoin` _) -> submission + , drGetInfo = \(submission `E.InnerJoin` sheet `E.InnerJoin` course `E.InnerJoin` school) -> do + E.on $ school E.^. SchoolId E.==. course E.^. CourseSchool + E.on $ course E.^. CourseId E.==. sheet E.^. SheetCourse + E.on $ sheet E.^. SheetId E.==. submission E.^. SubmissionSheet + let lastEdit = E.sub_select . E.from $ \submissionEdit -> do + E.where_ $ submissionEdit E.^. SubmissionEditSubmission E.==. submission E.^. SubmissionId + return . E.max_ $ submissionEdit E.^. SubmissionEditTime + E.orderBy [E.desc lastEdit] + return (submission E.^. SubmissionId, sheet E.^. SheetName, course E.^. CourseShorthand, course E.^. CourseName, school E.^. SchoolShorthand, school E.^. SchoolName, course E.^. CourseTerm) + , drRenderRecord = \(E.Value subId', E.Value shn', _, E.Value cName, _, E.Value sName, E.Value tid') -> do + subUsers <- selectList [SubmissionUserSubmission ==. subId'] [] + subNames <- fmap (sortOn snd) . forM subUsers $ \(Entity _ SubmissionUser{submissionUserUser}) -> (userDisplayName &&& userSurname) <$> getJust submissionUserUser + return [whamlet| + $newline never + + $forall (dName, sName) <- subNames + ^{nameWidget dName sName} + (_{ShortTermIdentifier (unTermKey tid')}, #{sName}, #{cName}, #{shn'}) + |] + , drRecordConfirmString = \(E.Value subId', E.Value shn', E.Value csh', _, E.Value ssh', _, E.Value tid') -> do + subUsers <- selectList [SubmissionUserSubmission ==. subId'] [] + subNames <- fmap sort . forM subUsers $ \(Entity _ SubmissionUser{submissionUserUser}) -> userSurname <$> getJust submissionUserUser + let subNames' = Text.intercalate ", " subNames + return [st|#{termToText (unTermKey tid')}/#{ssh'}/#{csh'}/#{shn'}/#{subNames'}|] + , drCaption = SomeMessage $ MsgSubmissionsDeleteQuestion 1 + , drSuccessMessage = SomeMessage $ MsgSubmissionsDeleted 1 + , drAbort = error "drAbort undefined" + , drSuccess = error "drSuccess undefined" + } diff --git a/src/Handler/Utils/Submission/TH.hs b/src/Handler/Utils/Submission/TH.hs index 99de8a01f..0b24a4da1 100644 --- a/src/Handler/Utils/Submission/TH.hs +++ b/src/Handler/Utils/Submission/TH.hs @@ -1,10 +1,3 @@ -{-# LANGUAGE NoImplicitPrelude - , TemplateHaskell - , ViewPatterns - , OverloadedStrings - , StandaloneDeriving - , DeriveLift - #-} {-# OPTIONS_GHC -fno-warn-orphans #-} module Handler.Utils.Submission.TH diff --git a/src/Handler/Utils/Table.hs b/src/Handler/Utils/Table.hs index 478bd58ff..811da9e2f 100644 --- a/src/Handler/Utils/Table.hs +++ b/src/Handler/Utils/Table.hs @@ -1,13 +1,7 @@ -{-# LANGUAGE NoImplicitPrelude #-} -{-# LANGUAGE OverloadedStrings #-} -{-# LANGUAGE QuasiQuotes #-} -{-# LANGUAGE TypeFamilies #-} - module Handler.Utils.Table where -- General Utilities for Tables -import Import hiding ((<>)) --- import Data.Monoid ((<>)) +import Import import Data.Profunctor import Control.Monad.Except @@ -64,11 +58,11 @@ headedRowSelector toExternal fromExternal attrs colonnade tdata = do extIds <- maybe (throwError "Error parsing values") return $ mapM fromPathPiece optlist case () of _ | extId `elem` extIds - -> Just <$> (lift $ fromExternal extId) + -> Just <$> lift (fromExternal extId) | otherwise -> return Nothing - view _ name attributes val _ = do + view _ name attributes val _ = [whamlet| diff --git a/src/Handler/Utils/Table/Cells.hs b/src/Handler/Utils/Table/Cells.hs index 5c4dad4d7..dd95183de 100644 --- a/src/Handler/Utils/Table/Cells.hs +++ b/src/Handler/Utils/Table/Cells.hs @@ -1,16 +1,10 @@ -{-# LANGUAGE NoImplicitPrelude #-} -{-# LANGUAGE OverloadedStrings #-} -{-# LANGUAGE RecordWildCards #-} -{-# LANGUAGE QuasiQuotes #-} -{-# LANGUAGE PartialTypeSignatures #-} -{-# LANGUAGE FlexibleContexts #-} - module Handler.Utils.Table.Cells where import Import import Data.Monoid (Any(..)) import Control.Monad.Writer.Class (MonadWriter(..)) +import Control.Monad.Trans.Writer (WriterT) import Utils.Lens import Handler.Utils @@ -21,8 +15,17 @@ type CourseLink = (TermId, SchoolId, CourseShorthand) -- TODO: Refactor with Wit -------------------- -- Special cells +tellCell :: (Monoid a, IsDBTable m a) => a -> DBCell m a -> DBCell m a +tellCell = flip mappend . writerCell . tell + +cellTell :: (Monoid a, IsDBTable m a) => DBCell m a -> a -> DBCell m a +cellTell = flip tellCell + indicatorCell :: IsDBTable m Any => DBCell m Any -- For dbTables that return a Bool to indicate content -indicatorCell = mempty & cellContents %~ (tell (Any True) *>) +indicatorCell = writerCell . tell $ Any True + +writerCell :: IsDBTable m w => WriterT w m () -> DBCell m w +writerCell act = mempty & cellContents %~ (<* act) -- Datatype cells timeCell :: IsDBTable m a => UTCTime -> DBCell m a @@ -70,7 +73,7 @@ courseCellCL (tid,ssh,csh) = anchorCell link name name = citext2widget csh courseCell :: IsDBTable m a => Course -> DBCell m a -courseCell (Course {..}) = anchorCell link name `mappend` desc +courseCell Course{..} = anchorCell link name `mappend` desc where link = CourseR courseTerm courseSchool courseShorthand CShowR name = citext2widget courseName @@ -97,7 +100,7 @@ submissionCell crse shn sid = csh = crse ^. _3 mkCid = encrypt sid mkRoute cid = CSubmissionR tid ssh csh shn cid SubShowR - mkText cid = display2widget cid + mkText = display2widget in anchorCellM' mkCid mkRoute mkText correctorStateCell :: IsDBTable m a => SheetCorrector -> DBCell m a diff --git a/src/Handler/Utils/Table/Pagination.hs b/src/Handler/Utils/Table/Pagination.hs index 3e017472c..368758bea 100644 --- a/src/Handler/Utils/Table/Pagination.hs +++ b/src/Handler/Utils/Table/Pagination.hs @@ -1,41 +1,29 @@ -{-# LANGUAGE NoImplicitPrelude - , ExistentialQuantification - , RecordWildCards - , NamedFieldPuns - , OverloadedStrings - , TemplateHaskell - , QuasiQuotes - , LambdaCase - , ViewPatterns - , FlexibleContexts - , FlexibleInstances - , MultiParamTypeClasses - , TypeFamilies - , ScopedTypeVariables - , TupleSections - , RankNTypes - , MultiWayIf - , FunctionalDependencies - #-} +{-# OPTIONS -fno-warn-orphans #-} module Handler.Utils.Table.Pagination - ( SortColumn(..), SortDirection(..) + ( module Handler.Utils.Table.Pagination.Types + , SortColumn(..), SortDirection(..) + , SortingSetting(..) + , pattern SortAscBy, pattern SortDescBy , FilterColumn(..), IsFilterColumn , DBRow(..), _dbrOutput, _dbrIndex, _dbrCount - , DBStyle(..), DBEmptyStyle(..) + , DBStyle(..), defaultDBSFilterLayout, DBEmptyStyle(..) , DBTable(..), IsDBTable(..), DBCell(..) + , singletonFilter + , DBParams(..) , cellAttrs, cellContents + , PagesizeLimit(..) , PaginationSettings(..), PaginationInput(..), piIsUnset , PSValidator(..) , defaultFilter, defaultSorting , restrictFilter, restrictSorting - , ToSortable(..), Sortable(..), sortable + , ToSortable(..), Sortable(..) , dbTable , dbTableWidget, dbTableWidget' , widgetColonnade, formColonnade, dbColonnade , cell, textCell, stringCell, i18nCell , anchorCell, anchorCell', anchorCellM, anchorCellM' - , tickmarkCell + , tickmarkCell, cellTooltip , listCell , formCell, DBFormResult, getDBFormResult , dbRow, dbSelect @@ -45,25 +33,21 @@ module Handler.Utils.Table.Pagination ) where import Handler.Utils.Table.Pagination.Types +import Handler.Utils.Form +import Utils import Utils.Lens.TH -import Import hiding (Proxy(..)) +import Import hiding (pi) import qualified Database.Esqueleto as E import qualified Database.Esqueleto.Internal.Sql as E (SqlSelect,unsafeSqlValue) import qualified Database.Esqueleto.Internal.Language as E (From) -import Text.Blaze (Attribute) -import qualified Text.Blaze.Html5.Attributes as Html5 -import qualified Text.Blaze.Html5 as Html5 import qualified Data.Binary.Builder as Builder import qualified Network.Wai as Wai -import Data.CaseInsensitive (CI) -import qualified Data.CaseInsensitive as CI - -import Control.Monad.RWS hiding ((<>), Foldable(..), mapM_, forM_) -import Control.Monad.Writer hiding ((<>), Foldable(..), mapM_, forM_) +import Control.Monad.RWS hiding ((<>), mapM_) +import Control.Monad.Writer hiding ((<>), mapM_) import Control.Monad.Reader (ReaderT(..), mapReaderT) import Control.Monad.Trans.Maybe @@ -72,7 +56,9 @@ import Data.Foldable (Foldable(foldMap)) import Data.Map (Map, (!)) import qualified Data.Map as Map -import Data.Profunctor (lmap) +import qualified Data.Set as Set + +import qualified Data.CaseInsensitive as CI import Colonnade hiding (bool, fromMaybe, singleton) import qualified Colonnade (singleton) @@ -84,26 +70,73 @@ import Data.Ratio ((%)) import Control.Lens -import Data.Proxy +import Data.List (elemIndex) + +import Data.Aeson (Options(..), SumEncoding(..), defaultOptions) +import Data.Aeson.Text +import Data.Aeson.TH (deriveJSON) + +import qualified Data.Text as Text + +import Data.Proxy (Proxy(..)) + +import qualified Data.Binary as B +import qualified Data.ByteArray as BA (convert) +import Crypto.MAC.HMAC (hmac, HMAC) +import Crypto.Hash.Algorithms (SHAKE256) + +import qualified Data.ByteString.Base64.URL as Base64 (encode) +import qualified Data.ByteString.Lazy as LBS + + +$(sqlInTuples [2..16]) data SortColumn t = forall a. PersistField a => SortColumn { getSortColumn :: t -> E.SqlExpr (E.Value a) } data SortDirection = SortAsc | SortDesc - deriving (Eq, Ord, Enum, Show, Read) + deriving (Eq, Ord, Enum, Bounded, Show, Read, Generic) + +instance Universe SortDirection +instance Finite SortDirection + instance PathPiece SortDirection where toPathPiece SortAsc = "asc" toPathPiece SortDesc = "desc" - fromPathPiece (CI.mk -> t) - | t == "asc" = Just SortAsc - | t == "desc" = Just SortDesc - | otherwise = Nothing + fromPathPiece = finiteFromPathPiece + +deriveJSON defaultOptions + { constructorTagModifier = camelToPathPiece' 1 + } ''SortDirection sqlSortDirection :: t -> (SortColumn t, SortDirection) -> E.SqlExpr E.OrderBy sqlSortDirection t (SortColumn e, SortAsc ) = E.asc $ e t sqlSortDirection t (SortColumn e, SortDesc) = E.desc $ e t +data SortingSetting = SortingSetting + { sortKey :: SortingKey + , sortDir :: SortDirection + } deriving (Eq, Ord, Show, Read, Generic) + +deriveJSON defaultOptions + { fieldLabelModifier = camelToPathPiece' 1 + } ''SortingSetting + +instance PathPiece SortingSetting where + toPathPiece SortingSetting{..} = toPathPiece sortKey <> "-" <> toPathPiece sortDir + fromPathPiece str = do + let sep = "-" + let (Text.dropEnd (Text.length sep) -> key, dir) = Text.breakOnEnd sep str + SortingSetting <$> fromPathPiece key <*> fromPathPiece dir + +pattern SortAscBy :: SortingKey -> SortingSetting +pattern SortAscBy key = SortingSetting key SortAsc + +pattern SortDescBy :: SortingKey -> SortingSetting +pattern SortDescBy key = SortingSetting key SortDesc + + data FilterColumn t = forall a. IsFilterColumn t a => FilterColumn a filterColumn :: FilterColumn t -> [Text] -> t -> E.SqlExpr (E.Value Bool) @@ -119,20 +152,67 @@ instance IsFilterColumn t cont => IsFilterColumn t (t -> cont) where filterColumn' cont is t = filterColumn' (cont t) is t instance {-# OVERLAPPABLE #-} (PathPiece (Element l), IsFilterColumn t cont, MonoPointed l, Monoid l) => IsFilterColumn t (l -> cont) where - filterColumn' cont is t = filterColumn' (cont input) is' t + filterColumn' cont is = filterColumn' (cont input) is' where (input, ($ []) -> is') = go (mempty, id) is go acc [] = acc - go (acc, is') (i:is) - | Just i' <- fromPathPiece i = go (acc `mappend` singleton i', is') is - | otherwise = go (acc, is' . (i:)) is + go (acc, is3) (i:is2) + | Just i' <- fromPathPiece i = go (acc `mappend` singleton i', is3) is2 + | otherwise = go (acc, is3 . (i:)) is2 + + +data PagesizeLimit = PagesizeLimit !Int64 | PagesizeAll + deriving (Eq, Ord, Read, Show, Generic) + +instance Bounded PagesizeLimit where + minBound = PagesizeLimit minBound + maxBound = PagesizeAll + +instance Enum PagesizeLimit where + toEnum i + | toInteger i >= fromIntegral (minBound :: Int64) + , toInteger i <= fromIntegral (maxBound :: Int64) + = PagesizeLimit $ fromIntegral i + | toInteger i > fromIntegral (maxBound :: Int64) + = PagesizeAll + | otherwise + = error "toEnum PagesizeLimit: out of bounds" + fromEnum (PagesizeLimit i) + | toInteger i >= fromIntegral (minBound :: Int) + , toInteger i <= fromIntegral (maxBound :: Int) + = fromIntegral i + | otherwise + = error "fromEnum PagesizeLimit: out of bounds" + fromEnum PagesizeAll + = error "fromEnum PagesizeLimit: infinite" + + succ (PagesizeLimit i) + | i == maxBound = PagesizeAll + | otherwise = PagesizeLimit $ succ i + succ PagesizeAll = error "succ PagesizeLimit: out of bounds" + pred (PagesizeLimit i) + | i == minBound = error "pred PagesizeLimit: out of bounds" + | otherwise = PagesizeLimit $ pred i + pred PagesizeAll = PagesizeLimit maxBound + +instance PathPiece PagesizeLimit where + toPathPiece PagesizeAll = "all" + toPathPiece (PagesizeLimit n) = toPathPiece n + fromPathPiece str + | CI.mk str == "all" = Just PagesizeAll + | otherwise = PagesizeLimit <$> fromPathPiece str + +deriveJSON defaultOptions + { constructorTagModifier = camelToPathPiece' 1 + , sumEncoding = UntaggedValue + } ''PagesizeLimit + data PaginationSettings = PaginationSettings - { psSorting :: [(CI Text, SortDirection)] - , psFilter :: Map (CI Text) [Text] - , psLimit :: Int64 + { psSorting :: [SortingSetting] + , psFilter :: Map FilterKey [Text] + , psLimit :: PagesizeLimit , psPage :: Int64 - , psShortcircuit :: Bool } makeLenses_ ''PaginationSettings @@ -141,20 +221,34 @@ instance Default PaginationSettings where def = PaginationSettings { psSorting = [] , psFilter = Map.empty - , psLimit = 50 + , psLimit = PagesizeLimit 50 , psPage = 0 - , psShortcircuit = False } +deriveJSON defaultOptions + { fieldLabelModifier = camelToPathPiece' 1 + } ''PaginationSettings + data PaginationInput = PaginationInput - { piSorting :: Maybe [(CI Text, SortDirection)] - , piFilter :: Maybe (Map (CI Text) [Text]) - , piLimit :: Maybe Int64 + { piSorting :: Maybe [SortingSetting] + , piFilter :: Maybe (Map FilterKey [Text]) + , piLimit :: Maybe PagesizeLimit , piPage :: Maybe Int64 - , piShortcircuit :: Bool - } + } deriving (Eq, Ord, Show, Read, Generic) + +instance Default PaginationInput where + def = PaginationInput + { piSorting = Nothing + , piFilter = Nothing + , piLimit = Nothing + , piPage = Nothing + } makeLenses_ ''PaginationInput +deriveJSON defaultOptions + { fieldLabelModifier = camelToPathPiece' 1 + , omitNothingFields = True + } ''PaginationInput piIsUnset :: PaginationInput -> Bool piIsUnset PaginationInput{..} = and @@ -162,13 +256,14 @@ piIsUnset PaginationInput{..} = and , isNothing piFilter , isNothing piLimit , isNothing piPage - , not piShortcircuit ] -data DBRow r = DBRow - { dbrOutput :: r +type DBTableKey k' = (ToJSON k', FromJSON k', Ord k', Binary k') +data DBRow r = forall k'. DBTableKey k' => DBRow + { dbrKey :: k' + , dbrOutput :: r , dbrIndex, dbrCount :: Int64 - } deriving (Show, Read, Eq, Ord) + } makeLenses_ ''DBRow @@ -179,7 +274,7 @@ instance Foldable DBRow where foldMap f DBRow{..} = f dbrOutput instance Traversable DBRow where - traverse f DBRow{..} = DBRow <$> f dbrOutput <*> pure dbrIndex <*> pure dbrCount + traverse f DBRow{..} = DBRow <$> pure dbrKey <*> f dbrOutput <*> pure dbrIndex <*> pure dbrCount newtype PSValidator m x = PSValidator { runPSValidator :: DBTable m x -> Maybe PaginationInput -> ([SomeMessage UniWorX], PaginationSettings) } @@ -189,40 +284,41 @@ instance Default (PSValidator m x) where Just pi -> swap . (\act -> execRWS act pi def) $ do asks piSorting >>= maybe (return ()) (\s -> modify $ \ps -> ps { psSorting = s }) asks piFilter >>= maybe (return ()) (\f -> modify $ \ps -> ps { psFilter = f }) - + l <- asks piLimit case l of - Just l' + Just (PagesizeLimit l') | l' <= 0 -> tell . pure $ SomeMessage MsgPSLimitNonPositive - | otherwise -> modify $ \ps -> ps { psLimit = l' } + | otherwise -> modify $ \ps -> ps { psLimit = PagesizeLimit l' } + Just PagesizeAll + -> modify $ \ps -> ps { psLimit = PagesizeAll } Nothing -> return () asks piPage >>= maybe (return ()) (\p -> modify $ \ps -> ps { psPage = p }) - asks piShortcircuit >>= (\s -> modify $ \ps -> ps { psShortcircuit = s }) -defaultFilter :: Map (CI Text) [Text] -> PSValidator m x -> PSValidator m x -defaultFilter psFilter (runPSValidator -> f) = PSValidator $ \dbTable -> injectDefault <*> f dbTable +defaultFilter :: Map FilterKey [Text] -> PSValidator m x -> PSValidator m x +defaultFilter psFilter (runPSValidator -> f) = PSValidator $ \dbTable' -> injectDefault <*> f dbTable' where injectDefault x = case x >>= piFilter of Just _ -> id Nothing -> set (_2._psFilter) psFilter -defaultSorting :: [(CI Text, SortDirection)] -> PSValidator m x -> PSValidator m x -defaultSorting psSorting (runPSValidator -> f) = PSValidator $ \dbTable -> injectDefault <*> f dbTable +defaultSorting :: [SortingSetting] -> PSValidator m x -> PSValidator m x +defaultSorting psSorting (runPSValidator -> f) = PSValidator $ \dbTable' -> injectDefault <*> f dbTable' where injectDefault x = case x >>= piSorting of Just _ -> id Nothing -> set (_2._psSorting) psSorting -restrictFilter :: (CI Text -> [Text] -> Bool) -> PSValidator m x -> PSValidator m x -restrictFilter restrict (runPSValidator -> f) = PSValidator $ \dbTable ps -> over _2 restrict' $ f dbTable ps +restrictFilter :: (FilterKey -> [Text] -> Bool) -> PSValidator m x -> PSValidator m x +restrictFilter restrict (runPSValidator -> f) = PSValidator $ \dbTable' ps -> over _2 restrict' $ f dbTable' ps where restrict' p = p { psFilter = Map.filterWithKey restrict $ psFilter p } -restrictSorting :: (CI Text -> SortDirection -> Bool) -> PSValidator m x -> PSValidator m x -restrictSorting restrict (runPSValidator -> f) = PSValidator $ \dbTable ps -> over _2 restrict' $ f dbTable ps +restrictSorting :: (SortingKey -> SortDirection -> Bool) -> PSValidator m x -> PSValidator m x +restrictSorting restrict (runPSValidator -> f) = PSValidator $ \dbTable' ps -> over _2 restrict' $ f dbTable' ps where - restrict' p = p { psSorting = filter (uncurry restrict) $ psSorting p } + restrict' p = p { psSorting = filter (\SortingSetting{..} -> restrict sortKey sortDir) $ psSorting p } data DBEmptyStyle = DBESNoHeading | DBESHeading @@ -235,6 +331,12 @@ data DBStyle = DBStyle { dbsEmptyStyle :: DBEmptyStyle , dbsEmptyMessage :: UniWorXMessage , dbsAttrs :: [(Text, Text)] + , dbsFilterLayout :: Widget + -> Enctype + -> Text + -> Widget + -> Widget + -- ^ Filter UI, Filter Encoding, Filter action, table } instance Default DBStyle where @@ -242,34 +344,65 @@ instance Default DBStyle where { dbsEmptyStyle = def , dbsEmptyMessage = MsgNoTableContent , dbsAttrs = [ ("class", "table table--striped table--hover table--sortable") ] + , dbsFilterLayout = \_filterWgdt _filterEnctype _filterAction scrolltable -> + [whamlet| + $newline never + + ^{scrolltable} + |] } -data DBTable m x = forall a r r' h i t. +defaultDBSFilterLayout :: Widget -- ^ Filter UI + -> Enctype + -> Text -- ^ Filter action (target uri) + -> Widget -- ^ Table + -> Widget +defaultDBSFilterLayout filterWgdt filterEnctype filterAction scrolltable = $(widgetFile "table/layout-filter-default") + + +singletonFilter :: Ord k => k -> Prism' (Map k [v]) (Maybe v) +-- ^ for use with @prismAForm@ +singletonFilter key = prism' fromInner (fmap Just . fromOuter) + where + fromInner = maybe Map.empty $ Map.singleton key . pure + fromOuter = Map.lookup key >=> listToMaybe + + +data DBTable m x = forall a r r' h i t k k'. ( ToSortable h, Functor h - , E.SqlSelect a r - , PathPiece i + , E.SqlSelect a r, SqlIn k k', DBTableKey k' + , PathPiece i, Eq i , E.From E.SqlQuery E.SqlExpr E.SqlBackend t ) => DBTable { dbtSQLQuery :: t -> E.SqlQuery a + , dbtRowKey :: t -> k , dbtProj :: DBRow r -> MaybeT (ReaderT SqlBackend (HandlerT UniWorX IO)) r' , dbtColonnade :: Colonnade h r' (DBCell m x) - , dbtSorting :: Map (CI Text) (SortColumn t) - , dbtFilter :: Map (CI Text) (FilterColumn t) + , dbtSorting :: Map SortingKey (SortColumn t) + , dbtFilter :: Map FilterKey (FilterColumn t) + , dbtFilterUI :: Maybe (Map FilterKey [Text]) -> AForm (ReaderT SqlBackend (HandlerT UniWorX IO)) (Map FilterKey [Text]) , dbtStyle :: DBStyle + , dbtParams :: DBParams m x , dbtIdent :: i } -class (MonadHandler m, Monoid x, Monoid (DBCell m x)) => IsDBTable (m :: * -> *) (x :: *) where +class (MonadHandler m, Monoid x, Monoid (DBCell m x), Default (DBParams m x)) => IsDBTable (m :: * -> *) (x :: *) where + data DBParams m x :: * type DBResult m x :: * -- type DBResult' m x :: * data DBCell m x :: * dbCell :: Iso' (DBCell m x) ([(Text, Text)], WriterT x m Widget) - + -- dbWidget :: Proxy m -> Proxy x -> Iso' (DBResult m x) (Widget, DBResult' m x) - dbWidget :: forall m'. (MonadHandler m', HandlerSite m' ~ UniWorX) => DBTable m x -> DBResult m x -> m' Widget - dbHandler :: forall m'. (MonadHandler m', HandlerSite m' ~ UniWorX) => DBTable m x -> (Widget -> Widget) -> DBResult m x -> m' (DBResult m x) - runDBTable :: forall m'. (MonadHandler m', HandlerSite m' ~ UniWorX) => m (x, Widget) -> ReaderT SqlBackend m' (DBResult m x) + -- | Format @DBTable@ when sort-circuiting + dbWidget :: forall m' p p'. (MonadHandler m', HandlerSite m' ~ UniWorX) => p m -> p' x -> DBResult m x -> m' Widget + -- | Format @DBTable@ when not short-circuiting + dbHandler :: forall m' p p'. (MonadHandler m', HandlerSite m' ~ UniWorX) => p m -> p' x -> (Widget -> Widget) -> DBResult m x -> m' (DBResult m x) + runDBTable :: forall m' k'. (MonadHandler m', HandlerSite m' ~ UniWorX, ToJSON k') => DBTable m x -> PaginationInput -> [k'] -> m (x, Widget) -> ReaderT SqlBackend m' (DBResult m x) + + dbInvalidateResult :: forall m'. (MonadHandler m', HandlerSite m' ~ UniWorX) => DBParams m x -> DBTableInvalid -> DBResult m x -> m' (DBResult m x) + dbInvalidateResult _ _ = return cellAttrs :: IsDBTable m x => Lens' (DBCell m x) [(Text, Text)] cellAttrs = dbCell . _1 @@ -278,6 +411,7 @@ cellContents :: IsDBTable m x => Lens' (DBCell m x) (WriterT x m Widget) cellContents = dbCell . _2 instance Monoid x => IsDBTable (HandlerT UniWorX IO) x where + data DBParams (HandlerT UniWorX IO) x = DBParamsWidget type DBResult (HandlerT UniWorX IO) x = (x, Widget) -- type DBResult' (WidgetT UniWorX IO) () = () @@ -288,18 +422,22 @@ instance Monoid x => IsDBTable (HandlerT UniWorX IO) x where dbCell = iso (\WidgetCell{..} -> (wgtCellAttrs, wgtCellContents)) - (\(attrs, mkWidget) -> WidgetCell attrs mkWidget) - + (uncurry WidgetCell) + -- dbWidget Proxy Proxy = iso (, ()) $ view _1 - dbWidget _ = return . snd - dbHandler _ f = return . over _2 f - runDBTable act = liftHandlerT act + dbWidget _ _ = return . snd + dbHandler _ _ f = return . over _2 f + runDBTable _ _ _ = liftHandlerT instance Monoid x => Monoid (DBCell (HandlerT UniWorX IO) x) where mempty = WidgetCell mempty $ return mempty (WidgetCell a c) `mappend` (WidgetCell a' c') = WidgetCell (mappend a a') (mappend <$> c <*> c') +instance Default (DBParams (HandlerT UniWorX IO) x) where + def = DBParamsWidget + instance Monoid x => IsDBTable (ReaderT SqlBackend (HandlerT UniWorX IO)) x where + data DBParams (ReaderT SqlBackend (HandlerT UniWorX IO)) x = DBParamsDB type DBResult (ReaderT SqlBackend (HandlerT UniWorX IO)) x = (x, Widget) data DBCell (ReaderT SqlBackend (HandlerT UniWorX IO)) x = DBCell @@ -309,160 +447,302 @@ instance Monoid x => IsDBTable (ReaderT SqlBackend (HandlerT UniWorX IO)) x wher dbCell = iso (\DBCell{..} -> (dbCellAttrs, dbCellContents)) - (\(attrs, mkWidget) -> DBCell attrs mkWidget) + (uncurry DBCell) - dbWidget _ = return . snd - dbHandler _ f = return . over _2 f + dbWidget _ _ = return . snd + dbHandler _ _ f = return . over _2 f -- runDBTable :: forall m. (MonadHandler m, HandlerSite m ~ UniWorX) => ReaderT SqlBackend (HandlerT UniWorX IO) ((), Widget) -> m (Widget) - runDBTable = mapReaderT liftHandlerT + runDBTable _ _ _ = mapReaderT liftHandlerT instance Monoid x => Monoid (DBCell (ReaderT SqlBackend (HandlerT UniWorX IO)) x) where mempty = DBCell mempty $ return mempty (DBCell a c) `mappend` (DBCell a' c') = DBCell (mappend a a') (mappend <$> c <*> c') -instance Monoid a => IsDBTable (RWST (Maybe (Env, FileEnv), UniWorX, [Lang]) Enctype Ints (HandlerT UniWorX IO)) (FormResult a) where - -- type DBResult (RWST (Maybe (Env, FileEnv), UniWorX, [Lang]) Enctype Ints (HandlerT UniWorX IO)) (FormResult a) = ((FormResult a, Widget), Enctype) - type DBResult (RWST (Maybe (Env, FileEnv), UniWorX, [Lang]) Enctype Ints (HandlerT UniWorX IO)) (FormResult a) = Form a +instance Default (DBParams (ReaderT SqlBackend (HandlerT UniWorX IO)) x) where + def = DBParamsDB + +instance Monoid x => IsDBTable (RWST (Maybe (Env, FileEnv), UniWorX, [Lang]) Enctype Ints (HandlerT UniWorX IO)) x where + data DBParams (RWST (Maybe (Env, FileEnv), UniWorX, [Lang]) Enctype Ints (HandlerT UniWorX IO)) x = forall a. DBParamsForm + { dbParamsFormMethod :: StdMethod + , dbParamsFormAction :: Maybe (SomeRoute UniWorX) + , dbParamsFormAttrs :: [(Text, Text)] + , dbParamsFormAddSubmit :: Bool + , dbParamsFormAdditional :: Form a + , dbParamsFormEvaluate :: forall m' a' x'. (MonadHandler m', HandlerSite m' ~ UniWorX, MonadResource m') => (Html -> MForm (HandlerT UniWorX IO) (FormResult a', x')) -> m' ((FormResult a', x'), Enctype) + , dbParamsFormResult :: Lens' x (FormResult a) + } + type DBResult (RWST (Maybe (Env, FileEnv), UniWorX, [Lang]) Enctype Ints (HandlerT UniWorX IO)) x = (x, Widget) -- type DBResult' (RWST (Maybe (Env, FileEnv), UniWorX, [Lang]) Enctype Ints (HandlerT UniWorX IO)) (FormResult a) = (FormResult a, Enctype) - data DBCell (RWST (Maybe (Env, FileEnv), UniWorX, [Lang]) Enctype Ints (HandlerT UniWorX IO)) (FormResult a) = FormCell + data DBCell (RWST (Maybe (Env, FileEnv), UniWorX, [Lang]) Enctype Ints (HandlerT UniWorX IO)) x = forall a. FormCell { formCellAttrs :: [(Text, Text)] - , formCellContents :: MForm (HandlerT UniWorX IO) (FormResult a, Widget) + , formCellContents :: WriterT x (MForm (HandlerT UniWorX IO)) (FormResult a, Widget) + , formCellLens :: Lens' x (FormResult a) } -- dbCell :: Iso' - -- (DBCell (RWST ... ... ... (HandlerT UniWorX IO)) (FormResult a)) - -- ([(Text, Text)], WriterT (FormResult a) (RWST ... ... ... (HandlerT UniWorX IO)) Widget) + -- (DBCell (RWST ... ... ... (HandlerT UniWorX IO)) x) + -- ([(Text, Text)], WriterT x (RWST ... ... ... (HandlerT UniWorX IO)) Widget) dbCell = iso - (\FormCell{..} -> (formCellAttrs, WriterT $ fmap swap formCellContents)) - (\(attrs, mkWidget) -> FormCell attrs . fmap swap $ runWriterT mkWidget) - + (\FormCell{..} -> (formCellAttrs, formCellContents >>= uncurry ($>) . over _1 (tell . (flip $ set formCellLens) mempty))) + (\(attrs, mkWidget) -> FormCell attrs ((pure (), ) <$> mkWidget) $ lens (\_ -> pure ()) (\s _ -> s)) + -- dbWidget Proxy Proxy = iso ((,) <$> view (_1._2) <*> ((,) <$> view (_1._1) <*> view _2)) -- ((,) <$> ((,) <$> view (_2._1) <*> view _1) <*> view (_2._2)) - dbWidget DBTable{ dbtIdent = (toPathPiece -> dbtIdent) } = liftHandlerT . fmap (view $ _1 . _2) . runFormPost . identifyForm dbtIdent - dbHandler DBTable{ dbtIdent = (toPathPiece -> dbtIdent) } f form = return $ \csrf -> over _2 f <$> identifyForm dbtIdent form csrf - -- runDBTable :: MForm (HandlerT UniWorX IO) (FormResult a, Widget) -> m ((FormResult a, Widget), Enctype) - -- runDBTable form = liftHandlerT . runFormPost $ \html -> over _2 (<> toWidget html) <$> form - -- runDBTable :: MForm (HandlerT UniWorX IO) (FormResult a, Widget) -> m (Html -> MForm (HandleT UniWorX IO) (FormResult a, Widget)) - runDBTable = return . withFragment + dbWidget _ _ = return . snd + dbHandler _ _ f = return . over _2 f + -- runDBTable :: forall m' k'. (MonadHandler m', HandlerSite m' ~ UniWorX, ToJSON k') => DBTable (MForm (HandlerT UniWorX IO)) x -> PaginationInput -> [k'] -> (MForm (HandlerT UniWorX IO)) (x, Widget) -> ReaderT SqlBackend m' (x, Widget) + runDBTable dbtable@(DBTable{ dbtParams = dbtParams@DBParamsForm{..} }) pi pKeys = fmap ((\(res, (wdgt, x)) -> (x & dbParamsFormResult .~ res, wdgt)) . view _1) . dbParamsFormEvaluate . fmap (fmap $ \(x, wdgt) -> (x ^. dbParamsFormResult, (wdgt, x))) . dbParamsFormWrap dbtParams . addPIHiddenField dbtable pi . addPreviousHiddenField dbtable pKeys . withFragment + + dbInvalidateResult DBParamsForm{..} reason result = do + reasonTxt <- getMessageRender <*> pure reason + let + adjResult (FormFailure errs) = FormFailure $ reasonTxt : errs + adjResult _ = FormFailure $ pure reasonTxt + return $ over (_1 . dbParamsFormResult) adjResult result + +instance Monoid x => Default (DBParams (RWST (Maybe (Env, FileEnv), UniWorX, [Lang]) Enctype Ints (HandlerT UniWorX IO)) x) where + def = DBParamsForm + { dbParamsFormMethod = POST + , dbParamsFormAction = Nothing + , dbParamsFormAttrs = [] + , dbParamsFormAddSubmit = False + , dbParamsFormAdditional = \_ -> return (pure (), mempty) + , dbParamsFormEvaluate = liftHandlerT . runFormPost + , dbParamsFormResult = lens (\_ -> pure ()) (\s _ -> s) + } + +dbParamsFormWrap :: Monoid x => DBParams (RWST (Maybe (Env, FileEnv), UniWorX, [Lang]) Enctype Ints (HandlerT UniWorX IO)) x -> (Html -> MForm (HandlerT UniWorX IO) (x, Widget)) -> (Html -> MForm (HandlerT UniWorX IO) (x, Widget)) +dbParamsFormWrap DBParamsForm{..} tableForm frag = do + let form = mappend <$> tableForm frag <*> (fmap (over _1 $ (flip $ set dbParamsFormResult) mempty) $ dbParamsFormAdditional mempty) + ((res, fWidget), enctype) <- listen form + return . (res,) $ do + btnId <- newIdent + act <- traverse toTextUrl dbParamsFormAction + let submitField :: Field Handler ButtonSubmit + submitField = buttonField BtnSubmit + submitView :: Widget + submitView = fieldView submitField btnId "" mempty (Right BtnSubmit) False + enctype' = bool id (mappend $ fieldEnctype submitField) dbParamsFormAddSubmit enctype + $(widgetFile "table/form-wrap") + +data WithIdent x = forall ident. PathPiece ident => WithIdent { _ident :: ident, _withoutIdent :: x } + +instance PathPiece x => PathPiece (WithIdent x) where + toPathPiece (WithIdent ident x) + | not . null $ toPathPiece ident = toPathPiece ident <> "-" <> toPathPiece x + | otherwise = toPathPiece x + fromPathPiece txt = do + let sep = "-" + (ident, (Text.stripSuffix sep -> Just rest)) <- return $ Text.breakOn sep txt + WithIdent <$> pure ident <*> fromPathPiece rest + +addPIHiddenField :: DBTable m' x -> PaginationInput -> (Html -> MForm m a) -> (Html -> MForm m a) +addPIHiddenField DBTable{ dbtIdent } pi form fragment + = form $ fragment <> [shamlet| + $newline never + + |] + where + wIdent :: Text -> Text + wIdent = toPathPiece . WithIdent dbtIdent + +addPreviousHiddenField :: (ToJSON k', MonadHandler m, HandlerSite m ~ UniWorX) => DBTable m' x -> [k'] -> (Html -> MForm m a) -> (Html -> MForm m a) +addPreviousHiddenField DBTable{ dbtIdent } pKeys form fragment = do + encrypted <- encodedSecretBox SecretBoxShort pKeys + form $ fragment <> [shamlet| + $newline never + + |] + where + wIdent :: Text -> Text + wIdent = toPathPiece . WithIdent dbtIdent + +instance Monoid x => Monoid (DBCell (RWST (Maybe (Env, FileEnv), UniWorX, [Lang]) Enctype Ints (HandlerT UniWorX IO)) x) where + mempty = FormCell mempty (return mempty) $ lens (\_ -> pure ()) (\s _ -> s) + (FormCell attrs c l) `mappend` (FormCell attrs' c' l') = FormCell (mappend attrs attrs') ((\(a, w) (a', w') -> ((,) <$> a <*> a', mappend w w')) <$> c <*> c') (lens (liftA2 (,) <$> view l <*> view l') (\s as -> s & l .~ (fst <$> as) & l' .~ (snd <$> as))) -instance Monoid a => Monoid (DBCell (RWST (Maybe (Env, FileEnv), UniWorX, [Lang]) Enctype Ints (HandlerT UniWorX IO)) (FormResult a)) where - mempty = FormCell mempty (return mempty) - (FormCell a c) `mappend` (FormCell a' c') = FormCell (mappend a a') (mappend <$> c <*> c') - instance IsDBTable m a => IsString (DBCell m a) where fromString = cell . fromString - -dbTable :: forall m x. IsDBTable m x => PSValidator m x -> DBTable m x -> Handler (DBResult m x) -dbTable PSValidator{..} dbtable@(DBTable{ dbtIdent = (toPathPiece -> dbtIdent), dbtStyle = DBStyle{..}, .. }) = do + +dbTable :: forall m x. IsDBTable m x => PSValidator m x -> DBTable m x -> DB (DBResult m x) +dbTable PSValidator{..} dbtable@DBTable{ dbtIdent = dbtIdent'@(toPathPiece -> dbtIdent), dbtStyle = DBStyle{..}, .. } = do let sortingOptions = mkOptionList - [ Option t' (t, d) t' + [ Option t' (SortingSetting t d) t' | (t, _) <- mapToList dbtSorting , d <- [SortAsc, SortDesc] - , let t' = CI.foldedCase t <> "-" <> toPathPiece d + , let t' = toPathPiece $ SortingSetting t d ] - (_, defPS) = runPSValidator dbtable Nothing - wIdent n - | not $ null dbtIdent = dbtIdent <> "-" <> n - | otherwise = n + wIdent :: Text -> Text + wIdent = toPathPiece . WithIdent dbtIdent dbsAttrs' | not $ null dbtIdent = ("id", dbtIdent) : dbsAttrs | otherwise = dbsAttrs multiTextField = Field { fieldParse = \ts _ -> return . Right $ Just ts - , fieldView = undefined + , fieldView = error "multiTextField: should not be rendered" , fieldEnctype = UrlEncoded } - - psResult <- runInputGetResult $ PaginationInput - <$> iopt (multiSelectField $ return sortingOptions) (wIdent "sorting") - <*> ((assertM' $ not . Map.null) . Map.mapMaybe (assertM $ not . null) <$> Map.traverseWithKey (\k _ -> iopt multiTextField . wIdent $ CI.foldedCase k) dbtFilter) - <*> iopt intField (wIdent "pagesize") - <*> iopt intField (wIdent "page") - <*> ireq checkBoxField (wIdent "table-only") - $(logDebug) . tshow $ (,,,,) <$> (piSorting <$> psResult) - <*> (piFilter <$> psResult) - <*> (piLimit <$> psResult) - <*> (piPage <$> psResult) - <*> (piShortcircuit <$> psResult) + piPrevious <- lift . runInputMaybe $ ireq (jsonField True) (wIdent "pagination") + let piPreviousRes = maybe FormMissing FormSuccess piPrevious + previousKeys <- throwExceptT . runMaybeT $ encodedSecretBoxOpen =<< MaybeT (lift . lookupPostParam $ wIdent "previous") + + piInput <- lift . runInputGetResult $ PaginationInput + <$> iopt (multiSelectField $ return sortingOptions) (wIdent "sorting") + <*> (assertM' (not . Map.null) . Map.mapMaybe (assertM $ not . null) <$> Map.traverseWithKey (\k _ -> iopt multiTextField . wIdent $ toPathPiece k) dbtFilter) + <*> iopt pathPieceField (wIdent "pagesize") + <*> iopt intField (wIdent "page") + + let prevPi + | FormSuccess pi <- piPreviousRes <|> piInput + = pi + | otherwise + = def + + referencePagesize = psLimit . snd . runPSValidator dbtable $ Just prevPi + + (((filterRes, filterWdgt), filterEnc), ((pagesizeRes, pagesizeWdgt), pagesizeEnc)) <- mdo + (filterRes'@((filterRes, _), _)) <- runFormGet . identForm FIDDBTableFilter . addPIHiddenField dbtable (prevPi & _piFilter .~ Nothing & _piPage .~ Nothing & _piLimit .~ (formResult' pagesizeRes <|> piLimit prevPi)) . renderAForm FormDBTableFilter $ dbtFilterUI (piFilter prevPi) + + (pagesizeRes'@((pagesizeRes, _), _)) <- lift . runFormGet . identForm FIDDBTablePagesize . addPIHiddenField dbtable (prevPi & _piPage .~ Nothing & _piLimit .~ Nothing & _piFilter .~ (formResult' filterRes <|> piFilter prevPi)) . renderAForm FormDBTablePagesize $ + areq (pagesizeField referencePagesize) (fslI MsgDBTablePagesize & addAutosubmit & addName (wIdent "pagesize") & addClass "select--pagesize") (Just referencePagesize) + <* autosubmitButton + return (filterRes', pagesizeRes') let - (errs, PaginationSettings{..}) = case psResult of - FormSuccess pi - | not (piIsUnset pi) -> runPSValidator dbtable $ Just pi - FormFailure errs -> first (map SomeMessage errs <>) $ runPSValidator dbtable Nothing - _ -> runPSValidator dbtable Nothing - psSorting' = map (first (dbtSorting !)) psSorting - sqlQuery' = E.from $ \t -> dbtSQLQuery t - <* E.orderBy (map (sqlSortDirection t) psSorting') - <* E.limit psLimit - <* E.offset (psPage * psLimit) - <* Map.foldrWithKey (\key args expr -> E.where_ (filterColumn (dbtFilter ! key) args t) >> expr) (return ()) psFilter + piResult = (\fSettings -> prevPi & _piFilter .~ Just fSettings) <$> filterRes + <|> (\ps -> prevPi & _piLimit .~ Just ps) <$> pagesizeRes + <|> piPreviousRes + <|> piInput + + psShortcircuit <- (== Just dbtIdent') <$> lookupCustomHeader HeaderDBTableShortcircuit + + let + ((errs, PaginationSettings{..}), paginationInput@PaginationInput{..}) + | FormSuccess pi <- piResult + , not $ piIsUnset pi + = (, pi) . runPSValidator dbtable $ Just pi + | FormFailure errs' <- piResult + = (, def) . first (map SomeMessage errs' <>) $ runPSValidator dbtable Nothing + | otherwise + = (, def) $ runPSValidator dbtable Nothing + psSorting' = map (\SortingSetting{..} -> (dbtSorting ! sortKey, sortDir)) psSorting mapM_ (addMessageI Warning) errs - runDB $ do - rows' <- E.select $ (,) <$> pure (E.unsafeSqlValue "count(*) OVER ()" :: E.SqlExpr (E.Value Int64)) <*> sqlQuery' + rows' <- E.select . E.from $ \t -> do + res <- dbtSQLQuery t + E.orderBy (map (sqlSortDirection t) psSorting') + case previousKeys of + Nothing + | PagesizeLimit l <- psLimit + -> do + E.limit l + E.offset (psPage * l) + Just ps -> E.where_ $ dbtRowKey t `sqlIn` ps + _other -> return () + Map.foldrWithKey (\key args expr -> E.where_ (filterColumn (dbtFilter ! key) args t) >> expr) (return ()) psFilter + return (E.unsafeSqlValue "count(*) OVER ()" :: E.SqlExpr (E.Value Int64), dbtRowKey t, res) - let mapMaybeM f = fmap catMaybes . mapM (runMaybeT . f) - - rows <- mapMaybeM dbtProj . map (\(dbrIndex, (E.Value dbrCount, dbrOutput)) -> DBRow{..}) $ zip [succ (psPage * psLimit)..] rows' + let mapMaybeM f = fmap catMaybes . mapM (\(k, v) -> runMaybeT $ (,) <$> pure k <*> f v) + firstRow :: Int64 + firstRow + | PagesizeLimit l <- psLimit + = succ (psPage * l) + | otherwise + = 1 + reproduceSorting + | Just ps <- previousKeys + = sortOn $ \(_, dbrKey, _) -> elemIndex dbrKey ps + | otherwise + = id - let - rowCount - | (E.Value n, _):_ <- rows' = n - | otherwise = 0 + (currentKeys, rows) <- fmap unzip . mapMaybeM dbtProj . map (\(dbrIndex, (E.Value dbrCount, dbrKey, dbrOutput)) -> (dbrKey, DBRow{..})) . zip [firstRow..] $ reproduceSorting rows' - table' :: WriterT x m Widget - table' = do - getParams <- liftHandlerT $ queryToQueryText . Wai.queryString . reqWaiRequest <$> getRequest + getParams <- liftHandlerT $ queryToQueryText . Wai.queryString . reqWaiRequest <$> getRequest + let + tblLink :: (QueryText -> QueryText) -> Text + tblLink f = decodeUtf8 . toStrict . Builder.toLazyByteString . renderQueryText True $ (f . substPi . setParam "_hasdata" Nothing) getParams + substPi = foldr (.) id + [ setParams (wIdent "sorting") . map toPathPiece $ fromMaybe [] piSorting + , foldr (.) id . map (\k -> setParams (wIdent $ toPathPiece k) . fromMaybe [] . join $ traverse (Map.lookup k) piFilter) $ Map.keys dbtFilter + , setParam (wIdent "pagesize") $ fmap toPathPiece piLimit + , setParam (wIdent "page") $ fmap toPathPiece piPage + , setParam (wIdent "pagination") Nothing + ] - let - tblLink f = decodeUtf8 . Builder.toLazyByteString . renderQueryText True $ f getParams + let + rowCount + | (E.Value n, _, _):_ <- rows' = n + | otherwise = 0 - genHeaders SortableP{..} = forM (toSortable . oneColonnadeHead <$> getColonnade dbtColonnade) $ \Sortable{..} -> do - widget <- sortableContent ^. cellContents - let - directions = [dir | (k, dir) <- psSorting, Just k == sortableKey ] - isSortable = isJust sortableKey - isSorted = (`elem` directions) - attrs = sortableContent ^. cellAttrs - return $(widgetFile "table/cell/header") + rawAction = tblLink + $ setParam (wIdent "sorting") Nothing + . setParam (wIdent "pagesize") Nothing + . setParam (wIdent "page") Nothing + . setParam (wIdent "pagination") Nothing - columnCount :: Int64 - columnCount = olength64 $ getColonnade dbtColonnade + table' :: WriterT x m Widget + table' = do + let + genHeaders SortableP{..} = forM (toSortable . oneColonnadeHead <$> getColonnade dbtColonnade) $ \Sortable{..} -> do + widget <- sortableContent ^. cellContents + let + directions = [dir | SortingSetting k dir <- psSorting, Just k == sortableKey ] + isSortable = isJust sortableKey + isSorted = (`elem` directions) + attrs = sortableContent ^. cellAttrs + return $(widgetFile "table/cell/header") - wHeaders <- maybe (return Nothing) (fmap Just . genHeaders) pSortable + columnCount :: Int64 + columnCount = olength64 $ getColonnade dbtColonnade - wRows <- forM rows $ \row -> forM (oneColonnadeEncode <$> getColonnade dbtColonnade) $ \(($ row) -> cell) -> do - widget <- cell ^. cellContents - let attrs = cell ^. cellAttrs - return $(widgetFile "table/cell/body") - - let table = $(widgetFile "table/colonnade") - pageCount = max 1 . ceiling $ rowCount % psLimit - pageNumbers = [0..pred pageCount] + wHeaders <- maybe (return Nothing) (fmap Just . genHeaders) pSortable - return $(widgetFile "table/layout") + wRows <- forM rows $ \row' -> forM (oneColonnadeEncode <$> getColonnade dbtColonnade) $ \(($ row') -> cell') -> do + widget <- cell' ^. cellContents + let attrs = cell' ^. cellAttrs + return $(widgetFile "table/cell/body") - bool (dbHandler dbtable $ \table -> $(widgetFile "table/layout-wrapper")) (sendResponse <=< tblLayout <=< dbWidget dbtable) psShortcircuit <=< runDBTable . fmap swap $ runWriterT table' + return $(widgetFile "table/colonnade") + + pageCount + | PagesizeLimit l <- psLimit + = max 1 . ceiling $ rowCount % l + | otherwise + = 1 + pageNumbers = [0..pred pageCount] + + uiLayout table = dbsFilterLayout filterWdgt filterEnc rawAction $(widgetFile "table/layout") + + dbInvalidateResult' = foldr (<=<) return . catMaybes $ + [ do + pKeys <- previousKeys + guard $ pKeys /= currentKeys + return . dbInvalidateResult dbtParams . DBTIRowsMissing $ length previousKeys - length currentKeys + ] + + dbInvalidateResult' <=< bool (dbHandler (Proxy @m) (Proxy @x) $ (\table -> $(widgetFile "table/layout-wrapper")) . uiLayout) (sendResponse <=< tblLayout . uiLayout <=< dbWidget (Proxy @m) (Proxy @x)) psShortcircuit <=< runDBTable dbtable paginationInput currentKeys . fmap swap $ runWriterT table' where tblLayout :: forall m'. (MonadHandler m', HandlerSite m' ~ UniWorX) => Widget -> m' Html tblLayout tbl' = do tbl <- liftHandlerT $ widgetToPageContent tbl' withUrlRenderer $(hamletFile "templates/table/layout-standalone.hamlet") + setParams :: Text -> [Text] -> QueryText -> QueryText + setParams key vs qt = map ((key, ) . Just) vs ++ [ i | i@(key', _) <- qt, key' /= key ] + setParam :: Text -> Maybe Text -> QueryText -> QueryText - setParam key v qt = (key, v) : [ i | i@(key', _) <- qt, key' /= key ] + setParam key = setParams key . maybeToList dbTableWidget :: Monoid x => PSValidator (HandlerT UniWorX IO) x -> DBTable (HandlerT UniWorX IO) x - -> Handler (DBResult (HandlerT UniWorX IO) x) + -> DB (DBResult (HandlerT UniWorX IO) x) dbTableWidget = dbTable -dbTableWidget' :: PSValidator (HandlerT UniWorX IO) () -> DBTable (HandlerT UniWorX IO) () -> Handler Widget +dbTableWidget' :: PSValidator (HandlerT UniWorX IO) () -> DBTable (HandlerT UniWorX IO) () -> DB Widget dbTableWidget' = fmap (fmap snd) . dbTable widgetColonnade :: (Headedness h, Monoid x) @@ -480,6 +760,25 @@ dbColonnade :: (Headedness h, Monoid x) -> Colonnade h r (DBCell (ReaderT SqlBackend (HandlerT UniWorX IO)) x) dbColonnade = id +pagesizeOptions :: PagesizeLimit -- ^ Current/previous value + -> NonNull [PagesizeLimit] +pagesizeOptions psLim = impureNonNull . Set.toAscList . Set.fromList $ psLim : PagesizeAll : map PagesizeLimit opts + where + opts :: [Int64] + opts = filter (> 0) $ opts' <> map (`div` 2) opts' + + opts' = [ 10^n | n <- [1..3]] + +pagesizeField :: PagesizeLimit -> Field Handler PagesizeLimit +pagesizeField psLim = selectField $ do + MsgRenderer mr <- getMsgRenderer + let + optText (PagesizeLimit l) = tshow l + optText PagesizeAll = mr MsgDBTablePagesizeAll + + toOptionList = flip OptionList fromPathPiece . map (\o -> Option (optText o) o $ toPathPiece o) + return . toOptionList . toNullable $ pagesizeOptions psLim + --- DBCell utility functions @@ -487,7 +786,7 @@ cell :: IsDBTable m a => Widget -> DBCell m a cell wgt = dbCell # ([], return wgt) textCell, stringCell :: (MonoFoldable msg, Element msg ~ Char, IsDBTable m a) => msg -> DBCell m a -textCell = cell . toWidget . (pack :: [Char] -> Text) . otoList +textCell = cell . toWidget . (pack :: String -> Text) . otoList stringCell = textCell i18nCell :: (RenderMessage UniWorX msg, IsDBTable m a) => msg -> DBCell m a @@ -499,6 +798,15 @@ tickmarkCell :: (IsDBTable m a) => Bool -> DBCell m a tickmarkCell True = textCell (tickmark :: Text) tickmarkCell False = mempty +cellTooltip :: (RenderMessage UniWorX msg, IsDBTable m a) => msg -> DBCell m a -> DBCell m a +cellTooltip msg = cellContents.mapped %~ (<> tipWdgt) + where + tipWdgt = [whamlet| + + + _{msg} + |] + anchorCell :: IsDBTable m a => Route UniWorX -> Widget -> DBCell m a anchorCell = anchorCellM . return @@ -510,10 +818,10 @@ anchorCell' :: IsDBTable m a -> (r -> DBCell m a) anchorCell' mkRoute mkWidget val = anchorCell (mkRoute val) (mkWidget val) -anchorCellM :: IsDBTable m a => (WidgetT UniWorX IO (Route UniWorX)) -> Widget -> DBCell m a +anchorCellM :: IsDBTable m a => WidgetT UniWorX IO (Route UniWorX) -> Widget -> DBCell m a anchorCellM routeM widget = anchorCellM' routeM id (const widget) -anchorCellM' :: IsDBTable m a => (WidgetT UniWorX IO x) -> (x -> Route UniWorX) -> (x -> Widget) -> DBCell m a +anchorCellM' :: IsDBTable m a => WidgetT UniWorX IO x -> (x -> Route UniWorX) -> (x -> Widget) -> DBCell m a anchorCellM' xM x2route x2widget = cell $ do x <- xM let route = x2route x @@ -530,37 +838,52 @@ listCell xs mkCell = review dbCell . ([], ) $ do \(view dbCell . mkCell -> (attrs, mkWidget)) -> (attrs, ) <$> mkWidget return $(widgetFile "table/cell/list") -newtype DBFormResult r i a = DBFormResult (Map i (r, a -> a)) +newtype DBFormResult i a r = DBFormResult (Map i (r, a -> a)) -instance Ord i => Monoid (DBFormResult r i a) where +instance Functor (DBFormResult i a) where + f `fmap` (DBFormResult resMap) = DBFormResult $ fmap (over _1 f) resMap + +instance Ord i => Monoid (DBFormResult i a r) where mempty = DBFormResult Map.empty (DBFormResult m1) `mappend` (DBFormResult m2) = DBFormResult $ Map.unionWith (\(r, f1) (_, f2) -> (r, f2 . f1)) m1 m2 -getDBFormResult :: forall r i a. Ord i => (r -> a) -> DBFormResult r i a -> Map i a +getDBFormResult :: forall r i a. Ord i => (r -> a) -> DBFormResult i a r -> Map i a getDBFormResult initial (DBFormResult m) = Map.map (\(r, f) -> f $ initial r) m -formCell :: forall r i a. Ord i - => (r -> MForm (HandlerT UniWorX IO) i) - -> (r -> i -> MForm (HandlerT UniWorX IO) (FormResult (a -> a), Widget)) - -> (r -> DBCell ((RWST (Maybe (Env, FileEnv), UniWorX, [Lang]) Enctype Ints (HandlerT UniWorX IO))) (FormResult (DBFormResult r i a))) -formCell genIndex genForm input = FormCell +formCell :: forall res r i a. (Ord i, Monoid res) + => Lens' res (FormResult (DBFormResult i a (DBRow r))) + -> (DBRow r -> MForm (HandlerT UniWorX IO) i) + -> (DBRow r -> (forall p. PathPiece p => p -> Text) -> MForm (HandlerT UniWorX IO) (FormResult (a -> a), Widget)) -- ^ Given the row data and a callback to make an input name suitably unique generate the `MForm` + -> (DBRow r -> DBCell (MForm (HandlerT UniWorX IO)) res) +formCell formCellLens genIndex genForm input@(DBRow{dbrKey}) = FormCell { formCellAttrs = [] , formCellContents = do -- MForm (HandlerT UniWorX IO) (FormResult (Map i (Endo a)), Widget) - i <- genIndex input - (edit, w) <- genForm input i + i <- lift $ genIndex input + hashKey <- LBS.toStrict . B.encode <$> cryptoIDKey return + let + mkUnique :: PathPiece p => p -> Text + mkUnique (toPathPiece -> name) = name <> "-" <> decodeUtf8 (Base64.encode rowKeyHash) + where + rowKeyHash = (BA.convert :: HMAC (SHAKE256 264) -> ByteString) . hmac hashKey . LBS.toStrict $ B.encode dbrKey + (edit, w) <- lift $ genForm input mkUnique return (DBFormResult . Map.singleton i . (input,) <$> edit, w) + , formCellLens } -- Predefined colonnades +--Number column? dbRow :: forall h r m a. (Headedness h, IsDBTable m a) => Colonnade h (DBRow r) (DBCell m a) dbRow = Colonnade.singleton (headednessPure $ i18nCell MsgNrColumn) $ \DBRow{ dbrIndex } -> textCell $ tshow dbrIndex -dbSelect :: forall h r i a. (Headedness h, Ord i, PathPiece i) - => Setter' a Bool - -> (r -> MForm (HandlerT UniWorX IO) i) - -> Colonnade h r (DBCell ((RWST (Maybe (Env, FileEnv), UniWorX, [Lang]) Enctype Ints (HandlerT UniWorX IO))) (FormResult (DBFormResult r i a))) -dbSelect resLens genIndex = Colonnade.singleton (headednessPure $ i18nCell MsgSelectColumn) $ \r -> flip (formCell genIndex) r $ \_ i -> do - (selResult, selWidget) <- mreq checkBoxField ("" { fsName = Just $ "select-" <> toPathPiece i }) (Just False) - return (set resLens <$> selResult, [whamlet|^{fvInput selWidget}|]) +dbSelect :: forall res h r i a. (Headedness h, Ord i, PathPiece i, Monoid res) + => Lens' res (FormResult (DBFormResult i a (DBRow r))) + -> Setter' a Bool + -> (DBRow r -> MForm (HandlerT UniWorX IO) i) + -> Colonnade h (DBRow r) (DBCell (MForm (HandlerT UniWorX IO)) res) +dbSelect resLens selLens genIndex = Colonnade.singleton (headednessPure $ i18nCell MsgSelectColumn) $ formCell resLens genIndex genForm + where + genForm _ mkUnique = do + (selResult, selWidget) <- mreq checkBoxField (fsUniq mkUnique "select") (Just False) + return (set selLens <$> selResult, [whamlet|^{fvInput selWidget}|]) diff --git a/src/Handler/Utils/Table/Pagination/Types.hs b/src/Handler/Utils/Table/Pagination/Types.hs index 0a0b6c1c2..44648cf21 100644 --- a/src/Handler/Utils/Table/Pagination/Types.hs +++ b/src/Handler/Utils/Table/Pagination/Types.hs @@ -1,10 +1,15 @@ -{-# LANGUAGE NoImplicitPrelude - , ExistentialQuantification - , RankNTypes - , RecordWildCards - #-} +{-# LANGUAGE GeneralizedNewtypeDeriving #-} -module Handler.Utils.Table.Pagination.Types where +module Handler.Utils.Table.Pagination.Types + ( FilterKey, SortingKey + , Sortable(..) + , sortable + , ToSortable(..) + , SortableP(..) + , SqlIn(..) + , sqlInTuples + , DBTableInvalid(..) + ) where import Import hiding (singleton) @@ -13,12 +18,30 @@ import Colonnade.Encode import Data.CaseInsensitive (CI) +import Data.Aeson (FromJSON, ToJSON, FromJSONKey, ToJSONKey) + +import qualified Database.Esqueleto as E +import qualified Database.Esqueleto.Internal.Sql as E (SqlSelect) + +import Language.Haskell.TH + +import Data.List (foldr1, foldl) + + +newtype FilterKey = FilterKey { _unFilterKey :: CI Text } + deriving (Show, Read, Generic) + deriving newtype (Ord, Eq, PathPiece, IsString, FromJSON, ToJSON, FromJSONKey, ToJSONKey) +newtype SortingKey = SortingKey { _unSortingKey :: CI Text } + deriving (Show, Read, Generic) + deriving newtype (Ord, Eq, PathPiece, IsString, FromJSON, ToJSON, FromJSONKey, ToJSONKey) + + data Sortable a = Sortable - { sortableKey :: Maybe (CI Text) + { sortableKey :: Maybe SortingKey , sortableContent :: a } -sortable :: Maybe (CI Text) -> c -> (a -> c) -> Colonnade Sortable a c +sortable :: Maybe SortingKey -> c -> (a -> c) -> Colonnade Sortable a c sortable k h = singleton (Sortable k h) instance Headedness Sortable where @@ -42,3 +65,43 @@ instance ToSortable Headed where instance ToSortable Headless where pSortable = Nothing + + +class E.SqlSelect a r => SqlIn a r | a -> r, r -> a where + sqlIn :: a -> [r] -> E.SqlExpr (E.Value Bool) + +instance PersistField a => SqlIn (E.SqlExpr (E.Value a)) (E.Value a) where + x `sqlIn` xs = x `E.in_` E.valList (map E.unValue xs) + +sqlInTuples :: [Int] -> DecsQ +sqlInTuples = mapM sqlInTuple + +sqlInTuple :: Int -> DecQ +sqlInTuple arity = do + tyVars <- replicateM arity $ newName "t" + vVs <- replicateM arity $ newName "v" + xVs <- replicateM arity $ newName "x" + xsV <- newName "xs" + + let + matchE = lam1E (tupP $ map (\vV -> conP 'E.Value [varP vV]) vVs) (foldr1 (\e1 e2 -> [e|$(e1) E.&&. $(e2)|]) . map (\(varE -> vE, varE -> xE) -> [e|E.val $(vE) E.==. $(xE)|]) $ zip vVs xVs) + tupTy f = foldl (\typ v -> typ `appT` f (varT v)) (tupleT arity) tyVars + + instanceD (cxt $ map (\v -> [t|PersistField $(varT v)|]) tyVars) [t|SqlIn $(tupTy $ \v -> [t|E.SqlExpr (E.Value $(v))|]) $(tupTy $ \v -> [t|E.Value $(v)|])|] + [ funD 'sqlIn + [ clause [tupP $ map varP xVs, varP xsV] + ( guardedB + [ normalGE [e|null $(varE xsV)|] [e|E.val False|] + , normalGE [e|otherwise|] [e|foldr1 (E.||.) $ map $(matchE) $(varE xsV)|] + ] + ) [] + ] + ] + + +data DBTableInvalid = DBTIRowsMissing Int + deriving (Eq, Ord, Read, Show, Generic, Typeable) + +instance Exception DBTableInvalid + +embedRenderMessage ''UniWorX ''DBTableInvalid id diff --git a/src/Handler/Utils/Templates.hs b/src/Handler/Utils/Templates.hs index d23e6b31e..ef584c19b 100644 --- a/src/Handler/Utils/Templates.hs +++ b/src/Handler/Utils/Templates.hs @@ -1,30 +1,30 @@ -{-# LANGUAGE NoImplicitPrelude, TemplateHaskell, QuasiQuotes #-} - module Handler.Utils.Templates where import Data.Either (isLeft) import Import -modal :: WidgetT UniWorX IO () -> Either (Route UniWorX) (WidgetT UniWorX IO ()) -> WidgetT UniWorX IO () +modal :: WidgetT site IO () -> Either (SomeRoute site) (WidgetT site IO ()) -> WidgetT site IO () modal modalTrigger modalContent = do let modalDynamic = isLeft modalContent modalId <- newIdent triggerId <- newIdent $(widgetFile "widgets/modal") case modalContent of - -- TODO: refactor this. preferably put svg in separte file somewhere in static? - Left route -> [whamlet| - $newline never - - - - ^{modalTrigger} - |] - Right _ -> [whamlet| - $newline never - - - - ^{modalTrigger} - |] + Left route -> do + route' <- toTextUrl route + [whamlet| + $newline never + + + + ^{modalTrigger} + |] + Right _ -> do + [whamlet| + $newline never + + + + ^{modalTrigger} + |] diff --git a/src/Handler/Utils/Zip.hs b/src/Handler/Utils/Zip.hs index fb196c933..fd98ab67b 100644 --- a/src/Handler/Utils/Zip.hs +++ b/src/Handler/Utils/Zip.hs @@ -1,7 +1,3 @@ -{-# LANGUAGE NoImplicitPrelude #-} -{-# LANGUAGE RecordWildCards #-} -{-# LANGUAGE OverloadedStrings #-} -{-# LANGUAGE DeriveGeneric, DeriveDataTypeable #-} {-# OPTIONS_GHC -fno-warn-missing-fields #-} -- This concerns zipEntrySize in produceZip {-# OPTIONS_GHC -fno-warn-orphans #-} @@ -61,7 +57,7 @@ consumeZip = unZipStream `fuseUpstream` consumeZip' fileContent | hasTrailingPathSeparator zipEntryName = Nothing | otherwise = Just $ mconcat contentChunks - yield $ File{..} + yield File{..} consumeZip' accContents :: Monad m => Sink (Either a b) m [b] accContents = do @@ -85,7 +81,7 @@ produceZip info = mapC toZipData =$= void (zipStream zipOptions) } toZipData :: Monad m => File -> (ZipEntry, ZipData m) - toZipData f@(File{..}) = ((toZipEntry f){ zipEntrySize = fromIntegral . ByteString.length <$> fileContent }, maybe mempty (ZipDataByteString . Lazy.ByteString.fromStrict) fileContent) + toZipData f@File{..} = ((toZipEntry f){ zipEntrySize = fromIntegral . ByteString.length <$> fileContent }, maybe mempty (ZipDataByteString . Lazy.ByteString.fromStrict) fileContent) toZipEntry :: File -> ZipEntry toZipEntry File{..} = ZipEntry diff --git a/src/Import.hs b/src/Import.hs index cdb0ec16f..27dc6e5df 100644 --- a/src/Import.hs +++ b/src/Import.hs @@ -5,3 +5,4 @@ module Import import Foundation as Import import Import.NoFoundation as Import +import Utils.SystemMessage as Import diff --git a/src/Import/NoFoundation.hs b/src/Import/NoFoundation.hs index 8db4ec779..1f1220787 100644 --- a/src/Import/NoFoundation.hs +++ b/src/Import/NoFoundation.hs @@ -1,18 +1,22 @@ -{-# LANGUAGE CPP #-} module Import.NoFoundation ( module Import + , MForm ) where -import ClassyPrelude.Yesod as Import hiding (formatTime, derivePersistFieldJSON, addMessage, addMessageI) +import ClassyPrelude.Yesod as Import hiding (formatTime, derivePersistFieldJSON, addMessage, addMessageI, (.=), MForm, Proxy, foldlM, static) import Model as Import import Model.Types.JSON as Import import Model.Migration as Import +import Model.Rating as Import +import Model.Submission as Import import Settings as Import import Settings.StaticFiles as Import import Yesod.Auth as Import import Yesod.Core.Types as Import (loggerSet) import Yesod.Default.Config2 as Import import Utils as Import +import Yesod.Core.Json as Import (provideJson) +import Yesod.Core.Types.Instances as Import () import Data.Fixed as Import @@ -25,3 +29,39 @@ import Text.Lucius as Import import Text.Shakespeare.Text as Import hiding (text, stext) import Data.Universe as Import +import Data.Pool as Import (Pool) +import Network.HaskellNet.SMTP as Import (SMTPConnection) + +import Mail as Import + +import Data.Data as Import (Data) +import Data.Typeable as Import (Typeable) +import GHC.Generics as Import (Generic) +import GHC.Exts as Import (IsList) + +import Data.Hashable as Import +import Data.List.NonEmpty as Import (NonEmpty(..)) +import Data.Text.Encoding.Error as Import(UnicodeException(..)) +import Data.Semigroup as Import (Semigroup) +import Data.Monoid as Import (Last(..), First(..)) +import Data.Monoid.Instances as Import () + +import Data.Binary as Import (Binary) + +import Control.Monad.Morph as Import (MFunctor(..)) + +import Control.Monad.Trans.Resource as Import (ReleaseKey) + +import Network.Mail.Mime.Instances as Import () +import Yesod.Core.Instances as Import () + +import Ldap.Client.Pool as Import + +import Database.Esqueleto.Instances as Import () +import Database.Persist.Sql.Instances as Import () +import Database.Persist.Sql as Import (SqlReadT,SqlWriteT) + + +import Control.Monad.Trans.RWS (RWST) + +type MForm m = RWST (Maybe (Env, FileEnv), HandlerSite m, [Lang]) Enctype Ints m diff --git a/src/Jobs.hs b/src/Jobs.hs new file mode 100644 index 000000000..2a9a42556 --- /dev/null +++ b/src/Jobs.hs @@ -0,0 +1,331 @@ +module Jobs + ( module Types + , module Jobs.Queue + , handleJobs + , stopJobCtl + ) where + +import Import + +import Jobs.Types as Types hiding (JobCtl(JobCtlQueue)) +import Jobs.Types (JobCtl(JobCtlQueue)) +import Jobs.Queue +import Jobs.Crontab + +import Data.Conduit.TMChan +import qualified Data.Conduit.List as C + +import qualified Data.Text.Lazy as LT + +import Data.Aeson (fromJSON, toJSON) +import qualified Data.Aeson as Aeson +import qualified Data.Aeson.Types as Aeson +import Database.Persist.Sql (fromSqlKey) + +import Data.Semigroup (Max(..)) + +import Utils.Sql + +import Control.Monad.Random (evalRand, mkStdGen, getRandomR) + +import Cron +import qualified Data.HashMap.Strict as HashMap +import Data.HashMap.Strict (HashMap) + +import qualified Data.List.NonEmpty as NonEmpty + +import qualified Data.Map.Strict as Map + +import Data.Foldable (foldrM) + +import Control.Monad.Trans.Reader (mapReaderT) +import Control.Monad.Trans.State (evalStateT, mapStateT) +import qualified Control.Monad.State.Class as State +import Control.Monad.Reader.Class (MonadReader(..)) +import Control.Monad.Trans.Resource (MonadResourceBase, runResourceT, allocate, release) +import Control.Monad.Trans.Maybe (MaybeT(..)) +import Control.Monad.Logger + +import Data.Time.Clock +import Data.Time.Zones + +import Control.Concurrent.STM (retry) + + +import Jobs.Handler.SendNotification +import Jobs.Handler.SendTestEmail +import Jobs.Handler.QueueNotification +import Jobs.Handler.HelpRequest +import Jobs.Handler.SetLogSettings +import Jobs.Handler.DistributeCorrections + + +data JobQueueException = JInvalid QueuedJobId QueuedJob + | JLocked QueuedJobId InstanceId UTCTime + | JNonexistant QueuedJobId + deriving (Read, Show, Eq, Generic, Typeable) + +instance Exception JobQueueException + + +handleJobs :: ( MonadResource m + , MonadIO m + ) + => UniWorX -> m () +-- | Spawn a set of workers that read control commands from `appJobCtl` and address them as they come in +-- +-- Uses `unsafeHandler`, as per documentation all HTTP-related fields of state/environment are meaningless placeholders. +-- Handling commands in `HandlerT` provides us with the facilities to render urls, unifies logging, provides a value of the foundation type, ... +handleJobs foundation@UniWorX{..} = do + let num = appJobWorkers appSettings + + jobCrontab <- liftIO $ newTMVarIO HashMap.empty + jobConfirm <- liftIO $ newTVarIO HashMap.empty + + forM_ [1..num] $ \n -> do + (bChan, chan) <- atomically $ newBroadcastTMChan >>= (\c -> (c, ) <$> dupTMChan c) + let + logStart = $logDebugS ("Jobs #" <> tshow n) "Starting" + logStop = $logDebugS ("Jobs #" <> tshow n) "Stopping" + removeChan = atomically . modifyTVar' appJobCtl . Map.delete =<< myThreadId + doFork = flip forkFinally (\_ -> removeChan) . unsafeHandler foundation . bracket_ logStart logStop . flip runReaderT JobContext{..} . runConduit $ sourceTMChan chan .| handleJobs' n + (_, tId) <- allocate (liftIO doFork) (\_ -> liftIO . atomically $ closeTMChan chan) + atomically . modifyTVar' appJobCtl $ Map.insert tId bChan + + -- Start cron operation + registeredCron <- liftIO newEmptyTMVarIO + let execCrontab' = whenM (atomically $ readTMVar registeredCron) $ + unsafeHandler foundation $ runReaderT execCrontab JobContext{..} + unregister = atomically . whenM (fromMaybe False <$> tryReadTMVar registeredCron) . void $ tryTakeTMVar appCronThread + cData <- allocate (liftIO . forkFinally execCrontab' $ \_ -> unregister) (\_ -> liftIO . atomically . void $ tryTakeTMVar jobCrontab) + registeredCron' <- atomically $ do + registeredCron' <- tryPutTMVar appCronThread cData + registeredCron' <$ putTMVar registeredCron registeredCron' + when registeredCron' $ + liftIO . unsafeHandler foundation . flip runReaderT JobContext{..} $ + writeJobCtlBlock JobCtlDetermineCrontab + +stopJobCtl :: MonadIO m => UniWorX -> m () +-- ^ Stop all worker threads currently running +stopJobCtl UniWorX{appJobCtl, appCronThread} = do + mcData <- atomically $ tryReadTMVar appCronThread + whenIsJust mcData $ \(rKey, _) -> do + liftIO $ release rKey + atomically . guardM $ isEmptyTMVar appCronThread + + wMap <- liftIO $ readTVarIO appJobCtl + atomically $ forM_ wMap closeTMChan + atomically $ do + wMap' <- readTVar appJobCtl + guard . none (`Map.member` wMap') $ Map.keysSet wMap + + +execCrontab :: ReaderT JobContext (HandlerT UniWorX IO) () +-- ^ Keeping a `HashMap` of the latest execution times of `JobCtl`s we have +-- seen, wait for the time of the next job and fire it +execCrontab = evalStateT go HashMap.empty + where + go = do + mapStateT (liftHandlerT . runDB . setSerializable) $ do + let + merge (Entity leId CronLastExec{..}) + | Just job <- Aeson.parseMaybe parseJSON cronLastExecJob + = State.modify $ HashMap.insertWith (<>) (JobCtlQueue job) (Max cronLastExecTime) + | otherwise = lift $ delete leId + runConduit $ transPipe lift (selectSource [] []) .| C.mapM_ merge + + refT <- liftIO getCurrentTime + settings <- getsYesod appSettings + currentState <- mapStateT (mapReaderT $ liftIO . atomically) $ do + crontab' <- liftBase . tryReadTMVar =<< asks jobCrontab + case crontab' of + Nothing -> return Nothing + Just crontab -> Just <$> do + State.modify . HashMap.filterWithKey $ \k _ -> HashMap.member k crontab + prevExec <- State.get + case earliestJob settings prevExec crontab refT of + Nothing -> liftBase retry + Just (_, MatchNone) -> liftBase retry + Just x -> return (crontab, x) + + case currentState of + Nothing -> return () + Just (currentCrontab, (jobCtl, nextMatch)) -> do + let doJob = mapStateT (mapReaderT $ liftHandlerT . runDBJobs . setSerializable) $ do + newCrontab <- lift . lift . hoist lift $ determineCrontab' + if + | ((==) `on` HashMap.lookup jobCtl) newCrontab currentCrontab + -> do + now <- liftIO $ getCurrentTime + instanceID <- getsYesod appInstanceID + State.modify $ HashMap.alter (Just . ($ Max now) . maybe id (<>)) jobCtl + case jobCtl of + JobCtlQueue job -> do + void . lift . lift $ upsertBy + (UniqueCronLastExec $ toJSON job) + CronLastExec + { cronLastExecJob = toJSON job + , cronLastExecTime = now + , cronLastExecInstance = instanceID + } + [ CronLastExecTime =. now ] + lift . lift $ queueDBJob job + other -> writeJobCtl other + | otherwise + -> lift . mapReaderT (liftIO . atomically) $ + lift . void . flip swapTMVar newCrontab =<< asks jobCrontab + + case nextMatch of + MatchAsap -> doJob + MatchNone -> return () + MatchAt nextTime -> do + JobContext{jobCrontab} <- ask + nextTime' <- applyJitter jobCtl nextTime + $logDebugS "Cron" [st|Waiting until #{tshow (utcToLocalTimeTZ appTZ nextTime')} to execute #{tshow jobCtl}|] + logFunc <- askLoggerIO + whenM (liftIO . flip runLoggingT logFunc $ waitUntil jobCrontab currentCrontab nextTime') + doJob + + go + where + acc :: NominalDiffTime + acc = 1e-3 + + debouncingAcc :: AppSettings -> JobCtl -> NominalDiffTime + debouncingAcc AppSettings{appNotificationRateLimit} = \case + JobCtlQueue (JobQueueNotification _) -> appNotificationRateLimit + _ -> acc + + applyJitter :: (MonadHandler m, HandlerSite m ~ UniWorX, Hashable seed) => seed -> UTCTime -> m UTCTime + applyJitter seed t = do + appInstance <- getsYesod appInstanceID + let + halfRange = truncate $ 0.5 / acc + diff = evalRand ( (* acc) . fromInteger <$> getRandomR (- halfRange, halfRange)) $ mkStdGen (hash appInstance `hashWithSalt` seed) + return $ addUTCTime diff t + + earliestJob :: AppSettings -> HashMap JobCtl (Max UTCTime) -> Crontab JobCtl -> UTCTime -> Maybe (JobCtl, CronNextMatch UTCTime) + earliestJob settings lastTimes crontab now = foldr go' Nothing $ HashMap.toList crontab + where + go' (jobCtl, cron) mbPrev + | Just (_, t') <- mbPrev + , t' < t + = mbPrev + | otherwise + = Just (jobCtl, t) + where + t = nextCronMatch appTZ (getMax <$> HashMap.lookup jobCtl lastTimes) (debouncingAcc settings jobCtl) now cron + + waitUntil :: (Eq a, MonadResourceBase m, MonadLogger m) => TMVar a -> a -> UTCTime -> m Bool + waitUntil crontabTV crontab nextTime = runResourceT $ do + diffT <- diffUTCTime nextTime <$> liftIO getCurrentTime + let waitTime = fromInteger (truncate $ diffT / acc) * toRational acc + waitTime' + | diffT < acc = "Done" + | otherwise = tshow (realToFrac waitTime :: NominalDiffTime) + $logDebugS "waitUntil" [st|#{tshow diffT} (#{waitTime'})|] + if + | diffT < acc -> return True + | otherwise -> do + retVar <- liftIO newEmptyTMVarIO + void . liftIO . forkFinally (threadDelay . round $ waitTime * 1e6) $ atomically . putTMVar retVar + let + awaitDelayThread = False <$ takeTMVar retVar + awaitCrontabChange = do + crontab' <- tryReadTMVar crontabTV + True <$ guard (Just crontab /= crontab') + crontabChanged <- liftIO . atomically $ awaitCrontabChange <|> awaitDelayThread + bool (waitUntil crontabTV crontab nextTime) (return False) crontabChanged + + +handleJobs' :: Natural -> Sink JobCtl (ReaderT JobContext Handler) () +handleJobs' wNum = C.mapM_ $ \jctl -> do + $logDebugS logIdent $ tshow jctl + resVars <- mapReaderT (liftIO . atomically) $ + HashMap.lookup jctl <$> (lift . readTVar =<< asks jobConfirm) + res <- fmap (either Just $ const Nothing) . try $ handleCmd jctl + sentRes <- liftIO . atomically $ foldrM (\resVar -> bool (tryPutTMVar resVar res) $ return True) False (maybe [] NonEmpty.toList resVars) + case res of + Just err + | not sentRes -> $logErrorS logIdent $ tshow err + _other -> return () + where + logIdent = "Jobs #" <> tshow wNum + + handleQueueException :: MonadLogger m => JobQueueException -> m () + handleQueueException (JInvalid jId j) = $logWarnS logIdent $ "Invalid QueuedJob (#" ++ tshow (fromSqlKey jId) ++ "): " ++ tshow j + handleQueueException (JNonexistant jId) = $logInfoS logIdent $ "Saw nonexistant queue id: " ++ tshow (fromSqlKey jId) + handleQueueException (JLocked jId lInstance lTime) = $logDebugS logIdent $ "Saw locked QueuedJob: " ++ tshow (fromSqlKey jId, lInstance, lTime) + + handleCmd JobCtlFlush = void . lift . runDB . runConduit $ selectKeys [] [ Asc QueuedJobCreationTime ] .| C.mapM_ (writeJobCtl . JobCtlPerform) + handleCmd (JobCtlQueue job) = lift $ queueJob' job + handleCmd (JobCtlPerform jId) = lift . handle handleQueueException . jLocked jId $ \j@QueuedJob{..} -> do + content <- case fromJSON queuedJobContent of + Aeson.Success c -> return c + Aeson.Error t -> do + $logErrorS logIdent $ "Aeson decoding error: " <> pack t + throwM $ JInvalid jId j + + $logDebugS logIdent . LT.toStrict . decodeUtf8 $ Aeson.encode content + + performJob content + + -- `performJob` is expected to throw an exception if it detects that the job was not done + runDB $ delete jId + handleCmd JobCtlDetermineCrontab = do + newCTab <- liftHandlerT . runDB $ setSerializable determineCrontab' + -- logDebugS logIdent $ tshow newCTab + mapReaderT (liftIO . atomically) $ + lift . void . flip swapTMVar newCTab =<< asks jobCrontab + +jLocked :: QueuedJobId -> (QueuedJob -> Handler a) -> Handler a +jLocked jId act = do + hasLock <- liftIO $ newTVarIO False + + let + lock = runDB . setSerializable $ do + qj@QueuedJob{..} <- maybe (throwM $ JNonexistant jId) return =<< get jId + instanceID <- getsYesod appInstanceID + threshold <- getsYesod $ appJobStaleThreshold . appSettings + now <- liftIO getCurrentTime + hadStale <- maybeT (return False) $ do + lockTime <- MaybeT $ return queuedJobLockTime + lockInstance <- MaybeT $ return queuedJobLockInstance + if + | lockInstance == instanceID + , diffUTCTime now lockTime >= threshold + -> return True + | otherwise + -> throwM $ JLocked jId lockInstance lockTime + when hadStale . + $logWarnS "Jobs" $ "Ignored stale lock: " <> tshow qj + val <- updateGet jId [ QueuedJobLockInstance =. Just instanceID + , QueuedJobLockTime =. Just now + ] + liftIO . atomically $ writeTVar hasLock True + return val + + unlock = whenM (liftIO . atomically $ readTVar hasLock) $ + runDB . setSerializable $ + update jId [ QueuedJobLockInstance =. Nothing + , QueuedJobLockTime =. Nothing + ] + + bracket lock (const unlock) act + + +pruneLastExecs :: Crontab JobCtl -> DB () +pruneLastExecs crontab = runConduit $ selectSource [] [] .| C.mapM_ ensureCrontab + where + ensureCrontab (Entity leId CronLastExec{..}) + | Just job <- Aeson.parseMaybe parseJSON cronLastExecJob + , HashMap.member (JobCtlQueue job) crontab + = return () + | otherwise = delete leId + +determineCrontab' :: DB (Crontab JobCtl) +determineCrontab' = (\ct -> ct <$ pruneLastExecs ct) =<< determineCrontab + + +performJob :: Job -> HandlerT UniWorX IO () +performJob = $(dispatchTH ''Job) diff --git a/src/Jobs/Crontab.hs b/src/Jobs/Crontab.hs new file mode 100644 index 000000000..41b3441c6 --- /dev/null +++ b/src/Jobs/Crontab.hs @@ -0,0 +1,107 @@ +module Jobs.Crontab + ( determineCrontab + ) where + +import Import + +import qualified Data.HashMap.Strict as HashMap +import Jobs.Types + +import Data.Maybe (fromJust) +import qualified Data.Map as Map +import Data.Semigroup (Max(..)) + +import Data.Time +import Data.Time.Zones + +import Control.Monad.Trans.Writer (execWriterT) +import Control.Monad.Writer.Class (MonadWriter(..)) + +import qualified Data.Conduit.List as C + + +determineCrontab :: DB (Crontab JobCtl) +-- ^ Extract all future jobs from the database (sheet deadlines, ...) +determineCrontab = execWriterT $ do + AppSettings{..} <- getsYesod appSettings + + case appJobFlushInterval of + Just interval -> tell $ HashMap.singleton + JobCtlFlush + Cron + { cronInitial = CronAsap + , cronRepeat = CronRepeatScheduled CronAsap + , cronRateLimit = interval + , cronNotAfter = Right CronNotScheduled + } + Nothing -> return () + + tell $ HashMap.singleton + JobCtlDetermineCrontab + Cron + { cronInitial = CronAsap + , cronRepeat = CronRepeatScheduled CronAsap + , cronRateLimit = appJobCronInterval + , cronNotAfter = Right CronNotScheduled + } + + let + sheetJobs (Entity nSheet Sheet{..}) = do + tell $ HashMap.singleton + (JobCtlQueue $ JobQueueNotification NotificationSheetActive{..}) + Cron + { cronInitial = CronTimestamp $ utcToLocalTimeTZ appTZ sheetActiveFrom + , cronRepeat = CronRepeatNever + , cronRateLimit = appNotificationRateLimit + , cronNotAfter = Right . CronTimestamp $ utcToLocalTimeTZ appTZ sheetActiveTo + } + tell $ HashMap.singleton + (JobCtlQueue $ JobQueueNotification NotificationSheetSoonInactive{..}) + Cron + { cronInitial = CronTimestamp . utcToLocalTimeTZ appTZ . max sheetActiveFrom $ addUTCTime (-nominalDay) sheetActiveTo + , cronRepeat = CronRepeatOnChange -- Allow repetition of the notification (if something changes), but wait at least an hour + , cronRateLimit = appNotificationRateLimit + , cronNotAfter = Right . CronTimestamp $ utcToLocalTimeTZ appTZ sheetActiveTo + } + tell $ HashMap.singleton + (JobCtlQueue $ JobQueueNotification NotificationSheetInactive{..}) + Cron + { cronInitial = CronTimestamp $ utcToLocalTimeTZ appTZ sheetActiveTo + , cronRepeat = CronRepeatOnChange + , cronRateLimit = appNotificationRateLimit + , cronNotAfter = Left appNotificationExpiration + } + when sheetAutoDistribute $ + tell $ HashMap.singleton + (JobCtlQueue $ JobDistributeCorrections nSheet) + Cron + { cronInitial = CronTimestamp $ utcToLocalTimeTZ appTZ sheetActiveTo + , cronRepeat = CronRepeatNever + , cronRateLimit = 3600 -- Irrelevant due to `cronRepeat` + , cronNotAfter = Left nominalDay + } + + sheetSubmissions <- lift $ collateSubmissions <$> + selectList [SubmissionRatingBy !=. Nothing, SubmissionSheet ==. nSheet] [] + tell $ flip Map.foldMapWithKey sheetSubmissions $ + \nUser (Max mbTime) -> if + | Just time <- mbTime -> HashMap.singleton + (JobCtlQueue $ JobQueueNotification NotificationCorrectionsAssigned { nUser, nSheet } ) + Cron + { cronInitial = CronTimestamp $ utcToLocalTimeTZ appTZ $ addUTCTime appNotificationCollateDelay time + , cronRepeat = CronRepeatNever + , cronRateLimit = appNotificationRateLimit + , cronNotAfter = Left appNotificationExpiration + } + | otherwise -> mempty + + runConduit $ transPipe lift (selectSource [] []) .| C.mapM_ sheetJobs + +-- | Partial function: Submission must not have Nothing at ratingBy +collateSubmissions :: [Entity Submission] -> Map UserId (Max (Maybe UTCTime)) +collateSubmissions = Map.fromListWith (<>) . fmap procCorrector + where + procCorrector :: Entity Submission -> (UserId ,Max (Maybe UTCTime)) + procCorrector = (,) <$> fromJust . submissionRatingBy . entityVal + <*> Max . submissionRatingAssigned . entityVal + diff --git a/src/Jobs/Handler/DistributeCorrections.hs b/src/Jobs/Handler/DistributeCorrections.hs new file mode 100644 index 000000000..192c4dea3 --- /dev/null +++ b/src/Jobs/Handler/DistributeCorrections.hs @@ -0,0 +1,21 @@ +module Jobs.Handler.DistributeCorrections + ( dispatchJobDistributeCorrections + ) where + +import Import + +import Jobs.Queue + +import Control.Monad.Trans.Reader (mapReaderT) + +import Handler.Utils.Submission + +import qualified Data.Set as Set + + +dispatchJobDistributeCorrections :: SheetId + -> Handler () +dispatchJobDistributeCorrections jSheet = runDBJobs $ do + (_, unassigned) <- mapReaderT lift $ assignSubmissions jSheet Nothing + unless (Set.null unassigned) $ + queueDBJob . JobQueueNotification $ NotificationCorrectionsNotDistributed jSheet diff --git a/src/Jobs/Handler/HelpRequest.hs b/src/Jobs/Handler/HelpRequest.hs new file mode 100644 index 000000000..1ec904e2b --- /dev/null +++ b/src/Jobs/Handler/HelpRequest.hs @@ -0,0 +1,35 @@ +module Jobs.Handler.HelpRequest + ( dispatchJobHelpRequest + ) where + +import Import + +import Text.Hamlet +import qualified Data.CaseInsensitive as CI + +import Handler.Utils + +import Utils.Lens + +import Data.Bitraversable + + +dispatchJobHelpRequest :: Either (Maybe Address) UserId + -> UTCTime + -> Text -- ^ Help Request + -> Maybe Text -- ^ Referer + -> Handler () +dispatchJobHelpRequest jSender jRequestTime jHelpRequest jReferer = do + supportAddress <- getsYesod $ appMailSupport . appSettings + userInfo <- bitraverse return (runDB . getEntity) jSender + let userAddress = either + id + (fmap $ \(Entity _ User{..}) -> Address (Just userDisplayName) (CI.original userEmail)) + userInfo + mailT def $ do + _mailTo .= [supportAddress] + whenIsJust userAddress $ addMailHeader "Reply-To" . renderAddress + setSubjectI MsgMailSubjectSupport + setDate jRequestTime + rtime <- formatTimeMail SelFormatDateTime jRequestTime + addPart ($(ihamletFile "templates/mail/support.hamlet") :: HtmlUrlI18n UniWorXMessage (Route UniWorX)) diff --git a/src/Jobs/Handler/QueueNotification.hs b/src/Jobs/Handler/QueueNotification.hs new file mode 100644 index 000000000..8c9a759a9 --- /dev/null +++ b/src/Jobs/Handler/QueueNotification.hs @@ -0,0 +1,69 @@ +module Jobs.Handler.QueueNotification + ( dispatchJobQueueNotification + ) where + +import Import + +import Jobs.Types + +import qualified Database.Esqueleto as E +import Utils.Sql +import Jobs.Queue + + +dispatchJobQueueNotification :: Notification -> Handler () +dispatchJobQueueNotification jNotification = runDBJobs . setSerializable $ do + candidates <- hoist lift $ determineNotificationCandidates jNotification + nClass <- hoist lift $ classifyNotification jNotification + mapM_ (queueDBJob . flip JobSendNotification jNotification) $ do + Entity uid User{userNotificationSettings} <- candidates + guard $ notificationAllowed userNotificationSettings nClass + return uid + + +determineNotificationCandidates :: Notification -> DB [Entity User] +determineNotificationCandidates NotificationSubmissionRated{..} + = E.select . E.from $ \(user `E.InnerJoin` submissionUser) -> do + E.on $ user E.^. UserId E.==. submissionUser E.^. SubmissionUserUser + E.where_ $ submissionUser E.^. SubmissionUserSubmission E.==. E.val nSubmission + return user +determineNotificationCandidates NotificationSheetActive{..} + = E.select . E.from $ \(user `E.InnerJoin` courseParticipant `E.InnerJoin` sheet) -> do + E.on $ sheet E.^. SheetCourse E.==. courseParticipant E.^. CourseParticipantCourse + E.on $ user E.^. UserId E.==. courseParticipant E.^. CourseParticipantUser + E.where_ $ sheet E.^. SheetId E.==. E.val nSheet + return user +determineNotificationCandidates NotificationSheetSoonInactive{..} + = E.select . E.from $ \(user `E.InnerJoin` courseParticipant `E.InnerJoin` sheet) -> do + E.on $ sheet E.^. SheetCourse E.==. courseParticipant E.^. CourseParticipantCourse + E.on $ user E.^. UserId E.==. courseParticipant E.^. CourseParticipantUser + E.where_ $ sheet E.^. SheetId E.==. E.val nSheet + return user +determineNotificationCandidates NotificationSheetInactive{..} + = E.select . E.from $ \(user `E.InnerJoin` lecturer `E.InnerJoin` sheet) -> do + E.on $ lecturer E.^. LecturerCourse E.==. sheet E.^. SheetCourse + E.on $ lecturer E.^. LecturerUser E.==. user E.^. UserId + E.where_ $ sheet E.^. SheetId E.==. E.val nSheet + return user +determineNotificationCandidates NotificationCorrectionsAssigned{..} + = selectList [UserId ==. nUser] [] +determineNotificationCandidates NotificationCorrectionsNotDistributed{nSheet} + = E.select . E.from $ \(user `E.InnerJoin` lecturer `E.InnerJoin` sheet) -> do + E.on $ lecturer E.^. LecturerCourse E.==. sheet E.^. SheetCourse + E.on $ lecturer E.^. LecturerUser E.==. user E.^. UserId + E.where_ $ sheet E.^. SheetId E.==. E.val nSheet + return user + +classifyNotification :: Notification -> DB NotificationTrigger +classifyNotification NotificationSubmissionRated{..} = do + Sheet{sheetType} <- belongsToJust submissionSheet =<< getJust nSubmission + return $ case sheetType of + NotGraded -> NTSubmissionRated + _other -> NTSubmissionRatedGraded +classifyNotification NotificationSheetActive{} = return NTSheetActive +classifyNotification NotificationSheetSoonInactive{} = return NTSheetSoonInactive +classifyNotification NotificationSheetInactive{} = return NTSheetInactive +classifyNotification NotificationCorrectionsAssigned{} = return NTCorrectionsAssigned +classifyNotification NotificationCorrectionsNotDistributed{} = return NTCorrectionsNotDistributed + + diff --git a/src/Jobs/Handler/SendNotification.hs b/src/Jobs/Handler/SendNotification.hs new file mode 100644 index 000000000..547830603 --- /dev/null +++ b/src/Jobs/Handler/SendNotification.hs @@ -0,0 +1,18 @@ +module Jobs.Handler.SendNotification + ( dispatchJobSendNotification + ) where + +import Import + +import Jobs.Types + + +import Jobs.Handler.SendNotification.SubmissionRated +import Jobs.Handler.SendNotification.SheetActive +import Jobs.Handler.SendNotification.SheetInactive +import Jobs.Handler.SendNotification.CorrectionsAssigned +import Jobs.Handler.SendNotification.CorrectionsNotDistributed + + +dispatchJobSendNotification :: UserId -> Notification -> Handler () +dispatchJobSendNotification jRecipient jNotification = $(dispatchTH ''Notification) jNotification jRecipient diff --git a/src/Jobs/Handler/SendNotification/CorrectionsAssigned.hs b/src/Jobs/Handler/SendNotification/CorrectionsAssigned.hs new file mode 100644 index 000000000..51ec02f77 --- /dev/null +++ b/src/Jobs/Handler/SendNotification/CorrectionsAssigned.hs @@ -0,0 +1,32 @@ +{-# OPTIONS_GHC -fno-warn-unused-do-bind #-} -- ihamletFile discards do results + +module Jobs.Handler.SendNotification.CorrectionsAssigned + ( dispatchNotificationCorrectionsAssigned + ) where + +import Import + +import Handler.Utils.Mail + +import Text.Hamlet +import qualified Data.CaseInsensitive as CI + +dispatchNotificationCorrectionsAssigned :: UserId -> SheetId -> UserId -> Handler () +dispatchNotificationCorrectionsAssigned nUser nSheet jRecipient = do + (Course{..}, Sheet{..}, nbrSubs) <- liftHandlerT . runDB $ do + sheet <- getJust nSheet + course <- belongsToJust sheetCourse sheet + nbrSubs <- count [ SubmissionSheet ==. nSheet + , SubmissionRatingBy ==. Just nUser + , SubmissionRatingTime ==. Nothing + ] + return (course, sheet, nbrSubs) + when (nbrSubs > 0) . userMailT jRecipient $ do + setSubjectI $ MsgMailSubjectCorrectionsAssigned courseShorthand sheetName + + MsgRenderer mr <- getMailMsgRenderer + let termDesc = mr . ShortTermIdentifier $ unTermKey courseTerm + + addAlternatives $ do + let editNotifications = $(ihamletFile "templates/mail/editNotifications.hamlet") + providePreferredAlternative ($(ihamletFile "templates/mail/correctionsAssigned.hamlet") :: HtmlUrlI18n UniWorXMessage (Route UniWorX)) diff --git a/src/Jobs/Handler/SendNotification/CorrectionsNotDistributed.hs b/src/Jobs/Handler/SendNotification/CorrectionsNotDistributed.hs new file mode 100644 index 000000000..cb24f7e04 --- /dev/null +++ b/src/Jobs/Handler/SendNotification/CorrectionsNotDistributed.hs @@ -0,0 +1,31 @@ +module Jobs.Handler.SendNotification.CorrectionsNotDistributed + ( dispatchNotificationCorrectionsNotDistributed + ) where + +import Import + +import Handler.Utils.Mail + +import Text.Hamlet +import qualified Data.CaseInsensitive as CI + +dispatchNotificationCorrectionsNotDistributed :: SheetId -> UserId -> Handler () +dispatchNotificationCorrectionsNotDistributed nSheet jRecipient = do + (Course{..}, Sheet{..}, nbrSubs) <- liftHandlerT . runDB $ do + sheet <- getJust nSheet + course <- belongsToJust sheetCourse sheet + nbrSubs <- count [ SubmissionSheet ==. nSheet + , SubmissionRatingBy ==. Nothing + ] + return (course, sheet, nbrSubs) + when (nbrSubs > 0) . userMailT jRecipient $ do + setSubjectI $ MsgMailSubjectSubmissionsUnassigned courseShorthand sheetName + MsgRenderer mr <- getMailMsgRenderer + let termDesc = mr . ShortTermIdentifier $ unTermKey courseTerm + tid = courseTerm + ssh = courseSchool + csh = courseShorthand + shn = sheetName + + addAlternatives $ + providePreferredAlternative ($(ihamletFile "templates/mail/correctionsUndistributed.hamlet") :: HtmlUrlI18n UniWorXMessage (Route UniWorX)) diff --git a/src/Jobs/Handler/SendNotification/SheetActive.hs b/src/Jobs/Handler/SendNotification/SheetActive.hs new file mode 100644 index 000000000..91a8fc716 --- /dev/null +++ b/src/Jobs/Handler/SendNotification/SheetActive.hs @@ -0,0 +1,31 @@ +{-# OPTIONS_GHC -fno-warn-unused-do-bind #-} -- ihamletFile discards do results + +module Jobs.Handler.SendNotification.SheetActive + ( dispatchNotificationSheetActive + ) where + +import Import + +import Handler.Utils.Mail + +import Text.Hamlet +import qualified Data.CaseInsensitive as CI + +dispatchNotificationSheetActive :: SheetId -> UserId -> Handler () +dispatchNotificationSheetActive nSheet jRecipient = userMailT jRecipient $ do + (Course{..}, Sheet{..}) <- liftHandlerT . runDB $ do + sheet <- getJust nSheet + course <- belongsToJust sheetCourse sheet + return (course, sheet) + setSubjectI $ MsgMailSubjectSheetActive courseShorthand sheetName + + MsgRenderer mr <- getMailMsgRenderer + let termDesc = mr . ShortTermIdentifier $ unTermKey courseTerm + tid = courseTerm + ssh = courseSchool + csh = courseShorthand + shn = sheetName + + addAlternatives $ do + let editNotifications = $(ihamletFile "templates/mail/editNotifications.hamlet") + providePreferredAlternative ($(ihamletFile "templates/mail/sheetActive.hamlet") :: HtmlUrlI18n UniWorXMessage (Route UniWorX)) diff --git a/src/Jobs/Handler/SendNotification/SheetInactive.hs b/src/Jobs/Handler/SendNotification/SheetInactive.hs new file mode 100644 index 000000000..f318539f4 --- /dev/null +++ b/src/Jobs/Handler/SendNotification/SheetInactive.hs @@ -0,0 +1,52 @@ +{-# OPTIONS_GHC -fno-warn-unused-do-bind #-} -- ihamletFile discards do results + +module Jobs.Handler.SendNotification.SheetInactive + ( dispatchNotificationSheetSoonInactive + , dispatchNotificationSheetInactive + ) where + +import Import + +import Handler.Utils.Mail + +import Text.Hamlet +import qualified Data.CaseInsensitive as CI + +dispatchNotificationSheetSoonInactive :: SheetId -> UserId -> Handler () +dispatchNotificationSheetSoonInactive nSheet jRecipient = userMailT jRecipient $ do + (Course{..}, Sheet{..}) <- liftHandlerT . runDB $ do + sheet <- getJust nSheet + course <- belongsToJust sheetCourse sheet + return (course, sheet) + setSubjectI $ MsgMailSubjectSheetSoonInactive courseShorthand sheetName + + MsgRenderer mr <- getMailMsgRenderer + let termDesc = mr . ShortTermIdentifier $ unTermKey courseTerm + tid = courseTerm + ssh = courseSchool + csh = courseShorthand + shn = sheetName + + addAlternatives $ do + let editNotifications = $(ihamletFile "templates/mail/editNotifications.hamlet") + providePreferredAlternative ($(ihamletFile "templates/mail/sheetSoonInactive.hamlet") :: HtmlUrlI18n UniWorXMessage (Route UniWorX)) + +dispatchNotificationSheetInactive :: SheetId -> UserId -> Handler () +dispatchNotificationSheetInactive nSheet jRecipient = userMailT jRecipient $ do + (Course{..}, Sheet{..}) <- liftHandlerT . runDB $ do + sheet <- getJust nSheet + course <- belongsToJust sheetCourse sheet + return (course, sheet) + setSubjectI $ MsgMailSubjectSheetInactive courseShorthand sheetName + + MsgRenderer mr <- getMailMsgRenderer + let termDesc = mr . ShortTermIdentifier $ unTermKey courseTerm + tid = courseTerm + ssh = courseSchool + csh = courseShorthand + shn = sheetName + + addAlternatives $ do + let editNotifications = $(ihamletFile "templates/mail/editNotifications.hamlet") + providePreferredAlternative ($(ihamletFile "templates/mail/sheetInactive.hamlet") :: HtmlUrlI18n UniWorXMessage (Route UniWorX)) + diff --git a/src/Jobs/Handler/SendNotification/SubmissionRated.hs b/src/Jobs/Handler/SendNotification/SubmissionRated.hs new file mode 100644 index 000000000..78083d83f --- /dev/null +++ b/src/Jobs/Handler/SendNotification/SubmissionRated.hs @@ -0,0 +1,55 @@ +{-# OPTIONS_GHC -fno-warn-unused-do-bind #-} -- ihamletFile discards do results + +module Jobs.Handler.SendNotification.SubmissionRated + ( dispatchNotificationSubmissionRated + ) where + +import Import + +import Utils.Lens +import Handler.Utils.DateTime +import Handler.Utils.Mail + +import Text.Hamlet +import qualified Data.Aeson as Aeson +import qualified Data.CaseInsensitive as CI + +dispatchNotificationSubmissionRated :: SubmissionId -> UserId -> Handler () +dispatchNotificationSubmissionRated nSubmission jRecipient = userMailT jRecipient $ do + (Course{..}, Sheet{..}, Submission{..}, corrector) <- liftHandlerT . runDB $ do + submission@Submission{submissionRatingBy} <- getJust nSubmission + sheet <- belongsToJust submissionSheet submission + course <- belongsToJust sheetCourse sheet + corrector <- traverse getJust submissionRatingBy + return (course, sheet, submission, corrector) + setSubjectI $ MsgMailSubjectSubmissionRated courseShorthand + + csid <- encrypt nSubmission + MsgRenderer mr <- getMailMsgRenderer + let termDesc = mr . ShortTermIdentifier $ unTermKey courseTerm + let sheetTypeDesc = mr sheetType + submissionRatingTime' <- traverse (formatTimeMail SelFormatDateTime) submissionRatingTime + let tid = courseTerm + ssh = courseSchool + csh = courseShorthand + shn = sheetName + + -- TODO: provide convienience template-haskell for `addAlternatives` + addAlternatives $ do + provideAlternative $ Aeson.object + [ "submission" Aeson..= ciphertext csid + , "submission-rating-points" Aeson..= (guard (sheetType /= NotGraded) *> submissionRatingPoints) + , "submission-rating-comment" Aeson..= submissionRatingComment + , "submission-rating-time" Aeson..= submissionRatingTime + , "submission-rating-by" Aeson..= (userDisplayName <$> corrector) + , "submission-rating-passed" Aeson..= join (gradingPassed <$> sheetType ^? _grading <*> submissionRatingPoints) + , "sheet-name" Aeson..= sheetName + , "sheet-type" Aeson..= sheetType + , "course-name" Aeson..= courseName + , "course-shorthand" Aeson..= courseShorthand + , "course-term" Aeson..= courseTerm + , "course-school" Aeson..= courseSchool + ] + -- provideAlternative $ \(MsgRenderer mr) -> ($(textFile "templates/mail/submissionRated.txt") :: TextUrl (Route UniWorX)) -- textFile does not support control statements + let editNotifications = $(ihamletFile "templates/mail/editNotifications.hamlet") + providePreferredAlternative ($(ihamletFile "templates/mail/submissionRated.hamlet") :: HtmlUrlI18n UniWorXMessage (Route UniWorX)) diff --git a/src/Jobs/Handler/SendTestEmail.hs b/src/Jobs/Handler/SendTestEmail.hs new file mode 100644 index 000000000..5c5cd0900 --- /dev/null +++ b/src/Jobs/Handler/SendTestEmail.hs @@ -0,0 +1,28 @@ +module Jobs.Handler.SendTestEmail + ( dispatchJobSendTestEmail + ) where + +import Import + +import Handler.Utils.DateTime + +import Text.Shakespeare.Text + +import Utils.Lens + +dispatchJobSendTestEmail :: Email -> MailContext -> Handler () +dispatchJobSendTestEmail jEmail jMailContext = mailT jMailContext $ do + _mailTo .= [Address Nothing jEmail] + setSubjectI MsgMailTestSubject + now <- liftIO getCurrentTime + nDT <- formatTimeMail SelFormatDateTime now + nD <- formatTimeMail SelFormatDate now + nT <- formatTimeMail SelFormatTime now + addPart $ \(MsgRenderer mr) -> ([text| + #{mr MsgMailTestContent} + + #{mr MsgMailTestDateTime} + * #{nDT} + * #{nD} + * #{nT} + |] :: TextUrl (Route UniWorX)) diff --git a/src/Jobs/Handler/SetLogSettings.hs b/src/Jobs/Handler/SetLogSettings.hs new file mode 100644 index 000000000..a7bf40f6c --- /dev/null +++ b/src/Jobs/Handler/SetLogSettings.hs @@ -0,0 +1,12 @@ +module Jobs.Handler.SetLogSettings + ( dispatchJobSetLogSettings + ) where + +import Import + +dispatchJobSetLogSettings :: InstanceId -> LogSettings -> Handler () +dispatchJobSetLogSettings jInstance jLogSettings = do + instanceId <- getsYesod appInstanceID + unless (instanceId == jInstance) $ fail "Incorrect instance" + lSettings <- getsYesod appLogSettings + atomically $ writeTVar lSettings jLogSettings diff --git a/src/Jobs/Queue.hs b/src/Jobs/Queue.hs new file mode 100644 index 000000000..a9d701ec4 --- /dev/null +++ b/src/Jobs/Queue.hs @@ -0,0 +1,86 @@ +module Jobs.Queue + ( writeJobCtl, writeJobCtlBlock + , queueJob, queueJob' + , YesodJobDB + , runDBJobs, queueDBJob + , module Jobs.Types + ) where + +import Import + +import Utils.Sql +import Jobs.Types + +import Control.Monad.Trans.Writer (WriterT, runWriterT) +import Control.Monad.Writer.Class (MonadWriter(..)) +import Control.Monad.Trans.Reader (ReaderT, mapReaderT) + +import qualified Data.Set as Set +import qualified Data.List.NonEmpty as NonEmpty +import qualified Data.HashMap.Strict as HashMap + +import Control.Monad.Random (evalRand, mkStdGen, uniform) + + +data JobQueueException = JobQueuePoolEmpty + deriving (Eq, Ord, Enum, Bounded, Show, Read, Generic) + +instance Exception JobQueueException + + +writeJobCtl :: (MonadHandler m, HandlerSite m ~ UniWorX) => JobCtl -> m () +writeJobCtl cmd = do + tid <- liftIO myThreadId + wMap <- getsYesod appJobCtl >>= liftIO . readTVarIO + if + | null wMap -> throwM JobQueuePoolEmpty + | otherwise -> do + let chan = flip evalRand (mkStdGen (hash tid `hashWithSalt` cmd)) $ uniform wMap + liftIO . atomically $ writeTMChan chan cmd + +writeJobCtlBlock :: (MonadHandler m, HandlerSite m ~ UniWorX) => JobCtl -> ReaderT JobContext m () +writeJobCtlBlock cmd = do + getResVar <- asks jobConfirm + resVar <- liftIO . atomically $ do + var <- newEmptyTMVar + modifyTVar' getResVar $ HashMap.insertWith (<>) cmd (pure var) + return var + lift $ writeJobCtl cmd + let + removeResVar = HashMap.update (NonEmpty.nonEmpty . NonEmpty.filter (/= resVar)) cmd + mExc <- liftIO . atomically $ takeTMVar resVar <* modifyTVar' getResVar removeResVar + maybe (return ()) throwM mExc + +queueJobUnsafe :: Job -> YesodDB UniWorX QueuedJobId +queueJobUnsafe job = do + now <- liftIO getCurrentTime + self <- getsYesod appInstanceID + insert QueuedJob + { queuedJobContent = toJSON job + , queuedJobCreationInstance = self + , queuedJobCreationTime = now + , queuedJobLockInstance = Nothing + , queuedJobLockTime = Nothing + } + -- We should not immediately notify a worker; instead wait for the transaction to finish first + -- writeJobCtl $ JobCtlPerform jId -- FIXME: Should do fancy load balancing across instances (or something) + -- return jId + +queueJob :: (MonadHandler m, HandlerSite m ~ UniWorX) => Job -> m QueuedJobId +queueJob = liftHandlerT . runDB . setSerializable . queueJobUnsafe + +queueJob' :: (MonadHandler m, HandlerSite m ~ UniWorX) => Job -> m () +-- ^ `queueJob` followed by `JobCtlPerform` +queueJob' job = queueJob job >>= writeJobCtl . JobCtlPerform + +type YesodJobDB site = ReaderT (YesodPersistBackend site) (WriterT (Set QueuedJobId) (HandlerT site IO)) + +queueDBJob :: Job -> ReaderT (YesodPersistBackend UniWorX) (WriterT (Set QueuedJobId) (HandlerT UniWorX IO)) () +queueDBJob job = mapReaderT lift (queueJobUnsafe job) >>= tell . Set.singleton + +runDBJobs :: (MonadHandler m, HandlerSite m ~ UniWorX) + => ReaderT (YesodPersistBackend UniWorX) (WriterT (Set QueuedJobId) (HandlerT UniWorX IO)) a -> m a +runDBJobs act = do + (ret, jIds) <- liftHandlerT . runDB $ mapReaderT runWriterT act + forM_ jIds $ writeJobCtl . JobCtlPerform + return ret diff --git a/src/Jobs/Types.hs b/src/Jobs/Types.hs new file mode 100644 index 000000000..2e6eb3164 --- /dev/null +++ b/src/Jobs/Types.hs @@ -0,0 +1,62 @@ +module Jobs.Types + ( Job(..), Notification(..) + , JobCtl(..) + , JobContext(..) + ) where + +import Import.NoFoundation + +import Data.Aeson (defaultOptions, Options(..), SumEncoding(..)) +import Data.Aeson.TH (deriveJSON) + +import Data.List.NonEmpty (NonEmpty) + + +data Job = JobSendNotification { jRecipient :: UserId, jNotification :: Notification } + | JobSendTestEmail { jEmail :: Email, jMailContext :: MailContext } + | JobQueueNotification { jNotification :: Notification } + | JobHelpRequest { jSender :: Either (Maybe Address) UserId + , jRequestTime :: UTCTime + , jHelpRequest :: Text, jReferer :: Maybe Text } + | JobSetLogSettings { jInstance :: InstanceId, jLogSettings :: LogSettings } + | JobDistributeCorrections { jSheet :: SheetId } + deriving (Eq, Ord, Show, Read, Generic, Typeable) +data Notification = NotificationSubmissionRated { nSubmission :: SubmissionId } + | NotificationSheetActive { nSheet :: SheetId } + | NotificationSheetSoonInactive { nSheet :: SheetId } + | NotificationSheetInactive { nSheet :: SheetId } + | NotificationCorrectionsAssigned { nUser :: UserId, nSheet :: SheetId } + | NotificationCorrectionsNotDistributed { nSheet :: SheetId } + deriving (Eq, Ord, Show, Read, Generic, Typeable) + +instance Hashable Job +instance Hashable Notification + +deriveJSON defaultOptions + { constructorTagModifier = intercalate "-" . map toLower . drop 1 . splitCamel + , fieldLabelModifier = intercalate "-" . map toLower . drop 1 . splitCamel + , tagSingleConstructors = True + , sumEncoding = TaggedObject "job" "data" + } ''Job + +deriveJSON defaultOptions + { constructorTagModifier = intercalate "-" . map toLower . drop 1 . splitCamel + , fieldLabelModifier = intercalate "-" . map toLower . drop 1 . splitCamel + , tagSingleConstructors = True + , sumEncoding = TaggedObject "notification" "data" + } ''Notification + + +data JobCtl = JobCtlFlush + | JobCtlPerform QueuedJobId + | JobCtlDetermineCrontab + | JobCtlQueue Job + deriving (Eq, Ord, Read, Show, Generic, Typeable) + +instance Hashable JobCtl + + +data JobContext = JobContext + { jobCrontab :: TMVar (Crontab JobCtl) + , jobConfirm :: TVar (HashMap JobCtl (NonEmpty (TMVar (Maybe SomeException)))) + } diff --git a/src/Ldap/Client/Pool.hs b/src/Ldap/Client/Pool.hs new file mode 100644 index 000000000..875078b6f --- /dev/null +++ b/src/Ldap/Client/Pool.hs @@ -0,0 +1,115 @@ +{-# OPTIONS_GHC -fno-warn-orphans #-} + +module Ldap.Client.Pool + ( LdapPool + , LdapExecutor, Ldap, LdapError + , LdapPoolError(..) + , withLdap + , createLdapPool + ) where + +import ClassyPrelude + +import Ldap.Client (Ldap, LdapError) +import qualified Ldap.Client as Ldap + +import Data.Pool + +import Control.Monad.Logger +import Data.Time.Clock (NominalDiffTime) + +import Data.Dynamic + +import System.Timeout.Lifted + + +type LdapPool = Pool LdapExecutor +data LdapExecutor = LdapExecutor + { ldapExec :: forall a. Typeable a => (Ldap -> IO a) -> IO (Either LdapPoolError a) + , ldapDestroy :: TMVar () + } + +instance Exception LdapError + +data LdapPoolError = LdapPoolTimeout | LdapError LdapError + deriving (Eq, Show, Generic, Typeable) + +instance Exception LdapPoolError + + +withLdap :: (MonadBaseControl IO m, MonadIO m, Typeable a) => LdapPool -> (Ldap -> IO a) -> m (Either LdapPoolError a) +withLdap pool act = withResource pool $ \LdapExecutor{..} -> liftIO $ ldapExec act + + +createLdapPool :: ( MonadLoggerIO m, MonadIO m ) + => Ldap.Host + -> Ldap.PortNumber + -> Int -- ^ Stripes + -> NominalDiffTime -- ^ Connection Timeout + -> NominalDiffTime -- ^ Action Timeout + -> Int -- ^ Limit + -> m LdapPool +createLdapPool host port stripes timeoutConn (round . (* 1e6) -> timeoutAct) limit = do + logFunc <- askLoggerIO + + let + mkExecutor :: IO LdapExecutor + mkExecutor = do + ldapDestroy <- newEmptyTMVarIO + ldapAct <- newEmptyTMVarIO + + let + ldapExec :: forall a. Typeable a => (Ldap -> IO a) -> IO (Either LdapPoolError a) + ldapExec act = do + ldapAnswer <- newEmptyTMVarIO :: IO (TMVar (Either SomeException Dynamic)) + atomically $ putTMVar ldapAct (fmap toDyn . act, ldapAnswer) + either throwIO (return . Right . flip fromDyn (error "Could not cast dynamic")) =<< atomically (takeTMVar ldapAnswer) + `catches` + [ Handler $ return . Left . LdapError . Ldap.ParseError + , Handler $ return . Left . LdapError . Ldap.ResponseError + , Handler $ return . Left . LdapError . Ldap.IOError + , Handler $ return . Left . LdapError . Ldap.DisconnectError + , Handler $ return . Left . (id :: LdapPoolError -> LdapPoolError) + ] + + go :: Maybe (TMVar (Maybe a)) -> Ldap -> LoggingT IO () + go waiting ldap = do + $logDebugS "LdapExecutor" "Waiting" + for_ waiting $ atomically . flip putTMVar Nothing + instruction <- atomically $ (Nothing <$ takeTMVar ldapDestroy) <|> (Just <$> takeTMVar ldapAct) + case instruction of + Nothing -> $logDebugS "LdapExecutor" "Terminating" + Just (act, returnRes) -> do + $logDebugS "LdapExecutor" "Executing" + res <- try . withTimeout . liftIO $ act ldap + didReturn <- atomically $ tryPutTMVar returnRes res + unless didReturn $ + $logErrorS "LdapExecutor" "Could not return result" + either throwM (const $ return ()) res + `catches` + [ Handler (\(Ldap.ResponseError _) -> return ()) + ] + go Nothing ldap + + withTimeout $ do + setup <- newEmptyTMVarIO + + void . fork . flip runLoggingT logFunc $ do + $logDebugS "LdapExecutor" "Starting" + res <- liftIO . Ldap.with host port $ flip runLoggingT logFunc . go (Just setup) + case res of + Left exc -> do + $logWarnS "LdapExecutor" $ tshow exc + atomically . void . tryPutTMVar setup $ Just exc + Right res' -> return res' + + maybe (return ()) throwM =<< atomically (takeTMVar setup) + + return LdapExecutor{..} + + delExecutor :: LdapExecutor -> IO () + delExecutor LdapExecutor{..} = atomically . void $ tryPutTMVar ldapDestroy () + liftIO $ createPool mkExecutor delExecutor stripes timeoutConn limit + where + withTimeout :: forall m a. (MonadBaseControl IO m, MonadThrow m) => m a -> m a + withTimeout = maybe (throwM LdapPoolTimeout) return <=< timeout timeoutAct diff --git a/src/Mail.hs b/src/Mail.hs new file mode 100644 index 000000000..c125bf88d --- /dev/null +++ b/src/Mail.hs @@ -0,0 +1,464 @@ +{-# LANGUAGE GeneralizedNewtypeDeriving + , UndecidableInstances + #-} + +module Mail + ( -- * Structured MIME emails + module Network.Mail.Mime + -- * MailT + , MailT, defMailT + , MailSmtpData(..), MailContext(..), MailLanguages(..) + , MonadMail(..) + , getMailMessageRender, getMailMsgRenderer + -- * YesodMail + , VerpMode(..) + , YesodMail(..) + , MailException(..) + -- * Monadically constructing Mail + , PrioritisedAlternatives + , ToMailPart(..) + , addAlternatives, provideAlternative, providePreferredAlternative + , addPart + , MonadHeader(..) + , MailHeader + , MailObjectId + , replaceMailHeader, addMailHeader, removeMailHeader + , replaceMailHeaderI, addMailHeaderI + , setSubjectI, setMailObjectId, setMailObjectId' + , setDate, setDateCurrent + , setMailSmtpData + , _mailFrom, _mailTo, _mailCc, _mailBcc, _mailHeaders, _mailParts + , _partType, _partEncoding, _partFilename, _partHeaders, _partContent + ) where + +import ClassyPrelude.Yesod hiding (snoc, (.=), getMessageRender) + +import Network.Mail.Mime hiding (addPart, addAttachment) +import qualified Network.Mail.Mime as Mime (addPart) + +import Data.Monoid (Last(..)) +import Control.Monad.Trans.RWS (RWST(..)) +import Control.Monad.Trans.State (StateT(..), execStateT, mapStateT) +import Control.Monad.Trans.Writer (execWriter, Writer) +import Control.Monad.RWS.Class (MonadWriter(..), MonadReader(..), MonadState(..), modify) +import Control.Monad.Fail + +import GHC.Generics (Generic) +import Generics.Deriving.Monoid (memptydefault, mappenddefault) + +import Data.Sequence (Seq) +import qualified Data.Sequence as Seq + +import Data.Set (Set) +import qualified Data.Set as Set + +import qualified Data.Text as Text + +import qualified Data.Foldable as Foldable + +import qualified Data.Text.Lazy as LT +import qualified Data.Text.Lazy.Builder as LTB +import qualified Data.ByteString.Lazy as LBS + +import Utils (MsgRendererS(..)) +import Utils.Lens.TH +import Control.Lens hiding (from) + +import Text.Blaze.Renderer.Utf8 + +import Data.UUID (UUID) +import qualified Data.UUID as UUID +import qualified Data.UUID.V4 as UUID +import Data.UUID.Cryptographic.ImplicitNamespace + +import Data.Binary (Binary) + +import GHC.TypeLits (KnownSymbol) + +import Network.BSD (getHostName) + +import Data.Time.Zones (TZ, utcTZ, utcToLocalTimeTZ, timeZoneForUTCTime) +import Data.Time.LocalTime (ZonedTime(..)) + +import Network.HaskellNet.SMTP (SMTPConnection) +import qualified Network.HaskellNet.SMTP as SMTP + +import qualified Text.Hamlet as Hamlet (Translate) +import qualified Text.Shakespeare as Shakespeare (RenderUrl) + +import qualified Data.Aeson as Aeson +import qualified Data.Aeson.Encode.Pretty as Aeson +import Data.Aeson (Options(..)) +import Data.Aeson.TH +import Utils.PathPiece (splitCamel) +import Utils.DateTime + +import Data.Universe.Instances.Reverse () +import Data.Universe.Instances.Reverse.JSON () +import Data.Universe.Instances.Reverse.Hashable () + +import GHC.Exts (IsList) + +makeLenses_ ''Mail +makeLenses_ ''Part + + +newtype MailT m a = MailT { _unMailT :: RWST MailContext MailSmtpData Mail m a } + deriving newtype ( MonadTrans, Monad, Functor, MonadFail, Applicative, Alternative, MonadPlus + , MonadIO, MonadHandler, MonadCatch, MonadThrow, MonadMask, MonadResource, MonadBase b + , MonadState Mail, MonadWriter MailSmtpData, MonadReader MailContext + ) + +instance {-# OVERLAPPING #-} (MonadCrypto m, MonadCryptoKey m ~ CryptoIDKey) => MonadCrypto (MailT m) where + type MonadCryptoKey (MailT m) = CryptoIDKey + cryptoIDKey f = lift (cryptoIDKey return) >>= f + +data MailSmtpData = MailSmtpData + { smtpEnvelopeFrom :: Last Text + , smtpRecipients :: Set Text + } deriving (Eq, Ord, Show, Read, Generic) + +instance Monoid (MailSmtpData) where + mempty = memptydefault + mappend = mappenddefault + +newtype MailLanguages = MailLanguages { mailLanguages :: [Lang] } + deriving (Eq, Ord, Show, Read, Generic, Typeable) + deriving newtype (FromJSON, ToJSON, IsList) + +instance Default MailLanguages where + def = MailLanguages [] + +instance Hashable MailLanguages + +data MailContext = MailContext + { mcLanguages :: MailLanguages + , mcDateTimeFormat :: SelDateTimeFormat -> DateTimeFormat + } deriving (Eq, Ord, Read, Show, Generic, Typeable) + +deriveJSON defaultOptions + { fieldLabelModifier = intercalate "-" . map toLower . drop 1 . splitCamel + } ''MailContext + +instance Hashable MailContext +instance Default MailContext where + def = MailContext { mcLanguages = def + , mcDateTimeFormat = def + } + +makeLenses_ ''MailContext + +class (MonadHandler m, MonadState Mail m) => MonadMail m where + askMailLanguages :: m MailLanguages + askMailDateTimeFormat :: SelDateTimeFormat -> m DateTimeFormat + tellMailSmtpData :: MailSmtpData -> m () + +instance MonadHandler m => MonadMail (MailT m) where + askMailLanguages = view _mcLanguages + askMailDateTimeFormat = (view _mcDateTimeFormat ??) + tellMailSmtpData = tell + +data VerpMode = VerpNone + | Verp { verpSeparator, verpAtReplacement :: Char } + deriving (Eq, Show, Read, Generic) + +deriveJSON defaultOptions + { constructorTagModifier = intercalate "-" . map toLower . drop 1 . splitCamel + , fieldLabelModifier = intercalate "-" . map toLower . drop 1 . splitCamel + , sumEncoding = UntaggedValue + } ''VerpMode + +getMailMessageRender :: ( MonadMail m + , HandlerSite m ~ site + , RenderMessage site msg + ) => m (msg -> Text) +getMailMessageRender = renderMessage <$> getYesod <*> (mailLanguages <$> askMailLanguages) + +getMailMsgRenderer :: forall site m. + ( MonadMail m + , HandlerSite m ~ site + ) => m (MsgRendererS site) +getMailMsgRenderer = do + mr <- getMailMessageRender + return $ MsgRenderer (mr . SomeMessage :: RenderMessage site msg => msg -> Text) + + +data MailException = MailNotAvailable + | MailNoSenderSpecified + | MailNoRecipientsSpecified + deriving (Eq, Ord, Read, Show, Generic, Typeable) + +instance Exception MailException + + +class Yesod site => YesodMail site where + defaultFromAddress :: (MonadHandler m, HandlerSite m ~ site) => m Address + defaultFromAddress = (Address Nothing . ("yesod@" <>) . pack) <$> liftIO getHostName + + mailObjectIdDomain :: (MonadHandler m, HandlerSite m ~ site) => m Text + mailObjectIdDomain = pack <$> liftIO getHostName + + mailDateTZ :: (MonadHandler m, HandlerSite m ~ site) => m TZ + mailDateTZ = return utcTZ + + mailSmtp :: ( MonadHandler m + , HandlerSite m ~ site + , MonadBaseControl IO m + ) => (SMTPConnection -> m a) -> m a + mailSmtp _ = throwM MailNotAvailable + + mailVerp :: ( MonadHandler m + , HandlerSite m ~ site + ) => m VerpMode + mailVerp = return VerpNone + + mailT :: ( MonadHandler m + , HandlerSite m ~ site + , MonadBaseControl IO m + , MonadLogger m + ) => MailContext -> MailT m a -> m a + mailT = defMailT + + defaultMailLayout :: ( MonadHandler m + , HandlerSite m ~ site + ) => WidgetT site IO () -> m Html + defaultMailLayout wgt = do + PageContent{..} <- liftHandlerT $ widgetToPageContent wgt + msgs <- getMessages + withUrlRenderer [hamlet| + $newline never + $doctype 5 + + + #{pageTitle} + ^{pageHead} + <body> + $forall (status, msg) <- msgs + <p class="message #{status}">#{msg} + ^{pageBody} + |] + +defMailT :: ( MonadHandler m + , YesodMail (HandlerSite m) + , MonadBaseControl IO m + , MonadLogger m + ) => MailContext + -> MailT m a + -> m a +defMailT ls (MailT mailC) = do + fromAddress <- defaultFromAddress + (ret, mail, smtpData) <- runRWST mailC ls (emptyMail fromAddress) + mail' <- liftIO $ LBS.toStrict <$> renderMail' mail + -- logDebugS "Mail" $ "Rendered mail:\n" <> decodeUtf8 mail' + ret <$ case smtpData of + MailSmtpData{ smtpEnvelopeFrom = Last Nothing } -> throwM MailNoSenderSpecified + MailSmtpData{ smtpRecipients } + | Set.null smtpRecipients -> throwM MailNoRecipientsSpecified + MailSmtpData{ smtpEnvelopeFrom = Last (Just (unpack -> returnPath)) + , smtpRecipients = (map unpack . toList -> recipients) + } -> mailSmtp $ \conn -> do + $logInfoS "Mail" $ "Submitting email: " <> tshow smtpData + liftIO $ SMTP.sendMail + returnPath + recipients + mail' + conn + + +data PrioritisedAlternatives m = PrioritisedAlternatives + { preferredAlternative :: Last (m Part) + , otherAlternatives :: Seq (m Part) + } deriving (Generic) + +instance Monoid (PrioritisedAlternatives m) where + mempty = memptydefault + mappend = mappenddefault + +class YesodMail site => ToMailPart site a where + type MailPartReturn site a :: * + type MailPartReturn site a = () + toMailPart :: (MonadMail m, HandlerSite m ~ site) => a -> StateT Part m (MailPartReturn site a) + +instance YesodMail site => ToMailPart site (StateT Part (HandlerT site IO) a) where + type MailPartReturn site (StateT Part (HandlerT site IO) a) = a + toMailPart = mapStateT liftHandlerT + +instance YesodMail site => ToMailPart site LT.Text where + toMailPart text = do + _partType .= "text/plain; charset=utf-8" + _partEncoding .= QuotedPrintableText + _partContent .= encodeUtf8 text + +instance YesodMail site => ToMailPart site Text where + toMailPart = toMailPart . LT.fromStrict + +instance YesodMail site => ToMailPart site LTB.Builder where + toMailPart = toMailPart . LTB.toLazyText + +instance YesodMail site => ToMailPart site Html where + toMailPart html = do + _partType .= "text/html; charset=utf-8" + _partEncoding .= QuotedPrintableText + _partContent .= renderMarkup html + +instance (ToMailPart site a, RenderMessage site msg) => ToMailPart site (Hamlet.Translate msg -> a) where + type MailPartReturn site (Hamlet.Translate msg -> a) = MailPartReturn site a + toMailPart act = do + mr <- lift getMailMessageRender + toMailPart $ act (toHtml . mr) + +instance (ToMailPart site a, site ~ site') => ToMailPart site (MsgRendererS site' -> a) where + type MailPartReturn site (MsgRendererS site' -> a) = MailPartReturn site a + toMailPart act = do + mr <- lift getMailMsgRenderer + toMailPart $ act mr + +instance ToMailPart site a => ToMailPart site (Shakespeare.RenderUrl (Route site) -> a) where + type MailPartReturn site (Shakespeare.RenderUrl (Route site) -> a) = MailPartReturn site a + toMailPart act = do + ur <- getUrlRenderParams + toMailPart $ act ur + +instance YesodMail site => ToMailPart site Aeson.Value where + toMailPart val = do + _partType .= "application/json; charset=utf-8" + _partEncoding .= QuotedPrintableText + _partContent .= Aeson.encodePretty val + + +addAlternatives :: (MonadMail m) + => Writer (PrioritisedAlternatives m) () + -> m () +addAlternatives provided = do + let PrioritisedAlternatives{..} = execWriter provided + alternatives <- sequence . Foldable.toList $ maybe id (flip (Seq.|>)) (getLast preferredAlternative) otherAlternatives + modify $ Mime.addPart alternatives + +provideAlternative, providePreferredAlternative + :: (MonadMail m, HandlerSite m ~ site, ToMailPart site a) + => a + -> Writer (PrioritisedAlternatives m) () +provideAlternative part = tell $ mempty { otherAlternatives = Seq.singleton $ execStateT (toMailPart part) initialPart } +providePreferredAlternative part = tell $ mempty { preferredAlternative = Last . Just $ execStateT (toMailPart part) initialPart } + +addPart :: ( MonadMail m + , HandlerSite m ~ site + , ToMailPart site a + ) => a -> m (MailPartReturn site a) +addPart part = do + (ret, part') <- runStateT (toMailPart part) initialPart + modify . Mime.addPart $ pure part' + return ret + +initialPart :: Part +initialPart = Part + { partType = "text/plain" + , partEncoding = None + , partFilename = Nothing + , partHeaders = [] + , partContent = mempty + } + + +class MonadHandler m => MonadHeader m where + modifyHeaders :: (Headers -> Headers) -> m () + objectIdHeader :: m MailHeader + +instance MonadHandler m => MonadHeader (MailT m) where + modifyHeaders f = MailT . modify $ over _mailHeaders f + objectIdHeader = return "Message-ID" + +instance MonadHandler m => MonadHeader (StateT Part m) where + modifyHeaders f = _partHeaders %= f + objectIdHeader = return "Content-ID" + + +type MailHeader = ByteString +type MailObjectId = Text + + +replaceMailHeader :: MonadHeader m => MailHeader -> Maybe Text -> m () +replaceMailHeader header mC = removeMailHeader header >> maybe (return ()) (addMailHeader header) mC + +addMailHeader :: MonadHeader m => MailHeader -> Text -> m () +addMailHeader header c = modifyHeaders $ \mailHeaders -> mailHeaders `snoc` (header, c) + +removeMailHeader :: MonadHeader m => MailHeader -> m () +removeMailHeader header = modifyHeaders $ \mailHeaders -> filter ((/= header) . fst) mailHeaders + + +replaceMailHeaderI :: ( RenderMessage site msg + , MonadMail m + , HandlerSite m ~ site + , MonadHeader m + ) => MailHeader -> msg -> m () +replaceMailHeaderI header msg = removeMailHeader header >> addMailHeaderI header msg + +addMailHeaderI :: ( RenderMessage site msg + , MonadMail m + , HandlerSite m ~ site + , MonadHeader m + ) => MailHeader -> msg -> m () +addMailHeaderI header msg = addMailHeader header =<< (getMailMessageRender <*> pure msg) + + +setSubjectI :: (RenderMessage site msg, MonadHandler m, HandlerSite m ~ site) => msg -> MailT m () +setSubjectI = replaceMailHeaderI "Subject" + +setMailObjectUUID :: ( MonadHeader m + , YesodMail (HandlerSite m) + ) => UUID -> m MailObjectId +setMailObjectUUID uuid = do + domain <- mailObjectIdDomain + oidHeader <- objectIdHeader + let objectId = UUID.toText uuid <> "@" <> domain + replaceMailHeader oidHeader . Just $ "<" <> objectId <> ">" + return objectId + +setMailObjectId :: ( MonadHeader m + , YesodMail (HandlerSite m) + ) => m MailObjectId +setMailObjectId = setMailObjectUUID =<< liftIO UUID.nextRandom + +setMailObjectId' :: ( MonadHeader m + , YesodMail (HandlerSite m) + , MonadCrypto m + , HasCryptoUUID plain m + , MonadCryptoKey m ~ CryptoIDKey + , KnownSymbol (CryptoIDNamespace UUID plain) + , Binary plain + ) => plain -> m MailObjectId +setMailObjectId' oid = setMailObjectUUID . ciphertext =<< encrypt oid + + +setDateCurrent :: (MonadHandler m, YesodMail (HandlerSite m)) => MailT m () +setDateCurrent = setDate =<< liftIO getCurrentTime + +setDate :: (MonadHandler m, YesodMail (HandlerSite m)) => UTCTime -> MailT m () +setDate time = do + tz <- mailDateTZ + let timeStr = formatTime defaultTimeLocale "%a, %d %b %Y %T %z" $ ZonedTime (utcToLocalTimeTZ tz time) (timeZoneForUTCTime tz time) + replaceMailHeader "Date" . Just $ pack timeStr + + +setMailSmtpData :: (MonadHandler m, YesodMail (HandlerSite m)) => MailT m () +setMailSmtpData = do + Address _ from <- use _mailFrom + recps <- Set.fromList . map addressEmail . concat <$> forM [_mailTo, _mailCc, _mailBcc] use + + tell $ mempty { smtpRecipients = recps } + + verpMode <- mailVerp + if + | Verp{..} <- verpMode + , [recp] <- Set.toList recps + -> let (user, domain) = Text.breakOn "@" from + verp = mconcat + [ user + , Text.singleton verpSeparator + , Text.replace "@" (Text.singleton verpAtReplacement) recp + , domain + ] + in tell $ mempty { smtpEnvelopeFrom = Last $ Just verp } + | otherwise + -> tell $ mempty { smtpEnvelopeFrom = Last $ Just from } diff --git a/src/Model.hs b/src/Model.hs index f57f39a7c..54acc1b28 100644 --- a/src/Model.hs +++ b/src/Model.hs @@ -1,46 +1,43 @@ -{-# LANGUAGE EmptyDataDecls #-} -{-# LANGUAGE FlexibleInstances #-} -{-# LANGUAGE GADTs #-} {-# LANGUAGE GeneralizedNewtypeDeriving #-} -{-# LANGUAGE MultiParamTypeClasses #-} -{-# LANGUAGE NoImplicitPrelude #-} -{-# LANGUAGE OverloadedStrings #-} -{-# LANGUAGE TemplateHaskell #-} -{-# LANGUAGE TypeFamilies #-} -{-# LANGUAGE RecordWildCards #-} -{-# LANGUAGE StandaloneDeriving #-} - module Model ( module Model , module Model.Types + , module Cron.Types ) where import ClassyPrelude.Yesod import Database.Persist.Quasi +import Database.Persist.TH.Directory -- import Data.Time -- import Data.ByteString -import Model.Types -import Data.Aeson.TH +import Model.Types hiding (_maxPoints, _passingPoints) +import Cron.Types + +import Data.Aeson (Value) import Data.CaseInsensitive (CI) import Data.CaseInsensitive.Instances () +import Utils.Message (MessageClass) +import Settings.Cluster (ClusterSettingsKey) + +import Data.Binary (Binary) + -- You can define all of your database entities in the entities file. -- You can find more information on persistent and how to declare entities -- at: -- http://www.yesodweb.com/book/persistent/ share [mkPersist sqlSettings, mkDeleteCascade sqlSettings, mkMigrate "migrateAll'", mkSave "currentModel"] - $(persistFileWith lowerCaseSettings "models") + $(persistDirectoryWith lowerCaseSettings "models") -- (Eq Course) is impossible so we derive it for the Uniqueness Constraint only deriving instance Eq (Unique Course) +deriving instance Eq (Unique Sheet) -data PWEntry = PWEntry - { pwUser :: User - , pwHash :: Text - } deriving (Show) -$(deriveJSON defaultOptions ''PWEntry) +-- Primary keys mentioned in dbtable row-keys must be Binary +-- Automatically generated (i.e. numeric) ids are already taken care of +deriving instance Binary (Key Term) submissionRatingDone :: Submission -> Bool -submissionRatingDone Submission{..} = isJust submissionRatingPoints +submissionRatingDone Submission{..} = isJust submissionRatingTime diff --git a/src/Model/Migration.hs b/src/Model/Migration.hs index 54ec40156..ac11d3241 100644 --- a/src/Model/Migration.hs +++ b/src/Model/Migration.hs @@ -1,11 +1,3 @@ -{-# LANGUAGE NoImplicitPrelude #-} -{-# LANGUAGE TemplateHaskell, QuasiQuotes #-} -{-# LANGUAGE TypeFamilies, FlexibleInstances #-} -{-# LANGUAGE ExistentialQuantification #-} -{-# LANGUAGE DeriveGeneric #-} -{-# LANGUAGE OverloadedStrings #-} -{-# LANGUAGE RecordWildCards #-} - module Model.Migration ( migrateAll ) where @@ -16,6 +8,7 @@ import Utils (lastMaybe) import Model import Model.Migration.Version +import qualified Model.Migration.Types as Legacy import Data.Map (Map) import qualified Data.Map as Map @@ -57,9 +50,9 @@ share [mkPersist sqlSettings, mkMigrate "migrateDBVersioning"] deriving Show Eq Ord |] -migrateAll :: MonadIO m => ReaderT SqlBackend m () +migrateAll :: (MonadLogger m, MonadBaseControl IO m, MonadIO m) => ReaderT SqlBackend m () migrateAll = do - runMigration $ do + mapM_ ($logInfoS "Migration") <=< runMigrationSilent $ do -- Manual migrations to go to InitialVersion below: migrateEnableExtension "citext" @@ -76,21 +69,21 @@ migrateAll = do -- Map.foldlWithKey traverses migrations in ascending order of AppliedMigrationKey Map.foldlWithKey doCustomMigration (return ()) missingMigrations - runMigration migrateAll' + mapM_ ($logInfoS "Migration") =<< runMigrationSilent migrateAll' {- Confusion about quotes, from the PostgreSQL Manual: Single quotes for string constants, double quotes for table/column names. - QuasiQuoter: ^{TableName} @{ColumnName} (includes Escaping); - #{anything} (no escaping); + QuasiQuoter: ^{TableName} @{ColumnName} (escaped as column/table-name; value determined from current model); + #{anything} (escaped as value); -} customMigrations :: MonadIO m => Map (Key AppliedMigration) (ReaderT SqlBackend m ()) customMigrations = Map.fromListWith (>>) [ ( AppliedMigrationKey [migrationVersion|initial|] [version|0.0.0|] - , whenM (tableExists "user") $ do -- New theme format + , whenM (columnExists "user" "theme") $ do -- New theme format userThemes <- [sqlQQ| SELECT "id", "theme" FROM "user"; |] forM_ userThemes $ \(uid, Single str) -> case stripPrefix "theme--" str of Just v @@ -100,12 +93,12 @@ customMigrations = Map.fromListWith (>>) , ( AppliedMigrationKey [migrationVersion|0.0.0|] [version|1.0.0|] , whenM (tableExists "sheet") $ -- Better JSON encoding [executeQQ| - ALTER TABLE "sheet" ALTER COLUMN "type" TYPE json USING "type"::json; - ALTER TABLE "sheet" ALTER COLUMN "grouping" TYPE json USING "grouping"::json; + ALTER TABLE "sheet" ALTER COLUMN "type" TYPE jsonb USING "type"::jsonb; + ALTER TABLE "sheet" ALTER COLUMN "grouping" TYPE jsonb USING "grouping"::jsonb; |] ) , ( AppliedMigrationKey [migrationVersion|1.0.0|] [version|2.0.0|] - , whenM (tableExists "school") $ do -- SchoolId is the Shorthand CI Text now + , whenM (columnExists "school" "id") $ do -- SchoolId is the Shorthand CI Text now -- Read old table into memory schoolTable <- [sqlQQ| SELECT "id", "shorthand" FROM "school"; |] let _sT = schoolTable :: [(Single Int64, Single (CI Text))] -- Types needed @@ -150,9 +143,9 @@ customMigrations = Map.fromListWith (>>) FOREIGN KEY (school) REFERENCES school(shorthand); |] [executeQQ| - ALTER TABLE "school" DROP COLUMN "id"; - ALTER TABLE "school" ADD PRIMARY KEY (shorthand); - |] + ALTER TABLE "school" DROP COLUMN "id"; + ALTER TABLE "school" ADD PRIMARY KEY (shorthand); + |] ) , ( AppliedMigrationKey [migrationVersion|2.0.0|] [version|3.0.0|] , whenM (tableExists "sheet_corrector") $ do -- Load is encoded as JSON now. @@ -161,32 +154,57 @@ customMigrations = Map.fromListWith (>>) Just load -> update uid [SheetCorrectorLoad =. load] _other -> error $ "Could not parse Load: " <> show str [executeQQ| - ALTER TABLE "sheet_corrector" ALTER COLUMN "load" TYPE json USING "load"::json; + ALTER TABLE "sheet_corrector" ALTER COLUMN "load" TYPE jsonb USING "load"::jsonb; |] ) , ( AppliedMigrationKey [migrationVersion|3.0.0|] [version|3.1.0|] , whenM (tableExists "user") $ do userDisplayNames <- [sqlQQ| SELECT "id", "display_name" FROM "user"; |] [executeQQ| - ALTER TABLE "user" ADD COLUMN "surname" text DEFAULT ''; + ALTER TABLE "user" ADD COLUMN IF NOT EXISTS "surname" text DEFAULT ''; |] forM_ userDisplayNames $ \(uid, Single str) -> case lastMaybe $ words str of Just name -> update uid [UserSurname =. name] - _other -> error $ "Empty userDisplayName found" + _other -> error "Empty userDisplayName found" ) , ( AppliedMigrationKey [migrationVersion|3.1.0|] [version|3.2.0|] - , whenM (tableExists "sheet") $ do + , whenM (tableExists "sheet") $ [executeQQ| - ALTER TABLE "sheet" ADD COLUMN "upload_mode" json DEFAULT '{ "tag": "Upload", "unpackZips": true }'; + ALTER TABLE "sheet" ADD COLUMN IF NOT EXISTS "upload_mode" jsonb DEFAULT '{ "tag": "Upload", "unpackZips": true }'; |] ) , ( AppliedMigrationKey [migrationVersion|3.2.0|] [version|4.0.0|] - , whenM (tableExists "user") $ do + , whenM (columnExists "user" "plugin") $ -- <> is standard sql for /= [executeQQ| DELETE FROM "user" WHERE "plugin" <> 'LDAP'; ALTER TABLE "user" DROP COLUMN "plugin"; - ALTER TABLE "user" ADD COLUMN "authentication" json DEFAULT '"ldap"'; + ALTER TABLE "user" ADD COLUMN IF NOT EXISTS "authentication" jsonb DEFAULT '"ldap"'; + |] + ) + , ( AppliedMigrationKey [migrationVersion|4.0.0|] [version|5.0.0|] + , whenM (tableExists "user") $ + [executeQQ| + ALTER TABLE "user" ADD COLUMN IF NOT EXISTS "notification_settings" jsonb NOT NULL DEFAULT '[]'; + |] + ) + , ( AppliedMigrationKey [migrationVersion|5.0.0|] [version|6.0.0|] + , whenM (tableExists "sheet") $ do + sheets <- [sqlQQ| SELECT "id", "type" FROM "sheet"; |] + forM_ sheets $ \(sid, Single lsty) -> update sid [SheetType =. Legacy.sheetType lsty] + ) + , ( AppliedMigrationKey [migrationVersion|6.0.0|] [version|7.0.0|] + , whenM (tableExists "cluster_config") $ + [executeQQ| + UPDATE "cluster_config" SET "setting" = 'secret-box-key' WHERE "setting" = 'error-message-key'; + |] + ) + , ( AppliedMigrationKey [migrationVersion|7.0.0|] [version|8.0.0|] + , whenM (tableExists "sheet") $ + [executeQQ| + UPDATE "sheet" SET "type" = json_build_object('type', "type"->'type', 'grading', "type"->'') WHERE jsonb_exists("type", ''); + UPDATE "sheet" SET "type" = json_build_object('type', "type"->'type', 'grading', json_build_object('type', "type"->'grading'->'type', 'max', "type"->'grading'->'points')) WHERE ("type"->'grading'->'type') = '"points"' AND jsonb_exists("type"->'grading', 'points'); + UPDATE "sheet" SET "type" = json_build_object('type', "type"->'type', 'grading', json_build_object('type', "type"->'grading'->'type', 'max', "type"->'grading'->'points', 'passing', 0)) WHERE ("type"->'grading'->'type') = '"pass-points"' AND jsonb_exists("type"->'grading', 'points'); |] ) ] @@ -195,7 +213,18 @@ customMigrations = Map.fromListWith (>>) tableExists :: MonadIO m => Text -> ReaderT SqlBackend m Bool tableExists table = do - haveSchoolTable <- [sqlQQ| SELECT to_regclass(#{table}); |] - case haveSchoolTable :: [Maybe (Single PersistValue)] of + haveTable <- [sqlQQ| SELECT to_regclass(#{table}); |] + case haveTable :: [Maybe (Single PersistValue)] of [Just _] -> return True _other -> return False + +columnExists :: MonadIO m + => Text -- ^ Table + -> Text -- ^ Column + -> ReaderT SqlBackend m Bool +columnExists table column = do + haveColumn <- [sqlQQ|SELECT column_name FROM information_schema.columns WHERE table_name=#{table} and column_name=#{column};|] + case haveColumn :: [Single PersistValue] of + [_] -> return True + _other -> return False + diff --git a/src/Model/Migration/Types.hs b/src/Model/Migration/Types.hs new file mode 100644 index 000000000..0aed744b0 --- /dev/null +++ b/src/Model/Migration/Types.hs @@ -0,0 +1,29 @@ +module Model.Migration.Types where + +import ClassyPrelude.Yesod +import Data.Aeson.TH (deriveJSON, defaultOptions) +import Database.Persist.Sql + +import qualified Model as Current +import qualified Model.Types.JSON as Current + +data SheetType + = Bonus { maxPoints :: Current.Points } -- Erhöht nicht das Maximum, wird gutgeschrieben + | Normal { maxPoints :: Current.Points } -- Erhöht das Maximum, wird gutgeschrieben + | Pass { maxPoints, passingPoints :: Current.Points } + | NotGraded + deriving (Show, Read, Eq) + +sheetType :: SheetType -> Current.SheetType +sheetType Bonus {..} = Current.Bonus Current.Points {..} +sheetType Normal {..} = Current.Normal Current.Points {..} +sheetType Pass {..} = Current.Normal Current.PassPoints {..} +sheetType NotGraded = Current.NotGraded + +{- TODO: + * RenderMessage instance for newtype(SheetType) if needed +-} + + +deriveJSON defaultOptions ''SheetType +Current.derivePersistFieldJSON ''SheetType diff --git a/src/Model/Migration/Version.hs b/src/Model/Migration/Version.hs index 37bbd8f3f..35c799a10 100644 --- a/src/Model/Migration/Version.hs +++ b/src/Model/Migration/Version.hs @@ -1,10 +1,3 @@ -{-# LANGUAGE NoImplicitPrelude #-} -{-# LANGUAGE OverloadedStrings #-} -{-# LANGUAGE TemplateHaskell, QuasiQuotes #-} -{-# LANGUAGE PatternSynonyms #-} -{-# LANGUAGE RecordWildCards #-} -{-# LANGUAGE StandaloneDeriving #-} -{-# LANGUAGE DeriveLift, DeriveGeneric, DeriveDataTypeable #-} {-# OPTIONS_GHC -fno-warn-orphans #-} module Model.Migration.Version @@ -71,22 +64,25 @@ instance PersistFieldSql Version where version, migrationVersion :: QuasiQuoter -version = QuasiQuoter{..} +version = undefinedQuote{quoteExp} where - quoteExp v = TH.lift $ case [ x | (x, "") <- readP_to_S parseVersion v] of - [x] -> x + quoteExp v = case [ x | (x, "") <- readP_to_S parseVersion v] of + [x] -> TH.lift x [] -> error "No parse" _ -> error "Ambiguous parse" - quotePat = error "version cannot be used as pattern" - quoteType = error "version cannot be used as type" - quoteDec = error "version cannot be used as declaration" -migrationVersion = QuasiQuoter{..} +migrationVersion = undefinedQuote{quoteExp} where quoteExp "initial" = TH.lift InitialVersion - quoteExp v = TH.lift $ case [ x | (x, "") <- readP_to_S parseVersion v] of - [x] -> MigrationVersion x + quoteExp v = case [ x | (x, "") <- readP_to_S parseVersion v] of + [x] -> TH.lift $ MigrationVersion x [] -> error "No parse" _ -> error "Ambiguous parse" + + +undefinedQuote :: QuasiQuoter +undefinedQuote = QuasiQuoter{..} + where + quoteExp = error "version cannot be used as expression" quotePat = error "version cannot be used as pattern" quoteType = error "version cannot be used as type" quoteDec = error "version cannot be used as declaration" diff --git a/src/Model/Rating.hs b/src/Model/Rating.hs new file mode 100644 index 000000000..c7b4e910f --- /dev/null +++ b/src/Model/Rating.hs @@ -0,0 +1,36 @@ +module Model.Rating where + +import ClassyPrelude.Yesod +import Model +-- import Data.Text (Text) +import Data.Text.Encoding.Error (UnicodeException(..)) +import GHC.Generics (Generic) +import Data.Typeable (Typeable) + + +data Rating = Rating + { ratingCourseName :: CourseName + , ratingSheetName :: SheetName + , ratingCorrectorName :: Maybe Text + , ratingSheetType :: SheetType + , ratingValues :: Rating' + } deriving (Read, Show, Eq, Generic, Typeable) + +data Rating' = Rating' + { ratingPoints :: Maybe Points + , ratingComment :: Maybe Text + , ratingTime :: Maybe UTCTime + } deriving (Read, Show, Eq, Generic, Typeable) + +data RatingException = RatingNotUnicode UnicodeException -- ^ Rating failed to parse as unicode + | RatingMissingSeparator -- ^ Could not split rating header from comments + | RatingMultiple -- ^ Encountered multiple point values in rating + | RatingInvalid String -- ^ Failed to parse rating point value + | RatingFileIsDirectory -- ^ We do not expect this to, it's included for totality + | RatingNegative -- ^ Rating points must be non-negative + | RatingExceedsMax -- ^ Rating point must not exceed maximum points + | RatingNotExpected -- ^ Rating not expected + | RatingBinaryExpected -- ^ Rating must be 0 or 1 + deriving (Show, Eq, Generic, Typeable) + +instance Exception RatingException diff --git a/src/Model/Submission.hs b/src/Model/Submission.hs new file mode 100644 index 000000000..0f931911b --- /dev/null +++ b/src/Model/Submission.hs @@ -0,0 +1,22 @@ +module Model.Submission where + +import ClassyPrelude.Yesod +import CryptoID + +data SubmissionSinkException = DuplicateFileTitle FilePath + | DuplicateRating + | RatingWithoutUpdate + | ForeignRating CryptoFileNameSubmission + deriving (Typeable, Show) + +instance Exception SubmissionSinkException + +data SubmissionMultiSinkException + = SubmissionSinkException + { _submissionSinkId :: CryptoFileNameSubmission + , _submissionSinkFedFile :: Maybe FilePath + , _submissionSinkException :: SubmissionSinkException + } + deriving (Typeable, Show) + +instance Exception SubmissionMultiSinkException diff --git a/src/Model/Types.hs b/src/Model/Types.hs index 4f406a148..c72254dbd 100644 --- a/src/Model/Types.hs +++ b/src/Model/Types.hs @@ -1,20 +1,19 @@ -{-# LANGUAGE RecordWildCards #-} -{-# LANGUAGE PatternGuards #-} -{-# LANGUAGE LambdaCase #-} -{-# LANGUAGE TemplateHaskell #-} -{-# LANGUAGE NoImplicitPrelude #-} -{-# LANGUAGE OverloadedStrings #-} -{-# LANGUAGE DeriveGeneric, DeriveDataTypeable, GeneralizedNewtypeDeriving #-} -{-# LANGUAGE FlexibleInstances, MultiParamTypeClasses #-} -{-# LANGUAGE ViewPatterns #-} -{-- # LANGUAGE ExistentialQuantification #-} -- for DA type +{-# LANGUAGE GeneralizedNewtypeDeriving + , UndecidableInstances + #-} {-# OPTIONS_GHC -fno-warn-orphans #-} -- for instance PathPiece (CI Text) -module Model.Types where +module Model.Types + ( module Model.Types + , module Numeric.Natural + , module Mail + , module Utils.DateTime + ) where import ClassyPrelude import Utils -import Control.Lens +import Control.Lens hiding (universe) +import Utils.Lens.TH import Data.Set (Set) import qualified Data.Set as Set @@ -24,7 +23,10 @@ import Data.Monoid (Sum(..)) import Data.Maybe (fromJust) import Data.Universe import Data.Universe.Helpers -import Data.UUID.Types +import Data.UUID.Types (UUID) +import qualified Data.UUID.Types as UUID + +import Data.Default import Text.Read (readMaybe) @@ -40,45 +42,54 @@ import Data.Text (Text) import qualified Data.Text as Text import qualified Data.Text.Lens as Text +import qualified Data.HashMap.Strict as HashMap + import Data.CaseInsensitive (CI) import qualified Data.CaseInsensitive as CI import Data.CaseInsensitive.Instances () import Yesod.Core.Dispatch (PathPiece(..)) -import Data.Aeson (FromJSON(..), ToJSON(..), withText, Value(..)) +import qualified Data.Aeson as Aeson +import qualified Data.Aeson.Types as Aeson +import Data.Aeson (FromJSON(..), ToJSON(..), FromJSONKey(..), ToJSONKey(..), FromJSONKeyFunction(..), withText, withObject, Value()) +import Data.Aeson.Types (toJSONKeyText) import Data.Aeson.TH (deriveJSON, defaultOptions, Options(..), SumEncoding(..)) import GHC.Generics (Generic) import Generics.Deriving.Monoid (memptydefault, mappenddefault) import Data.Typeable (Typeable) +import Data.Universe.Instances.Reverse () + import qualified Yesod.Auth.Util.PasswordStore as PWStore +import Mail (MailLanguages(..)) +import Utils.DateTime (DateTimeFormat(..), SelDateTimeFormat(..)) + +import Numeric.Natural +import Data.Word.Word24 (Word24) +import Data.Bits +import Data.Ix +import Data.List (genericIndex, elemIndex) +import System.Random (Random(..)) +import Data.Data (Data) + +import Model.Types.Wordlist +import Data.Text.Metrics (damerauLevenshtein) + +import Data.Binary (Binary) + instance PathPiece UUID where - fromPathPiece = Data.UUID.Types.fromString . unpack - toPathPiece = pack . toString - -instance (CI.FoldCase s, PathPiece s) => PathPiece (CI s) where - fromPathPiece = fmap CI.mk . fromPathPiece - toPathPiece = toPathPiece . CI.original + fromPathPiece = UUID.fromString . unpack + toPathPiece = pack . UUID.toString instance {-# OVERLAPS #-} PathMultiPiece FilePath where fromPathMultiPiece = Just . unpack . intercalate "/" toPathMultiPiece = Text.splitOn "/" . pack -instance (CI.FoldCase s, PathMultiPiece s) => PathMultiPiece (CI s) where - fromPathMultiPiece = fmap CI.mk . fromPathMultiPiece - toPathMultiPiece = toPathMultiPiece . CI.foldedCase - -instance ToHttpApiData (CI Text) where - toUrlPiece = CI.original - -instance FromHttpApiData (CI Text) where - parseUrlPiece = return . CI.mk - - +type Count = Sum Integer type Points = Centi toPoints :: Integral a => a -> Points -- deprecated @@ -92,53 +103,129 @@ fromPoints = round instance DisplayAble Points +instance DisplayAble a => DisplayAble (Sum a) where + display (Sum x) = display x + +data SheetGrading + = Points { maxPoints :: Points } + | PassPoints { maxPoints, passingPoints :: Points } + | PassBinary -- non-zero means passed + deriving (Eq, Read, Show, Generic) + +deriveJSON defaultOptions + { constructorTagModifier = camelToPathPiece + , fieldLabelModifier = intercalate "-" . map toLower . dropEnd 1 . splitCamel + , sumEncoding = TaggedObject "type" "data" + } ''SheetGrading +derivePersistFieldJSON ''SheetGrading + +makeLenses_ ''SheetGrading + +_passingBound :: Fold SheetGrading (Either () Points) +_passingBound = folding passPts + where + passPts :: SheetGrading -> Maybe (Either () Points) + passPts (Points{}) = Nothing + passPts (PassPoints{passingPoints}) = Just $ Right passingPoints + passPts (PassBinary) = Just $ Left () + +gradingPassed :: SheetGrading -> Points -> Maybe Bool +gradingPassed gr pts = either pBinary pPoints <$> gr ^? _passingBound + where pBinary _ = pts /= 0 + pPoints b = pts >= b + + +data SheetGradeSummary = SheetGradeSummary + { numSheets :: Count -- Total number of sheets, includes all + , numSheetsPasses :: Count -- Number of sheets required to pass FKA: numGradePasses + , numSheetsPoints :: Count -- Number of sheets having points FKA: sumGradePointsd + , sumSheetsPoints :: Sum Points -- Total of all points in all sheets + -- Marking dependend + , numMarked :: Count -- Number of already marked sheets + , numMarkedPasses :: Count -- Number of already marked sheets with passes + , numMarkedPoints :: Count -- Number of already marked sheets with points + , sumMarkedPoints :: Sum Points -- Achieveable points within marked sheets + -- + , achievedPasses :: Count -- Achieved passes (within marked sheets) + , achievedPoints :: Sum Points -- Achieved points (within marked sheets) + } deriving (Generic, Read, Show, Eq) + +instance Monoid SheetGradeSummary where + mempty = memptydefault + mappend = mappenddefault + +instance Semigroup SheetGradeSummary where + (<>) = mappend -- TODO: remove for GHC > 8.4.x + +makeLenses_ ''SheetGradeSummary + +sheetGradeSum :: SheetGrading -> Maybe Points -> SheetGradeSummary +sheetGradeSum gr Nothing = mempty + { numSheets = 1 + , numSheetsPasses = bool mempty 1 $ has _passingBound gr + , numSheetsPoints = bool mempty 1 $ has _maxPoints gr + , sumSheetsPoints = maybe mempty Sum $ gr ^? _maxPoints + } +sheetGradeSum gr (Just p) = + let unmarked@SheetGradeSummary{..} = sheetGradeSum gr Nothing + in unmarked + { numMarked = numSheets + , numMarkedPasses = numSheetsPasses + , numMarkedPoints = numSheetsPoints + , sumMarkedPoints = sumSheetsPoints + , achievedPasses = fromMaybe mempty $ bool 0 1 <$> gradingPassed gr p + , achievedPoints = bool mempty (Sum p) $ has _maxPoints gr + } + + data SheetType - = Bonus { maxPoints :: Points } - | Normal { maxPoints :: Points } - | Pass { maxPoints, passingPoints :: Points } - | NotGraded - deriving (Show, Read, Eq) + = NotGraded + | Normal { grading :: SheetGrading } + | Bonus { grading :: SheetGrading } + | Informational { grading :: SheetGrading } + deriving (Eq, Read, Show, Generic) -instance DisplayAble SheetType where - display (Bonus {..}) = tshow maxPoints <> " Bonuspunkte" - display (Normal{..}) = tshow maxPoints <> " Punkte" - display (Pass {..}) = "Bestanden ab " <> tshow (pToI passingPoints) <> " von " <> tshow maxPoints - display (NotGraded) = "Unbewertet" - -deriveJSON defaultOptions ''SheetType +deriveJSON defaultOptions + { constructorTagModifier = camelToPathPiece + , fieldLabelModifier = camelToPathPiece + , sumEncoding = TaggedObject "type" "data" + } ''SheetType derivePersistFieldJSON ''SheetType data SheetTypeSummary = SheetTypeSummary - { sumBonusPoints :: Sum Points - , sumNormalPoints :: Sum Points - , numPassSheets :: Sum Int - , numNotGraded :: Sum Int - , achievedBonus :: Maybe (Sum Points) - , achievedNormal :: Maybe (Sum Points) - , achievedPasses :: Maybe (Sum Int) - } deriving (Generic) + { normalSummary + , bonusSummary + , informationalSummary :: SheetGradeSummary + , numNotGraded :: Count + } deriving (Generic, Read, Show, Eq) instance Monoid SheetTypeSummary where - mempty = memptydefault + mempty = memptydefault mappend = mappenddefault -sheetTypeSum :: (SheetType, Maybe Points) -> SheetTypeSummary -sheetTypeSum (Bonus{..}, achieved) = mempty { sumBonusPoints = Sum maxPoints, achievedBonus = Sum <$> achieved } -sheetTypeSum (Normal{..}, achieved) = mempty { sumNormalPoints = Sum maxPoints, achievedNormal = Sum <$> achieved } -sheetTypeSum (Pass{..}, achieved) = mempty { numPassSheets = Sum 1, achievedPasses = Sum . bool 0 1 . (passingPoints <=) <$> achieved} -sheetTypeSum (NotGraded, _ ) = mempty { numNotGraded = Sum 1 } +instance Semigroup SheetTypeSummary where + (<>) = mappend -- TODO: remove for GHC > 8.4.x +makeLenses_ ''SheetTypeSummary + +sheetTypeSum :: SheetType -> Maybe Points -> SheetTypeSummary +sheetTypeSum Bonus{..} mps = mempty { bonusSummary = sheetGradeSum grading mps } +sheetTypeSum Normal{..} mps = mempty { normalSummary = sheetGradeSum grading mps } +sheetTypeSum Informational{..} mps = mempty { informationalSummary = sheetGradeSum grading mps } +sheetTypeSum NotGraded _ = mempty { numNotGraded = Sum 1 } data SheetGroup - = Arbitrary { maxParticipants :: Int } + = Arbitrary { maxParticipants :: Natural } | RegisteredGroups | NoGroups - deriving (Show, Read, Eq) + deriving (Show, Read, Eq, Generic) deriveJSON defaultOptions ''SheetGroup derivePersistFieldJSON ''SheetGroup +makeLenses_ ''SheetGroup + data SheetFileType = SheetExercise | SheetHint | SheetSolution | SheetMarking - deriving (Show, Read, Eq, Ord, Enum, Bounded) + deriving (Show, Read, Eq, Ord, Enum, Bounded, Generic) derivePersistField "SheetFileType" instance Universe SheetFileType where universe = universeDef @@ -165,7 +252,7 @@ partitionFileType :: Ord a => [(SheetFileType,a)] -> SheetFileType -> Set a partitionFileType fs t = Map.findWithDefault Set.empty t . Map.fromListWith Set.union $ map (over _2 Set.singleton) fs data SubmissionFileType = SubmissionOriginal | SubmissionCorrected - deriving (Show, Read, Eq, Ord, Enum, Bounded) + deriving (Show, Read, Eq, Ord, Enum, Bounded, Generic) instance Universe SubmissionFileType where universe = universeDef instance Finite SubmissionFileType @@ -196,28 +283,52 @@ instance DisplayAble DA where data UploadMode = NoUpload | Upload { unpackZips :: Bool } - deriving (Show, Read, Eq, Ord) + deriving (Show, Read, Eq, Ord, Generic) deriveJSON defaultOptions ''UploadMode derivePersistFieldJSON ''UploadMode +instance Universe UploadMode where + universe = NoUpload : (Upload <$> universe) +instance Finite UploadMode + +instance PathPiece UploadMode where + toPathPiece = \case + NoUpload -> "no-upload" + Upload True -> "unpack" + Upload False -> "no-unpack" + fromPathPiece = finiteFromPathPiece + +data SheetSubmissionMode = NoSubmissions + | CorrectorSubmissions + | UserSubmissions + deriving (Show, Read, Eq, Ord, Enum, Bounded, Generic) + +deriveJSON defaultOptions + { constructorTagModifier = camelToPathPiece + } ''SheetSubmissionMode +derivePersistField "SheetSubmissionMode" + +instance Universe SheetSubmissionMode +instance Finite SheetSubmissionMode + +nullaryPathPiece ''SheetSubmissionMode camelToPathPiece + data ExamStatus = Attended | NoShow | Voided - deriving (Show, Read, Eq, Ord, Enum, Bounded) + deriving (Show, Read, Eq, Ord, Enum, Bounded, Generic) derivePersistField "ExamStatus" -- | Specify a corrector's workload data Load -- = ByTutorial { countsToLoad :: Bool } | ByProportion { load :: Rational } - = Load { byTutorial :: Maybe Bool -- ^ Just all from Tutorial, True if counting towards overall workload + = Load { byTutorial :: Maybe Bool -- ^ @Just@ all from Tutorial, @True@ if counting towards overall workload , byProportion :: Rational -- ^ workload proportion of all submission not assigned to tutorial leaders } - deriving (Show, Read, Eq, Ord) + deriving (Show, Read, Eq, Ord, Generic) deriveJSON defaultOptions ''Load derivePersistFieldJSON ''Load - - instance Semigroup Load where (Load byTut prop) <> (Load byTut' prop') = Load byTut'' (prop + prop') where @@ -240,6 +351,8 @@ instance Monoid Load where data Season = Summer | Winter deriving (Show, Read, Eq, Ord, Enum, Bounded, Generic, Typeable) +instance Binary Season + seasonToChar :: Season -> Char seasonToChar Summer = 'S' seasonToChar Winter = 'W' @@ -259,6 +372,13 @@ data TermIdentifier = TermIdentifier , season :: Season } deriving (Show, Read, Eq, Ord, Generic, Typeable) +instance Binary TermIdentifier + +instance Enum TermIdentifier where + -- ^ Do not use for conversion – Enumeration only + toEnum int = let (toInteger -> year, toEnum -> season) = int `divMod` 2 in TermIdentifier{..} + fromEnum TermIdentifier{..} = fromInteger year * 2 + fromEnum season + -- Conversion TermId <-> TermIdentifier:: -- from_TermId_to_TermIdentifier = unTermKey -- from_TermIdentifier_to_TermId = TermKey @@ -332,7 +452,7 @@ instance PathPiece TermIdentifier where toPathPiece = termToText instance ToJSON TermIdentifier where - toJSON = String . termToText + toJSON = Aeson.String . termToText instance FromJSON TermIdentifier where parseJSON = withText "Term" $ either (fail . Text.unpack) return . termFromText @@ -352,9 +472,19 @@ time `withinTerm` term = timeYear `mod` 100 == termYear `mod` 100 data StudyFieldType = FieldPrimary | FieldSecondary - deriving (Eq, Ord, Enum, Show, Read, Bounded) + deriving (Eq, Ord, Enum, Show, Read, Bounded, Generic) derivePersistField "StudyFieldType" +instance PersistField UUID where + toPersistValue = PersistDbSpecific . UUID.toASCIIBytes + fromPersistValue (PersistText t) = maybe (Left "Failed to parse UUID") Right $ UUID.fromText t + fromPersistValue (PersistByteString bs) = maybe (Left "Failed to parse UUID") Right $ UUID.fromASCIIBytes bs + fromPersistValue (PersistDbSpecific bs) = maybe (Left "Failed to parse UUID") Right $ UUID.fromASCIIBytes bs + fromPersistValue x = Left $ "Expected UUID, received: " <> tshow x + +instance PersistFieldSql UUID where + sqlType _ = SqlOther "uuid" + instance DisplayAble StudyFieldType data Theme @@ -364,20 +494,16 @@ data Theme | ThemeAberdeenReds | ThemeMossGreen | ThemeSkyLove - deriving (Eq, Ord, Bounded, Enum, Show, Read) + deriving (Eq, Ord, Bounded, Enum, Show, Read, Generic) deriveJSON defaultOptions { constructorTagModifier = fromJust . stripPrefix "Theme" } ''Theme -$( return [] ) -- forces order of splices, error otherwise, see https://ghc.haskell.org/trac/ghc/ticket/9813 - instance Universe Theme where universe = universeDef instance Finite Theme -instance PathPiece Theme where - toPathPiece = $(nullaryToPathPiece ''Theme [Text.intercalate "-" . map Text.toLower . unsafeTail . splitCamel]) - fromPathPiece = finiteFromPathPiece +nullaryPathPiece ''Theme (camelToPathPiece' 1) $(deriveSimpleWith ''DisplayAble 'display (over Text.packed $ Text.intercalate " " . unsafeTail . splitCamel) ''Theme) -- describe theme to user @@ -391,17 +517,9 @@ instance PathPiece obj => PathPiece (ZIPArchiveName obj) where fromPathPiece = fmap ZIPArchiveName . fromPathPiece <=< (stripSuffix `on` CI.foldCase) ".zip" toPathPiece = (<> ".zip") . toPathPiece . unZIPArchiveName -newtype DateTimeFormat = DateTimeFormat { unDateTimeFormat :: String } - deriving (Eq, Ord, Read, Show, ToJSON, FromJSON, PersistField, PersistFieldSql, IsString) - -data SelDateTimeFormat = SelFormatDateTime | SelFormatDate | SelFormatTime - deriving (Eq, Ord, Read, Show, Enum, Bounded) - data CorrectorState = CorrectorNormal | CorrectorMissing | CorrectorExcused - deriving (Eq, Ord, Read, Show, Enum, Bounded) - -$( return [] ) -- forces order of splices, error otherwise, see https://ghc.haskell.org/trac/ghc/ticket/9813 + deriving (Eq, Ord, Read, Show, Enum, Bounded, Generic) deriveJSON defaultOptions { constructorTagModifier = fromJust . stripPrefix "Corrector" @@ -410,16 +528,14 @@ deriveJSON defaultOptions instance Universe CorrectorState where universe = universeDef instance Finite CorrectorState -instance PathPiece CorrectorState where - toPathPiece = $(nullaryToPathPiece ''CorrectorState [Text.intercalate "-" . map toLower . unsafeTail . splitCamel]) - fromPathPiece = finiteFromPathPiece +nullaryPathPiece ''CorrectorState (camelToPathPiece' 1) derivePersistField "CorrectorState" data AuthenticationMode = AuthLDAP | AuthPWHash { authPWHash :: Text } - deriving (Eq, Ord, Read, Show) + deriving (Eq, Ord, Read, Show, Generic) deriveJSON defaultOptions { constructorTagModifier = intercalate "-" . map toLower . drop 1 . splitCamel @@ -429,14 +545,241 @@ deriveJSON defaultOptions derivePersistFieldJSON ''AuthenticationMode - + +derivePersistFieldJSON ''Value + + +-- ^ `NotificationSettings` is for now a series of boolean checkboxes, i.e. a mapping @NotificationTrigger -> Bool@ +-- +-- Could maybe be replaced with `Structure Notification` in the long term +data NotificationTrigger = NTSubmissionRatedGraded + | NTSubmissionRated + | NTSheetActive + | NTSheetSoonInactive + | NTSheetInactive + | NTCorrectionsAssigned + | NTCorrectionsNotDistributed + deriving (Eq, Ord, Read, Show, Enum, Bounded, Generic, Typeable) + +instance Universe NotificationTrigger +instance Finite NotificationTrigger + +instance Hashable NotificationTrigger + +deriveJSON defaultOptions + { constructorTagModifier = intercalate "-" . map toLower . drop 1 . splitCamel + } ''NotificationTrigger + +instance ToJSONKey NotificationTrigger where + toJSONKey = toJSONKeyText $ \v -> let Aeson.String t = toJSON v in t + +instance FromJSONKey NotificationTrigger where + fromJSONKey = FromJSONKeyTextParser $ parseJSON . Aeson.String + + +newtype NotificationSettings = NotificationSettings { notificationAllowed :: NotificationTrigger -> Bool } + deriving (Generic, Typeable) + deriving newtype (Eq, Ord, Read, Show) + +instance Default NotificationSettings where + def = NotificationSettings $ \case + NTSubmissionRatedGraded -> True + NTSubmissionRated -> False + NTSheetActive -> True + NTSheetSoonInactive -> False + NTSheetInactive -> True + NTCorrectionsAssigned -> True + NTCorrectionsNotDistributed -> True + +instance ToJSON NotificationSettings where + toJSON v = toJSON . HashMap.fromList $ map (id &&& notificationAllowed v) universeF + +instance FromJSON NotificationSettings where + parseJSON = withObject "NotificationSettings" $ \o -> do + o' <- parseJSON $ Aeson.Object o :: Aeson.Parser (HashMap NotificationTrigger Bool) + return . NotificationSettings $ \n -> case HashMap.lookup n o' of + Nothing -> notificationAllowed def n + Just b -> b + +derivePersistFieldJSON ''NotificationSettings + + +instance ToBackendKey SqlBackend record => Hashable (Key record) where + hashWithSalt s key = s `hashWithSalt` fromSqlKey key + + +derivePersistFieldJSON ''MailLanguages + + +type PseudonymWord = CI Text + +newtype Pseudonym = Pseudonym Word24 + deriving (Eq, Ord, Read, Show, Generic, Data) + deriving newtype (Bounded, Enum, Integral, Num, Real, Ix) + + +instance PersistField Pseudonym where + toPersistValue p = toPersistValue (fromIntegral p :: Word32) + fromPersistValue v = do + w <- fromPersistValue v :: Either Text Word32 + if + | 0 <= w + , w <= fromIntegral (maxBound :: Pseudonym) + -> return $ fromIntegral w + | otherwise + -> Left "Pseudonym out of range" + +instance PersistFieldSql Pseudonym where + sqlType _ = SqlInt32 + +instance Random Pseudonym where + randomR (max minBound -> lo, min maxBound -> hi) gen = over _1 (fromIntegral :: Word32 -> Pseudonym) $ randomR (fromIntegral lo, fromIntegral hi) gen + random = randomR (minBound, maxBound) + +instance FromJSON Pseudonym where + parseJSON v@(Aeson.Number _) = do + w <- parseJSON v :: Aeson.Parser Word32 + if + | 0 <= w + , w <= fromIntegral (maxBound :: Pseudonym) + -> return $ fromIntegral w + | otherwise + -> fail "Pseudonym out auf range" + parseJSON (Aeson.String t) + = case t ^? _PseudonymText of + Just p -> return p + Nothing -> fail "Could not parse pseudonym" + parseJSON v = flip (Aeson.withArray "Pseudonym") v $ \ws -> do + ws' <- toList . map CI.mk <$> mapM parseJSON ws + case ws' ^? _PseudonymWords of + Just p -> return p + Nothing -> fail "Could not parse pseudonym words" + +instance ToJSON Pseudonym where + toJSON = toJSON . (review _PseudonymWords :: Pseudonym -> [PseudonymWord]) + +pseudonymWordlist :: [PseudonymWord] +pseudonymCharacters :: Set (CI Char) +(pseudonymWordlist, pseudonymCharacters) = $(wordlist "config/wordlist.txt") + +_PseudonymWords :: Prism' [PseudonymWord] Pseudonym +_PseudonymWords = prism' pToWords pFromWords + where + pFromWords :: [PseudonymWord] -> Maybe Pseudonym + pFromWords [w1, w2] + | Just i1 <- elemIndex w1 pseudonymWordlist + , Just i2 <- elemIndex w2 pseudonymWordlist + , i1 <= maxWord, i2 <= maxWord + = Just . Pseudonym $ shiftL (fromIntegral i1) 12 .|. fromIntegral i2 + pFromWords _ = Nothing + + pToWords :: Pseudonym -> [PseudonymWord] + pToWords (Pseudonym p) + = [ genericIndex pseudonymWordlist $ shiftR p 12 .&. maxWord + , genericIndex pseudonymWordlist $ p .&. maxWord + ] + + maxWord :: Num a => a + maxWord = 0b111111111111 + +_PseudonymText :: Prism' Text Pseudonym +_PseudonymText = prism' tToWords tFromWords . _PseudonymWords + where + tFromWords :: Text -> Maybe [PseudonymWord] + tFromWords input + | [result] <- input ^.. pseudonymFragments + = Just result + | otherwise + = Nothing + + tToWords :: [PseudonymWord] -> Text + tToWords = Text.unwords . map CI.original + +pseudonymWords :: Fold Text PseudonymWord +pseudonymWords = folding + $ \(CI.mk -> input) -> map (view _2) . fromMaybe [] . listToMaybe . groupBy ((==) `on` view _1) . sortBy (comparing $ view _1) . filter ((<= distanceCutoff) . view _1) $ map (distance input &&& id) pseudonymWordlist + where + distance = damerauLevenshtein `on` CI.foldedCase + -- | Arbitrary cutoff point, for reference: ispell cuts off at 1 + distanceCutoff = 2 + +pseudonymFragments :: Fold Text [PseudonymWord] +pseudonymFragments = folding + $ mapM (toListOf pseudonymWords) . (\l -> guard (length l == 2) *> l) . filter (not . null) . Text.split (\(CI.mk -> c) -> not $ Set.member c pseudonymCharacters) + + +data AuthTag + = AuthFree + | AuthAdmin + | AuthNoEscalation + | AuthDeprecated + | AuthDevelopment + | AuthLecturer + | AuthCorrector + | AuthTime + | AuthRegistered + | AuthParticipant + | AuthCapacity + | AuthEmpty + | AuthMaterials + | AuthOwner + | AuthRated + | AuthUserSubmissions + | AuthCorrectorSubmissions + | AuthAuthentication + | AuthRead + | AuthWrite + deriving (Eq, Ord, Enum, Bounded, Read, Show, Generic) + +instance Universe AuthTag +instance Finite AuthTag +instance Hashable AuthTag + +deriveJSON defaultOptions + { constructorTagModifier = camelToPathPiece' 1 + } ''AuthTag + +nullaryPathPiece ''AuthTag (camelToPathPiece' 1) + +instance ToJSONKey AuthTag where + toJSONKey = toJSONKeyText $ \v -> let Aeson.String t = toJSON v in t + +instance FromJSONKey AuthTag where + fromJSONKey = FromJSONKeyTextParser $ parseJSON . Aeson.String + + +newtype AuthTagActive = AuthTagActive { authTagIsActive :: AuthTag -> Bool } + deriving (Read, Show, Generic) + deriving newtype (Eq, Ord) + +instance Default AuthTagActive where + def = AuthTagActive $ \case + AuthAdmin -> False + _ -> True + +instance ToJSON AuthTagActive where + toJSON v = toJSON . HashMap.fromList $ map (id &&& authTagIsActive v) universeF + +instance FromJSON AuthTagActive where + parseJSON = withObject "AuthTagActive" $ \o -> do + o' <- parseJSON $ Aeson.Object o :: Aeson.Parser (HashMap AuthTag Bool) + return . AuthTagActive $ \n -> case HashMap.lookup n o' of + Nothing -> authTagIsActive def n + Just b -> b + +derivePersistFieldJSON ''AuthTagActive + + -- Type synonyms +type Email = Text + type SchoolName = CI Text type SchoolShorthand = CI Text type CourseName = CI Text type CourseShorthand = CI Text type SheetName = CI Text -type UserEmail = CI Text +type UserEmail = CI Email type PWHashAlgorithm = ByteString -> PWStore.Salt -> Int -> ByteString +type InstanceId = UUID diff --git a/src/Model/Types/JSON.hs b/src/Model/Types/JSON.hs index 655c95294..e69f8f1b2 100644 --- a/src/Model/Types/JSON.hs +++ b/src/Model/Types/JSON.hs @@ -1,7 +1,3 @@ -{-# LANGUAGE NoImplicitPrelude #-} -{-# LANGUAGE RecordWildCards #-} -{-# LANGUAGE TemplateHaskell, QuasiQuotes #-} - module Model.Types.JSON ( derivePersistFieldJSON ) where @@ -20,10 +16,10 @@ import Language.Haskell.TH.Datatype derivePersistFieldJSON :: Name -> DecsQ -derivePersistFieldJSON n = do - DatatypeInfo{..} <- reifyDatatype n +derivePersistFieldJSON tName = do + DatatypeInfo{..} <- reifyDatatype tName vars <- forM datatypeVars (const $ newName "a") - let t = foldl (\t n -> t `appT` varT n) (conT n) vars + let t = foldl (\t' n' -> t' `appT` varT n') (conT tName) vars iCxt | null vars = cxt [] | otherwise = cxt [[t|ToJSON|] `appT` t, [t|FromJSON|] `appT` t] @@ -43,14 +39,14 @@ derivePersistFieldJSON n = do bs <- newName "bs" clause [[p|PersistByteString $(varP bs)|]] (normalB [e|first pack $ JSON.eitherDecodeStrict' $(varE bs)|]) [] , do - t <- newName "t" - clause [[p|PersistText $(varP t)|]] (normalB [e|first pack . JSON.eitherDecodeStrict' $ Text.encodeUtf8 $(varE t)|]) [] + text <- newName "text" + clause [[p|PersistText $(varP text)|]] (normalB [e|first pack . JSON.eitherDecodeStrict' $ Text.encodeUtf8 $(varE text)|]) [] , clause [wildP] (normalB [e|Left "JSON values must be converted from PersistDbSpecific, PersistText, or PersistByteString"|]) [] ] ] , instanceD sqlCxt ([t|PersistFieldSql|] `appT` t) [ funD (mkName "sqlType") - [ clause [wildP] (normalB [e|SqlOther "json"|]) [] + [ clause [wildP] (normalB [e|SqlOther "jsonb"|]) [] ] ] ] diff --git a/src/Model/Types/Wordlist.hs b/src/Model/Types/Wordlist.hs new file mode 100644 index 000000000..5cfecd662 --- /dev/null +++ b/src/Model/Types/Wordlist.hs @@ -0,0 +1,41 @@ +module Model.Types.Wordlist (wordlist) where + +import ClassyPrelude hiding (lift) + +import Language.Haskell.TH +import Language.Haskell.TH.Syntax (qAddDependentFile, Lift(..)) + +import Data.Text (Text) +import qualified Data.Text as Text +import qualified Data.Text.IO as Text + +import qualified Data.Set as Set + +import qualified Data.CaseInsensitive as CI +import Data.CaseInsensitive.Instances () + +wordlist :: FilePath -> ExpQ +wordlist file = do + qAddDependentFile file + wordlist' <- runIO $ filter ((||) <$> not . isComment <*> isWord) . Text.lines <$> Text.readFile file + let usedChars = Set.unions $ map (Set.fromList . map CI.mk . Text.unpack) wordlist' + tupE + [ listE $ map (\(Text.unpack -> word) -> [e|CI.mk $ Text.pack $(lift word)|]) wordlist' + , [e|Set.fromDistinctAscList $(lift $ Set.toAscList usedChars)|] + ] + +isWord :: Text -> Bool +isWord t + | [w] <- Text.words t + , w == t + = True + | otherwise + = False + +isComment :: Text -> Bool +isComment line = or + [ commentSymbol `Text.isPrefixOf` Text.stripStart line + , Text.null $ Text.strip line + ] + where + commentSymbol = "#" diff --git a/src/Network/Mail/Mime/Instances.hs b/src/Network/Mail/Mime/Instances.hs new file mode 100644 index 000000000..18c22e67a --- /dev/null +++ b/src/Network/Mail/Mime/Instances.hs @@ -0,0 +1,33 @@ +{-# OPTIONS_GHC -fno-warn-orphans #-} + +module Network.Mail.Mime.Instances + ( + ) where + +import ClassyPrelude +import Network.Mail.Mime +import Data.Hashable (Hashable) + +import Data.Aeson +import Data.Aeson.TH + +import Utils.PathPiece + +import Utils (assertM) + + +deriving instance Read Address +deriving instance Ord Address +deriving instance Generic Address + +instance Hashable Address + +deriveToJSON defaultOptions + { fieldLabelModifier = intercalate "-" . map toLower . drop 1 . splitCamel + } ''Address + +instance FromJSON Address where + parseJSON = withObject "Address" $ \obj -> do + addressName <- assertM (not . null) <$> (obj .:? "name") + addressEmail <- obj .: "email" + return Address{..} diff --git a/src/Settings.hs b/src/Settings.hs index 4649c76f4..f3ad5f7ac 100644 --- a/src/Settings.hs +++ b/src/Settings.hs @@ -1,21 +1,21 @@ -{-# LANGUAGE CPP #-} -{-# LANGUAGE NoImplicitPrelude #-} -{-# LANGUAGE OverloadedStrings #-} -{-# LANGUAGE RecordWildCards #-} -{-# LANGUAGE TemplateHaskell #-} -{-# LANGUAGE MultiWayIf #-} {-# OPTIONS_GHC -fno-warn-orphans #-} + -- | Settings are centralized, as much as possible, into this file. This -- includes database connection settings, static file locations, etc. -- In addition, you can configure a number of different aspects of Yesod -- by overriding methods in the Yesod typeclass. That instance is -- declared in the Foundation.hs file. -module Settings where +module Settings + ( module Settings + , module Settings.Cluster + ) where import ClassyPrelude.Yesod +import Data.UUID (UUID) import qualified Control.Exception as Exception -import Data.Aeson (Result (..), fromJSON, withObject, - (.!=), (.:?)) +import Data.Aeson (Result (..), fromJSON, withObject + ,(.!=), (.:?), withScientific + ) import qualified Data.Aeson.Types as Aeson import Data.Aeson.TH import Data.FileEmbed (embedFile) @@ -29,6 +29,12 @@ import Yesod.Default.Util (WidgetFileSettings, widgetFileReload) import qualified Yesod.Auth.Util.PasswordStore as PWStore +import Data.Time (NominalDiffTime, nominalDay) + +import Data.Scientific (toBoundedInteger) +import Data.Word (Word16) + +import qualified Data.Text as Text import qualified Data.Text.Encoding as Text import qualified Ldap.Client as Ldap @@ -39,18 +45,38 @@ import Control.Lens import Data.Maybe (fromJust) import qualified Data.Char as Char +import qualified Network.HaskellNet.Auth as HaskellNet (UserName, Password, AuthType(..)) +import qualified Network.Socket as HaskellNet (PortNumber(..), HostName) +import qualified Network + +import Network.Mail.Mime (Address) +import Network.Mail.Mime.Instances () + +import Mail (VerpMode) + +import qualified Database.Memcached.Binary.Types as Memcached + import Model +import Settings.Cluster + +import Control.Monad.Trans.Maybe (MaybeT(..)) + +import qualified System.FilePath as FilePath -- | Runtime settings to configure this application. These settings can be -- loaded from various sources: defaults, environment variables, config files, -- theoretically even a database. data AppSettings = AppSettings - { appStaticDir :: String + { appStaticDir :: FilePath -- ^ Directory from which to serve static files. , appDatabaseConf :: PostgresConf -- ^ Configuration settings for accessing the database. , appLdapConf :: Maybe LdapConf -- ^ Configuration settings for accessing the LDAP-directory + , appSmtpConf :: Maybe SmtpConf + -- ^ Configuration settings for accessing a SMTP Mailserver + , appWidgetMemcachedConf :: Maybe WidgetMemcachedConf + -- ^ Configuration settings for accessing a Memcached instance for use with `addStaticContent` , appRoot :: Maybe Text -- ^ Base for all generated URLs. If @Nothing@, determined -- from the request headers. @@ -61,11 +87,21 @@ data AppSettings = AppSettings , appIpFromHeader :: Bool -- ^ Get the IP address from the header when logging. Useful when sitting -- behind a reverse proxy. + , appMailFrom :: Address + , appMailObjectDomain :: Text + , appMailVerp :: VerpMode + , appMailSupport :: Address + , appJobWorkers :: Natural + , appJobFlushInterval :: Maybe NominalDiffTime + , appJobCronInterval :: NominalDiffTime + , appJobStaleThreshold :: NominalDiffTime + , appNotificationRateLimit :: NominalDiffTime + , appNotificationCollateDelay :: NominalDiffTime + , appNotificationExpiration :: NominalDiffTime + , appSessionTimeout :: NominalDiffTime + + , appInitialLogSettings :: LogSettings - , appDetailedRequestLogging :: Bool - -- ^ Use detailed request logging system - , appShouldLogAll :: Bool - -- ^ Should all log messages be displayed? , appReloadTemplates :: Bool -- ^ Use the reload version of templates , appMutableStatic :: Bool @@ -76,29 +112,46 @@ data AppSettings = AppSettings -- ^ Indicate if auth dummy login should be enabled. , appAllowDeprecated :: Bool -- ^ Indicate if deprecated routes are accessible for everyone - , appMinimumLogLevel :: LogLevel + , appEncryptErrors :: Bool , appUserDefaults :: UserDefaultConf , appAuthPWHash :: PWHashConf - , appCryptoIDKeyFile :: FilePath - } - + , appInitialInstanceID :: Maybe (Either FilePath UUID) + } deriving (Show) + +data LogSettings = LogSettings + { logAll, logDetailed :: Bool + , logMinimumLevel :: LogLevel + , logDestination :: LogDestination + } deriving (Show, Read, Generic, Eq, Ord) + +data LogDestination = LogDestStderr | LogDestStdout | LogDestFile { logDestFile :: !FilePath } + deriving (Show, Read, Generic, Eq, Ord) + +deriving instance Generic LogLevel +instance Hashable LogLevel +instance Hashable LogSettings +instance Hashable LogDestination + data UserDefaultConf = UserDefaultConf { userDefaultTheme :: Theme , userDefaultMaxFavourites :: Int , userDefaultDateTimeFormat, userDefaultDateFormat, userDefaultTimeFormat :: DateTimeFormat , userDefaultDownloadFiles :: Bool - } + } deriving (Show) data PWHashConf = PWHashConf { pwHashAlgorithm :: PWHashAlgorithm , pwHashStrength :: Int } +instance Show PWHashConf where + show PWHashConf{..} = "PWHashConf { pwHashStrength = " <> show pwHashStrength <> ", .. }" + instance FromJSON PWHashConf where parseJSON = withObject "PWHashConf" $ \o -> do - pwHashAlgorithm' <- (o .: "algorithm" :: Aeson.Parser Text) + pwHashAlgorithm' <- o .: "algorithm" :: Aeson.Parser Text pwHashAlgorithm <- if | pwHashAlgorithm' == "pbkdf1" -> return PWStore.pbkdf1 | pwHashAlgorithm' == "pbkdf2" -> return PWStore.pbkdf2 @@ -112,12 +165,76 @@ data LdapConf = LdapConf , ldapDn :: Ldap.Dn, ldapPassword :: Ldap.Password , ldapBase :: Ldap.Dn , ldapScope :: Ldap.Scope - , ldapTimeout :: Int32 - } + , ldapTimeout :: NominalDiffTime + , ldapSearchTimeout :: Int32 + , ldapPool :: ResourcePoolConf + } deriving (Show) +data SmtpConf = SmtpConf + { smtpHost :: HaskellNet.HostName + , smtpPort :: HaskellNet.PortNumber + , smtpAuth :: Maybe SmtpAuthConf + , smtpSsl :: SmtpSslMode + , smtpPool :: ResourcePoolConf + } deriving (Show) + +data WidgetMemcachedConf = WidgetMemcachedConf + { widgetMemcachedConnectInfo :: Memcached.ConnectInfo + , widgetMemcachedBaseUrl :: Text + , widgetMemcachedExpiry :: Maybe NominalDiffTime + } deriving (Show) + +instance FromJSON Memcached.Auth where + parseJSON = Aeson.withText "Auth" $ \(Text.breakOn "@" -> (encodeUtf8 -> user, encodeUtf8 -> pw)) -> return $ Memcached.Plain user pw + +instance FromJSON Network.PortID where + parseJSON v = Network.UnixSocket <$> pSocket v <|> Network.PortNumber <$> pNumber v <|> Network.Service <$> pService v + where + pSocket = Aeson.withText "UnixSocket" $ fmap unpack . assertM' ("/" `Text.isPrefixOf`) + pNumber = Aeson.withScientific "PortNumber" $ maybe (fail "PortNumber ") (return . (fromIntegral :: Word16 -> Network.PortNumber)) . toBoundedInteger + pService = Aeson.withText "Service" $ return . unpack + +instance FromJSON WidgetMemcachedConf where + parseJSON = withObject "WidgetMemcachedConf" $ \o -> do + connectHost <- o .: "host" + connectPort <- o .: "port" + connectAuth <- o .: "auth" + numConnection <- o .: "limit" + connectionIdleTime <- o .: "timeout" + widgetMemcachedBaseUrl <- o .: "base-url" + widgetMemcachedExpiry <- assertM (maybe True $ \t -> 0 < t && t <= 30 * nominalDay) $ o .:? "expiration" + + return WidgetMemcachedConf{ widgetMemcachedConnectInfo = Memcached.ConnectInfo{..}, .. } + +data ResourcePoolConf = ResourcePoolConf + { poolStripes :: Int + , poolTimeout :: NominalDiffTime + , poolLimit :: Int + } deriving (Show) + +data SmtpSslMode = SmtpSslNone | SmtpSslSmtps | SmtpSslStarttls + deriving (Show) + +data SmtpAuthConf = SmtpAuthConf + { smtpAuthType :: HaskellNet.AuthType + , smtpAuthUsername :: HaskellNet.UserName + , smtpAuthPassword :: HaskellNet.Password + } deriving (Show) + +deriveJSON defaultOptions + { constructorTagModifier = camelToPathPiece' 2 + , fieldLabelModifier = camelToPathPiece' 2 + , sumEncoding = UntaggedValue + , unwrapUnaryRecords = True + } ''LogDestination + +deriveJSON defaultOptions + { fieldLabelModifier = camelToPathPiece' 1 + } ''LogSettings + deriveFromJSON defaultOptions ''Ldap.Scope deriveFromJSON defaultOptions - { fieldLabelModifier = intercalate "-" . map toLower . drop 2 . splitCamel + { fieldLabelModifier = camelToPathPiece' 2 } ''UserDefaultConf instance FromJSON LdapConf where @@ -137,15 +254,62 @@ instance FromJSON LdapConf where ldapBase <- Ldap.Dn <$> o .: "baseDN" ldapScope <- o .: "scope" ldapTimeout <- o .: "timeout" + ldapSearchTimeout <- o .: "search-timeout" + ldapPool <- o .: "pool" return LdapConf{..} deriveFromJSON + defaultOptions + { fieldLabelModifier = intercalate "-" . map toLower . drop 1 . splitCamel + } + ''ResourcePoolConf + +deriveJSON defaultOptions { constructorTagModifier = over (ix 1) Char.toLower . fromJust . stripPrefix "Level" , sumEncoding = UntaggedValue } ''LogLevel +instance FromJSON HaskellNet.PortNumber where + parseJSON = withScientific "PortNumber" $ \sciNum -> case toBoundedInteger sciNum of + Just int -> return $ fromIntegral (int :: Word16) + Nothing -> fail "Expected whole number of plausible size to denote port" + +deriveFromJSON + defaultOptions + { constructorTagModifier = unpack . intercalate "-" . Text.splitOn "_" . toLower . pack + , allNullaryToStringTag = True + } + ''HaskellNet.AuthType + +instance FromJSON SmtpConf where + parseJSON = withObject "SmtpConf" $ \o -> do + smtpHost <- o .: "host" + smtpPort <- o .: "port" + smtpAuth <- assertM (not . null . smtpAuthUsername) <$> o .:? "auth" + smtpSsl <- o .: "ssl" + smtpPool <- o .: "pool" + return SmtpConf{..} + +deriveFromJSON + defaultOptions + { constructorTagModifier = intercalate "-" . map toLower . drop 2 . splitCamel + , allNullaryToStringTag = True + } + ''SmtpSslMode + +deriveFromJSON + defaultOptions + { fieldLabelModifier = let + nameMap "username" = "user" + nameMap "password" = "pass" + nameMap x = x + in nameMap . intercalate "-" . map toLower . drop 2 . splitCamel + } + ''SmtpAuthConf + + instance FromJSON AppSettings where parseJSON = withObject "AppSettings" $ \o -> do let defaultDev = @@ -160,24 +324,55 @@ instance FromJSON AppSettings where Ldap.Tls host _ -> not $ null host Ldap.Plain host -> not $ null host appLdapConf <- assertM nonEmptyHost <$> o .:? "ldap" + appSmtpConf <- assertM (not . null . smtpHost) <$> o .:? "smtp" + let validWidgetMemcachedConf WidgetMemcachedConf{ widgetMemcachedConnectInfo = Memcached.ConnectInfo{..}, ..} = and + [ not (null connectHost) || isUnixSocket connectPort + , not $ null widgetMemcachedBaseUrl + , numConnection > 0 + , connectionIdleTime >= 0 + ] + isUnixSocket (Network.UnixSocket _) = True + isUnixSocket _ = False + appWidgetMemcachedConf <- assertM validWidgetMemcachedConf <$> o .:? "widget-memcached" appRoot <- o .:? "approot" appHost <- fromString <$> o .: "host" appPort <- o .: "port" appIpFromHeader <- o .: "ip-from-header" - appDetailedRequestLogging <- o .:? "detailed-logging" .!= defaultDev - appShouldLogAll <- o .:? "should-log-all" .!= defaultDev - appMinimumLogLevel <- o .: "minimum-log-level" + appMailFrom <- o .: "mail-from" + appMailObjectDomain <- o .: "mail-object-domain" + appMailVerp <- o .: "mail-verp" + appMailSupport <- o .: "mail-support" + + appJobWorkers <- o .: "job-workers" + appJobFlushInterval <- o .:? "job-flush-interval" + appJobCronInterval <- o .: "job-cron-interval" + appJobStaleThreshold <- o .: "job-stale-threshold" + appNotificationRateLimit <- o .: "notification-rate-limit" + appNotificationCollateDelay <- o .: "notification-collate-delay" + appNotificationExpiration <- o .: "notification-expiration" + + appSessionTimeout <- o .: "session-timeout" + appReloadTemplates <- o .:? "reload-templates" .!= defaultDev appMutableStatic <- o .:? "mutable-static" .!= defaultDev appSkipCombining <- o .:? "skip-combining" .!= defaultDev appAuthDummyLogin <- o .:? "auth-dummy-login" .!= defaultDev appAllowDeprecated <- o .:? "allow-deprecated" .!= defaultDev + appEncryptErrors <- o .:? "encrypt-errors" .!= not defaultDev + + appInitialLogSettings <- o .: "log-settings" appUserDefaults <- o .: "user-defaults" appAuthPWHash <- o .: "auth-pw-hash" - appCryptoIDKeyFile <- o .: "cryptoid-keyfile" + appInitialInstanceID <- runMaybeT $ do + val <- MaybeT (o .:? "instance-id") + val' <- lift $ (Right <$> parseJSON val) <|> (Left <$> parseJSON val) + case val' of + Left fp -> guard $ FilePath.isValid fp + _ -> return () + return val' return AppSettings {..} diff --git a/src/Settings/Cluster.hs b/src/Settings/Cluster.hs new file mode 100644 index 000000000..a6fb11799 --- /dev/null +++ b/src/Settings/Cluster.hs @@ -0,0 +1,122 @@ +{-# OPTIONS_GHC -fno-warn-orphans #-} + +module Settings.Cluster + ( ClusterSettingsKey(..) + , ClusterSetting(..) + ) where + +import ClassyPrelude.Yesod +import Database.Persist.Sql +import Web.HttpApiData + +import Utils +import Control.Lens +import Data.Universe + +import Data.Aeson ( FromJSON(..), ToJSON(..) + , Options(..), defaultOptions + , FromJSONKey(..), ToJSONKey(..), FromJSONKeyFunction(..) + ) +import Data.Aeson.TH (deriveJSON) +import Data.Aeson.Types (toJSONKeyText) +import qualified Data.Aeson as Aeson + +import qualified Web.ClientSession as ClientSession +import qualified Crypto.Saltine.Core.SecretBox as SecretBox +import qualified Crypto.Saltine.Class as Saltine + +import Data.CryptoID.ByteString (CryptoIDKey) +import qualified Data.CryptoID.ByteString as CryptoID + +import qualified Data.Binary as Binary +import qualified Data.Serialize as Serialize +import qualified Data.ByteString.Base64.URL as Base64 + + +data ClusterSettingsKey + = ClusterCryptoIDKey + | ClusterClientSessionKey + | ClusterSecretBoxKey + deriving (Eq, Ord, Enum, Bounded, Show, Read) + +instance Universe ClusterSettingsKey +instance Finite ClusterSettingsKey + +nullaryPathPiece ''ClusterSettingsKey (camelToPathPiece' 1) + +deriveJSON + defaultOptions + { constructorTagModifier = camelToPathPiece' 1 + } + ''ClusterSettingsKey + +instance ToJSONKey ClusterSettingsKey where + toJSONKey = toJSONKeyText $ \v -> let String t = toJSON v in t + +instance FromJSONKey ClusterSettingsKey where + fromJSONKey = FromJSONKeyTextParser $ parseJSON . String + +instance PersistField ClusterSettingsKey where + toPersistValue = PersistText . toPathPiece + fromPersistValue (PersistText t) = maybe (Left $ "Could not parse " <> t) Right $ fromPathPiece t + fromPersistValue _other = Left "Expecting PersistText" + +instance PersistFieldSql ClusterSettingsKey where + sqlType _ = SqlString + +instance ToHttpApiData ClusterSettingsKey where + toUrlPiece = toPathPiece +instance FromHttpApiData ClusterSettingsKey where + parseUrlPiece = maybe (Left "Could not parse url piece") Right . fromPathPiece + + +class (ToJSON (ClusterSettingValue key), FromJSON (ClusterSettingValue key)) => ClusterSetting (key :: ClusterSettingsKey) where + type ClusterSettingValue key :: * + initClusterSetting :: forall m p. MonadIO m => p key -> m (ClusterSettingValue key) + knownClusterSetting :: forall p. p key -> ClusterSettingsKey + + +instance ClusterSetting 'ClusterCryptoIDKey where + type ClusterSettingValue 'ClusterCryptoIDKey = CryptoIDKey + initClusterSetting _ = CryptoID.genKey + knownClusterSetting _ = ClusterCryptoIDKey + +instance ToJSON CryptoIDKey where + toJSON = Aeson.String . decodeUtf8 . Base64.encode . toStrict . Binary.encode + +instance FromJSON CryptoIDKey where + parseJSON = Aeson.withText "CryptoIDKey" $ \t -> do + bytes <- either fail (return . fromStrict) . Base64.decode $ encodeUtf8 t + case Binary.decodeOrFail bytes of + Left (_, _, err) -> fail err + Right (bs, _, ret) + | null bs -> return ret + | otherwise -> fail $ show (length bs) ++ " extra bytes" + + +instance ClusterSetting 'ClusterClientSessionKey where + type ClusterSettingValue 'ClusterClientSessionKey = ClientSession.Key + initClusterSetting _ = liftIO $ view _2 <$> ClientSession.randomKey + knownClusterSetting _ = ClusterClientSessionKey + +instance ToJSON ClientSession.Key where + toJSON = Aeson.String . decodeUtf8 . Base64.encode . Serialize.encode + +instance FromJSON ClientSession.Key where + parseJSON = Aeson.withText "Key" $ \t -> do + bytes <- either fail return . Base64.decode $ encodeUtf8 t + either fail return $ Serialize.decode bytes + + +instance ClusterSetting 'ClusterSecretBoxKey where + type ClusterSettingValue 'ClusterSecretBoxKey = SecretBox.Key + initClusterSetting _ = liftIO SecretBox.newKey + knownClusterSetting _ = ClusterSecretBoxKey + +instance ToJSON SecretBox.Key where + toJSON = Aeson.String . decodeUtf8 . Base64.encode . Saltine.encode + +instance FromJSON SecretBox.Key where + parseJSON = Aeson.withText "Key" $ \t -> do + bytes <- either fail return . Base64.decode $ encodeUtf8 t + maybe (fail "Could not parse key") return $ Saltine.decode bytes diff --git a/src/Settings/StaticFiles.hs b/src/Settings/StaticFiles.hs index 0cefeaa1d..c7bd88255 100644 --- a/src/Settings/StaticFiles.hs +++ b/src/Settings/StaticFiles.hs @@ -1,21 +1,26 @@ -{-# LANGUAGE NoImplicitPrelude #-} -{-# LANGUAGE OverloadedStrings #-} -{-# LANGUAGE TemplateHaskell #-} -module Settings.StaticFiles where +module Settings.StaticFiles + ( module Settings.StaticFiles + , module Yesod.EmbeddedStatic + ) where + +import ClassyPrelude import Settings (appStaticDir, compileTimeAppSettings) -import Yesod.Static (staticFiles) +import Yesod.EmbeddedStatic -- This generates easy references to files in the static directory at compile time, -- giving you compile-time verification that referenced files exist. -- Warning: any files added to your static directory during run-time can't be --- accessed this way. You'll have to use their FilePath or URL to access them. +-- accessed this way. -- -- For example, to refer to @static/js/script.js@ via an identifier, you'd use: -- -- js_script_js --- --- If the identifier is not available, you may use: --- --- StaticFile ["js", "script.js"] [] -staticFiles (appStaticDir compileTimeAppSettings) + +#ifdef DEVELOPMENT +#define DEV_BOOL True +#else +#define DEV_BOOL False +#endif + +mkEmbeddedStatic DEV_BOOL "embeddedStatic" [embedDir $ appStaticDir compileTimeAppSettings] diff --git a/src/Utils.hs b/src/Utils.hs index 08343ec80..2990778dc 100644 --- a/src/Utils.hs +++ b/src/Utils.hs @@ -1,36 +1,35 @@ -{-# LANGUAGE NoImplicitPrelude #-} -{-# LANGUAGE OverloadedStrings #-} -{-# LANGUAGE DefaultSignatures #-} -{-# LANGUAGE ScopedTypeVariables #-} -{-# LANGUAGE RankNTypes #-} -{-# LANGUAGE TypeSynonymInstances, FlexibleInstances #-} -{-# LANGUAGE TypeFamilies, FlexibleContexts, ConstraintKinds #-} -{-# LANGUAGE QuasiQuotes, TemplateHaskell #-} -{-# LANGUAGE ViewPatterns #-} {-# OPTIONS_GHC -fno-warn-orphans #-} -- Monad FormResult module Utils ( module Utils ) where -import ClassyPrelude.Yesod +import ClassyPrelude.Yesod hiding (foldlM) -- import Data.Double.Conversion.Text -- faster implementation for textPercent? -import Data.Foldable as Fold hiding (length) +import qualified Data.Foldable as Fold +import Data.Foldable as Utils (foldlM, foldrM) +import Data.Monoid (Sum(..)) import Data.CaseInsensitive (CI) import qualified Data.CaseInsensitive as CI +import qualified Data.ByteString as BS +import qualified Data.ByteString.Lazy as LBS +import qualified Data.Text as Text + import Utils.DB as Utils import Utils.TH as Utils import Utils.DateTime as Utils import Utils.PathPiece as Utils import Utils.Message as Utils +import Utils.Lang as Utils +import Control.Lens as Utils (none) import Text.Blaze (Markup, ToMarkup) -import Data.Char (isDigit) +import Data.Char (isDigit, isSpace) import Data.Text (dropWhileEnd, takeWhileEnd, justifyRight) import Numeric (showFFloat) @@ -42,8 +41,9 @@ import qualified Data.Map as Map -- import qualified Data.List as List import Control.Monad.Trans.Except (ExceptT(..), throwE, runExceptT) +import Control.Monad.Except (MonadError(..)) import Control.Monad.Trans.Maybe (MaybeT(..)) -import Control.Monad.Catch +import Control.Monad.Catch hiding (throwM) import qualified Database.Esqueleto as E (Value, unValue) @@ -53,13 +53,26 @@ import Instances.TH.Lift () import Text.Shakespeare.Text (st) +import qualified Data.Aeson as Aeson + +import Data.Universe + +import qualified Crypto.Saltine.Internal.ByteSizes as Saltine +import qualified Data.ByteString.Base64.URL as Base64 +import qualified Crypto.Saltine.Core.SecretBox as SecretBox +import qualified Crypto.Saltine.Class as Saltine +import qualified Crypto.Data.PKCS7 as PKCS7 + +import Data.Fixed (Centi) +import Data.Ratio ((%)) + ----------- -- Yesod -- ----------- -newtype MsgRendererS site = MsgRenderer { render :: (forall msg. RenderMessage site msg => msg -> Text) } +newtype MsgRendererS site = MsgRenderer { render :: forall msg. RenderMessage site msg => msg -> Text } getMsgRenderer :: forall m site. (MonadHandler m, HandlerSite m ~ site) => m (MsgRendererS site) getMsgRenderer = do @@ -77,7 +90,7 @@ guardAuthResult AuthenticationRequired = notAuthenticated guardAuthResult (Unauthorized t) = permissionDenied t guardAuthResult Authorized = return () -data UnsupportedAuthPredicate route = UnsupportedAuthPredicate String route +data UnsupportedAuthPredicate route = UnsupportedAuthPredicate Text route deriving (Eq, Ord, Typeable, Show) instance (Show route, Typeable route) => Exception (UnsupportedAuthPredicate route) @@ -85,11 +98,30 @@ unsupportedAuthPredicate :: ExpQ unsupportedAuthPredicate = do logFunc <- logErrorS [e| \tag route -> do - $(return logFunc) "AccessControl" [st|"!#{tag}" used on route that doesn't support it: #{tshow route}|] - unauthorizedI (UnsupportedAuthPredicate tag route) + $(return logFunc) "AccessControl" [st|"!#{toPathPiece tag}" used on route that doesn't support it: #{tshow route}|] + unauthorizedI (UnsupportedAuthPredicate (toPathPiece tag) route) |] +class RedirectUrl site url => HasRoute site url where + urlRoute :: url -> Route site + +instance HasRoute site (Route site) where + urlRoute = id +instance (key ~ Text, val ~ Text) => HasRoute site (Route site, Map key val) where + urlRoute = view _1 +instance (key ~ Text, val ~ Text) => HasRoute site (Route site, [(key, val)]) where + urlRoute = view _1 +instance (HasRoute site a, PathPiece b) => HasRoute site (Fragment a b) where + urlRoute (a :#: _) = urlRoute a + +data SomeRoute site = forall url. HasRoute site url => SomeRoute url + +instance RedirectUrl site (SomeRoute site) where + toTextUrl (SomeRoute url) = toTextUrl url +instance HasRoute site (SomeRoute site) where + urlRoute (SomeRoute url) = urlRoute url + --------------------- -- Text and String -- @@ -106,29 +138,29 @@ tickmarkT = tickmark text2Html :: Text -> Html text2Html = toHtml -- prevents ambiguous types -toWgt :: (ToMarkup a, MonadBaseControl IO m, MonadThrow m, MonadIO m) => - a -> WidgetT site m () +toWgt :: (ToMarkup a, MonadBaseControl IO m, MonadThrow m, MonadIO m) + => a -> WidgetT site m () toWgt = toWidget . toHtml -- Convenience Functions to avoid type signatures: -text2widget :: (MonadBaseControl IO m, MonadThrow m, MonadIO m) => - Text -> WidgetT site m () +text2widget :: (MonadBaseControl IO m, MonadThrow m, MonadIO m) + => Text -> WidgetT site m () text2widget t = [whamlet|#{t}|] -citext2widget :: (MonadBaseControl IO m, MonadThrow m, MonadIO m) => - (CI Text) -> WidgetT site m () +citext2widget :: (MonadBaseControl IO m, MonadThrow m, MonadIO m) + => CI Text -> WidgetT site m () citext2widget t = [whamlet|#{CI.original t}|] -str2widget :: (MonadBaseControl IO m, MonadThrow m, MonadIO m) => - String -> WidgetT site m () +str2widget :: (MonadBaseControl IO m, MonadThrow m, MonadIO m) + => String -> WidgetT site m () str2widget s = [whamlet|#{s}|] -display2widget :: (MonadBaseControl IO m, MonadThrow m, MonadIO m, DisplayAble a) => - a -> WidgetT site m () +display2widget :: (MonadBaseControl IO m, MonadThrow m, MonadIO m, DisplayAble a) + => a -> WidgetT site m () display2widget = text2widget . display withFragment :: Monad m => MForm m (a, WidgetT site IO ()) -> Markup -> MForm m (a, WidgetT site IO ()) -withFragment form html = (flip fmap) form $ \(x, widget) -> (x, toWidget html >> widget) +withFragment form html = flip fmap form $ over _2 (toWidget html >>) -- Types that can be converted to Text for direct displayed to User! (Show for debugging, Display for Production) @@ -175,15 +207,16 @@ instance {-# OVERLAPPABLE #-} Show a => DisplayAble a where -- The easy way out display = pack . show -} -textPercent :: Double -> Text -- slow, maybe use Data.Double.Conversion.Text.toFixed instead? -textPercent x = lz <> (pack $ show rx) <> "%" +textPercent :: Real a => a -> Text -- slow, maybe use Data.Double.Conversion.Text.toFixed instead? +textPercent x = lz <> pack (show rx) <> "%" where - round' :: Double -> Int -- avoids annoying warning - round' = round - rx :: Double - rx = fromIntegral (round' $ 1000.0*x) / 10.0 + rx :: Centi + rx = realToFrac (x * 100) lz = if rx < 10.0 then "0" else "" +textPercentInt :: Integral a => a -> a -> Text -- slow, maybe use Data.Double.Conversion.Text.toFixed instead? +textPercentInt part whole = textPercent $ fromIntegral part % fromIntegral whole + stepTextCounterCI :: CI Text -> CI Text -- find and increment rightmost-number, preserving leading zeroes stepTextCounterCI = CI.map stepTextCounter @@ -202,7 +235,6 @@ stepTextCounter text -- Data.Text.groupBy ((==) `on` isDigit) $ Data.Text.pack "12.ProMo Ue3bung00322 34 (H)" -- ["12",".ProMo Ue","3","bung","00322"," ","34"," (H)"] - ------------ -- Tuples -- ------------ @@ -262,10 +294,10 @@ infixl 5 !!! (!!!) :: (Ord k, Monoid v) => Map k v -> k -> v -(!!!) m k = (fromMaybe mempty) $ Map.lookup k m +(!!!) m k = fromMaybe mempty $ Map.lookup k m groupMap :: (Ord k, Ord v) => [(k,v)] -> Map k (Set v) -groupMap l = Map.fromListWith mappend $ [(k, Set.singleton v) | (k,v) <- l] +groupMap l = Map.fromListWith mappend [(k, Set.singleton v) | (k,v) <- l] partMap :: (Ord k, Monoid v) => [(k,v)] -> Map k v partMap = Map.fromListWith mappend @@ -289,14 +321,13 @@ toNothing = const Nothing toNothingS :: String -> Maybe b toNothingS = const Nothing -maybeAdd :: Num a => Maybe a -> Maybe a -> Maybe a -- treats Nothing as neutral/zero, unlike fmap +maybeAdd :: Num a => Maybe a -> Maybe a -> Maybe a -- treats Nothing as neutral/zero, unlike fmap/ap maybeAdd (Just x) (Just y) = Just (x + y) maybeAdd Nothing y = y maybeAdd x Nothing = x maybeEmpty :: Monoid m => Maybe a -> (a -> m) -> m -maybeEmpty (Just x) f = f x -maybeEmpty Nothing _ = mempty +maybeEmpty = flip foldMap whenIsJust :: Monad m => Maybe a -> (a -> m ()) -> m () whenIsJust (Just x) f = f x @@ -306,12 +337,26 @@ ifMaybeM :: Monad m => Maybe a -> b -> (a -> m b) -> m b -- more convenient argu ifMaybeM Nothing dft _ = return dft ifMaybeM (Just x) _ act = act x +maybePositive :: (Num a, Ord a) => a -> Maybe a -- convenient for Shakespeare: one $maybe instead of $with & $if +maybePositive a | a > 0 = Just a + | otherwise = Nothing + +positiveSum :: (Num a, Ord a) => Sum a -> Maybe a -- like maybePositive +positiveSum = maybePositive . getSum + maybeM :: Monad m => m b -> (a -> m b) -> m (Maybe a) -> m b maybeM dft act mb = mb >>= maybe dft act maybeT :: Monad m => m a -> MaybeT m a -> m a maybeT x m = runMaybeT m >>= maybe x return +maybeT_ :: Monad m => MaybeT m () -> m () +maybeT_ = void . runMaybeT + +hoistMaybe :: MonadPlus m => Maybe a -> m a +-- ^ `hoist` regarding `Maybe` as if identical to @MaybeT Identity@ +hoistMaybe = maybe mzero return + catchIfMaybeT :: (MonadCatch m, Exception e) => (e -> Bool) -> m a -> MaybeT m a catchIfMaybeT p act = catchIf p (lift act) (const mzero) @@ -319,7 +364,7 @@ mcons :: Maybe a -> [a] -> [a] mcons Nothing xs = xs mcons (Just x) xs = x:xs -newtype NTop a = NTop a -- treat Nothing as Top for Ord (Maybe a); default implementation treats Nothing as bottom +newtype NTop a = NTop { nBot :: a } -- treat Nothing as Top for Ord (Maybe a); default implementation treats Nothing as bottom instance Eq a => Eq (NTop (Maybe a)) where (NTop x) == (NTop y) = x == y @@ -330,6 +375,8 @@ instance Ord a => Ord (NTop (Maybe a)) where compare _ (NTop Nothing) = LT compare (NTop (Just x)) (NTop (Just y)) = compare x y +exceptTMaybe :: Monad m => ExceptT e m a -> MaybeT m a +exceptTMaybe = MaybeT . fmap (either (const Nothing) Just) . runExceptT ------------ @@ -360,19 +407,19 @@ whenIsRight (Left _) _ = return () maybeExceptT :: Monad m => e -> m (Maybe b) -> ExceptT e m b maybeExceptT err act = lift act >>= maybe (throwE err) return -maybeMExceptT :: Monad m => (m e) -> m (Maybe b) -> ExceptT e m b +maybeMExceptT :: Monad m => m e -> m (Maybe b) -> ExceptT e m b maybeMExceptT err act = lift act >>= maybe (lift err >>= throwE) return whenExceptT :: Monad m => Bool -> e -> ExceptT e m () whenExceptT b err = when b $ throwE err -whenMExceptT :: Monad m => Bool -> (m e) -> ExceptT e m () +whenMExceptT :: Monad m => Bool -> m e -> ExceptT e m () whenMExceptT b err = when b $ lift err >>= throwE guardExceptT :: Monad m => Bool -> e -> ExceptT e m () guardExceptT b err = unless b $ throwE err -guardMExceptT :: Monad m => Bool -> (m e) -> ExceptT e m () +guardMExceptT :: Monad m => Bool -> m e -> ExceptT e m () guardMExceptT b err = unless b $ lift err >>= throwE exceptT :: Monad m => (e -> m b) -> (a -> m b) -> ExceptT e m a -> m b @@ -381,18 +428,22 @@ exceptT f g = either f g <=< runExceptT catchIfMExceptT :: (MonadCatch m, Exception e) => (e -> m e') -> (e -> Bool) -> m a -> ExceptT e' m a catchIfMExceptT err p act = catchIf p (lift act) (throwE <=< lift . err) +throwExceptT :: ( Exception e, MonadThrow m ) + => ExceptT e m a -> m a +throwExceptT = exceptT throwM return + ------------ -- Monads -- ------------ -shortCircuitM :: Monad m => (a -> Bool) -> m a -> m a -> (a -> a -> a) -> m a -shortCircuitM sc mx my bop = do +shortCircuitM :: Monad m => (a -> Bool) -> (a -> a -> a) -> m a -> m a -> m a +shortCircuitM sc binOp mx my = do x <- mx - case sc x of - True -> return x - False -> bop <$> pure x <*> my + if + | sc x -> return x + | otherwise -> binOp <$> pure x <*> my guardM :: MonadPlus m => m Bool -> m () @@ -401,6 +452,9 @@ guardM f = guard =<< f assertM :: MonadPlus m => (a -> Bool) -> m a -> m a assertM f x = x >>= assertM' f +assertM_ :: MonadPlus m => (a -> Bool) -> m a -> m () +assertM_ f x = guard . f =<< x + assertM' :: MonadPlus m => (a -> Bool) -> a -> m a assertM' f x = x <$ guard (f x) @@ -415,22 +469,196 @@ ifM c m m' = ifNotM :: Monad m => m Bool -> m a -> m a -> m a ifNotM c = flip $ ifM c --- | Lazy monadic conjunction. -and2M :: Monad m => m Bool -> m Bool -> m Bool +and2M, or2M :: Monad m => m Bool -> m Bool -> m Bool and2M ma mb = ifM ma mb (return False) +or2M ma = ifM ma (return True) -andM :: (Foldable f, Monad m) => f (m Bool) -> m Bool +andM, orM :: (Foldable f, Monad m) => f (m Bool) -> m Bool andM = Fold.foldr and2M (return True) - -allM :: (Functor f, Foldable f, Monad m) => f a -> (a -> m Bool) -> m Bool -allM xs f = andM $ fmap f xs - --- | Lazy monadic disjunction. -or2M :: Monad m => m Bool -> m Bool -> m Bool -or2M ma mb = ifM ma (return True) mb - -orM :: (Foldable f, Monad m) => f (m Bool) -> m Bool orM = Fold.foldr or2M (return False) -anyM :: (Functor f, Foldable f, Monad m) => f a -> (a -> m Bool) -> m Bool +allM, anyM :: (Functor f, Foldable f, Monad m) => f a -> (a -> m Bool) -> m Bool +allM xs f = andM $ fmap f xs anyM xs f = orM $ fmap f xs + +ofoldr1M, ofoldl1M :: (MonoFoldable mono, Monad m) => (Element mono -> Element mono -> m (Element mono)) -> NonNull mono -> m (Element mono) +ofoldr1M f (otoList -> x:xs) = foldrM f x xs +ofoldr1M _ _ = error "otoList of NonNull is empty" +ofoldl1M f (otoList -> x:xs) = foldlM f x xs +ofoldl1M _ _ = error "otoList of NonNull is empty" + +partitionM :: forall mono m . + ( MonoFoldable mono + , Monoid mono + , MonoPointed mono + , Monad m) + => (Element mono -> m Bool) -> mono -> m (mono, mono) +partitionM crit = ofoldlM dist mempty + where + dist :: (mono,mono) -> Element mono -> m (mono,mono) + dist acc x = do + okay <- crit x + return $ if + | okay -> acc `mappend` (opoint x, mempty) + | otherwise -> acc `mappend` (mempty, opoint x) + +mconcatMapM :: (Monoid b, Monad m, Foldable f) => (a -> m b) -> f a -> m b +mconcatMapM f = foldM (\x my -> mappend x <$> my) mempty . map f . Fold.toList + +mconcatForM :: (Monoid b, Monad m, Foldable f) => f a -> (a -> m b) -> m b +mconcatForM = flip mconcatMapM + + +-------------- +-- Sessions -- +-------------- + +setSessionJson :: (PathPiece k, ToJSON v, MonadHandler m) => k -> v -> m () +setSessionJson (toPathPiece -> key) (LBS.toStrict . Aeson.encode -> val) = setSessionBS key val + +lookupSessionJson :: (PathPiece k, FromJSON v, MonadHandler m) => k -> m (Maybe v) +lookupSessionJson (toPathPiece -> key) = (Aeson.decode' . LBS.fromStrict =<<) <$> lookupSessionBS key + +modifySessionJson :: (PathPiece k, FromJSON v, ToJSON v, MonadHandler m) => k -> (Maybe v -> Maybe v) -> m () +modifySessionJson (toPathPiece -> key) f = lookupSessionJson key >>= maybe (deleteSession key) (setSessionJson key) . f + +tellSessionJson :: (PathPiece k, FromJSON v, ToJSON v, MonadHandler m, Monoid v) => k -> v -> m () +tellSessionJson key val = modifySessionJson key $ Just . (`mappend` val) . fromMaybe mempty + +getSessionJson :: (PathPiece k, FromJSON v, MonadHandler m) => k -> m (Maybe v) +-- ^ `lookupSessionJson` followed by `deleteSession` +getSessionJson key = lookupSessionJson key <* deleteSession (toPathPiece key) + +-------------------- +-- GET Parameters -- +-------------------- + +data GlobalGetParam = GetReferer + deriving (Eq, Ord, Enum, Bounded, Read, Show, Generic) + +instance Universe GlobalGetParam +instance Finite GlobalGetParam +nullaryPathPiece ''GlobalGetParam (camelToPathPiece' 1) + +lookupGlobalGetParam :: (MonadHandler m, PathPiece result) => GlobalGetParam -> m (Maybe result) +lookupGlobalGetParam ident = (>>= fromPathPiece) <$> lookupGetParam (toPathPiece ident) + +hasGlobalGetParam :: MonadHandler m => GlobalGetParam -> m Bool +hasGlobalGetParam ident = isJust <$> lookupGetParam (toPathPiece ident) + + +data GlobalPostParam = PostDeleteTarget + deriving (Eq, Ord, Enum, Bounded, Read, Show, Generic) + +instance Universe GlobalPostParam +instance Finite GlobalPostParam +nullaryPathPiece ''GlobalPostParam (camelToPathPiece' 1) + +lookupGlobalPostParam :: (MonadHandler m, PathPiece result) => GlobalPostParam -> m (Maybe result) +lookupGlobalPostParam ident = (>>= fromPathPiece) <$> lookupPostParam (toPathPiece ident) + +hasGlobalPostParam :: MonadHandler m => GlobalPostParam -> m Bool +hasGlobalPostParam ident = isJust <$> lookupPostParam (toPathPiece ident) + +--------------------------------- +-- Custom HTTP Request-Headers -- +--------------------------------- + +data CustomHeader = HeaderIsModal | HeaderDBTableShortcircuit + deriving (Eq, Ord, Enum, Bounded, Read, Show, Generic) + +instance Universe CustomHeader +instance Finite CustomHeader +nullaryPathPiece ''CustomHeader (intercalate "-" . drop 1 . splitCamel) + +lookupCustomHeader :: (MonadHandler m, PathPiece result) => CustomHeader -> m (Maybe result) +lookupCustomHeader ident = (>>= fromPathPiece . decodeUtf8) <$> lookupHeader (CI.mk . encodeUtf8 $ toPathPiece ident) + +hasCustomHeader :: MonadHandler m => CustomHeader -> m Bool +hasCustomHeader ident = isJust <$> lookupHeader (CI.mk . encodeUtf8 $ toPathPiece ident) + +------------------ +-- Cryptography -- +------------------ + +data SecretBoxEncoding = SecretBoxShort | SecretBoxPretty + deriving (Eq, Ord, Enum, Bounded, Read, Show, Generic, Typeable) + +instance Universe SecretBoxEncoding +instance Finite SecretBoxEncoding +instance Default SecretBoxEncoding where + def = SecretBoxShort + +encodedSecretBoxBlocksize :: Word8 +-- | `encodedSecretBox'` tries to hide plaintext length by ensuring the message +-- length (before addition of HMAC and nonce) is always a multiple of +-- `encodedSecretBlocksize`. +-- Bigger blocksizes hide exact message length better but lead to longer messages +encodedSecretBoxBlocksize = maxBound + + +encodedSecretBox' :: ( ToJSON a, MonadIO m ) + => SecretBox.Key + -> SecretBoxEncoding + -> a -> m Text +encodedSecretBox' sKey pretty val = liftIO $ do + nonce <- SecretBox.newNonce + let + encrypt = SecretBox.secretbox sKey nonce + base64 = decodeUtf8 . Base64.encode + pad = PKCS7.padBytesN (fromIntegral encodedSecretBoxBlocksize) + attachNonce = mappend $ Saltine.encode nonce + chunk + | SecretBoxPretty <- pretty = Text.intercalate "\n" . Text.chunksOf 76 + | otherwise = id + + return . chunk . base64 . attachNonce . encrypt . pad . toStrict $ Aeson.encode val + +data EncodedSecretBoxException + = EncodedSecretBoxInvalidBase64 !String + | EncodedSecretBoxInvalidPadding + | EncodedSecretBoxCiphertextTooShort + | EncodedSecretBoxCouldNotDecodeNonce + | EncodedSecretBoxCouldNotOpenSecretBox + | EncodedSecretBoxCouldNotDecodePlaintext !String + deriving (Eq, Ord, Show, Read, Generic, Typeable) +instance Exception EncodedSecretBoxException + +encodedSecretBoxOpen' :: (FromJSON a, MonadError EncodedSecretBoxException m) + => SecretBox.Key + -> Text -> m a +encodedSecretBoxOpen' sKey chunked = do + let unchunked = Text.filter (not . isSpace) chunked + decoded <- either (throwError . EncodedSecretBoxInvalidBase64) return . Base64.decode $ encodeUtf8 unchunked + + unless (BS.length decoded >= Saltine.secretBoxNonce + Saltine.secretBoxMac) $ + throwError EncodedSecretBoxCiphertextTooShort + let (nonceBS, encrypted) = BS.splitAt Saltine.secretBoxNonce decoded + nonce <- maybe (throwError EncodedSecretBoxCouldNotDecodeNonce) return $ Saltine.decode nonceBS + padded <- maybe (throwError EncodedSecretBoxCouldNotOpenSecretBox) return $ SecretBox.secretboxOpen sKey nonce encrypted + + unpadded <- maybe (throwError EncodedSecretBoxInvalidPadding) return $ PKCS7.unpadBytesN (fromIntegral encodedSecretBoxBlocksize) padded + + either (throwError . EncodedSecretBoxCouldNotDecodePlaintext) return $ Aeson.eitherDecodeStrict' unpadded + +class Monad m => MonadSecretBox m where + secretBoxKey :: m SecretBox.Key + +instance MonadSecretBox ((->) SecretBox.Key) where + secretBoxKey = id + +instance Monad m => MonadSecretBox (ReaderT SecretBox.Key m) where + secretBoxKey = ask + +encodedSecretBox :: ( ToJSON a, MonadSecretBox m, MonadIO m ) + => SecretBoxEncoding + -> a -> m Text +encodedSecretBox pretty val = do + sKey <- secretBoxKey + encodedSecretBox' sKey pretty val + +encodedSecretBoxOpen :: ( FromJSON a, MonadError EncodedSecretBoxException m, MonadSecretBox m ) + => Text -> m a +encodedSecretBoxOpen ciphertext = do + sKey <- secretBoxKey + encodedSecretBoxOpen' sKey ciphertext diff --git a/src/Utils/DB.hs b/src/Utils/DB.hs index 380bb8b2a..2b8f8bd01 100644 --- a/src/Utils/DB.hs +++ b/src/Utils/DB.hs @@ -1,8 +1,3 @@ -{-# LANGUAGE NoImplicitPrelude #-} -{-# LANGUAGE OverloadedStrings #-} -{-# LANGUAGE TypeFamilies, FlexibleContexts, ConstraintKinds #-} -{-# LANGUAGE QuasiQuotes #-} - module Utils.DB where import ClassyPrelude.Yesod @@ -15,7 +10,7 @@ import qualified Data.Set as Set import qualified Database.Esqueleto as E -- import Database.Persist -- currently not needed here - +-- ezero = E.val (0 :: Int64) emptyOrIn :: PersistField typ => E.SqlExpr (E.Value typ) -> Set typ -> E.SqlExpr (E.Value Bool) @@ -29,11 +24,11 @@ entities2map = foldl' (\m entity -> Map.insert (entityKey entity) (entityVal ent getKeyBy :: (PersistEntityBackend record ~ BaseBackend backend, PersistEntity record, PersistUniqueRead backend, MonadIO m) => Unique record -> ReaderT backend m (Maybe (Key record)) -getKeyBy u = (fmap entityKey) <$> getBy u -- TODO optimize this, so that DB does not deliver entire record! +getKeyBy u = fmap entityKey <$> getBy u -- TODO optimize this, so that DB does not deliver entire record! getKeyBy404 :: (PersistEntityBackend record ~ BaseBackend backend, PersistEntity record, PersistUniqueRead backend, MonadIO m) => Unique record -> ReaderT backend m (Key record) -getKeyBy404 = (fmap entityKey) . getBy404 -- TODO optimize this, so that DB does not deliver entire record! +getKeyBy404 = fmap entityKey . getBy404 -- TODO optimize this, so that DB does not deliver entire record! existsBy :: (PersistEntityBackend record ~ BaseBackend backend, PersistEntity record, PersistUniqueRead backend, MonadIO m) => Unique record -> ReaderT backend m Bool diff --git a/src/Utils/DateTime.hs b/src/Utils/DateTime.hs index 1b82dbe12..0b5855566 100644 --- a/src/Utils/DateTime.hs +++ b/src/Utils/DateTime.hs @@ -1,15 +1,12 @@ -{-# LANGUAGE NoImplicitPrelude - , TemplateHaskell - , QuasiQuotes - , StandaloneDeriving - , DeriveLift - #-} +{-# LANGUAGE GeneralizedNewtypeDeriving #-} {-# OPTIONS_GHC -fno-warn-orphans #-} module Utils.DateTime ( timeLocaleMap , TimeLocale(..) , currentYear + , DateTimeFormat(..) + , SelDateTimeFormat(..) , module Data.Time.Zones , module Data.Time.Zones.TH ) where @@ -20,14 +17,29 @@ import System.Locale.Read import Data.Time (TimeZone(..), TimeLocale(..)) import Data.Time.Zones (TZ) import Data.Time.Zones.TH (includeSystemTZ) +import Data.Time.Clock.POSIX import Language.Haskell.TH import Language.Haskell.TH.Syntax (Lift(..)) import Instances.TH.Lift () +import Data.Data (Data) +import Data.Typeable (Typeable) +import Data.Universe + +import Database.Persist.Sql (PersistField, PersistFieldSql) + +import Data.Aeson.Types (toJSONKeyText) +import Data.Aeson +import Data.Aeson.TH + +import Utils.PathPiece + deriving instance Lift TimeZone deriving instance Lift TimeLocale +instance Hashable UTCTime where + hashWithSalt s = hashWithSalt s . toRational . utcTimeToPOSIXSeconds -- $(timeLocaleMap _) :: [Lang] -> TimeLocale timeLocaleMap :: [(Lang, String)] -- ^ Languages and matching locales, first is taken as default @@ -63,3 +75,31 @@ currentYear = do now <- runIO getCurrentTime let (year, _, _) = toGregorian $ utctDay now [e|year|] + + +newtype DateTimeFormat = DateTimeFormat { unDateTimeFormat :: String } + deriving (Eq, Ord, Read, Show, Data, Generic, Typeable) + deriving newtype (ToJSON, FromJSON, PersistField, PersistFieldSql, IsString) + +instance Hashable DateTimeFormat + +data SelDateTimeFormat = SelFormatDateTime | SelFormatDate | SelFormatTime + deriving (Eq, Ord, Read, Show, Enum, Bounded, Data, Generic, Typeable) + +instance Universe SelDateTimeFormat +instance Finite SelDateTimeFormat +instance Hashable SelDateTimeFormat + +deriveJSON defaultOptions + { constructorTagModifier = intercalate "-" . map toLower . drop 2 . splitCamel + } ''SelDateTimeFormat + +instance ToJSONKey SelDateTimeFormat where + toJSONKey = toJSONKeyText $ \v -> let String txt = toJSON v in txt +instance FromJSONKey SelDateTimeFormat where + fromJSONKey = FromJSONKeyTextParser $ parseJSON . String + +instance {-# OVERLAPPING #-} Default (SelDateTimeFormat -> DateTimeFormat) where + def SelFormatDateTime = "%c" + def SelFormatDate = "%F" + def SelFormatTime = "%T" diff --git a/src/Utils/Form.hs b/src/Utils/Form.hs index 939169e9b..6fab13a32 100644 --- a/src/Utils/Form.hs +++ b/src/Utils/Form.hs @@ -1,40 +1,46 @@ -{-# LANGUAGE NoImplicitPrelude - , TemplateHaskell - , ViewPatterns - , OverloadedStrings - , QuasiQuotes - , TemplateHaskell - , MultiParamTypeClasses - , TypeFamilies - , FlexibleContexts - , NamedFieldPuns - , ScopedTypeVariables -#-} +{-# OPTIONS_GHC -fno-warn-deprecations #-} module Utils.Form where -import ClassyPrelude.Yesod +import ClassyPrelude.Yesod hiding (addMessage, cons, Proxy(..)) import Settings import qualified Text.Blaze.Internal as Blaze (null) import qualified Data.Text as T -import qualified Data.Char as Char import Data.CaseInsensitive (CI) import qualified Data.CaseInsensitive as CI +import Data.Universe + +import Data.Map.Lazy ((!)) +import qualified Data.Map.Lazy as Map +import qualified Data.Set as Set + +import Control.Monad.Trans.Maybe (MaybeT(..)) + +import Data.List ((!!)) + +import Control.Lens import Web.PathPieces +import Data.UUID + +import Utils.Message +import Utils.PathPiece + +import Data.Proxy + ------------------- -- Form Renderer -- ------------------- -- | Use this type to pass information to the form template -data FormLayout = FormStandard +data FormLayout = FormStandard | FormDBTableFilter | FormDBTablePagesize renderAForm :: Monad m => FormLayout -> FormRender m a renderAForm formLayout aform fragment = do - (res, (($ []) -> views)) <- aFormToForm aform + (res, ($ []) -> fieldViews) <- aFormToForm aform let widget = $(widgetFile "widgets/form") return (res, widget) @@ -43,58 +49,58 @@ renderAForm formLayout aform fragment = do -------------------- fsl :: Text -> FieldSettings site -fsl lbl = - FieldSettings { fsLabel = (SomeMessage lbl) - , fsTooltip = Nothing - , fsId = Nothing - , fsName = Nothing - , fsAttrs = [] - } +fsl lbl + = FieldSettings { fsLabel = SomeMessage lbl + , fsTooltip = Nothing + , fsId = Nothing + , fsName = Nothing + , fsAttrs = [] + } fslI :: RenderMessage site msg => msg -> FieldSettings site -fslI lbl = - FieldSettings { fsLabel = (SomeMessage lbl) - , fsTooltip = Nothing - , fsId = Nothing - , fsName = Nothing - , fsAttrs = [] - } +fslI lbl + = FieldSettings { fsLabel = SomeMessage lbl + , fsTooltip = Nothing + , fsId = Nothing + , fsName = Nothing + , fsAttrs = [] + } fslp :: Text -> Text -> FieldSettings site -fslp lbl placeholder = - FieldSettings { fsLabel = (SomeMessage lbl) - , fsTooltip = Nothing - , fsId = Nothing - , fsName = Nothing - , fsAttrs = [("placeholder", placeholder)] - } +fslp lbl placeholder + = FieldSettings { fsLabel = SomeMessage lbl + , fsTooltip = Nothing + , fsId = Nothing + , fsName = Nothing + , fsAttrs = [("placeholder", placeholder)] + } fslpI :: RenderMessage site msg => msg -> Text -> FieldSettings site -fslpI lbl placeholder = - FieldSettings { fsLabel = (SomeMessage lbl) - , fsTooltip = Nothing - , fsId = Nothing - , fsName = Nothing - , fsAttrs = [("placeholder", placeholder)] - } +fslpI lbl placeholder + = FieldSettings { fsLabel = SomeMessage lbl + , fsTooltip = Nothing + , fsId = Nothing + , fsName = Nothing + , fsAttrs = [("placeholder", placeholder)] + } addAttr :: Text -> Text -> FieldSettings site -> FieldSettings site -addAttr attr valu fs = fs { fsAttrs=newAttrs (fsAttrs fs) } +addAttr attr valu fs = fs { fsAttrs = newAttrs $ fsAttrs fs } where newAttrs :: [(Text,Text)] -> [(Text,Text)] - newAttrs [] = [(attr,valu)] - newAttrs (p@(a,v):t) - | attr==a = (a,T.append valu $ cons ' ' v):t - | otherwise = p:(newAttrs t) + newAttrs [] = [(attr, valu)] + newAttrs (p@(a,v) : t) + | attr==a = (a, T.append valu $ cons ' ' v) : t + | otherwise = p : newAttrs t addAttrs :: Text -> [Text] -> FieldSettings site -> FieldSettings site -addAttrs attr valus fs = fs { fsAttrs=newAttrs (fsAttrs fs) } +addAttrs attr valus fs = fs { fsAttrs = newAttrs $ fsAttrs fs } where - newAttrs :: [(Text,Text)] -> [(Text,Text)] - newAttrs [] = [(attr,T.intercalate " " valus)] - newAttrs (p@(a,v):t) - | attr==a = (a,T.intercalate " " (v:valus)):t - | otherwise = p:(newAttrs t) + newAttrs :: [(Text, Text)] -> [(Text, Text)] + newAttrs [] = [(attr, T.intercalate " " valus)] + newAttrs (p@(a,v) : t) + | attr==a = ( a, T.intercalate " " $ v : valus ) : t + | otherwise = p : newAttrs t addClass :: Text -> FieldSettings site -> FieldSettings site addClass = addAttr "class" @@ -106,23 +112,25 @@ addName :: Text -> FieldSettings site -> FieldSettings site addName nm fs = fs { fsName = Just nm } addNameClass :: Text -> Text -> FieldSettings site -> FieldSettings site -addNameClass gName gClass fs = fs { fsName= Just gName, fsAttrs=("class",gClass):(fsAttrs fs) } +addNameClass gName gClass fs = fs { fsName = Just gName, fsAttrs = ("class",gClass) : fsAttrs fs } addIdClass :: Text -> Text -> FieldSettings site -> FieldSettings site -addIdClass gId gClass fs = fs { fsId= Just gId, fsAttrs=("class",gClass):(fsAttrs fs) } +addIdClass gId gClass fs = fs { fsId = Just gId, fsAttrs = ("class",gClass) : fsAttrs fs } setClass :: FieldSettings site -> Text -> FieldSettings site -- deprecated -setClass fs c = fs { fsAttrs=("class",c):(fsAttrs fs) } +setClass fs c = fs { fsAttrs = ("class",c) : fsAttrs fs } setNameClass :: FieldSettings site -> Text -> Text -> FieldSettings site -- deprecated -setNameClass fs gName gClass = fs { fsName= Just gName, fsAttrs=("class",gClass):(fsAttrs fs) } +setNameClass fs gName gClass = fs { fsName = Just gName + , fsAttrs = ("class",gClass) : fsAttrs fs + } setTooltip :: RenderMessage site msg => msg -> FieldSettings site -> FieldSettings site setTooltip msg fs = fs { fsTooltip = Just $ SomeMessage msg } -addDatalist :: (PathPiece (Element vals), MonoFoldable vals, Monad m) => Field m a -> WidgetT (HandlerSite m) IO vals -> Field m a -addDatalist field mValues = field +addDatalist :: (PathPiece (Element vals), MonoFoldable vals, Monad m) => WidgetT (HandlerSite m) IO vals -> Field m a -> Field m a +addDatalist mValues field = field { fieldView = \fId fName fAttrs fRes fReq -> do listId <- newIdent values <- map toPathPiece . otoList <$> mValues @@ -135,12 +143,41 @@ addDatalist field mValues = field |] } +noValidate :: FieldSettings site -> FieldSettings site +noValidate = addAttr "formnovalidate" "" + +inputDisabled :: FieldSettings site -> FieldSettings site +inputDisabled = addAttr "disabled" "" + +inputReadonly :: FieldSettings site -> FieldSettings site +inputReadonly = addAttr "readonly" "" + +addAutosubmit :: FieldSettings site -> FieldSettings site +addAutosubmit = addAttr "data-autosubmit" "" + ------------------------------------------------ -- Unique Form Identifiers to avoid accidents -- ------------------------------------------------ -data FormIdentifier = FIDcourse | FIDsheet | FIDsubmission | FIDsettings | FIDcorrectors | FIDcorrectorTable | FIDcorrection | FIDcorrectionsUpload | FIDcorrectionUpload - deriving (Enum, Eq, Ord, Bounded, Read, Show) +data FormIdentifier + = FIDcourse + | FIDsheet + | FIDsubmission + | FIDsettings + | FIDcorrectors + | FIDcorrectorTable + | FIDcorrection + | FIDcorrectionsUpload + | FIDcorrectionUpload + | FIDSystemMessageAdd + | FIDSystemMessageTable + | FIDSystemMessageModify + | FIDSystemMessageModifyTranslation UUID + | FIDSystemMessageAddTranslation + | FIDDBTableFilter + | FIDDBTablePagesize + | FIDDelete + deriving (Eq, Ord, Read, Show) instance PathPiece FormIdentifier where fromPathPiece = readFromPathPiece @@ -162,49 +199,115 @@ identForm = identifyForm . toPathPiece -- Buttons (new version ) -- ---------------------------- -data family ButtonCssClass site :: * +data family ButtonClass site :: * -bcc2txt :: Show (ButtonCssClass site) => ButtonCssClass site -> Text -- a Hack; maybe define Read/Show manually -bcc2txt bcc = T.pack $ "btn-" ++ (Char.toLower <$> (drop 2 $ show bcc)) +class (PathPiece a, PathPiece (ButtonClass site), RenderMessage site ButtonMessage) => Button site a where + btnLabel :: a -> WidgetT site IO () -class (Enum a, Bounded a, Ord a, PathPiece a) => Button site a where - label :: a -> WidgetT site IO () - label = toWidget . toPathPiece + default btnLabel :: RenderMessage site a => a -> WidgetT site IO () + btnLabel = toWidget <=< ap getMessageRender . return - cssClass :: a -> ButtonCssClass site + btnValidate :: forall p. p site -> a -> Bool + btnValidate _ _ = True -data SubmitButton = BtnSubmit - deriving (Enum, Eq, Ord, Bounded, Read, Show) + btnClasses :: a -> [ButtonClass site] + btnClasses _ = [] -instance PathPiece SubmitButton where - toPathPiece = showToPathPiece - fromPathPiece = readFromPathPiece +data ButtonMessage = MsgAmbiguousButtons + | MsgWrongButtonValue + | MsgMultipleButtonValues + deriving (Eq, Ord, Enum, Bounded, Read, Show, Generic, Typeable) -buttonField :: forall site a. (Button site a, Show (ButtonCssClass site)) => a -> Field (HandlerT site IO) a -- already validates that the correct button press was received (result only neccessary for combinedButtonField) -buttonField btn = Field {fieldParse, fieldView, fieldEnctype} +data ButtonSubmit = BtnSubmit + deriving (Eq, Ord, Enum, Bounded, Read, Show, Generic, Typeable) + +instance Universe ButtonSubmit +instance Finite ButtonSubmit + +nullaryPathPiece ''ButtonSubmit $ camelToPathPiece' 1 + +buttonField :: forall a m. + ( Button (HandlerSite m) a + , MonadHandler m + ) => a -> Field m a +-- | Already validates that the correct button press was received (result only neccessary for combinedButtonField) +buttonField btn = Field{..} where fieldEnctype = UrlEncoded + fieldView :: FieldViewFunc m a fieldView fid name attrs _val _ = let - cssClass' :: ButtonCssClass site - cssClass' = cssClass btn + validate = btnValidate (Proxy @(HandlerSite m)) btn + classes :: [ButtonClass (HandlerSite m)] + classes = btnClasses btn in [whamlet| - <button .btn .#{bcc2txt cssClass'} type=submit name=#{name} value=#{toPathPiece btn} *{attrs} ##{fid}>^{label btn} + $newline never + <button class=#{unwords $ map toPathPiece classes} type=submit name=#{name} value=#{toPathPiece btn} *{attrs} ##{fid} :not validate:formnovalidate>^{btnLabel btn} |] - fieldParse [] _ = return $ Right Nothing - fieldParse [str] _ - | str == toPathPiece btn = return $ Right $ Just btn - | otherwise = return $ Left "Wrong button value" - fieldParse _ _ = return $ Left "Multiple button values" + fieldParse [] [] = return $ Right Nothing + fieldParse [str] [] + | str == toPathPiece btn = return . Right $ Just btn + | otherwise = return . Left $ SomeMessage MsgWrongButtonValue + fieldParse _ _ = return . Left $ SomeMessage MsgMultipleButtonValues -combinedButtonField :: (Button site a, Show (ButtonCssClass site)) => [a] -> AForm (HandlerT site IO) [Maybe a] -combinedButtonField btns = traverse b2f btns - where - b2f b = aopt (buttonField b) "" Nothing +combinedButtonField :: forall a m. + ( Button (HandlerSite m) a + , MonadHandler m + ) => [a] -> FieldSettings (HandlerSite m) -> AForm m [Maybe a] +combinedButtonField bs FieldSettings{..} = formToAForm $ do + mr <- getMessageRender + fvId <- maybe newFormIdent return fsId + name <- maybe newFormIdent return fsName + (ress, fvs) <- fmap unzip . for bs $ \b -> mopt (buttonField b) ("" { fsId = Just $ fvId <> "__" <> toPathPiece b + , fsName = Just $ name <> "__" <> toPathPiece b + , fsAttrs + }) Nothing + return ( sequenceA ress + , pure FieldView + { fvLabel = toHtml $ mr fsLabel + , fvTooltip = fmap (toHtml . mr) fsTooltip + , fvId + , fvInput = foldMap fvInput fvs + , fvErrors = bool Nothing (Just $ foldMap (fromMaybe mempty . fvErrors) fvs) $ any (isJust . fvErrors) fvs + , fvRequired = False + } + ) -submitButton :: (Button site SubmitButton, Show (ButtonCssClass site)) => AForm (HandlerT site IO) () -submitButton = void $ combinedButtonField [BtnSubmit] +combinedButtonFieldF :: forall m a. + ( Button (HandlerSite m) a + , Finite a + , MonadHandler m + ) => FieldSettings (HandlerSite m) -> AForm m [Maybe a] +combinedButtonFieldF = combinedButtonField (universeF :: [a]) + +disambiguateButtons :: forall m a. + ( MonadHandler m + , RenderMessage (HandlerSite m) ButtonMessage + ) => AForm m [Maybe a] -> AForm m a +disambiguateButtons = traverseAForm $ \case + (catMaybes -> [bRes]) -> return $ FormSuccess bRes + (catMaybes -> [] ) -> return FormMissing + _other -> formFailure [MsgAmbiguousButtons] + +combinedButtonField_ :: forall a m. + ( Button (HandlerSite m) a + , MonadHandler m + ) => [a] -> FieldSettings (HandlerSite m) -> AForm m () +combinedButtonField_ = (void .) . combinedButtonField + +combinedButtonFieldF_ :: forall m a p. + ( Button (HandlerSite m) a + , MonadHandler m + , Finite a + ) => p a -> FieldSettings (HandlerSite m) -> AForm m () +combinedButtonFieldF_ _ = void . combinedButtonFieldF @m @a + +submitButton :: (Button (HandlerSite m) ButtonSubmit, MonadHandler m) => AForm m () +submitButton = combinedButtonFieldF_ (Proxy @ButtonSubmit) "" + +autosubmitButton :: (Button (HandlerSite m) ButtonSubmit, MonadHandler m) => AForm m () +autosubmitButton = combinedButtonFieldF_ (Proxy @ButtonSubmit) $ "" & addAutosubmit ------------------- -- Custom Fields -- @@ -216,3 +319,127 @@ ciField :: ( Textual t , RenderMessage (HandlerSite m) FormMessage ) => Field m (CI t) ciField = convertField (CI.mk . fromList . unpack) (pack . toList . CI.original) textField + +pathPieceField :: ( PathPiece a + , Monad m + , RenderMessage (HandlerSite m) FormMessage + ) => Field m a +pathPieceField = checkMMap (\t -> return . maybe (Left $ MsgInvalidEntry t) Right $ fromPathPiece t) toPathPiece textField + +reorderField :: ( MonadHandler m + , HandlerSite m ~ site + , Eq a + , Show a + ) => HandlerT site IO (OptionList a) -> Field m [a] +-- ^ Allow the user to enter a /permutation/ of the given options (every option must occur exactly once in the result) +reorderField optList = Field{..} + where + fieldEnctype = UrlEncoded + fieldParse [] _ = return $ Right Nothing + fieldParse optlist _ = do + OptionList{..} <- liftHandlerT optList + let + olNum = fromIntegral $ length olOptions + selOptions = Map.fromList $ do + i <- [1..olNum] + (readMay -> Just (n :: Word), '.' : extVal) <- break (== '.') . unpack <$> optlist + guard $ i == n + Just val <- return . olReadExternal $ pack extVal + return (i, val) + return $ if + | Map.keysSet selOptions == Set.fromList [1..olNum] + -> Right . Just $ map (selOptions !) [1..fromIntegral olNum] + | otherwise + -> Left "Not a valid permutation" + fieldView theId name attrs val isReq = do + OptionList{..} <- liftHandlerT optList + let + isSel n = (==) (either (const $ map optionInternalValue olOptions) id val !! pred n) . optionInternalValue + nums = map (id &&& withNum theId) [1..length olOptions] + withNum t n = tshow n <> "." <> t + $(widgetFile "widgets/permutation") + +optionsFinite :: ( MonadHandler m + , Finite a + , RenderMessage site a + , HandlerSite m ~ site + , PathPiece a + ) + => m (OptionList a) +optionsFinite = do + mr <- getMessageRender + let + mkOption a = Option + { optionDisplay = mr a + , optionInternalValue = a + , optionExternalValue = toPathPiece a + } + return . mkOptionList $ mkOption <$> universeF + + +--------------------- +-- Form evaluation -- +--------------------- + +traverseAForm :: forall m a b. Monad m => (a -> m (FormResult b)) -> (AForm m a -> AForm m b) +traverseAForm adj (AForm f) = AForm $ \mr env ints -> do + ret@(res, _, _, _) <- f mr env ints + case res of + FormFailure errs + -> return $ ret & _1 .~ FormFailure errs + FormMissing + -> return $ ret & _1 .~ FormMissing + FormSuccess a -> do + a' <- adj a + return $ ret & _1 .~ a' + +formFailure :: forall msg m a. + ( MonadHandler m + , RenderMessage (HandlerSite m) msg + ) => [msg] -> m (FormResult a) +formFailure errs' = do + mr <- getMessageRender + return . FormFailure $ map mr errs' + + +formResult :: MonadHandler m => FormResult a -> (a -> m ()) -> m () +formResult res f = void . formResultMaybe res $ \x -> Nothing <$ f x + +formResultMaybe :: MonadHandler m => FormResult a -> (a -> m (Maybe b)) -> m (Maybe b) +formResultMaybe (FormFailure errs) _ = Nothing <$ forM_ errs (addMessage Error . toHtml) +formResultMaybe FormMissing _ = return Nothing +formResultMaybe (FormSuccess res) f = f res + +formResult' :: FormResult a -> Maybe a +formResult' FormMissing = Nothing +formResult' (FormFailure _) = Nothing +formResult' (FormSuccess x) = Just x + +runInputGetMaybe, runInputPostMaybe, runInputMaybe :: MonadHandler m => FormInput m a -> m (Maybe a) +runInputGetMaybe form = do + res <- runInputGetResult form + return $ case res of + FormSuccess suc -> Just suc + _other -> Nothing +runInputPostMaybe form = do + res <- runInputPostResult form + return $ case res of + FormSuccess suc -> Just suc + _other -> Nothing +runInputMaybe form = runMaybeT $ MaybeT (runInputPostMaybe form) <|> MaybeT (runInputGetMaybe form) + +hoistAForm :: HandlerSite m ~ HandlerSite n => (forall a. m a -> n a) -> AForm m b -> AForm n b +hoistAForm f (AForm g) = AForm (\x y z ->f $ g x y z) + +hoistField :: HandlerSite m ~ HandlerSite n => (forall a. m a -> n a) -> Field m b -> Field n b +hoistField f Field{..} = Field + { fieldParse = \x y -> f $ fieldParse x y + , fieldView + , fieldEnctype + } + +prismAForm :: Monad m => Prism' s a -> Maybe s -> (Maybe a -> AForm m a) -> AForm m s +-- ^ @Monad m => Prism' s a -> (Maybe a -> AForm m a) -> (Maybe s -> AForm m s)@ +prismAForm p outer form = review p <$> form inner + where + inner = outer >>= preview p diff --git a/src/Utils/Lang.hs b/src/Utils/Lang.hs new file mode 100644 index 000000000..a8ebe1878 --- /dev/null +++ b/src/Utils/Lang.hs @@ -0,0 +1,33 @@ +module Utils.Lang where + +import ClassyPrelude.Yesod + +import qualified Data.List.NonEmpty as NonEmpty +import Data.List.NonEmpty (NonEmpty(..)) + +import qualified Data.Text as Text + + +selectLanguage :: MonadHandler m + => NonEmpty Lang -- ^ Available translations, first is default + -> m Lang +selectLanguage avL = selectLanguage' avL <$> languages + +selectLanguage' :: NonEmpty Lang -- ^ Available translations, first is default + -> [Lang] -- ^ Languages in preference order + -> Lang +selectLanguage' (defL :| _) [] = defL +selectLanguage' avL (l:ls) + | not $ null l + , Just l' <- find (== l) (NonEmpty.toList avL) + = l' + | not $ null l + , Just lParts <- NonEmpty.nonEmpty $ Text.splitOn "-" l + , found <- find ((NonEmpty.toList lParts `isPrefixOf`) . Text.splitOn "-") avL + = flip fromMaybe found $ selectLanguage' avL $ Text.intercalate "-" (NonEmpty.tail lParts) : ls + | otherwise = selectLanguage' avL ls + +langMatches :: Lang -- ^ Needle + -> Lang -- ^ Haystack + -> Bool +langMatches = isPrefixOf `on` Text.splitOn "-" diff --git a/src/Utils/Lens.hs b/src/Utils/Lens.hs index 55f8d406c..68a1ba2a8 100644 --- a/src/Utils/Lens.hs +++ b/src/Utils/Lens.hs @@ -1,19 +1,24 @@ -{-# LANGUAGE NoImplicitPrelude #-} -{-# LANGUAGE TemplateHaskell #-} -{-# LANGUAGE FlexibleInstances #-} -{-# LANGUAGE MultiParamTypeClasses #-} -{-# LANGUAGE FunctionalDependencies #-} module Utils.Lens ( module Utils.Lens ) where import Import.NoFoundation -import Control.Lens as Utils.Lens -import Utils.Lens.TH +import Control.Lens as Utils.Lens hiding ((<.>)) +import Control.Lens.Extras as Utils.Lens (is) +import Utils.Lens.TH as Utils.Lens (makeLenses_) import qualified Database.Esqueleto as E (Value(..),InnerJoin(..)) _unValue :: Lens' (E.Value a) a _unValue f (E.Value a) = E.Value <$> f a +_PathPiece :: PathPiece v => Prism' Text v +_PathPiece = prism' toPathPiece fromPathPiece + +maybePrism :: Prism' a b -> Prism' (Maybe a) (Maybe b) +maybePrism p = prism' (fmap $ review p) (fmap $ preview p ) + +applying :: Applicative f => Lens' s a -> Lens' (f s) (f a) +applying l = lens (fmap $ view l) (liftA2 . flip $ set l) + _InnerJoinLeft :: Lens' (E.InnerJoin l r) l -- forall f. Functor f => (a -> f a) -> s -> f s _InnerJoinLeft f (E.InnerJoin l r) = (`E.InnerJoin` r) <$> f l @@ -29,6 +34,12 @@ makeLenses_ ''SheetCorrector makeLenses_ ''SubmissionGroup +makeLenses_ ''SheetGrading + +makeLenses_ ''SheetType + +makePrisms ''AuthResult + -- makeClassy_ ''Load diff --git a/src/Utils/Message.hs b/src/Utils/Message.hs index 438d21932..7cf7f653f 100644 --- a/src/Utils/Message.hs +++ b/src/Utils/Message.hs @@ -1,35 +1,121 @@ -{-# LANGUAGE FlexibleInstances, FlexibleContexts #-} -{-# LANGUAGE TemplateHaskell #-} - - module Utils.Message ( MessageClass(..) - , addMessage, addMessageI + , UnknownMessageClass(..) + , addMessage, addMessageI, addMessageIHamlet, addMessageFile, addMessageWidget + , Message(..) + , messageI, messageIHamlet, messageFile, messageWidget ) where -import Data.Text as Text (toLower) import Data.Universe -import Utils.PathPiece (finiteFromPathPiece, nullaryToPathPiece) +import Utils.PathPiece +import Data.Aeson +import Data.Aeson.TH import qualified ClassyPrelude.Yesod (addMessage, addMessageI) -import ClassyPrelude.Yesod (PathPiece(..),MonadHandler,HandlerSite,RenderMessage,Html) +import ClassyPrelude.Yesod hiding (addMessage, addMessageI) + +import Text.Hamlet + +import Language.Haskell.TH +import Language.Haskell.TH.Syntax (Lift) + +import Text.Blaze (preEscapedText) +import Text.Blaze.Html.Renderer.Text (renderHtml) +import Text.HTML.SanitizeXSS (sanitizeBalance) data MessageClass = Error | Warning | Info | Success - deriving (Eq,Ord,Enum,Bounded,Show,Read) + deriving (Eq, Ord, Enum, Bounded, Show, Read, Lift) instance Universe MessageClass instance Finite MessageClass -$( return [] ) -- forces order of splices, error otherwise, see https://ghc.haskell.org/trac/ghc/ticket/9813 +deriveJSON defaultOptions + { constructorTagModifier = camelToPathPiece + } ''MessageClass -instance PathPiece MessageClass where - toPathPiece = $(nullaryToPathPiece ''MessageClass [Text.toLower]) - fromPathPiece = finiteFromPathPiece +nullaryPathPiece ''MessageClass camelToPathPiece +derivePersistField "MessageClass" -addMessage :: MonadHandler m => MessageClass-> Html -> m () +newtype UnknownMessageClass = UnknownMessageClass Text + deriving (Eq, Ord, Read, Show, Generic, Typeable) + +instance Exception UnknownMessageClass + + +data Message = Message + { messageClass :: MessageClass + , messageContent :: Html + } + +instance Eq Message where + a == b = ((==) `on` messageClass) a b && ((==) `on` renderHtml . messageContent) a b + +instance Ord Message where + a `compare` b = (compare `on` messageClass) a b `mappend` (compare `on` renderHtml . messageContent) a b + +instance ToJSON Message where + toJSON Message{..} = object + [ "class" .= messageClass + , "content" .= renderHtml messageContent + ] + +instance FromJSON Message where + parseJSON = withObject "Message" $ \o -> do + messageClass <- o .: "class" + messageContent <- preEscapedText . sanitizeBalance <$> o .: "content" + return Message{..} + + +addMessage :: MonadHandler m => MessageClass -> Html -> m () addMessage mc = ClassyPrelude.Yesod.addMessage (toPathPiece mc) addMessageI :: (MonadHandler m, RenderMessage (HandlerSite m) msg) => MessageClass -> msg -> m () addMessageI mc = ClassyPrelude.Yesod.addMessageI (toPathPiece mc) + +messageI :: (MonadHandler m, RenderMessage (HandlerSite m) msg) => MessageClass -> msg -> m Message +messageI messageClass msg = do + messageContent <- toHtml . ($ msg) <$> getMessageRender + return Message{..} + +addMessageIHamlet :: ( MonadHandler m + , RenderMessage (HandlerSite m) msg + , HandlerSite m ~ site + ) => MessageClass -> HtmlUrlI18n msg (Route site) -> m () +addMessageIHamlet mc iHamlet = do + mr <- getMessageRender + ClassyPrelude.Yesod.addMessage (toPathPiece mc) =<< withUrlRenderer (iHamlet $ toHtml . mr) + +messageIHamlet :: ( MonadHandler m + , RenderMessage (HandlerSite m) msg + , HandlerSite m ~ site + ) => MessageClass -> HtmlUrlI18n msg (Route site) -> m Message +messageIHamlet mc iHamlet = do + mr <- getMessageRender + Message mc <$> withUrlRenderer (iHamlet $ toHtml . mr) + +addMessageFile :: MessageClass -> FilePath -> ExpQ +addMessageFile mc tPath = [e|addMessageIHamlet mc $(ihamletFile tPath)|] + +messageFile :: MessageClass -> FilePath -> ExpQ +messageFile mc tPath = [e|messageIHamlet mc $(ihamletFile tPath)|] + +addMessageWidget :: forall m site. + ( MonadHandler m + , HandlerSite m ~ site + , Yesod site + ) => MessageClass -> WidgetT site IO () -> m () +-- ^ _Note_: `addMessageWidget` ignores `pageTitle` and `pageHead` +addMessageWidget mc wgt = do + PageContent{pageBody} <- liftHandlerT $ widgetToPageContent wgt + addMessageIHamlet mc (const pageBody :: HtmlUrlI18n (SomeMessage site) (Route site)) + +messageWidget :: forall m site. + ( MonadHandler m + , HandlerSite m ~ site + , Yesod site + ) => MessageClass -> WidgetT site IO () -> m Message +messageWidget mc wgt = do + PageContent{pageBody} <- liftHandlerT $ widgetToPageContent wgt + messageIHamlet mc (const pageBody :: HtmlUrlI18n (SomeMessage site) (Route site)) diff --git a/src/Utils/PathPiece.hs b/src/Utils/PathPiece.hs index 0aa1a364c..5e0dd8621 100644 --- a/src/Utils/PathPiece.hs +++ b/src/Utils/PathPiece.hs @@ -1,10 +1,9 @@ -{-# LANGUAGE NoImplicitPrelude - #-} - module Utils.PathPiece ( finiteFromPathPiece , nullaryToPathPiece + , nullaryPathPiece , splitCamel + , camelToPathPiece, camelToPathPiece' ) where import ClassyPrelude.Yesod @@ -16,15 +15,15 @@ import Data.Universe import qualified Data.Text as Text import qualified Data.Char as Char -import Data.Monoid (Endo(..)) +import Numeric.Natural finiteFromPathPiece :: (PathPiece a, Finite a) => Text -> Maybe a finiteFromPathPiece text = case filter (\c -> toPathPiece c == text) universeF of [x] -> Just x _xs -> Nothing -nullaryToPathPiece :: Name -> [Text -> Text] -> ExpQ -nullaryToPathPiece nullaryType manglers = do +nullaryToPathPiece :: Name -> (Text -> Text) -> ExpQ +nullaryToPathPiece nullaryType ((. Text.pack) -> mangle) = do TyConI (DataD _ _ _ _ constructors _) <- reify nullaryType helperName <- newName "helper" let @@ -32,8 +31,15 @@ nullaryToPathPiece nullaryType manglers = do toClause con = fail $ "Unsupported constructor: " ++ show con helperDec = funD helperName $ map toClause constructors letE [helperDec] $ varE helperName - where - mangle = appEndo (foldMap Endo manglers) . Text.pack + +nullaryPathPiece :: Name -> (Text -> Text) -> DecsQ +nullaryPathPiece nullaryType mangle = + pure <$> instanceD (cxt []) [t|PathPiece $(conT nullaryType)|] + [ funD 'toPathPiece + [ clause [] (normalB $ nullaryToPathPiece nullaryType mangle) [] ] + , funD 'fromPathPiece + [ clause [] (normalB [e|finiteFromPathPiece|]) [] ] + ] splitCamel :: Textual t => t -> [t] splitCamel = map fromList . reverse . helper (error "hasChange undefined at start of string") [] "" . otoList @@ -51,3 +57,9 @@ splitCamel = map fromList . reverse . helper (error "hasChange undefined at star | otherwise = helper True (reverse ws :items) [c] cs sameCategory = (==) `on` Char.generalCategory + +camelToPathPiece' :: Textual t => Natural -> t -> t +camelToPathPiece' dropN = intercalate "-" . map toLower . drop (fromIntegral dropN) . splitCamel + +camelToPathPiece :: Textual t => t -> t +camelToPathPiece = camelToPathPiece' 0 diff --git a/src/Utils/Sheet.hs b/src/Utils/Sheet.hs new file mode 100644 index 000000000..595c0729e --- /dev/null +++ b/src/Utils/Sheet.hs @@ -0,0 +1,46 @@ +module Utils.Sheet where + +import Import.NoFoundation +import qualified Database.Esqueleto as E + + +-- DB Queries for Sheets that are used in several places + +sheetCurrent :: MonadIO m => TermId -> SchoolId -> CourseShorthand -> SqlReadT m (Maybe SheetName) +sheetCurrent tid ssh csh = do + now <- liftIO getCurrentTime + sheets <- E.select . E.from $ \(course `E.InnerJoin` sheet) -> do + E.on $ sheet E.^. SheetCourse E.==. course E.^. CourseId + E.where_ $ sheet E.^. SheetActiveTo E.>. E.val now + E.&&. sheet E.^. SheetActiveFrom E.<=. E.val now + E.&&. course E.^. CourseTerm E.==. E.val tid + E.&&. course E.^. CourseSchool E.==. E.val ssh + E.&&. course E.^. CourseShorthand E.==. E.val csh + E.orderBy [E.asc $ sheet E.^. SheetActiveTo] + E.limit 1 + return $ sheet E.^. SheetName + return $ case sheets of + [] -> Nothing + [E.Value shn] -> Just shn + _ -> error "SQL Query with limit 1 returned more than one result" + + +sheetOldUnassigned :: MonadIO m => TermId -> SchoolId -> CourseShorthand -> SqlReadT m (Maybe SheetName) +sheetOldUnassigned tid ssh csh = do + now <- liftIO getCurrentTime + sheets <- E.select . E.from $ \(course `E.InnerJoin` sheet) -> do + E.on $ sheet E.^. SheetCourse E.==. course E.^. CourseId + E.where_ $ sheet E.^. SheetActiveTo E.<=. E.val now + E.&&. course E.^. CourseTerm E.==. E.val tid + E.&&. course E.^. CourseSchool E.==. E.val ssh + E.&&. course E.^. CourseShorthand E.==. E.val csh + E.where_ . E.exists . E.from $ \submission -> + E.where_ $ submission E.^. SubmissionSheet E.==. sheet E.^. SheetId + E.&&. E.isNothing (submission E.^. SubmissionRatingBy) + E.orderBy [E.asc $ sheet E.^. SheetActiveTo] + E.limit 1 + return $ sheet E.^. SheetName + return $ case sheets of + [] -> Nothing + [E.Value shn] -> Just shn + _ -> error "SQL Query with limit 1 returned more than one result" diff --git a/src/Utils/Sql.hs b/src/Utils/Sql.hs new file mode 100644 index 000000000..aae593c05 --- /dev/null +++ b/src/Utils/Sql.hs @@ -0,0 +1,32 @@ +module Utils.Sql + ( setSerializable + ) where + +import ClassyPrelude.Yesod + +import Database.Persist.Sql + +import Database.PostgreSQL.Simple (SqlError(SqlError), sqlErrorHint) +import Control.Monad.Catch (handleIf) + +import Data.Time.Clock + +setSerializable :: (MonadLogger m, MonadCatch m, MonadBase IO m, MonadIO m) => ReaderT SqlBackend m a -> ReaderT SqlBackend m a +setSerializable act = setSerializable' (0 :: Integer) + where + act' = [executeQQ|SET TRANSACTION ISOLATION LEVEL SERIALIZABLE|] *> act + + setSerializable' (min 10 -> logBackoff) = + handleIf + (\SqlError{sqlErrorHint} -> "The transaction might succeed if retried." `isInfixOf` sqlErrorHint) + (\e -> do + let + delay :: NominalDiffTime + delay = 1e-3 * 2 ^ logBackoff + $logWarnS "Sql" $ tshow (delay, e) + transactionUndo + threadDelay . round $ delay * 1e6 + setSerializable' (succ logBackoff) + ) + act' + diff --git a/src/Utils/SystemMessage.hs b/src/Utils/SystemMessage.hs new file mode 100644 index 000000000..e5cff0496 --- /dev/null +++ b/src/Utils/SystemMessage.hs @@ -0,0 +1,21 @@ +module Utils.SystemMessage where + +import Import.NoFoundation + +import qualified Data.List.NonEmpty as NonEmpty +import Data.List (findIndex) + +import Control.Monad.Trans.Maybe (MaybeT(..)) + + +getSystemMessage :: MonadHandler m + => NonEmpty Lang -- ^ `appLanguages` + -> SystemMessageId + -> ReaderT SqlBackend m (Maybe (SystemMessage, Maybe SystemMessageTranslation)) +getSystemMessage appLanguages smId = runMaybeT $ do + SystemMessage{..} <- MaybeT $ get smId + translations <- lift $ selectList [SystemMessageTranslationMessage ==. smId] [] + let + avL = NonEmpty.sortWith (\l -> NTop $ findIndex (langMatches l) $ NonEmpty.toList appLanguages) $ systemMessageDefaultLanguage :| map (systemMessageTranslationLanguage . entityVal) translations + lang <- selectLanguage avL + return (SystemMessage{..}, find (langMatches lang . systemMessageTranslationLanguage) $ map entityVal translations) diff --git a/src/Utils/TH.hs b/src/Utils/TH.hs index 45bc84c7e..501cfee12 100644 --- a/src/Utils/TH.hs +++ b/src/Utils/TH.hs @@ -1,17 +1,18 @@ -{-# LANGUAGE TemplateHaskell #-} -{-# LANGUAGE QuasiQuotes #-} - module Utils.TH where -- Common Utility Functions that require TemplateHaskell -- import Data.Char +import ClassyPrelude.Yesod import Language.Haskell.TH +import Language.Haskell.TH.Datatype -- import Control.Monad -- import Control.Monad.Trans.Class -- import Control.Monad.Trans.Maybe -- import Control.Monad.Trans.Except +import Data.List ((!!), foldl) + ------------ -- Tuples -- ------------ @@ -43,7 +44,7 @@ altFun perm = lamE pat rhs where pat = map varP $ fn:xs rhs = foldl appE (varE fn) $ map varE ps -- rhs = appE (varE fn) (varE $ xs!!1) - mx = maximum perm + mx = maximum $ impureNonNull perm xs = [ mkName $ "x" ++ show j | j <- [1..mx] ] ps = [ xs !! (j-1) | j <- perm ] fn = mkName "fn" @@ -76,3 +77,75 @@ deriveSimpleWith cls fun strOp ty = do in return $ Clause pats body [] genClause _ = fail "deriveShowTheme: constructors not allowed to have arguments" +embedRenderMessage :: Name -- ^ Foundation type + -> Name -- ^ Type to embed into message type + -> (Text -> Text) -- ^ Mangle constructor names + -> DecsQ +-- ^ @embedRenderMessage ''Foundation ''MessageType mangle@ declares a +-- `RenderMessage Foundation MessageType` instance expecting the default +-- message-datatype (@FoundationMessage@) to contain one constructor for each +-- constructor of @MessageType@, taking the same arguments: +-- +-- > data NewMessage = NewMessageOne | NewMessageTwo +-- > data FoundationMessage = MsgOne | MsgTwo +-- > +-- > -- embedRenderMessage ''Foundation ''NewMessage (drop 2 . splitCamel) +-- > instance RenderMessage Foundation NewMessage where +-- > renderMessage f ls = renderMessage f ls . \case +-- > NewMessageOne -> MsgOne +-- > NewMessageTwo -> MsgTwo +embedRenderMessage f inner mangle = do + DatatypeInfo{..} <- reifyDatatype inner + let + matches :: [MatchQ] + matches = flip map datatypeCons $ \ConstructorInfo{..} -> do + vars <- forM constructorFields $ \_ -> newName "x" + let body = foldl (\e v -> e `appE` varE v) (conE . mkName . unpack $ "Msg" <> mangle (pack $ nameBase constructorName)) vars + match (conP constructorName $ map varP vars) (normalB body) [] + + f' <- newName "f" + ls <- newName "ls" + + pure <$> instanceD (cxt []) [t|RenderMessage $(conT f) $(conT inner)|] + [ funD 'renderMessage + [ clause [varP f', varP ls] (normalB $ [e|renderMessage $(varE f') $(varE ls) . $(lamCaseE matches)|]) [] + ] + ] + +embedRenderMessageVariant :: Name -- ^ Foundation Type + -> Name -- ^ Name of newtype + -> (Text -> Text) -- ^ Mangle constructor names + -> DecsQ +embedRenderMessageVariant f newT mangle = do + [ConstructorInfo{ constructorName = newtypeName, constructorFields = [ ConT newtypeInner ] }] <- datatypeCons <$> reifyDatatype newT + DatatypeInfo{..} <- reifyDatatype newtypeInner + + let + matches :: [MatchQ] + matches = flip map datatypeCons $ \ConstructorInfo{..} -> do + vars <- forM constructorFields $ \_ -> newName "x" + let body = foldl (\e v -> e `appE` varE v) (conE . mkName . unpack $ "Msg" <> mangle (pack $ nameBase constructorName)) vars + match (conP newtypeName [conP constructorName $ map varP vars]) (normalB body) [] + + f' <- newName "f" + ls <- newName "ls" + + pure <$> instanceD (cxt []) [t|RenderMessage $(conT f) $(conT newT)|] + [ funD 'renderMessage + [ clause [varP f', varP ls] (normalB $ [e|renderMessage $(varE f') $(varE ls) . $(lamCaseE matches)|]) [] + ] + ] + + +dispatchTH :: Name -- ^ Datatype to pattern match + -> ExpQ +-- ^ Produces a lambda-case-expression matching all constructors of the named datatype and calling a function (named after the constructor prefixed with @dispatch@) on the fields of each constructor +dispatchTH dType = do + DatatypeInfo{..} <- reifyDatatype dType + let + matches = map mkMatch datatypeCons + mkMatch ConstructorInfo{..} = do + pats <- forM constructorFields $ \_ -> newName "x" + let fName = mkName $ "dispatch" <> nameBase constructorName + match (conP constructorName $ map varP pats) (normalB $ foldl (\e pat -> e `appE` varE pat) (varE fName) pats) [] + lamCaseE matches diff --git a/src/Yesod/Core/Instances.hs b/src/Yesod/Core/Instances.hs new file mode 100644 index 000000000..0b0f139c4 --- /dev/null +++ b/src/Yesod/Core/Instances.hs @@ -0,0 +1,41 @@ +{-# OPTIONS_GHC -fno-warn-orphans #-} + +module Yesod.Core.Instances + ( + ) where + +import ClassyPrelude.Yesod + +import Utils (assertM') +import Control.Lens + +import Data.ByteString.Builder (toLazyByteString) + +import System.FilePath ((</>)) + +import Data.Aeson + + +instance (RenderRoute site, ParseRoute site) => PathPiece (Route site) where + fromPathPiece + = parseRoute + . over (_2.traverse._2) (fromMaybe "") + . over _2 queryToQueryText + . decodePath + . encodeUtf8 + toPathPiece + = pack + . ("/" </>) + . unpack + . decodeUtf8 + . toLazyByteString + . uncurry encodePath + . over _2 queryTextToQuery + . over (_2.traverse._2) (assertM' $ not . null) + . renderRoute + +instance (RenderRoute site, ParseRoute site) => FromJSON (Route site) where + parseJSON = withText "Route" $ maybe (fail "Could not parse route") return . fromPathPiece + +instance (RenderRoute site, ParseRoute site) => ToJSON (Route site) where + toJSON = String . toPathPiece diff --git a/src/Yesod/Core/Types/Instances.hs b/src/Yesod/Core/Types/Instances.hs new file mode 100644 index 000000000..e296d0c52 --- /dev/null +++ b/src/Yesod/Core/Types/Instances.hs @@ -0,0 +1,16 @@ +{-# OPTIONS_GHC -fno-warn-orphans #-} + +module Yesod.Core.Types.Instances + ( + ) where + +import ClassyPrelude +import Yesod.Core.Types + +import Control.Monad.Fix + +instance MonadFix m => MonadFix (HandlerT site m) where + mfix f = HandlerT $ \r -> mfix $ \a -> unHandlerT (f a) r + +instance MonadFix m => MonadFix (WidgetT site m) where + mfix f = WidgetT $ \r -> mfix $ \ ~(a, _) -> unWidgetT (f a) r diff --git a/src/index.md b/src/index.md index a1c616b17..563023e8b 100644 --- a/src/index.md +++ b/src/index.md @@ -96,3 +96,53 @@ CryptoID Model.Migration : Manuelle Datenbank-Migration + +Model.Rating + : Types for Submission Ratings that the Database does not depend on, but needed in Foundation + +Jobs + : `handleJobs` worker thread handling background jobs + `JobQueueException` + +Jobs.Types + : `Job`, `Notification`, `JobCtl` Types of Jobs + +Cron.Types + : Datentypen zur Spezifikation von Intervallen zu denen Jobs ausgeführt werden + können: + + `Cron`, `CronMatch`, `CronAbsolute`, `CronRepeat`, `Crontab` + +Cron + : Seiteneffektfreie Berechnungen auf Typen aus `Cron.Types`: `nextCronMatch` + +Jobs.Queue + : Funktionen zum _anstoßen_ von Jobs und zur Kommunikation mit den + Worker-Threads + + `writeJobCtl` schickt Nachricht an einen pseudo-Zufälligen worker-thread der + lokalen Instanz + + `queueJob` und `queueJob'` schreiben neue Jobs in die Instanz-übergreifende + Job-Queue, `queueJob'` stößt außerdem einen lokalen worker-thread an sich + des Jobs anzunehmen + + `runDBJobs` ersetzt `runDB` und erlaubt `queueDBJob` zu + benutzen. `queueDBJob` schreibt einen Job in die Queue; am Ende stößt + `runDBJobs` lokale worker-threads für alle mit `queueDBJobs` eingetragenen + Jobs an. + +Jobs.TH + : Templatehaskell für den dispatch mechanismus für `Jobs` + +Jobs.Crontab + : Generiert `Crontab JobCtl` aus der Datenbank (sammelt alle in den Daten aus + der Datenbank impliziten Jobs (notifications zu bestimmten zeiten, + aufräumaktionen, ...) ein) + +Jobs.Handler.** + : Via `Jobs.TH` delegiert `Jobs` das Interpretieren und Ausführen eines Werts + aus `Jobs.Types` an einen dieser Handler + +Mail + : Monadically constructing MIME emails diff --git a/stack.nix b/stack.nix index 93d072683..7a8a0dcbf 100644 --- a/stack.nix +++ b/stack.nix @@ -7,7 +7,7 @@ in haskell.lib.buildStackProject { inherit ghc; name = "stackenv"; buildInputs = (with pkgs; - [ postgresql zlib openldap cyrus_sasl.dev + [ postgresql zlib libsodium ]) ++ (with haskellPackages; [ yesod-bin ]); diff --git a/stack.yaml b/stack.yaml index 8f93444f8..c4f2d4dba 100644 --- a/stack.yaml +++ b/stack.yaml @@ -29,11 +29,24 @@ extra-deps: - uuid-crypto-1.4.0.0 - filepath-crypto-0.1.0.0 - cryptoids-0.5.1.0 - - cryptoids-types-0.0.0 + - cryptoids-types-1.0.0 - cryptoids-class-0.0.0 - system-locale-0.3.0.0 - persistent-2.7.3.1 + - saltine-0.1.0.1 + + - hlint-test-0.1.0.0 + + - pkcs7-1.0.0.1 + + - quickcheck-classes-0.4.14 + - semirings-0.2.1.1 + + - memcached-binary-0.2.0 + +allow-newer: true + resolver: lts-10.5 diff --git a/start.sh b/start.sh index da7e422d4..24abcd36c 100755 --- a/start.sh +++ b/start.sh @@ -3,19 +3,20 @@ unset HOST export DETAILED_LOGGING=true export LOG_ALL=true +export LOGLEVEL=info export DUMMY_LOGIN=true export ALLOW_DEPRECATED=true export PWFILE=users.yml move-back() { mv -v .stack-work .stack-work-run - [[ -d .stack-work-ghci ]] && mv -v .stack-work-ghci .stack-work + [[ -d .stack-work-build ]] && mv -v .stack-work-build .stack-work } if [[ -d .stack-work-run ]]; then - [[ -d .stack-work ]] && mv -v .stack-work .stack-work-ghci + [[ -d .stack-work ]] && mv -v .stack-work .stack-work-build mv -v .stack-work-run .stack-work trap move-back EXIT fi -stack exec -- yesod devel +stack exec -- yesod devel $@ diff --git a/static/css/fonts.css b/static/css/fonts.css index ae0be87be..785fe33d3 100644 --- a/static/css/fonts.css +++ b/static/css/fonts.css @@ -17,3 +17,113 @@ font-family:"Font Awesome 5 Free"; font-weight:900; } + +@font-face { + font-family: 'Source Sans Pro'; + font-style: normal; + font-weight: 300; + src: + local('Source Sans Pro Light'), + local('SourceSansPro-Light'), + /* from https://fonts.gstatic.com/s/sourcesanspro/v11/6xKydSBYKcSV-LCoeQqfX1RYOo3ik4zwlxdu.woff2 */ + url('../fonts/sourcesanspro/Source_Sans_Pro_300.woff2') format('woff2'), + /* from https://fonts.gstatic.com/s/sourcesanspro/v11/6xKydSBYKcSV-LCoeQqfX1RYOo3ik4zwlxdo.woff */ + url('../fonts/sourcesanspro/Source_Sans_Pro_300.woff') format('woff'), + /* from https://fonts.gstatic.com/s/sourcesanspro/v11/6xKydSBYKcSV-LCoeQqfX1RYOo3ik4zwlxdq.eot */ + url('../fonts/sourcesanspro/Source_Sans_Pro_300.eot?#iefix') format('embedded-opentype'), + /* from https://fonts.gstatic.com/l/font?kit=6xKydSBYKcSV-LCoeQqfX1RYOo3ik4zwlxdp&skey=e2b26fc7e9e1ade8&v=v11#SourceSansPro */ + url('../fonts/sourcesanspro/Source_Sans_Pro_300.svg#SourceSansPro') format('svg'), + /* from https://fonts.gstatic.com/s/sourcesanspro/v11/6xKydSBYKcSV-LCoeQqfX1RYOo3ik4zwlxdr.ttf */ + url('../fonts/sourcesanspro/Source_Sans_Pro_300.ttf') format('truetype'); +} +@font-face { + font-family: 'Source Sans Pro'; + font-style: normal; + font-weight: 400; + src: + local('Source Sans Pro Regular'), + local('SourceSansPro-Regular'), + /* from https://fonts.gstatic.com/s/sourcesanspro/v11/6xK3dSBYKcSV-LCoeQqfX1RYOo3qOK7l.woff2 */ + url('../fonts/sourcesanspro/Source_Sans_Pro_400.woff2') format('woff2'), + /* from https://fonts.gstatic.com/s/sourcesanspro/v11/6xK3dSBYKcSV-LCoeQqfX1RYOo3qOK7j.woff */ + url('../fonts/sourcesanspro/Source_Sans_Pro_400.woff') format('woff'), + /* from https://fonts.gstatic.com/s/sourcesanspro/v11/6xK3dSBYKcSV-LCoeQqfX1RYOo3qOK7h.eot */ + url('../fonts/sourcesanspro/Source_Sans_Pro_400.eot?#iefix') format('embedded-opentype'), + /* from https://fonts.gstatic.com/l/font?kit=6xK3dSBYKcSV-LCoeQqfX1RYOo3qOK7i&skey=1e026b1c27170b9b&v=v11#SourceSansPro */ + url('../fonts/sourcesanspro/Source_Sans_Pro_400.svg#SourceSansPro') format('svg'), + /* from https://fonts.gstatic.com/s/sourcesanspro/v11/6xK3dSBYKcSV-LCoeQqfX1RYOo3qOK7g.ttf */ + url('../fonts/sourcesanspro/Source_Sans_Pro_400.ttf') format('truetype'); +} +@font-face { + font-family: 'Source Sans Pro'; + font-style: normal; + font-weight: 600; + src: + local('Source Sans Pro SemiBold'), + local('SourceSansPro-SemiBold'), + /* from https://fonts.gstatic.com/s/sourcesanspro/v11/6xKydSBYKcSV-LCoeQqfX1RYOo3i54rwlxdu.woff2 */ + url('../fonts/sourcesanspro/Source_Sans_Pro_600.woff2') format('woff2'), + /* from https://fonts.gstatic.com/s/sourcesanspro/v11/6xKydSBYKcSV-LCoeQqfX1RYOo3i54rwlxdo.woff */ + url('../fonts/sourcesanspro/Source_Sans_Pro_600.woff') format('woff'), + /* from https://fonts.gstatic.com/s/sourcesanspro/v11/6xKydSBYKcSV-LCoeQqfX1RYOo3i54rwlxdq.eot */ + url('../fonts/sourcesanspro/Source_Sans_Pro_600.eot?#iefix') format('embedded-opentype'), + /* from https://fonts.gstatic.com/l/font?kit=6xKydSBYKcSV-LCoeQqfX1RYOo3i54rwlxdp&skey=227a890402fab339&v=v11#SourceSansPro */ + url('../fonts/sourcesanspro/Source_Sans_Pro_600.svg#SourceSansPro') format('svg'), + /* from https://fonts.gstatic.com/s/sourcesanspro/v11/6xKydSBYKcSV-LCoeQqfX1RYOo3i54rwlxdr.ttf */ + url('../fonts/sourcesanspro/Source_Sans_Pro_600.ttf') format('truetype'); +} +@font-face { + font-family: 'Source Sans Pro'; + font-style: normal; + font-weight: 900; + src: + local('Source Sans Pro Black'), + local('SourceSansPro-Black'), + /* from https://fonts.gstatic.com/s/sourcesanspro/v11/6xKydSBYKcSV-LCoeQqfX1RYOo3iu4nwlxdu.woff2 */ + url('../fonts/sourcesanspro/Source_Sans_Pro_900.woff2') format('woff2'), + /* from https://fonts.gstatic.com/s/sourcesanspro/v11/6xKydSBYKcSV-LCoeQqfX1RYOo3iu4nwlxdo.woff */ + url('../fonts/sourcesanspro/Source_Sans_Pro_900.woff') format('woff'), + /* from https://fonts.gstatic.com/s/sourcesanspro/v11/6xKydSBYKcSV-LCoeQqfX1RYOo3iu4nwlxdq.eot */ + url('../fonts/sourcesanspro/Source_Sans_Pro_900.eot?#iefix') format('embedded-opentype'), + /* from https://fonts.gstatic.com/l/font?kit=6xKydSBYKcSV-LCoeQqfX1RYOo3iu4nwlxdp&skey=cf4dfcb31d72fb0a&v=v11#SourceSansPro */ + url('../fonts/sourcesanspro/Source_Sans_Pro_900.svg#SourceSansPro') format('svg'), + /* from https://fonts.gstatic.com/s/sourcesanspro/v11/6xKydSBYKcSV-LCoeQqfX1RYOo3iu4nwlxdr.ttf */ + url('../fonts/sourcesanspro/Source_Sans_Pro_900.ttf') format('truetype'); +} + +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 300; + src: + local('Roboto Light'), + local('Roboto-Light'), + /* from https://fonts.gstatic.com/s/roboto/v18/KFOlCnqEu92Fr1MmSU5fBBc4.woff2 */ + url('../fonts/roboto/Roboto_300.woff2') format('woff2'), + /* from https://fonts.gstatic.com/s/roboto/v18/KFOlCnqEu92Fr1MmSU5fBBc-.woff */ + url('../fonts/roboto/Roboto_300.woff') format('woff'), + /* from https://fonts.gstatic.com/s/roboto/v18/KFOlCnqEu92Fr1MmSU5fBBc8.eot */ + url('../fonts/roboto/Roboto_300.eot?#iefix') format('embedded-opentype'), + /* from https://fonts.gstatic.com/l/font?kit=KFOlCnqEu92Fr1MmSU5fBBc_&skey=11ce8ad5f54705ca&v=v18#Roboto */ + url('../fonts/roboto/Roboto_300.svg#Roboto') format('svg'), + /* from https://fonts.gstatic.com/s/roboto/v18/KFOlCnqEu92Fr1MmSU5fBBc9.ttf */ + url('../fonts/roboto/Roboto_300.ttf') format('truetype'); +} +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 400; + src: + local('Roboto'), + local('Roboto-Regular'), + /* from https://fonts.gstatic.com/s/roboto/v18/KFOmCnqEu92Fr1Mu4mxK.woff2 */ + url('../fonts/roboto/Roboto_400.woff2') format('woff2'), + /* from https://fonts.gstatic.com/s/roboto/v18/KFOmCnqEu92Fr1Mu4mxM.woff */ + url('../fonts/roboto/Roboto_400.woff') format('woff'), + /* from https://fonts.gstatic.com/s/roboto/v18/KFOmCnqEu92Fr1Mu4mxO.eot */ + url('../fonts/roboto/Roboto_400.eot?#iefix') format('embedded-opentype'), + /* from https://fonts.gstatic.com/l/font?kit=KFOmCnqEu92Fr1Mu4mxN&skey=a0a0114a1dcab3ac&v=v18#Roboto */ + url('../fonts/roboto/Roboto_400.svg#Roboto') format('svg'), + /* from https://fonts.gstatic.com/s/roboto/v18/KFOmCnqEu92Fr1Mu4mxP.ttf */ + url('../fonts/roboto/Roboto_400.ttf') format('truetype'); +} diff --git a/embedded/favicon.ico b/static/favicon.ico similarity index 100% rename from embedded/favicon.ico rename to static/favicon.ico diff --git a/static/fonts/roboto/Roboto_300.eot b/static/fonts/roboto/Roboto_300.eot new file mode 100644 index 000000000..17b7d5cd2 Binary files /dev/null and b/static/fonts/roboto/Roboto_300.eot differ diff --git a/static/fonts/roboto/Roboto_300.svg b/static/fonts/roboto/Roboto_300.svg new file mode 100644 index 000000000..4ded944a8 --- /dev/null +++ b/static/fonts/roboto/Roboto_300.svg @@ -0,0 +1,312 @@ +<?xml version="1.0" standalone="no"?> +<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> +<svg xmlns="http://www.w3.org/2000/svg"> +<defs > +<font id="Roboto" horiz-adv-x="1135" ><font-face + font-family="Roboto Light" + units-per-em="2048" + panose-1="2 0 0 0 0 0 0 0 0 0" + ascent="1900" + descent="-500" + alphabetic="0" /> +<glyph unicode=" " horiz-adv-x="498" /> +<glyph unicode="!" horiz-adv-x="462" d="M284 405H173L167 1456H291L284 405ZM153 70Q153 104 175 127T235 151T295 128T318 70Q318 37 296 15T235 -8T175 14T153 70Z" /> +<glyph unicode=""" horiz-adv-x="588" d="M243 1396L223 1083H143L146 1536H243V1396ZM479 1396L459 1083H378L382 1536H479V1396Z" /> +<glyph unicode="#" horiz-adv-x="1191" d="M753 410H439L362 0H263L340 410H85V503H357L440 944H161V1040H458L537 1456H636L557 1040H872L951 1456H1051L972 1040H1201V944H954L871 503H1126V410H853L776 0H676L753 410ZM456 503H771L854 944H539L456 503Z" /> +<glyph unicode="$" d="M901 359Q901 470 829 540T575 674Q349 745 258 842T167 1095Q167 1258 267 1359T539 1475V1677H641V1475Q817 1459 913 1343T1010 1028H891Q891 1185 810 1277T587 1370Q445 1370 366 1296T286 1097Q286 977 359 910T607 783T862 669T981 +540T1021 361Q1021 197 919 97T637 -18V-208H536V-19Q335 -6 225 107T115 418H235Q235 262 326 174T580 85Q722 85 811 161T901 359Z" /> +<glyph unicode="%" horiz-adv-x="1513" d="M109 1176Q109 1306 189 1391T394 1477T598 1392T679 1170V1099Q679 971 600 886T396 800Q273 800 191 884T109 1106V1176ZM206 1099Q206 1006 257 946T396 886Q481 886 531 946T582 1103V1176Q582 1269 530 1329T394 +1390Q311 1390 259 1330T206 1170V1099ZM842 357Q842 487 922 572T1126 657T1330 573T1412 350V279Q1412 149 1332 64T1128 -21T924 63T842 284V357ZM938 279Q938 185 989 125T1128 65Q1214 65 1264 125T1315 284V357Q1315 453 1264 511T1126 570Q1042 570 990 +511T938 353V279ZM434 121L359 169L1070 1307L1145 1259L434 121Z" /> +<glyph unicode="&" horiz-adv-x="1260" d="M404 794Q317 899 278 981T238 1145Q238 1298 329 1387T573 1476Q712 1476 798 1396T884 1191Q884 1047 718 908L558 784L958 318Q1049 465 1049 651H1160Q1160 403 1032 232L1231 0H1087L961 146Q882 68 779 24T560 +-20Q352 -20 230 86T108 371Q108 477 170 571T390 784L404 794ZM560 81Q651 81 736 119T890 229L483 701L469 716L423 681Q227 521 227 371Q227 240 317 161T560 81ZM358 1149Q358 1027 493 861L624 961Q688 1007 729 1062T770 1191Q770 1269 716 1321T572 1374Q474 +1374 416 1311T358 1149Z" /> +<glyph unicode="'" horiz-adv-x="348" d="M226 1395L209 1090H119Q124 1386 124 1536H226V1395Z" /> +<glyph unicode="(" horiz-adv-x="653" d="M140 588Q140 806 196 1011T360 1387T592 1632L621 1551Q555 1504 490 1414T374 1200T292 922T260 571Q260 362 307 169T438 -171T621 -393L592 -470Q465 -394 357 -225T195 148T140 588Z" /> +<glyph unicode=")" horiz-adv-x="667" d="M514 573Q514 353 460 150T298 -223T62 -470L33 -393Q131 -323 214 -176T346 166T394 591Q394 798 346 990T214 1334T33 1555L62 1632Q188 1555 295 1386T458 1011T514 573Z" /> +<glyph unicode="*" horiz-adv-x="869" d="M361 1000L29 1108L61 1209L393 1086L389 1456H493L485 1083L809 1210L842 1109L509 994L732 700L647 637L433 942L229 639L144 700L361 1000Z" /> +<glyph unicode="+" horiz-adv-x="1156" d="M630 740H1073V628H630V146H509V628H75V740H509V1206H630V740Z" /> +<glyph unicode="," horiz-adv-x="392" d="M131 -272L60 -220Q151 -98 154 33V188H271V63Q271 -145 131 -272Z" /> +<glyph unicode="-" horiz-adv-x="586" d="M528 592H49V693H528V592Z" /> +<glyph unicode="." horiz-adv-x="489" d="M145 72Q145 107 167 131T230 156T293 132T316 72T293 15T230 -8T168 14T145 72Z" /> +<glyph unicode="/" horiz-adv-x="813" d="M139 -125H30L638 1456H746L139 -125Z" /> +<glyph unicode="0" d="M1015 607Q1015 299 902 140T569 -20Q353 -20 238 136T120 592V853Q120 1160 234 1318T567 1476Q783 1476 897 1324T1015 874V607ZM895 868Q895 1118 814 1246T567 1374Q405 1374 323 1249T239 880V594Q239 345 323 213T569 81Q729 81 811 +210T895 588V868Z" /> +<glyph unicode="1" d="M694 0H574V1312L178 1165V1277L674 1461H694V0Z" /> +<glyph unicode="2" d="M1049 0H137V92L636 658Q760 801 808 894T856 1075Q856 1213 775 1293T552 1374Q405 1374 315 1280T224 1036H105Q105 1159 160 1260T318 1418T552 1476Q752 1476 864 1371T977 1085Q977 983 914 862T690 560L284 101H1049V0Z" /> +<glyph unicode="3" d="M403 793H527Q630 793 707 829T824 929T865 1076Q865 1216 786 1295T559 1374Q419 1374 330 1292T240 1074H120Q120 1187 177 1280T335 1425T559 1476Q757 1476 871 1368T985 1072Q985 967 919 879T736 746Q872 708 942 616T1012 395Q1012 +208 890 94T564 -20Q434 -20 326 32T158 177T98 395H218Q218 256 315 169T564 81Q719 81 805 160T892 391Q892 537 799 614T523 691H403V793Z" /> +<glyph unicode="4" d="M872 469H1099V368H872V0H752V368H67V436L741 1456H872V469ZM214 469H752V1301L699 1209L214 469Z" /> +<glyph unicode="5" d="M218 746L289 1456H1017V1345H392L341 853Q458 933 615 933Q812 933 929 805T1046 464Q1046 234 932 107T611 -20Q421 -20 303 86T168 383H283Q300 234 384 158T611 81Q767 81 846 180T926 462Q926 622 837 723T594 824Q509 824 446 803T313 +719L218 746Z" /> +<glyph unicode="6" d="M843 1467V1362H829Q568 1362 418 1209T252 782Q312 865 405 910T613 956Q805 956 918 824T1032 477Q1032 335 979 221T827 44T601 -20Q392 -20 261 131T130 523V643Q130 1034 308 1248T813 1467H843ZM594 853Q480 853 382 786T250 614V512Q250 +322 347 202T601 82Q741 82 827 193T914 473Q914 645 828 749T594 853Z" /> +<glyph unicode="7" d="M1034 1387L412 0H287L905 1354H77V1456H1034V1387Z" /> +<glyph unicode="8" d="M995 1081Q995 968 929 879T755 747Q881 704 957 608T1033 386Q1033 199 906 90T570 -20Q359 -20 233 89T106 386Q106 510 179 607T379 747Q271 789 207 878T143 1081Q143 1262 259 1369T568 1476T877 1368T995 1081ZM913 385Q913 521 816 +608T568 696T321 610T225 385T318 164T570 81Q725 81 819 163T913 385ZM875 1082Q875 1207 789 1290T568 1374Q432 1374 348 1294T263 1082Q263 954 347 876T569 798Q704 798 789 876T875 1082Z" /> +<glyph unicode="9" d="M884 674Q820 580 725 529T519 477Q395 477 300 541T153 718T101 965Q101 1109 156 1227T311 1410T541 1476Q760 1476 882 1323T1004 887V779Q1004 385 836 187T323 -11H301L302 93H344Q605 97 741 241T884 674ZM534 580Q654 580 749 651T885 +837V906Q885 1128 793 1250T543 1373Q401 1373 310 1259T219 970Q219 803 306 692T534 580Z" /> +<glyph unicode=":" horiz-adv-x="430" d="M383 72Q383 107 405 131T468 156T531 132T554 72T531 15T468 -8T406 14T383 72ZM129 995Q129 1030 151 1054T214 1079T277 1055T300 995T277 938T214 915T152 937T129 995Z" /> +<glyph unicode=";" horiz-adv-x="399" d="M118 995Q118 1030 140 1054T203 1079T266 1055T289 995T266 938T203 915T141 937T118 995ZM131 -272L60 -220Q151 -98 154 33V188H271V63Q271 -145 131 -272Z" /> +<glyph unicode="<" horiz-adv-x="1047" d="M208 655L904 355V229L77 608V705L904 1083V957L208 655Z" /> +<glyph unicode="=" horiz-adv-x="1133" d="M983 829H149V935H983V829ZM983 418H149V524H983V418Z" /> +<glyph unicode=">" horiz-adv-x="1061" d="M835 659L124 962V1085L969 707V610L124 231V355L835 659Z" /> +<glyph unicode="?" horiz-adv-x="930" d="M376 404Q378 522 408 594T537 763T664 901T708 990T724 1101Q724 1226 658 1297T472 1369Q352 1369 279 1301T203 1115H84Q86 1279 195 1377T472 1476Q644 1476 743 1376T843 1103Q843 995 794 901T608 680Q495 585 495 +404H376ZM360 70Q360 104 381 127T442 151Q480 151 502 128T525 70Q525 37 503 15T442 -8Q403 -8 382 14T360 70Z" /> +<glyph unicode="@" horiz-adv-x="1870" d="M1754 513Q1749 366 1700 241T1565 48T1364 -20Q1267 -20 1206 31T1125 174Q1017 -20 827 -20Q687 -20 618 101T567 427Q582 590 641 717T796 916T1001 988Q1078 988 1136 967T1271 880L1220 310Q1210 194 1249 130T1376 +66Q1499 66 1575 186T1661 513Q1680 918 1507 1122T983 1327Q772 1327 603 1222T335 923T225 478T291 35T528 -260T906 -363Q998 -363 1087 -341T1236 -284L1267 -364Q1210 -402 1108 -427T902 -453Q652 -453 472 -341T203 -17T125 478Q137 756 247 970T550 1302T987 +1420Q1242 1420 1419 1314T1681 1002T1754 513ZM673 286Q684 186 729 132T848 77Q1033 77 1121 332L1166 848Q1099 897 1008 897Q897 897 816 809T696 565T673 286Z" /> +<glyph unicode="A" horiz-adv-x="1279" d="M970 408H309L159 0H30L581 1456H698L1249 0H1121L970 408ZM347 513H931L639 1306L347 513Z" /> +<glyph unicode="B" horiz-adv-x="1255" d="M184 0V1456H614Q848 1456 969 1360T1090 1075Q1090 962 1029 879T860 759Q987 731 1064 634T1142 410Q1142 217 1018 109T671 0H184ZM307 700V104H676Q834 104 926 184T1019 408Q1019 543 931 621T686 700H307ZM307 +803H643Q797 806 881 875T966 1078Q966 1218 879 1284T614 1351H307V803Z" /> +<glyph unicode="C" horiz-adv-x="1330" d="M1215 454Q1190 224 1051 102T679 -20Q517 -20 393 61T200 290T131 630V819Q131 1013 199 1163T394 1394T688 1476Q922 1476 1057 1350T1215 1000H1091Q1045 1371 688 1371Q490 1371 373 1223T255 814V636Q255 384 369 +234T679 84Q872 84 970 176T1091 454H1215Z" /> +<glyph unicode="D" horiz-adv-x="1341" d="M184 0V1456H591Q770 1456 912 1375T1133 1141T1213 795V661Q1213 466 1134 315T912 82T582 0H184ZM307 1351V104H583Q813 104 952 256T1091 669V797Q1091 1048 954 1199T593 1351H307Z" /> +<glyph unicode="E" horiz-adv-x="1165" d="M988 698H307V104H1090V0H184V1456H1085V1351H307V802H988V698Z" /> +<glyph unicode="F" horiz-adv-x="1152" d="M986 680H307V0H184V1456H1086V1351H307V785H986V680Z" /> +<glyph unicode="G" horiz-adv-x="1400" d="M1235 173Q1171 82 1035 31T729 -20Q558 -20 425 62T219 294T145 638V822Q145 1125 298 1300T709 1476Q934 1476 1071 1362T1234 1046H1111Q1084 1206 981 1288T710 1371Q506 1371 387 1226T268 817V645Q268 479 324 +352T486 154T729 84Q888 84 1002 134Q1076 167 1112 211V587H721V691H1235V173Z" /> +<glyph unicode="H" horiz-adv-x="1449" d="M1263 0H1139V698H307V0H184V1456H307V802H1139V1456H1263V0Z" /> +<glyph unicode="I" horiz-adv-x="545" d="M334 0H211V1456H334V0Z" /> +<glyph unicode="J" horiz-adv-x="1127" d="M827 1456H951V433Q951 226 832 103T511 -20Q299 -20 185 91T71 401H194Q194 243 277 164T511 84Q650 84 737 176T827 426V1456Z" /> +<glyph unicode="K" horiz-adv-x="1292" d="M512 723L307 521V0H184V1456H307V671L1053 1456H1208L598 808L1255 0H1105L512 723Z" /> +<glyph unicode="L" horiz-adv-x="1079" d="M308 104H1027V0H184V1456H308V104Z" /> +<glyph unicode="M" horiz-adv-x="1772" d="M347 1456L884 171L1423 1456H1587V0H1464V634L1474 1284L932 0H837L297 1279L307 638V0H184V1456H347Z" /> +<glyph unicode="N" horiz-adv-x="1454" d="M1268 0H1145L308 1246V0H184V1456H308L1146 209V1456H1268V0Z" /> +<glyph unicode="O" horiz-adv-x="1386" d="M1260 649Q1260 448 1191 296T992 62T694 -20Q439 -20 282 162T125 655V805Q125 1004 195 1157T395 1393T692 1476T988 1395T1187 1166T1260 823V649ZM1137 807Q1137 1070 1018 1219T692 1368Q489 1368 369 1219T248 +801V649Q248 390 368 239T694 87Q903 87 1020 236T1137 653V807Z" /> +<glyph unicode="P" horiz-adv-x="1261" d="M307 593V0H184V1456H680Q907 1456 1038 1340T1170 1021Q1170 816 1044 705T677 593H307ZM307 697H680Q859 697 953 782T1047 1019Q1047 1170 954 1259T688 1351H307V697Z" /> +<glyph unicode="Q" horiz-adv-x="1386" d="M1256 649Q1256 441 1183 287T973 53L1238 -178L1153 -254L856 3Q774 -20 689 -20Q523 -20 394 62T193 294T121 642V805Q121 1004 191 1157T391 1393T687 1476Q857 1476 986 1394T1185 1159T1256 806V649ZM1133 807Q1133 +1070 1014 1219T687 1368Q485 1368 365 1219T244 801V649Q244 390 363 239T689 87Q897 87 1015 236T1133 652V807Z" /> +<glyph unicode="R" horiz-adv-x="1300" d="M728 606H305V0H181V1456H654Q887 1456 1018 1343T1149 1027Q1149 887 1067 780T847 632L1211 13V0H1080L728 606ZM305 711H682Q837 711 931 799T1025 1027Q1025 1181 927 1266T652 1351H305V711Z" /> +<glyph unicode="S" horiz-adv-x="1213" d="M1008 358Q1008 479 923 549T612 683T282 822Q134 928 134 1100Q134 1267 271 1371T623 1476Q768 1476 882 1420T1060 1264T1123 1041H999Q999 1190 897 1280T623 1371Q456 1371 357 1297T258 1102Q258 991 347 921T632 +798T929 687T1081 549T1132 360Q1132 188 995 84T632 -20Q478 -20 350 35T155 189T88 416H211Q211 262 326 173T632 84Q802 84 905 159T1008 358Z" /> +<glyph unicode="T" horiz-adv-x="1223" d="M1172 1351H673V0H550V1351H52V1456H1172V1351Z" /> +<glyph unicode="U" horiz-adv-x="1346" d="M1187 1456V462Q1186 315 1122 206T942 39T674 -20Q444 -20 306 105T162 453V1456H284V471Q284 287 389 186T674 84T958 186T1063 470V1456H1187Z" /> +<glyph unicode="V" horiz-adv-x="1263" d="M623 180L631 149L640 180L1098 1456H1233L691 0H573L31 1456H165L623 180Z" /> +<glyph unicode="W" horiz-adv-x="1836" d="M453 393L498 167L553 383L869 1456H980L1292 383L1346 165L1394 393L1657 1456H1783L1410 0H1292L962 1139L925 1283L889 1139L551 0H433L61 1456H187L453 393Z" /> +<glyph unicode="X" horiz-adv-x="1253" d="M627 840L1037 1456H1184L702 738L1199 0H1051L627 636L201 0H55L553 738L70 1456H217L627 840Z" /> +<glyph unicode="Y" horiz-adv-x="1226" d="M611 662L1056 1456H1198L672 548V0H549V548L24 1456H170L611 662Z" /> +<glyph unicode="Z" horiz-adv-x="1225" d="M239 104H1138V0H90V93L954 1351H116V1456H1106V1368L239 104Z" /> +<glyph unicode="[" horiz-adv-x="491" d="M493 1562H283V-210H493V-312H163V1664H493V1562Z" /> +<glyph unicode="\" horiz-adv-x="807" d="M48 1456H165L773 -125H656L48 1456Z" /> +<glyph unicode="]" horiz-adv-x="491" d="M0 1664H331V-312H0V-210H211V1562H0V1664Z" /> +<glyph unicode="^" horiz-adv-x="852" d="M421 1298L193 729H77L376 1456H466L764 729H648L421 1298Z" /> +<glyph unicode="_" horiz-adv-x="884" d="M882 -101H1V0H882V-101Z" /> +<glyph unicode="`" horiz-adv-x="585" d="M438 1256H329L103 1536H247L438 1256Z" /> +<glyph unicode="a" horiz-adv-x="1097" d="M839 0Q821 51 816 151Q753 69 656 25T449 -20Q293 -20 197 67T100 287Q100 445 231 537T598 629H815V752Q815 868 744 934T535 1001Q410 1001 328 937T246 783L126 784Q126 913 246 1007T541 1102Q722 1102 826 1012T934 +759V247Q934 90 967 12V0H839ZM463 86Q583 86 677 144T815 299V537H601Q422 535 321 472T220 297Q220 206 287 146T463 86Z" /> +<glyph unicode="b" d="M1027 530Q1027 277 915 129T614 -20Q388 -20 272 148L267 0H155V1536H274V925Q388 1102 612 1102Q804 1102 915 956T1027 548V530ZM907 551Q907 765 824 881T590 998Q475 998 395 942T274 776V288Q364 84 592 84Q740 84 823 201T907 551Z" /> +<glyph unicode="c" horiz-adv-x="1055" d="M556 81Q681 81 765 151T857 334H972Q967 235 910 154T759 26T556 -20Q343 -20 219 128T94 526V562Q94 722 150 845T310 1035T555 1102Q733 1102 848 996T972 717H857Q849 844 766 922T555 1000Q393 1000 304 883T214 +555V520Q214 313 303 197T556 81Z" /> +<glyph unicode="d" horiz-adv-x="1138" d="M108 551Q108 803 220 952T526 1102Q745 1102 860 929V1536H979V0H867L862 144Q747 -20 524 -20Q337 -20 223 130T108 537V551ZM229 530Q229 323 312 204T546 84Q767 84 860 279V787Q767 998 548 998Q397 998 313 880T229 530Z" /> +<glyph unicode="e" horiz-adv-x="1058" d="M575 -20Q437 -20 326 48T152 237T90 510V553Q90 709 150 834T319 1030T553 1102Q750 1102 865 968T981 600V533H209V510Q209 326 314 204T580 81Q676 81 749 116T883 228L958 171Q826 -20 575 -20ZM553 1000Q418 1000 +326 901T213 635H862V648Q857 804 773 902T553 1000Z" /> +<glyph unicode="f" horiz-adv-x="678" d="M242 0V984H63V1082H242V1213Q242 1379 326 1468T562 1557Q630 1557 689 1540L680 1440Q630 1452 571 1452Q472 1452 417 1391T362 1216V1082H620V984H362V0H242Z" /> +<glyph unicode="g" horiz-adv-x="1136" d="M108 551Q108 805 220 953T526 1102Q747 1102 862 926L868 1082H980V22Q980 -187 863 -309T546 -431Q433 -431 331 -381T169 -246L236 -174Q363 -330 538 -330Q688 -330 772 -242T859 4V140Q744 -20 524 -20Q336 -20 +222 130T108 535V551ZM229 530Q229 323 312 204T546 84Q767 84 859 282V785Q817 889 738 943T548 998Q397 998 313 880T229 530Z" /> +<glyph unicode="h" horiz-adv-x="1124" d="M275 899Q334 996 426 1049T627 1102Q801 1102 886 1004T972 710V0H853V711Q852 856 792 927T598 998Q487 998 402 929T275 741V0H156V1536H275V899Z" /> +<glyph unicode="i" horiz-adv-x="459" d="M290 0H170V1082H290V0ZM149 1395Q149 1429 171 1452T231 1476T291 1453T314 1395T292 1338T231 1315T171 1338T149 1395Z" /> +<glyph unicode="j" horiz-adv-x="467" d="M285 1082V-129Q285 -279 213 -358T1 -437Q-53 -437 -104 -418L-102 -319Q-58 -332 -12 -332Q166 -332 166 -127V1082H285ZM226 1476Q265 1476 287 1453T309 1395T287 1338T226 1315Q188 1315 167 1338T145 1395T166 1452T226 +1476Z" /> +<glyph unicode="k" horiz-adv-x="1003" d="M413 545L276 413V0H156V1536H276V553L389 675L803 1082H954L495 626L994 0H851L413 545Z" /> +<glyph unicode="l" horiz-adv-x="459" d="M290 0H170V1536H290V0Z" /> +<glyph unicode="m" horiz-adv-x="1815" d="M265 1082L269 906Q329 1004 419 1053T619 1102Q875 1102 944 892Q1002 993 1099 1047T1313 1102Q1661 1102 1668 722V0H1548V713Q1547 858 1486 928T1285 998Q1156 996 1067 915T968 716V0H848V722Q847 861 783 929T584 +998Q471 998 390 934T270 742V0H150V1082H265Z" /> +<glyph unicode="n" horiz-adv-x="1125" d="M270 1082L274 897Q335 997 426 1049T627 1102Q801 1102 886 1004T972 710V0H853V711Q852 856 792 927T598 998Q487 998 402 929T275 741V0H156V1082H270Z" /> +<glyph unicode="o" horiz-adv-x="1147" d="M90 557Q90 713 150 838T321 1032T572 1102Q788 1102 922 951T1056 549V524Q1056 367 996 242T825 48T574 -20Q359 -20 225 131T90 533V557ZM210 524Q210 330 310 206T574 81Q736 81 836 205T937 534V557Q937 681 891 +784T762 943T572 1000Q412 1000 311 875T210 546V524Z" /> +<glyph unicode="p" d="M1026 530Q1026 277 914 129T614 -20Q392 -20 274 136V-416H155V1082H266L272 929Q389 1102 611 1102Q805 1102 915 955T1026 547V530ZM906 551Q906 758 821 878T584 998Q474 998 395 945T274 791V272Q317 179 397 130T586 81Q737 81 821 +201T906 551Z" /> +<glyph unicode="q" horiz-adv-x="1142" d="M108 551Q108 805 220 953T528 1102Q747 1102 861 935L867 1082H979V-416H859V134Q741 -20 526 -20Q336 -20 222 130T108 535V551ZM229 530Q229 320 313 201T548 81Q763 81 859 268V798Q814 895 735 947T550 1000Q399 +1000 314 881T229 530Z" /> +<glyph unicode="r" horiz-adv-x="689" d="M656 980Q618 987 575 987Q463 987 386 925T275 743V0H156V1082H273L275 910Q370 1102 580 1102Q630 1102 659 1089L656 980Z" /> +<glyph unicode="s" horiz-adv-x="1037" d="M804 275Q804 364 733 418T517 502T294 572T176 669T137 807Q137 935 244 1018T518 1102Q699 1102 808 1013T918 779H798Q798 874 719 937T518 1000Q400 1000 329 948T257 811Q257 730 316 686T533 604T769 525T886 424T924 +281Q924 144 814 62T525 -20Q336 -20 219 71T101 303H221Q228 198 309 140T525 81Q650 81 727 136T804 275Z" /> +<glyph unicode="t" horiz-adv-x="658" d="M342 1359V1082H566V984H342V263Q342 173 374 129T483 85Q513 85 580 95L585 -3Q538 -20 457 -20Q334 -20 278 51T222 262V984H23V1082H222V1359H342Z" /> +<glyph unicode="u" horiz-adv-x="1125" d="M852 137Q744 -20 507 -20Q334 -20 244 80T152 378V1082H271V393Q271 84 521 84Q781 84 850 299V1082H970V0H854L852 137Z" /> +<glyph unicode="v" horiz-adv-x="985" d="M493 165L822 1082H945L541 0H444L38 1082H161L493 165Z" /> +<glyph unicode="w" horiz-adv-x="1544" d="M415 249L433 156L457 254L717 1082H819L1076 261L1104 147L1127 252L1349 1082H1473L1158 0H1056L778 858L765 917L752 857L479 0H377L63 1082H186L415 249Z" /> +<glyph unicode="x" horiz-adv-x="996" d="M496 643L788 1082H930L563 551L946 0H805L497 458L189 0H48L430 551L63 1082H204L496 643Z" /> +<glyph unicode="y" horiz-adv-x="973" d="M499 172L815 1082H944L482 -184L458 -240Q369 -437 183 -437Q140 -437 91 -423L90 -324L152 -330Q240 -330 294 -287T387 -137L440 9L32 1082H163L499 172Z" /> +<glyph unicode="z" horiz-adv-x="996" d="M235 101H938V0H87V88L743 979H107V1082H894V993L235 101Z" /> +<glyph unicode="{" horiz-adv-x="676" d="M637 -404Q469 -354 384 -241T299 59V280Q299 543 68 543V647Q299 647 299 908V1137Q300 1320 384 1433T637 1597L663 1518Q419 1440 419 1127V914Q419 668 235 595Q419 518 419 277V49Q423 -243 666 -324L637 -404Z" /> +<glyph unicode="|" horiz-adv-x="452" d="M279 -270H178V1456H279V-270Z" /> +<glyph unicode="}" horiz-adv-x="676" d="M9 -324Q252 -243 256 49V273Q256 526 449 594Q256 662 256 913V1126Q256 1442 12 1518L38 1597Q209 1546 292 1432T376 1131V908Q376 647 607 647V543Q376 543 376 280V59Q376 -128 291 -241T38 -404L9 -324Z" /> +<glyph unicode="~" horiz-adv-x="1402" d="M1254 764Q1254 615 1171 519T958 423Q886 423 824 450T670 558T535 659T441 680Q352 680 303 621T253 450L145 449Q145 598 226 692T441 787Q515 787 581 756T740 643Q807 580 855 555T958 529Q1046 529 1098 592T1150 +764H1254Z" /> +<glyph unicode=" " horiz-adv-x="498" /> +<glyph unicode="¡" horiz-adv-x="452" d="M174 690H285L292 -359H168L174 690ZM305 1022Q305 988 283 965T223 942T163 965T140 1022T162 1079T223 1102T283 1079T305 1022Z" /> +<glyph unicode="¢" horiz-adv-x="1115" d="M581 81Q704 81 788 150T882 334H997Q989 195 887 97T636 -17V-245H516V-16Q331 7 225 150T119 526V562Q119 784 224 929T516 1098V1318H636V1099Q791 1083 891 978T997 717H882Q874 844 791 922T580 1000Q418 1000 +329 883T239 555V520Q239 313 328 197T581 81Z" /> +<glyph unicode="£" horiz-adv-x="1170" d="M404 645L413 368Q415 194 349 104H1094V0H97V104H195Q246 117 272 211Q292 285 290 367L281 645H93V749H277L268 1039Q268 1239 378 1357T674 1476Q856 1476 961 1371T1067 1088H944Q944 1223 869 1297T665 1371Q540 +1371 466 1283T392 1039L401 749H745V645H404Z" /> +<glyph unicode="¤" horiz-adv-x="1481" d="M1131 133Q1053 61 953 21T740 -20Q514 -20 349 132L194 -26L109 60L268 221Q144 389 144 608Q144 835 277 1006L109 1177L194 1264L361 1094Q526 1234 740 1234T1119 1092L1289 1265L1375 1177L1204 1002Q1334 +832 1334 608Q1334 393 1212 224L1375 60L1289 -27L1131 133ZM257 608Q257 470 321 350T499 161T740 91Q869 91 981 161T1157 350T1221 608Q1221 747 1156 866T979 1054T740 1122T500 1054T323 867T257 608Z" /> +<glyph unicode="¥" horiz-adv-x="1056" d="M527 731L892 1456H1030L631 705H944V616H586V412H944V324H586V0H463V324H109V412H463V616H109V705H422L24 1456H163L527 731Z" /> +<glyph unicode="¦" horiz-adv-x="444" d="M159 -270V501H279V-270H159ZM279 698H159V1456H279V698Z" /> +<glyph unicode="§" horiz-adv-x="1239" d="M1119 431Q1119 331 1058 262T887 159Q978 111 1026 41T1075 -139Q1075 -303 949 -399T606 -495Q497 -495 401 -467T236 -382Q102 -268 102 -64L222 -62Q222 -218 325 -305T606 -393Q766 -393 860 -324T954 -141Q954 +-64 920 -17T805 69T548 156T284 255T153 378T108 551Q108 651 166 721T331 825Q245 872 199 942T153 1120Q153 1281 282 1378T624 1476Q848 1476 972 1363T1097 1045H977Q977 1191 881 1282T624 1374Q459 1374 366 1306T273 1122Q273 1043 304 996T411 911T646 +828Q842 777 936 726T1075 603T1119 431ZM454 771Q346 758 287 700T228 553Q228 470 263 422T379 336T663 242L755 214Q867 227 933 284T999 428Q999 526 932 585T692 700L454 771Z" /> +<glyph unicode="¨" horiz-adv-x="881" d="M137 1396Q137 1430 159 1453T219 1477T279 1454T302 1396Q302 1363 280 1340T219 1317T159 1340T137 1396ZM575 1395Q575 1429 597 1452T657 1476T717 1453T740 1395Q740 1362 718 1339T657 1316T597 1339T575 1395Z" /> +<glyph unicode="©" horiz-adv-x="1637" d="M1121 607Q1121 455 1039 374T807 293T566 399T474 686V776Q474 950 566 1056T807 1163T1039 1083T1122 850H1023Q1023 1074 807 1074Q701 1074 637 993T573 771V680Q573 546 636 465T807 383Q913 383 967 436T1022 +607H1121ZM192 729Q192 553 273 399T502 155T817 65Q984 65 1129 154T1357 396T1441 729Q1441 907 1358 1059T1130 1300T817 1389Q646 1389 499 1298T272 1055T192 729ZM107 729Q107 931 200 1104T459 1376T817 1476T1174 1377T1432 1104T1526 729Q1526 532 1436 +360T1181 84T817 -21Q620 -21 455 82T198 358T107 729Z" /> +<glyph unicode="ª" horiz-adv-x="906" d="M649 705Q634 748 628 799Q541 691 406 691Q289 691 223 749T157 908Q157 1018 240 1079T486 1140H625V1201Q625 1286 585 1333T464 1380Q374 1380 323 1345T271 1237L164 1243Q164 1345 247 1410T464 1476Q588 1476 +661 1405T734 1199V884Q734 792 760 705H649ZM426 786Q479 786 536 816T625 890V1058H496Q266 1058 266 912Q266 786 426 786Z" /> +<glyph unicode="«" horiz-adv-x="933" d="M247 792L523 404H418L123 783V802L418 1181H523L247 792ZM556 536L832 148H727L432 527V546L727 925H832L556 536Z" /> +<glyph unicode="¬" horiz-adv-x="1117" d="M936 386H816V670H124V776H936V386Z" /> +<glyph unicode="" horiz-adv-x="586" d="M528 592H49V693H528V592Z" /> +<glyph unicode="®" horiz-adv-x="1642" d="M102 729Q102 931 195 1104T454 1376T812 1476T1169 1377T1428 1104T1522 729Q1522 530 1431 358T1175 83T812 -21T450 82T193 358T102 729ZM187 729Q187 550 270 396T499 154T812 65T1125 153T1353 396T1436 729Q1436 +905 1355 1057T1129 1299T812 1389Q644 1389 499 1301T270 1060T187 729ZM650 666V321H552V1160H810Q957 1160 1036 1099T1115 912Q1115 779 974 715Q1046 689 1074 635T1102 504T1106 394T1119 337V321H1017Q1003 357 1003 503Q1003 592 966 629T838 666H650ZM650 +757H831Q912 757 964 799T1017 910Q1017 995 974 1031T824 1070H650V757Z" /> +<glyph unicode="¯" horiz-adv-x="874" d="M756 1343H137V1440H756V1343Z" /> +<glyph unicode="°" horiz-adv-x="774" d="M630 1226Q630 1122 559 1051T388 980Q287 980 215 1051T143 1226T216 1402T388 1476T558 1403T630 1226ZM233 1226Q233 1159 277 1115T388 1071T497 1115T540 1226Q540 1295 497 1340T388 1385Q323 1385 278 1340T233 +1226Z" /> +<glyph unicode="±" horiz-adv-x="1085" d="M609 829H1000V727H609V289H498V727H84V829H498V1267H609V829ZM963 0H128V101H963V0Z" /> +<glyph unicode="²" horiz-adv-x="740" d="M667 665H96V740L416 1054Q522 1164 522 1237Q522 1300 482 1338T362 1377Q275 1377 228 1333T181 1215H76Q76 1323 155 1394T360 1465T557 1403T628 1239Q628 1138 510 1016L455 961L229 752H667V665Z" /> +<glyph unicode="³" horiz-adv-x="740" d="M267 1107H353Q434 1109 481 1145T529 1241Q529 1303 486 1340T362 1377Q286 1377 238 1340T190 1245H85Q85 1341 163 1403T361 1465Q489 1465 562 1405T635 1243Q635 1187 597 1140T489 1069Q651 1027 651 880Q651 +778 572 716T363 654Q234 654 153 717T71 884H177Q177 822 229 782T366 741Q453 741 499 779T546 883Q546 1025 340 1025H267V1107Z" /> +<glyph unicode="´" horiz-adv-x="576" d="M315 1536H460L229 1256H124L315 1536Z" /> +<glyph unicode="µ" horiz-adv-x="1140" d="M281 1082V446Q281 266 344 174T544 81Q676 81 753 138T859 312V1082H979V0H870L863 154Q765 -20 552 -20Q368 -20 281 105V-416H162V1082H281Z" /> +<glyph unicode="¶" horiz-adv-x="973" d="M681 0V520H573Q423 520 312 578T142 742T83 988Q83 1201 216 1328T577 1456H801V0H681Z" /> +<glyph unicode="·" horiz-adv-x="503" d="M163 717Q163 752 185 776T247 800T310 776T333 717T310 659T247 635T185 658T163 717Z" /> +<glyph unicode="¸" horiz-adv-x="498" d="M246 0L234 -64Q399 -85 399 -235Q399 -327 320 -381T105 -435L98 -357Q187 -357 243 -325T300 -237Q300 -179 257 -157T124 -127L153 0H246Z" /> +<glyph unicode="¹" horiz-adv-x="740" d="M464 665H358V1328L126 1258V1348L450 1455H464V665Z" /> +<glyph unicode="º" horiz-adv-x="922" d="M135 1132Q135 1285 223 1380T458 1476Q605 1476 693 1381T782 1127V1033Q782 880 694 785T460 690Q313 690 224 784T135 1038V1132ZM243 1033Q243 919 299 852T460 785Q559 785 616 851T674 1037V1132Q674 1247 +616 1313T458 1380T301 1312T243 1127V1033Z" /> +<glyph unicode="»" horiz-adv-x="928" d="M221 944L516 560V541L221 162H115L391 550L115 944H221ZM540 944L835 560V541L540 162H434L710 550L434 944H540Z" /> +<glyph unicode="¼" horiz-adv-x="1484" d="M453 664H347V1327L115 1257V1347L439 1454H453V664ZM414 129L340 177L1051 1315L1125 1267L414 129ZM1272 275H1399V187H1272V0H1167V187H768L764 253L1161 789H1272V275ZM878 275H1167V659L1136 609L878 275Z" /> +<glyph unicode="½" horiz-adv-x="1548" d="M370 129L296 177L1007 1315L1081 1267L370 129ZM438 664H332V1327L100 1257V1347L424 1454H438V664ZM1436 0H865V75L1185 389Q1291 499 1291 572Q1291 635 1251 673T1131 712Q1044 712 997 668T950 550H845Q845 +658 924 729T1129 800T1326 738T1397 574Q1397 473 1279 351L1224 296L998 87H1436V0Z" /> +<glyph unicode="¾" horiz-adv-x="1590" d="M558 129L484 177L1195 1315L1269 1267L558 129ZM1387 275H1514V187H1387V0H1282V187H883L879 253L1276 789H1387V275ZM993 275H1282V659L1251 609L993 275ZM314 1107H400Q481 1109 528 1145T576 1241Q576 1303 +533 1340T409 1377Q333 1377 285 1340T237 1245H132Q132 1341 210 1403T408 1465Q536 1465 609 1405T682 1243Q682 1187 644 1140T536 1069Q698 1027 698 880Q698 778 619 716T410 654Q281 654 200 717T118 884H224Q224 822 276 782T413 741Q500 741 546 779T593 +883Q593 1025 387 1025H314V1107Z" /> +<glyph unicode="¿" horiz-adv-x="940" d="M551 687Q549 564 524 505T405 352T288 228Q207 123 207 -8Q207 -137 274 -207T469 -277Q588 -277 659 -207T732 -20H852Q850 -186 745 -284T469 -383Q291 -383 190 -283T88 -10Q88 101 141 202T337 438Q422 509 +429 618L431 687H551ZM567 1022Q567 988 545 965T485 941T425 964T402 1022Q402 1055 424 1078T485 1101T545 1078T567 1022Z" /> +<glyph unicode="À" horiz-adv-x="1279" d="M970 408H309L159 0H30L581 1456H698L1249 0H1121L970 408ZM347 513H931L639 1306L347 513ZM716 1571H607L381 1851H525L716 1571Z" /> +<glyph unicode="Á" horiz-adv-x="1279" d="M970 408H309L159 0H30L581 1456H698L1249 0H1121L970 408ZM347 513H931L639 1306L347 513ZM762 1851H907L676 1571H571L762 1851Z" /> +<glyph unicode="Â" horiz-adv-x="1279" d="M970 408H309L159 0H30L581 1456H698L1249 0H1121L970 408ZM347 513H931L639 1306L347 513ZM921 1583V1573H810L642 1756L475 1573H366V1586L604 1841H680L921 1583Z" /> +<glyph unicode="Ã" horiz-adv-x="1279" d="M970 408H309L159 0H30L581 1456H698L1249 0H1121L970 408ZM347 513H931L639 1306L347 513ZM983 1809Q983 1713 927 1655T788 1596Q712 1596 640 1651T510 1706Q463 1706 432 1675T400 1588L310 1591Q310 1683 364 +1743T505 1803Q553 1803 587 1786T651 1748T711 1710T783 1693Q829 1693 861 1726T894 1815L983 1809Z" /> +<glyph unicode="Ä" horiz-adv-x="1279" d="M970 408H309L159 0H30L581 1456H698L1249 0H1121L970 408ZM347 513H931L639 1306L347 513ZM343 1711Q343 1745 365 1768T425 1792T485 1769T508 1711Q508 1678 486 1655T425 1632T365 1655T343 1711ZM781 1710Q781 +1744 803 1767T863 1791T923 1768T946 1710Q946 1677 924 1654T863 1631T803 1654T781 1710Z" /> +<glyph unicode="Å" horiz-adv-x="1279" d="M970 408H309L159 0H30L581 1456H698L1249 0H1121L970 408ZM347 513H931L639 1306L347 513ZM450 1715Q450 1795 506 1850T643 1905Q722 1905 779 1850T836 1715Q836 1636 781 1582T643 1528T505 1582T450 1715ZM527 +1715Q527 1665 560 1632T643 1599Q692 1599 726 1631T760 1715Q760 1768 725 1801T643 1834Q594 1834 561 1800T527 1715Z" /> +<glyph unicode="Æ" horiz-adv-x="1865" d="M1823 0H1006L989 389H393L163 0H17L898 1456H1762V1354H1068L1091 809H1680V707H1095L1121 101H1823V0ZM460 502H985L950 1331L460 502Z" /> +<glyph unicode="Ç" horiz-adv-x="1330" d="M1215 454Q1190 224 1051 102T679 -20Q517 -20 393 61T200 290T131 630V819Q131 1013 199 1163T394 1394T688 1476Q922 1476 1057 1350T1215 1000H1091Q1045 1371 688 1371Q490 1371 373 1223T255 814V636Q255 384 +369 234T679 84Q872 84 970 176T1091 454H1215ZM728 -9L716 -73Q881 -94 881 -244Q881 -336 802 -390T587 -444L580 -366Q669 -366 725 -334T782 -246Q782 -188 739 -166T606 -136L635 -9H728Z" /> +<glyph unicode="È" horiz-adv-x="1165" d="M988 698H307V104H1090V0H184V1456H1085V1351H307V802H988V698ZM693 1577H584L358 1857H502L693 1577Z" /> +<glyph unicode="É" horiz-adv-x="1165" d="M988 698H307V104H1090V0H184V1456H1085V1351H307V802H988V698ZM739 1857H884L653 1577H548L739 1857Z" /> +<glyph unicode="Ê" horiz-adv-x="1165" d="M988 698H307V104H1090V0H184V1456H1085V1351H307V802H988V698ZM898 1589V1579H787L619 1762L452 1579H343V1592L581 1847H657L898 1589Z" /> +<glyph unicode="Ë" horiz-adv-x="1165" d="M988 698H307V104H1090V0H184V1456H1085V1351H307V802H988V698ZM320 1717Q320 1751 342 1774T402 1798T462 1775T485 1717Q485 1684 463 1661T402 1638T342 1661T320 1717ZM758 1716Q758 1750 780 1773T840 1797T900 +1774T923 1716Q923 1683 901 1660T840 1637T780 1660T758 1716Z" /> +<glyph unicode="Ì" horiz-adv-x="545" d="M334 0H211V1456H334V0ZM348 1577H239L13 1857H157L348 1577Z" /> +<glyph unicode="Í" horiz-adv-x="545" d="M334 0H211V1456H334V0ZM393 1857H538L307 1577H202L393 1857Z" /> +<glyph unicode="Î" horiz-adv-x="545" d="M334 0H211V1456H334V0ZM553 1589V1579H442L274 1762L107 1579H-2V1592L236 1847H312L553 1589Z" /> +<glyph unicode="Ï" horiz-adv-x="545" d="M334 0H211V1456H334V0ZM-25 1717Q-25 1751 -3 1774T57 1798T117 1775T140 1717Q140 1684 118 1661T57 1638T-3 1661T-25 1717ZM413 1716Q413 1750 435 1773T495 1797T555 1774T578 1716Q578 1683 556 1660T495 1637T435 +1660T413 1716Z" /> +<glyph unicode="Ð" horiz-adv-x="1371" d="M214 0V689H33V791H214V1456H621Q800 1456 942 1375T1163 1141T1243 795V661Q1243 466 1164 315T942 82T612 0H214ZM645 689H337V104H608Q843 104 982 256T1121 669V797Q1121 1048 984 1199T623 1351H337V791H645V689Z" /> +<glyph unicode="Ñ" horiz-adv-x="1454" d="M1268 0H1145L308 1246V0H184V1456H308L1146 209V1456H1268V0ZM1067 1809Q1067 1713 1011 1655T872 1596Q796 1596 724 1651T594 1706Q547 1706 516 1675T484 1588L394 1591Q394 1683 448 1743T589 1803Q637 1803 +671 1786T735 1748T795 1710T867 1693Q913 1693 945 1726T978 1815L1067 1809Z" /> +<glyph unicode="Ò" horiz-adv-x="1386" d="M1260 649Q1260 448 1191 296T992 62T694 -20Q439 -20 282 162T125 655V805Q125 1004 195 1157T395 1393T692 1476T988 1395T1187 1166T1260 823V649ZM1137 807Q1137 1070 1018 1219T692 1368Q489 1368 369 1219T248 +801V649Q248 390 368 239T694 87Q903 87 1020 236T1137 653V807ZM765 1583H656L430 1863H574L765 1583Z" /> +<glyph unicode="Ó" horiz-adv-x="1386" d="M1260 649Q1260 448 1191 296T992 62T694 -20Q439 -20 282 162T125 655V805Q125 1004 195 1157T395 1393T692 1476T988 1395T1187 1166T1260 823V649ZM1137 807Q1137 1070 1018 1219T692 1368Q489 1368 369 1219T248 +801V649Q248 390 368 239T694 87Q903 87 1020 236T1137 653V807ZM811 1863H956L725 1583H620L811 1863Z" /> +<glyph unicode="Ô" horiz-adv-x="1386" d="M1260 649Q1260 448 1191 296T992 62T694 -20Q439 -20 282 162T125 655V805Q125 1004 195 1157T395 1393T692 1476T988 1395T1187 1166T1260 823V649ZM1137 807Q1137 1070 1018 1219T692 1368Q489 1368 369 1219T248 +801V649Q248 390 368 239T694 87Q903 87 1020 236T1137 653V807ZM970 1595V1585H859L691 1768L524 1585H415V1598L653 1853H729L970 1595Z" /> +<glyph unicode="Õ" horiz-adv-x="1386" d="M1260 649Q1260 448 1191 296T992 62T694 -20Q439 -20 282 162T125 655V805Q125 1004 195 1157T395 1393T692 1476T988 1395T1187 1166T1260 823V649ZM1137 807Q1137 1070 1018 1219T692 1368Q489 1368 369 1219T248 +801V649Q248 390 368 239T694 87Q903 87 1020 236T1137 653V807ZM1032 1821Q1032 1725 976 1667T837 1608Q761 1608 689 1663T559 1718Q512 1718 481 1687T449 1600L359 1603Q359 1695 413 1755T554 1815Q602 1815 636 1798T700 1760T760 1722T832 1705Q878 1705 +910 1738T943 1827L1032 1821Z" /> +<glyph unicode="Ö" horiz-adv-x="1386" d="M1260 649Q1260 448 1191 296T992 62T694 -20Q439 -20 282 162T125 655V805Q125 1004 195 1157T395 1393T692 1476T988 1395T1187 1166T1260 823V649ZM1137 807Q1137 1070 1018 1219T692 1368Q489 1368 369 1219T248 +801V649Q248 390 368 239T694 87Q903 87 1020 236T1137 653V807ZM392 1723Q392 1757 414 1780T474 1804T534 1781T557 1723Q557 1690 535 1667T474 1644T414 1667T392 1723ZM830 1722Q830 1756 852 1779T912 1803T972 1780T995 1722Q995 1689 973 1666T912 1643T852 +1666T830 1722Z" /> +<glyph unicode="×" horiz-adv-x="1072" d="M93 179L451 544L108 894L187 974L529 624L872 974L951 894L608 544L966 179L887 100L529 464L172 100L93 179Z" /> +<glyph unicode="Ø" horiz-adv-x="1386" d="M1260 649Q1260 448 1191 296T992 62T694 -20Q508 -20 375 77L274 -83H170L307 134Q125 318 125 658V805Q125 1004 195 1157T395 1393T692 1476Q916 1476 1064 1336L1171 1505H1274L1125 1268Q1259 1088 1260 807V649ZM248 +649Q248 388 370 235L1002 1237Q883 1368 692 1368Q489 1368 369 1219T248 801V649ZM1137 807Q1137 1018 1057 1160L434 171Q541 87 694 87Q903 87 1020 236T1137 653V807Z" /> +<glyph unicode="Ù" horiz-adv-x="1346" d="M1187 1456V462Q1186 315 1122 206T942 39T674 -20Q444 -20 306 105T162 453V1456H284V471Q284 287 389 186T674 84T958 186T1063 470V1456H1187ZM756 1571H647L421 1851H565L756 1571Z" /> +<glyph unicode="Ú" horiz-adv-x="1346" d="M1187 1456V462Q1186 315 1122 206T942 39T674 -20Q444 -20 306 105T162 453V1456H284V471Q284 287 389 186T674 84T958 186T1063 470V1456H1187ZM802 1851H947L716 1571H611L802 1851Z" /> +<glyph unicode="Û" horiz-adv-x="1346" d="M1187 1456V462Q1186 315 1122 206T942 39T674 -20Q444 -20 306 105T162 453V1456H284V471Q284 287 389 186T674 84T958 186T1063 470V1456H1187ZM961 1583V1573H850L682 1756L515 1573H406V1586L644 1841H720L961 1583Z" /> +<glyph unicode="Ü" horiz-adv-x="1346" d="M1187 1456V462Q1186 315 1122 206T942 39T674 -20Q444 -20 306 105T162 453V1456H284V471Q284 287 389 186T674 84T958 186T1063 470V1456H1187ZM383 1711Q383 1745 405 1768T465 1792T525 1769T548 1711Q548 1678 +526 1655T465 1632T405 1655T383 1711ZM821 1710Q821 1744 843 1767T903 1791T963 1768T986 1710Q986 1677 964 1654T903 1631T843 1654T821 1710Z" /> +<glyph unicode="Ý" horiz-adv-x="1226" d="M611 662L1056 1456H1198L672 548V0H549V548L24 1456H170L611 662ZM732 1845H877L646 1565H541L732 1845Z" /> +<glyph unicode="Þ" horiz-adv-x="1214" d="M303 1456V1152H628Q771 1152 877 1101T1039 956T1096 738Q1096 553 974 441T641 324H303V0H183V1456H303ZM303 1051V425H627Q784 425 880 510T976 736T885 961T642 1051H303Z" /> +<glyph unicode="ß" horiz-adv-x="1200" d="M271 0H151V1127Q151 1327 246 1435T512 1544Q665 1544 760 1460T856 1237Q856 1179 843 1131T794 1019T746 913T733 824Q733 768 774 716T911 593T1051 454T1096 306Q1096 160 990 70T720 -20Q636 -20 545 4T414 +60L448 161Q485 132 562 106T706 80Q828 80 902 144T976 306Q976 367 932 423T797 547T659 681T613 826Q613 922 676 1034T739 1230Q739 1323 676 1382T522 1442Q275 1442 271 1136V0Z" /> +<glyph unicode="à" horiz-adv-x="1097" d="M839 0Q821 51 816 151Q753 69 656 25T449 -20Q293 -20 197 67T100 287Q100 445 231 537T598 629H815V752Q815 868 744 934T535 1001Q410 1001 328 937T246 783L126 784Q126 913 246 1007T541 1102Q722 1102 826 +1012T934 759V247Q934 90 967 12V0H839ZM463 86Q583 86 677 144T815 299V537H601Q422 535 321 472T220 297Q220 206 287 146T463 86ZM653 1256H544L318 1536H462L653 1256Z" /> +<glyph unicode="á" horiz-adv-x="1097" d="M839 0Q821 51 816 151Q753 69 656 25T449 -20Q293 -20 197 67T100 287Q100 445 231 537T598 629H815V752Q815 868 744 934T535 1001Q410 1001 328 937T246 783L126 784Q126 913 246 1007T541 1102Q722 1102 826 +1012T934 759V247Q934 90 967 12V0H839ZM463 86Q583 86 677 144T815 299V537H601Q422 535 321 472T220 297Q220 206 287 146T463 86ZM699 1536H844L613 1256H508L699 1536Z" /> +<glyph unicode="â" horiz-adv-x="1097" d="M839 0Q821 51 816 151Q753 69 656 25T449 -20Q293 -20 197 67T100 287Q100 445 231 537T598 629H815V752Q815 868 744 934T535 1001Q410 1001 328 937T246 783L126 784Q126 913 246 1007T541 1102Q722 1102 826 +1012T934 759V247Q934 90 967 12V0H839ZM463 86Q583 86 677 144T815 299V537H601Q422 535 321 472T220 297Q220 206 287 146T463 86ZM858 1268V1258H747L579 1441L412 1258H303V1271L541 1526H617L858 1268Z" /> +<glyph unicode="ã" horiz-adv-x="1097" d="M839 0Q821 51 816 151Q753 69 656 25T449 -20Q293 -20 197 67T100 287Q100 445 231 537T598 629H815V752Q815 868 744 934T535 1001Q410 1001 328 937T246 783L126 784Q126 913 246 1007T541 1102Q722 1102 826 +1012T934 759V247Q934 90 967 12V0H839ZM463 86Q583 86 677 144T815 299V537H601Q422 535 321 472T220 297Q220 206 287 146T463 86ZM920 1494Q920 1398 864 1340T725 1281Q649 1281 577 1336T447 1391Q400 1391 369 1360T337 1273L247 1276Q247 1368 301 1428T442 +1488Q490 1488 524 1471T588 1433T648 1395T720 1378Q766 1378 798 1411T831 1500L920 1494Z" /> +<glyph unicode="ä" horiz-adv-x="1097" d="M839 0Q821 51 816 151Q753 69 656 25T449 -20Q293 -20 197 67T100 287Q100 445 231 537T598 629H815V752Q815 868 744 934T535 1001Q410 1001 328 937T246 783L126 784Q126 913 246 1007T541 1102Q722 1102 826 +1012T934 759V247Q934 90 967 12V0H839ZM463 86Q583 86 677 144T815 299V537H601Q422 535 321 472T220 297Q220 206 287 146T463 86ZM280 1396Q280 1430 302 1453T362 1477T422 1454T445 1396Q445 1363 423 1340T362 1317T302 1340T280 1396ZM718 1395Q718 1429 +740 1452T800 1476T860 1453T883 1395Q883 1362 861 1339T800 1316T740 1339T718 1395Z" /> +<glyph unicode="å" horiz-adv-x="1097" d="M839 0Q821 51 816 151Q753 69 656 25T449 -20Q293 -20 197 67T100 287Q100 445 231 537T598 629H815V752Q815 868 744 934T535 1001Q410 1001 328 937T246 783L126 784Q126 913 246 1007T541 1102Q722 1102 826 +1012T934 759V247Q934 90 967 12V0H839ZM463 86Q583 86 677 144T815 299V537H601Q422 535 321 472T220 297Q220 206 287 146T463 86ZM387 1400Q387 1480 443 1535T580 1590Q659 1590 716 1535T773 1400Q773 1321 718 1267T580 1213T442 1267T387 1400ZM464 1400Q464 +1350 497 1317T580 1284Q629 1284 663 1316T697 1400Q697 1453 662 1486T580 1519Q531 1519 498 1485T464 1400Z" /> +<glyph unicode="æ" horiz-adv-x="1732" d="M1265 -20Q1126 -20 1027 34T867 186Q807 88 693 34T440 -20Q271 -20 178 64T85 293Q85 450 195 539T511 632H781V720Q781 852 718 926T528 1000Q398 1000 315 935T232 765L113 778Q113 922 229 1012T528 1102Q653 +1102 741 1049T870 889Q930 989 1024 1045T1235 1102Q1431 1102 1543 982T1658 644V538H901V509Q901 308 997 195T1265 81Q1450 81 1589 199L1636 112Q1491 -20 1265 -20ZM458 80Q549 80 642 126T781 236V536H525Q388 536 302 475T207 309L206 289Q206 192 271 +136T458 80ZM1235 1000Q1103 1000 1013 902T904 636H1539V667Q1539 821 1459 910T1235 1000Z" /> +<glyph unicode="ç" horiz-adv-x="1055" d="M556 81Q681 81 765 151T857 334H972Q967 235 910 154T759 26T556 -20Q343 -20 219 128T94 526V562Q94 722 150 845T310 1035T555 1102Q733 1102 848 996T972 717H857Q849 844 766 922T555 1000Q393 1000 304 883T214 +555V520Q214 313 303 197T556 81ZM589 -9L577 -73Q742 -94 742 -244Q742 -336 663 -390T448 -444L441 -366Q530 -366 586 -334T643 -246Q643 -188 600 -166T467 -136L496 -9H589Z" /> +<glyph unicode="è" horiz-adv-x="1058" d="M575 -20Q437 -20 326 48T152 237T90 510V553Q90 709 150 834T319 1030T553 1102Q750 1102 865 968T981 600V533H209V510Q209 326 314 204T580 81Q676 81 749 116T883 228L958 171Q826 -20 575 -20ZM553 1000Q418 +1000 326 901T213 635H862V648Q857 804 773 902T553 1000ZM640 1256H531L305 1536H449L640 1256Z" /> +<glyph unicode="é" horiz-adv-x="1058" d="M575 -20Q437 -20 326 48T152 237T90 510V553Q90 709 150 834T319 1030T553 1102Q750 1102 865 968T981 600V533H209V510Q209 326 314 204T580 81Q676 81 749 116T883 228L958 171Q826 -20 575 -20ZM553 1000Q418 +1000 326 901T213 635H862V648Q857 804 773 902T553 1000ZM686 1536H831L600 1256H495L686 1536Z" /> +<glyph unicode="ê" horiz-adv-x="1058" d="M575 -20Q437 -20 326 48T152 237T90 510V553Q90 709 150 834T319 1030T553 1102Q750 1102 865 968T981 600V533H209V510Q209 326 314 204T580 81Q676 81 749 116T883 228L958 171Q826 -20 575 -20ZM553 1000Q418 +1000 326 901T213 635H862V648Q857 804 773 902T553 1000ZM845 1268V1258H734L566 1441L399 1258H290V1271L528 1526H604L845 1268Z" /> +<glyph unicode="ë" horiz-adv-x="1058" d="M575 -20Q437 -20 326 48T152 237T90 510V553Q90 709 150 834T319 1030T553 1102Q750 1102 865 968T981 600V533H209V510Q209 326 314 204T580 81Q676 81 749 116T883 228L958 171Q826 -20 575 -20ZM553 1000Q418 +1000 326 901T213 635H862V648Q857 804 773 902T553 1000ZM267 1396Q267 1430 289 1453T349 1477T409 1454T432 1396Q432 1363 410 1340T349 1317T289 1340T267 1396ZM705 1395Q705 1429 727 1452T787 1476T847 1453T870 1395Q870 1362 848 1339T787 1316T727 1339T705 +1395Z" /> +<glyph unicode="ì" horiz-adv-x="456" d="M288 0H168V1082H288V0ZM305 1244H196L-30 1524H114L305 1244Z" /> +<glyph unicode="í" horiz-adv-x="456" d="M288 0H168V1082H288V0ZM350 1780H495L264 1500H159L350 1780Z" /> +<glyph unicode="î" horiz-adv-x="456" d="M288 0H168V1082H288V0ZM510 1256V1246H399L231 1429L64 1246H-45V1259L193 1514H269L510 1256Z" /> +<glyph unicode="ï" horiz-adv-x="456" d="M288 0H168V1082H288V0ZM-68 1384Q-68 1418 -46 1441T14 1465T74 1442T97 1384Q97 1351 75 1328T14 1305T-46 1328T-68 1384ZM370 1383Q370 1417 392 1440T452 1464T512 1441T535 1383Q535 1350 513 1327T452 1304T392 +1327T370 1383Z" /> +<glyph unicode="ð" horiz-adv-x="1191" d="M811 1303Q1049 1053 1055 645V535Q1055 376 999 249T842 51T615 -20Q485 -20 379 41T211 216T149 466Q149 695 268 830T587 965Q687 965 773 927T919 821Q877 1072 709 1240L484 1101L433 1174L639 1302Q502 1408 +296 1475L335 1578Q577 1506 744 1366L938 1487L989 1414L811 1303ZM935 625L933 682Q894 765 807 813T609 861Q448 861 359 756T269 466Q269 363 314 274T438 134T619 83Q760 83 847 207T935 543V625Z" /> +<glyph unicode="ñ" horiz-adv-x="1125" d="M270 1082L274 897Q335 997 426 1049T627 1102Q801 1102 886 1004T972 710V0H853V711Q852 856 792 927T598 998Q487 998 402 929T275 741V0H156V1082H270ZM916 1493Q916 1397 860 1339T721 1280Q645 1280 573 1335T443 +1390Q396 1390 365 1359T333 1272L243 1275Q243 1367 297 1427T438 1487Q486 1487 520 1470T584 1432T644 1394T716 1377Q762 1377 794 1410T827 1499L916 1493Z" /> +<glyph unicode="ò" horiz-adv-x="1147" d="M90 557Q90 713 150 838T321 1032T572 1102Q788 1102 922 951T1056 549V524Q1056 367 996 242T825 48T574 -20Q359 -20 225 131T90 533V557ZM210 524Q210 330 310 206T574 81Q736 81 836 205T937 534V557Q937 681 +891 784T762 943T572 1000Q412 1000 311 875T210 546V524ZM645 1256H536L310 1536H454L645 1256Z" /> +<glyph unicode="ó" horiz-adv-x="1147" d="M90 557Q90 713 150 838T321 1032T572 1102Q788 1102 922 951T1056 549V524Q1056 367 996 242T825 48T574 -20Q359 -20 225 131T90 533V557ZM210 524Q210 330 310 206T574 81Q736 81 836 205T937 534V557Q937 681 +891 784T762 943T572 1000Q412 1000 311 875T210 546V524ZM691 1536H836L605 1256H500L691 1536Z" /> +<glyph unicode="ô" horiz-adv-x="1147" d="M90 557Q90 713 150 838T321 1032T572 1102Q788 1102 922 951T1056 549V524Q1056 367 996 242T825 48T574 -20Q359 -20 225 131T90 533V557ZM210 524Q210 330 310 206T574 81Q736 81 836 205T937 534V557Q937 681 +891 784T762 943T572 1000Q412 1000 311 875T210 546V524ZM850 1268V1258H739L571 1441L404 1258H295V1271L533 1526H609L850 1268Z" /> +<glyph unicode="õ" horiz-adv-x="1147" d="M90 557Q90 713 150 838T321 1032T572 1102Q788 1102 922 951T1056 549V524Q1056 367 996 242T825 48T574 -20Q359 -20 225 131T90 533V557ZM210 524Q210 330 310 206T574 81Q736 81 836 205T937 534V557Q937 681 +891 784T762 943T572 1000Q412 1000 311 875T210 546V524ZM912 1493Q912 1397 856 1339T717 1280Q641 1280 569 1335T439 1390Q392 1390 361 1359T329 1272L239 1275Q239 1367 293 1427T434 1487Q482 1487 516 1470T580 1432T640 1394T712 1377Q758 1377 790 1410T823 +1499L912 1493Z" /> +<glyph unicode="ö" horiz-adv-x="1147" d="M90 557Q90 713 150 838T321 1032T572 1102Q788 1102 922 951T1056 549V524Q1056 367 996 242T825 48T574 -20Q359 -20 225 131T90 533V557ZM210 524Q210 330 310 206T574 81Q736 81 836 205T937 534V557Q937 681 +891 784T762 943T572 1000Q412 1000 311 875T210 546V524ZM272 1396Q272 1430 294 1453T354 1477T414 1454T437 1396Q437 1363 415 1340T354 1317T294 1340T272 1396ZM710 1395Q710 1429 732 1452T792 1476T852 1453T875 1395Q875 1362 853 1339T792 1316T732 1339T710 +1395Z" /> +<glyph unicode="÷" horiz-adv-x="1164" d="M1070 644H72V760H1070V644ZM495 1088Q495 1123 517 1147T579 1171T642 1147T665 1088T642 1030T579 1006T517 1029T495 1088ZM495 291Q495 326 517 350T579 374T642 350T665 291T642 233T579 210T517 233T495 291Z" /> +<glyph unicode="ø" horiz-adv-x="1140" d="M89 557Q89 713 149 838T320 1032T571 1102Q685 1102 785 1054L863 1214H957L857 1010Q951 938 1003 821T1055 557V524Q1055 368 994 242T823 48T573 -20Q465 -20 373 21L294 -140H200L299 63Q199 134 144 253T89 +524V557ZM208 524Q208 414 243 319T348 163L737 957Q662 1000 571 1000Q410 1000 309 875T208 546V524ZM935 557Q935 660 902 751T806 905L419 115Q487 81 573 81Q734 81 834 205T935 534V557Z" /> +<glyph unicode="ù" horiz-adv-x="1125" d="M852 137Q744 -20 507 -20Q334 -20 244 80T152 378V1082H271V393Q271 84 521 84Q781 84 850 299V1082H970V0H854L852 137ZM647 1256H538L312 1536H456L647 1256Z" /> +<glyph unicode="ú" horiz-adv-x="1125" d="M852 137Q744 -20 507 -20Q334 -20 244 80T152 378V1082H271V393Q271 84 521 84Q781 84 850 299V1082H970V0H854L852 137ZM693 1536H838L607 1256H502L693 1536Z" /> +<glyph unicode="û" horiz-adv-x="1125" d="M852 137Q744 -20 507 -20Q334 -20 244 80T152 378V1082H271V393Q271 84 521 84Q781 84 850 299V1082H970V0H854L852 137ZM852 1268V1258H741L573 1441L406 1258H297V1271L535 1526H611L852 1268Z" /> +<glyph unicode="ü" horiz-adv-x="1125" d="M852 137Q744 -20 507 -20Q334 -20 244 80T152 378V1082H271V393Q271 84 521 84Q781 84 850 299V1082H970V0H854L852 137ZM274 1396Q274 1430 296 1453T356 1477T416 1454T439 1396Q439 1363 417 1340T356 1317T296 +1340T274 1396ZM712 1395Q712 1429 734 1452T794 1476T854 1453T877 1395Q877 1362 855 1339T794 1316T734 1339T712 1395Z" /> +<glyph unicode="ý" horiz-adv-x="973" d="M499 172L815 1082H944L482 -184L458 -240Q369 -437 183 -437Q140 -437 91 -423L90 -324L152 -330Q240 -330 294 -287T387 -137L440 9L32 1082H163L499 172ZM633 1536H778L547 1256H442L633 1536Z" /> +<glyph unicode="þ" horiz-adv-x="1150" d="M1031 530Q1031 277 919 129T618 -20Q397 -20 279 136V-416H159V1536H279V932Q396 1102 616 1102Q808 1102 919 956T1031 548V530ZM911 551Q911 758 826 878T589 998Q479 998 400 945T279 791V270Q321 180 400 131T591 +81Q742 81 826 201T911 551Z" /> +<glyph unicode="ÿ" horiz-adv-x="973" d="M499 172L815 1082H944L482 -184L458 -240Q369 -437 183 -437Q140 -437 91 -423L90 -324L152 -330Q240 -330 294 -287T387 -137L440 9L32 1082H163L499 172ZM214 1396Q214 1430 236 1453T296 1477T356 1454T379 1396Q379 +1363 357 1340T296 1317T236 1340T214 1396ZM652 1395Q652 1429 674 1452T734 1476T794 1453T817 1395Q817 1362 795 1339T734 1316T674 1339T652 1395Z" /> +<glyph unicode="–" horiz-adv-x="1334" d="M1417 686H415V788H1417V686Z" /> +<glyph unicode="—" horiz-adv-x="1580" d="M1462 686H126V788H1462V686Z" /> +<glyph unicode="‘" horiz-adv-x="364" d="M238 1554L310 1503Q220 1385 217 1249V1121H98V1233Q98 1325 135 1410T238 1554Z" /> +<glyph unicode="’" horiz-adv-x="364" d="M133 1099L62 1151Q152 1272 155 1405V1536H273V1435Q273 1226 133 1099Z" /> +<glyph unicode="‚" horiz-adv-x="353" d="M112 -231L41 -179Q124 -68 132 51L133 205H252V104Q252 -104 112 -231Z" /> +<glyph unicode="“" horiz-adv-x="612" d="M239 1554L311 1503Q221 1385 218 1249V1121H99V1233Q99 1325 136 1410T239 1554ZM490 1554L562 1503Q472 1385 469 1249V1121H350V1233Q350 1325 387 1410T490 1554Z" /> +<glyph unicode="”" horiz-adv-x="617" d="M139 1099L68 1151Q158 1272 161 1405V1536H279V1435Q279 1226 139 1099ZM383 1099L312 1151Q402 1272 405 1405V1536H523V1435Q523 1226 383 1099Z" /> +<glyph unicode="„" horiz-adv-x="593" d="M112 -240L41 -188Q130 -65 133 73V236H252V106Q252 -111 112 -240ZM346 -240L275 -188Q363 -66 366 73V236H486V106Q486 -111 346 -240Z" /> +<glyph unicode="•" horiz-adv-x="662" d="M146 752Q146 831 197 881T331 931Q413 931 464 883T517 757V717Q517 636 466 588T332 540Q248 540 197 589T146 719V752Z" /> +<glyph unicode="‹" horiz-adv-x="609" d="M232 555L508 167H403L108 546V565L403 944H508L232 555Z" /> +<glyph unicode="›" horiz-adv-x="609" d="M203 944L498 560V541L203 162H97L373 550L97 944H203Z" /> +</font> +</defs> +</svg> diff --git a/static/fonts/roboto/Roboto_300.ttf b/static/fonts/roboto/Roboto_300.ttf new file mode 100644 index 000000000..a22188eed Binary files /dev/null and b/static/fonts/roboto/Roboto_300.ttf differ diff --git a/static/fonts/roboto/Roboto_300.woff b/static/fonts/roboto/Roboto_300.woff new file mode 100644 index 000000000..96663f072 Binary files /dev/null and b/static/fonts/roboto/Roboto_300.woff differ diff --git a/static/fonts/roboto/Roboto_300.woff2 b/static/fonts/roboto/Roboto_300.woff2 new file mode 100644 index 000000000..52c5845a7 Binary files /dev/null and b/static/fonts/roboto/Roboto_300.woff2 differ diff --git a/static/fonts/roboto/Roboto_400.eot b/static/fonts/roboto/Roboto_400.eot new file mode 100644 index 000000000..a0780d6e3 Binary files /dev/null and b/static/fonts/roboto/Roboto_400.eot differ diff --git a/static/fonts/roboto/Roboto_400.svg b/static/fonts/roboto/Roboto_400.svg new file mode 100644 index 000000000..627f5a368 --- /dev/null +++ b/static/fonts/roboto/Roboto_400.svg @@ -0,0 +1,308 @@ +<?xml version="1.0" standalone="no"?> +<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> +<svg xmlns="http://www.w3.org/2000/svg"> +<defs > +<font id="Roboto" horiz-adv-x="1158" ><font-face + font-family="Roboto" + units-per-em="2048" + panose-1="2 0 0 0 0 0 0 0 0 0" + ascent="1900" + descent="-500" + alphabetic="0" /> +<glyph unicode=" " horiz-adv-x="507" /> +<glyph unicode="!" horiz-adv-x="527" d="M347 411H180L167 1456H361L347 411ZM160 93Q160 138 187 168T269 199T351 169T379 93T351 19T269 -11T188 18T160 93Z" /> +<glyph unicode=""" horiz-adv-x="655" d="M277 1400L247 1042H136L137 1536H277V1400ZM547 1400L517 1042H406L407 1536H547V1400Z" /> +<glyph unicode="#" horiz-adv-x="1261" d="M765 410H501L421 0H278L358 410H119V547H384L453 901H195V1040H480L562 1456H705L623 1040H887L969 1456H1113L1031 1040H1235V901H1004L935 547H1160V410H909L829 0H685L765 410ZM527 547H791L860 901H596L527 547Z" /> +<glyph unicode="$" horiz-adv-x="1150" d="M856 375Q856 467 792 530T574 644Q361 709 264 813T166 1079Q166 1243 261 1348T524 1473V1692H673V1472Q841 1449 934 1331T1028 1008H844Q844 1149 777 1232T596 1315Q477 1315 414 1254T351 1082Q351 980 417 920T636 +810T874 701T1000 562T1041 377Q1041 208 940 105T655 -17V-208H507V-17Q321 0 216 115T110 429H295Q295 290 368 215T575 140Q706 140 781 203T856 375Z" /> +<glyph unicode="%" horiz-adv-x="1500" d="M105 1176Q105 1307 188 1392T403 1477Q536 1477 618 1392T701 1170V1099Q701 967 618 884T405 800Q275 800 190 883T105 1106V1176ZM243 1099Q243 1021 287 971T405 920Q476 920 519 969T563 1103V1176Q563 1254 520 +1305T403 1356T286 1305T243 1172V1099ZM814 357Q814 488 897 572T1112 657T1327 573T1411 350V279Q1411 148 1328 64T1114 -21T899 62T814 285V357ZM952 279Q952 200 996 150T1114 99Q1186 99 1229 148T1272 283V357Q1272 436 1229 486T1112 536Q1041 536 997 +487T952 353V279ZM447 110L342 176L1053 1314L1158 1248L447 110Z" /> +<glyph unicode="&" horiz-adv-x="1273" d="M101 391Q101 496 159 584T383 789Q286 907 253 979T220 1122Q220 1288 318 1382T584 1476Q734 1476 832 1389T930 1168Q930 1080 886 1006T730 849L623 770L947 383Q1015 513 1015 672H1182Q1182 417 1059 249L1267 +0H1045L948 115Q874 49 775 15T572 -20Q359 -20 230 93T101 391ZM572 131Q719 131 841 243L486 668L453 644Q286 521 286 391Q286 273 362 202T572 131ZM405 1128Q405 1032 523 888L641 971Q709 1019 734 1062T759 1168Q759 1235 709 1279T583 1324Q501 1324 453 +1269T405 1128Z" /> +<glyph unicode="'" horiz-adv-x="357" d="M253 1425L232 1057H103L104 1536H253V1425Z" /> +<glyph unicode="(" horiz-adv-x="700" d="M133 591Q133 817 193 1025T374 1403T623 1643L661 1521Q515 1409 422 1179T319 664L318 579Q318 193 459 -91Q544 -261 661 -357L623 -470Q490 -396 369 -222Q133 118 133 591Z" /> +<glyph unicode=")" horiz-adv-x="712" d="M567 581Q567 358 509 154T330 -224T77 -470L38 -357Q192 -239 285 9T381 561V593Q381 803 337 983T215 1307T38 1530L77 1643Q209 1570 328 1399T507 1022T567 581Z" /> +<glyph unicode="*" horiz-adv-x="882" d="M330 983L28 1073L74 1224L376 1112L367 1456H520L510 1107L807 1217L853 1065L546 974L744 703L620 609L434 897L254 616L129 707L330 983Z" /> +<glyph unicode="+" horiz-adv-x="1161" d="M670 781H1076V606H670V146H484V606H78V781H484V1206H670V781Z" /> +<glyph unicode="," horiz-adv-x="402" d="M134 -290L29 -218Q123 -87 127 52V219H308V74Q308 -27 259 -128T134 -290Z" /> +<glyph unicode="-" horiz-adv-x="565" d="M525 543H37V694H525V543Z" /> +<glyph unicode="." horiz-adv-x="539" d="M144 97Q144 145 172 177T258 209T344 177T374 97Q374 51 345 20T258 -11T173 20T144 97Z" /> +<glyph unicode="/" horiz-adv-x="844" d="M177 -125H18L626 1456H784L177 -125Z" /> +<glyph unicode="0" horiz-adv-x="1150" d="M1034 621Q1034 296 923 138T576 -20Q343 -20 231 134T115 596V843Q115 1164 226 1320T574 1476Q809 1476 920 1326T1034 861V621ZM849 874Q849 1109 783 1216T574 1324Q432 1324 367 1217T300 888V592Q300 356 368 244T576 +131Q713 131 779 237T849 571V874Z" /> +<glyph unicode="1" horiz-adv-x="1150" d="M729 0H543V1233L170 1096V1264L700 1463H729V0Z" /> +<glyph unicode="2" horiz-adv-x="1150" d="M1075 0H121V133L625 693Q737 820 779 899T822 1064Q822 1178 753 1251T569 1324Q431 1324 355 1246T278 1027H93Q93 1228 222 1352T569 1476Q772 1476 890 1370T1008 1086Q1008 871 734 574L344 151H1075V0Z" /> +<glyph unicode="3" horiz-adv-x="1150" d="M390 818H529Q660 820 735 887T810 1068Q810 1324 555 1324Q435 1324 364 1256T292 1074H107Q107 1247 233 1361T555 1476Q761 1476 878 1367T995 1064Q995 969 934 880T766 747Q886 709 951 621T1017 406Q1017 210 889 +95T556 -20T223 91T94 384H280Q280 269 355 200T556 131Q690 131 761 201T832 402Q832 529 754 597T529 667H390V818Z" /> +<glyph unicode="4" horiz-adv-x="1150" d="M902 489H1104V338H902V0H716V338H53V447L705 1456H902V489ZM263 489H716V1203L694 1163L263 489Z" /> +<glyph unicode="5" horiz-adv-x="1150" d="M206 730L280 1456H1026V1285H437L393 888Q500 951 636 951Q835 951 952 820T1069 464Q1069 239 948 110T608 -20Q415 -20 293 87T154 383H329Q346 258 418 195T608 131Q737 131 810 219T884 462Q884 608 805 696T593 +785Q472 785 403 732L354 692L206 730Z" /> +<glyph unicode="6" horiz-adv-x="1150" d="M847 1457V1300H813Q597 1296 469 1172T321 823Q436 955 635 955Q825 955 938 821T1052 475Q1052 250 930 115T601 -20Q392 -20 262 140T132 554V625Q132 1027 303 1239T814 1457H847ZM604 801Q509 801 429 744T318 601V533Q318 +353 399 243T601 133Q726 133 797 225T869 466Q869 616 797 708T604 801Z" /> +<glyph unicode="7" horiz-adv-x="1150" d="M1061 1352L458 0H264L865 1304H77V1456H1061V1352Z" /> +<glyph unicode="8" horiz-adv-x="1150" d="M1004 1076Q1004 967 947 882T791 749Q905 700 971 606T1038 393Q1038 204 911 92T575 -20Q365 -20 239 92T112 393Q112 511 176 606T355 750Q258 798 202 883T146 1076Q146 1260 264 1368T575 1476Q767 1476 885 1368T1004 +1076ZM853 397Q853 519 776 596T573 673T373 597T297 397T370 202T575 131Q705 131 779 202T853 397ZM575 1324Q466 1324 399 1257T331 1073Q331 962 397 894T575 825T752 893T819 1073T750 1254T575 1324Z" /> +<glyph unicode="9" horiz-adv-x="1150" d="M830 640Q772 571 692 529T515 487Q389 487 296 549T151 723T100 972Q100 1118 155 1235T313 1414T551 1476Q767 1476 891 1315T1016 874V820Q1016 395 848 200T341 -1H305V155H344Q573 159 696 274T830 640ZM545 640Q638 +640 716 697T831 838V912Q831 1094 752 1208T552 1322Q430 1322 356 1229T282 982Q282 833 353 737T545 640Z" /> +<glyph unicode=":" horiz-adv-x="496" d="M390 97Q390 145 418 177T504 209T590 177T620 97Q620 51 591 20T504 -11T419 20T390 97ZM135 980Q135 1028 163 1060T249 1092T335 1060T365 980Q365 934 336 903T249 872T164 903T135 980Z" /> +<glyph unicode=";" horiz-adv-x="433" d="M111 980Q111 1028 139 1060T225 1092T311 1060T341 980Q341 934 312 903T225 872T140 903T111 980ZM146 -290L41 -218Q135 -87 139 52V219H320V74Q320 -27 271 -128T146 -290Z" /> +<glyph unicode="<" horiz-adv-x="1041" d="M264 644L890 391V195L72 574V720L890 1098V902L264 644Z" /> +<glyph unicode="=" horiz-adv-x="1124" d="M986 814H152V975H986V814ZM986 399H152V559H986V399Z" /> +<glyph unicode=">" horiz-adv-x="1070" d="M795 650L134 909V1099L988 721V575L134 196V388L795 650Z" /> +<glyph unicode="?" horiz-adv-x="967" d="M357 410Q359 529 384 598T486 751L617 886Q701 981 701 1090Q701 1195 646 1254T486 1314Q384 1314 322 1260T260 1115H75Q77 1277 190 1376T486 1476Q675 1476 780 1375T886 1096Q886 921 724 751L615 643Q542 562 542 +410H357ZM349 93Q349 138 376 168T458 199T540 169T568 93T540 19T458 -11T377 18T349 93Z" /> +<glyph unicode="@" horiz-adv-x="1839" d="M1738 502Q1726 260 1618 120T1329 -20Q1142 -20 1089 148Q1035 63 966 22T822 -20Q680 -20 607 96T553 417Q568 582 628 711T784 915T985 989Q1066 989 1130 968T1274 883L1222 329Q1203 98 1350 98Q1463 98 1533 210T1609 +502Q1628 891 1465 1095T967 1299Q766 1299 610 1200T364 912T263 478Q251 230 323 48T542 -231T899 -328Q989 -328 1079 -306T1230 -249L1267 -364Q1205 -403 1103 -428T895 -453Q645 -453 465 -341T196 -17T118 478Q130 753 241 972T542 1311T971 1431Q1220 1431 +1398 1319T1663 996T1738 502ZM712 417Q698 275 738 199T867 123Q927 123 982 174T1074 320L1075 329L1121 832Q1065 861 1001 861Q884 861 808 742T712 417Z" /> +<glyph unicode="A" horiz-adv-x="1336" d="M973 380H363L226 0H28L584 1456H752L1309 0H1112L973 380ZM421 538H916L668 1219L421 538Z" /> +<glyph unicode="B" horiz-adv-x="1275" d="M169 0V1456H645Q882 1456 1001 1358T1121 1068Q1121 966 1063 888T905 766Q1023 733 1091 641T1160 420Q1160 224 1033 112T674 0H169ZM361 681V157H678Q812 157 889 226T967 418Q967 681 681 681H361ZM361 835H651Q777 +835 852 898T928 1069Q928 1189 858 1243T645 1298H361V835Z" /> +<glyph unicode="C" horiz-adv-x="1333" d="M1240 462Q1213 231 1070 106T688 -20Q430 -20 275 165T119 660V800Q119 1003 191 1157T397 1393T705 1476Q937 1476 1077 1347T1240 988H1047Q1022 1162 939 1240T705 1318Q521 1318 417 1182T312 795V654Q312 417 411 +277T688 137Q848 137 933 209T1047 462H1240Z" /> +<glyph unicode="D" horiz-adv-x="1343" d="M169 0V1456H580Q770 1456 916 1372T1141 1133T1222 777V684Q1222 478 1143 323T916 85T572 0H169ZM361 1298V157H563Q785 157 908 295T1032 688V773Q1032 1021 916 1158T585 1298H361Z" /> +<glyph unicode="E" horiz-adv-x="1164" d="M992 673H361V157H1094V0H169V1456H1084V1298H361V830H992V673Z" /> +<glyph unicode="F" horiz-adv-x="1132" d="M972 643H361V0H169V1456H1071V1298H361V800H972V643Z" /> +<glyph unicode="G" horiz-adv-x="1395" d="M1244 191Q1170 85 1038 33T729 -20Q551 -20 413 63T200 301T122 658V785Q122 1114 275 1295T707 1476Q935 1476 1074 1360T1244 1029H1052Q998 1318 708 1318Q515 1318 416 1183T315 790V671Q315 426 427 282T730 137Q838 +137 919 161T1053 242V569H716V725H1244V191Z" /> +<glyph unicode="H" horiz-adv-x="1460" d="M1288 0H1095V673H361V0H169V1456H361V830H1095V1456H1288V0Z" /> +<glyph unicode="I" horiz-adv-x="557" d="M375 0H183V1456H375V0Z" /> +<glyph unicode="J" horiz-adv-x="1130" d="M779 1456H972V425Q972 216 847 98T512 -20Q295 -20 174 91T53 402H245Q245 277 313 207T512 137Q631 137 704 212T779 422V1456Z" /> +<glyph unicode="K" horiz-adv-x="1284" d="M539 677L361 492V0H169V1456H361V736L1008 1456H1240L667 813L1285 0H1055L539 677Z" /> +<glyph unicode="L" horiz-adv-x="1102" d="M362 157H1052V0H169V1456H362V157Z" /> +<glyph unicode="M" horiz-adv-x="1788" d="M417 1456L893 268L1369 1456H1618V0H1426V567L1444 1179L966 0H819L342 1176L361 567V0H169V1456H417Z" /> +<glyph unicode="N" horiz-adv-x="1460" d="M1288 0H1095L362 1122V0H169V1456H362L1097 329V1456H1288V0Z" /> +<glyph unicode="O" horiz-adv-x="1408" d="M1289 681Q1289 467 1217 308T1013 64T705 -20Q533 -20 400 64T194 305T118 668V773Q118 983 191 1144T397 1390T703 1476Q878 1476 1011 1392T1217 1147T1289 773V681ZM1098 775Q1098 1034 994 1172T703 1311Q521 1311 +417 1173T309 788V681Q309 430 414 287T705 143Q891 143 993 278T1098 667V775Z" /> +<glyph unicode="P" horiz-adv-x="1292" d="M361 570V0H169V1456H706Q945 1456 1080 1334T1216 1011Q1216 799 1084 685T704 570H361ZM361 727H706Q860 727 942 799T1024 1009Q1024 1139 942 1217T717 1298H361V727Z" /> +<glyph unicode="Q" horiz-adv-x="1408" d="M1281 681Q1281 470 1214 318T1026 79L1286 -125L1155 -246L848 -2Q776 -20 696 -20Q524 -20 391 64T185 305T109 668V773Q109 983 182 1144T388 1390T694 1476Q870 1476 1003 1391T1209 1147T1281 774V681ZM1089 775Q1089 +1032 987 1171T694 1311Q513 1311 409 1173T301 788V681Q301 431 405 287T696 143T984 278T1089 667V775Z" /> +<glyph unicode="R" horiz-adv-x="1261" d="M703 589H361V0H168V1456H650Q896 1456 1028 1344T1161 1018Q1161 882 1088 781T883 630L1225 12V0H1019L703 589ZM361 746H656Q799 746 883 820T968 1018Q968 1153 888 1225T655 1298H361V746Z" /> +<glyph unicode="S" horiz-adv-x="1215" d="M598 649Q351 720 239 823T126 1079Q126 1251 263 1363T621 1476Q771 1476 888 1418T1070 1258T1135 1035H942Q942 1167 858 1242T621 1318Q479 1318 400 1256T320 1082Q320 993 395 932T652 819T936 707T1088 563T1138 +370Q1138 193 1000 87T631 -20Q481 -20 351 37T151 195T80 422H273Q273 290 370 214T631 137Q783 137 864 199T945 368T870 533T598 649Z" /> +<glyph unicode="T" horiz-adv-x="1222" d="M1175 1298H707V0H516V1298H49V1456H1175V1298Z" /> +<glyph unicode="U" horiz-adv-x="1328" d="M1194 1456V466Q1193 260 1065 129T716 -18L665 -20Q426 -20 284 109T140 464V1456H330V470Q330 312 417 225T665 137Q828 137 914 224T1001 469V1456H1194Z" /> +<glyph unicode="V" horiz-adv-x="1303" d="M651 255L1067 1456H1277L737 0H567L28 1456H237L651 255Z" /> +<glyph unicode="W" horiz-adv-x="1817" d="M483 459L511 267L552 440L840 1456H1002L1283 440L1323 264L1354 460L1580 1456H1773L1420 0H1245L945 1061L922 1172L899 1061L588 0H413L61 1456H253L483 459Z" /> +<glyph unicode="X" horiz-adv-x="1284" d="M644 898L993 1456H1219L759 734L1230 0H1002L644 568L284 0H57L529 734L68 1456H293L644 898Z" /> +<glyph unicode="Y" horiz-adv-x="1230" d="M613 725L993 1456H1211L709 543V0H517V543L15 1456H235L613 725Z" /> +<glyph unicode="Z" horiz-adv-x="1226" d="M313 157H1146V0H86V144L884 1298H99V1456H1114V1315L313 157Z" /> +<glyph unicode="[" horiz-adv-x="543" d="M523 1512H332V-160H523V-312H146V1664H523V1512Z" /> +<glyph unicode="\" horiz-adv-x="840" d="M40 1456H216L824 -125H648L40 1456Z" /> +<glyph unicode="]" horiz-adv-x="543" d="M9 1664H387V-312H9V-160H202V1512H9V1664Z" /> +<glyph unicode="^" horiz-adv-x="856" d="M426 1211L236 729H64L363 1456H490L788 729H617L426 1211Z" /> +<glyph unicode="_" horiz-adv-x="924" d="M920 -151H4V0H920V-151Z" /> +<glyph unicode="`" horiz-adv-x="633" d="M474 1242H315L57 1536H280L474 1242Z" /> +<glyph unicode="a" horiz-adv-x="1114" d="M808 0Q792 32 782 114Q653 -20 474 -20Q314 -20 212 70T109 300Q109 469 237 562T599 656H779V741Q779 838 721 895T550 953Q451 953 384 903T317 782H131Q131 863 188 938T344 1058T561 1102Q748 1102 854 1009T964 +751V253Q964 104 1002 16V0H808ZM501 141Q588 141 666 186T779 303V525H634Q294 525 294 326Q294 239 352 190T501 141Z" /> +<glyph unicode="b" horiz-adv-x="1149" d="M1056 529Q1056 281 942 131T636 -20Q431 -20 319 125L310 0H140V1536H325V963Q437 1102 634 1102T943 953T1056 545V529ZM871 550Q871 739 798 842T588 945Q405 945 325 775V307Q410 137 590 137Q723 137 797 240T871 550Z" /> +<glyph unicode="c" horiz-adv-x="1072" d="M574 131Q673 131 747 191T829 341H1004Q999 248 940 164T783 30T574 -20Q353 -20 223 127T92 531V562Q92 720 150 843T316 1034T573 1102Q755 1102 875 993T1004 710H829Q821 815 750 882T573 950Q432 950 355 849T277 +555V520Q277 333 354 232T574 131Z" /> +<glyph unicode="d" horiz-adv-x="1155" d="M95 550Q95 799 213 950T522 1102Q712 1102 823 972V1536H1008V0H838L829 116Q718 -20 520 -20Q332 -20 214 134T95 536V550ZM280 529Q280 345 356 241T566 137Q742 137 823 295V792Q740 945 568 945Q432 945 356 840T280 529Z" /> +<glyph unicode="e" horiz-adv-x="1085" d="M589 -20Q369 -20 231 124T93 511V545Q93 706 154 832T326 1030T566 1102Q777 1102 894 963T1011 565V488H278Q282 328 371 230T599 131Q697 131 765 171T884 277L997 189Q861 -20 589 -20ZM566 950Q454 950 378 869T284 +640H826V654Q818 795 750 872T566 950Z" /> +<glyph unicode="f" horiz-adv-x="711" d="M231 0V939H60V1082H231V1193Q231 1367 324 1462T587 1557Q651 1557 714 1540L704 1390Q657 1399 604 1399Q514 1399 465 1347T416 1196V1082H647V939H416V0H231Z" /> +<glyph unicode="g" horiz-adv-x="1149" d="M96 550Q96 803 213 952T523 1102Q721 1102 832 962L841 1082H1010V26Q1010 -184 886 -305T551 -426Q434 -426 322 -376T151 -239L247 -128Q366 -275 538 -275Q673 -275 748 -199T824 15V108Q713 -20 521 -20Q331 -20 +214 133T96 550ZM282 529Q282 346 357 242T567 137Q742 137 824 296V790Q739 945 569 945Q434 945 358 840T282 529Z" /> +<glyph unicode="h" horiz-adv-x="1128" d="M325 951Q448 1102 645 1102Q988 1102 991 715V0H806V716Q805 833 753 889T589 945Q499 945 431 897T325 771V0H140V1536H325V951Z" /> +<glyph unicode="i" horiz-adv-x="497" d="M341 0H156V1082H341V0ZM141 1369Q141 1414 168 1445T250 1476T332 1445T360 1369T332 1294T250 1264T169 1294T141 1369Z" /> +<glyph unicode="j" horiz-adv-x="489" d="M331 1082V-125Q331 -437 48 -437Q-13 -437 -65 -419V-271Q-33 -279 19 -279Q81 -279 113 -246T146 -129V1082H331ZM127 1369Q127 1413 154 1444T235 1476Q289 1476 317 1445T345 1369T317 1294T235 1264T154 1294T127 1369Z" /> +<glyph unicode="k" horiz-adv-x="1038" d="M442 501L326 380V0H141V1536H326V607L425 726L762 1082H987L566 630L1036 0H819L442 501Z" /> +<glyph unicode="l" horiz-adv-x="497" d="M341 0H156V1536H341V0Z" /> +<glyph unicode="m" horiz-adv-x="1795" d="M314 1082L319 962Q438 1102 640 1102Q867 1102 949 928Q1003 1006 1089 1054T1294 1102Q1650 1102 1656 725V0H1471V714Q1471 830 1418 887T1240 945Q1137 945 1069 884T990 718V0H804V709Q804 945 573 945Q391 945 +324 790V0H139V1082H314Z" /> +<glyph unicode="n" horiz-adv-x="1130" d="M315 1082L321 946Q445 1102 645 1102Q988 1102 991 715V0H806V716Q805 833 753 889T589 945Q499 945 431 897T325 771V0H140V1082H315Z" /> +<glyph unicode="o" horiz-adv-x="1168" d="M91 551Q91 710 153 837T327 1033T582 1102Q803 1102 939 949T1076 542V529Q1076 371 1016 246T843 50T584 -20Q364 -20 228 133T91 538V551ZM277 529Q277 349 360 240T584 131Q725 131 808 241T891 551Q891 729 807 +839T582 950Q445 950 361 841T277 529Z" /> +<glyph unicode="p" horiz-adv-x="1149" d="M1054 529Q1054 282 941 131T635 -20Q438 -20 325 105V-416H140V1082H309L318 962Q431 1102 632 1102Q827 1102 940 955T1054 546V529ZM869 550Q869 733 791 839T577 945Q409 945 325 796V279Q408 131 579 131Q712 131 +790 236T869 550Z" /> +<glyph unicode="q" horiz-adv-x="1164" d="M95 550Q95 805 212 953T526 1102Q718 1102 829 973L837 1082H1007V-416H822V100Q710 -20 524 -20Q328 -20 212 132T95 537V550ZM280 529Q280 343 358 237T570 131Q735 131 822 277V807Q734 950 572 950Q438 950 359 +844T280 529Z" /> +<glyph unicode="r" horiz-adv-x="693" d="M663 916Q621 923 572 923Q390 923 325 768V0H140V1082H320L323 957Q414 1102 581 1102Q635 1102 663 1088V916Z" /> +<glyph unicode="s" horiz-adv-x="1056" d="M770 287Q770 362 714 403T517 475T294 547T172 647T132 785Q132 918 244 1010T532 1102Q716 1102 830 1007T945 764H759Q759 840 695 895T532 950Q431 950 374 906T317 791Q317 724 370 690T561 625T786 551T913 448T955 +300Q955 155 839 68T538 -20Q408 -20 308 26T152 154T95 333H280Q285 240 354 186T538 131Q643 131 706 173T770 287Z" /> +<glyph unicode="t" horiz-adv-x="669" d="M391 1344V1082H593V939H391V268Q391 203 418 171T510 138Q542 138 598 150V0Q525 -20 456 -20Q332 -20 269 55T206 268V939H9V1082H206V1344H391Z" /> +<glyph unicode="u" horiz-adv-x="1129" d="M808 107Q700 -20 491 -20Q318 -20 228 80T136 378V1082H321V383Q321 137 521 137Q733 137 803 295V1082H988V0H812L808 107Z" /> +<glyph unicode="v" horiz-adv-x="992" d="M497 251L765 1082H954L566 0H425L33 1082H222L497 251Z" /> +<glyph unicode="w" horiz-adv-x="1539" d="M1098 255L1306 1082H1491L1176 0H1026L763 820L507 0H357L43 1082H227L440 272L692 1082H841L1098 255Z" /> +<glyph unicode="x" horiz-adv-x="1015" d="M503 687L743 1082H959L605 547L970 0H756L506 405L256 0H41L406 547L52 1082H266L503 687Z" /> +<glyph unicode="y" horiz-adv-x="969" d="M494 271L746 1082H944L509 -167Q408 -437 188 -437L153 -434L84 -421V-271L134 -275Q228 -275 280 -237T367 -98L408 12L22 1082H224L494 271Z" /> +<glyph unicode="z" horiz-adv-x="1015" d="M314 151H947V0H88V136L685 929H97V1082H917V951L314 151Z" /> +<glyph unicode="{" horiz-adv-x="693" d="M632 -366Q455 -316 366 -202T276 101V300Q276 543 64 543V688Q276 688 276 930V1138Q278 1321 365 1433T632 1597L670 1482Q461 1415 461 1133V931Q461 704 294 615Q461 525 461 296V90Q464 -185 670 -251L632 -366Z" /> +<glyph unicode="|" horiz-adv-x="499" d="M324 -270H175V1456H324V-270Z" /> +<glyph unicode="}" horiz-adv-x="693" d="M19 -251Q222 -186 229 80V300Q229 531 410 615Q229 697 229 930V1133Q229 1415 20 1482L58 1597Q235 1547 324 1435T414 1137V927Q414 688 626 688V543Q414 543 414 300V98Q414 -90 324 -203T58 -366L19 -251Z" /> +<glyph unicode="~" horiz-adv-x="1393" d="M1263 777Q1263 619 1170 511T939 402Q867 402 803 428T655 529T533 621T454 639Q376 639 334 586T292 438L131 436Q131 596 223 699T454 802Q530 802 600 770T758 658T910 567L939 565Q1015 565 1062 623T1110 776L1263 777Z" /> +<glyph unicode=" " horiz-adv-x="507" /> +<glyph unicode="¡" horiz-adv-x="499" d="M170 684H338L351 -360H157L170 684ZM358 996Q358 951 331 920T249 889T167 920T139 996T167 1071T249 1101T330 1071T358 996Z" /> +<glyph unicode="¢" horiz-adv-x="1120" d="M586 131Q686 131 760 191T842 341H1017Q1011 215 912 115T669 -12V-245H484V-11Q305 23 205 165T105 527V562Q105 774 206 916T484 1092V1318H669V1095Q819 1072 915 966T1017 710H842Q834 815 763 882T586 950Q445 +950 368 849T290 555V520Q290 333 367 232T586 131Z" /> +<glyph unicode="£" horiz-adv-x="1190" d="M449 622L457 402Q457 248 395 157H1128L1127 0H95V157H172Q212 166 237 231T264 393V401L256 622H91V779H251L242 1039Q242 1238 364 1357T687 1476Q877 1476 988 1370T1099 1087H908Q908 1194 845 1256T670 1318Q565 +1318 500 1241T435 1039L444 779H763V622H449Z" /> +<glyph unicode="¤" horiz-adv-x="1460" d="M1103 112Q944 -20 735 -20Q528 -20 369 110L235 -26L105 109L244 250Q140 406 140 608Q140 814 252 977L105 1128L235 1264L382 1114Q540 1234 735 1234Q931 1234 1090 1113L1239 1265L1371 1128L1220 974Q1330 +811 1330 608Q1330 412 1228 253L1371 109L1239 -27L1103 112ZM311 608Q311 485 368 379T524 212T735 151T946 212T1100 379T1157 608Q1157 730 1101 835T946 1001T735 1062Q622 1062 524 1002T369 836T311 608Z" /> +<glyph unicode="¥" horiz-adv-x="1075" d="M539 793L847 1456H1060L693 736H954V611H630V446H954V322H630V0H437V322H119V446H437V611H119V736H382L15 1456H231L539 793Z" /> +<glyph unicode="¦" horiz-adv-x="491" d="M147 -270V521H333V-270H147ZM333 698H147V1456H333V698Z" /> +<glyph unicode="§" horiz-adv-x="1256" d="M1145 431Q1145 242 959 157Q1028 108 1064 40T1100 -128Q1100 -296 970 -395T612 -495Q500 -495 400 -467T229 -382Q90 -269 90 -64L276 -62Q276 -192 366 -267T612 -343Q748 -343 831 -285T914 -130Q914 -41 843 +11T563 126Q381 174 285 229T143 362T96 551Q96 737 278 825Q212 874 177 942T141 1110Q141 1276 274 1376T630 1476Q862 1476 992 1363T1122 1045H937Q937 1170 853 1247T630 1325Q488 1325 408 1268T327 1112Q327 1043 355 1003T450 931T661 858T889 782T1030 +698T1116 585T1145 431ZM602 691Q512 715 437 742Q357 723 320 673T282 553Q282 483 309 443T402 370T611 296T797 238Q875 258 917 308T959 428Q959 516 890 570T602 691Z" /> +<glyph unicode="¨" horiz-adv-x="856" d="M101 1371Q101 1416 128 1446T210 1477T292 1447T320 1371T292 1296T210 1266T129 1296T101 1371ZM531 1369Q531 1414 558 1445T640 1476T722 1445T750 1369T722 1294T640 1264T559 1294T531 1369Z" /> +<glyph unicode="©" horiz-adv-x="1609" d="M1119 597Q1119 444 1033 364T788 283Q631 283 537 388T442 676V786Q442 962 537 1067T788 1173Q948 1173 1034 1091T1120 860H974Q974 959 927 1001T788 1044Q694 1044 640 975T586 783V670Q586 550 640 481T788 +412Q880 412 926 454T973 597H1119ZM206 729Q206 557 286 411T503 181T801 98T1098 181T1315 410T1395 729Q1395 899 1316 1044T1100 1272T801 1356Q641 1356 503 1274T286 1045T206 729ZM91 729Q91 931 184 1104T443 1376T801 1476T1158 1377T1416 1104T1510 729Q1510 +532 1420 360T1165 84T801 -21Q604 -21 439 82T182 358T91 729Z" /> +<glyph unicode="ª" horiz-adv-x="915" d="M618 705Q606 739 600 777Q524 691 396 691Q277 691 212 753T147 918Q147 1029 230 1089T486 1149H594V1201Q594 1336 470 1336Q401 1336 362 1309T322 1231L161 1243Q161 1346 247 1411T470 1476Q603 1476 680 1405T757 +1199V883Q757 786 783 705H618ZM435 828Q478 828 522 848T594 895V1037H482Q399 1036 355 1005T310 922Q310 828 435 828Z" /> +<glyph unicode="«" horiz-adv-x="961" d="M536 804L794 407H653L358 795V814L653 1203H794L536 804ZM610 548L868 151H727L432 539V558L727 947H868L610 548Z" /> +<glyph unicode="¬" horiz-adv-x="1134" d="M958 375H772V639H127V800H958V375Z" /> +<glyph unicode="" horiz-adv-x="565" d="M525 543H37V694H525V543Z" /> +<glyph unicode="®" horiz-adv-x="1610" d="M90 729Q90 931 183 1104T442 1376T800 1476T1157 1377T1415 1104T1509 729Q1509 532 1419 360T1164 84T800 -21Q603 -21 438 82T181 358T90 729ZM205 729Q205 557 285 411T502 181T800 98Q961 98 1099 182T1315 +412T1394 729Q1394 900 1316 1044T1099 1272T800 1356Q640 1356 502 1274T285 1045T205 729ZM653 654V316H512V1165H788Q941 1165 1025 1100T1110 909Q1110 786 982 721Q1104 671 1105 517V456Q1105 370 1122 332V316H977Q963 352 963 444T960 554Q944 650 829 +654H653ZM653 782H809Q881 784 925 817T969 904Q969 977 930 1007T791 1038H653V782Z" /> +<glyph unicode="¯" horiz-adv-x="938" d="M814 1302H142V1445H814V1302Z" /> +<glyph unicode="°" horiz-adv-x="765" d="M130 1216Q130 1320 204 1398T385 1476Q489 1476 562 1399T636 1216Q636 1110 563 1035T385 960Q280 960 205 1035T130 1216ZM385 1088Q439 1088 476 1123T513 1216Q513 1274 476 1311T385 1349Q330 1349 293 1310T255 +1216T292 1125T385 1088Z" /> +<glyph unicode="±" horiz-adv-x="1094" d="M649 854H1013V703H649V289H482V703H97V854H482V1267H649V854ZM970 0H135V152H970V0Z" /> +<glyph unicode="²" horiz-adv-x="751" d="M683 667H84V775L384 1057Q493 1159 493 1228Q493 1277 461 1307T369 1338Q294 1338 259 1300T223 1205H66Q66 1319 149 1393T365 1467T574 1404T651 1230Q651 1126 544 1019L460 940L284 795H683V667Z" /> +<glyph unicode="³" horiz-adv-x="751" d="M265 1126H349Q423 1126 459 1156T495 1235Q495 1280 464 1309T362 1338Q305 1338 268 1313T230 1246H73Q73 1344 154 1405T360 1467Q497 1467 575 1407T653 1242Q653 1187 618 1142T517 1071Q666 1030 666 887Q666 +781 581 719T360 656Q228 656 145 719T62 889H220Q220 844 259 814T366 784Q436 784 472 814T509 895Q509 1008 353 1010H265V1126Z" /> +<glyph unicode="´" horiz-adv-x="642" d="M316 1536H540L272 1242H123L316 1536Z" /> +<glyph unicode="µ" horiz-adv-x="1160" d="M339 1082V449Q340 286 391 208T559 130Q758 130 820 282V1082H1006V0H839L830 115Q737 -20 567 -20Q420 -20 339 53V-416H154V1082H339Z" /> +<glyph unicode="¶" horiz-adv-x="1001" d="M646 0V520H562Q332 520 200 647T67 988Q67 1201 200 1328T563 1456H832V0H646Z" /> +<glyph unicode="·" horiz-adv-x="534" d="M147 729Q147 777 175 809T261 841T347 809T377 729Q377 682 348 651T261 619T176 650T147 729Z" /> +<glyph unicode="¸" horiz-adv-x="507" d="M285 0L273 -52Q426 -79 426 -225Q426 -322 346 -378T123 -435L116 -328Q195 -328 238 -302T282 -229Q282 -185 250 -164T120 -134L152 0H285Z" /> +<glyph unicode="¹" horiz-adv-x="751" d="M495 667H338V1268L122 1211V1339L477 1456H495V667Z" /> +<glyph unicode="º" horiz-adv-x="931" d="M122 1123Q122 1281 216 1378T464 1476Q619 1476 713 1380T807 1117V1043Q807 884 714 787T466 690T217 787T122 1049V1123ZM285 1043Q285 943 333 886T466 829Q549 829 596 886T644 1045V1123Q644 1222 596 1279T464 +1336Q383 1336 335 1281T285 1129V1043Z" /> +<glyph unicode="»" horiz-adv-x="960" d="M244 949L539 560V541L244 152H102L360 550L102 949H244ZM593 949L888 560V541L593 152H451L709 550L451 949H593Z" /> +<glyph unicode="¼" horiz-adv-x="1500" d="M458 664H301V1265L85 1208V1336L440 1453H458V664ZM443 118L339 184L1050 1322L1154 1256L443 118ZM1318 299H1425V169H1318V0H1161V169H786L780 271L1157 789H1318V299ZM938 299H1161V588L1144 560L938 299Z" /> +<glyph unicode="½" horiz-adv-x="1589" d="M399 118L295 184L1006 1322L1110 1256L399 118ZM453 664H296V1265L80 1208V1336L435 1453H453V664ZM1481 0H882V108L1182 390Q1291 492 1291 561Q1291 610 1259 640T1167 671Q1092 671 1057 633T1021 538H864Q864 +652 947 726T1163 800T1372 737T1449 563Q1449 459 1342 352L1258 273L1082 128H1481V0Z" /> +<glyph unicode="¾" horiz-adv-x="1593" d="M570 118L466 184L1177 1322L1281 1256L570 118ZM1410 299H1517V169H1410V0H1253V169H878L872 271L1249 789H1410V299ZM1030 299H1253V588L1236 560L1030 299ZM314 1126H398Q472 1126 508 1156T544 1235Q544 1280 +513 1309T411 1338Q354 1338 317 1313T279 1246H122Q122 1344 203 1405T409 1467Q546 1467 624 1407T702 1242Q702 1187 667 1142T566 1071Q715 1030 715 887Q715 781 630 719T409 656Q277 656 194 719T111 889H269Q269 844 308 814T415 784Q485 784 521 814T558 +895Q558 1008 402 1010H314V1126Z" /> +<glyph unicode="¿" horiz-adv-x="969" d="M588 680Q587 574 567 511T498 388T358 233T255 37L253 0Q253 -109 311 -166T478 -224Q578 -224 640 -168T703 -20H888Q886 -181 774 -283T478 -385Q282 -385 175 -285T68 -5Q68 168 228 343L337 456Q403 534 403 +680H588ZM596 997Q596 952 569 921T487 890T405 921T377 997Q377 1041 405 1071T487 1101T568 1071T596 997Z" /> +<glyph unicode="À" horiz-adv-x="1336" d="M973 380H363L226 0H28L584 1456H752L1309 0H1112L973 380ZM421 538H916L668 1219L421 538ZM778 1552H619L361 1846H584L778 1552Z" /> +<glyph unicode="Á" horiz-adv-x="1336" d="M973 380H363L226 0H28L584 1456H752L1309 0H1112L973 380ZM421 538H916L668 1219L421 538ZM763 1846H987L719 1552H570L763 1846Z" /> +<glyph unicode="Â" horiz-adv-x="1336" d="M973 380H363L226 0H28L584 1456H752L1309 0H1112L973 380ZM421 538H916L668 1219L421 538ZM975 1572V1562H822L672 1732L523 1562H370V1574L616 1846H728L975 1572Z" /> +<glyph unicode="Ã" horiz-adv-x="1336" d="M973 380H363L226 0H28L584 1456H752L1309 0H1112L973 380ZM421 538H916L668 1219L421 538ZM1027 1814Q1027 1706 966 1639T812 1572Q771 1572 741 1582T663 1623T593 1660T543 1667Q502 1667 473 1636T444 1555L320 +1562Q320 1669 380 1739T534 1809Q569 1809 597 1799T673 1760T746 1722T803 1713Q846 1713 874 1747T903 1826L1027 1814Z" /> +<glyph unicode="Ä" horiz-adv-x="1336" d="M973 380H363L226 0H28L584 1456H752L1309 0H1112L973 380ZM421 538H916L668 1219L421 538ZM350 1681Q350 1726 377 1756T459 1787T541 1757T569 1681T541 1606T459 1576T378 1606T350 1681ZM780 1679Q780 1724 +807 1755T889 1786T971 1755T999 1679T971 1604T889 1574T808 1604T780 1679Z" /> +<glyph unicode="Å" horiz-adv-x="1336" d="M973 380H363L226 0H28L584 1456H752L1309 0H1112L973 380ZM421 538H916L668 1219L421 538ZM887 1729Q887 1642 825 1584T672 1525Q580 1525 519 1584T457 1729T518 1876T672 1937T825 1876T887 1729ZM556 1729Q556 +1682 589 1648T672 1614Q720 1614 754 1647T788 1729T755 1812T672 1847Q622 1847 589 1812T556 1729Z" /> +<glyph unicode="Æ" horiz-adv-x="1914" d="M1879 0H996L981 353H417L212 0H-14L866 1456H1817V1304H1126L1146 833H1736V682H1152L1174 151H1879V0ZM518 527H974L943 1260L518 527Z" /> +<glyph unicode="Ç" horiz-adv-x="1333" d="M1240 462Q1213 231 1070 106T688 -20Q430 -20 275 165T119 660V800Q119 1003 191 1157T397 1393T705 1476Q937 1476 1077 1347T1240 988H1047Q1022 1162 939 1240T705 1318Q521 1318 417 1182T312 795V654Q312 +417 411 277T688 137Q848 137 933 209T1047 462H1240ZM751 -9L739 -61Q892 -88 892 -234Q892 -331 812 -387T589 -444L582 -337Q661 -337 704 -311T748 -238Q748 -194 716 -173T586 -143L618 -9H751Z" /> +<glyph unicode="È" horiz-adv-x="1164" d="M992 673H361V157H1094V0H169V1456H1084V1298H361V830H992V673ZM725 1564H566L308 1858H531L725 1564Z" /> +<glyph unicode="É" horiz-adv-x="1164" d="M992 673H361V157H1094V0H169V1456H1084V1298H361V830H992V673ZM710 1858H934L666 1564H517L710 1858Z" /> +<glyph unicode="Ê" horiz-adv-x="1164" d="M992 673H361V157H1094V0H169V1456H1084V1298H361V830H992V673ZM922 1584V1574H769L619 1744L470 1574H317V1586L563 1858H675L922 1584Z" /> +<glyph unicode="Ë" horiz-adv-x="1164" d="M992 673H361V157H1094V0H169V1456H1084V1298H361V830H992V673ZM297 1693Q297 1738 324 1768T406 1799T488 1769T516 1693T488 1618T406 1588T325 1618T297 1693ZM727 1691Q727 1736 754 1767T836 1798T918 1767T946 +1691T918 1616T836 1586T755 1616T727 1691Z" /> +<glyph unicode="Ì" horiz-adv-x="557" d="M375 0H183V1456H375V0ZM385 1564H226L-32 1858H191L385 1564Z" /> +<glyph unicode="Í" horiz-adv-x="557" d="M375 0H183V1456H375V0ZM369 1858H593L325 1564H176L369 1858Z" /> +<glyph unicode="Î" horiz-adv-x="557" d="M375 0H183V1456H375V0ZM582 1584V1574H429L279 1744L130 1574H-23V1586L223 1858H335L582 1584Z" /> +<glyph unicode="Ï" horiz-adv-x="557" d="M375 0H183V1456H375V0ZM-43 1693Q-43 1738 -16 1768T66 1799T148 1769T176 1693T148 1618T66 1588T-15 1618T-43 1693ZM387 1691Q387 1736 414 1767T496 1798T578 1767T606 1691T578 1616T496 1586T415 1616T387 1691Z" /> +<glyph unicode="Ð" horiz-adv-x="1373" d="M199 0V666H7V817H199V1456H610Q800 1456 946 1372T1171 1133T1252 777V684Q1252 478 1173 323T946 85T602 0H199ZM643 666H391V157H592Q814 157 937 294T1062 680V773Q1062 1021 946 1158T615 1298H391V817H643V666Z" /> +<glyph unicode="Ñ" horiz-adv-x="1460" d="M1288 0H1095L362 1122V0H169V1456H362L1097 329V1456H1288V0ZM1081 1814Q1081 1706 1020 1639T866 1572Q825 1572 795 1582T717 1623T647 1660T597 1667Q556 1667 527 1636T498 1555L374 1562Q374 1669 434 1739T588 +1809Q623 1809 651 1799T727 1760T800 1722T857 1713Q900 1713 928 1747T957 1826L1081 1814Z" /> +<glyph unicode="Ò" horiz-adv-x="1408" d="M1289 681Q1289 467 1217 308T1013 64T705 -20Q533 -20 400 64T194 305T118 668V773Q118 983 191 1144T397 1390T703 1476Q878 1476 1011 1392T1217 1147T1289 773V681ZM1098 775Q1098 1034 994 1172T703 1311Q521 +1311 417 1173T309 788V681Q309 430 414 287T705 143Q891 143 993 278T1098 667V775ZM812 1554H653L395 1848H618L812 1554Z" /> +<glyph unicode="Ó" horiz-adv-x="1408" d="M1289 681Q1289 467 1217 308T1013 64T705 -20Q533 -20 400 64T194 305T118 668V773Q118 983 191 1144T397 1390T703 1476Q878 1476 1011 1392T1217 1147T1289 773V681ZM1098 775Q1098 1034 994 1172T703 1311Q521 +1311 417 1173T309 788V681Q309 430 414 287T705 143Q891 143 993 278T1098 667V775ZM797 1848H1021L753 1554H604L797 1848Z" /> +<glyph unicode="Ô" horiz-adv-x="1408" d="M1289 681Q1289 467 1217 308T1013 64T705 -20Q533 -20 400 64T194 305T118 668V773Q118 983 191 1144T397 1390T703 1476Q878 1476 1011 1392T1217 1147T1289 773V681ZM1098 775Q1098 1034 994 1172T703 1311Q521 +1311 417 1173T309 788V681Q309 430 414 287T705 143Q891 143 993 278T1098 667V775ZM1009 1574V1564H856L706 1734L557 1564H404V1576L650 1848H762L1009 1574Z" /> +<glyph unicode="Õ" horiz-adv-x="1408" d="M1289 681Q1289 467 1217 308T1013 64T705 -20Q533 -20 400 64T194 305T118 668V773Q118 983 191 1144T397 1390T703 1476Q878 1476 1011 1392T1217 1147T1289 773V681ZM1098 775Q1098 1034 994 1172T703 1311Q521 +1311 417 1173T309 788V681Q309 430 414 287T705 143Q891 143 993 278T1098 667V775ZM1061 1816Q1061 1708 1000 1641T846 1574Q805 1574 775 1584T697 1625T627 1662T577 1669Q536 1669 507 1638T478 1557L354 1564Q354 1671 414 1741T568 1811Q603 1811 631 1801T707 +1762T780 1724T837 1715Q880 1715 908 1749T937 1828L1061 1816Z" /> +<glyph unicode="Ö" horiz-adv-x="1408" d="M1289 681Q1289 467 1217 308T1013 64T705 -20Q533 -20 400 64T194 305T118 668V773Q118 983 191 1144T397 1390T703 1476Q878 1476 1011 1392T1217 1147T1289 773V681ZM1098 775Q1098 1034 994 1172T703 1311Q521 +1311 417 1173T309 788V681Q309 430 414 287T705 143Q891 143 993 278T1098 667V775ZM384 1683Q384 1728 411 1758T493 1789T575 1759T603 1683T575 1608T493 1578T412 1608T384 1683ZM814 1681Q814 1726 841 1757T923 1788T1005 1757T1033 1681T1005 1606T923 +1576T842 1606T814 1681Z" /> +<glyph unicode="×" horiz-adv-x="1092" d="M89 329L419 665L91 1000L210 1123L539 788L868 1123L987 1000L659 665L989 329L870 206L539 543L208 206L89 329Z" /> +<glyph unicode="Ø" horiz-adv-x="1408" d="M1289 681Q1289 467 1217 308T1013 64T705 -20Q534 -20 403 62L306 -93H164L308 138Q118 330 118 690V773Q118 983 191 1144T397 1390T703 1476Q917 1476 1065 1351L1168 1516H1309L1150 1261Q1287 1074 1289 780V681ZM309 +681Q309 437 407 296L971 1200Q869 1311 703 1311Q521 1311 417 1173T309 788V681ZM1098 775Q1098 957 1042 1088L493 207Q584 143 705 143Q891 143 993 278T1098 667V775Z" /> +<glyph unicode="Ù" horiz-adv-x="1328" d="M1194 1456V466Q1193 260 1065 129T716 -18L665 -20Q426 -20 284 109T140 464V1456H330V470Q330 312 417 225T665 137Q828 137 914 224T1001 469V1456H1194ZM773 1552H614L356 1846H579L773 1552Z" /> +<glyph unicode="Ú" horiz-adv-x="1328" d="M1194 1456V466Q1193 260 1065 129T716 -18L665 -20Q426 -20 284 109T140 464V1456H330V470Q330 312 417 225T665 137Q828 137 914 224T1001 469V1456H1194ZM758 1846H982L714 1552H565L758 1846Z" /> +<glyph unicode="Û" horiz-adv-x="1328" d="M1194 1456V466Q1193 260 1065 129T716 -18L665 -20Q426 -20 284 109T140 464V1456H330V470Q330 312 417 225T665 137Q828 137 914 224T1001 469V1456H1194ZM970 1572V1562H817L667 1732L518 1562H365V1574L611 +1846H723L970 1572Z" /> +<glyph unicode="Ü" horiz-adv-x="1328" d="M1194 1456V466Q1193 260 1065 129T716 -18L665 -20Q426 -20 284 109T140 464V1456H330V470Q330 312 417 225T665 137Q828 137 914 224T1001 469V1456H1194ZM345 1681Q345 1726 372 1756T454 1787T536 1757T564 +1681T536 1606T454 1576T373 1606T345 1681ZM775 1679Q775 1724 802 1755T884 1786T966 1755T994 1679T966 1604T884 1574T803 1604T775 1679Z" /> +<glyph unicode="Ý" horiz-adv-x="1230" d="M613 725L993 1456H1211L709 543V0H517V543L15 1456H235L613 725ZM708 1846H932L664 1552H515L708 1846Z" /> +<glyph unicode="Þ" horiz-adv-x="1210" d="M352 1456V1163H631Q778 1163 888 1111T1057 961T1117 738Q1117 544 985 429T626 313H352V0H166V1456H352ZM352 1011V465H629Q771 465 851 540T931 736Q931 859 851 934T635 1011H352Z" /> +<glyph unicode="ß" horiz-adv-x="1218" d="M324 0H139V1111Q139 1319 242 1436T532 1554Q712 1554 810 1465T909 1216Q909 1091 845 990T781 819Q781 768 818 721T950 601T1087 461T1130 317Q1130 158 1029 69T745 -20Q664 -20 574 2T445 52L488 207Q537 +175 604 153T725 131Q832 131 888 178T945 307Q945 359 908 407T777 528T639 671T595 821Q595 910 664 1013T734 1201Q734 1295 682 1348T542 1402Q324 1402 324 1109V0Z" /> +<glyph unicode="à" horiz-adv-x="1114" d="M808 0Q792 32 782 114Q653 -20 474 -20Q314 -20 212 70T109 300Q109 469 237 562T599 656H779V741Q779 838 721 895T550 953Q451 953 384 903T317 782H131Q131 863 188 938T344 1058T561 1102Q748 1102 854 1009T964 +751V253Q964 104 1002 16V0H808ZM501 141Q588 141 666 186T779 303V525H634Q294 525 294 326Q294 239 352 190T501 141ZM687 1242H528L270 1536H493L687 1242Z" /> +<glyph unicode="á" horiz-adv-x="1114" d="M808 0Q792 32 782 114Q653 -20 474 -20Q314 -20 212 70T109 300Q109 469 237 562T599 656H779V741Q779 838 721 895T550 953Q451 953 384 903T317 782H131Q131 863 188 938T344 1058T561 1102Q748 1102 854 1009T964 +751V253Q964 104 1002 16V0H808ZM501 141Q588 141 666 186T779 303V525H634Q294 525 294 326Q294 239 352 190T501 141ZM672 1536H896L628 1242H479L672 1536Z" /> +<glyph unicode="â" horiz-adv-x="1114" d="M808 0Q792 32 782 114Q653 -20 474 -20Q314 -20 212 70T109 300Q109 469 237 562T599 656H779V741Q779 838 721 895T550 953Q451 953 384 903T317 782H131Q131 863 188 938T344 1058T561 1102Q748 1102 854 1009T964 +751V253Q964 104 1002 16V0H808ZM501 141Q588 141 666 186T779 303V525H634Q294 525 294 326Q294 239 352 190T501 141ZM884 1262V1252H731L581 1422L432 1252H279V1264L525 1536H637L884 1262Z" /> +<glyph unicode="ã" horiz-adv-x="1114" d="M808 0Q792 32 782 114Q653 -20 474 -20Q314 -20 212 70T109 300Q109 469 237 562T599 656H779V741Q779 838 721 895T550 953Q451 953 384 903T317 782H131Q131 863 188 938T344 1058T561 1102Q748 1102 854 1009T964 +751V253Q964 104 1002 16V0H808ZM501 141Q588 141 666 186T779 303V525H634Q294 525 294 326Q294 239 352 190T501 141ZM936 1504Q936 1396 875 1329T721 1262Q680 1262 650 1272T572 1313T502 1350T452 1357Q411 1357 382 1326T353 1245L229 1252Q229 1359 289 +1429T443 1499Q478 1499 506 1489T582 1450T655 1412T712 1403Q755 1403 783 1437T812 1516L936 1504Z" /> +<glyph unicode="ä" horiz-adv-x="1114" d="M808 0Q792 32 782 114Q653 -20 474 -20Q314 -20 212 70T109 300Q109 469 237 562T599 656H779V741Q779 838 721 895T550 953Q451 953 384 903T317 782H131Q131 863 188 938T344 1058T561 1102Q748 1102 854 1009T964 +751V253Q964 104 1002 16V0H808ZM501 141Q588 141 666 186T779 303V525H634Q294 525 294 326Q294 239 352 190T501 141ZM259 1371Q259 1416 286 1446T368 1477T450 1447T478 1371T450 1296T368 1266T287 1296T259 1371ZM689 1369Q689 1414 716 1445T798 1476T880 +1445T908 1369T880 1294T798 1264T717 1294T689 1369Z" /> +<glyph unicode="å" horiz-adv-x="1114" d="M808 0Q792 32 782 114Q653 -20 474 -20Q314 -20 212 70T109 300Q109 469 237 562T599 656H779V741Q779 838 721 895T550 953Q451 953 384 903T317 782H131Q131 863 188 938T344 1058T561 1102Q748 1102 854 1009T964 +751V253Q964 104 1002 16V0H808ZM501 141Q588 141 666 186T779 303V525H634Q294 525 294 326Q294 239 352 190T501 141ZM796 1419Q796 1332 734 1274T581 1215Q489 1215 428 1274T366 1419T427 1566T581 1627T734 1566T796 1419ZM465 1419Q465 1372 498 1338T581 +1304Q629 1304 663 1337T697 1419T664 1502T581 1537Q531 1537 498 1502T465 1419Z" /> +<glyph unicode="æ" horiz-adv-x="1729" d="M1262 -20Q1001 -20 865 160Q800 74 687 27T433 -20Q266 -20 172 66T78 304Q78 461 191 548T526 635H749V720Q749 827 694 888T535 950Q430 950 360 895T290 759L106 778Q106 921 227 1011T535 1102Q650 1102 738 +1061T876 936Q939 1015 1026 1058T1218 1102Q1428 1102 1544 974T1660 612V497H932Q939 321 1026 226T1262 130Q1410 130 1531 206L1578 237L1642 101Q1484 -20 1262 -20ZM469 130Q541 130 620 167T749 258V495H521Q404 493 334 438T264 300Q264 223 317 177T469 +130ZM1218 950Q1103 950 1029 865T937 640H1475V671Q1475 803 1408 876T1218 950Z" /> +<glyph unicode="ç" horiz-adv-x="1072" d="M574 131Q673 131 747 191T829 341H1004Q999 248 940 164T783 30T574 -20Q353 -20 223 127T92 531V562Q92 720 150 843T316 1034T573 1102Q755 1102 875 993T1004 710H829Q821 815 750 882T573 950Q432 950 355 +849T277 555V520Q277 333 354 232T574 131ZM604 -9L592 -61Q745 -88 745 -234Q745 -331 665 -387T442 -444L435 -337Q514 -337 557 -311T601 -238Q601 -194 569 -173T439 -143L471 -9H604Z" /> +<glyph unicode="è" horiz-adv-x="1085" d="M589 -20Q369 -20 231 124T93 511V545Q93 706 154 832T326 1030T566 1102Q777 1102 894 963T1011 565V488H278Q282 328 371 230T599 131Q697 131 765 171T884 277L997 189Q861 -20 589 -20ZM566 950Q454 950 378 +869T284 640H826V654Q818 795 750 872T566 950ZM671 1242H512L254 1536H477L671 1242Z" /> +<glyph unicode="é" horiz-adv-x="1085" d="M589 -20Q369 -20 231 124T93 511V545Q93 706 154 832T326 1030T566 1102Q777 1102 894 963T1011 565V488H278Q282 328 371 230T599 131Q697 131 765 171T884 277L997 189Q861 -20 589 -20ZM566 950Q454 950 378 +869T284 640H826V654Q818 795 750 872T566 950ZM656 1536H880L612 1242H463L656 1536Z" /> +<glyph unicode="ê" horiz-adv-x="1085" d="M589 -20Q369 -20 231 124T93 511V545Q93 706 154 832T326 1030T566 1102Q777 1102 894 963T1011 565V488H278Q282 328 371 230T599 131Q697 131 765 171T884 277L997 189Q861 -20 589 -20ZM566 950Q454 950 378 +869T284 640H826V654Q818 795 750 872T566 950ZM868 1262V1252H715L565 1422L416 1252H263V1264L509 1536H621L868 1262Z" /> +<glyph unicode="ë" horiz-adv-x="1085" d="M589 -20Q369 -20 231 124T93 511V545Q93 706 154 832T326 1030T566 1102Q777 1102 894 963T1011 565V488H278Q282 328 371 230T599 131Q697 131 765 171T884 277L997 189Q861 -20 589 -20ZM566 950Q454 950 378 +869T284 640H826V654Q818 795 750 872T566 950ZM243 1371Q243 1416 270 1446T352 1477T434 1447T462 1371T434 1296T352 1266T271 1296T243 1371ZM673 1369Q673 1414 700 1445T782 1476T864 1445T892 1369T864 1294T782 1264T701 1294T673 1369Z" /> +<glyph unicode="ì" horiz-adv-x="506" d="M341 0H155V1082H341V0ZM615 1497H456L198 1791H421L615 1497Z" /> +<glyph unicode="í" horiz-adv-x="506" d="M341 0H155V1082H341V0ZM343 1791H567L299 1497H150L343 1791Z" /> +<glyph unicode="î" horiz-adv-x="506" d="M341 0H155V1082H341V0ZM556 1261V1251H403L253 1421L104 1251H-49V1263L197 1535H309L556 1261Z" /> +<glyph unicode="ï" horiz-adv-x="506" d="M341 0H155V1082H341V0ZM-69 1370Q-69 1415 -42 1445T40 1476T122 1446T150 1370T122 1295T40 1265T-41 1295T-69 1370ZM361 1368Q361 1413 388 1444T470 1475T552 1444T580 1368T552 1293T470 1263T389 1293T361 1368Z" /> +<glyph unicode="ð" horiz-adv-x="1200" d="M820 1301Q1069 1037 1069 628V535Q1069 377 1011 251T844 52T602 -20Q467 -20 357 44T187 221T126 467Q126 614 182 730T341 912T574 977Q737 977 858 863Q810 1058 669 1199L451 1051L378 1150L570 1281Q438 1372 +255 1421L312 1580Q551 1526 726 1387L915 1516L988 1416L820 1301ZM884 635L882 691Q849 752 780 788T618 825Q473 825 392 730T311 467Q311 327 394 229T606 131Q731 131 807 244T884 541V635Z" /> +<glyph unicode="ñ" horiz-adv-x="1130" d="M315 1082L321 946Q445 1102 645 1102Q988 1102 991 715V0H806V716Q805 833 753 889T589 945Q499 945 431 897T325 771V0H140V1082H315ZM927 1504Q927 1396 866 1329T712 1262Q671 1262 641 1272T563 1313T493 1350T443 +1357Q402 1357 373 1326T344 1245L220 1252Q220 1359 280 1429T434 1499Q469 1499 497 1489T573 1450T646 1412T703 1403Q746 1403 774 1437T803 1516L927 1504Z" /> +<glyph unicode="ò" horiz-adv-x="1168" d="M91 551Q91 710 153 837T327 1033T582 1102Q803 1102 939 949T1076 542V529Q1076 371 1016 246T843 50T584 -20Q364 -20 228 133T91 538V551ZM277 529Q277 349 360 240T584 131Q725 131 808 241T891 551Q891 729 +807 839T582 950Q445 950 361 841T277 529ZM681 1242H522L264 1536H487L681 1242Z" /> +<glyph unicode="ó" horiz-adv-x="1168" d="M91 551Q91 710 153 837T327 1033T582 1102Q803 1102 939 949T1076 542V529Q1076 371 1016 246T843 50T584 -20Q364 -20 228 133T91 538V551ZM277 529Q277 349 360 240T584 131Q725 131 808 241T891 551Q891 729 +807 839T582 950Q445 950 361 841T277 529ZM666 1536H890L622 1242H473L666 1536Z" /> +<glyph unicode="ô" horiz-adv-x="1168" d="M91 551Q91 710 153 837T327 1033T582 1102Q803 1102 939 949T1076 542V529Q1076 371 1016 246T843 50T584 -20Q364 -20 228 133T91 538V551ZM277 529Q277 349 360 240T584 131Q725 131 808 241T891 551Q891 729 +807 839T582 950Q445 950 361 841T277 529ZM878 1262V1252H725L575 1422L426 1252H273V1264L519 1536H631L878 1262Z" /> +<glyph unicode="õ" horiz-adv-x="1168" d="M91 551Q91 710 153 837T327 1033T582 1102Q803 1102 939 949T1076 542V529Q1076 371 1016 246T843 50T584 -20Q364 -20 228 133T91 538V551ZM277 529Q277 349 360 240T584 131Q725 131 808 241T891 551Q891 729 +807 839T582 950Q445 950 361 841T277 529ZM930 1504Q930 1396 869 1329T715 1262Q674 1262 644 1272T566 1313T496 1350T446 1357Q405 1357 376 1326T347 1245L223 1252Q223 1359 283 1429T437 1499Q472 1499 500 1489T576 1450T649 1412T706 1403Q749 1403 777 +1437T806 1516L930 1504Z" /> +<glyph unicode="ö" horiz-adv-x="1168" d="M91 551Q91 710 153 837T327 1033T582 1102Q803 1102 939 949T1076 542V529Q1076 371 1016 246T843 50T584 -20Q364 -20 228 133T91 538V551ZM277 529Q277 349 360 240T584 131Q725 131 808 241T891 551Q891 729 +807 839T582 950Q445 950 361 841T277 529ZM253 1371Q253 1416 280 1446T362 1477T444 1447T472 1371T444 1296T362 1266T281 1296T253 1371ZM683 1369Q683 1414 710 1445T792 1476T874 1445T902 1369T874 1294T792 1264T711 1294T683 1369Z" /> +<glyph unicode="÷" horiz-adv-x="1169" d="M1069 600H71V784H1069V600ZM461 1098Q461 1146 489 1178T575 1210T661 1178T691 1098Q691 1051 662 1020T575 989T490 1020T461 1098ZM461 281Q461 329 489 361T575 393T661 361T691 281Q691 235 662 204T575 172T490 +203T461 281Z" /> +<glyph unicode="ø" horiz-adv-x="1160" d="M91 551Q91 710 152 836T326 1032T582 1102Q692 1102 786 1060L859 1208H983L881 1003Q1076 849 1076 529Q1076 371 1014 244T840 49T584 -20Q480 -20 394 15L320 -134H196L296 69Q91 218 91 551ZM276 529Q276 335 +373 224L716 918Q654 950 582 950Q444 950 360 841T276 529ZM890 551Q890 733 803 844L463 156Q518 131 584 131Q723 131 806 240T890 535V551Z" /> +<glyph unicode="ù" horiz-adv-x="1129" d="M808 107Q700 -20 491 -20Q318 -20 228 80T136 378V1082H321V383Q321 137 521 137Q733 137 803 295V1082H988V0H812L808 107ZM673 1242H514L256 1536H479L673 1242Z" /> +<glyph unicode="ú" horiz-adv-x="1129" d="M808 107Q700 -20 491 -20Q318 -20 228 80T136 378V1082H321V383Q321 137 521 137Q733 137 803 295V1082H988V0H812L808 107ZM658 1536H882L614 1242H465L658 1536Z" /> +<glyph unicode="û" horiz-adv-x="1129" d="M808 107Q700 -20 491 -20Q318 -20 228 80T136 378V1082H321V383Q321 137 521 137Q733 137 803 295V1082H988V0H812L808 107ZM870 1262V1252H717L567 1422L418 1252H265V1264L511 1536H623L870 1262Z" /> +<glyph unicode="ü" horiz-adv-x="1129" d="M808 107Q700 -20 491 -20Q318 -20 228 80T136 378V1082H321V383Q321 137 521 137Q733 137 803 295V1082H988V0H812L808 107ZM245 1371Q245 1416 272 1446T354 1477T436 1447T464 1371T436 1296T354 1266T273 1296T245 +1371ZM675 1369Q675 1414 702 1445T784 1476T866 1445T894 1369T866 1294T784 1264T703 1294T675 1369Z" /> +<glyph unicode="ý" horiz-adv-x="969" d="M494 271L746 1082H944L509 -167Q408 -437 188 -437L153 -434L84 -421V-271L134 -275Q228 -275 280 -237T367 -98L408 12L22 1082H224L494 271ZM599 1536H823L555 1242H406L599 1536Z" /> +<glyph unicode="þ" horiz-adv-x="1180" d="M1063 529Q1063 282 950 131T644 -20Q447 -20 334 105V-416H149V1536H334V970Q447 1102 641 1102Q836 1102 949 955T1063 546V529ZM878 550Q878 733 800 839T586 945Q418 945 334 796V279Q417 131 588 131Q721 131 +799 236T878 550Z" /> +<glyph unicode="ÿ" horiz-adv-x="969" d="M494 271L746 1082H944L509 -167Q408 -437 188 -437L153 -434L84 -421V-271L134 -275Q228 -275 280 -237T367 -98L408 12L22 1082H224L494 271ZM186 1371Q186 1416 213 1446T295 1477T377 1447T405 1371T377 1296T295 +1266T214 1296T186 1371ZM616 1369Q616 1414 643 1445T725 1476T807 1445T835 1369T807 1294T725 1264T644 1294T616 1369Z" /> +<glyph unicode="–" horiz-adv-x="1344" d="M1421 651H419V802H1421V651Z" /> +<glyph unicode="—" horiz-adv-x="1599" d="M1737 651H401V802H1737V651Z" /> +<glyph unicode="‘" horiz-adv-x="409" d="M270 1555L376 1483Q283 1356 280 1209V1073H96V1189Q96 1291 144 1391T270 1555Z" /> +<glyph unicode="’" horiz-adv-x="409" d="M153 1046L48 1118Q141 1248 144 1392V1536H327V1406Q326 1306 278 1207T153 1046Z" /> +<glyph unicode="‚" horiz-adv-x="407" d="M141 -283L36 -210Q127 -83 130 63V181H315V81Q315 -20 266 -121T141 -283Z" /> +<glyph unicode="“" horiz-adv-x="724" d="M278 1555L384 1483Q291 1356 288 1209V1073H104V1189Q104 1291 152 1391T278 1555ZM593 1555L699 1483Q606 1356 603 1209V1073H419V1189Q419 1291 467 1391T593 1555Z" /> +<glyph unicode="”" horiz-adv-x="731" d="M165 1046L60 1118Q153 1248 156 1392V1536H339V1406Q338 1306 290 1207T165 1046ZM472 1046L367 1118Q460 1248 463 1392V1536H646V1406Q645 1306 597 1207T472 1046Z" /> +<glyph unicode="„" horiz-adv-x="705" d="M141 -301L36 -229Q127 -92 130 61V246H315V82Q315 -26 266 -131T141 -301ZM437 -301L332 -229Q423 -92 426 61V246H612V82Q612 -25 564 -129T437 -301Z" /> +<glyph unicode="•" horiz-adv-x="690" d="M138 772Q138 859 193 915T341 971Q432 971 489 917T546 769V732Q546 645 491 590T342 535Q249 535 194 590T138 734V772Z" /> +<glyph unicode="‹" horiz-adv-x="614" d="M286 550L544 153H403L108 541V560L403 949H544L286 550Z" /> +<glyph unicode="›" horiz-adv-x="614" d="M231 949L526 560V541L231 152H89L347 550L89 949H231Z" /> +</font> +</defs> +</svg> diff --git a/static/fonts/roboto/Roboto_400.ttf b/static/fonts/roboto/Roboto_400.ttf new file mode 100644 index 000000000..b91bf3f7e Binary files /dev/null and b/static/fonts/roboto/Roboto_400.ttf differ diff --git a/static/fonts/roboto/Roboto_400.woff b/static/fonts/roboto/Roboto_400.woff new file mode 100644 index 000000000..92dfacc61 Binary files /dev/null and b/static/fonts/roboto/Roboto_400.woff differ diff --git a/static/fonts/roboto/Roboto_400.woff2 b/static/fonts/roboto/Roboto_400.woff2 new file mode 100644 index 000000000..7e854e669 Binary files /dev/null and b/static/fonts/roboto/Roboto_400.woff2 differ diff --git a/static/fonts/sourcesanspro/Source_Sans_Pro_300.eot b/static/fonts/sourcesanspro/Source_Sans_Pro_300.eot new file mode 100644 index 000000000..7092e737a Binary files /dev/null and b/static/fonts/sourcesanspro/Source_Sans_Pro_300.eot differ diff --git a/static/fonts/sourcesanspro/Source_Sans_Pro_300.svg b/static/fonts/sourcesanspro/Source_Sans_Pro_300.svg new file mode 100644 index 000000000..806471c89 --- /dev/null +++ b/static/fonts/sourcesanspro/Source_Sans_Pro_300.svg @@ -0,0 +1,347 @@ +<?xml version="1.0" standalone="no"?> +<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> +<svg xmlns="http://www.w3.org/2000/svg"> +<defs > +<font id="SourceSansPro" horiz-adv-x="503" ><font-face + font-family="Source Sans Pro Light" + units-per-em="1000" + panose-1="2 11 4 3 3 4 3 2 2 4" + ascent="984" + descent="-273" + alphabetic="0" /> +<glyph unicode=" " glyph-name="space" horiz-adv-x="200" /> +<glyph unicode="!" glyph-name="exclam" horiz-adv-x="259" d="M113 179L107 599V670H153L152 599L146 179H113ZM130 -12Q113 -12 100 0T87 33Q87 55 100 67T130 79Q147 79 159 67T172 33Q172 12 160 0T130 -12Z" /> +<glyph unicode=""" glyph-name="quotedbl" horiz-adv-x="360" d="M92 477L84 624L83 693H134V624L125 477H92ZM233 477L225 624L224 693H275V624L266 477H233Z" /> +<glyph unicode="#" glyph-name="numbersign" horiz-adv-x="479" d="M93 0L119 214H36V250H123L144 420H56V456H148L173 650H208L183 456H332L358 650H392L367 456H449V420H364L343 250H429V214H338L313 0H278L303 214H154L128 0H93ZM158 250H308L329 420H179L158 250Z" /> +<glyph unicode="$" glyph-name="dollar" horiz-adv-x="479" d="M226 -110V-11Q174 -7 131 15T59 66L83 97Q112 71 152 49T244 27Q307 27 340 61T374 150Q374 199 353 229T299 281T230 320T160 359T107 412T85 495Q85 526 95 553T125 600T170 634T226 650V749H265V650Q314 +647 345 627T402 580L376 552Q362 566 349 577T320 596T287 608T246 612Q194 612 162 580T130 497Q130 453 151 427T205 381T274 345T344 305T397 246T419 153Q419 81 376 38T265 -11V-110H226Z" /> +<glyph unicode="%" glyph-name="percent" horiz-adv-x="805" d="M181 257Q115 257 78 310T40 465Q40 565 77 618T181 671Q247 671 284 618T322 465Q322 364 285 311T181 257ZM181 290Q228 290 255 335T283 465Q283 549 256 593T181 638Q134 638 107 594T79 465Q79 +381 106 336T181 290ZM198 -12L566 671H604L237 -12H198ZM624 -12Q558 -12 521 41T483 196Q483 296 520 349T624 402Q690 402 727 349T765 196Q765 95 728 42T624 -12ZM624 21Q671 21 698 66T726 196Q726 280 699 324T624 369Q577 369 550 325T522 196Q522 112 +549 67T624 21Z" /> +<glyph unicode="&" glyph-name="ampersand" horiz-adv-x="575" d="M226 -12Q187 -12 152 0T92 36T51 93T36 167Q36 200 47 227T77 277T120 321T171 361Q151 403 139 444T127 524Q127 556 137 583T165 629T208 660T263 671Q317 671 345 637T373 551Q373 519 +360 492T326 442T277 397T221 354Q256 291 304 232T404 128Q439 173 465 227T508 345H551Q531 277 503 216T434 103Q469 75 501 57T562 27L547 -12Q482 11 406 71Q370 34 326 11T226 -12ZM168 526Q168 493 178 458T205 386Q230 404 253 422T294 460T322 501T333 +549Q333 565 329 580T317 608T295 627T261 635Q217 635 193 603T168 526ZM230 26Q271 26 308 45T376 97Q323 145 274 205T189 329Q167 312 148 294T113 257T90 216T81 170Q81 137 93 111T125 66T172 37T230 26Z" /> +<glyph unicode="'" glyph-name="quotesingle" horiz-adv-x="219" d="M92 477L84 624L83 693H134V624L125 477H92Z" /> +<glyph unicode="(" glyph-name="parenleft" horiz-adv-x="279" d="M220 -175Q158 -75 123 35T88 278Q88 410 123 520T220 731L247 715Q187 620 157 509T127 278Q127 159 157 48T247 -159L220 -175Z" /> +<glyph unicode=")" glyph-name="parenright" horiz-adv-x="279" d="M59 -175L32 -159Q92 -64 122 47T152 278Q152 397 122 508T32 715L59 731Q120 631 155 521T191 278Q191 146 156 36T59 -175Z" /> +<glyph unicode="*" glyph-name="asterisk" horiz-adv-x="395" d="M132 462L105 482L160 570L70 606L80 636L174 610L181 712H213L220 612L315 636L325 606L235 570L289 482L262 462L198 545L132 462Z" /> +<glyph unicode="+" glyph-name="plus" horiz-adv-x="479" d="M219 110V311H34V349H219V550H260V349H445V311H260V110H219Z" /> +<glyph unicode="," glyph-name="comma" horiz-adv-x="219" d="M62 -155L48 -125Q83 -107 104 -76T125 -4Q121 -5 113 -5Q96 -5 84 6T71 37Q71 57 84 68T114 79Q137 79 151 60T165 8Q165 -47 136 -89T62 -155Z" /> +<glyph unicode="-" glyph-name="hyphen" horiz-adv-x="299" d="M40 230V269H260V230H40Z" /> +<glyph unicode="." glyph-name="period" horiz-adv-x="219" d="M110 -12Q93 -12 80 0T67 33Q67 55 80 67T110 79Q127 79 139 67T152 33Q152 12 140 0T110 -12Z" /> +<glyph unicode="/" glyph-name="slash" horiz-adv-x="357" d="M9 -160L314 710H352L47 -160H9Z" /> +<glyph unicode="0" glyph-name="zero" horiz-adv-x="479" d="M239 -12Q147 -12 98 74T48 322Q48 482 97 566T239 651Q331 651 380 567T430 322Q430 161 381 75T239 -12ZM239 26Q306 26 345 100T385 322Q385 469 346 541T239 613Q173 613 133 541T93 322Q93 175 +133 101T239 26Z" /> +<glyph unicode="1" glyph-name="one" horiz-adv-x="479" d="M84 0V39H234V569H120V599Q159 606 189 616T243 639H279V39H418V0H84Z" /> +<glyph unicode="2" glyph-name="two" horiz-adv-x="479" d="M41 0V28Q120 108 179 171T277 287T336 384T356 471Q356 531 323 572T217 613Q173 613 135 589T68 529L39 557Q75 597 118 624T221 651Q307 651 354 602T401 472Q401 424 380 377T321 277T229 165T108 +35Q134 37 161 38T215 40H433V0H41Z" /> +<glyph unicode="3" glyph-name="three" horiz-adv-x="479" d="M232 -12Q194 -12 163 -4T108 17T64 46T29 78L55 109Q69 93 86 79T124 53T172 34T232 27Q264 27 291 37T339 65T370 110T381 168Q381 201 369 228T330 274T261 305T158 316V355Q213 355 251 366T313 +395T347 439T358 494Q358 548 323 580T229 613Q184 613 147 593T82 543L56 573Q89 605 131 628T229 651Q266 651 298 641T353 611T390 563T404 497Q404 434 370 396T282 339V335Q312 329 338 315T384 279T415 231T427 169Q427 127 412 94T371 37T309 1T232 -12Z" +/> +<glyph unicode="4" glyph-name="four" horiz-adv-x="479" d="M310 0V191H16V217L313 639H353V229H448V191H353V0H310ZM70 229H310V463Q310 485 311 518T314 573H310Q298 553 285 534T258 493L70 229Z" /> +<glyph unicode="5" glyph-name="five" horiz-adv-x="479" d="M227 -12Q189 -12 159 -5T104 15T60 43T26 74L51 105Q65 90 82 76T120 51T167 34T226 27Q258 27 287 39T337 74T372 128T385 199Q385 277 343 320T229 364Q192 364 166 353T110 321L79 340L102 639H397V600H142L122 +369Q147 384 174 393T236 403Q276 403 312 391T374 355T415 292T431 201Q431 150 414 111T368 44T303 2T227 -12Z" /> +<glyph unicode="6" glyph-name="six" horiz-adv-x="479" d="M261 -12Q164 -12 108 66T52 290Q52 390 71 459T123 571T198 632T287 651Q332 651 364 634T422 589L395 559Q374 585 346 598T287 612Q249 612 215 596T154 542T113 445T97 297Q130 338 171 362T258 +386Q343 386 389 336T436 188Q436 144 422 108T384 45T329 3T261 -12ZM262 26Q290 26 313 38T354 73T381 124T391 188Q391 222 383 251T359 302T316 336T253 348Q219 348 178 327T98 252Q101 201 112 160T144 89T193 43T262 26Z" /> +<glyph unicode="7" glyph-name="seven" horiz-adv-x="479" d="M188 0Q192 97 204 177T240 329T298 466T381 600H44V639H437V613Q380 537 343 467T283 325T250 173T236 0H188Z" /> +<glyph unicode="8" glyph-name="eight" horiz-adv-x="479" d="M243 -12Q199 -12 162 1T98 38T56 94T40 164Q40 196 51 224T81 274T122 314T168 344V348Q150 360 134 374T105 407T84 447T76 495Q76 529 89 558T124 607T177 639T243 651Q284 651 316 639T370 604T404 +551T416 484Q416 458 407 434T385 388T355 350T325 322V318Q346 305 366 290T401 256T427 212T437 155Q437 120 423 90T384 37T322 1T243 -12ZM290 335Q331 368 352 404T374 483Q374 510 365 533T340 575T299 603T243 614Q216 614 194 605T155 581T129 543T120 +495Q120 461 134 437T173 394T227 361T290 335ZM243 25Q277 25 304 35T351 63T381 105T392 156Q392 193 376 218T332 263T269 297T197 327Q148 298 116 259T84 166Q84 136 96 111T129 66T179 36T243 25Z" /> +<glyph unicode="9" glyph-name="nine" horiz-adv-x="479" d="M226 291Q261 291 303 314T381 388Q378 439 367 480T335 551T285 597T216 613Q189 613 165 601T124 567T97 516T87 452Q87 417 95 388T120 337T163 303T226 291ZM191 -12Q146 -12 113 5T56 50L83 80Q104 +54 132 41T192 27Q230 27 264 43T325 97T366 194T382 342Q349 302 307 278T220 254Q136 254 90 304T43 452Q43 495 57 532T95 595T150 636T218 651Q314 651 370 574T426 350Q426 249 407 180T355 69T280 7T191 -12Z" /> +<glyph unicode=":" glyph-name="colon" horiz-adv-x="219" d="M110 370Q93 370 80 382T67 415Q67 437 80 449T110 461Q127 461 139 449T152 415Q152 394 140 382T110 370ZM110 -12Q93 -12 80 0T67 33Q67 55 80 67T110 79Q127 79 139 67T152 33Q152 12 140 0T110 -12Z" /> +<glyph unicode=";" glyph-name="semicolon" horiz-adv-x="219" d="M110 370Q93 370 80 382T67 415Q67 437 80 449T110 461Q127 461 139 449T152 415Q152 394 140 382T110 370ZM62 -155L48 -125Q83 -107 104 -76T125 -4Q121 -5 113 -5Q96 -5 84 6T71 37Q71 57 84 +68T114 79Q137 79 151 60T165 8Q165 -47 136 -89T62 -155Z" /> +<glyph unicode="<" glyph-name="less" horiz-adv-x="479" d="M445 146L34 310V354L445 518V475L213 385L80 334V330L213 279L445 189V146Z" /> +<glyph unicode="=" glyph-name="equal" horiz-adv-x="479" d="M34 413V451H445V413H34ZM34 466V504H445V466H34Z" /> +<glyph unicode=">" glyph-name="greater" horiz-adv-x="479" d="M34 146V189L266 279L399 330V334L266 385L34 475V518L445 354V310L34 146Z" /> +<glyph unicode="?" glyph-name="question" horiz-adv-x="402" d="M163 179Q157 220 165 253T190 315T226 369T264 418T294 469T306 526Q306 549 300 570T279 608T244 633T193 643Q156 643 123 627T64 579L37 604Q66 637 105 659T197 682Q233 682 262 671T311 639T341 +590T352 529Q352 495 340 467T309 412T271 361T234 308T208 249T203 179H163ZM186 -12Q169 -12 157 0T144 33Q144 55 156 67T186 79Q203 79 216 67T229 33Q229 12 216 0T186 -12Z" /> +<glyph unicode="@" glyph-name="at" horiz-adv-x="814" d="M388 -146Q316 -146 255 -123T148 -55T78 54T52 202Q52 300 84 379T171 515T298 602T449 633Q521 633 579 610T678 546T741 446T763 316Q763 252 746 204T702 122T643 73T579 56Q539 56 513 74T482 132H480Q454 +103 424 83T358 62Q335 62 314 70T278 96T253 138T244 198Q244 234 256 274T293 347T351 401T430 423Q483 423 513 375H515L524 415H558L522 226Q488 91 582 91Q606 91 631 106T677 149T711 219T725 313Q725 377 706 430T650 520T563 577T446 598Q377 598 313 570T200 +491T120 367T90 205Q90 132 112 74T173 -25T268 -88T391 -110Q441 -110 482 -97T559 -62L575 -92Q489 -146 388 -146ZM364 98Q414 98 472 165L503 338Q485 366 469 376T429 387Q395 387 368 370T323 325T294 265T284 201Q284 144 307 121T364 98Z" /> +<glyph unicode="A" glyph-name="A" horiz-adv-x="526" d="M188 388L146 265H380L338 388Q318 447 300 501T265 616H261Q244 555 226 501T188 388ZM8 0L240 659H286L518 0H470L393 226H132L54 0H8Z" /> +<glyph unicode="B" glyph-name="B" horiz-adv-x="578" d="M97 0V659H275Q375 659 434 621T493 499Q493 447 467 409T391 355V351Q455 340 494 301T533 192Q533 144 516 108T466 48T389 12T288 0H97ZM143 369H257Q358 369 402 402T447 494Q447 564 400 592T262 +621H143V369ZM143 38H276Q375 38 431 75T488 191Q488 263 433 297T276 331H143V38Z" /> +<glyph unicode="C" glyph-name="C" horiz-adv-x="564" d="M331 -12Q270 -12 219 12T132 80T75 188T55 331Q55 409 75 472T133 579T221 647T336 671Q394 671 438 647T508 592L481 561Q454 592 418 610T337 629Q283 629 240 608T166 549T119 455T103 331Q103 262 +119 207T165 112T237 52T333 30Q384 30 424 50T500 111L527 82Q489 38 442 13T331 -12Z" /> +<glyph unicode="D" glyph-name="D" horiz-adv-x="604" d="M97 0V659H250Q326 659 382 636T476 570T531 467T549 332Q549 257 531 196T476 91T383 24T251 0H97ZM143 39H245Q312 39 360 60T440 121T486 213T501 332Q501 396 486 449T440 540T361 599T245 620H143V39Z" /> +<glyph unicode="E" glyph-name="E" horiz-adv-x="515" d="M97 0V659H458V619H143V370H407V330H143V40H468V0H97Z" /> +<glyph unicode="F" glyph-name="F" horiz-adv-x="477" d="M97 0V659H456V619H143V357H408V317H143V0H97Z" /> +<glyph unicode="G" glyph-name="G" horiz-adv-x="605" d="M338 -12Q274 -12 222 12T133 80T76 188T55 331Q55 409 76 472T135 579T227 647T346 671Q379 671 406 664T456 646T495 620T526 592L499 561Q473 589 437 609T347 629Q290 629 245 608T169 549T120 455T103 +331Q103 262 119 207T165 112T240 52T341 30Q386 30 425 43T489 80V285H331V324H533V63Q502 30 453 9T338 -12Z" /> +<glyph unicode="H" glyph-name="H" horiz-adv-x="639" d="M97 0V659H143V370H496V659H542V0H496V330H143V0H97Z" /> +<glyph unicode="I" glyph-name="I" horiz-adv-x="240" d="M97 0V659H143V0H97Z" /> +<glyph unicode="J" glyph-name="J" horiz-adv-x="462" d="M203 -12Q148 -12 107 13T41 85L76 108Q100 66 130 48T203 30Q263 30 292 66T321 184V659H367V179Q367 139 358 105T330 44T279 3T203 -12Z" /> +<glyph unicode="K" glyph-name="K" horiz-adv-x="558" d="M97 0V659H143V293H145L464 659H519L309 415L548 0H495L277 380L143 227V0H97Z" /> +<glyph unicode="L" glyph-name="L" horiz-adv-x="467" d="M97 0V659H143V40H447V0H97Z" /> +<glyph unicode="M" glyph-name="M" horiz-adv-x="706" d="M97 0V659H162L300 272Q313 236 326 200T352 126H356Q369 163 381 199T406 272L543 659H609V0H564V433Q564 474 566 521T570 611H566L515 464L373 72H333L190 464L138 611H134Q136 569 138 522T140 433V0H97Z" /> +<glyph unicode="N" glyph-name="N" horiz-adv-x="636" d="M97 0V659H145L423 194L497 63H501Q499 111 497 159T495 255V659H539V0H491L213 465L139 596H135Q137 548 139 503T141 409V0H97Z" /> +<glyph unicode="O" glyph-name="O" horiz-adv-x="652" d="M326 -12Q267 -12 217 12T131 82T75 190T55 332Q55 410 75 472T131 579T217 647T326 671Q386 671 436 648T522 580T578 473T598 332Q598 254 578 191T522 82T436 13T326 -12ZM326 30Q376 30 417 51T487 +112T533 207T549 332Q549 400 533 455T488 548T417 608T326 629Q276 629 235 608T164 549T119 455T103 332Q103 263 119 208T164 113T234 52T326 30Z" /> +<glyph unicode="P" glyph-name="P" horiz-adv-x="549" d="M97 0V659H263Q319 659 363 650T438 618T485 561T502 475Q502 378 440 331T267 283H143V0H97ZM143 322H256Q357 322 406 358T455 475Q455 558 405 589T252 620H143V322Z" /> +<glyph unicode="Q" glyph-name="Q" horiz-adv-x="652" d="M326 27Q376 27 417 49T487 110T533 206T549 332Q549 400 533 455T488 548T417 608T326 629Q276 629 235 608T164 549T119 455T103 332Q103 263 119 207T164 111T234 49T326 27ZM519 -156Q477 -156 443 +-145T381 -115T333 -69T300 -11Q246 -6 201 20T124 91T73 197T55 332Q55 410 75 472T131 579T217 647T326 671Q386 671 436 648T522 580T578 473T598 332Q598 258 580 197T530 92T452 21T351 -11Q374 -61 417 -87T523 -113Q546 -113 561 -111T590 -105L600 -144Q587 +-148 566 -152T519 -156Z" /> +<glyph unicode="R" glyph-name="R" horiz-adv-x="544" d="M97 0V659H286Q335 659 375 650T443 619T486 565T502 485Q502 406 457 361T333 306L515 0H462L283 303H143V0H97ZM143 341H274Q362 341 408 376T455 485Q455 559 408 589T274 620H143V341Z" /> +<glyph unicode="S" glyph-name="S" horiz-adv-x="521" d="M269 -12Q197 -12 141 15T46 87L76 119Q112 78 162 54T269 30Q345 30 389 66T433 162Q433 193 424 214T398 251T361 278T315 300L215 345Q194 354 170 367T127 399T94 445T81 509Q81 545 95 574T135 625T196 +659T273 671Q333 671 379 648T456 592L430 562Q401 592 362 610T273 629Q207 629 167 597T127 511Q127 482 138 462T166 428T203 403T241 384L341 340Q369 328 394 313T438 278T468 231T480 165Q480 127 465 95T423 39T356 2T269 -12Z" /> +<glyph unicode="T" glyph-name="T" horiz-adv-x="524" d="M239 0V619H29V659H495V619H285V0H239Z" /> +<glyph unicode="U" glyph-name="U" horiz-adv-x="634" d="M316 -12Q274 -12 234 0T163 43T114 125T95 253V659H141V258Q141 192 155 149T194 79T249 41T316 30Q352 30 384 41T441 78T481 148T496 258V659H539V253Q539 176 520 125T470 44T399 1T316 -12Z" /> +<glyph unicode="V" glyph-name="V" horiz-adv-x="491" d="M222 0L4 659H53L175 274Q194 214 209 164T245 53H249Q259 83 267 110T284 163T300 217T318 274L440 659H487L271 0H222Z" /> +<glyph unicode="W" glyph-name="W" horiz-adv-x="770" d="M178 0L28 659H76L159 271Q170 217 181 164T204 56H208Q220 110 232 163T259 271L362 659H409L512 271Q526 217 538 164T565 56H569Q580 110 590 163T612 271L695 659H740L593 0H542L422 452Q413 491 404 +526T387 601H383Q375 562 365 527T346 452L228 0H178Z" /> +<glyph unicode="X" glyph-name="X" horiz-adv-x="482" d="M17 0L215 341L31 659H81L189 465Q203 442 214 422T243 375H247Q261 402 271 422T296 465L404 659H451L267 339L465 0H415L300 202Q286 227 272 252T239 307H235Q219 277 206 252T179 202L64 0H17Z" /> +<glyph unicode="Y" glyph-name="Y" horiz-adv-x="447" d="M200 0V267L3 659H52L152 453Q169 417 185 382T222 311H226Q245 347 263 382T297 453L397 659H444L246 267V0H200Z" /> +<glyph unicode="Z" glyph-name="Z" horiz-adv-x="538" d="M50 0V27L429 619H83V659H487V632L107 40H490V0H50Z" /> +<glyph unicode="[" glyph-name="bracketleft" horiz-adv-x="279" d="M98 -152V708H258V679H133V-123H258V-152H98Z" /> +<glyph unicode="\" glyph-name="backslash" horiz-adv-x="357" d="M311 -160L5 710H43L349 -160H311Z" /> +<glyph unicode="]" glyph-name="bracketright" horiz-adv-x="279" d="M21 -152V-123H146V679H21V708H181V-152H21Z" /> +<glyph unicode="^" glyph-name="asciicircum" horiz-adv-x="479" d="M66 290L216 670H262L413 290H370L293 493L241 626H237L186 493L109 290H66Z" /> +<glyph unicode="_" glyph-name="underscore" horiz-adv-x="500" d="M12 -117V-79H488V-117H12Z" /> +<glyph unicode="`" glyph-name="grave" horiz-adv-x="535" d="M296 574L152 725L186 754L320 597L296 574Z" /> +<glyph unicode="a" glyph-name="a" horiz-adv-x="491" d="M197 -12Q168 -12 143 -4T99 20T69 61T58 120Q58 200 132 241T368 301Q368 328 364 355T347 404T312 439T254 453Q206 453 166 434T101 397L81 430Q94 439 112 450T154 470T204 485T260 492Q302 492 331 +478T378 438T404 380T412 307V0H374L370 62H367Q330 33 288 11T197 -12ZM205 26Q247 26 285 46T368 104V267Q294 258 243 245T161 214T117 173T103 122Q103 96 111 78T133 49T165 32T205 26Z" /> +<glyph unicode="b" glyph-name="b" horiz-adv-x="542" d="M280 -12Q245 -12 208 4T136 49H134L129 0H92V719H136V511L134 417Q171 448 213 470T300 492Q396 492 444 426T492 247Q492 186 475 138T429 57T361 6T280 -12ZM278 27Q314 27 345 43T398 88T432 157T445 +247Q445 291 437 329T410 394T363 437T293 453Q257 453 218 433T136 374V89Q176 55 213 41T278 27Z" /> +<glyph unicode="c" glyph-name="c" horiz-adv-x="449" d="M270 -12Q223 -12 184 5T115 54T69 132T52 239Q52 299 70 346T118 426T187 475T271 492Q321 492 354 474T412 433L386 402Q363 424 335 438T272 453Q235 453 204 438T149 394T112 326T98 239Q98 192 110 +153T145 86T200 43T272 27Q310 27 342 43T400 82L423 51Q392 24 354 6T270 -12Z" /> +<glyph unicode="d" glyph-name="d" horiz-adv-x="544" d="M251 -12Q160 -12 106 52T52 239Q52 297 69 344T115 424T183 474T265 492Q309 492 341 477T410 433L408 521V719H452V0H414L410 62H407Q378 33 339 11T251 -12ZM257 27Q297 27 333 47T408 106V391Q370 +425 337 439T268 453Q232 453 201 437T148 392T112 324T99 239Q99 191 109 152T140 86T189 43T257 27Z" /> +<glyph unicode="e" glyph-name="e" horiz-adv-x="483" d="M274 -12Q228 -12 188 5T117 54T70 133T52 239Q52 298 69 345T116 424T183 474T261 492Q347 492 396 434T445 270Q445 261 445 252T443 234H97Q98 189 111 151T147 85T204 42T278 26Q317 26 348 37T407 +69L425 35Q396 18 362 3T274 -12ZM97 270H403Q403 363 365 408T262 454Q231 454 203 442T153 405T116 347T97 270Z" /> +<glyph unicode="f" glyph-name="f" horiz-adv-x="263" d="M99 0V442H33V476L99 480V587Q99 659 130 695T218 731Q253 731 288 715L276 679Q261 687 247 690T218 693Q180 693 162 665T143 584V480H254V442H143V0H99Z" /> +<glyph unicode="g" glyph-name="g" horiz-adv-x="487" d="M249 -231Q158 -231 105 -195T52 -98Q52 -66 71 -36T123 18V22Q105 33 93 52T81 99Q81 131 99 153T133 187V191Q110 211 92 245T73 323Q73 360 86 391T122 444T176 479T242 492Q262 492 278 489T305 480H468V443H356Q379 +423 394 392T409 322Q409 285 396 254T361 201T308 166T242 153Q222 153 201 158T162 173Q146 160 135 144T123 104Q123 78 142 60T215 41H318Q399 41 437 15T476 -69Q476 -100 460 -129T415 -181T343 -217T249 -231ZM242 188Q267 188 289 197T329 225T356 268T366 +323Q366 353 356 378T330 420T290 446T242 456Q216 456 194 447T154 420T127 379T117 323Q117 293 127 268T154 225T194 198T242 188ZM254 -195Q294 -195 327 -185T383 -157T418 -119T431 -74Q431 -34 403 -18T320 -1H217Q209 -1 193 0T157 7Q124 -16 109 -42T94 +-94Q94 -139 135 -167T254 -195Z" /> +<glyph unicode="h" glyph-name="h" horiz-adv-x="528" d="M92 0V719H136V405Q174 443 213 467T302 492Q377 492 412 447T447 308V0H403V302Q403 379 378 415T293 452Q250 452 215 430T136 362V0H92Z" /> +<glyph unicode="i" glyph-name="i" horiz-adv-x="229" d="M92 0V480H136V0H92ZM115 596Q98 596 87 607T75 635Q75 654 86 664T115 675Q132 675 143 665T155 635Q155 618 144 607T115 596Z" /> +<glyph unicode="j" glyph-name="j" horiz-adv-x="229" d="M29 -229Q12 -229 -5 -226T-33 -217L-22 -181Q-13 -184 0 -187T28 -191Q68 -191 80 -162T92 -86V480H137V-89Q137 -160 111 -194T29 -229ZM115 596Q99 596 87 607T75 635Q75 654 87 664T115 675Q132 675 +144 665T156 635Q156 618 144 607T115 596Z" /> +<glyph unicode="k" glyph-name="k" horiz-adv-x="464" d="M92 0V719H136V189H138L375 480H426L270 290L452 0H403L244 257L136 131V0H92Z" /> +<glyph unicode="l" glyph-name="l" horiz-adv-x="237" d="M151 -12Q92 -12 92 64V719H136V58Q136 42 142 35T157 27Q160 27 163 27T175 29L183 -7Q176 -9 169 -10T151 -12Z" /> +<glyph unicode="m" glyph-name="m" horiz-adv-x="812" d="M92 0V480H130L134 406H137Q169 443 208 467T288 492Q346 492 377 466T421 394Q463 439 502 465T584 492Q728 492 728 308V0H683V302Q683 379 657 415T576 452Q511 452 432 362V0H388V302Q388 379 362 +415T280 452Q215 452 136 362V0H92Z" /> +<glyph unicode="n" glyph-name="n" horiz-adv-x="532" d="M92 0V480H130L134 406H137Q174 443 213 467T302 492Q377 492 412 447T447 308V0H403V302Q403 379 378 415T293 452Q250 452 215 430T136 362V0H92Z" /> +<glyph unicode="o" glyph-name="o" horiz-adv-x="535" d="M267 -12Q224 -12 185 5T117 54T70 132T52 239Q52 299 69 346T116 426T185 475T267 492Q310 492 349 475T418 426T465 347T483 239Q483 179 466 133T419 54T350 5T267 -12ZM267 27Q303 27 334 42T388 86T424 +153T437 239Q437 287 424 326T389 393T335 437T267 453Q231 453 200 438T147 394T111 326T98 239Q98 192 111 153T146 86T200 43T267 27Z" /> +<glyph unicode="p" glyph-name="p" horiz-adv-x="544" d="M92 -217V480H130L134 420H137Q172 448 213 470T300 492Q396 492 444 426T492 247Q492 186 475 138T429 57T361 6T280 -12Q246 -12 210 3T136 47V-217H92ZM278 27Q314 27 345 43T398 88T432 157T445 247Q445 +291 437 329T410 394T363 437T293 453Q257 453 219 433T136 374V89Q178 55 214 41T278 27Z" /> +<glyph unicode="q" glyph-name="q" horiz-adv-x="544" d="M408 -217V-32L410 63Q378 32 339 10T251 -12Q160 -12 106 52T52 239Q52 297 69 344T115 424T183 474T265 492Q309 492 341 477T408 436H410L415 480H452V-217H408ZM257 27Q297 27 333 47T408 106V391Q370 +425 337 439T268 453Q232 453 201 437T148 392T112 324T99 239Q99 191 109 152T140 86T189 43T257 27Z" /> +<glyph unicode="r" glyph-name="r" horiz-adv-x="317" d="M92 0V480H130L134 391H137Q161 436 195 464T273 492Q287 492 298 490T321 482L311 442Q299 447 290 448T267 450Q235 450 200 423T136 327V0H92Z" /> +<glyph unicode="s" glyph-name="s" horiz-adv-x="405" d="M208 -12Q154 -12 109 7T32 54L58 87Q89 61 124 44T211 26Q268 26 296 54T325 121Q325 143 315 160T287 189T250 210T208 227Q181 237 154 248T104 274T69 311T55 364Q55 390 65 413T95 454T143 482T210 +492Q248 492 284 478T347 442L323 411Q299 429 272 441T208 454Q180 454 160 447T127 427T107 399T100 367Q100 346 109 332T135 306T171 287T213 270Q241 259 269 248T319 221T356 182T370 123Q370 96 360 72T328 29T277 -1T208 -12Z" /> +<glyph unicode="t" glyph-name="t" horiz-adv-x="312" d="M223 -12Q188 -12 165 -2T128 28T109 74T103 133V442H28V476L104 480L110 619H148V480H287V442H148V129Q148 106 151 88T164 56T188 35T229 27Q243 27 259 31T289 42L301 6Q280 -2 259 -7T223 -12Z" /> +<glyph unicode="u" glyph-name="u" horiz-adv-x="529" d="M230 -12Q155 -12 120 33T85 172V480H129V178Q129 101 154 65T238 28Q281 28 316 51T393 126V480H437V0H400L395 80H393Q358 38 319 13T230 -12Z" /> +<glyph unicode="v" glyph-name="v" horiz-adv-x="434" d="M192 0L12 480H60L168 179Q179 144 192 109T216 41H220Q232 74 244 109T269 179L377 480H422L244 0H192Z" /> +<glyph unicode="w" glyph-name="w" horiz-adv-x="685" d="M166 0L24 480H72L158 169Q167 136 175 105T191 41H195Q203 73 212 104T230 169L317 480H370L457 169Q466 136 475 105T493 41H497Q505 73 514 104T531 169L616 480H661L523 0H465L381 298Q370 333 363 +366T344 435H340Q332 400 323 366T302 296L219 0H166Z" /> +<glyph unicode="x" glyph-name="x" horiz-adv-x="407" d="M14 0L177 251L27 480H76L154 358Q166 338 178 319T205 279H209Q222 299 233 318T258 358L333 480H379L230 247L393 0H344L259 131Q245 154 231 176T202 219H198Q184 198 171 176T143 131L61 0H14Z" /> +<glyph unicode="y" glyph-name="y" horiz-adv-x="436" d="M73 -219Q46 -219 24 -209L34 -170Q42 -173 52 -175T73 -178Q118 -178 148 -142T196 -51L209 -9L12 480H60L176 178Q187 148 200 112T228 44H232Q243 76 254 112T276 178L379 480H424L234 -60Q224 -90 +210 -119T176 -170T131 -205T73 -219Z" /> +<glyph unicode="z" glyph-name="z" horiz-adv-x="404" d="M27 0V24L311 442H58V480H368V457L85 39H378V0H27Z" /> +<glyph unicode="{" glyph-name="braceleft" horiz-adv-x="279" d="M224 -152Q196 -152 176 -146T141 -126T120 -87T113 -24Q113 32 117 80T121 181Q121 196 118 211T105 237T78 255T35 262V294Q61 294 78 301T104 319T117 344T121 373Q121 427 117 475T113 580Q113 +618 120 642T141 681T175 702T224 708H258V679H227Q181 679 166 654T150 576Q150 527 153 483T156 384Q156 339 146 314T105 280V276Q135 267 145 241T156 172Q156 118 153 74T150 -20Q150 -73 165 -98T227 -123H258V-152H224Z" /> +<glyph unicode="|" glyph-name="bar" horiz-adv-x="226" d="M95 -250V750H131V-250H95Z" /> +<glyph unicode="}" glyph-name="braceright" horiz-adv-x="279" d="M21 -152V-123H52Q98 -123 113 -98T129 -20Q129 29 126 73T123 172Q123 215 134 241T174 276V280Q145 289 134 314T123 384Q123 438 126 482T129 576Q129 629 114 654T52 679H21V708H55Q83 708 +103 702T138 682T159 643T166 580Q166 524 162 476T158 373Q158 358 161 344T174 319T201 301T244 294V262Q218 262 201 255T175 237T162 211T158 181Q158 129 162 81T166 -24Q166 -62 159 -86T138 -125T104 -146T55 -152H21Z" /> +<glyph unicode="~" glyph-name="asciitilde" horiz-adv-x="479" d="M329 266Q300 266 277 280T232 311T190 342T148 356Q125 356 106 342T69 293L40 311Q62 353 91 373T150 394Q179 394 202 380T247 349T289 318T331 304Q354 304 373 318T410 367L438 347Q417 +306 388 286T329 266Z" /> +<glyph unicode=" " glyph-name="uni00A0" horiz-adv-x="199" /> +<glyph unicode="¡" glyph-name="exclamdown" horiz-adv-x="259" d="M107 -190V-119L113 301H146L152 -119L153 -190H107ZM130 401Q113 401 100 413T87 448Q87 468 100 480T130 492Q147 492 159 480T172 448Q172 425 160 413T130 401Z" /> +<glyph unicode="¢" glyph-name="cent" horiz-adv-x="479" d="M107 311Q107 233 146 182T255 121V502Q223 497 196 481T149 441T118 383T107 311ZM255 -28V81Q213 85 178 102T117 148T77 219T62 311Q62 363 77 403T118 473T180 520T255 541V652H289V543Q337 +541 369 524T424 483L400 455Q377 476 349 490T289 504V119Q326 121 357 136T412 173L435 144Q406 117 370 100T289 80V-28H255Z" /> +<glyph unicode="£" glyph-name="sterling" horiz-adv-x="479" d="M57 0V27Q113 59 138 111T163 221Q163 240 161 258T154 293H54V326L120 329H144Q133 367 123 404T112 481Q112 560 157 605T282 651Q334 651 368 630T426 580L397 553Q376 578 349 595T282 +612Q251 612 228 602T189 574T165 532T157 481Q157 441 167 405T189 329H354V293H197Q201 276 203 259T205 221Q205 159 186 118T133 44V40H428V0H57Z" /> +<glyph unicode="¤" glyph-name="currency" horiz-adv-x="479" d="M57 114L31 142L96 209Q78 233 68 263T58 328Q58 365 68 395T96 450L31 518L57 546L123 477Q146 498 176 509T239 521Q271 521 301 510T355 477L422 546L448 518L382 450Q400 426 410 396T420 +328Q420 293 410 263T383 209L448 142L422 114L355 182Q332 160 302 149T239 137Q173 137 123 182L57 114ZM239 174Q267 174 292 185T335 217T365 265T376 328Q376 362 365 391T336 440T292 472T239 484Q211 484 186 473T143 441T113 391T102 328Q102 294 113 266T142 +217T186 186T239 174Z" /> +<glyph unicode="¥" glyph-name="yen" horiz-adv-x="479" d="M216 0V165H50V199H216V270H50V303H202L30 639H78L172 446Q188 413 204 380T238 309H242Q261 346 276 379T309 446L403 639H449L275 303H429V270H261V199H429V165H261V0H216Z" /> +<glyph unicode="¦" glyph-name="brokenbar" horiz-adv-x="226" d="M95 279V750H131V279H95ZM95 -250V220H131V-250H95Z" /> +<glyph unicode="§" glyph-name="section" horiz-adv-x="479" d="M92 355Q92 316 114 292T170 250T242 217T312 181Q348 198 367 219T387 281Q387 321 365 346T309 390T237 423T168 459Q134 439 113 416T92 355ZM233 -52Q181 -52 141 -35T72 11L102 39Q128 +15 157 0T233 -15Q279 -15 306 10T333 70Q333 104 312 125T260 163T192 193T124 228T71 277T50 352Q50 400 75 431T139 483Q124 498 115 518T106 564Q106 585 114 606T139 643T181 670T241 681Q283 681 318 666T381 628L357 597Q333 617 307 630T242 643Q217 643 +199 637T170 620T154 595T148 567Q148 534 169 514T221 477T288 446T356 411T408 360T429 284Q429 234 405 206T342 156Q358 140 367 120T376 72Q376 45 365 22T334 -17T288 -43T233 -52Z" /> +<glyph unicode="¨" glyph-name="dieresis" horiz-adv-x="535" d="M178 598Q162 598 152 608T141 635Q141 651 151 661T178 672Q194 672 204 662T215 635Q215 619 205 609T178 598ZM356 598Q340 598 330 608T319 635Q319 651 329 661T356 672Q372 672 382 +662T393 635Q393 619 383 609T356 598Z" /> +<glyph unicode="©" glyph-name="copyright" horiz-adv-x="741" d="M371 -12Q306 -12 248 12T146 79T77 184T51 322Q51 397 76 458T146 562T248 628T371 652Q435 652 493 629T595 562T664 458T690 322Q690 246 665 185T595 80T493 12T371 -12ZM371 19Q428 +19 479 41T570 102T632 198T655 322Q655 389 632 444T570 539T480 600T371 622Q313 622 262 601T171 540T109 445T86 322Q86 254 109 198T171 103T261 41T371 19ZM376 124Q340 124 309 137T253 176T215 238T201 322Q201 365 216 400T255 459T312 496T381 509Q421 +509 449 494T501 454L478 428Q455 450 433 461T380 472Q320 472 282 431T244 322Q244 247 280 204T378 161Q414 161 442 175T493 211L513 183Q486 159 455 142T376 124Z" /> +<glyph unicode="ª" glyph-name="ordfeminine" horiz-adv-x="337" d="M139 398Q96 398 69 421T42 489Q42 542 91 569T248 607Q248 626 245 643T233 672T212 692T178 699Q148 699 118 687T71 662L56 689Q76 702 109 716T182 731Q240 731 262 697T285 606V406H255L249 +445H245Q224 427 198 413T139 398ZM148 430Q196 430 248 479V581Q155 570 118 548T81 492Q81 460 99 445T148 430Z" /> +<glyph unicode="«" glyph-name="guillemotleft" horiz-adv-x="400" d="M180 72L43 233V271L180 432L205 411L82 252L205 91L180 72ZM321 72L184 233V271L321 432L346 411L223 252L346 91L321 72Z" /> +<glyph unicode="¬" glyph-name="logicalnot" horiz-adv-x="479" d="M404 110V311H34V349H445V110H404Z" /> +<glyph unicode="" glyph-name="uni00AD" horiz-adv-x="299" d="M40 230V269H260V230H40Z" /> +<glyph unicode="®" glyph-name="registered" horiz-adv-x="401" d="M200 324Q163 324 130 338T72 377T33 437T18 517Q18 561 32 597T72 658T130 698T200 712Q237 712 270 698T328 659T367 597T382 517Q382 473 368 438T329 377T271 338T200 324ZM200 353Q231 +353 259 365T307 399T339 451T351 517Q351 553 339 583T307 636T259 671T200 684Q168 684 141 672T93 637T61 584T49 517Q49 481 61 451T93 400T140 366T200 353ZM132 418V624H201Q216 624 229 621T254 611T271 591T278 560Q278 541 267 525T238 504L287 418H250L211 +494H164V418H132ZM164 521H193Q216 521 230 529T244 558Q244 575 234 585T196 596H164V521Z" /> +<glyph unicode="¯" glyph-name="overscore" horiz-adv-x="535" d="M144 606V642H390V606H144Z" /> +<glyph unicode="°" glyph-name="degree" horiz-adv-x="311" d="M156 447Q134 447 114 455T77 478T52 515T42 565Q42 593 51 615T77 652T113 676T156 684Q178 684 198 676T235 653T260 615T270 565Q270 537 261 515T235 478T199 455T156 447ZM156 479Q191 +479 213 503T236 565Q236 603 214 628T156 653Q121 653 99 628T76 565Q76 528 98 504T156 479Z" /> +<glyph unicode="±" glyph-name="plusminus" horiz-adv-x="479" d="M219 109V310H34V347H219V550H260V347H445V310H260V109H219ZM34 0V37H445V0H34Z" /> +<glyph unicode="²" glyph-name="two.sups" horiz-adv-x="362" d="M56 406V431Q106 477 142 513T202 578T237 631T249 681Q249 724 226 749T163 774Q136 774 113 756T72 712L47 735Q65 765 97 786T167 808Q221 808 254 778T288 685Q288 654 276 626T241 569T188 +509T119 440H311V406H56Z" /> +<glyph unicode="³" glyph-name="three.sups" horiz-adv-x="362" d="M177 394Q131 394 96 416T40 469L69 491Q87 462 115 445T178 427Q215 427 242 448T269 510Q269 548 232 569T131 590V618Q190 618 221 643T253 702Q253 734 231 754T170 775Q147 775 124 +761T81 723L56 745Q77 772 106 790T174 808Q223 808 257 781T292 705Q292 668 271 644T217 606Q235 603 251 595T280 575T300 547T308 509Q308 482 298 461T270 425T228 402T177 394Z" /> +<glyph unicode="´" glyph-name="acute" horiz-adv-x="535" d="M238 574L214 597L348 754L382 725L238 574Z" /> +<glyph unicode="µ" glyph-name="uni00B5" horiz-adv-x="543" d="M92 -180V480H136V178Q136 106 160 67T242 28Q261 28 279 31T317 46T356 80T397 139V480H441Q440 374 439 271T438 64Q438 45 446 36T468 27Q479 27 496 33L504 -3Q496 -7 486 -9T462 -12Q427 +-12 413 11T399 89H396Q365 37 327 13T245 -11Q208 -11 180 0T132 49Q132 8 132 -21T132 -76T134 -125T137 -180H92Z" /> +<glyph unicode="¶" glyph-name="paragraph" horiz-adv-x="515" d="M373 -80V659H419V-80H373ZM291 244Q236 244 190 255T111 291T60 355T42 451Q42 507 59 546T107 611T181 647T275 659H319V244H291Z" /> +<glyph unicode="·" glyph-name="middot" horiz-adv-x="219" d="M110 277Q93 277 80 289T67 322Q67 344 80 356T110 368Q127 368 139 356T152 322Q152 301 140 289T110 277Z" /> +<glyph unicode="¸" glyph-name="cedilla" horiz-adv-x="535" d="M199 -219L192 -189Q257 -185 281 -172T305 -136Q305 -114 287 -103T227 -85L268 2H303L273 -65Q305 -73 324 -88T344 -134Q344 -173 307 -193T199 -219Z" /> +<glyph unicode="¹" glyph-name="one.sups" horiz-adv-x="362" d="M176 406V730H94V757Q123 763 143 772T181 796H214V406H176Z" /> +<glyph unicode="º" glyph-name="ordmasculine" horiz-adv-x="360" d="M179 398Q149 398 122 409T76 442T45 495T33 565Q33 605 44 636T75 688T122 720T179 731Q209 731 236 720T282 688T313 636T325 565Q325 526 314 495T283 443T236 410T179 398ZM179 431Q228 +431 257 468T286 565Q286 625 257 662T179 699Q131 699 102 662T72 565Q72 505 101 468T179 431Z" /> +<glyph unicode="»" glyph-name="guillemotright" horiz-adv-x="400" d="M78 72L54 91L176 252L54 411L78 432L216 271V233L78 72ZM219 72L195 91L317 252L195 411L219 432L357 271V233L219 72Z" /> +<glyph unicode="¼" glyph-name="onequarter" horiz-adv-x="764" d="M156 269V593H74V620Q103 626 123 635T161 659H194V269H156ZM177 -12L545 671H583L216 -12H177ZM625 0V114H448V135L625 390H661V146H719V114H661V0H625ZM496 146H625V233L629 337H625L569 +254L496 146Z" /> +<glyph unicode="½" glyph-name="onehalf" horiz-adv-x="786" d="M156 269V593H74V620Q103 626 123 635T161 659H194V269H156ZM154 -12L522 671H560L193 -12H154ZM480 0V25Q530 71 566 107T626 172T661 225T673 275Q673 318 650 343T587 368Q560 368 537 350T496 +306L471 329Q489 359 521 380T591 402Q645 402 678 372T712 279Q712 248 700 220T665 163T612 103T543 34H735V0H480Z" /> +<glyph unicode="¾" glyph-name="threequarters" horiz-adv-x="783" d="M177 257Q131 257 96 279T40 332L69 354Q87 325 115 308T178 290Q215 290 242 311T269 373Q269 411 232 432T131 453V481Q190 481 221 506T253 565Q253 597 231 617T170 638Q147 638 +124 624T81 586L56 608Q77 635 106 653T174 671Q223 671 257 644T292 568Q292 531 271 507T217 469Q235 466 251 458T280 438T300 410T308 372Q308 345 298 324T270 288T228 265T177 257ZM224 -12L592 671H630L263 -12H224ZM644 0V114H467V135L644 390H680V146H738V114H680V0H644ZM515 +146H644V233L648 337H644L588 254L515 146Z" /> +<glyph unicode="¿" glyph-name="questiondown" horiz-adv-x="402" d="M206 -202Q169 -202 141 -191T92 -159T62 -110T51 -49Q51 -15 63 13T94 68T132 120T169 172T195 231T199 301H240Q245 260 237 227T212 165T176 111T138 62T108 11T96 -46Q96 -69 102 +-90T123 -127T158 -153T210 -163Q246 -163 279 -146T338 -99L366 -124Q337 -156 298 -179T206 -202ZM216 401Q199 401 187 413T174 448Q174 468 186 480T216 492Q233 492 245 480T258 448Q258 425 246 413T216 401Z" /> +<glyph unicode="À" glyph-name="Agrave" horiz-adv-x="526" d="M188 388L146 265H380L338 388Q318 447 300 501T265 616H261Q244 555 226 501T188 388ZM8 0L240 659H286L518 0H470L393 226H132L54 0H8ZM284 706L151 819L179 852L304 729L284 706Z" /> +<glyph unicode="Á" glyph-name="Aacute" horiz-adv-x="526" d="M188 388L146 265H380L338 388Q318 447 300 501T265 616H261Q244 555 226 501T188 388ZM8 0L240 659H286L518 0H470L393 226H132L54 0H8ZM242 706L222 729L347 852L375 819L242 706Z" /> +<glyph unicode="Â" glyph-name="Acircumflex" horiz-adv-x="526" d="M188 388L146 265H380L338 388Q318 447 300 501T265 616H261Q244 555 226 501T188 388ZM8 0L240 659H286L518 0H470L393 226H132L54 0H8ZM128 726L241 839H285L398 726L378 707L265 805H261L148 +707L128 726Z" /> +<glyph unicode="Ã" glyph-name="Atilde" horiz-adv-x="526" d="M188 388L146 265H380L338 388Q318 447 300 501T265 616H261Q244 555 226 501T188 388ZM8 0L240 659H286L518 0H470L393 226H132L54 0H8ZM340 718Q311 718 291 730T255 757T223 784T186 797Q164 +797 149 777T131 721L98 724Q100 771 122 802T186 834Q215 834 235 822T271 795T303 768T340 755Q362 755 376 776T395 832L428 829Q426 782 404 750T340 718Z" /> +<glyph unicode="Ä" glyph-name="Adieresis" horiz-adv-x="526" d="M188 388L146 265H380L338 388Q318 447 300 501T265 616H261Q244 555 226 501T188 388ZM8 0L240 659H286L518 0H470L393 226H132L54 0H8ZM165 725Q149 725 139 734T129 761Q129 778 139 788T165 +798Q181 798 191 788T202 761Q202 744 192 735T165 725ZM361 725Q345 725 335 734T324 761Q324 778 334 788T361 798Q377 798 387 788T397 761Q397 744 387 735T361 725Z" /> +<glyph unicode="Å" glyph-name="Aring" horiz-adv-x="526" d="M188 388L146 265H380L338 388Q318 447 300 501T265 616H261Q244 555 226 501T188 388ZM8 0L240 659H286L518 0H470L393 226H132L54 0H8ZM263 700Q225 700 200 723T175 785Q175 825 200 848T263 +871Q299 871 325 848T351 785Q351 747 325 724T263 700ZM263 726Q286 726 302 741T319 785Q319 814 303 829T263 845Q239 845 222 830T205 785Q205 756 222 741T263 726Z" /> +<glyph unicode="Æ" glyph-name="AE" horiz-adv-x="809" d="M283 388L210 255H411V619H407Q376 563 346 506T283 388ZM21 0L386 659H752V619H457V370H702V330H457V40H762V0H411V217H189L70 0H21Z" /> +<glyph unicode="Ç" glyph-name="Ccedilla" horiz-adv-x="564" d="M331 -12Q270 -12 219 12T132 80T75 188T55 331Q55 409 75 472T133 579T221 647T336 671Q394 671 438 647T508 592L481 561Q454 592 418 610T337 629Q283 629 240 608T166 549T119 455T103 +331Q103 262 119 207T165 112T237 52T333 30Q384 30 424 50T500 111L527 82Q489 38 442 13T331 -12ZM262 -219L255 -189Q320 -185 344 -172T368 -136Q368 -114 350 -103T290 -85L331 2H366L336 -65Q368 -73 387 -88T407 -134Q407 -173 370 -193T262 -219Z" /> +<glyph unicode="È" glyph-name="Egrave" horiz-adv-x="515" d="M97 0V659H458V619H143V370H407V330H143V40H468V0H97ZM303 706L170 819L198 852L323 729L303 706Z" /> +<glyph unicode="É" glyph-name="Eacute" horiz-adv-x="515" d="M97 0V659H458V619H143V370H407V330H143V40H468V0H97ZM261 706L241 729L366 852L394 819L261 706Z" /> +<glyph unicode="Ê" glyph-name="Ecircumflex" horiz-adv-x="515" d="M97 0V659H458V619H143V370H407V330H143V40H468V0H97ZM147 726L260 839H304L417 726L397 707L284 805H280L167 707L147 726Z" /> +<glyph unicode="Ë" glyph-name="Edieresis" horiz-adv-x="515" d="M97 0V659H458V619H143V370H407V330H143V40H468V0H97ZM184 725Q168 725 158 734T148 761Q148 778 158 788T184 798Q200 798 210 788T221 761Q221 744 211 735T184 725ZM380 725Q364 725 354 +734T343 761Q343 778 353 788T380 798Q396 798 406 788T416 761Q416 744 406 735T380 725Z" /> +<glyph unicode="Ì" glyph-name="Igrave" horiz-adv-x="240" d="M97 0V659H143V0H97ZM141 706L8 819L36 852L161 729L141 706Z" /> +<glyph unicode="Í" glyph-name="Iacute" horiz-adv-x="240" d="M97 0V659H143V0H97ZM99 706L79 729L204 852L232 819L99 706Z" /> +<glyph unicode="Î" glyph-name="Icircumflex" horiz-adv-x="240" d="M97 0V659H143V0H97ZM-15 726L98 839H142L255 726L235 707L122 805H118L5 707L-15 726Z" /> +<glyph unicode="Ï" glyph-name="Idieresis" horiz-adv-x="240" d="M97 0V659H143V0H97ZM22 725Q6 725 -4 734T-14 761Q-14 778 -4 788T22 798Q38 798 48 788T59 761Q59 744 49 735T22 725ZM218 725Q202 725 192 734T181 761Q181 778 191 788T218 798Q234 +798 244 788T254 761Q254 744 244 735T218 725Z" /> +<glyph unicode="Ð" glyph-name="Eth" horiz-adv-x="625" d="M37 332V363L118 365V659H271Q347 659 403 636T497 570T552 467T570 332Q570 257 552 196T497 91T404 24T272 0H118V332H37ZM164 39H266Q333 39 381 60T461 121T507 213T522 332Q522 396 507 449T461 +540T382 599T266 620H164V365H327V332H164V39Z" /> +<glyph unicode="Ñ" glyph-name="Ntilde" horiz-adv-x="636" d="M97 0V659H145L423 194L497 63H501Q499 111 497 159T495 255V659H539V0H491L213 465L139 596H135Q137 548 139 503T141 409V0H97ZM400 718Q371 718 351 730T315 757T283 784T246 797Q224 797 +209 777T191 721L158 724Q160 771 182 802T246 834Q275 834 295 822T331 795T363 768T400 755Q422 755 436 776T455 832L488 829Q486 782 464 750T400 718Z" /> +<glyph unicode="Ò" glyph-name="Ograve" horiz-adv-x="652" d="M326 -12Q267 -12 217 12T131 82T75 190T55 332Q55 410 75 472T131 579T217 647T326 671Q386 671 436 648T522 580T578 473T598 332Q598 254 578 191T522 82T436 13T326 -12ZM326 30Q376 30 +417 51T487 112T533 207T549 332Q549 400 533 455T488 548T417 608T326 629Q276 629 235 608T164 549T119 455T103 332Q103 263 119 208T164 113T234 52T326 30ZM347 706L214 819L242 852L367 729L347 706Z" /> +<glyph unicode="Ó" glyph-name="Oacute" horiz-adv-x="652" d="M326 -12Q267 -12 217 12T131 82T75 190T55 332Q55 410 75 472T131 579T217 647T326 671Q386 671 436 648T522 580T578 473T598 332Q598 254 578 191T522 82T436 13T326 -12ZM326 30Q376 30 +417 51T487 112T533 207T549 332Q549 400 533 455T488 548T417 608T326 629Q276 629 235 608T164 549T119 455T103 332Q103 263 119 208T164 113T234 52T326 30ZM305 706L285 729L410 852L438 819L305 706Z" /> +<glyph unicode="Ô" glyph-name="Ocircumflex" horiz-adv-x="652" d="M326 -12Q267 -12 217 12T131 82T75 190T55 332Q55 410 75 472T131 579T217 647T326 671Q386 671 436 648T522 580T578 473T598 332Q598 254 578 191T522 82T436 13T326 -12ZM326 30Q376 +30 417 51T487 112T533 207T549 332Q549 400 533 455T488 548T417 608T326 629Q276 629 235 608T164 549T119 455T103 332Q103 263 119 208T164 113T234 52T326 30ZM191 726L304 839H348L461 726L441 707L328 805H324L211 707L191 726Z" /> +<glyph unicode="Õ" glyph-name="Otilde" horiz-adv-x="652" d="M326 -12Q267 -12 217 12T131 82T75 190T55 332Q55 410 75 472T131 579T217 647T326 671Q386 671 436 648T522 580T578 473T598 332Q598 254 578 191T522 82T436 13T326 -12ZM326 30Q376 30 +417 51T487 112T533 207T549 332Q549 400 533 455T488 548T417 608T326 629Q276 629 235 608T164 549T119 455T103 332Q103 263 119 208T164 113T234 52T326 30ZM403 718Q374 718 354 730T318 757T286 784T249 797Q227 797 212 777T194 721L161 724Q163 771 185 +802T249 834Q278 834 298 822T334 795T366 768T403 755Q425 755 439 776T458 832L491 829Q489 782 467 750T403 718Z" /> +<glyph unicode="Ö" glyph-name="Odieresis" horiz-adv-x="652" d="M326 -12Q267 -12 217 12T131 82T75 190T55 332Q55 410 75 472T131 579T217 647T326 671Q386 671 436 648T522 580T578 473T598 332Q598 254 578 191T522 82T436 13T326 -12ZM326 30Q376 +30 417 51T487 112T533 207T549 332Q549 400 533 455T488 548T417 608T326 629Q276 629 235 608T164 549T119 455T103 332Q103 263 119 208T164 113T234 52T326 30ZM228 725Q212 725 202 734T192 761Q192 778 202 788T228 798Q244 798 254 788T265 761Q265 744 +255 735T228 725ZM424 725Q408 725 398 734T387 761Q387 778 397 788T424 798Q440 798 450 788T460 761Q460 744 450 735T424 725Z" /> +<glyph unicode="×" glyph-name="multiply" horiz-adv-x="479" d="M78 135L52 163L213 330L52 497L78 525L239 356L401 525L427 497L266 330L427 163L401 135L239 303L78 135Z" /> +<glyph unicode="Ø" glyph-name="Oslash" horiz-adv-x="652" d="M330 -12Q276 -12 231 8T150 65L84 -23L56 -1L126 93Q94 138 77 198T59 332Q59 410 79 472T135 579T221 647T330 671Q382 671 426 653T506 601L566 682L595 660L530 574Q565 529 583 469T602 +332Q602 254 582 191T526 82T440 13T330 -12ZM107 332Q107 271 119 221T155 132L478 565Q449 596 412 612T330 629Q280 629 239 608T168 549T123 455T107 332ZM330 30Q380 30 421 51T491 112T537 207T553 332Q553 395 540 446T501 535L177 101Q206 67 244 49T330 +30Z" /> +<glyph unicode="Ù" glyph-name="Ugrave" horiz-adv-x="634" d="M316 -12Q274 -12 234 0T163 43T114 125T95 253V659H141V258Q141 192 155 149T194 79T249 41T316 30Q352 30 384 41T441 78T481 148T496 258V659H539V253Q539 176 520 125T470 44T399 1T316 +-12ZM338 706L205 819L233 852L358 729L338 706Z" /> +<glyph unicode="Ú" glyph-name="Uacute" horiz-adv-x="634" d="M316 -12Q274 -12 234 0T163 43T114 125T95 253V659H141V258Q141 192 155 149T194 79T249 41T316 30Q352 30 384 41T441 78T481 148T496 258V659H539V253Q539 176 520 125T470 44T399 1T316 +-12ZM296 706L276 729L401 852L429 819L296 706Z" /> +<glyph unicode="Û" glyph-name="Ucircumflex" horiz-adv-x="634" d="M316 -12Q274 -12 234 0T163 43T114 125T95 253V659H141V258Q141 192 155 149T194 79T249 41T316 30Q352 30 384 41T441 78T481 148T496 258V659H539V253Q539 176 520 125T470 44T399 1T316 +-12ZM182 726L295 839H339L452 726L432 707L319 805H315L202 707L182 726Z" /> +<glyph unicode="Ü" glyph-name="Udieresis" horiz-adv-x="634" d="M316 -12Q274 -12 234 0T163 43T114 125T95 253V659H141V258Q141 192 155 149T194 79T249 41T316 30Q352 30 384 41T441 78T481 148T496 258V659H539V253Q539 176 520 125T470 44T399 1T316 +-12ZM219 725Q203 725 193 734T183 761Q183 778 193 788T219 798Q235 798 245 788T256 761Q256 744 246 735T219 725ZM415 725Q399 725 389 734T378 761Q378 778 388 788T415 798Q431 798 441 788T451 761Q451 744 441 735T415 725Z" /> +<glyph unicode="Ý" glyph-name="Yacute" horiz-adv-x="447" d="M200 0V267L3 659H52L152 453Q169 417 185 382T222 311H226Q245 347 263 382T297 453L397 659H444L246 267V0H200ZM202 706L182 729L307 852L335 819L202 706Z" /> +<glyph unicode="Þ" glyph-name="Thorn" horiz-adv-x="563" d="M97 0V659H143V542H277Q332 542 375 532T449 501T496 444T512 358Q512 261 450 214T277 166H143V0H97ZM143 205H266Q367 205 416 241T465 358Q465 440 416 471T266 503H143V205Z" /> +<glyph unicode="ß" glyph-name="germandbls" horiz-adv-x="542" d="M367 -12Q328 -12 294 2T231 39L253 72Q282 49 308 38T367 26Q392 26 411 34T442 56T461 88T468 125Q468 160 453 182T414 219T364 247T313 276T275 314T259 373Q259 409 274 435T308 484T341 +532T357 591Q357 635 334 663T262 691Q205 691 171 649T136 517V0H92V532Q92 625 138 677T263 729Q296 729 321 719T365 690T392 648T402 595Q402 556 387 529T353 478T319 431T303 377Q303 348 318 330T357 299T408 272T458 241T497 196T513 127Q513 97 502 72T472 +28T426 -1T367 -12Z" /> +<glyph unicode="à" glyph-name="agrave" horiz-adv-x="491" d="M197 -12Q168 -12 143 -4T99 20T69 61T58 120Q58 200 132 241T368 301Q368 328 364 355T347 404T312 439T254 453Q206 453 166 434T101 397L81 430Q94 439 112 450T154 470T204 485T260 492Q302 +492 331 478T378 438T404 380T412 307V0H374L370 62H367Q330 33 288 11T197 -12ZM205 26Q247 26 285 46T368 104V267Q294 258 243 245T161 214T117 173T103 122Q103 96 111 78T133 49T165 32T205 26ZM283 574L139 725L173 754L307 597L283 574Z" /> +<glyph unicode="á" glyph-name="aacute" horiz-adv-x="491" d="M197 -12Q168 -12 143 -4T99 20T69 61T58 120Q58 200 132 241T368 301Q368 328 364 355T347 404T312 439T254 453Q206 453 166 434T101 397L81 430Q94 439 112 450T154 470T204 485T260 492Q302 +492 331 478T378 438T404 380T412 307V0H374L370 62H367Q330 33 288 11T197 -12ZM205 26Q247 26 285 46T368 104V267Q294 258 243 245T161 214T117 173T103 122Q103 96 111 78T133 49T165 32T205 26ZM225 574L201 597L335 754L369 725L225 574Z" /> +<glyph unicode="â" glyph-name="acircumflex" horiz-adv-x="491" d="M197 -12Q168 -12 143 -4T99 20T69 61T58 120Q58 200 132 241T368 301Q368 328 364 355T347 404T312 439T254 453Q206 453 166 434T101 397L81 430Q94 439 112 450T154 470T204 485T260 +492Q302 492 331 478T378 438T404 380T412 307V0H374L370 62H367Q330 33 288 11T197 -12ZM205 26Q247 26 285 46T368 104V267Q294 258 243 245T161 214T117 173T103 122Q103 96 111 78T133 49T165 32T205 26ZM116 593L233 737H275L392 593L370 572L256 698H252L138 +572L116 593Z" /> +<glyph unicode="ã" glyph-name="atilde" horiz-adv-x="491" d="M197 -12Q168 -12 143 -4T99 20T69 61T58 120Q58 200 132 241T368 301Q368 328 364 355T347 404T312 439T254 453Q206 453 166 434T101 397L81 430Q94 439 112 450T154 470T204 485T260 492Q302 +492 331 478T378 438T404 380T412 307V0H374L370 62H367Q330 33 288 11T197 -12ZM205 26Q247 26 285 46T368 104V267Q294 258 243 245T161 214T117 173T103 122Q103 96 111 78T133 49T165 32T205 26ZM330 579Q301 579 282 594T246 627T215 660T178 675Q151 675 +139 648T124 582L90 584Q91 608 96 630T111 670T138 699T179 710Q207 710 226 695T262 662T294 629T331 614Q357 614 369 641T384 707L418 705Q416 682 412 660T397 619T370 590T330 579Z" /> +<glyph unicode="ä" glyph-name="adieresis" horiz-adv-x="491" d="M197 -12Q168 -12 143 -4T99 20T69 61T58 120Q58 200 132 241T368 301Q368 328 364 355T347 404T312 439T254 453Q206 453 166 434T101 397L81 430Q94 439 112 450T154 470T204 485T260 492Q302 +492 331 478T378 438T404 380T412 307V0H374L370 62H367Q330 33 288 11T197 -12ZM205 26Q247 26 285 46T368 104V267Q294 258 243 245T161 214T117 173T103 122Q103 96 111 78T133 49T165 32T205 26ZM165 598Q149 598 139 608T128 635Q128 651 138 661T165 672Q181 +672 191 662T202 635Q202 619 192 609T165 598ZM343 598Q327 598 317 608T306 635Q306 651 316 661T343 672Q359 672 369 662T380 635Q380 619 370 609T343 598Z" /> +<glyph unicode="å" glyph-name="aring" horiz-adv-x="491" d="M197 -12Q168 -12 143 -4T99 20T69 61T58 120Q58 200 132 241T368 301Q368 328 364 355T347 404T312 439T254 453Q206 453 166 434T101 397L81 430Q94 439 112 450T154 470T204 485T260 492Q302 +492 331 478T378 438T404 380T412 307V0H374L370 62H367Q330 33 288 11T197 -12ZM205 26Q247 26 285 46T368 104V267Q294 258 243 245T161 214T117 173T103 122Q103 96 111 78T133 49T165 32T205 26ZM254 548Q212 548 185 574T157 643Q157 686 184 712T254 739Q296 +739 323 713T351 643Q351 601 324 575T254 548ZM254 574Q281 574 300 592T319 643Q319 675 300 694T254 713Q227 713 208 694T189 643Q189 611 208 593T254 574Z" /> +<glyph unicode="æ" glyph-name="ae" horiz-adv-x="784" d="M205 -12Q176 -12 151 -4T107 20T76 60T65 119Q65 199 140 241T370 301Q370 328 366 355T350 404T315 439T257 453Q212 453 173 434T109 397L89 430Q102 439 120 450T160 470T208 485T261 492Q320 +492 354 460T401 372Q427 427 470 459T568 492Q653 492 699 434T746 270Q746 261 746 252T744 234H412Q412 189 425 151T461 86T515 43T583 27Q622 27 651 38T708 70L727 35Q713 26 698 18T665 3T626 -8T579 -12Q547 -12 521 -4T474 19T437 51T407 87Q359 41 305 +15T205 -12ZM212 26Q231 26 254 32T300 50T347 79T391 119Q380 141 375 173T370 240L369 267Q299 258 250 246T170 215T125 174T111 122Q111 70 141 48T212 26ZM412 268H705Q705 361 669 407T567 454Q537 454 511 441T464 403T430 344T412 268Z" /> +<glyph unicode="ç" glyph-name="ccedilla" horiz-adv-x="449" d="M270 -12Q223 -12 184 5T115 54T69 132T52 239Q52 299 70 346T118 426T187 475T271 492Q321 492 354 474T412 433L386 402Q363 424 335 438T272 453Q235 453 204 438T149 394T112 326T98 239Q98 +192 110 153T145 86T200 43T272 27Q310 27 342 43T400 82L423 51Q392 24 354 6T270 -12ZM188 -219L181 -189Q246 -185 270 -172T294 -136Q294 -114 276 -103T216 -85L257 2H292L262 -65Q294 -73 313 -88T333 -134Q333 -173 296 -193T188 -219Z" /> +<glyph unicode="è" glyph-name="egrave" horiz-adv-x="483" d="M274 -12Q228 -12 188 5T117 54T70 133T52 239Q52 298 69 345T116 424T183 474T261 492Q347 492 396 434T445 270Q445 261 445 252T443 234H97Q98 189 111 151T147 85T204 42T278 26Q317 26 +348 37T407 69L425 35Q396 18 362 3T274 -12ZM97 270H403Q403 363 365 408T262 454Q231 454 203 442T153 405T116 347T97 270ZM290 574L146 725L180 754L314 597L290 574Z" /> +<glyph unicode="é" glyph-name="eacute" horiz-adv-x="483" d="M274 -12Q228 -12 188 5T117 54T70 133T52 239Q52 298 69 345T116 424T183 474T261 492Q347 492 396 434T445 270Q445 261 445 252T443 234H97Q98 189 111 151T147 85T204 42T278 26Q317 26 +348 37T407 69L425 35Q396 18 362 3T274 -12ZM97 270H403Q403 363 365 408T262 454Q231 454 203 442T153 405T116 347T97 270ZM232 574L208 597L342 754L376 725L232 574Z" /> +<glyph unicode="ê" glyph-name="ecircumflex" horiz-adv-x="483" d="M274 -12Q228 -12 188 5T117 54T70 133T52 239Q52 298 69 345T116 424T183 474T261 492Q347 492 396 434T445 270Q445 261 445 252T443 234H97Q98 189 111 151T147 85T204 42T278 26Q317 +26 348 37T407 69L425 35Q396 18 362 3T274 -12ZM97 270H403Q403 363 365 408T262 454Q231 454 203 442T153 405T116 347T97 270ZM123 593L240 737H282L399 593L377 572L263 698H259L145 572L123 593Z" /> +<glyph unicode="ë" glyph-name="edieresis" horiz-adv-x="483" d="M274 -12Q228 -12 188 5T117 54T70 133T52 239Q52 298 69 345T116 424T183 474T261 492Q347 492 396 434T445 270Q445 261 445 252T443 234H97Q98 189 111 151T147 85T204 42T278 26Q317 +26 348 37T407 69L425 35Q396 18 362 3T274 -12ZM97 270H403Q403 363 365 408T262 454Q231 454 203 442T153 405T116 347T97 270ZM172 598Q156 598 146 608T135 635Q135 651 145 661T172 672Q188 672 198 662T209 635Q209 619 199 609T172 598ZM350 598Q334 598 +324 608T313 635Q313 651 323 661T350 672Q366 672 376 662T387 635Q387 619 377 609T350 598Z" /> +<glyph unicode="ì" glyph-name="igrave" horiz-adv-x="229" d="M92 0V480H136V0H92ZM143 574L-1 725L33 754L167 597L143 574Z" /> +<glyph unicode="í" glyph-name="iacute" horiz-adv-x="229" d="M92 0V480H136V0H92ZM85 574L61 597L195 754L229 725L85 574Z" /> +<glyph unicode="î" glyph-name="icircumflex" horiz-adv-x="229" d="M92 0V480H136V0H92ZM-24 593L93 737H135L252 593L230 572L116 698H112L-2 572L-24 593Z" /> +<glyph unicode="ï" glyph-name="idieresis" horiz-adv-x="229" d="M92 0V480H136V0H92ZM25 598Q9 598 -1 608T-12 635Q-12 651 -2 661T25 672Q41 672 51 662T62 635Q62 619 52 609T25 598ZM203 598Q187 598 177 608T166 635Q166 651 176 661T203 672Q219 +672 229 662T240 635Q240 619 230 609T203 598Z" /> +<glyph unicode="ð" glyph-name="eth" horiz-adv-x="535" d="M267 -12Q227 -12 190 4T124 49T78 122T60 219Q60 268 75 309T117 380T183 425T267 442Q310 442 348 423T415 366Q401 440 371 493T299 588L157 515L142 542L274 610Q246 634 215 654T151 694L173 +724Q210 704 244 681T311 629L453 703L468 676L334 607Q394 546 432 460T470 252Q470 192 455 143T414 60T350 7T267 -12ZM267 27Q308 27 337 44T386 92T415 163T425 251Q425 283 422 313Q403 341 384 359T345 387T307 400T269 404Q228 404 198 389T146 349T115 +290T104 219Q104 177 117 142T152 81T204 41T267 27Z" /> +<glyph unicode="ñ" glyph-name="ntilde" horiz-adv-x="532" d="M92 0V480H130L134 406H137Q174 443 213 467T302 492Q377 492 412 447T447 308V0H403V302Q403 379 378 415T293 452Q250 452 215 430T136 362V0H92ZM359 579Q330 579 311 594T275 627T244 660T207 +675Q180 675 168 648T153 582L119 584Q120 608 125 630T140 670T167 699T208 710Q236 710 255 695T291 662T323 629T360 614Q386 614 398 641T413 707L447 705Q445 682 441 660T426 619T399 590T359 579Z" /> +<glyph unicode="ò" glyph-name="ograve" horiz-adv-x="535" d="M267 -12Q224 -12 185 5T117 54T70 132T52 239Q52 299 69 346T116 426T185 475T267 492Q310 492 349 475T418 426T465 347T483 239Q483 179 466 133T419 54T350 5T267 -12ZM267 27Q303 27 334 +42T388 86T424 153T437 239Q437 287 424 326T389 393T335 437T267 453Q231 453 200 438T147 394T111 326T98 239Q98 192 111 153T146 86T200 43T267 27ZM296 574L152 725L186 754L320 597L296 574Z" /> +<glyph unicode="ó" glyph-name="oacute" horiz-adv-x="535" d="M267 -12Q224 -12 185 5T117 54T70 132T52 239Q52 299 69 346T116 426T185 475T267 492Q310 492 349 475T418 426T465 347T483 239Q483 179 466 133T419 54T350 5T267 -12ZM267 27Q303 27 334 +42T388 86T424 153T437 239Q437 287 424 326T389 393T335 437T267 453Q231 453 200 438T147 394T111 326T98 239Q98 192 111 153T146 86T200 43T267 27ZM238 574L214 597L348 754L382 725L238 574Z" /> +<glyph unicode="ô" glyph-name="ocircumflex" horiz-adv-x="535" d="M267 -12Q224 -12 185 5T117 54T70 132T52 239Q52 299 69 346T116 426T185 475T267 492Q310 492 349 475T418 426T465 347T483 239Q483 179 466 133T419 54T350 5T267 -12ZM267 27Q303 +27 334 42T388 86T424 153T437 239Q437 287 424 326T389 393T335 437T267 453Q231 453 200 438T147 394T111 326T98 239Q98 192 111 153T146 86T200 43T267 27ZM129 593L246 737H288L405 593L383 572L269 698H265L151 572L129 593Z" /> +<glyph unicode="õ" glyph-name="otilde" horiz-adv-x="535" d="M267 -12Q224 -12 185 5T117 54T70 132T52 239Q52 299 69 346T116 426T185 475T267 492Q310 492 349 475T418 426T465 347T483 239Q483 179 466 133T419 54T350 5T267 -12ZM267 27Q303 27 334 +42T388 86T424 153T437 239Q437 287 424 326T389 393T335 437T267 453Q231 453 200 438T147 394T111 326T98 239Q98 192 111 153T146 86T200 43T267 27ZM343 579Q314 579 295 594T259 627T228 660T191 675Q164 675 152 648T137 582L103 584Q104 608 109 630T124 +670T151 699T192 710Q220 710 239 695T275 662T307 629T344 614Q370 614 382 641T397 707L431 705Q429 682 425 660T410 619T383 590T343 579Z" /> +<glyph unicode="ö" glyph-name="odieresis" horiz-adv-x="535" d="M267 -12Q224 -12 185 5T117 54T70 132T52 239Q52 299 69 346T116 426T185 475T267 492Q310 492 349 475T418 426T465 347T483 239Q483 179 466 133T419 54T350 5T267 -12ZM267 27Q303 27 +334 42T388 86T424 153T437 239Q437 287 424 326T389 393T335 437T267 453Q231 453 200 438T147 394T111 326T98 239Q98 192 111 153T146 86T200 43T267 27ZM178 598Q162 598 152 608T141 635Q141 651 151 661T178 672Q194 672 204 662T215 635Q215 619 205 609T178 +598ZM356 598Q340 598 330 608T319 635Q319 651 329 661T356 672Q372 672 382 662T393 635Q393 619 383 609T356 598Z" /> +<glyph unicode="÷" glyph-name="divide" horiz-adv-x="479" d="M34 311V349H445V311H34ZM239 109Q223 109 212 120T201 150Q201 167 212 178T239 189Q256 189 266 178T277 150Q277 131 267 120T239 109ZM239 469Q223 469 212 480T201 510Q201 527 212 538T239 +549Q256 549 266 538T277 510Q277 491 267 480T239 469Z" /> +<glyph unicode="ø" glyph-name="oslash" horiz-adv-x="535" d="M267 -12Q185 -12 126 44L72 -22L46 -1L104 69Q80 101 66 143T52 239Q52 299 69 346T116 426T185 475T267 492Q307 492 343 478T409 436L463 501L489 480L431 411Q455 379 469 336T483 239Q483 +179 466 133T419 54T350 5T267 -12ZM97 240Q97 159 133 103L382 403Q336 454 267 454Q231 454 200 439T146 395T110 327T97 240ZM267 26Q303 26 334 41T389 85T425 152T438 238Q438 320 402 376L153 76Q200 26 267 26Z" /> +<glyph unicode="ù" glyph-name="ugrave" horiz-adv-x="529" d="M230 -12Q155 -12 120 33T85 172V480H129V178Q129 101 154 65T238 28Q281 28 316 51T393 126V480H437V0H400L395 80H393Q358 38 319 13T230 -12ZM293 574L149 725L183 754L317 597L293 574Z" /> +<glyph unicode="ú" glyph-name="uacute" horiz-adv-x="529" d="M230 -12Q155 -12 120 33T85 172V480H129V178Q129 101 154 65T238 28Q281 28 316 51T393 126V480H437V0H400L395 80H393Q358 38 319 13T230 -12ZM235 574L211 597L345 754L379 725L235 574Z" /> +<glyph unicode="û" glyph-name="ucircumflex" horiz-adv-x="529" d="M230 -12Q155 -12 120 33T85 172V480H129V178Q129 101 154 65T238 28Q281 28 316 51T393 126V480H437V0H400L395 80H393Q358 38 319 13T230 -12ZM126 593L243 737H285L402 593L380 572L266 +698H262L148 572L126 593Z" /> +<glyph unicode="ü" glyph-name="udieresis" horiz-adv-x="529" d="M230 -12Q155 -12 120 33T85 172V480H129V178Q129 101 154 65T238 28Q281 28 316 51T393 126V480H437V0H400L395 80H393Q358 38 319 13T230 -12ZM175 598Q159 598 149 608T138 635Q138 651 +148 661T175 672Q191 672 201 662T212 635Q212 619 202 609T175 598ZM353 598Q337 598 327 608T316 635Q316 651 326 661T353 672Q369 672 379 662T390 635Q390 619 380 609T353 598Z" /> +<glyph unicode="ý" glyph-name="yacute" horiz-adv-x="436" d="M73 -219Q46 -219 24 -209L34 -170Q42 -173 52 -175T73 -178Q118 -178 148 -142T196 -51L209 -9L12 480H60L176 178Q187 148 200 112T228 44H232Q243 76 254 112T276 178L379 480H424L234 -60Q224 +-90 210 -119T176 -170T131 -205T73 -219ZM200 574L176 597L310 754L344 725L200 574Z" /> +<glyph unicode="þ" glyph-name="thorn" horiz-adv-x="544" d="M92 -217V719H136V421Q172 449 213 470T299 492Q347 492 383 475T444 425T480 348T492 247Q492 186 475 138T429 57T361 6T280 -12Q245 -12 210 3T136 46V-217H92ZM278 27Q314 27 345 43T398 +88T432 157T445 247Q445 291 437 329T410 394T363 437T293 453Q257 453 219 433T136 374V89Q178 55 214 41T278 27Z" /> +<glyph unicode="ÿ" glyph-name="ydieresis" horiz-adv-x="436" d="M73 -219Q46 -219 24 -209L34 -170Q42 -173 52 -175T73 -178Q118 -178 148 -142T196 -51L209 -9L12 480H60L176 178Q187 148 200 112T228 44H232Q243 76 254 112T276 178L379 480H424L234 +-60Q224 -90 210 -119T176 -170T131 -205T73 -219ZM140 598Q124 598 114 608T103 635Q103 651 113 661T140 672Q156 672 166 662T177 635Q177 619 167 609T140 598ZM318 598Q302 598 292 608T281 635Q281 651 291 661T318 672Q334 672 344 662T355 635Q355 619 +345 609T318 598Z" /> +<glyph unicode="–" glyph-name="endash" horiz-adv-x="480" d="M40 232V268H440V232H40Z" /> +<glyph unicode="—" glyph-name="emdash" horiz-adv-x="800" d="M40 232V268H760V232H40Z" /> +<glyph unicode="‘" glyph-name="quoteleft" horiz-adv-x="219" d="M102 480Q82 480 70 497T58 547Q58 601 80 639T143 703L161 680Q128 653 111 626T94 556Q96 557 102 557Q117 557 129 548T142 520Q142 501 131 491T102 480Z" /> +<glyph unicode="’" glyph-name="quoteright" horiz-adv-x="219" d="M76 477L58 500Q91 527 108 554T125 624Q123 623 117 623Q103 623 91 632T78 660Q78 679 89 689T117 700Q137 700 149 683T162 633Q162 579 140 541T76 477Z" /> +<glyph unicode="‚" glyph-name="quotesinglbase" horiz-adv-x="219" d="M76 -130L58 -107Q91 -80 108 -53T125 17Q123 16 117 16Q103 16 91 25T78 53Q78 72 89 82T117 93Q137 93 149 76T162 26Q162 -28 140 -66T76 -130Z" /> +<glyph unicode="“" glyph-name="quotedblleft" horiz-adv-x="360" d="M102 480Q82 480 70 497T58 547Q58 601 80 639T143 703L161 680Q128 653 111 626T94 556Q96 557 102 557Q117 557 129 548T142 520Q142 501 131 491T102 480ZM243 480Q223 480 211 497T199 +547Q199 601 221 639T284 703L302 680Q269 653 252 626T235 556Q237 557 243 557Q258 557 270 548T283 520Q283 501 272 491T243 480Z" /> +<glyph unicode="”" glyph-name="quotedblright" horiz-adv-x="360" d="M76 477L58 500Q91 527 108 554T125 624Q123 623 117 623Q103 623 91 632T78 660Q78 679 89 689T117 700Q137 700 149 683T162 633Q162 579 140 541T76 477ZM217 477L199 500Q232 527 +249 554T266 624Q264 623 258 623Q244 623 232 632T219 660Q219 679 230 689T258 700Q278 700 290 683T303 633Q303 579 281 541T217 477Z" /> +<glyph unicode="„" glyph-name="quotedblbase" horiz-adv-x="360" d="M76 -130L58 -107Q91 -80 108 -53T125 17Q123 16 117 16Q103 16 91 25T78 53Q78 72 89 82T117 93Q137 93 149 76T162 26Q162 -28 140 -66T76 -130ZM217 -130L199 -107Q232 -80 249 -53T266 +17Q264 16 258 16Q244 16 232 25T219 53Q219 72 230 82T258 93Q278 93 290 76T303 26Q303 -28 281 -66T217 -130Z" /> +<glyph unicode="•" glyph-name="bullet" horiz-adv-x="281" d="M140 154Q121 154 103 161T71 183T49 218T40 264Q40 289 48 309T71 344T103 366T140 374Q159 374 177 366T210 344T232 310T241 264Q241 238 233 218T210 184T178 162T140 154Z" /> +<glyph unicode="‹" glyph-name="guilsinglleft" horiz-adv-x="259" d="M180 72L43 233V271L180 432L205 411L82 252L205 91L180 72Z" /> +<glyph unicode="›" glyph-name="guilsinglright" horiz-adv-x="259" d="M78 72L54 91L176 252L54 411L78 432L216 271V233L78 72Z" /> +</font> +</defs> +</svg> diff --git a/static/fonts/sourcesanspro/Source_Sans_Pro_300.ttf b/static/fonts/sourcesanspro/Source_Sans_Pro_300.ttf new file mode 100644 index 000000000..f9f9a3a0b Binary files /dev/null and b/static/fonts/sourcesanspro/Source_Sans_Pro_300.ttf differ diff --git a/static/fonts/sourcesanspro/Source_Sans_Pro_300.woff b/static/fonts/sourcesanspro/Source_Sans_Pro_300.woff new file mode 100644 index 000000000..7ceadfc81 Binary files /dev/null and b/static/fonts/sourcesanspro/Source_Sans_Pro_300.woff differ diff --git a/static/fonts/sourcesanspro/Source_Sans_Pro_300.woff2 b/static/fonts/sourcesanspro/Source_Sans_Pro_300.woff2 new file mode 100644 index 000000000..bfb4050ba Binary files /dev/null and b/static/fonts/sourcesanspro/Source_Sans_Pro_300.woff2 differ diff --git a/static/fonts/sourcesanspro/Source_Sans_Pro_400.eot b/static/fonts/sourcesanspro/Source_Sans_Pro_400.eot new file mode 100644 index 000000000..c5262239d Binary files /dev/null and b/static/fonts/sourcesanspro/Source_Sans_Pro_400.eot differ diff --git a/static/fonts/sourcesanspro/Source_Sans_Pro_400.svg b/static/fonts/sourcesanspro/Source_Sans_Pro_400.svg new file mode 100644 index 000000000..64f90f599 --- /dev/null +++ b/static/fonts/sourcesanspro/Source_Sans_Pro_400.svg @@ -0,0 +1,344 @@ +<?xml version="1.0" standalone="no"?> +<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> +<svg xmlns="http://www.w3.org/2000/svg"> +<defs > +<font id="SourceSansPro" horiz-adv-x="522" ><font-face + font-family="Source Sans Pro" + units-per-em="1000" + panose-1="2 11 5 3 3 4 3 2 2 4" + ascent="984" + descent="-273" + alphabetic="0" /> +<glyph unicode=" " glyph-name="space" horiz-adv-x="200" /> +<glyph unicode="!" glyph-name="exclam" horiz-adv-x="289" d="M116 198L105 576L103 670H186L184 576L173 198H116ZM145 -12Q120 -12 103 5T85 50Q85 79 102 96T145 114Q169 114 186 97T204 50Q204 23 187 6T145 -12Z" /> +<glyph unicode=""" glyph-name="quotedbl" horiz-adv-x="425" d="M99 431L83 598L80 690H168L165 598L149 431H99ZM275 431L259 598L256 690H344L341 598L325 431H275Z" /> +<glyph unicode="#" glyph-name="numbersign" horiz-adv-x="497" d="M90 0L115 204H35V261H122L140 409H55V467H147L170 650H223L200 467H333L357 650H410L386 467H467V409H380L362 261H447V204H355L330 0H277L301 204H169L144 0H90ZM176 261H308L326 409H194L176 261Z" /> +<glyph unicode="$" glyph-name="dollar" horiz-adv-x="497" d="M222 -110V-11Q174 -6 129 15T52 66L90 123Q122 95 160 76T245 56Q301 56 328 84T356 159Q356 199 336 225T284 271T217 308T149 347T98 400T77 481Q77 548 116 592T222 647V748H282V649Q330 644 +363 623T424 573L380 524Q352 551 326 566T258 581Q212 581 185 555T158 485Q158 449 178 426T230 386T297 352T365 312T416 254T437 165Q437 93 396 47T282 -9V-110H222Z" /> +<glyph unicode="%" glyph-name="percent" horiz-adv-x="824" d="M184 254Q116 254 76 308T35 462Q35 561 75 614T184 668Q251 668 292 615T333 462Q333 362 292 308T184 254ZM184 305Q222 305 246 344T270 462Q270 540 246 578T184 617Q145 617 121 579T97 462Q97 +384 121 345T184 305ZM202 -12L564 668H620L258 -12H202ZM641 -12Q573 -12 533 42T492 196Q492 295 532 348T641 402Q708 402 749 349T790 196Q790 96 749 42T641 -12ZM641 39Q679 39 703 78T727 196Q727 274 703 312T641 351Q602 351 578 313T554 196Q554 118 +578 79T641 39Z" /> +<glyph unicode="&" glyph-name="ampersand" horiz-adv-x="609" d="M232 -12Q187 -12 151 1T88 39T47 96T32 170Q32 203 42 230T71 280T112 322T161 359Q141 400 130 438T118 513Q118 546 129 574T160 623T208 656T270 668Q331 668 365 632T399 538Q399 506 +386 479T352 429T305 385T251 344Q283 293 326 246T417 160Q447 201 470 249T509 354H586Q566 289 538 230T471 119Q505 96 536 80T594 56L572 -12Q537 -2 499 16T421 63Q383 29 337 9T232 -12ZM189 514Q189 487 197 458T220 399Q242 414 262 429T298 461T323 496T332 +537Q332 566 318 587T270 609Q233 609 211 582T189 514ZM241 54Q275 54 306 68T366 107Q318 149 274 198T194 302Q159 274 136 244T112 175Q112 148 122 126T149 87T190 63T241 54Z" /> +<glyph unicode="'" glyph-name="quotesingle" horiz-adv-x="249" d="M99 431L83 598L80 690H168L165 598L149 431H99Z" /> +<glyph unicode="(" glyph-name="parenleft" horiz-adv-x="303" d="M214 -176Q152 -76 117 35T82 278Q82 410 117 520T214 732L265 708Q207 612 179 503T150 278Q150 163 178 54T265 -152L214 -176Z" /> +<glyph unicode=")" glyph-name="parenright" horiz-adv-x="303" d="M89 -176L38 -152Q96 -56 124 53T153 278Q153 393 125 502T38 708L89 732Q151 631 186 521T221 278Q221 146 186 35T89 -176Z" /> +<glyph unicode="*" glyph-name="asterisk" horiz-adv-x="418" d="M138 420L98 449L155 543L58 583L73 629L175 604L184 712H233L242 605L345 629L360 583L263 543L319 449L280 420L209 506L138 420Z" /> +<glyph unicode="+" glyph-name="plus" horiz-adv-x="497" d="M216 104V299H34V361H216V556H281V361H463V299H281V104H216Z" /> +<glyph unicode="," glyph-name="comma" horiz-adv-x="249" d="M67 -170L47 -122Q90 -103 114 -72T137 0Q134 -1 127 -1Q103 -1 86 13T68 56Q68 83 86 98T129 114Q161 114 179 88T198 17Q198 -48 163 -96T67 -170Z" /> +<glyph unicode="-" glyph-name="hyphen" horiz-adv-x="311" d="M41 219V282H271V219H41Z" /> +<glyph unicode="." glyph-name="period" horiz-adv-x="249" d="M125 -12Q100 -12 83 5T65 50Q65 79 82 96T125 114Q149 114 166 97T184 50Q184 23 167 6T125 -12Z" /> +<glyph unicode="/" glyph-name="slash" horiz-adv-x="350" d="M10 -160L277 710H337L70 -160H10Z" /> +<glyph unicode="0" glyph-name="zero" horiz-adv-x="497" d="M249 -12Q152 -12 98 74T44 321Q44 482 98 566T249 650Q345 650 399 566T453 321Q453 160 399 74T249 -12ZM249 54Q277 54 299 69T338 117T364 200T373 321Q373 391 364 441T339 522T300 569T249 584Q221 +584 198 569T159 523T133 441T124 321Q124 181 158 118T249 54Z" /> +<glyph unicode="1" glyph-name="one" horiz-adv-x="497" d="M79 0V68H225V538H109V591Q153 599 185 610T244 638H307V68H439V0H79Z" /> +<glyph unicode="2" glyph-name="two" horiz-adv-x="497" d="M40 0V49Q112 121 168 179T262 286T320 377T340 458Q340 513 310 548T219 583Q179 583 145 561T83 506L36 553Q76 597 121 623T229 650Q318 650 369 599T420 462Q420 417 401 372T347 278T265 177T160 +65Q186 67 214 69T267 71H452V0H40Z" /> +<glyph unicode="3" glyph-name="three" horiz-adv-x="497" d="M236 -12Q198 -12 167 -5T109 15T63 44T26 78L68 132Q97 102 135 79T231 56Q289 56 326 87T363 173Q363 201 353 224T318 265T255 291T159 300V363Q210 363 244 372T300 397T331 435T340 482Q340 529 +311 556T230 583Q190 583 157 565T94 518L50 570Q87 605 131 627T233 650Q275 650 310 639T370 608T410 557T424 488Q424 430 392 393T308 336V332Q337 325 362 312T406 278T435 230T446 170Q446 128 430 94T385 37T318 1T236 -12Z" /> +<glyph unicode="4" glyph-name="four" horiz-adv-x="497" d="M304 0V176H17V230L290 638H382V242H469V176H382V0H304ZM104 242H304V427Q304 453 305 488T309 550H305Q293 527 280 505T253 460L104 242Z" /> +<glyph unicode="5" glyph-name="five" horiz-adv-x="497" d="M234 -12Q196 -12 165 -5T108 15T62 42T25 75L65 129Q93 100 131 78T226 56Q255 56 280 66T325 96T355 142T366 202Q366 268 329 305T230 342Q197 342 174 332T121 303L77 331L98 638H417V567H170L153 +378Q176 390 199 397T251 404Q292 404 328 392T391 356T433 294T449 204Q449 152 431 112T383 45T315 3T234 -12Z" /> +<glyph unicode="6" glyph-name="six" horiz-adv-x="497" d="M268 -12Q221 -12 181 7T112 64T65 160T48 295Q48 391 68 458T122 568T199 630T291 650Q343 650 380 631T445 582L399 531Q379 554 352 567T294 581Q261 581 231 567T178 521T141 438T126 310Q156 347 +196 368T275 390Q358 390 407 341T457 193Q457 147 442 110T401 45T341 3T268 -12ZM268 53Q292 53 312 63T347 91T370 135T379 193Q379 256 350 292T261 328Q230 328 194 309T128 244Q136 150 171 102T268 53Z" /> +<glyph unicode="7" glyph-name="seven" horiz-adv-x="497" d="M177 0Q181 90 193 165T226 307T281 438T362 567H44V638H455V587Q398 515 363 449T306 315T276 170T262 0H177Z" /> +<glyph unicode="8" glyph-name="eight" horiz-adv-x="497" d="M250 -12Q205 -12 167 1T101 37T57 93T41 163Q41 194 51 220T78 268T116 306T161 335V339Q126 364 99 399T72 486Q72 523 86 553T124 604T181 638T253 650Q295 650 328 638T384 603T420 549T433 480Q433 +455 425 432T404 389T376 353T345 326V322Q366 310 386 295T421 260T446 215T456 158Q456 122 441 91T399 37T334 1T250 -12ZM295 348Q327 377 344 409T362 476Q362 524 333 556T251 589Q206 589 177 561T148 486Q148 457 160 437T192 400T239 372T295 348ZM252 +49Q308 49 342 80T377 161Q377 192 363 214T325 252T270 282T204 310Q166 284 141 250T115 171Q115 144 125 122T154 84T198 58T252 49Z" /> +<glyph unicode="9" glyph-name="nine" horiz-adv-x="497" d="M235 310Q267 310 302 330T369 395Q361 489 325 537T228 585Q205 585 185 575T149 547T126 502T117 445Q117 382 146 346T235 310ZM205 -12Q154 -12 116 7T51 55L97 107Q117 84 144 70T202 56Q236 56 +266 70T319 116T356 201T371 330Q341 292 301 270T221 248Q138 248 89 297T40 445Q40 491 55 528T95 593T155 635T228 650Q275 650 315 631T385 574T431 478T448 343Q448 247 428 180T374 70T297 8T205 -12Z" /> +<glyph unicode=":" glyph-name="colon" horiz-adv-x="249" d="M125 349Q100 349 83 366T65 411Q65 440 82 457T125 475Q149 475 166 458T184 411Q184 384 167 367T125 349ZM125 -12Q100 -12 83 5T65 50Q65 79 82 96T125 114Q149 114 166 97T184 50Q184 23 167 6T125 -12Z" /> +<glyph unicode=";" glyph-name="semicolon" horiz-adv-x="249" d="M125 349Q100 349 83 366T65 411Q65 440 82 457T125 475Q149 475 166 458T184 411Q184 384 167 367T125 349ZM67 -170L47 -122Q90 -103 114 -72T137 0Q134 -1 127 -1Q103 -1 86 13T68 56Q68 83 +86 98T129 114Q161 114 179 88T198 17Q198 -48 163 -96T67 -170Z" /> +<glyph unicode="<" glyph-name="less" horiz-adv-x="497" d="M463 131L34 299V365L463 533V462L252 384L118 334V330L252 280L463 202V131Z" /> +<glyph unicode="=" glyph-name="equal" horiz-adv-x="497" d="M34 406V468H463V406H34ZM34 449V511H463V449H34Z" /> +<glyph unicode=">" glyph-name="greater" horiz-adv-x="497" d="M34 131V202L245 280L379 330V334L245 384L34 462V533L463 365V299L34 131Z" /> +<glyph unicode="?" glyph-name="question" horiz-adv-x="425" d="M160 198Q154 237 162 268T186 326T220 376T257 421T285 467T297 517Q297 557 273 585T200 614Q167 614 138 599T85 556L38 599Q70 635 112 658T210 682Q286 682 331 640T377 522Q377 489 365 462T336 +411T299 364T263 315T237 262T232 198H160ZM198 -12Q173 -12 156 5T139 50Q139 79 156 96T198 114Q223 114 240 97T258 50Q258 23 241 6T198 -12Z" /> +<glyph unicode="@" glyph-name="at" horiz-adv-x="847" d="M403 -155Q329 -155 265 -132T154 -64T79 49T51 203Q51 303 84 385T175 525T308 614T468 646Q544 646 604 622T707 555T773 450T796 315Q796 249 778 200T730 117T666 66T596 49Q555 49 527 68T493 125H491Q466 +96 434 77T369 57Q318 57 284 93T249 198Q249 238 262 279T301 354T361 409T441 430Q467 430 487 419T521 382H523L534 422H589L550 222Q520 105 604 105Q628 105 651 119T694 159T726 224T738 312Q738 372 721 423T668 512T581 570T461 591Q394 591 331 564T219 +486T141 365T111 206Q111 133 133 76T196 -20T290 -79T409 -100Q455 -100 496 -88T571 -55L593 -104Q508 -155 403 -155ZM385 113Q406 113 428 127T477 172L506 331Q492 354 477 363T442 373Q412 373 389 357T349 316T324 261T315 203Q315 155 335 134T385 113Z" +/> +<glyph unicode="A" glyph-name="A" horiz-adv-x="544" d="M203 367L172 267H369L338 367Q320 422 304 476T272 588H268Q253 531 237 477T203 367ZM3 0L225 656H319L541 0H452L390 200H151L88 0H3Z" /> +<glyph unicode="B" glyph-name="B" horiz-adv-x="588" d="M90 0V656H285Q335 656 376 647T447 619T493 570T510 496Q510 447 486 408T414 353V349Q474 338 511 299T548 192Q548 144 530 108T479 48T400 12T299 0H90ZM173 377H270Q354 377 391 406T428 485Q428 +542 390 566T274 590H173V377ZM173 66H287Q372 66 419 97T466 195Q466 256 420 284T287 313H173V66Z" /> +<glyph unicode="C" glyph-name="C" horiz-adv-x="571" d="M338 -12Q276 -12 224 11T134 77T74 184T52 328Q52 407 74 470T135 577T227 644T343 668Q403 668 448 644T523 587L478 533Q452 561 419 578T344 595Q297 595 259 577T194 524T153 440T138 330Q138 268 +152 219T193 134T256 80T341 61Q389 61 425 80T493 135L539 83Q500 38 451 13T338 -12Z" /> +<glyph unicode="D" glyph-name="D" horiz-adv-x="615" d="M90 0V656H254Q406 656 485 572T564 331Q564 253 544 192T485 88T389 23T258 0H90ZM173 68H248Q363 68 420 137T478 331Q478 456 421 522T248 588H173V68Z" /> +<glyph unicode="E" glyph-name="E" horiz-adv-x="527" d="M90 0V656H468V586H173V380H422V309H173V71H478V0H90Z" /> +<glyph unicode="F" glyph-name="F" horiz-adv-x="494" d="M90 0V656H468V586H173V364H423V294H173V0H90Z" /> +<glyph unicode="G" glyph-name="G" horiz-adv-x="617" d="M348 -12Q283 -12 229 11T135 77T74 184T52 328Q52 407 74 470T137 577T232 644T353 668Q387 668 415 661T467 643T509 617T542 587L496 533Q471 559 438 577T355 595Q305 595 265 577T197 524T154 440T138 +330Q138 268 152 219T194 134T262 80T356 61Q391 61 422 71T474 100V271H335V340H550V64Q518 31 466 10T348 -12Z" /> +<glyph unicode="H" glyph-name="H" horiz-adv-x="652" d="M90 0V656H173V381H478V656H562V0H478V309H173V0H90Z" /> +<glyph unicode="I" glyph-name="I" horiz-adv-x="263" d="M90 0V656H173V0H90Z" /> +<glyph unicode="J" glyph-name="J" horiz-adv-x="480" d="M212 -12Q89 -12 31 93L91 135Q113 96 141 79T204 61Q257 61 283 93T309 201V656H393V193Q393 151 383 114T351 48T295 4T212 -12Z" /> +<glyph unicode="K" glyph-name="K" horiz-adv-x="579" d="M90 0V656H173V327H176L449 656H543L338 406L575 0H482L286 341L173 208V0H90Z" /> +<glyph unicode="L" glyph-name="L" horiz-adv-x="486" d="M90 0V656H173V71H460V0H90Z" /> +<glyph unicode="M" glyph-name="M" horiz-adv-x="727" d="M90 0V656H190L316 306Q328 272 339 238T363 169H367Q379 203 389 237T412 306L536 656H637V0H559V361Q559 405 563 458T570 555H566L514 406L390 66H335L211 406L159 555H155Q158 511 161 458T165 361V0H90Z" /> +<glyph unicode="N" glyph-name="N" horiz-adv-x="647" d="M90 0V656H176L413 244L484 108H488Q485 158 482 211T478 317V656H557V0H471L233 413L162 548H158Q162 498 165 447T169 343V0H90Z" /> +<glyph unicode="O" glyph-name="O" horiz-adv-x="664" d="M332 -12Q270 -12 219 12T130 80T73 188T52 331Q52 410 72 472T130 578T218 645T332 668Q394 668 445 645T534 578T592 472T613 331Q613 252 593 189T535 81T446 12T332 -12ZM332 61Q376 61 411 80T472 +134T512 219T526 331Q526 392 512 441T473 524T412 576T332 595Q288 595 253 577T192 524T152 441T138 331Q138 269 152 220T191 135T252 80T332 61Z" /> +<glyph unicode="P" glyph-name="P" horiz-adv-x="566" d="M90 0V656H277Q332 656 377 646T455 614T505 554T523 463Q523 411 506 373T456 310T380 273T281 260H173V0H90ZM173 328H271Q357 328 398 360T440 463Q440 534 397 561T267 589H173V328Z" /> +<glyph unicode="Q" glyph-name="Q" horiz-adv-x="664" d="M332 57Q376 57 411 76T472 131T512 217T526 331Q526 392 512 441T473 524T412 576T332 595Q288 595 253 577T192 524T152 441T138 331Q138 268 152 218T191 131T252 76T332 57ZM533 -165Q488 -165 450 +-154T381 -121T328 -72T291 -9Q237 -2 193 25T118 96T69 199T52 331Q52 410 72 472T130 578T218 645T332 668Q394 668 445 645T534 578T592 472T613 331Q613 260 597 202T550 100T476 29T381 -8Q404 -52 446 -73T542 -95Q564 -95 580 -93T611 -86L627 -150Q612 +-156 587 -160T533 -165Z" /> +<glyph unicode="R" glyph-name="R" horiz-adv-x="569" d="M90 0V656H295Q345 656 387 647T460 615T508 558T525 472Q525 395 485 349T377 286L544 0H450L292 277H173V0H90ZM173 345H283Q360 345 401 376T442 472Q442 537 401 563T283 589H173V345Z" /> +<glyph unicode="S" glyph-name="S" horiz-adv-x="534" d="M272 -12Q203 -12 144 14T42 85L92 143Q127 106 174 84T273 61Q338 61 374 90T410 168Q410 193 402 210T379 240T344 263T301 284L207 325Q184 335 160 349T117 383T86 430T74 494Q74 531 89 563T132 618T197 +655T280 668Q339 668 389 646T474 587L429 533Q399 562 363 578T280 595Q225 595 192 570T158 499Q158 475 167 459T193 430T228 408T267 390L360 350Q388 338 413 323T456 287T484 239T495 175Q495 136 480 102T435 43T365 3T272 -12Z" /> +<glyph unicode="T" glyph-name="T" horiz-adv-x="536" d="M226 0V586H28V656H508V586H310V0H226Z" /> +<glyph unicode="U" glyph-name="U" horiz-adv-x="645" d="M323 -12Q273 -12 230 2T155 50T105 138T87 271V656H170V269Q170 210 182 170T214 106T263 72T323 61Q356 61 384 71T433 106T466 170T478 269V656H558V271Q558 192 540 138T491 51T416 3T323 -12Z" /> +<glyph unicode="V" glyph-name="V" horiz-adv-x="515" d="M210 0L0 656H89L194 302Q212 243 225 193T258 85H262Q280 143 294 193T325 302L430 656H515L307 0H210Z" /> +<glyph unicode="W" glyph-name="W" horiz-adv-x="786" d="M162 0L23 656H109L178 299Q187 245 197 193T216 87H220Q231 141 243 193T266 299L357 656H433L524 299Q536 247 548 194T572 87H576Q585 141 594 193T613 299L682 656H762L626 0H526L427 395Q418 433 +411 469T395 544H391Q383 506 375 470T358 395L261 0H162Z" /> +<glyph unicode="X" glyph-name="X" horiz-adv-x="513" d="M15 0L206 339L28 656H120L209 488Q222 465 233 444T260 393H264Q278 422 288 443T311 488L398 656H486L307 335L498 0H406L310 177Q297 201 284 226T254 282H250Q236 252 223 227T198 177L103 0H15Z" /> +<glyph unicode="Y" glyph-name="Y" horiz-adv-x="476" d="M196 0V254L-1 656H88L173 471Q189 435 204 400T236 328H240Q257 365 274 400T306 471L390 656H477L280 254V0H196Z" /> +<glyph unicode="Z" glyph-name="Z" horiz-adv-x="539" d="M45 0V50L390 586H76V656H494V607L148 71H497V0H45Z" /> +<glyph unicode="[" glyph-name="bracketleft" horiz-adv-x="303" d="M94 -152V708H273V661H156V-105H273V-152H94Z" /> +<glyph unicode="\" glyph-name="backslash" horiz-adv-x="350" d="M281 -160L14 710H73L340 -160H281Z" /> +<glyph unicode="]" glyph-name="bracketright" horiz-adv-x="303" d="M31 -152V-105H147V661H31V708H209V-152H31Z" /> +<glyph unicode="^" glyph-name="asciicircum" horiz-adv-x="497" d="M60 284L212 670H285L437 284H365L300 460L251 593H247L197 460L132 284H60Z" /> +<glyph unicode="_" glyph-name="underscore" horiz-adv-x="500" d="M12 -126V-71H488V-126H12Z" /> +<glyph unicode="`" glyph-name="grave" horiz-adv-x="542" d="M285 573L128 726L186 781L327 614L285 573Z" /> +<glyph unicode="a" glyph-name="a" horiz-adv-x="504" d="M194 -12Q133 -12 93 24T52 126Q52 206 123 248T350 308Q350 331 346 353T330 392T300 419T250 430Q208 430 171 414T105 378L73 435Q107 457 156 477T264 498Q353 498 393 444T433 298V0H365L358 58H355Q320 +29 280 9T194 -12ZM218 54Q253 54 284 70T350 119V254Q289 246 248 235T181 209T144 175T132 132Q132 90 157 72T218 54Z" /> +<glyph unicode="b" glyph-name="b" horiz-adv-x="553" d="M297 -12Q263 -12 227 4T158 50H155L148 0H82V712H164V518L162 430Q195 459 234 478T314 498Q361 498 397 481T457 431T494 353T507 251Q507 189 490 140T444 57T377 6T297 -12ZM283 57Q313 57 338 70T382 +108T411 169T422 250Q422 290 415 323T393 379T353 416T294 429Q235 429 164 363V108Q196 80 227 69T283 57Z" /> +<glyph unicode="c" glyph-name="c" horiz-adv-x="456" d="M274 -12Q226 -12 184 5T112 54T64 134T46 242Q46 303 65 350T116 431T190 481T280 498Q328 498 362 481T422 441L380 387Q359 406 336 418T283 430Q250 430 222 417T174 378T143 319T131 242Q131 200 +142 166T172 108T220 70T281 56Q315 56 343 70T395 105L431 50Q398 21 358 5T274 -12Z" /> +<glyph unicode="d" glyph-name="d" horiz-adv-x="555" d="M248 -12Q156 -12 102 54T47 242Q47 301 64 348T111 429T178 480T258 498Q300 498 331 483T394 442L390 525V712H473V0H405L398 57H395Q366 29 329 9T248 -12ZM266 57Q300 57 330 73T390 124V378Q359 406 +331 417T272 429Q243 429 218 416T173 378T143 319T132 243Q132 155 167 106T266 57Z" /> +<glyph unicode="e" glyph-name="e" horiz-adv-x="496" d="M279 -12Q230 -12 188 5T114 55T64 135T46 242Q46 302 64 349T113 430T183 480T264 498Q310 498 346 482T407 436T445 364T458 270Q458 257 458 245T455 223H127Q132 145 175 100T289 54Q324 54 353 64T410 +92L439 38Q407 18 368 3T279 -12ZM126 282H386Q386 356 355 394T266 433Q240 433 217 423T174 394T143 346T126 282Z" /> +<glyph unicode="f" glyph-name="f" horiz-adv-x="292" d="M96 0V419H30V481L96 486V563Q96 638 130 681T238 724Q261 724 281 720T319 708L301 645Q274 657 246 657Q178 657 178 563V486H281V419H178V0H96Z" /> +<glyph unicode="g" glyph-name="g" horiz-adv-x="504" d="M246 -224Q201 -224 164 -216T101 -190T60 -149T45 -93Q45 -62 64 -34T116 17V21Q98 32 86 51T73 100Q73 131 90 154T126 190V194Q102 214 83 247T63 325Q63 365 77 397T117 451T175 486T246 498Q266 498 +283 495T315 486H484V423H384Q401 406 412 380T424 323Q424 284 410 253T372 200T316 166T246 154Q228 154 209 158T173 171Q160 160 151 147T142 113Q142 90 160 75T228 60H322Q407 60 449 33T492 -56Q492 -90 475 -120T426 -174T349 -210T246 -224ZM246 209Q267 +209 285 217T318 240T341 276T349 325Q349 379 319 408T246 438Q203 438 173 409T143 325Q143 298 151 277T173 240T206 217T246 209ZM258 -167Q293 -167 321 -159T370 -137T401 -105T412 -68Q412 -34 387 -21T314 -8H230Q216 -8 200 -7T167 0Q141 -19 129 -40T117 +-82Q117 -121 154 -144T258 -167Z" /> +<glyph unicode="h" glyph-name="h" horiz-adv-x="544" d="M82 0V712H164V518L161 418Q196 451 234 474T323 498Q400 498 435 450T471 308V0H389V297Q389 366 367 396T297 427Q259 427 230 408T164 352V0H82Z" /> +<glyph unicode="i" glyph-name="i" horiz-adv-x="246" d="M82 0V486H164V0H82ZM124 586Q100 586 84 601T67 639Q67 663 83 677T124 692Q148 692 164 678T181 639Q181 616 165 601T124 586Z" /> +<glyph unicode="j" glyph-name="j" horiz-adv-x="247" d="M32 -217Q9 -217 -9 -213T-40 -204L-23 -142Q-14 -145 -2 -147T23 -150Q59 -150 71 -125T83 -55V486H165V-55Q165 -129 135 -173T32 -217ZM125 586Q101 586 85 601T68 639Q68 663 84 677T125 692Q148 692 +164 678T181 639Q181 616 165 601T125 586Z" /> +<glyph unicode="k" glyph-name="k" horiz-adv-x="495" d="M82 0V712H163V230H166L373 486H464L301 291L486 0H396L254 234L163 128V0H82Z" /> +<glyph unicode="l" glyph-name="l" horiz-adv-x="255" d="M169 -12Q122 -12 102 16T82 98V712H164V92Q164 72 171 64T187 56Q191 56 194 56T205 58L216 -4Q208 -8 197 -10T169 -12Z" /> +<glyph unicode="m" glyph-name="m" horiz-adv-x="829" d="M82 0V486H150L157 416H160Q192 451 229 474T311 498Q367 498 398 474T445 405Q483 447 521 472T605 498Q680 498 716 450T753 308V0H671V297Q671 366 649 396T581 427Q526 427 459 352V0H377V297Q377 +366 355 396T286 427Q231 427 164 352V0H82Z" /> +<glyph unicode="n" glyph-name="n" horiz-adv-x="547" d="M82 0V486H150L157 416H160Q195 451 233 474T323 498Q400 498 435 450T471 308V0H389V297Q389 366 367 396T297 427Q259 427 230 408T164 352V0H82Z" /> +<glyph unicode="o" glyph-name="o" horiz-adv-x="542" d="M271 -12Q226 -12 186 5T114 54T65 134T46 242Q46 303 64 350T114 431T185 481T271 498Q316 498 356 481T428 431T477 351T496 242Q496 182 478 135T428 55T357 5T271 -12ZM271 56Q302 56 328 69T372 107T401 +166T411 242Q411 284 401 318T373 378T328 416T271 430Q240 430 214 417T170 378T141 319T131 242Q131 200 141 166T169 108T214 70T271 56Z" /> +<glyph unicode="p" glyph-name="p" horiz-adv-x="555" d="M82 -205V486H150L157 430H160Q193 458 232 478T315 498Q362 498 398 481T458 431T494 353T507 250Q507 188 490 140T444 57T377 6T297 -12Q263 -12 230 3T162 44L164 -41V-205H82ZM283 57Q313 57 338 +70T382 108T411 169T422 250Q422 290 415 323T393 379T353 416T294 429Q263 429 232 412T164 363V108Q197 80 228 69T283 57Z" /> +<glyph unicode="q" glyph-name="q" horiz-adv-x="555" d="M390 -205V-32L394 56Q365 27 328 8T248 -12Q156 -12 102 54T47 242Q47 301 64 348T111 429T178 480T258 498Q300 498 332 484T397 440H399L407 486H473V-205H390ZM266 57Q300 57 330 73T390 124V378Q359 +406 331 417T272 429Q243 429 218 416T173 378T143 319T132 243Q132 155 167 106T266 57Z" /> +<glyph unicode="r" glyph-name="r" horiz-adv-x="347" d="M82 0V486H150L157 398H160Q185 444 220 471T298 498Q327 498 350 488L334 416Q322 420 312 422T287 424Q256 424 223 399T164 312V0H82Z" /> +<glyph unicode="s" glyph-name="s" horiz-adv-x="419" d="M209 -12Q157 -12 110 7T28 55L69 110Q101 84 134 68T212 52Q260 52 284 74T308 128Q308 147 298 161T273 185T237 204T197 220Q171 229 145 240T99 268T65 307T52 360Q52 389 63 414T96 458T149 487T219 +498Q265 498 303 482T370 443L331 391Q306 410 279 422T220 434Q174 434 153 413T131 364Q131 347 140 335T164 313T198 296T239 280Q265 270 291 259T339 232T373 191T387 133Q387 103 376 77T342 31T286 0T209 -12Z" /> +<glyph unicode="t" glyph-name="t" horiz-adv-x="338" d="M235 -12Q196 -12 170 0T127 33T103 84T96 150V419H24V481L100 486L110 622H179V486H310V419H179V149Q179 104 195 80T254 55Q267 55 282 59T309 68L325 6Q305 -1 282 -6T235 -12Z" /> +<glyph unicode="u" glyph-name="u" horiz-adv-x="544" d="M224 -12Q146 -12 111 36T75 178V486H158V189Q158 120 179 90T249 59Q287 59 316 78T380 141V486H462V0H394L387 76H384Q350 36 313 12T224 -12Z" /> +<glyph unicode="v" glyph-name="v" horiz-adv-x="467" d="M187 0L12 486H97L189 210Q200 174 211 138T234 67H238Q249 102 260 138T282 210L374 486H455L283 0H187Z" /> +<glyph unicode="w" glyph-name="w" horiz-adv-x="718" d="M159 0L24 486H108L180 205Q188 170 195 137T209 70H213Q221 104 229 137T246 205L321 486H401L477 205Q486 170 494 137T511 70H515Q523 104 530 137T545 205L616 486H694L564 0H464L394 261Q385 296 +378 330T361 401H357Q349 364 341 330T323 260L255 0H159Z" /> +<glyph unicode="x" glyph-name="x" horiz-adv-x="446" d="M14 0L173 254L26 486H115L180 379Q191 359 203 339T228 298H232Q243 318 254 338T276 379L335 486H421L274 245L432 0H343L272 113Q259 135 246 157T219 200H215Q202 179 190 158T166 113L100 0H14Z" /> +<glyph unicode="y" glyph-name="y" horiz-adv-x="467" d="M90 -209Q73 -209 59 -207T33 -199L49 -134Q57 -136 67 -138T86 -141Q128 -141 154 -112T196 -37L207 -1L12 486H97L196 217Q207 185 219 150T243 80H247Q258 113 268 149T288 217L375 486H455L272 -40Q259 +-76 243 -107T205 -160T155 -196T90 -209Z" /> +<glyph unicode="z" glyph-name="z" horiz-adv-x="425" d="M31 0V44L287 419H59V486H391V442L135 67H399V0H31Z" /> +<glyph unicode="{" glyph-name="braceleft" horiz-adv-x="303" d="M228 -152Q169 -152 140 -124T111 -19Q111 8 112 32T115 80T118 126T120 174Q120 189 116 202T103 227T76 245T34 252V304Q59 304 76 311T102 328T116 353T120 381Q120 432 116 476T111 575Q111 +652 140 680T228 708H273V661H246Q205 661 192 640T178 570Q178 524 181 482T184 389Q184 340 170 315T124 280V276Q156 267 170 241T184 167Q184 116 181 74T178 -14Q178 -63 191 -84T246 -105H273V-152H228Z" /> +<glyph unicode="|" glyph-name="bar" horiz-adv-x="241" d="M92 -250V750H150V-250H92Z" /> +<glyph unicode="}" glyph-name="braceright" horiz-adv-x="303" d="M31 -152V-105H57Q98 -105 111 -84T125 -14Q125 32 123 74T120 167Q120 215 133 241T179 276V280Q147 289 134 314T120 389Q120 440 122 482T125 570Q125 619 112 640T57 661H31V708H75Q105 708 +127 702T163 680T185 640T192 575Q192 520 188 476T183 381Q183 352 201 329T269 304V252Q244 252 228 245T201 227T187 203T183 174Q183 149 184 126T187 80T190 33T192 -19Q192 -58 185 -83T164 -124T127 -145T75 -152H31Z" /> +<glyph unicode="~" glyph-name="asciitilde" horiz-adv-x="497" d="M336 257Q306 257 283 270T239 299T199 328T159 341Q137 341 118 327T82 280L36 313Q63 361 96 382T161 403Q191 403 214 390T258 361T298 332T338 319Q360 319 379 333T415 380L461 346Q434 +298 401 278T336 257Z" /> +<glyph unicode=" " glyph-name="uni00A0" horiz-adv-x="202" /> +<glyph unicode="¡" glyph-name="exclamdown" horiz-adv-x="289" d="M103 -184L105 -90L116 288H173L184 -90L186 -184H103ZM145 372Q120 372 103 389T85 436Q85 463 102 480T145 498Q169 498 186 481T204 436Q204 407 187 390T145 372Z" /> +<glyph unicode="¢" glyph-name="cent" horiz-adv-x="497" d="M143 310Q143 243 174 199T262 142V477Q207 464 175 420T143 310ZM262 -33V71Q217 76 180 94T117 143T76 215T61 310Q61 362 76 403T119 474T183 522T262 547V653H314V550Q358 548 390 531T445 +492L405 440Q385 458 363 469T314 482V138Q346 140 372 153T418 185L454 133Q425 107 389 90T314 70V-33H262Z" /> +<glyph unicode="£" glyph-name="sterling" horiz-adv-x="497" d="M54 0V50Q105 78 132 125T160 230Q160 244 158 257T153 285H53V337L120 341H138Q128 373 120 403T111 466Q111 508 124 542T162 600T221 637T297 650Q351 650 388 629T452 575L404 528Q385 +551 361 566T303 581Q249 581 221 549T192 464Q192 432 199 403T216 341H375V285H229Q231 271 232 258T234 229Q234 176 218 141T172 75V71H453V0H54Z" /> +<glyph unicode="¤" glyph-name="currency" horiz-adv-x="497" d="M70 103L26 148L90 213Q73 236 64 265T54 329Q54 364 63 393T90 446L26 512L70 557L138 487Q186 524 249 524Q278 524 307 515T359 487L427 557L471 512L406 446Q423 423 433 394T443 329Q443 +294 433 265T406 213L471 148L427 103L359 172Q336 153 307 144T249 134Q185 134 138 172L70 103ZM249 195Q273 195 294 204T332 232T357 274T367 329Q367 359 358 383T332 426T295 453T249 463Q225 463 203 454T165 426T140 384T130 329Q130 299 139 275T165 232T203 +205T249 195Z" /> +<glyph unicode="¥" glyph-name="yen" horiz-adv-x="497" d="M207 0V158H45V206H207V271H45V318H186L23 638H109L187 467Q202 434 216 401T247 332H251Q268 367 282 400T312 467L390 638H474L310 318H452V271H289V206H452V158H289V0H207Z" /> +<glyph unicode="¦" glyph-name="brokenbar" horiz-adv-x="241" d="M92 291V750H150V291H92ZM92 -250V214H150V-250H92Z" /> +<glyph unicode="§" glyph-name="section" horiz-adv-x="497" d="M117 348Q117 315 137 294T187 256T253 226T320 193Q349 207 364 226T380 278Q380 312 360 334T310 372T245 403T178 435Q149 419 133 399T117 348ZM236 -64Q182 -64 138 -45T63 7L113 52Q138 +28 167 14T236 0Q276 0 298 20T321 69Q321 97 301 116T250 150T183 179T117 215T66 266T45 343Q45 387 69 419T131 472Q116 488 108 508T99 554Q99 580 108 603T137 645T185 673T251 684Q299 684 337 667T405 627L365 574Q341 594 314 607T254 620Q212 620 194 +602T175 557Q175 530 195 512T247 479T313 449T380 413T431 361T452 284Q452 236 429 207T367 155Q381 138 389 119T397 73Q397 43 385 18T352 -25T301 -53T236 -64Z" /> +<glyph unicode="¨" glyph-name="dieresis" horiz-adv-x="542" d="M175 587Q153 587 139 601T125 637Q125 658 139 672T175 687Q196 687 210 673T224 637Q224 616 210 602T175 587ZM367 587Q346 587 332 601T318 637Q318 658 332 672T367 687Q389 687 403 +673T417 637Q417 616 403 602T367 587Z" /> +<glyph unicode="©" glyph-name="copyright" horiz-adv-x="744" d="M372 -11Q307 -11 248 12T145 79T75 184T49 323Q49 399 75 460T145 564T248 630T372 653Q437 653 495 630T598 564T669 460T695 323Q695 246 669 185T599 80T496 13T372 -11ZM372 31Q429 +31 479 52T566 111T626 203T648 323Q648 388 626 441T567 533T479 591T372 612Q315 612 265 592T178 533T118 442T96 323Q96 257 118 204T177 112T265 52T372 31ZM380 125Q342 125 309 138T251 177T212 239T198 323Q198 366 213 401T254 461T313 499T383 512Q425 +512 454 496T508 455L473 416Q453 436 433 446T386 457Q331 457 298 420T264 323Q264 257 296 219T383 180Q415 180 439 192T485 224L515 182Q487 158 456 142T380 125Z" /> +<glyph unicode="ª" glyph-name="ordfeminine" horiz-adv-x="345" d="M136 387Q91 387 64 412T37 481Q37 534 84 561T236 600Q235 632 222 652T174 673Q148 673 121 663T73 639L50 682Q75 697 109 710T183 724Q243 724 270 689T298 591V395H248L241 432H237Q217 +414 192 401T136 387ZM154 436Q193 436 236 476V561Q159 553 129 534T98 486Q98 460 113 448T154 436Z" /> +<glyph unicode="«" glyph-name="guillemotleft" horiz-adv-x="429" d="M181 66L45 221V283L181 438L217 408L99 252L217 94L181 66ZM339 66L203 221V283L339 438L375 408L257 252L375 94L339 66Z" /> +<glyph unicode="¬" glyph-name="logicalnot" horiz-adv-x="497" d="M397 104V299H34V361H463V104H397Z" /> +<glyph unicode="" glyph-name="uni00AD" horiz-adv-x="311" d="M41 219V282H271V219H41Z" /> +<glyph unicode="®" glyph-name="registered" horiz-adv-x="423" d="M211 319Q172 319 138 333T79 374T38 436T23 516Q23 560 38 596T78 658T138 698T211 713Q250 713 284 699T344 658T385 596T400 516Q400 472 385 436T345 374T285 334T211 319ZM211 356Q242 +356 269 367T317 400T348 450T360 516Q360 551 349 580T317 631T270 665T211 677Q179 677 152 665T106 632T75 581T63 516Q63 480 74 451T105 400T152 368T211 356ZM139 417V620H215Q247 620 270 606T293 555Q293 537 283 522T256 500L302 417H256L221 487H180V417H139ZM180 +519H206Q249 519 249 553Q249 568 240 577T208 586H180V519Z" /> +<glyph unicode="¯" glyph-name="overscore" horiz-adv-x="542" d="M138 601V658H404V601H138Z" /> +<glyph unicode="°" glyph-name="degree" horiz-adv-x="331" d="M166 429Q141 429 119 438T79 463T51 503T41 556Q41 586 51 609T78 650T118 676T166 685Q191 685 213 676T253 650T281 610T291 556Q291 527 281 504T254 464T214 438T166 429ZM166 475Q199 +475 220 498T241 556Q241 593 220 616T166 639Q133 639 112 616T91 556Q91 521 112 498T166 475Z" /> +<glyph unicode="±" glyph-name="plusminus" horiz-adv-x="497" d="M216 127V304H34V366H216V556H281V366H463V304H281V127H216ZM34 0V62H463V0H34Z" /> +<glyph unicode="²" glyph-name="two.sups" horiz-adv-x="367" d="M52 395V432Q97 473 132 505T190 565T225 615T237 661Q237 699 217 721T162 743Q137 743 116 727T78 686L40 721Q63 755 96 776T170 797Q229 797 264 765T300 671Q300 643 289 617T259 565T213 +510T155 450H320V395H52Z" /> +<glyph unicode="³" glyph-name="three.sups" horiz-adv-x="367" d="M180 383Q132 383 95 404T35 459L78 492Q96 465 121 450T177 434Q209 434 232 452T255 504Q255 538 223 555T134 573V614Q185 614 212 634T240 684Q240 712 221 729T169 746Q147 746 127 +733T90 699L51 733Q77 762 107 779T179 797Q204 797 226 790T266 770T293 737T303 692Q303 657 284 634T235 596Q268 588 293 564T319 500Q319 473 308 452T278 415T234 391T180 383Z" /> +<glyph unicode="´" glyph-name="acute" horiz-adv-x="542" d="M257 573L215 614L356 781L414 726L257 573Z" /> +<glyph unicode="µ" glyph-name="uni00B5" horiz-adv-x="562" d="M82 -179V486H164V189Q164 124 184 92T253 59Q269 59 285 62T317 76T349 105T382 154V486H465Q463 387 461 285T459 95Q459 75 469 66T495 56Q507 56 524 62L535 0Q524 -5 511 -8T477 -12Q435 +-12 415 10T389 82H387Q361 35 327 13T252 -10Q223 -10 199 -1T158 37Q158 1 158 -26T160 -78T162 -126T165 -179H82Z" /> +<glyph unicode="¶" glyph-name="paragraph" horiz-adv-x="560" d="M380 -80V656H464V-80H380ZM293 226Q239 226 193 238T113 277T60 345T41 443Q41 502 59 542T109 608T186 645T282 656H326V226H293Z" /> +<glyph unicode="·" glyph-name="middot" horiz-adv-x="249" d="M125 259Q100 259 83 276T65 321Q65 350 82 367T125 385Q149 385 166 368T184 321Q184 294 167 277T125 259Z" /> +<glyph unicode="¸" glyph-name="cedilla" horiz-adv-x="542" d="M190 -226L182 -186Q245 -181 268 -170T291 -136Q291 -116 274 -105T214 -88L258 3H311L282 -64Q317 -72 336 -88T355 -135Q355 -179 313 -200T190 -226Z" /> +<glyph unicode="¹" glyph-name="one.sups" horiz-adv-x="367" d="M172 395V703H87V745Q120 751 142 760T184 785H236V395H172Z" /> +<glyph unicode="º" glyph-name="ordmasculine" horiz-adv-x="365" d="M182 387Q151 387 124 398T75 431T42 484T30 555Q30 595 42 626T75 680T123 713T182 724Q213 724 240 713T289 680T322 627T334 555Q334 515 322 484T289 432T241 399T182 387ZM182 438Q224 +438 247 470T270 555Q270 609 247 641T182 673Q140 673 117 641T93 555Q93 503 116 471T182 438Z" /> +<glyph unicode="»" glyph-name="guillemotright" horiz-adv-x="429" d="M89 66L54 94L172 252L54 408L89 438L226 283V221L89 66ZM247 66L212 94L330 252L212 408L247 438L384 283V221L247 66Z" /> +<glyph unicode="¼" glyph-name="onequarter" horiz-adv-x="781" d="M149 266V574H64V616Q97 622 119 631T161 656H213V266H149ZM180 -12L542 668H598L236 -12H180ZM633 0V104H455V137L619 390H691V150H749V104H691V0H633ZM522 150H633V220L637 329H633L583 +248L522 150Z" /> +<glyph unicode="½" glyph-name="onehalf" horiz-adv-x="808" d="M149 266V574H64V616Q97 622 119 631T161 656H213V266H149ZM159 -12L521 668H577L215 -12H159ZM493 0V37Q538 78 573 110T631 170T666 220T678 266Q678 304 658 326T603 348Q578 348 557 332T519 +291L481 326Q504 360 537 381T611 402Q670 402 705 370T741 276Q741 248 730 222T700 170T654 115T596 55H761V0H493Z" /> +<glyph unicode="¾" glyph-name="threequarters" horiz-adv-x="796" d="M180 254Q132 254 95 275T35 330L78 363Q96 336 121 321T177 305Q209 305 232 323T255 375Q255 409 223 426T134 444V485Q185 485 212 505T240 555Q240 583 221 600T169 617Q147 617 +127 604T90 570L51 604Q77 633 107 650T179 668Q204 668 226 661T266 641T293 608T303 563Q303 528 284 505T235 467Q268 459 293 435T319 371Q319 344 308 323T278 286T234 262T180 254ZM217 -12L579 668H635L273 -12H217ZM648 0V104H470V137L634 390H706V150H764V104H706V0H648ZM537 +150H648V220L652 329H648L598 248L537 150Z" /> +<glyph unicode="¿" glyph-name="questiondown" horiz-adv-x="425" d="M215 -196Q139 -196 94 -154T48 -36Q48 -3 60 24T89 75T126 122T162 171T187 224T192 288H265Q270 249 262 218T239 160T205 110T168 65T140 19T128 -31Q128 -71 152 -99T225 -127Q258 +-127 287 -112T339 -70L387 -113Q355 -148 313 -172T215 -196ZM227 372Q202 372 185 389T167 436Q167 463 184 480T227 498Q251 498 268 481T286 436Q286 407 269 390T227 372Z" /> +<glyph unicode="À" glyph-name="Agrave" horiz-adv-x="544" d="M203 367L172 267H369L338 367Q320 422 304 476T272 588H268Q253 531 237 477T203 367ZM3 0L225 656H319L541 0H452L390 200H151L88 0H3ZM288 697L136 812L183 867L325 739L288 697Z" /> +<glyph unicode="Á" glyph-name="Aacute" horiz-adv-x="544" d="M203 367L172 267H369L338 367Q320 422 304 476T272 588H268Q253 531 237 477T203 367ZM3 0L225 656H319L541 0H452L390 200H151L88 0H3ZM254 697L217 739L359 867L406 812L254 697Z" /> +<glyph unicode="Â" glyph-name="Acircumflex" horiz-adv-x="544" d="M203 367L172 267H369L338 367Q320 422 304 476T272 588H268Q253 531 237 477T203 367ZM3 0L225 656H319L541 0H452L390 200H151L88 0H3ZM123 725L228 838H314L419 725L383 699L273 792H269L159 +699L123 725Z" /> +<glyph unicode="Ã" glyph-name="Atilde" horiz-adv-x="544" d="M203 367L172 267H369L338 367Q320 422 304 476T272 588H268Q253 531 237 477T203 367ZM3 0L225 656H319L541 0H452L390 200H151L88 0H3ZM346 709Q318 709 298 720T262 744T231 769T198 780Q179 +780 166 763T150 714L94 718Q97 775 124 808T196 841Q224 841 244 830T280 806T311 781T344 770Q384 770 392 836L448 832Q445 774 418 742T346 709Z" /> +<glyph unicode="Ä" glyph-name="Adieresis" horiz-adv-x="544" d="M203 367L172 267H369L338 367Q320 422 304 476T272 588H268Q253 531 237 477T203 367ZM3 0L225 656H319L541 0H452L390 200H151L88 0H3ZM168 715Q147 715 133 729T119 764Q119 786 133 799T168 +813Q190 813 203 800T217 764Q217 743 204 729T168 715ZM374 715Q352 715 339 729T325 764Q325 786 338 799T374 813Q395 813 409 800T423 764Q423 743 409 729T374 715Z" /> +<glyph unicode="Å" glyph-name="Aring" horiz-adv-x="544" d="M203 367L172 267H369L338 367Q320 422 304 476T272 588H268Q253 531 237 477T203 367ZM3 0L225 656H319L541 0H452L390 200H151L88 0H3ZM271 699Q229 699 202 723T174 789Q174 831 201 855T271 +880Q313 880 340 856T368 789Q368 748 341 724T271 699ZM271 735Q291 735 306 749T322 789Q322 815 307 829T271 843Q249 843 234 829T219 789Q219 763 234 749T271 735Z" /> +<glyph unicode="Æ" glyph-name="AE" horiz-adv-x="822" d="M290 376L229 258H401V590H397Q344 483 290 376ZM8 0L352 656H763V586H485V380H717V309H485V71H773V0H401V191H195L96 0H8Z" /> +<glyph unicode="Ç" glyph-name="Ccedilla" horiz-adv-x="571" d="M338 -12Q276 -12 224 11T134 77T74 184T52 328Q52 407 74 470T135 577T227 644T343 668Q403 668 448 644T523 587L478 533Q452 561 419 578T344 595Q297 595 259 577T194 524T153 440T138 +330Q138 268 152 219T193 134T256 80T341 61Q389 61 425 80T493 135L539 83Q500 38 451 13T338 -12ZM256 -226L248 -186Q311 -181 334 -170T357 -136Q357 -116 340 -105T280 -88L324 3H377L348 -64Q383 -72 402 -88T421 -135Q421 -179 379 -200T256 -226Z" /> +<glyph unicode="È" glyph-name="Egrave" horiz-adv-x="527" d="M90 0V656H468V586H173V380H422V309H173V71H478V0H90ZM301 697L149 812L196 867L338 739L301 697Z" /> +<glyph unicode="É" glyph-name="Eacute" horiz-adv-x="527" d="M90 0V656H468V586H173V380H422V309H173V71H478V0H90ZM267 697L230 739L372 867L419 812L267 697Z" /> +<glyph unicode="Ê" glyph-name="Ecircumflex" horiz-adv-x="527" d="M90 0V656H468V586H173V380H422V309H173V71H478V0H90ZM136 725L241 838H327L432 725L396 699L286 792H282L172 699L136 725Z" /> +<glyph unicode="Ë" glyph-name="Edieresis" horiz-adv-x="527" d="M90 0V656H468V586H173V380H422V309H173V71H478V0H90ZM181 715Q160 715 146 729T132 764Q132 786 146 799T181 813Q203 813 216 800T230 764Q230 743 217 729T181 715ZM387 715Q365 715 352 +729T338 764Q338 786 351 799T387 813Q408 813 422 800T436 764Q436 743 422 729T387 715Z" /> +<glyph unicode="Ì" glyph-name="Igrave" horiz-adv-x="263" d="M90 0V656H173V0H90ZM148 697L-4 812L43 867L185 739L148 697Z" /> +<glyph unicode="Í" glyph-name="Iacute" horiz-adv-x="263" d="M90 0V656H173V0H90ZM114 697L77 739L219 867L266 812L114 697Z" /> +<glyph unicode="Î" glyph-name="Icircumflex" horiz-adv-x="263" d="M90 0V656H173V0H90ZM-17 725L88 838H174L279 725L243 699L133 792H129L19 699L-17 725Z" /> +<glyph unicode="Ï" glyph-name="Idieresis" horiz-adv-x="263" d="M90 0V656H173V0H90ZM28 715Q7 715 -7 729T-21 764Q-21 786 -7 799T28 813Q50 813 63 800T77 764Q77 743 64 729T28 715ZM234 715Q212 715 199 729T185 764Q185 786 198 799T234 813Q255 +813 269 800T283 764Q283 743 269 729T234 715Z" /> +<glyph unicode="Ð" glyph-name="Eth" horiz-adv-x="638" d="M33 321V364L112 368V656H276Q428 656 507 572T586 331Q586 253 566 192T507 88T411 23T280 0H112V321H33ZM195 68H270Q385 68 442 137T500 331Q500 456 443 522T270 588H195V368H344V321H195V68Z" /> +<glyph unicode="Ñ" glyph-name="Ntilde" horiz-adv-x="647" d="M90 0V656H176L413 244L484 108H488Q485 158 482 211T478 317V656H557V0H471L233 413L162 548H158Q162 498 165 447T169 343V0H90ZM401 709Q373 709 353 720T317 744T286 769T253 780Q234 780 +221 763T205 714L149 718Q152 775 179 808T251 841Q279 841 299 830T335 806T366 781T399 770Q439 770 447 836L503 832Q500 774 473 742T401 709Z" /> +<glyph unicode="Ò" glyph-name="Ograve" horiz-adv-x="664" d="M332 -12Q270 -12 219 12T130 80T73 188T52 331Q52 410 72 472T130 578T218 645T332 668Q394 668 445 645T534 578T592 472T613 331Q613 252 593 189T535 81T446 12T332 -12ZM332 61Q376 61 +411 80T472 134T512 219T526 331Q526 392 512 441T473 524T412 576T332 595Q288 595 253 577T192 524T152 441T138 331Q138 269 152 220T191 135T252 80T332 61ZM349 697L197 812L244 867L386 739L349 697Z" /> +<glyph unicode="Ó" glyph-name="Oacute" horiz-adv-x="664" d="M332 -12Q270 -12 219 12T130 80T73 188T52 331Q52 410 72 472T130 578T218 645T332 668Q394 668 445 645T534 578T592 472T613 331Q613 252 593 189T535 81T446 12T332 -12ZM332 61Q376 61 +411 80T472 134T512 219T526 331Q526 392 512 441T473 524T412 576T332 595Q288 595 253 577T192 524T152 441T138 331Q138 269 152 220T191 135T252 80T332 61ZM315 697L278 739L420 867L467 812L315 697Z" /> +<glyph unicode="Ô" glyph-name="Ocircumflex" horiz-adv-x="664" d="M332 -12Q270 -12 219 12T130 80T73 188T52 331Q52 410 72 472T130 578T218 645T332 668Q394 668 445 645T534 578T592 472T613 331Q613 252 593 189T535 81T446 12T332 -12ZM332 61Q376 +61 411 80T472 134T512 219T526 331Q526 392 512 441T473 524T412 576T332 595Q288 595 253 577T192 524T152 441T138 331Q138 269 152 220T191 135T252 80T332 61ZM184 725L289 838H375L480 725L444 699L334 792H330L220 699L184 725Z" /> +<glyph unicode="Õ" glyph-name="Otilde" horiz-adv-x="664" d="M332 -12Q270 -12 219 12T130 80T73 188T52 331Q52 410 72 472T130 578T218 645T332 668Q394 668 445 645T534 578T592 472T613 331Q613 252 593 189T535 81T446 12T332 -12ZM332 61Q376 61 +411 80T472 134T512 219T526 331Q526 392 512 441T473 524T412 576T332 595Q288 595 253 577T192 524T152 441T138 331Q138 269 152 220T191 135T252 80T332 61ZM407 709Q379 709 359 720T323 744T292 769T259 780Q240 780 227 763T211 714L155 718Q158 775 185 +808T257 841Q285 841 305 830T341 806T372 781T405 770Q445 770 453 836L509 832Q506 774 479 742T407 709Z" /> +<glyph unicode="Ö" glyph-name="Odieresis" horiz-adv-x="664" d="M332 -12Q270 -12 219 12T130 80T73 188T52 331Q52 410 72 472T130 578T218 645T332 668Q394 668 445 645T534 578T592 472T613 331Q613 252 593 189T535 81T446 12T332 -12ZM332 61Q376 +61 411 80T472 134T512 219T526 331Q526 392 512 441T473 524T412 576T332 595Q288 595 253 577T192 524T152 441T138 331Q138 269 152 220T191 135T252 80T332 61ZM229 715Q208 715 194 729T180 764Q180 786 194 799T229 813Q251 813 264 800T278 764Q278 743 +265 729T229 715ZM435 715Q413 715 400 729T386 764Q386 786 399 799T435 813Q456 813 470 800T484 764Q484 743 470 729T435 715Z" /> +<glyph unicode="×" glyph-name="multiply" horiz-adv-x="497" d="M94 126L50 171L205 330L50 488L94 533L249 374L403 533L447 488L292 330L447 171L403 126L249 286L94 126Z" /> +<glyph unicode="Ø" glyph-name="Oslash" horiz-adv-x="664" d="M335 -12Q231 -12 160 53L96 -30L50 6L120 97Q89 142 72 200T55 331Q55 410 75 472T133 578T221 645T335 668Q439 668 511 605L573 686L619 651L550 562Q582 518 599 461T616 331Q616 252 596 +189T538 81T449 12T335 -12ZM141 331Q141 283 149 242T174 168L462 541Q411 595 335 595Q291 595 256 577T195 524T155 441T141 331ZM335 61Q379 61 414 80T475 134T515 219T529 331Q529 379 521 419T496 491L209 117Q259 61 335 61Z" /> +<glyph unicode="Ù" glyph-name="Ugrave" horiz-adv-x="645" d="M323 -12Q273 -12 230 2T155 50T105 138T87 271V656H170V269Q170 210 182 170T214 106T263 72T323 61Q356 61 384 71T433 106T466 170T478 269V656H558V271Q558 192 540 138T491 51T416 3T323 +-12ZM339 697L187 812L234 867L376 739L339 697Z" /> +<glyph unicode="Ú" glyph-name="Uacute" horiz-adv-x="645" d="M323 -12Q273 -12 230 2T155 50T105 138T87 271V656H170V269Q170 210 182 170T214 106T263 72T323 61Q356 61 384 71T433 106T466 170T478 269V656H558V271Q558 192 540 138T491 51T416 3T323 +-12ZM305 697L268 739L410 867L457 812L305 697Z" /> +<glyph unicode="Û" glyph-name="Ucircumflex" horiz-adv-x="645" d="M323 -12Q273 -12 230 2T155 50T105 138T87 271V656H170V269Q170 210 182 170T214 106T263 72T323 61Q356 61 384 71T433 106T466 170T478 269V656H558V271Q558 192 540 138T491 51T416 +3T323 -12ZM174 725L279 838H365L470 725L434 699L324 792H320L210 699L174 725Z" /> +<glyph unicode="Ü" glyph-name="Udieresis" horiz-adv-x="645" d="M323 -12Q273 -12 230 2T155 50T105 138T87 271V656H170V269Q170 210 182 170T214 106T263 72T323 61Q356 61 384 71T433 106T466 170T478 269V656H558V271Q558 192 540 138T491 51T416 3T323 +-12ZM219 715Q198 715 184 729T170 764Q170 786 184 799T219 813Q241 813 254 800T268 764Q268 743 255 729T219 715ZM425 715Q403 715 390 729T376 764Q376 786 389 799T425 813Q446 813 460 800T474 764Q474 743 460 729T425 715Z" /> +<glyph unicode="Ý" glyph-name="Yacute" horiz-adv-x="476" d="M196 0V254L-1 656H88L173 471Q189 435 204 400T236 328H240Q257 365 274 400T306 471L390 656H477L280 254V0H196ZM221 697L184 739L326 867L373 812L221 697Z" /> +<glyph unicode="Þ" glyph-name="Thorn" horiz-adv-x="583" d="M90 0V656H173V546H291Q345 546 390 536T466 503T515 444T533 353Q533 301 516 263T466 199T390 162T291 150H173V0H90ZM173 218H281Q367 218 408 250T450 353Q450 424 408 451T281 478H173V218Z" /> +<glyph unicode="ß" glyph-name="germandbls" horiz-adv-x="576" d="M387 -12Q345 -12 311 1T246 37L279 95Q305 73 330 63T385 52Q427 52 448 76T469 132Q469 161 455 180T418 213T371 239T323 268T287 306T272 364Q272 398 285 422T315 468T346 513T360 +568Q360 606 340 630T277 655Q223 655 194 617T164 500V0H82V515Q82 609 133 665T278 722Q317 722 347 711T399 679T430 633T441 576Q441 538 427 512T396 463T364 421T350 374Q350 350 364 334T401 306T448 280T496 249T532 204T547 137Q547 105 536 78T504 31T454 +0T387 -12Z" /> +<glyph unicode="à" glyph-name="agrave" horiz-adv-x="504" d="M194 -12Q133 -12 93 24T52 126Q52 206 123 248T350 308Q350 331 346 353T330 392T300 419T250 430Q208 430 171 414T105 378L73 435Q107 457 156 477T264 498Q353 498 393 444T433 298V0H365L358 +58H355Q320 29 280 9T194 -12ZM218 54Q253 54 284 70T350 119V254Q289 246 248 235T181 209T144 175T132 132Q132 90 157 72T218 54ZM276 573L119 726L177 781L318 614L276 573Z" /> +<glyph unicode="á" glyph-name="aacute" horiz-adv-x="504" d="M194 -12Q133 -12 93 24T52 126Q52 206 123 248T350 308Q350 331 346 353T330 392T300 419T250 430Q208 430 171 414T105 378L73 435Q107 457 156 477T264 498Q353 498 393 444T433 298V0H365L358 +58H355Q320 29 280 9T194 -12ZM218 54Q253 54 284 70T350 119V254Q289 246 248 235T181 209T144 175T132 132Q132 90 157 72T218 54ZM248 573L206 614L347 781L405 726L248 573Z" /> +<glyph unicode="â" glyph-name="acircumflex" horiz-adv-x="504" d="M194 -12Q133 -12 93 24T52 126Q52 206 123 248T350 308Q350 331 346 353T330 392T300 419T250 430Q208 430 171 414T105 378L73 435Q107 457 156 477T264 498Q353 498 393 444T433 298V0H365L358 +58H355Q320 29 280 9T194 -12ZM218 54Q253 54 284 70T350 119V254Q289 246 248 235T181 209T144 175T132 132Q132 90 157 72T218 54ZM107 600L221 740H303L417 600L382 568L264 681H260L142 568L107 600Z" /> +<glyph unicode="ã" glyph-name="atilde" horiz-adv-x="504" d="M194 -12Q133 -12 93 24T52 126Q52 206 123 248T350 308Q350 331 346 353T330 392T300 419T250 430Q208 430 171 414T105 378L73 435Q107 457 156 477T264 498Q353 498 393 444T433 298V0H365L358 +58H355Q320 29 280 9T194 -12ZM218 54Q253 54 284 70T350 119V254Q289 246 248 235T181 209T144 175T132 132Q132 90 157 72T218 54ZM334 577Q307 577 288 590T253 619T223 648T191 661Q168 661 157 639T144 582L89 585Q90 614 96 639T115 682T145 710T190 721Q217 +721 236 708T271 679T301 650T334 637Q356 637 367 659T380 716L435 712Q434 683 428 659T409 616T379 588T334 577Z" /> +<glyph unicode="ä" glyph-name="adieresis" horiz-adv-x="504" d="M194 -12Q133 -12 93 24T52 126Q52 206 123 248T350 308Q350 331 346 353T330 392T300 419T250 430Q208 430 171 414T105 378L73 435Q107 457 156 477T264 498Q353 498 393 444T433 298V0H365L358 +58H355Q320 29 280 9T194 -12ZM218 54Q253 54 284 70T350 119V254Q289 246 248 235T181 209T144 175T132 132Q132 90 157 72T218 54ZM166 587Q144 587 130 601T116 637Q116 658 130 672T166 687Q187 687 201 673T215 637Q215 616 201 602T166 587ZM358 587Q337 +587 323 601T309 637Q309 658 323 672T358 687Q380 687 394 673T408 637Q408 616 394 602T358 587Z" /> +<glyph unicode="å" glyph-name="aring" horiz-adv-x="504" d="M194 -12Q133 -12 93 24T52 126Q52 206 123 248T350 308Q350 331 346 353T330 392T300 419T250 430Q208 430 171 414T105 378L73 435Q107 457 156 477T264 498Q353 498 393 444T433 298V0H365L358 +58H355Q320 29 280 9T194 -12ZM218 54Q253 54 284 70T350 119V254Q289 246 248 235T181 209T144 175T132 132Q132 90 157 72T218 54ZM262 554Q211 554 182 582T152 653Q152 695 181 723T262 751Q313 751 342 723T372 653Q372 610 343 582T262 554ZM262 591Q286 +591 302 607T319 653Q319 681 303 697T262 714Q238 714 222 698T205 653Q205 624 221 608T262 591Z" /> +<glyph unicode="æ" glyph-name="ae" horiz-adv-x="785" d="M201 -12Q139 -12 99 24T58 126Q58 206 129 248T352 308Q352 331 348 353T333 392T302 419T253 430Q213 430 177 414T112 378L79 435Q113 457 161 477T263 498Q317 498 352 471T402 395Q431 443 +471 470T562 498Q607 498 641 482T699 436T735 364T747 269Q747 241 744 223H429Q430 185 442 154T475 101T522 67T580 55Q615 55 643 66T698 95L728 38Q696 18 658 3T570 -12Q509 -12 468 15T399 79Q349 34 299 11T201 -12ZM224 54Q258 54 298 73T371 129Q363 +148 358 174T352 229V254Q294 246 254 235T188 209T151 175T139 132Q139 90 163 72T224 54ZM429 278H675Q675 353 646 393T560 433Q509 433 473 392T429 278Z" /> +<glyph unicode="ç" glyph-name="ccedilla" horiz-adv-x="456" d="M274 -12Q226 -12 184 5T112 54T64 134T46 242Q46 303 65 350T116 431T190 481T280 498Q328 498 362 481T422 441L380 387Q359 406 336 418T283 430Q250 430 222 417T174 378T143 319T131 +242Q131 200 142 166T172 108T220 70T281 56Q315 56 343 70T395 105L431 50Q398 21 358 5T274 -12ZM185 -226L177 -186Q240 -181 263 -170T286 -136Q286 -116 269 -105T209 -88L253 3H306L277 -64Q312 -72 331 -88T350 -135Q350 -179 308 -200T185 -226Z" /> +<glyph unicode="è" glyph-name="egrave" horiz-adv-x="496" d="M279 -12Q230 -12 188 5T114 55T64 135T46 242Q46 302 64 349T113 430T183 480T264 498Q310 498 346 482T407 436T445 364T458 270Q458 257 458 245T455 223H127Q132 145 175 100T289 54Q324 +54 353 64T410 92L439 38Q407 18 368 3T279 -12ZM126 282H386Q386 356 355 394T266 433Q240 433 217 423T174 394T143 346T126 282ZM279 573L122 726L180 781L321 614L279 573Z" /> +<glyph unicode="é" glyph-name="eacute" horiz-adv-x="496" d="M279 -12Q230 -12 188 5T114 55T64 135T46 242Q46 302 64 349T113 430T183 480T264 498Q310 498 346 482T407 436T445 364T458 270Q458 257 458 245T455 223H127Q132 145 175 100T289 54Q324 +54 353 64T410 92L439 38Q407 18 368 3T279 -12ZM126 282H386Q386 356 355 394T266 433Q240 433 217 423T174 394T143 346T126 282ZM251 573L209 614L350 781L408 726L251 573Z" /> +<glyph unicode="ê" glyph-name="ecircumflex" horiz-adv-x="496" d="M279 -12Q230 -12 188 5T114 55T64 135T46 242Q46 302 64 349T113 430T183 480T264 498Q310 498 346 482T407 436T445 364T458 270Q458 257 458 245T455 223H127Q132 145 175 100T289 54Q324 +54 353 64T410 92L439 38Q407 18 368 3T279 -12ZM126 282H386Q386 356 355 394T266 433Q240 433 217 423T174 394T143 346T126 282ZM110 600L224 740H306L420 600L385 568L267 681H263L145 568L110 600Z" /> +<glyph unicode="ë" glyph-name="edieresis" horiz-adv-x="496" d="M279 -12Q230 -12 188 5T114 55T64 135T46 242Q46 302 64 349T113 430T183 480T264 498Q310 498 346 482T407 436T445 364T458 270Q458 257 458 245T455 223H127Q132 145 175 100T289 54Q324 +54 353 64T410 92L439 38Q407 18 368 3T279 -12ZM126 282H386Q386 356 355 394T266 433Q240 433 217 423T174 394T143 346T126 282ZM169 587Q147 587 133 601T119 637Q119 658 133 672T169 687Q190 687 204 673T218 637Q218 616 204 602T169 587ZM361 587Q340 587 +326 601T312 637Q312 658 326 672T361 687Q383 687 397 673T411 637Q411 616 397 602T361 587Z" /> +<glyph unicode="ì" glyph-name="igrave" horiz-adv-x="246" d="M82 0V486H164V0H82ZM137 573L-20 726L38 781L179 614L137 573Z" /> +<glyph unicode="í" glyph-name="iacute" horiz-adv-x="246" d="M82 0V486H164V0H82ZM109 573L67 614L208 781L266 726L109 573Z" /> +<glyph unicode="î" glyph-name="icircumflex" horiz-adv-x="246" d="M82 0V486H164V0H82ZM-32 600L82 740H164L278 600L243 568L125 681H121L3 568L-32 600Z" /> +<glyph unicode="ï" glyph-name="idieresis" horiz-adv-x="246" d="M82 0V486H164V0H82ZM27 587Q5 587 -9 601T-23 637Q-23 658 -9 672T27 687Q48 687 62 673T76 637Q76 616 62 602T27 587ZM219 587Q198 587 184 601T170 637Q170 658 184 672T219 687Q241 +687 255 673T269 637Q269 616 255 602T219 587Z" /> +<glyph unicode="ð" glyph-name="eth" horiz-adv-x="545" d="M269 -12Q227 -12 188 4T119 50T71 124T53 222Q53 273 69 314T112 385T177 431T259 447Q297 447 332 431T393 381Q379 443 352 489T286 573L145 500L121 541L248 606Q196 646 136 678L174 730Q210 +710 245 688T312 639L454 712L478 671L349 605Q409 544 447 460T485 257Q485 197 470 148T426 63T358 8T269 -12ZM271 56Q305 56 330 70T372 111T397 173T406 254Q406 268 406 282T404 309Q371 353 338 368T271 383Q238 383 212 371T168 337T141 286T131 222Q131 +184 142 154T172 102T217 68T271 56Z" /> +<glyph unicode="ñ" glyph-name="ntilde" horiz-adv-x="547" d="M82 0V486H150L157 416H160Q195 451 233 474T323 498Q400 498 435 450T471 308V0H389V297Q389 366 367 396T297 427Q259 427 230 408T164 352V0H82ZM364 577Q337 577 318 590T283 619T253 648T221 +661Q198 661 187 639T174 582L119 585Q120 614 126 639T145 682T175 710T220 721Q247 721 266 708T301 679T331 650T364 637Q386 637 397 659T410 716L465 712Q464 683 458 659T439 616T409 588T364 577Z" /> +<glyph unicode="ò" glyph-name="ograve" horiz-adv-x="542" d="M271 -12Q226 -12 186 5T114 54T65 134T46 242Q46 303 64 350T114 431T185 481T271 498Q316 498 356 481T428 431T477 351T496 242Q496 182 478 135T428 55T357 5T271 -12ZM271 56Q302 56 328 +69T372 107T401 166T411 242Q411 284 401 318T373 378T328 416T271 430Q240 430 214 417T170 378T141 319T131 242Q131 200 141 166T169 108T214 70T271 56ZM285 573L128 726L186 781L327 614L285 573Z" /> +<glyph unicode="ó" glyph-name="oacute" horiz-adv-x="542" d="M271 -12Q226 -12 186 5T114 54T65 134T46 242Q46 303 64 350T114 431T185 481T271 498Q316 498 356 481T428 431T477 351T496 242Q496 182 478 135T428 55T357 5T271 -12ZM271 56Q302 56 328 +69T372 107T401 166T411 242Q411 284 401 318T373 378T328 416T271 430Q240 430 214 417T170 378T141 319T131 242Q131 200 141 166T169 108T214 70T271 56ZM257 573L215 614L356 781L414 726L257 573Z" /> +<glyph unicode="ô" glyph-name="ocircumflex" horiz-adv-x="542" d="M271 -12Q226 -12 186 5T114 54T65 134T46 242Q46 303 64 350T114 431T185 481T271 498Q316 498 356 481T428 431T477 351T496 242Q496 182 478 135T428 55T357 5T271 -12ZM271 56Q302 +56 328 69T372 107T401 166T411 242Q411 284 401 318T373 378T328 416T271 430Q240 430 214 417T170 378T141 319T131 242Q131 200 141 166T169 108T214 70T271 56ZM116 600L230 740H312L426 600L391 568L273 681H269L151 568L116 600Z" /> +<glyph unicode="õ" glyph-name="otilde" horiz-adv-x="542" d="M271 -12Q226 -12 186 5T114 54T65 134T46 242Q46 303 64 350T114 431T185 481T271 498Q316 498 356 481T428 431T477 351T496 242Q496 182 478 135T428 55T357 5T271 -12ZM271 56Q302 56 328 +69T372 107T401 166T411 242Q411 284 401 318T373 378T328 416T271 430Q240 430 214 417T170 378T141 319T131 242Q131 200 141 166T169 108T214 70T271 56ZM343 577Q316 577 297 590T262 619T232 648T200 661Q177 661 166 639T153 582L98 585Q99 614 105 639T124 +682T154 710T199 721Q226 721 245 708T280 679T310 650T343 637Q365 637 376 659T389 716L444 712Q443 683 437 659T418 616T388 588T343 577Z" /> +<glyph unicode="ö" glyph-name="odieresis" horiz-adv-x="542" d="M271 -12Q226 -12 186 5T114 54T65 134T46 242Q46 303 64 350T114 431T185 481T271 498Q316 498 356 481T428 431T477 351T496 242Q496 182 478 135T428 55T357 5T271 -12ZM271 56Q302 56 +328 69T372 107T401 166T411 242Q411 284 401 318T373 378T328 416T271 430Q240 430 214 417T170 378T141 319T131 242Q131 200 141 166T169 108T214 70T271 56ZM175 587Q153 587 139 601T125 637Q125 658 139 672T175 687Q196 687 210 673T224 637Q224 616 210 +602T175 587ZM367 587Q346 587 332 601T318 637Q318 658 332 672T367 687Q389 687 403 673T417 637Q417 616 403 602T367 587Z" /> +<glyph unicode="÷" glyph-name="divide" horiz-adv-x="497" d="M34 299V361H463V299H34ZM249 96Q226 96 210 111T194 150Q194 173 210 188T249 203Q272 203 287 188T303 150Q303 126 288 111T249 96ZM249 456Q226 456 210 471T194 510Q194 533 210 548T249 +563Q272 563 287 548T303 510Q303 486 288 471T249 456Z" /> +<glyph unicode="ø" glyph-name="oslash" horiz-adv-x="542" d="M271 -12Q192 -12 132 37L83 -23L46 6L100 71Q75 103 61 145T46 242Q46 303 64 350T114 431T185 481T271 498Q309 498 345 486T410 448L460 509L496 480L442 415Q467 383 481 340T496 242Q496 +182 478 135T428 55T357 5T271 -12ZM127 246Q127 179 150 133L364 392Q327 432 271 432Q240 432 214 419T168 381T138 322T127 246ZM271 54Q302 54 328 67T374 105T404 164T415 239Q415 306 391 353L178 93Q217 54 271 54Z" /> +<glyph unicode="ù" glyph-name="ugrave" horiz-adv-x="544" d="M224 -12Q146 -12 111 36T75 178V486H158V189Q158 120 179 90T249 59Q287 59 316 78T380 141V486H462V0H394L387 76H384Q350 36 313 12T224 -12ZM286 573L129 726L187 781L328 614L286 573Z" /> +<glyph unicode="ú" glyph-name="uacute" horiz-adv-x="544" d="M224 -12Q146 -12 111 36T75 178V486H158V189Q158 120 179 90T249 59Q287 59 316 78T380 141V486H462V0H394L387 76H384Q350 36 313 12T224 -12ZM258 573L216 614L357 781L415 726L258 573Z" /> +<glyph unicode="û" glyph-name="ucircumflex" horiz-adv-x="544" d="M224 -12Q146 -12 111 36T75 178V486H158V189Q158 120 179 90T249 59Q287 59 316 78T380 141V486H462V0H394L387 76H384Q350 36 313 12T224 -12ZM117 600L231 740H313L427 600L392 568L274 +681H270L152 568L117 600Z" /> +<glyph unicode="ü" glyph-name="udieresis" horiz-adv-x="544" d="M224 -12Q146 -12 111 36T75 178V486H158V189Q158 120 179 90T249 59Q287 59 316 78T380 141V486H462V0H394L387 76H384Q350 36 313 12T224 -12ZM176 587Q154 587 140 601T126 637Q126 658 +140 672T176 687Q197 687 211 673T225 637Q225 616 211 602T176 587ZM368 587Q347 587 333 601T319 637Q319 658 333 672T368 687Q390 687 404 673T418 637Q418 616 404 602T368 587Z" /> +<glyph unicode="ý" glyph-name="yacute" horiz-adv-x="467" d="M90 -209Q73 -209 59 -207T33 -199L49 -134Q57 -136 67 -138T86 -141Q128 -141 154 -112T196 -37L207 -1L12 486H97L196 217Q207 185 219 150T243 80H247Q258 113 268 149T288 217L375 486H455L272 +-40Q259 -76 243 -107T205 -160T155 -196T90 -209ZM228 573L186 614L327 781L385 726L228 573Z" /> +<glyph unicode="þ" glyph-name="thorn" horiz-adv-x="555" d="M82 -205V712H164V518L163 435Q195 461 233 479T311 498Q359 498 395 481T457 431T494 353T507 250Q507 188 490 140T444 57T377 6T297 -12Q262 -12 229 2T163 42L164 -41V-205H82ZM283 57Q313 +57 338 70T382 108T411 169T422 250Q422 290 415 323T393 379T353 416T294 429Q263 429 232 412T164 363V108Q197 80 228 69T283 57Z" /> +<glyph unicode="ÿ" glyph-name="ydieresis" horiz-adv-x="467" d="M90 -209Q73 -209 59 -207T33 -199L49 -134Q57 -136 67 -138T86 -141Q128 -141 154 -112T196 -37L207 -1L12 486H97L196 217Q207 185 219 150T243 80H247Q258 113 268 149T288 217L375 486H455L272 +-40Q259 -76 243 -107T205 -160T155 -196T90 -209ZM146 587Q124 587 110 601T96 637Q96 658 110 672T146 687Q167 687 181 673T195 637Q195 616 181 602T146 587ZM338 587Q317 587 303 601T289 637Q289 658 303 672T338 687Q360 687 374 673T388 637Q388 616 374 +602T338 587Z" /> +<glyph unicode="–" glyph-name="endash" horiz-adv-x="480" d="M41 223V280H439V223H41Z" /> +<glyph unicode="—" glyph-name="emdash" horiz-adv-x="800" d="M41 223V280H759V223H41Z" /> +<glyph unicode="‘" glyph-name="quoteleft" horiz-adv-x="249" d="M120 428Q90 428 74 451T57 518Q57 578 84 622T163 696L187 657Q149 632 130 604T111 533Q114 534 120 534Q140 534 156 521T173 483Q173 457 158 443T120 428Z" /> +<glyph unicode="’" glyph-name="quoteright" horiz-adv-x="249" d="M86 431L63 469Q101 494 119 522T138 594Q135 593 130 593Q109 593 93 606T77 643Q77 669 92 684T130 699Q159 699 176 676T193 608Q193 548 166 505T86 431Z" /> +<glyph unicode="‚" glyph-name="quotesinglbase" horiz-adv-x="249" d="M86 -144L63 -106Q101 -81 119 -53T138 19Q135 18 130 18Q109 18 93 31T77 68Q77 94 92 109T130 124Q159 124 176 101T193 33Q193 -27 166 -70T86 -144Z" /> +<glyph unicode="“" glyph-name="quotedblleft" horiz-adv-x="425" d="M120 428Q90 428 74 451T57 518Q57 578 84 622T163 696L187 657Q149 632 130 604T111 533Q114 534 120 534Q140 534 156 521T173 483Q173 457 158 443T120 428ZM296 428Q266 428 250 +451T233 518Q233 578 260 622T339 696L363 657Q325 632 306 604T287 533Q290 534 296 534Q316 534 332 521T349 483Q349 457 334 443T296 428Z" /> +<glyph unicode="”" glyph-name="quotedblright" horiz-adv-x="425" d="M86 431L63 469Q101 494 119 522T138 594Q135 593 130 593Q109 593 93 606T77 643Q77 669 92 684T130 699Q159 699 176 676T193 608Q193 548 166 505T86 431ZM262 431L239 469Q277 +494 295 522T314 594Q311 593 306 593Q285 593 269 606T253 643Q253 669 268 684T306 699Q335 699 352 676T369 608Q369 548 342 505T262 431Z" /> +<glyph unicode="„" glyph-name="quotedblbase" horiz-adv-x="425" d="M86 -144L63 -106Q101 -81 119 -53T138 19Q135 18 130 18Q109 18 93 31T77 68Q77 94 92 109T130 124Q159 124 176 101T193 33Q193 -27 166 -70T86 -144ZM262 -144L239 -106Q277 -81 +295 -53T314 19Q311 18 306 18Q285 18 269 31T253 68Q253 94 268 109T306 124Q335 124 352 101T369 33Q369 -27 342 -70T262 -144Z" /> +<glyph unicode="•" glyph-name="bullet" horiz-adv-x="304" d="M152 143Q129 143 109 151T74 176T49 214T40 263Q40 290 49 312T73 350T109 375T152 384Q174 384 194 375T230 351T255 313T264 263Q264 236 255 214T231 176T195 152T152 143Z" /> +<glyph unicode="‹" glyph-name="guilsinglleft" horiz-adv-x="271" d="M181 66L45 221V283L181 438L217 408L99 252L217 94L181 66Z" /> +<glyph unicode="›" glyph-name="guilsinglright" horiz-adv-x="271" d="M89 66L54 94L172 252L54 408L89 438L226 283V221L89 66Z" /> +</font> +</defs> +</svg> diff --git a/static/fonts/sourcesanspro/Source_Sans_Pro_400.ttf b/static/fonts/sourcesanspro/Source_Sans_Pro_400.ttf new file mode 100644 index 000000000..e1247aef6 Binary files /dev/null and b/static/fonts/sourcesanspro/Source_Sans_Pro_400.ttf differ diff --git a/static/fonts/sourcesanspro/Source_Sans_Pro_400.woff b/static/fonts/sourcesanspro/Source_Sans_Pro_400.woff new file mode 100644 index 000000000..16f51fff1 Binary files /dev/null and b/static/fonts/sourcesanspro/Source_Sans_Pro_400.woff differ diff --git a/static/fonts/sourcesanspro/Source_Sans_Pro_400.woff2 b/static/fonts/sourcesanspro/Source_Sans_Pro_400.woff2 new file mode 100644 index 000000000..efa300c56 Binary files /dev/null and b/static/fonts/sourcesanspro/Source_Sans_Pro_400.woff2 differ diff --git a/static/fonts/sourcesanspro/Source_Sans_Pro_600.eot b/static/fonts/sourcesanspro/Source_Sans_Pro_600.eot new file mode 100644 index 000000000..46508d418 Binary files /dev/null and b/static/fonts/sourcesanspro/Source_Sans_Pro_600.eot differ diff --git a/static/fonts/sourcesanspro/Source_Sans_Pro_600.svg b/static/fonts/sourcesanspro/Source_Sans_Pro_600.svg new file mode 100644 index 000000000..3fda041c6 --- /dev/null +++ b/static/fonts/sourcesanspro/Source_Sans_Pro_600.svg @@ -0,0 +1,343 @@ +<?xml version="1.0" standalone="no"?> +<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> +<svg xmlns="http://www.w3.org/2000/svg"> +<defs > +<font id="SourceSansPro" horiz-adv-x="540" ><font-face + font-family="Source Sans Pro SemiBold" + units-per-em="1000" + panose-1="2 11 6 3 3 4 3 2 2 4" + ascent="984" + descent="-273" + alphabetic="0" /> +<glyph unicode=" " glyph-name="space" horiz-adv-x="200" /> +<glyph unicode="!" glyph-name="exclam" horiz-adv-x="315" d="M119 215L103 556L100 670H216L212 556L196 215H119ZM158 -12Q126 -12 105 10T83 66Q83 100 104 122T158 144Q190 144 211 122T232 66Q232 32 211 10T158 -12Z" /> +<glyph unicode=""" glyph-name="quotedbl" horiz-adv-x="482" d="M104 392L82 575L78 688H196L193 575L170 392H104ZM311 392L289 575L285 688H403L400 575L377 392H311Z" /> +<glyph unicode="#" glyph-name="numbersign" horiz-adv-x="513" d="M88 0L112 195H35V271H120L136 400H55V476H146L168 650H237L216 476H333L356 650H424L403 476H483V400H394L378 271H463V195H369L346 0H276L299 195H182L158 0H88ZM190 271H308L324 400H206L190 271Z" /> +<glyph unicode="$" glyph-name="dollar" horiz-adv-x="513" d="M218 -110V-10Q172 -5 126 14T45 66L97 144Q132 116 168 99T245 82Q294 82 318 104T342 168Q342 201 322 223T272 263T206 297T141 336T90 390T70 469Q70 539 110 585T218 644V746H298V646Q346 640 +380 619T443 568L384 501Q356 527 330 540T268 554Q227 554 204 534T181 474Q181 444 201 425T251 389T317 356T382 316T433 260T453 176Q453 104 413 56T298 -7V-110H218Z" /> +<glyph unicode="%" glyph-name="percent" horiz-adv-x="841" d="M186 252Q117 252 74 306T30 460Q30 559 73 612T186 666Q255 666 298 613T342 460Q342 361 299 307T186 252ZM186 319Q218 319 238 352T259 460Q259 534 239 566T186 599Q154 599 134 567T113 460Q113 +386 133 353T186 319ZM206 -12L563 666H633L277 -12H206ZM655 -12Q586 -12 543 42T499 196Q499 295 542 348T655 402Q724 402 767 349T811 196Q811 97 768 43T655 -12ZM655 55Q687 55 707 88T728 196Q728 270 708 302T655 335Q623 335 603 303T582 196Q582 122 +602 89T655 55Z" /> +<glyph unicode="&" glyph-name="ampersand" horiz-adv-x="639" d="M237 -12Q188 -12 150 2T84 41T43 99T28 172Q28 206 38 233T65 282T105 323T153 359Q133 397 122 433T111 503Q111 537 122 566T156 618T208 653T276 666Q343 666 381 628T420 527Q420 495 +408 468T376 419T331 376T278 337Q308 296 346 258T427 187Q454 223 475 266T510 361H616Q598 299 570 242T504 134Q536 114 566 101T622 82L593 -12Q555 -3 515 14T434 58Q395 26 346 7T237 -12ZM207 504Q207 481 214 458T233 408Q274 434 302 461T330 526Q330 +552 318 570T277 588Q246 588 227 565T207 504ZM251 77Q278 77 304 87T356 116Q312 153 273 194T201 281Q173 258 156 234T138 179Q138 133 170 105T251 77Z" /> +<glyph unicode="'" glyph-name="quotesingle" horiz-adv-x="275" d="M104 392L82 575L78 688H196L193 575L170 392H104Z" /> +<glyph unicode="(" glyph-name="parenleft" horiz-adv-x="324" d="M209 -178Q146 -75 112 35T77 278Q77 411 111 521T209 734L281 702Q224 605 198 497T171 278Q171 167 197 59T281 -146L209 -178Z" /> +<glyph unicode=")" glyph-name="parenright" horiz-adv-x="324" d="M115 -178L43 -146Q100 -49 126 59T153 278Q153 389 127 497T43 702L115 734Q178 631 212 521T247 278Q247 145 213 35T115 -178Z" /> +<glyph unicode="*" glyph-name="asterisk" horiz-adv-x="438" d="M143 384L92 421L150 519L48 564L67 624L176 599L187 712H250L261 599L371 624L390 564L287 519L345 421L294 384L219 471L143 384Z" /> +<glyph unicode="+" glyph-name="plus" horiz-adv-x="513" d="M213 99V288H34V372H213V561H300V372H479V288H300V99H213Z" /> +<glyph unicode="," glyph-name="comma" horiz-adv-x="275" d="M72 -182L47 -119Q96 -100 122 -68T148 2H139Q110 2 88 20T65 73Q65 105 87 124T142 144Q183 144 205 113T228 26Q228 -48 188 -102T72 -182Z" /> +<glyph unicode="-" glyph-name="hyphen" horiz-adv-x="322" d="M42 210V294H280V210H42Z" /> +<glyph unicode="." glyph-name="period" horiz-adv-x="275" d="M138 -12Q106 -12 85 10T63 66Q63 100 84 122T138 144Q170 144 191 122T212 66Q212 32 191 10T138 -12Z" /> +<glyph unicode="/" glyph-name="slash" horiz-adv-x="344" d="M12 -160L245 710H323L90 -160H12Z" /> +<glyph unicode="0" glyph-name="zero" horiz-adv-x="513" d="M256 -12Q156 -12 98 73T40 321Q40 483 98 565T256 648Q356 648 414 565T472 321Q472 159 414 74T256 -12ZM256 78Q279 78 298 90T332 132T354 207T362 321Q362 388 354 433T332 507T299 546T256 558Q233 +558 214 547T180 507T158 434T150 321Q150 253 158 207T180 132T213 91T256 78Z" /> +<glyph unicode="1" glyph-name="one" horiz-adv-x="513" d="M74 0V94H216V512H99V584Q147 593 181 605T246 636H332V94H457V0H74Z" /> +<glyph unicode="2" glyph-name="two" horiz-adv-x="513" d="M38 0V67Q104 131 157 185T248 285T306 371T326 447Q326 498 299 527T221 557Q184 557 154 536T97 486L33 550Q77 597 123 622T236 648Q282 648 319 634T382 595T422 533T437 453Q437 411 419 368T369 +280T295 188T206 91Q231 93 260 95T312 98H468V0H38Z" /> +<glyph unicode="3" glyph-name="three" horiz-adv-x="513" d="M240 -12Q162 -12 110 14T24 78L79 152Q108 123 145 103T230 82Q282 82 314 107T347 178Q347 203 338 223T308 257T250 278T160 286V370Q207 370 238 377T289 398T317 431T326 472Q326 512 301 534T232 +557Q194 557 164 541T104 497L45 568Q86 604 132 626T236 648Q282 648 320 637T385 605T427 552T442 480Q442 426 413 390T331 334V330Q388 315 425 275T463 172Q463 128 446 94T398 37T327 1T240 -12Z" /> +<glyph unicode="4" glyph-name="four" horiz-adv-x="513" d="M299 0V164H18V242L270 636H407V253H487V164H407V0H299ZM132 253H299V397Q299 425 300 463T304 529H300Q288 504 275 480T248 430L132 253Z" /> +<glyph unicode="5" glyph-name="five" horiz-adv-x="513" d="M241 -12Q164 -12 112 14T24 76L77 150Q106 123 142 103T226 82Q280 82 314 114T349 204Q349 261 317 292T232 323Q201 323 180 315T130 287L75 322L94 636H434V539H194L181 385Q201 395 220 400T265 +406Q306 406 342 394T406 358T449 296T465 207Q465 155 447 114T397 45T326 3T241 -12Z" /> +<glyph unicode="6" glyph-name="six" horiz-adv-x="513" d="M275 -12Q228 -12 186 6T113 63T63 160T44 299Q44 392 65 458T120 566T200 628T294 648Q352 648 393 627T464 576L402 506Q385 527 358 540T301 554Q271 554 245 542T198 503T166 430T151 319Q179 354 +216 374T289 394Q330 394 364 382T423 346T461 284T475 197Q475 149 459 111T416 45T353 3T275 -12ZM273 76Q313 76 340 107T368 197Q368 254 342 282T268 310Q241 310 211 294T154 237Q163 152 194 114T273 76Z" /> +<glyph unicode="7" glyph-name="seven" horiz-adv-x="513" d="M168 0Q172 85 183 155T214 290T267 414T345 539H44V636H471V566Q415 497 381 435T326 307T298 167T285 0H168Z" /> +<glyph unicode="8" glyph-name="eight" horiz-adv-x="513" d="M257 -12Q210 -12 171 1T103 37T58 92T41 163Q41 193 50 217T76 262T112 298T156 326V330Q119 356 94 392T68 479Q68 518 82 549T122 602T183 636T260 648Q303 648 337 636T396 601T434 547T447 476Q447 +452 440 431T420 391T393 357T362 330V326Q384 314 404 299T439 263T463 218T472 161Q472 124 457 93T413 38T345 1T257 -12ZM299 359Q325 385 338 412T352 469Q352 511 328 538T258 566Q221 566 196 544T171 479Q171 455 181 437T208 406T249 381T299 359ZM259 +70Q305 70 334 95T364 165Q364 191 352 209T320 242T271 269T211 294Q181 272 162 242T142 175Q142 127 176 99T259 70Z" /> +<glyph unicode="9" glyph-name="nine" horiz-adv-x="513" d="M244 326Q272 326 302 343T358 400Q349 484 317 522T238 560Q199 560 171 529T143 440Q143 383 169 355T244 326ZM217 -12Q160 -12 118 9T47 60L109 130Q127 109 154 96T211 82Q241 82 267 94T314 133T346 +206T361 317Q333 282 295 263T222 243Q181 243 147 255T89 291T51 353T37 440Q37 488 53 526T96 592T159 633T237 648Q283 648 325 630T398 573T448 477T467 338Q467 245 447 179T392 71T312 8T217 -12Z" /> +<glyph unicode=":" glyph-name="colon" horiz-adv-x="275" d="M138 330Q106 330 85 352T63 408Q63 442 84 464T138 486Q170 486 191 464T212 408Q212 374 191 352T138 330ZM138 -12Q106 -12 85 10T63 66Q63 100 84 122T138 144Q170 144 191 122T212 66Q212 32 +191 10T138 -12Z" /> +<glyph unicode=";" glyph-name="semicolon" horiz-adv-x="275" d="M138 330Q106 330 85 352T63 408Q63 442 84 464T138 486Q170 486 191 464T212 408Q212 374 191 352T138 330ZM72 -182L47 -119Q96 -100 122 -68T148 2H139Q110 2 88 20T65 73Q65 105 87 124T142 +144Q183 144 205 113T228 26Q228 -48 188 -102T72 -182Z" /> +<glyph unicode="<" glyph-name="less" horiz-adv-x="513" d="M479 117L34 290V374L479 547V450L286 382L151 334V330L286 282L479 214V117Z" /> +<glyph unicode="=" glyph-name="equal" horiz-adv-x="513" d="M34 400V484H479V400H34ZM34 433V517H479V433H34Z" /> +<glyph unicode=">" glyph-name="greater" horiz-adv-x="513" d="M34 117V214L227 282L362 330V334L227 382L34 450V547L479 374V290L34 117Z" /> +<glyph unicode="?" glyph-name="question" horiz-adv-x="444" d="M157 215Q152 251 159 281T181 336T214 382T249 424T277 465T288 508Q288 544 267 566T207 588Q176 588 151 574T104 536L40 595Q73 633 118 657T221 682Q260 682 293 672T349 640T386 588T400 +516Q400 484 389 459T360 410T324 366T289 322T264 273T258 215H157ZM208 -12Q176 -12 155 10T134 66Q134 100 155 122T208 144Q240 144 261 122T283 66Q283 32 262 10T208 -12Z" /> +<glyph unicode="@" glyph-name="at" horiz-adv-x="875" d="M416 -164Q342 -164 276 -141T159 -72T80 43T50 204Q50 307 85 390T179 533T317 625T484 658Q562 658 625 633T733 563T802 454T826 314Q826 247 807 197T756 112T687 61T612 44Q569 44 539 63T502 120H500Q477 +90 444 71T379 52Q324 52 289 90T253 198Q253 241 267 283T308 360T370 415T450 437Q502 437 528 388H530L543 429H616L573 218Q548 117 623 117Q646 117 669 130T710 169T739 229T750 310Q750 367 734 417T684 504T598 564T475 586Q409 586 347 559T237 483T160 +364T130 208Q130 134 153 78T216 -15T310 -72T425 -91Q467 -91 508 -80T582 -50L609 -114Q521 -164 416 -164ZM403 127Q421 127 440 139T482 179L508 326Q486 361 453 361Q427 361 407 346T372 308T350 258T342 205Q342 164 358 146T403 127Z" /> +<glyph unicode="A" glyph-name="A" horiz-adv-x="558" d="M217 348L194 268H361L338 348Q322 400 308 455T279 564H275Q261 509 247 455T217 348ZM-2 0L211 654H347L560 0H438L387 177H167L116 0H-2Z" /> +<glyph unicode="B" glyph-name="B" horiz-adv-x="597" d="M83 0V654H292Q343 654 385 646T459 619T508 569T526 493Q526 446 502 406T435 351V347Q489 335 524 297T560 192Q560 143 541 107T489 47T409 12T309 0H83ZM199 384H282Q351 384 381 409T412 476Q412 +524 380 544T284 564H199V384ZM199 90H297Q369 90 408 116T447 198Q447 250 409 273T297 297H199V90Z" /> +<glyph unicode="C" glyph-name="C" horiz-adv-x="576" d="M344 -12Q282 -12 228 10T135 75T72 181T49 325Q49 405 72 468T136 576T231 643T348 666Q410 666 458 641T537 583L475 508Q449 534 419 549T351 565Q311 565 278 549T220 502T182 427T168 328Q168 216 +216 153T348 89Q392 89 426 107T488 156L550 83Q510 37 459 13T344 -12Z" /> +<glyph unicode="D" glyph-name="D" horiz-adv-x="625" d="M83 0V654H258Q408 654 492 573T576 330Q576 249 555 187T493 84T395 21T264 0H83ZM199 94H250Q350 94 403 151T457 330Q457 450 403 505T250 560H199V94Z" /> +<glyph unicode="E" glyph-name="E" horiz-adv-x="538" d="M83 0V654H477V556H199V389H434V291H199V98H487V0H83Z" /> +<glyph unicode="F" glyph-name="F" horiz-adv-x="510" d="M83 0V654H478V556H199V371H437V273H199V0H83Z" /> +<glyph unicode="G" glyph-name="G" horiz-adv-x="628" d="M357 -12Q291 -12 235 10T137 75T72 181T49 325Q49 405 73 468T138 576T236 643T358 666Q428 666 476 641T556 583L494 508Q469 532 439 548T362 565Q318 565 283 549T222 502T182 427T168 328Q168 216 +218 153T368 89Q396 89 421 96T462 118V259H338V354H566V66Q533 33 479 11T357 -12Z" /> +<glyph unicode="H" glyph-name="H" horiz-adv-x="663" d="M83 0V654H199V391H464V654H580V0H464V290H199V0H83Z" /> +<glyph unicode="I" glyph-name="I" horiz-adv-x="282" d="M83 0V654H199V0H83Z" /> +<glyph unicode="J" glyph-name="J" horiz-adv-x="494" d="M219 -12Q150 -12 103 16T24 99L104 158Q124 122 150 106T206 89Q252 89 275 117T298 215V654H414V205Q414 160 403 121T368 52T307 5T219 -12Z" /> +<glyph unicode="K" glyph-name="K" horiz-adv-x="597" d="M83 0V654H199V357H202L435 654H564L363 399L598 0H470L293 308L199 191V0H83Z" /> +<glyph unicode="L" glyph-name="L" horiz-adv-x="502" d="M83 0V654H199V98H471V0H83Z" /> +<glyph unicode="M" glyph-name="M" horiz-adv-x="745" d="M83 0V654H214L330 334Q341 303 351 271T372 206H376Q387 238 396 270T417 334L530 654H662V0H555V299Q555 322 556 349T560 403T565 457T570 507H566L513 355L406 61H337L229 355L177 507H173Q175 484 +177 458T182 404T186 349T188 299V0H83Z" /> +<glyph unicode="N" glyph-name="N" horiz-adv-x="656" d="M83 0V654H202L406 286L473 147H477Q473 198 468 256T462 370V654H573V0H454L250 368L183 507H179Q183 455 188 398T194 286V0H83Z" /> +<glyph unicode="O" glyph-name="O" horiz-adv-x="674" d="M337 -12Q273 -12 220 11T129 79T70 187T49 330Q49 409 70 471T129 577T220 643T337 666Q401 666 454 643T545 577T605 472T626 330Q626 250 605 187T546 80T454 12T337 -12ZM337 89Q376 89 407 106T460 +154T494 230T506 330Q506 440 461 502T337 565Q259 565 214 503T168 330Q168 275 180 231T214 155T267 106T337 89Z" /> +<glyph unicode="P" glyph-name="P" horiz-adv-x="582" d="M83 0V654H289Q343 654 389 644T470 610T523 548T542 452Q542 398 523 358T471 292T392 253T293 240H199V0H83ZM199 333H284Q428 333 428 452Q428 514 391 537T280 561H199V333Z" /> +<glyph unicode="Q" glyph-name="Q" horiz-adv-x="674" d="M337 83Q376 83 407 100T460 149T494 227T506 330Q506 440 461 502T337 565Q259 565 214 503T168 330Q168 273 180 227T214 149T267 100T337 83ZM545 -174Q447 -174 381 -127T283 -7Q230 2 187 29T113 +100T66 201T49 330Q49 409 70 471T129 577T220 643T337 666Q401 666 454 643T545 577T605 472T626 330Q626 262 611 206T566 106T497 35T406 -4Q429 -43 469 -61T558 -79Q580 -79 597 -77T629 -69L650 -155Q633 -163 606 -168T545 -174Z" /> +<glyph unicode="R" glyph-name="R" horiz-adv-x="592" d="M83 0V654H304Q355 654 399 644T475 612T525 552T544 460Q544 385 509 339T414 273L570 0H440L299 256H199V0H83ZM199 348H292Q359 348 394 376T430 460Q430 517 395 539T292 561H199V348Z" /> +<glyph unicode="S" glyph-name="S" horiz-adv-x="545" d="M274 -12Q208 -12 147 13T38 84L106 163Q141 130 186 110T276 89Q332 89 361 112T390 173Q390 193 383 207T362 231T330 251T289 269L199 308Q175 318 152 333T109 369T79 418T67 482Q67 521 83 554T129 +613T198 652T287 666Q344 666 397 644T488 583L429 509Q397 535 363 550T287 565Q240 565 212 545T184 488Q184 469 192 456T215 432T249 413T288 396L377 359Q406 347 430 331T471 294T499 246T509 182Q509 142 493 107T447 46T373 4T274 -12Z" /> +<glyph unicode="T" glyph-name="T" horiz-adv-x="546" d="M215 0V556H26V654H520V556H331V0H215Z" /> +<glyph unicode="U" glyph-name="U" horiz-adv-x="655" d="M328 -12Q271 -12 226 4T148 57T98 149T80 287V654H196V278Q196 225 205 189T232 130T274 99T328 89Q358 89 383 98T426 130T454 188T464 278V654H575V287Q575 206 558 150T509 57T431 5T328 -12Z" /> +<glyph unicode="V" glyph-name="V" horiz-adv-x="536" d="M200 0L-4 654H119L211 325Q227 269 239 219T269 112H273Q290 169 302 219T330 325L421 654H540L337 0H200Z" /> +<glyph unicode="W" glyph-name="W" horiz-adv-x="800" d="M148 0L18 654H137L194 324Q202 271 210 219T226 115H230Q241 167 251 219T273 324L353 654H454L534 324Q545 273 556 221T578 115H582Q590 168 597 220T613 324L670 654H781L656 0H512L431 344Q423 382 +416 419T402 495H398Q391 457 384 420T368 344L289 0H148Z" /> +<glyph unicode="X" glyph-name="X" horiz-adv-x="541" d="M13 0L199 337L25 654H154L226 509Q238 486 249 462T276 409H280Q292 438 302 462T324 509L393 654H516L342 332L528 0H399L319 154Q306 180 294 205T266 261H262Q249 231 238 206T214 154L136 0H13Z" /> +<glyph unicode="Y" glyph-name="Y" horiz-adv-x="501" d="M192 0V243L-4 654H120L191 487Q205 450 219 416T249 343H253Q269 381 284 415T313 487L384 654H505L308 243V0H192Z" /> +<glyph unicode="Z" glyph-name="Z" d="M40 0V70L356 556H69V654H500V584L183 98H502V0H40Z" /> +<glyph unicode="[" glyph-name="bracketleft" horiz-adv-x="324" d="M90 -152V708H286V645H177V-89H286V-152H90Z" /> +<glyph unicode="\" glyph-name="backslash" horiz-adv-x="344" d="M255 -160L21 710H99L333 -160H255Z" /> +<glyph unicode="]" glyph-name="bracketright" horiz-adv-x="324" d="M38 -152V-89H147V645H38V708H234V-152H38Z" /> +<glyph unicode="^" glyph-name="asciicircum" horiz-adv-x="513" d="M55 279L208 670H304L458 279H361L306 430L258 565H254L207 430L152 279H55Z" /> +<glyph unicode="_" glyph-name="underscore" horiz-adv-x="500" d="M12 -133V-64H488V-133H12Z" /> +<glyph unicode="`" glyph-name="grave" horiz-adv-x="549" d="M276 573L106 728L186 804L333 630L276 573Z" /> +<glyph unicode="a" glyph-name="a" horiz-adv-x="516" d="M192 -12Q127 -12 87 27T47 132Q47 171 63 201T115 254T205 291T336 314Q335 333 331 350T316 381T288 402T246 410Q210 410 176 396T108 362L66 439Q107 465 158 484T268 503Q360 503 405 449T451 291V0H356L348 +54H344Q311 26 274 7T192 -12ZM229 78Q259 78 283 92T336 132V242Q286 236 252 226T197 204T167 175T158 141Q158 108 178 93T229 78Z" /> +<glyph unicode="b" glyph-name="b" horiz-adv-x="563" d="M311 -12Q277 -12 243 4T177 52H174L164 0H73V706H188V524L185 442Q216 469 252 486T327 503Q373 503 409 486T470 436T508 357T521 254Q521 191 504 142T457 58T390 6T311 -12ZM287 83Q336 83 369 125T402 +252Q402 326 377 367T296 408Q244 408 188 353V124Q214 101 239 92T287 83Z" /> +<glyph unicode="c" glyph-name="c" horiz-adv-x="462" d="M278 -12Q228 -12 185 5T109 55T59 136T41 245Q41 306 61 354T115 435T193 485T287 503Q335 503 369 487T431 448L375 373Q355 390 336 399T293 409Q233 409 196 365T159 245Q159 171 195 127T290 82Q319 +82 344 94T391 124L438 48Q403 18 362 3T278 -12Z" /> +<glyph unicode="d" glyph-name="d" horiz-adv-x="564" d="M245 -12Q152 -12 98 55T43 245Q43 305 60 353T107 434T173 485T251 503Q293 503 322 489T380 449L376 528V706H491V0H396L388 53H384Q357 26 321 7T245 -12ZM273 83Q328 83 376 138V367Q350 390 326 399T276 +408Q228 408 195 366T162 246Q162 166 190 125T273 83Z" /> +<glyph unicode="e" glyph-name="e" horiz-adv-x="507" d="M283 -12Q232 -12 188 5T111 56T60 136T41 245Q41 305 60 353T110 434T183 485T267 503Q317 503 355 486T418 438T457 364T470 270Q470 253 469 238T465 214H153Q161 148 199 113T298 77Q330 77 357 86T412 +113L451 41Q416 18 373 3T283 -12ZM152 292H370Q370 349 346 381T270 414Q226 414 193 383T152 292Z" /> +<glyph unicode="f" glyph-name="f" horiz-adv-x="317" d="M93 0V400H27V486L93 491V542Q93 580 102 612T131 668T181 705T256 718Q282 718 305 713T346 701L324 615Q297 627 270 627Q208 627 208 544V491H304V400H208V0H93Z" /> +<glyph unicode="g" glyph-name="g" horiz-adv-x="520" d="M244 -217Q200 -217 163 -209T98 -185T56 -145T40 -89Q40 -58 58 -32T110 16V20Q91 32 79 52T66 102Q66 131 82 154T120 193V197Q95 216 76 249T56 327Q56 369 72 402T114 457T176 491T250 503Q270 503 +288 500T322 491H498V406H408Q420 392 428 371T436 323Q436 282 422 251T382 199T323 167T250 156Q234 156 217 159T183 169Q172 159 166 149T159 122Q159 101 176 89T239 77H326Q415 77 460 49T506 -44Q506 -80 488 -112T435 -167T353 -203T244 -217ZM250 228Q285 +228 310 253T335 327Q335 373 311 398T250 424Q214 424 189 399T164 327Q164 279 189 254T250 228ZM262 -142Q322 -142 358 -119T395 -63Q395 -34 373 -24T308 -14H241Q201 -14 174 -7Q136 -36 136 -72Q136 -105 169 -123T262 -142Z" /> +<glyph unicode="h" glyph-name="h" horiz-adv-x="558" d="M73 0V706H188V524L184 429Q215 458 252 480T341 503Q420 503 456 453T492 308V0H377V293Q377 354 359 379T300 404Q268 404 244 389T188 343V0H73Z" /> +<glyph unicode="i" glyph-name="i" horiz-adv-x="262" d="M73 0V491H188V0H73ZM131 577Q100 577 80 595T60 642Q60 671 80 689T131 708Q162 708 182 690T202 642Q202 613 182 595T131 577Z" /> +<glyph unicode="j" glyph-name="j" horiz-adv-x="263" d="M34 -206Q7 -206 -12 -202T-46 -193L-24 -107Q-14 -110 -4 -112T18 -115Q51 -115 62 -93T74 -27V491H190V-25Q190 -64 182 -97T156 -154T107 -192T34 -206ZM132 577Q102 577 82 595T61 642Q61 671 81 689T132 +708Q163 708 183 690T204 642Q204 613 184 595T132 577Z" /> +<glyph unicode="k" glyph-name="k" horiz-adv-x="522" d="M73 0V706H186V265H189L371 491H497L329 291L514 0H389L263 213L186 125V0H73Z" /> +<glyph unicode="l" glyph-name="l" horiz-adv-x="271" d="M185 -12Q123 -12 98 25T73 126V706H188V120Q188 99 196 91T213 82Q217 82 220 82T231 84L246 -2Q223 -12 185 -12Z" /> +<glyph unicode="m" glyph-name="m" horiz-adv-x="843" d="M73 0V491H168L176 424H180Q211 457 247 480T330 503Q384 503 416 480T466 415Q501 453 539 478T624 503Q702 503 739 453T776 308V0H660V293Q660 354 642 379T585 404Q539 404 482 343V0H367V293Q367 +354 349 379T291 404Q245 404 188 343V0H73Z" /> +<glyph unicode="n" glyph-name="n" horiz-adv-x="560" d="M73 0V491H168L176 425H180Q213 457 251 480T341 503Q420 503 456 453T492 308V0H377V293Q377 354 359 379T300 404Q268 404 244 389T188 343V0H73Z" /> +<glyph unicode="o" glyph-name="o" horiz-adv-x="549" d="M274 -12Q228 -12 186 5T112 55T60 136T41 245Q41 306 60 354T111 435T186 485T274 503Q320 503 362 486T437 435T488 354T508 245Q508 184 489 136T437 55T363 5T274 -12ZM274 82Q328 82 359 126T390 +245Q390 320 359 364T274 409Q220 409 190 365T159 245Q159 171 189 127T274 82Z" /> +<glyph unicode="p" glyph-name="p" horiz-adv-x="564" d="M73 -194V491H168L176 439H180Q211 465 249 484T328 503Q374 503 409 486T470 435T508 356T521 253Q521 190 504 141T457 58T390 6T311 -12Q279 -12 247 2T185 42L188 -40V-194H73ZM287 83Q336 83 369 +125T402 252Q402 326 377 367T296 408Q244 408 188 353V124Q215 101 240 92T287 83Z" /> +<glyph unicode="q" glyph-name="q" horiz-adv-x="564" d="M376 -194V-33L380 49Q353 23 318 6T245 -12Q152 -12 98 55T43 245Q43 305 60 353T107 434T173 485T251 503Q293 503 324 489T387 444H390L400 491H491V-194H376ZM273 83Q328 83 376 138V367Q350 390 326 +399T276 408Q228 408 195 366T162 246Q162 166 190 125T273 83Z" /> +<glyph unicode="r" glyph-name="r" horiz-adv-x="373" d="M73 0V491H168L176 404H180Q206 452 243 477T319 503Q354 503 375 493L355 393Q342 397 331 399T304 401Q275 401 243 379T188 300V0H73Z" /> +<glyph unicode="s" glyph-name="s" horiz-adv-x="431" d="M210 -12Q159 -12 110 7T24 56L78 130Q111 104 143 90T214 75Q254 75 273 91T292 134Q292 149 283 160T259 181T225 197T187 213Q163 222 138 234T94 263T62 302T49 356Q49 421 97 462T228 503Q279 503 +320 485T391 444L338 374Q312 393 286 404T230 416Q193 416 176 401T158 362Q158 347 166 337T189 318T221 303T260 289Q285 280 310 269T355 240T388 199T401 140Q401 108 389 81T352 33T292 0T210 -12Z" /> +<glyph unicode="t" glyph-name="t" horiz-adv-x="361" d="M246 -12Q203 -12 174 1T126 37T99 93T90 166V400H20V486L96 491L110 625H206V491H331V400H206V166Q206 80 275 80Q288 80 301 83T326 91L346 6Q326 -1 301 -6T246 -12Z" /> +<glyph unicode="u" glyph-name="u" horiz-adv-x="556" d="M219 -12Q140 -12 104 38T68 183V491H183V198Q183 137 201 112T259 87Q291 87 315 103T368 155V491H483V0H389L380 72H377Q345 34 308 11T219 -12Z" /> +<glyph unicode="v" glyph-name="v" horiz-adv-x="495" d="M183 0L12 491H129L207 236Q217 200 227 163T248 88H252Q263 126 273 163T294 236L372 491H483L316 0H183Z" /> +<glyph unicode="w" glyph-name="w" horiz-adv-x="748" d="M154 0L24 491H140L199 236Q207 201 212 166T225 95H229Q236 131 243 166T260 236L324 491H429L494 236Q503 201 511 166T527 95H531Q538 131 544 166T557 236L616 491H724L599 0H462L405 229Q397 264 +390 298T375 372H371Q364 333 357 298T342 228L286 0H154Z" /> +<glyph unicode="x" glyph-name="x" horiz-adv-x="481" d="M14 0L170 256L24 491H148L203 398Q214 378 225 357T248 315H252Q261 335 271 356T290 398L337 491H456L311 243L467 0H343L283 97Q271 119 259 141T233 184H229Q218 163 208 142T186 97L134 0H14Z" /> +<glyph unicode="y" glyph-name="y" horiz-adv-x="495" d="M106 -202Q86 -202 71 -200T42 -192L63 -102Q70 -104 79 -106T98 -109Q137 -109 160 -86T196 -25L205 6L12 491H129L214 250Q225 218 235 183T257 112H261Q270 146 279 181T298 250L372 491H483L305 -22Q290 +-64 272 -97T231 -153T177 -189T106 -202Z" /> +<glyph unicode="z" glyph-name="z" horiz-adv-x="443" d="M34 0V62L266 400H60V491H410V430L179 92H418V0H34Z" /> +<glyph unicode="{" glyph-name="braceleft" horiz-adv-x="324" d="M232 -152Q200 -152 177 -146T139 -123T117 -81T109 -14Q109 13 110 35T113 79T116 121T118 167Q118 181 114 194T100 218T74 236T32 243V313Q57 313 73 320T100 337T114 361T118 388Q118 413 +117 434T114 477T111 520T109 570Q109 610 116 636T139 679T177 701T232 708H286V645H263Q227 645 215 628T202 565Q202 522 204 482T207 393Q207 339 191 314T140 280V276Q175 267 191 242T207 163Q207 115 205 75T202 -9Q202 -54 214 -71T263 -89H286V-152H232Z" +/> +<glyph unicode="|" glyph-name="bar" horiz-adv-x="255" d="M89 -250V750H166V-250H89Z" /> +<glyph unicode="}" glyph-name="braceright" horiz-adv-x="324" d="M38 -152V-89H61Q97 -89 109 -72T122 -9Q122 34 120 74T117 163Q117 216 133 241T184 276V280Q149 289 133 314T117 393Q117 441 119 481T122 565Q122 610 110 627T61 645H38V708H92Q123 708 +146 702T185 679T207 637T215 570Q215 543 214 521T211 477T208 435T206 388Q206 374 210 361T224 338T250 320T292 313V243Q267 243 251 236T224 219T210 195T206 167Q206 143 207 122T210 79T213 36T215 -14Q215 -54 208 -80T185 -123T147 -145T92 -152H38Z" +/> +<glyph unicode="~" glyph-name="asciitilde" horiz-adv-x="513" d="M343 248Q313 248 290 260T246 288T208 315T168 328Q126 328 94 269L32 315Q64 367 99 389T170 412Q200 412 223 400T267 372T305 345T345 332Q387 332 419 391L480 344Q448 293 413 271T343 248Z" /> +<glyph unicode=" " glyph-name="uni00A0" horiz-adv-x="205" /> +<glyph unicode="¡" glyph-name="exclamdown" horiz-adv-x="315" d="M100 -179L103 -65L119 276H196L212 -65L216 -179H100ZM158 347Q126 347 105 369T83 426Q83 459 104 481T158 503Q190 503 211 481T232 426Q232 391 211 369T158 347Z" /> +<glyph unicode="¢" glyph-name="cent" horiz-adv-x="513" d="M173 308Q173 252 198 214T269 162V455Q223 440 198 402T173 308ZM269 -37V62Q175 74 118 137T61 308Q61 360 77 402T120 476T186 526T269 553V654H335V556Q377 554 408 538T463 499L409 428Q374 +459 335 463V155Q361 157 383 169T423 196L471 123Q442 97 407 82T335 61V-37H269Z" /> +<glyph unicode="£" glyph-name="sterling" horiz-adv-x="513" d="M51 0V71Q99 95 128 138T157 237Q157 248 156 257T153 278H53V347L120 352H132Q124 378 118 403T111 454Q111 499 125 535T166 596T230 634T311 648Q366 648 405 627T475 570L411 507Q392 +529 371 541T321 554Q274 554 248 527T222 448Q222 423 227 400T239 352H393V278H256Q259 258 259 236Q259 191 246 161T206 102V98H476V0H51Z" /> +<glyph unicode="¤" glyph-name="currency" horiz-adv-x="513" d="M82 93L23 153L85 216Q68 239 59 267T50 329Q50 363 59 391T85 443L23 506L82 566L150 496Q198 527 256 527Q314 527 362 496L431 566L490 506L427 443Q444 420 453 392T462 329Q462 296 453 +268T427 216L490 153L431 93L362 163Q339 147 312 140T256 132Q228 132 201 139T151 163L82 93ZM256 214Q299 214 328 245T358 329Q358 382 329 413T256 445Q214 445 184 414T154 329Q154 277 184 246T256 214Z" /> +<glyph unicode="¥" glyph-name="yen" horiz-adv-x="513" d="M198 0V152H41V212H198V271H41V330H172L18 636H137L201 485Q215 452 228 419T256 352H260Q274 386 287 419T315 485L379 636H495L340 330H472V271H314V212H472V152H314V0H198Z" /> +<glyph unicode="¦" glyph-name="brokenbar" horiz-adv-x="255" d="M89 302V750H166V302H89ZM89 -250V209H166V-250H89Z" /> +<glyph unicode="§" glyph-name="section" horiz-adv-x="513" d="M140 342Q140 314 158 296T203 262T264 234T327 203Q350 215 361 232T373 275Q373 303 356 322T311 357T250 385T187 415Q164 401 152 384T140 342ZM238 -74Q184 -74 135 -54T54 4L122 64Q147 +39 175 26T238 12Q273 12 291 28T310 68Q310 92 290 108T240 138T176 167T111 203T61 256T41 334Q41 375 63 408T124 463Q94 496 94 545Q94 575 104 601T136 646T187 676T258 687Q311 687 353 668T426 626L372 553Q349 573 322 586T264 600Q229 600 214 586T198 +550Q198 527 218 512T269 482T335 452T401 414T451 361T472 284Q472 238 450 207T389 153Q401 137 408 118T415 73Q415 41 403 15T368 -32T312 -63T238 -74Z" /> +<glyph unicode="¨" glyph-name="dieresis" horiz-adv-x="549" d="M171 578Q145 578 128 595T110 639Q110 665 127 682T171 700Q198 700 215 683T232 639Q232 613 215 596T171 578ZM377 578Q350 578 333 595T316 639Q316 665 333 682T377 700Q403 700 420 +683T438 639Q438 613 421 596T377 578Z" /> +<glyph unicode="©" glyph-name="copyright" horiz-adv-x="747" d="M374 -10Q308 -10 249 13T145 80T74 185T47 324Q47 401 73 462T144 566T248 631T374 654Q440 654 499 632T602 566T673 462T700 324Q700 247 674 186T603 81T499 14T374 -10ZM374 42Q430 +42 479 62T564 120T621 209T642 324Q642 387 621 438T564 526T479 583T374 603Q318 603 269 583T184 527T126 439T105 324Q105 261 126 209T183 120T269 63T374 42ZM384 126Q344 126 310 139T250 178T211 240T196 323Q196 367 211 402T253 462T314 500T385 514Q430 +514 460 497T514 456L469 406Q450 424 432 433T391 443Q340 443 311 409T282 323Q282 265 310 231T387 197Q416 197 437 208T478 236L517 180Q489 157 458 142T384 126Z" /> +<glyph unicode="ª" glyph-name="ordfeminine" horiz-adv-x="352" d="M133 377Q87 377 60 404T33 474Q33 527 78 555T226 593Q224 620 212 636T170 652Q147 652 123 643T75 620L45 675Q74 692 109 705T184 718Q309 718 309 577V385H242L234 420H230Q210 402 +186 390T133 377ZM160 441Q177 441 193 449T226 474V544Q163 536 139 520T114 481Q114 441 160 441Z" /> +<glyph unicode="«" glyph-name="guillemotleft" horiz-adv-x="456" d="M182 61L47 210V294L182 443L228 406L113 252L228 97L182 61ZM356 61L221 210V294L356 443L402 406L287 252L402 97L356 61Z" /> +<glyph unicode="¬" glyph-name="logicalnot" horiz-adv-x="513" d="M392 99V288H34V372H479V99H392Z" /> +<glyph unicode="" glyph-name="uni00AD" horiz-adv-x="322" d="M42 210V294H280V210H42Z" /> +<glyph unicode="®" glyph-name="registered" horiz-adv-x="443" d="M221 315Q181 315 146 329T85 370T43 433T28 514Q28 558 43 595T84 658T146 699T221 714Q261 714 296 700T357 659T399 595T414 514Q414 470 399 434T358 371T296 330T221 315ZM221 358Q252 +358 279 369T325 401T356 450T367 514Q367 549 356 578T326 628T279 660T221 672Q189 672 163 661T117 628T86 578T75 514Q75 479 86 451T116 402T162 370T221 358ZM144 417V616H227Q260 616 283 601T307 551Q307 534 298 519T270 496L314 417H261L228 482H194V417H144ZM194 +518H217Q234 518 244 526T254 548Q254 561 246 569T218 578H194V518Z" /> +<glyph unicode="¯" glyph-name="overscore" horiz-adv-x="549" d="M134 596V672H414V596H134Z" /> +<glyph unicode="°" glyph-name="degree" horiz-adv-x="348" d="M175 413Q147 413 123 423T80 451T51 494T40 549Q40 579 50 604T79 647T122 675T175 685Q203 685 227 675T270 647T299 604T310 549Q310 519 300 494T271 451T228 423T175 413ZM175 472Q207 +472 226 493T246 549Q246 584 227 605T175 627Q143 627 124 606T104 549Q104 515 123 494T175 472Z" /> +<glyph unicode="±" glyph-name="plusminus" horiz-adv-x="513" d="M213 143V299H34V382H213V561H300V382H479V299H300V143H213ZM34 0V83H479V0H34Z" /> +<glyph unicode="²" glyph-name="two.sups" horiz-adv-x="372" d="M48 385V433Q132 505 179 554T226 644Q226 677 209 696T160 715Q138 715 119 701T83 663L33 709Q59 746 95 766T173 787Q235 787 272 754T310 658Q310 632 301 608T274 560T235 510T186 458H327V385H48Z" +/> +<glyph unicode="³" glyph-name="three.sups" horiz-adv-x="372" d="M183 373Q133 373 94 394T31 451L85 493Q121 440 176 440Q204 440 223 455T243 498Q243 527 216 542T136 558V609Q179 609 203 625T228 669Q228 692 212 706T169 720Q149 720 131 708T97 +677L47 721Q76 753 107 770T183 787Q209 787 232 780T274 759T302 725T313 680Q313 647 297 625T251 587Q283 576 305 553T328 492Q328 465 317 443T285 406T239 382T183 373Z" /> +<glyph unicode="´" glyph-name="acute" horiz-adv-x="549" d="M272 573L215 630L362 804L442 728L272 573Z" /> +<glyph unicode="µ" glyph-name="uni00B5" horiz-adv-x="578" d="M73 -178V491H188V198Q188 139 206 113T263 87Q292 87 317 103T370 166V491H486Q485 445 484 396T481 298T479 205T478 123Q478 100 489 91T518 82Q524 82 532 83T548 88L563 2Q549 -4 533 +-8T490 -12Q398 -12 382 76H378Q356 34 326 13T259 -8Q235 -8 215 -2T181 26Q181 -6 181 -31T183 -80T185 -127T190 -178H73Z" /> +<glyph unicode="¶" glyph-name="paragraph" horiz-adv-x="599" d="M387 -80V654H503V-80H387ZM295 212Q241 212 195 225T114 267T60 337T40 436Q40 497 59 538T111 605T190 642T288 654H332V212H295Z" /> +<glyph unicode="·" glyph-name="middot" horiz-adv-x="275" d="M138 243Q106 243 85 265T63 321Q63 355 84 377T138 399Q170 399 191 377T212 321Q212 287 191 265T138 243Z" /> +<glyph unicode="¸" glyph-name="cedilla" horiz-adv-x="549" d="M184 -233L174 -183Q235 -179 257 -169T280 -136Q280 -119 264 -108T203 -91L249 3H319L290 -62Q326 -71 345 -87T365 -135Q365 -183 318 -206T184 -233Z" /> +<glyph unicode="¹" glyph-name="one.sups" horiz-adv-x="372" d="M168 385V679H82V733Q119 739 141 748T186 775H255V385H168Z" /> +<glyph unicode="º" glyph-name="ordmasculine" horiz-adv-x="369" d="M184 377Q152 377 124 388T74 422T40 475T27 547Q27 587 39 619T74 673T124 706T184 718Q215 718 243 707T294 673T328 619T341 547Q341 507 329 476T294 422T244 389T184 377ZM184 444Q219 +444 237 472T256 547Q256 595 238 623T184 652Q149 652 131 624T112 547Q112 500 130 472T184 444Z" /> +<glyph unicode="»" glyph-name="guillemotright" horiz-adv-x="456" d="M99 61L54 97L168 252L54 406L99 443L235 294V210L99 61ZM273 61L228 97L342 252L228 406L273 443L409 294V210L273 61Z" /> +<glyph unicode="¼" glyph-name="onequarter" horiz-adv-x="795" d="M142 264V558H56V612Q93 618 115 627T160 654H229V264H142ZM183 -12L540 666H610L254 -12H183ZM640 0V95H461V139L613 390H717V154H775V95H717V0H640ZM545 154H640V209L645 322H641L596 +243L545 154Z" /> +<glyph unicode="½" glyph-name="onehalf" horiz-adv-x="827" d="M142 264V558H56V612Q93 618 115 627T160 654H229V264H142ZM165 -12L522 666H592L236 -12H165ZM503 0V48Q587 120 634 169T681 259Q681 292 664 311T615 330Q593 330 574 316T538 278L488 324Q514 +361 550 381T628 402Q690 402 727 369T765 273Q765 247 756 223T729 175T690 125T641 73H782V0H503Z" /> +<glyph unicode="¾" glyph-name="threequarters" horiz-adv-x="807" d="M182 252Q132 252 93 273T30 330L84 372Q120 319 175 319Q203 319 222 334T242 377Q242 406 215 421T135 437V488Q178 488 202 504T227 548Q227 571 211 585T168 599Q148 599 130 587T96 +556L46 600Q75 632 106 649T182 666Q208 666 231 659T273 638T301 604T312 559Q312 526 296 504T250 466Q282 455 304 432T327 371Q327 344 316 322T284 285T238 261T182 252ZM212 -12L569 666H639L283 -12H212ZM652 0V95H473V139L625 390H729V154H787V95H729V0H652ZM557 +154H652V209L657 322H653L608 243L557 154Z" /> +<glyph unicode="¿" glyph-name="questiondown" horiz-adv-x="444" d="M224 -191Q145 -191 95 -149T45 -25Q45 7 56 32T85 81T121 125T155 169T180 218T186 276H288Q293 239 285 210T263 155T230 109T195 67T167 26T156 -17Q156 -52 177 -74T238 -97Q268 -97 +293 -83T340 -45L405 -104Q371 -142 326 -166T224 -191ZM236 347Q204 347 183 369T162 426Q162 459 183 481T236 503Q268 503 289 481T310 426Q310 391 289 369T236 347Z" /> +<glyph unicode="À" glyph-name="Agrave" horiz-adv-x="558" d="M217 348L194 268H361L338 348Q322 400 308 455T279 564H275Q261 509 247 455T217 348ZM-2 0L211 654H347L560 0H438L387 177H167L116 0H-2ZM291 688L123 805L185 881L342 746L291 688Z" /> +<glyph unicode="Á" glyph-name="Aacute" horiz-adv-x="558" d="M217 348L194 268H361L338 348Q322 400 308 455T279 564H275Q261 509 247 455T217 348ZM-2 0L211 654H347L560 0H438L387 177H167L116 0H-2ZM263 688L212 746L369 881L431 805L263 688Z" /> +<glyph unicode="Â" glyph-name="Acircumflex" horiz-adv-x="558" d="M217 348L194 268H361L338 348Q322 400 308 455T279 564H275Q261 509 247 455T217 348ZM-2 0L211 654H347L560 0H438L387 177H167L116 0H-2ZM118 725L215 836H339L436 725L386 692L279 +780H275L168 692L118 725Z" /> +<glyph unicode="Ã" glyph-name="Atilde" horiz-adv-x="558" d="M217 348L194 268H361L338 348Q322 400 308 455T279 564H275Q261 509 247 455T217 348ZM-2 0L211 654H347L560 0H438L387 177H167L116 0H-2ZM350 700Q323 700 303 710T266 732T236 754T207 764Q190 +764 179 751T165 707L89 713Q93 780 124 813T204 846Q231 846 251 836T288 814T318 792T347 782Q382 782 389 840L465 834Q461 767 430 734T350 700Z" /> +<glyph unicode="Ä" glyph-name="Adieresis" horiz-adv-x="558" d="M217 348L194 268H361L338 348Q322 400 308 455T279 564H275Q261 509 247 455T217 348ZM-2 0L211 654H347L560 0H438L387 177H167L116 0H-2ZM170 708Q144 708 128 724T111 767Q111 793 127 +810T170 827Q196 827 213 810T230 767Q230 741 213 725T170 708ZM384 708Q358 708 341 724T324 767Q324 793 341 810T384 827Q410 827 426 810T443 767Q443 741 427 725T384 708Z" /> +<glyph unicode="Å" glyph-name="Aring" horiz-adv-x="558" d="M217 348L194 268H361L338 348Q322 400 308 455T279 564H275Q261 509 247 455T217 348ZM-2 0L211 654H347L560 0H438L387 177H167L116 0H-2ZM277 698Q230 698 201 723T171 792Q171 836 200 861T277 +887Q323 887 353 862T383 792Q383 749 353 724T277 698ZM277 744Q296 744 309 756T323 792Q323 815 310 828T277 841Q257 841 244 828T230 792Q230 769 243 757T277 744Z" /> +<glyph unicode="Æ" glyph-name="AE" horiz-adv-x="834" d="M297 366L246 261H394V565H390Q366 514 343 464T297 366ZM-3 0L324 654H773V556H510V389H731V291H510V98H783V0H394V170H202L119 0H-3Z" /> +<glyph unicode="Ç" glyph-name="Ccedilla" horiz-adv-x="576" d="M344 -12Q282 -12 228 10T135 75T72 181T49 325Q49 405 72 468T136 576T231 643T348 666Q410 666 458 641T537 583L475 508Q449 534 419 549T351 565Q311 565 278 549T220 502T182 427T168 +328Q168 216 216 153T348 89Q392 89 426 107T488 156L550 83Q510 37 459 13T344 -12ZM252 -233L242 -183Q303 -179 325 -169T348 -136Q348 -119 332 -108T271 -91L317 3H387L358 -62Q394 -71 413 -87T433 -135Q433 -183 386 -206T252 -233Z" /> +<glyph unicode="È" glyph-name="Egrave" horiz-adv-x="538" d="M83 0V654H477V556H199V389H434V291H199V98H487V0H83ZM301 688L133 805L195 881L352 746L301 688Z" /> +<glyph unicode="É" glyph-name="Eacute" horiz-adv-x="538" d="M83 0V654H477V556H199V389H434V291H199V98H487V0H83ZM273 688L222 746L379 881L441 805L273 688Z" /> +<glyph unicode="Ê" glyph-name="Ecircumflex" horiz-adv-x="538" d="M83 0V654H477V556H199V389H434V291H199V98H487V0H83ZM128 725L225 836H349L446 725L396 692L289 780H285L178 692L128 725Z" /> +<glyph unicode="Ë" glyph-name="Edieresis" horiz-adv-x="538" d="M83 0V654H477V556H199V389H434V291H199V98H487V0H83ZM180 708Q154 708 138 724T121 767Q121 793 137 810T180 827Q206 827 223 810T240 767Q240 741 223 725T180 708ZM394 708Q368 708 351 +724T334 767Q334 793 351 810T394 827Q420 827 436 810T453 767Q453 741 437 725T394 708Z" /> +<glyph unicode="Ì" glyph-name="Igrave" horiz-adv-x="282" d="M83 0V654H199V0H83ZM155 688L-13 805L49 881L206 746L155 688Z" /> +<glyph unicode="Í" glyph-name="Iacute" horiz-adv-x="282" d="M83 0V654H199V0H83ZM127 688L76 746L233 881L295 805L127 688Z" /> +<glyph unicode="Î" glyph-name="Icircumflex" horiz-adv-x="282" d="M83 0V654H199V0H83ZM-18 725L79 836H203L300 725L250 692L143 780H139L32 692L-18 725Z" /> +<glyph unicode="Ï" glyph-name="Idieresis" horiz-adv-x="282" d="M83 0V654H199V0H83ZM34 708Q8 708 -8 724T-25 767Q-25 793 -9 810T34 827Q60 827 77 810T94 767Q94 741 77 725T34 708ZM248 708Q222 708 205 724T188 767Q188 793 205 810T248 827Q274 +827 290 810T307 767Q307 741 291 725T248 708Z" /> +<glyph unicode="Ð" glyph-name="Eth" horiz-adv-x="649" d="M30 311V366L107 370V654H282Q432 654 516 573T600 330Q600 249 579 187T517 84T419 21T288 0H107V311H30ZM223 94H274Q374 94 427 151T481 330Q481 450 427 505T274 560H223V370H360V311H223V94Z" /> +<glyph unicode="Ñ" glyph-name="Ntilde" horiz-adv-x="656" d="M83 0V654H202L406 286L473 147H477Q473 198 468 256T462 370V654H573V0H454L250 368L183 507H179Q183 455 188 398T194 286V0H83ZM403 700Q376 700 356 710T319 732T289 754T260 764Q243 764 +232 751T218 707L142 713Q146 780 177 813T257 846Q284 846 304 836T341 814T371 792T400 782Q435 782 442 840L518 834Q514 767 483 734T403 700Z" /> +<glyph unicode="Ò" glyph-name="Ograve" horiz-adv-x="674" d="M337 -12Q273 -12 220 11T129 79T70 187T49 330Q49 409 70 471T129 577T220 643T337 666Q401 666 454 643T545 577T605 472T626 330Q626 250 605 187T546 80T454 12T337 -12ZM337 89Q376 89 +407 106T460 154T494 230T506 330Q506 440 461 502T337 565Q259 565 214 503T168 330Q168 275 180 231T214 155T267 106T337 89ZM351 688L183 805L245 881L402 746L351 688Z" /> +<glyph unicode="Ó" glyph-name="Oacute" horiz-adv-x="674" d="M337 -12Q273 -12 220 11T129 79T70 187T49 330Q49 409 70 471T129 577T220 643T337 666Q401 666 454 643T545 577T605 472T626 330Q626 250 605 187T546 80T454 12T337 -12ZM337 89Q376 89 +407 106T460 154T494 230T506 330Q506 440 461 502T337 565Q259 565 214 503T168 330Q168 275 180 231T214 155T267 106T337 89ZM323 688L272 746L429 881L491 805L323 688Z" /> +<glyph unicode="Ô" glyph-name="Ocircumflex" horiz-adv-x="674" d="M337 -12Q273 -12 220 11T129 79T70 187T49 330Q49 409 70 471T129 577T220 643T337 666Q401 666 454 643T545 577T605 472T626 330Q626 250 605 187T546 80T454 12T337 -12ZM337 89Q376 +89 407 106T460 154T494 230T506 330Q506 440 461 502T337 565Q259 565 214 503T168 330Q168 275 180 231T214 155T267 106T337 89ZM178 725L275 836H399L496 725L446 692L339 780H335L228 692L178 725Z" /> +<glyph unicode="Õ" glyph-name="Otilde" horiz-adv-x="674" d="M337 -12Q273 -12 220 11T129 79T70 187T49 330Q49 409 70 471T129 577T220 643T337 666Q401 666 454 643T545 577T605 472T626 330Q626 250 605 187T546 80T454 12T337 -12ZM337 89Q376 89 +407 106T460 154T494 230T506 330Q506 440 461 502T337 565Q259 565 214 503T168 330Q168 275 180 231T214 155T267 106T337 89ZM410 700Q383 700 363 710T326 732T296 754T267 764Q250 764 239 751T225 707L149 713Q153 780 184 813T264 846Q291 846 311 836T348 +814T378 792T407 782Q442 782 449 840L525 834Q521 767 490 734T410 700Z" /> +<glyph unicode="Ö" glyph-name="Odieresis" horiz-adv-x="674" d="M337 -12Q273 -12 220 11T129 79T70 187T49 330Q49 409 70 471T129 577T220 643T337 666Q401 666 454 643T545 577T605 472T626 330Q626 250 605 187T546 80T454 12T337 -12ZM337 89Q376 +89 407 106T460 154T494 230T506 330Q506 440 461 502T337 565Q259 565 214 503T168 330Q168 275 180 231T214 155T267 106T337 89ZM230 708Q204 708 188 724T171 767Q171 793 187 810T230 827Q256 827 273 810T290 767Q290 741 273 725T230 708ZM444 708Q418 708 +401 724T384 767Q384 793 401 810T444 827Q470 827 486 810T503 767Q503 741 487 725T444 708Z" /> +<glyph unicode="×" glyph-name="multiply" horiz-adv-x="513" d="M108 119L49 179L197 329L49 480L108 540L256 388L405 540L464 480L315 329L464 179L405 119L256 270L108 119Z" /> +<glyph unicode="Ø" glyph-name="Oslash" horiz-adv-x="674" d="M339 -12Q239 -12 169 44L106 -36L45 12L115 101Q84 144 68 201T51 330Q51 409 72 471T131 577T222 643T339 666Q442 666 514 609L578 690L640 642L568 551Q597 509 612 454T628 330Q628 250 +607 187T548 80T456 12T339 -12ZM170 330Q170 292 175 259T192 199L446 522Q403 565 339 565Q261 565 216 503T170 330ZM339 89Q378 89 409 106T462 154T496 230T508 330Q508 398 489 450L237 130Q278 89 339 89Z" /> +<glyph unicode="Ù" glyph-name="Ugrave" horiz-adv-x="655" d="M328 -12Q271 -12 226 4T148 57T98 149T80 287V654H196V278Q196 225 205 189T232 130T274 99T328 89Q358 89 383 98T426 130T454 188T464 278V654H575V287Q575 206 558 150T509 57T431 5T328 +-12ZM341 688L173 805L235 881L392 746L341 688Z" /> +<glyph unicode="Ú" glyph-name="Uacute" horiz-adv-x="655" d="M328 -12Q271 -12 226 4T148 57T98 149T80 287V654H196V278Q196 225 205 189T232 130T274 99T328 89Q358 89 383 98T426 130T454 188T464 278V654H575V287Q575 206 558 150T509 57T431 5T328 +-12ZM313 688L262 746L419 881L481 805L313 688Z" /> +<glyph unicode="Û" glyph-name="Ucircumflex" horiz-adv-x="655" d="M328 -12Q271 -12 226 4T148 57T98 149T80 287V654H196V278Q196 225 205 189T232 130T274 99T328 89Q358 89 383 98T426 130T454 188T464 278V654H575V287Q575 206 558 150T509 57T431 +5T328 -12ZM168 725L265 836H389L486 725L436 692L329 780H325L218 692L168 725Z" /> +<glyph unicode="Ü" glyph-name="Udieresis" horiz-adv-x="655" d="M328 -12Q271 -12 226 4T148 57T98 149T80 287V654H196V278Q196 225 205 189T232 130T274 99T328 89Q358 89 383 98T426 130T454 188T464 278V654H575V287Q575 206 558 150T509 57T431 5T328 +-12ZM220 708Q194 708 178 724T161 767Q161 793 177 810T220 827Q246 827 263 810T280 767Q280 741 263 725T220 708ZM434 708Q408 708 391 724T374 767Q374 793 391 810T434 827Q460 827 476 810T493 767Q493 741 477 725T434 708Z" /> +<glyph unicode="Ý" glyph-name="Yacute" horiz-adv-x="501" d="M192 0V243L-4 654H120L191 487Q205 450 219 416T249 343H253Q269 381 284 415T313 487L384 654H505L308 243V0H192ZM236 688L185 746L342 881L404 805L236 688Z" /> +<glyph unicode="Þ" glyph-name="Thorn" horiz-adv-x="600" d="M83 0V654H199V550H303Q357 550 402 540T481 506T533 444T552 348Q552 293 533 253T481 187T402 149T303 136H199V0H83ZM199 229H294Q438 229 438 348Q438 409 402 433T294 457H199V229Z" /> +<glyph unicode="ß" glyph-name="germandbls" horiz-adv-x="604" d="M404 -12Q362 -12 327 0T258 35L300 114Q351 75 401 75Q434 75 452 94T470 139Q470 163 456 179T422 208T377 233T333 261T298 300T284 357Q284 388 296 410T323 453T350 495T363 547Q363 +581 345 603T290 625Q240 625 214 589T187 484V0H73V501Q73 549 87 588T128 656T195 700T290 716Q335 716 369 703T427 669T462 619T474 560Q474 523 461 498T432 452T403 412T390 371Q390 351 404 337T438 311T483 287T528 256T563 210T577 144Q577 111 566 83T532 +33T478 0T404 -12Z" /> +<glyph unicode="à" glyph-name="agrave" horiz-adv-x="516" d="M192 -12Q127 -12 87 27T47 132Q47 171 63 201T115 254T205 291T336 314Q335 333 331 350T316 381T288 402T246 410Q210 410 176 396T108 362L66 439Q107 465 158 484T268 503Q360 503 405 449T451 +291V0H356L348 54H344Q311 26 274 7T192 -12ZM229 78Q259 78 283 92T336 132V242Q286 236 252 226T197 204T167 175T158 141Q158 108 178 93T229 78ZM271 573L101 728L181 804L328 630L271 573Z" /> +<glyph unicode="á" glyph-name="aacute" horiz-adv-x="516" d="M192 -12Q127 -12 87 27T47 132Q47 171 63 201T115 254T205 291T336 314Q335 333 331 350T316 381T288 402T246 410Q210 410 176 396T108 362L66 439Q107 465 158 484T268 503Q360 503 405 449T451 +291V0H356L348 54H344Q311 26 274 7T192 -12ZM229 78Q259 78 283 92T336 132V242Q286 236 252 226T197 204T167 175T158 141Q158 108 178 93T229 78ZM267 573L210 630L357 804L437 728L267 573Z" /> +<glyph unicode="â" glyph-name="acircumflex" horiz-adv-x="516" d="M192 -12Q127 -12 87 27T47 132Q47 171 63 201T115 254T205 291T336 314Q335 333 331 350T316 381T288 402T246 410Q210 410 176 396T108 362L66 439Q107 465 158 484T268 503Q360 503 +405 449T451 291V0H356L348 54H344Q311 26 274 7T192 -12ZM229 78Q259 78 283 92T336 132V242Q286 236 252 226T197 204T167 175T158 141Q158 108 178 93T229 78ZM100 607L211 742H327L438 607L393 564L271 667H267L145 564L100 607Z" /> +<glyph unicode="ã" glyph-name="atilde" horiz-adv-x="516" d="M192 -12Q127 -12 87 27T47 132Q47 171 63 201T115 254T205 291T336 314Q335 333 331 350T316 381T288 402T246 410Q210 410 176 396T108 362L66 439Q107 465 158 484T268 503Q360 503 405 449T451 +291V0H356L348 54H344Q311 26 274 7T192 -12ZM229 78Q259 78 283 92T336 132V242Q286 236 252 226T197 204T167 175T158 141Q158 108 178 93T229 78ZM338 575Q313 575 294 586T260 612T231 637T202 649Q167 649 161 582L87 586Q89 655 117 692T200 730Q225 730 +244 719T278 693T308 668T337 656Q355 656 364 673T377 723L451 719Q449 651 421 613T338 575Z" /> +<glyph unicode="ä" glyph-name="adieresis" horiz-adv-x="516" d="M192 -12Q127 -12 87 27T47 132Q47 171 63 201T115 254T205 291T336 314Q335 333 331 350T316 381T288 402T246 410Q210 410 176 396T108 362L66 439Q107 465 158 484T268 503Q360 503 405 +449T451 291V0H356L348 54H344Q311 26 274 7T192 -12ZM229 78Q259 78 283 92T336 132V242Q286 236 252 226T197 204T167 175T158 141Q158 108 178 93T229 78ZM166 578Q140 578 123 595T105 639Q105 665 122 682T166 700Q193 700 210 683T227 639Q227 613 210 596T166 +578ZM372 578Q345 578 328 595T311 639Q311 665 328 682T372 700Q398 700 415 683T433 639Q433 613 416 596T372 578Z" /> +<glyph unicode="å" glyph-name="aring" horiz-adv-x="516" d="M192 -12Q127 -12 87 27T47 132Q47 171 63 201T115 254T205 291T336 314Q335 333 331 350T316 381T288 402T246 410Q210 410 176 396T108 362L66 439Q107 465 158 484T268 503Q360 503 405 449T451 +291V0H356L348 54H344Q311 26 274 7T192 -12ZM229 78Q259 78 283 92T336 132V242Q286 236 252 226T197 204T167 175T158 141Q158 108 178 93T229 78ZM269 559Q211 559 180 588T148 660Q148 704 179 733T269 762Q327 762 358 733T390 660Q390 617 359 588T269 559ZM269 +605Q290 605 304 620T319 660Q319 686 305 701T269 716Q248 716 234 701T219 660Q219 635 233 620T269 605Z" /> +<glyph unicode="æ" glyph-name="ae" horiz-adv-x="785" d="M198 -12Q133 -12 93 27T52 132Q52 211 120 254T338 314Q337 333 333 350T318 381T292 402T250 410Q215 410 181 396T114 362L72 439Q113 465 162 484T265 503Q316 503 350 480T404 414Q434 456 +471 479T557 503Q604 503 639 486T699 437T735 363T748 268Q748 234 743 214H443Q449 150 486 115T578 80Q610 80 636 90T689 118L730 41Q695 18 653 3T563 -12Q505 -12 463 12T392 72Q341 28 294 8T198 -12ZM234 78Q263 78 295 93T354 136Q346 153 343 175T338 +219L336 242Q242 229 203 204T164 141Q164 108 183 93T234 78ZM443 287H649Q649 347 625 380T553 414Q511 414 481 381T443 287Z" /> +<glyph unicode="ç" glyph-name="ccedilla" horiz-adv-x="462" d="M278 -12Q228 -12 185 5T109 55T59 136T41 245Q41 306 61 354T115 435T193 485T287 503Q335 503 369 487T431 448L375 373Q355 390 336 399T293 409Q233 409 196 365T159 245Q159 171 195 +127T290 82Q319 82 344 94T391 124L438 48Q403 18 362 3T278 -12ZM184 -233L174 -183Q235 -179 257 -169T280 -136Q280 -119 264 -108T203 -91L249 3H319L290 -62Q326 -71 345 -87T365 -135Q365 -183 318 -206T184 -233Z" /> +<glyph unicode="è" glyph-name="egrave" horiz-adv-x="507" d="M283 -12Q232 -12 188 5T111 56T60 136T41 245Q41 305 60 353T110 434T183 485T267 503Q317 503 355 486T418 438T457 364T470 270Q470 253 469 238T465 214H153Q161 148 199 113T298 77Q330 +77 357 86T412 113L451 41Q416 18 373 3T283 -12ZM152 292H370Q370 349 346 381T270 414Q226 414 193 383T152 292ZM269 573L99 728L179 804L326 630L269 573Z" /> +<glyph unicode="é" glyph-name="eacute" horiz-adv-x="507" d="M283 -12Q232 -12 188 5T111 56T60 136T41 245Q41 305 60 353T110 434T183 485T267 503Q317 503 355 486T418 438T457 364T470 270Q470 253 469 238T465 214H153Q161 148 199 113T298 77Q330 +77 357 86T412 113L451 41Q416 18 373 3T283 -12ZM152 292H370Q370 349 346 381T270 414Q226 414 193 383T152 292ZM265 573L208 630L355 804L435 728L265 573Z" /> +<glyph unicode="ê" glyph-name="ecircumflex" horiz-adv-x="507" d="M283 -12Q232 -12 188 5T111 56T60 136T41 245Q41 305 60 353T110 434T183 485T267 503Q317 503 355 486T418 438T457 364T470 270Q470 253 469 238T465 214H153Q161 148 199 113T298 77Q330 +77 357 86T412 113L451 41Q416 18 373 3T283 -12ZM152 292H370Q370 349 346 381T270 414Q226 414 193 383T152 292ZM98 607L209 742H325L436 607L391 564L269 667H265L143 564L98 607Z" /> +<glyph unicode="ë" glyph-name="edieresis" horiz-adv-x="507" d="M283 -12Q232 -12 188 5T111 56T60 136T41 245Q41 305 60 353T110 434T183 485T267 503Q317 503 355 486T418 438T457 364T470 270Q470 253 469 238T465 214H153Q161 148 199 113T298 77Q330 +77 357 86T412 113L451 41Q416 18 373 3T283 -12ZM152 292H370Q370 349 346 381T270 414Q226 414 193 383T152 292ZM164 578Q138 578 121 595T103 639Q103 665 120 682T164 700Q191 700 208 683T225 639Q225 613 208 596T164 578ZM370 578Q343 578 326 595T309 +639Q309 665 326 682T370 700Q396 700 413 683T431 639Q431 613 414 596T370 578Z" /> +<glyph unicode="ì" glyph-name="igrave" horiz-adv-x="262" d="M73 0V491H188V0H73ZM133 573L-37 728L43 804L190 630L133 573Z" /> +<glyph unicode="í" glyph-name="iacute" horiz-adv-x="262" d="M73 0V491H188V0H73ZM129 573L72 630L219 804L299 728L129 573Z" /> +<glyph unicode="î" glyph-name="icircumflex" horiz-adv-x="262" d="M73 0V491H188V0H73ZM-38 607L73 742H189L300 607L255 564L133 667H129L7 564L-38 607Z" /> +<glyph unicode="ï" glyph-name="idieresis" horiz-adv-x="262" d="M73 0V491H188V0H73ZM28 578Q2 578 -15 595T-33 639Q-33 665 -16 682T28 700Q55 700 72 683T89 639Q89 613 72 596T28 578ZM234 578Q207 578 190 595T173 639Q173 665 190 682T234 700Q260 +700 277 683T295 639Q295 613 278 596T234 578Z" /> +<glyph unicode="ð" glyph-name="eth" horiz-adv-x="552" d="M271 -12Q226 -12 186 4T115 51T66 126T48 225Q48 277 64 319T109 390T174 435T252 451Q286 451 317 439T372 397Q358 447 334 486T276 559L134 487L103 540L225 602Q202 619 177 634T124 664L175 +735Q211 716 246 695T313 647L456 720L487 666L363 603Q422 543 460 460T498 262Q498 202 482 152T437 65T365 8T271 -12ZM274 82Q329 82 359 127T389 256Q389 269 389 281T387 306Q360 340 332 352T273 364Q218 364 186 327T154 225Q154 192 163 166T189 121T228 +92T274 82Z" /> +<glyph unicode="ñ" glyph-name="ntilde" horiz-adv-x="560" d="M73 0V491H168L176 425H180Q213 457 251 480T341 503Q420 503 456 453T492 308V0H377V293Q377 354 359 379T300 404Q268 404 244 389T188 343V0H73ZM369 575Q344 575 325 586T291 612T262 637T233 +649Q198 649 192 582L118 586Q120 655 148 692T231 730Q256 730 275 719T309 693T339 668T368 656Q386 656 395 673T408 723L482 719Q480 651 452 613T369 575Z" /> +<glyph unicode="ò" glyph-name="ograve" horiz-adv-x="549" d="M274 -12Q228 -12 186 5T112 55T60 136T41 245Q41 306 60 354T111 435T186 485T274 503Q320 503 362 486T437 435T488 354T508 245Q508 184 489 136T437 55T363 5T274 -12ZM274 82Q328 82 359 +126T390 245Q390 320 359 364T274 409Q220 409 190 365T159 245Q159 171 189 127T274 82ZM276 573L106 728L186 804L333 630L276 573Z" /> +<glyph unicode="ó" glyph-name="oacute" horiz-adv-x="549" d="M274 -12Q228 -12 186 5T112 55T60 136T41 245Q41 306 60 354T111 435T186 485T274 503Q320 503 362 486T437 435T488 354T508 245Q508 184 489 136T437 55T363 5T274 -12ZM274 82Q328 82 359 +126T390 245Q390 320 359 364T274 409Q220 409 190 365T159 245Q159 171 189 127T274 82ZM272 573L215 630L362 804L442 728L272 573Z" /> +<glyph unicode="ô" glyph-name="ocircumflex" horiz-adv-x="549" d="M274 -12Q228 -12 186 5T112 55T60 136T41 245Q41 306 60 354T111 435T186 485T274 503Q320 503 362 486T437 435T488 354T508 245Q508 184 489 136T437 55T363 5T274 -12ZM274 82Q328 +82 359 126T390 245Q390 320 359 364T274 409Q220 409 190 365T159 245Q159 171 189 127T274 82ZM105 607L216 742H332L443 607L398 564L276 667H272L150 564L105 607Z" /> +<glyph unicode="õ" glyph-name="otilde" horiz-adv-x="549" d="M274 -12Q228 -12 186 5T112 55T60 136T41 245Q41 306 60 354T111 435T186 485T274 503Q320 503 362 486T437 435T488 354T508 245Q508 184 489 136T437 55T363 5T274 -12ZM274 82Q328 82 359 +126T390 245Q390 320 359 364T274 409Q220 409 190 365T159 245Q159 171 189 127T274 82ZM343 575Q318 575 299 586T265 612T236 637T207 649Q172 649 166 582L92 586Q94 655 122 692T205 730Q230 730 249 719T283 693T313 668T342 656Q360 656 369 673T382 723L456 +719Q454 651 426 613T343 575Z" /> +<glyph unicode="ö" glyph-name="odieresis" horiz-adv-x="549" d="M274 -12Q228 -12 186 5T112 55T60 136T41 245Q41 306 60 354T111 435T186 485T274 503Q320 503 362 486T437 435T488 354T508 245Q508 184 489 136T437 55T363 5T274 -12ZM274 82Q328 82 +359 126T390 245Q390 320 359 364T274 409Q220 409 190 365T159 245Q159 171 189 127T274 82ZM171 578Q145 578 128 595T110 639Q110 665 127 682T171 700Q198 700 215 683T232 639Q232 613 215 596T171 578ZM377 578Q350 578 333 595T316 639Q316 665 333 682T377 +700Q403 700 420 683T438 639Q438 613 421 596T377 578Z" /> +<glyph unicode="÷" glyph-name="divide" horiz-adv-x="513" d="M34 288V372H479V288H34ZM256 84Q227 84 208 102T188 150Q188 179 207 197T256 215Q285 215 304 197T324 150Q324 121 305 103T256 84ZM256 444Q227 444 208 462T188 510Q188 539 207 557T256 +575Q285 575 304 557T324 510Q324 481 305 463T256 444Z" /> +<glyph unicode="ø" glyph-name="oslash" horiz-adv-x="549" d="M274 -12Q237 -12 202 -1T138 32L92 -24L46 12L96 73Q70 105 56 148T41 245Q41 306 60 354T111 435T186 485T274 503Q351 503 410 459L457 516L503 480L453 418Q479 386 493 343T508 245Q508 +184 489 136T437 55T363 5T274 -12ZM153 251Q153 199 167 160L349 384Q318 413 274 413Q220 413 187 368T153 251ZM274 78Q328 78 362 122T396 239Q396 292 382 331L199 108Q229 78 274 78Z" /> +<glyph unicode="ù" glyph-name="ugrave" horiz-adv-x="556" d="M219 -12Q140 -12 104 38T68 183V491H183V198Q183 137 201 112T259 87Q291 87 315 103T368 155V491H483V0H389L380 72H377Q345 34 308 11T219 -12ZM281 573L111 728L191 804L338 630L281 573Z" /> +<glyph unicode="ú" glyph-name="uacute" horiz-adv-x="556" d="M219 -12Q140 -12 104 38T68 183V491H183V198Q183 137 201 112T259 87Q291 87 315 103T368 155V491H483V0H389L380 72H377Q345 34 308 11T219 -12ZM277 573L220 630L367 804L447 728L277 573Z" /> +<glyph unicode="û" glyph-name="ucircumflex" horiz-adv-x="556" d="M219 -12Q140 -12 104 38T68 183V491H183V198Q183 137 201 112T259 87Q291 87 315 103T368 155V491H483V0H389L380 72H377Q345 34 308 11T219 -12ZM110 607L221 742H337L448 607L403 564L281 +667H277L155 564L110 607Z" /> +<glyph unicode="ü" glyph-name="udieresis" horiz-adv-x="556" d="M219 -12Q140 -12 104 38T68 183V491H183V198Q183 137 201 112T259 87Q291 87 315 103T368 155V491H483V0H389L380 72H377Q345 34 308 11T219 -12ZM176 578Q150 578 133 595T115 639Q115 +665 132 682T176 700Q203 700 220 683T237 639Q237 613 220 596T176 578ZM382 578Q355 578 338 595T321 639Q321 665 338 682T382 700Q408 700 425 683T443 639Q443 613 426 596T382 578Z" /> +<glyph unicode="ý" glyph-name="yacute" horiz-adv-x="495" d="M106 -202Q86 -202 71 -200T42 -192L63 -102Q70 -104 79 -106T98 -109Q137 -109 160 -86T196 -25L205 6L12 491H129L214 250Q225 218 235 183T257 112H261Q270 146 279 181T298 250L372 491H483L305 +-22Q290 -64 272 -97T231 -153T177 -189T106 -202ZM253 573L196 630L343 804L423 728L253 573Z" /> +<glyph unicode="þ" glyph-name="thorn" horiz-adv-x="564" d="M73 -194V706H188V524L186 447Q215 471 249 487T322 503Q369 503 406 486T468 435T507 356T521 253Q521 190 504 141T457 58T390 6T311 -12Q276 -12 246 1T186 38L188 -40V-194H73ZM287 83Q336 +83 369 125T402 252Q402 326 377 367T296 408Q244 408 188 353V124Q215 101 240 92T287 83Z" /> +<glyph unicode="ÿ" glyph-name="ydieresis" horiz-adv-x="495" d="M106 -202Q86 -202 71 -200T42 -192L63 -102Q70 -104 79 -106T98 -109Q137 -109 160 -86T196 -25L205 6L12 491H129L214 250Q225 218 235 183T257 112H261Q270 146 279 181T298 250L372 491H483L305 +-22Q290 -64 272 -97T231 -153T177 -189T106 -202ZM152 578Q126 578 109 595T91 639Q91 665 108 682T152 700Q179 700 196 683T213 639Q213 613 196 596T152 578ZM358 578Q331 578 314 595T297 639Q297 665 314 682T358 700Q384 700 401 683T419 639Q419 613 402 +596T358 578Z" /> +<glyph unicode="–" glyph-name="endash" horiz-adv-x="480" d="M42 214V290H438V214H42Z" /> +<glyph unicode="—" glyph-name="emdash" horiz-adv-x="800" d="M42 214V290H758V214H42Z" /> +<glyph unicode="‘" glyph-name="quoteleft" horiz-adv-x="275" d="M134 382Q96 382 76 411T56 493Q56 624 180 689L208 638Q166 614 146 585T125 512Q128 513 134 513Q161 513 180 497T200 451Q200 419 182 401T134 382Z" /> +<glyph unicode="’" glyph-name="quoteright" horiz-adv-x="275" d="M95 391L67 442Q109 466 129 495T150 568Q147 567 141 567Q115 567 96 583T76 629Q76 661 94 679T141 698Q179 698 199 669T220 587Q220 456 95 391Z" /> +<glyph unicode="‚" glyph-name="quotesinglbase" horiz-adv-x="275" d="M95 -156L67 -105Q109 -81 129 -52T150 21Q147 20 141 20Q115 20 96 36T76 82Q76 114 94 132T141 151Q179 151 199 122T220 40Q220 -91 95 -156Z" /> +<glyph unicode="“" glyph-name="quotedblleft" horiz-adv-x="482" d="M134 382Q96 382 76 411T56 493Q56 624 180 689L208 638Q166 614 146 585T125 512Q128 513 134 513Q161 513 180 497T200 451Q200 419 182 401T134 382ZM341 382Q303 382 283 411T263 +493Q263 624 387 689L415 638Q373 614 353 585T332 512Q335 513 341 513Q368 513 387 497T407 451Q407 419 389 401T341 382Z" /> +<glyph unicode="”" glyph-name="quotedblright" horiz-adv-x="482" d="M95 391L67 442Q109 466 129 495T150 568Q147 567 141 567Q115 567 96 583T76 629Q76 661 94 679T141 698Q179 698 199 669T220 587Q220 456 95 391ZM302 391L274 442Q316 466 336 +495T357 568Q354 567 348 567Q322 567 303 583T283 629Q283 661 301 679T348 698Q386 698 406 669T427 587Q427 456 302 391Z" /> +<glyph unicode="„" glyph-name="quotedblbase" horiz-adv-x="482" d="M95 -156L67 -105Q109 -81 129 -52T150 21Q147 20 141 20Q115 20 96 36T76 82Q76 114 94 132T141 151Q179 151 199 122T220 40Q220 -91 95 -156ZM302 -156L274 -105Q316 -81 336 -52T357 +21Q354 20 348 20Q322 20 303 36T283 82Q283 114 301 132T348 151Q386 151 406 122T427 40Q427 -91 302 -156Z" /> +<glyph unicode="•" glyph-name="bullet" horiz-adv-x="325" d="M162 133Q137 133 115 142T76 169T50 210T40 263Q40 291 49 315T75 356T114 383T162 393Q187 393 209 383T249 356T275 315T285 263Q285 234 276 211T249 170T210 143T162 133Z" /> +<glyph unicode="‹" glyph-name="guilsinglleft" horiz-adv-x="282" d="M182 61L47 210V294L182 443L228 406L113 252L228 97L182 61Z" /> +<glyph unicode="›" glyph-name="guilsinglright" horiz-adv-x="282" d="M99 61L54 97L168 252L54 406L99 443L235 294V210L99 61Z" /> +</font> +</defs> +</svg> diff --git a/static/fonts/sourcesanspro/Source_Sans_Pro_600.ttf b/static/fonts/sourcesanspro/Source_Sans_Pro_600.ttf new file mode 100644 index 000000000..8b7620ff1 Binary files /dev/null and b/static/fonts/sourcesanspro/Source_Sans_Pro_600.ttf differ diff --git a/static/fonts/sourcesanspro/Source_Sans_Pro_600.woff b/static/fonts/sourcesanspro/Source_Sans_Pro_600.woff new file mode 100644 index 000000000..3c6ce2ff3 Binary files /dev/null and b/static/fonts/sourcesanspro/Source_Sans_Pro_600.woff differ diff --git a/static/fonts/sourcesanspro/Source_Sans_Pro_600.woff2 b/static/fonts/sourcesanspro/Source_Sans_Pro_600.woff2 new file mode 100644 index 000000000..e379beda7 Binary files /dev/null and b/static/fonts/sourcesanspro/Source_Sans_Pro_600.woff2 differ diff --git a/static/fonts/sourcesanspro/Source_Sans_Pro_900.eot b/static/fonts/sourcesanspro/Source_Sans_Pro_900.eot new file mode 100644 index 000000000..af91ce20d Binary files /dev/null and b/static/fonts/sourcesanspro/Source_Sans_Pro_900.eot differ diff --git a/static/fonts/sourcesanspro/Source_Sans_Pro_900.svg b/static/fonts/sourcesanspro/Source_Sans_Pro_900.svg new file mode 100644 index 000000000..5911db3f9 --- /dev/null +++ b/static/fonts/sourcesanspro/Source_Sans_Pro_900.svg @@ -0,0 +1,346 @@ +<?xml version="1.0" standalone="no"?> +<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> +<svg xmlns="http://www.w3.org/2000/svg"> +<defs > +<font id="SourceSansPro" horiz-adv-x="570" ><font-face + font-family="Source Sans Pro Black" + units-per-em="1000" + panose-1="2 11 8 3 3 4 3 2 2 4" + ascent="984" + descent="-273" + alphabetic="0" /> +<glyph unicode=" " glyph-name="space" horiz-adv-x="200" /> +<glyph unicode="!" glyph-name="exclam" horiz-adv-x="360" d="M124 244L100 522L94 670H266L260 522L236 244H124ZM180 -12Q136 -12 108 18T80 92Q80 136 108 166T180 196Q224 196 252 166T280 92Q280 48 252 18T180 -12Z" /> +<glyph unicode=""" glyph-name="quotedbl" horiz-adv-x="580" d="M114 324L80 536L74 684H246L240 536L206 324H114ZM374 324L340 536L334 684H506L500 536L466 324H374Z" /> +<glyph unicode="#" glyph-name="numbersign" horiz-adv-x="540" d="M84 0L106 180H34V288H118L130 384H54V492H144L164 650H260L242 492H334L354 650H450L432 492H510V384H418L406 288H490V180H394L372 0H274L296 180H204L182 0H84ZM216 288H308L320 384H228L216 288Z" /> +<glyph unicode="$" glyph-name="dollar" horiz-adv-x="540" d="M212 -110V-10Q169 -5 121 13T34 66L108 182Q149 152 181 139T246 126Q284 126 300 139T316 182Q316 202 297 217T249 248T187 279T125 319T77 373T58 448Q58 524 98 574T212 640V744H324V642Q372 +634 408 612T475 558L390 460Q363 484 339 496T286 508Q254 508 238 497T222 456Q222 437 241 423T289 395T351 365T413 326T461 271T480 194Q480 121 442 68T324 -4V-110H212Z" /> +<glyph unicode="%" glyph-name="percent" horiz-adv-x="870" d="M190 248Q154 248 123 262T70 303T35 368T22 456Q22 505 34 543T69 607T123 648T190 662Q226 662 256 648T309 608T345 543T358 456Q358 407 345 369T310 303T257 262T190 248ZM190 342Q210 342 +225 366T240 456Q240 489 236 510T225 545T209 563T190 568Q180 568 171 563T155 545T144 511T140 456Q140 390 155 366T190 342ZM214 -12L562 662H658L310 -12H214ZM680 -12Q644 -12 613 2T560 43T525 108T512 196Q512 245 524 283T559 347T613 388T680 402Q716 +402 746 388T799 348T835 283T848 196Q848 147 835 109T800 43T747 2T680 -12ZM680 82Q700 82 715 106T730 196Q730 229 726 250T715 285T699 303T680 308Q670 308 661 303T645 285T634 251T630 196Q630 130 645 106T680 82Z" /> +<glyph unicode="&" glyph-name="ampersand" horiz-adv-x="690" d="M246 -12Q189 -12 147 3T78 45T36 105T22 176Q22 210 31 237T56 286T93 325T137 357Q118 391 108 424T98 486Q98 521 111 553T148 609T207 647T286 662Q364 662 411 621T458 508Q458 476 447 +450T418 402T377 362T328 327Q353 301 382 277T442 230Q465 260 483 296T512 374H668Q651 317 625 264T562 161Q621 132 670 126L630 -12Q587 -4 544 12T456 51Q413 22 361 5T246 -12ZM239 486Q239 455 257 421Q288 439 308 459T328 508Q328 550 290 550Q270 550 +255 534T239 486ZM268 118Q297 118 332 134Q264 188 214 247Q200 233 192 218T184 186Q184 156 206 137T268 118Z" /> +<glyph unicode="'" glyph-name="quotesingle" horiz-adv-x="320" d="M114 324L80 536L74 684H246L240 536L206 324H114Z" /> +<glyph unicode="(" glyph-name="parenleft" horiz-adv-x="360" d="M200 -180Q137 -77 103 34T68 278Q68 410 102 521T200 736L308 692Q254 594 230 488T206 278Q206 174 230 68T308 -136L200 -180Z" /> +<glyph unicode=")" glyph-name="parenright" horiz-adv-x="360" d="M160 -180L52 -136Q106 -38 130 68T154 278Q154 382 130 488T52 692L160 736Q223 632 257 521T292 278Q292 146 258 35T160 -180Z" /> +<glyph unicode="*" glyph-name="asterisk" horiz-adv-x="472" d="M152 321L82 372L142 479L30 531L57 614L178 590L192 712H280L294 589L415 614L442 531L329 479L390 372L320 321L236 412L152 321Z" /> +<glyph unicode="+" glyph-name="plus" horiz-adv-x="540" d="M208 90V270H34V390H208V570H332V390H506V270H332V90H208Z" /> +<glyph unicode="," glyph-name="comma" horiz-adv-x="320" d="M80 -204L46 -114Q107 -94 137 -61T167 8H160Q121 8 91 32T60 102Q60 144 90 170T164 196Q220 196 249 155T278 40Q278 -49 228 -113T80 -204Z" /> +<glyph unicode="-" glyph-name="hyphen" horiz-adv-x="340" d="M44 194V314H296V194H44Z" /> +<glyph unicode="." glyph-name="period" horiz-adv-x="320" d="M160 -12Q116 -12 88 18T60 92Q60 136 88 166T160 196Q204 196 232 166T260 92Q260 48 232 18T160 -12Z" /> +<glyph unicode="/" glyph-name="slash" horiz-adv-x="334" d="M14 -160L190 710H300L124 -160H14Z" /> +<glyph unicode="0" glyph-name="zero" horiz-adv-x="540" d="M270 -12Q217 -12 174 9T100 73T51 177T34 320Q34 401 51 462T99 564T174 625T270 646Q322 646 365 626T440 564T489 462T506 320Q506 239 489 177T441 73T366 10T270 -12ZM270 120Q285 120 298 127T322 +157T338 218T344 320Q344 383 338 421T322 480T299 507T270 514Q255 514 242 508T218 480T202 421T196 320Q196 257 202 218T218 157T241 128T270 120Z" /> +<glyph unicode="1" glyph-name="one" horiz-adv-x="540" d="M66 0V138H202V466H82V572Q136 583 174 597T248 634H374V138H488V0H66Z" /> +<glyph unicode="2" glyph-name="two" horiz-adv-x="540" d="M36 0V98Q92 150 140 196T225 282T281 359T302 428Q302 471 281 491T224 512Q192 512 168 494T120 452L28 544Q53 570 77 589T127 621T183 640T248 646Q296 646 336 631T405 589T450 524T466 438Q466 +400 450 361T407 282T349 206T284 136Q308 139 338 141T390 144H496V0H36Z" /> +<glyph unicode="3" glyph-name="three" horiz-adv-x="540" d="M246 -12Q168 -12 112 12T20 78L98 186Q127 159 160 143T228 126Q270 126 295 141T320 186Q320 204 314 218T291 242T243 257T162 262V382Q202 382 228 387T271 401T293 424T300 454Q300 512 234 512Q202 +512 177 499T122 460L36 564Q83 603 133 624T242 646Q347 646 409 600T472 467Q472 375 370 330V326Q424 309 458 272T492 174Q492 129 472 95T419 36T340 0T246 -12Z" /> +<glyph unicode="4" glyph-name="four" horiz-adv-x="540" d="M290 0V142H20V262L236 634H450V272H518V142H450V0H290ZM182 272H290V344Q290 360 290 379T292 419T294 458T296 494H292Q280 465 267 437T240 380L182 272Z" /> +<glyph unicode="5" glyph-name="five" horiz-adv-x="540" d="M252 -12Q174 -12 118 13T22 78L98 186Q127 160 159 143T226 126Q271 126 295 146T320 208Q320 249 296 269T234 290Q221 290 211 289T192 284T171 275T146 260L72 308L88 634H464V490H236L228 398Q245 +404 258 406T288 408Q329 408 366 396T431 360T475 299T492 212Q492 159 473 117T420 47T344 3T252 -12Z" /> +<glyph unicode="6" glyph-name="six" horiz-adv-x="540" d="M286 -12Q240 -12 196 5T116 61T60 159T38 306Q38 392 60 456T118 562T201 625T300 646Q368 646 417 622T498 566L408 464Q393 481 366 494T312 508Q289 508 269 500T233 471T208 418T195 337Q207 352 +222 364T253 384T285 396T314 400Q354 400 389 389T450 353T491 292T506 204Q506 153 489 113T441 45T371 3T286 -12ZM282 116Q309 116 329 135T350 204Q350 227 344 241T329 264T306 276T280 280Q257 280 236 268T199 226Q204 193 213 172T234 138T257 121T282 +116Z" /> +<glyph unicode="7" glyph-name="seven" horiz-adv-x="540" d="M152 0Q156 75 166 138T194 259T242 373T316 490H44V634H498V528Q443 464 411 408T361 293T336 163T324 0H152Z" /> +<glyph unicode="8" glyph-name="eight" horiz-adv-x="540" d="M268 -12Q220 -12 179 0T107 36T59 91T42 162Q42 218 71 253T146 312V316Q108 345 85 380T62 466Q62 508 77 541T121 598T188 633T274 646Q318 646 354 634T417 599T457 543T472 470Q472 426 449 393T391 +337V333Q438 308 469 269T500 166Q500 128 484 96T437 39T363 2T268 -12ZM306 378Q334 418 334 458Q334 491 317 509T270 528Q247 528 230 514T212 466Q212 434 236 415T306 378ZM272 106Q301 106 321 121T341 172Q341 189 333 202T310 225T272 246T222 268Q208 +251 199 229T189 182Q189 144 214 125T272 106Z" /> +<glyph unicode="9" glyph-name="nine" horiz-adv-x="540" d="M258 354Q281 354 302 366T339 408Q334 441 325 462T304 496T281 513T256 518Q229 518 209 499T188 430Q188 407 194 393T209 370T231 358T258 354ZM238 -12Q170 -12 121 12T40 68L130 170Q145 153 +172 140T226 126Q250 126 270 134T305 163T331 216T343 297Q331 282 316 270T285 250T253 238T224 234Q183 234 148 245T88 281T47 342T32 430Q32 481 49 521T97 589T167 631T252 646Q298 646 342 629T422 573T478 475T500 328Q500 242 478 178T420 72T337 9T238 +-12Z" /> +<glyph unicode=":" glyph-name="colon" horiz-adv-x="320" d="M160 298Q116 298 88 328T60 402Q60 446 88 476T160 506Q204 506 232 476T260 402Q260 358 232 328T160 298ZM160 -12Q116 -12 88 18T60 92Q60 136 88 166T160 196Q204 196 232 166T260 92Q260 48 +232 18T160 -12Z" /> +<glyph unicode=";" glyph-name="semicolon" horiz-adv-x="320" d="M160 298Q116 298 88 328T60 402Q60 446 88 476T160 506Q204 506 232 476T260 402Q260 358 232 328T160 298ZM80 -204L46 -114Q107 -94 137 -61T167 8H160Q121 8 91 32T60 102Q60 144 90 170T164 +196Q220 196 249 155T278 40Q278 -49 228 -113T80 -204Z" /> +<glyph unicode="<" glyph-name="less" horiz-adv-x="540" d="M506 94L34 274V390L506 570V430L344 380L208 334V330L344 284L506 234V94Z" /> +<glyph unicode="=" glyph-name="equal" horiz-adv-x="540" d="M34 390V510H506V390H34ZM34 407V527H506V407H34Z" /> +<glyph unicode=">" glyph-name="greater" horiz-adv-x="540" d="M34 94V234L196 284L332 330V334L196 380L34 430V570L506 390V274L34 94Z" /> +<glyph unicode="?" glyph-name="question" horiz-adv-x="478" d="M152 244Q147 276 154 303T174 352T205 394T238 430T263 462T274 494Q274 521 258 532T218 544Q192 544 174 532T136 502L42 588Q79 630 129 656T240 682Q281 682 317 672T380 641T422 587T438 +506Q438 476 427 453T401 409T367 371T333 334T309 293T302 244H152ZM226 -12Q182 -12 154 18T126 92Q126 136 154 166T226 196Q270 196 298 166T326 92Q326 48 298 18T226 -12Z" /> +<glyph unicode="@" glyph-name="at" horiz-adv-x="924" d="M438 -178Q362 -178 292 -155T167 -85T81 34T48 206Q48 312 85 399T185 548T332 644T512 678Q595 678 662 651T777 576T850 460T876 312Q876 242 855 190T799 104T722 52T638 34Q593 34 560 54T518 110H516Q506 +95 492 83T462 62T428 49T396 44Q334 44 297 86T260 198Q260 246 276 291T320 371T385 427T466 448Q490 448 509 437T540 398H542L558 440H662L614 212Q596 138 656 138Q678 138 699 150T735 184T760 238T770 308Q770 359 756 407T710 492T626 553T498 576Q435 +576 375 550T267 476T191 361T162 210Q162 136 186 82T250 -7T343 -59T452 -76Q488 -76 529 -66T600 -40L636 -132Q589 -156 541 -167T438 -178ZM434 150Q448 150 460 158T490 190L512 316Q507 327 497 333T472 340Q452 340 437 327T411 295T394 252T388 208Q388 +150 434 150Z" /> +<glyph unicode="A" glyph-name="A" horiz-adv-x="584" d="M240 316L229 271H349L338 316Q326 363 314 418T290 522H286Q275 472 264 418T240 316ZM-10 0L188 650H396L594 0H412L380 138H198L166 0H-10Z" /> +<glyph unicode="B" glyph-name="B" horiz-adv-x="612" d="M72 0V650H306Q357 650 402 643T480 617T532 568T552 488Q552 467 546 446T530 405T504 370T470 348V344Q517 330 549 294T582 192Q582 142 562 106T507 46T425 11T326 0H72ZM244 396H302Q344 396 364 +414T384 462Q384 492 364 505T302 518H244V396ZM244 132H314Q414 132 414 204Q414 240 390 255T314 270H244V132Z" /> +<glyph unicode="C" glyph-name="C" horiz-adv-x="586" d="M354 -12Q292 -12 236 8T137 70T69 174T44 320Q44 402 70 465T139 572T239 639T358 662Q423 662 474 637T560 576L470 466Q446 487 421 500T362 514Q333 514 308 501T263 464T232 405T220 326Q220 234 +258 185T360 136Q398 136 427 152T478 192L568 84Q526 36 472 12T354 -12Z" /> +<glyph unicode="D" glyph-name="D" horiz-adv-x="642" d="M72 0V650H264Q338 650 399 632T505 575T573 475T598 328Q598 242 574 180T507 78T404 19T274 0H72ZM244 138H254Q289 138 320 146T373 176T409 234T422 328Q422 385 409 421T374 477T320 504T254 512H244V138Z" /> +<glyph unicode="E" glyph-name="E" horiz-adv-x="556" d="M72 0V650H492V506H244V404H456V260H244V144H502V0H72Z" /> +<glyph unicode="F" glyph-name="F" horiz-adv-x="536" d="M72 0V650H496V506H244V382H460V238H244V0H72Z" /> +<glyph unicode="G" glyph-name="G" horiz-adv-x="646" d="M372 -12Q304 -12 244 8T140 70T70 174T44 320Q44 402 70 465T140 572T244 639T368 662Q440 662 492 637T580 576L490 466Q466 487 440 500T374 514Q341 514 313 501T264 464T232 405T220 326Q220 234 +261 185T390 136Q404 136 417 139T440 148V238H344V378H592V68Q557 35 499 12T372 -12Z" /> +<glyph unicode="H" glyph-name="H" horiz-adv-x="682" d="M72 0V650H244V408H438V650H610V0H438V258H244V0H72Z" /> +<glyph unicode="I" glyph-name="I" horiz-adv-x="316" d="M72 0V650H244V0H72Z" /> +<glyph unicode="J" glyph-name="J" horiz-adv-x="520" d="M232 -12Q152 -12 99 18T10 111L126 198Q143 166 165 151T208 136Q225 136 238 140T261 157T275 189T280 240V650H452V226Q452 177 439 134T398 59T330 7T232 -12Z" /> +<glyph unicode="K" glyph-name="K" horiz-adv-x="628" d="M72 0V650H244V408H248L412 650H600L406 386L638 0H450L306 250L244 162V0H72Z" /> +<glyph unicode="L" glyph-name="L" horiz-adv-x="530" d="M72 0V650H244V144H490V0H72Z" /> +<glyph unicode="M" glyph-name="M" horiz-adv-x="776" d="M72 0V650H256L354 384Q363 357 371 328T388 270H392Q401 299 409 328T426 384L520 650H704V0H548V192Q548 217 550 247T556 308T563 370T570 424H566L512 268L432 53H340L260 268L208 424H204Q207 400 +211 370T218 309T223 247T226 192V0H72Z" /> +<glyph unicode="N" glyph-name="N" horiz-adv-x="672" d="M72 0V650H248L392 360L454 214H458Q455 240 451 271T444 334T439 399T436 462V650H600V0H424L280 291L218 436H214Q220 380 228 314T236 188V0H72Z" /> +<glyph unicode="O" glyph-name="O" horiz-adv-x="692" d="M346 -12Q278 -12 223 11T128 77T66 184T44 328Q44 408 66 470T127 575T222 640T346 662Q413 662 469 640T564 575T626 470T648 328Q648 248 626 185T565 78T469 11T346 -12ZM346 136Q405 136 438 187T472 +328Q472 417 439 465T346 514Q287 514 254 466T220 328Q220 239 253 188T346 136Z" /> +<glyph unicode="P" glyph-name="P" horiz-adv-x="608" d="M72 0V650H310Q363 650 411 640T495 604T552 537T574 434Q574 374 553 331T495 261T412 220T314 206H244V0H72ZM244 342H306Q357 342 381 366T406 434Q406 478 379 496T302 514H244V342Z" /> +<glyph unicode="Q" glyph-name="Q" horiz-adv-x="692" d="M346 128Q405 128 438 179T472 328Q472 417 439 465T346 514Q287 514 254 466T220 328Q220 231 253 180T346 128ZM566 -188Q511 -188 465 -175T381 -136T315 -78T268 -3Q217 9 176 36T105 106T60 204T44 +328Q44 408 66 470T127 575T222 640T346 662Q413 662 469 640T564 575T626 470T648 328Q648 200 595 117T449 4Q472 -28 510 -40T586 -52Q607 -52 626 -49T660 -40L690 -164Q670 -175 639 -181T566 -188Z" /> +<glyph unicode="R" glyph-name="R" horiz-adv-x="630" d="M72 0V650H318Q370 650 417 640T500 606T557 542T578 440Q578 370 550 324T473 252L614 0H422L310 218H244V0H72ZM244 354H306Q410 354 410 440Q410 482 384 498T306 514H244V354Z" /> +<glyph unicode="S" glyph-name="S" horiz-adv-x="564" d="M278 -12Q216 -12 151 10T32 81L130 199Q165 171 205 154T282 136Q321 136 338 148T356 182Q356 194 350 202T333 217T305 230T268 245L187 279Q161 289 137 305T95 344T67 396T56 460Q56 502 74 538T124 +602T200 646T298 662Q354 662 411 641T514 575L428 467Q395 490 365 502T298 514Q266 514 248 503T230 470Q230 447 255 435T326 405L405 374Q466 350 499 307T532 196Q532 155 515 117T466 51T386 5T278 -12Z" /> +<glyph unicode="T" glyph-name="T" horiz-adv-x="564" d="M196 0V506H24V650H540V506H368V0H196Z" /> +<glyph unicode="U" glyph-name="U" horiz-adv-x="672" d="M338 -12Q201 -12 135 67T68 314V650H240V294Q240 207 263 172T338 136Q389 136 413 171T438 294V650H604V314Q604 147 539 68T338 -12Z" /> +<glyph unicode="V" glyph-name="V" horiz-adv-x="572" d="M182 0L-10 650H172L240 366Q254 314 264 264T288 160H292Q306 213 316 263T340 366L406 650H582L390 0H182Z" /> +<glyph unicode="W" glyph-name="W" horiz-adv-x="824" d="M124 0L10 650H186L222 366Q227 315 233 264T244 162H248Q257 213 266 264T284 366L346 650H490L552 366Q561 317 570 266T588 162H592Q597 214 603 265T614 366L650 650H814L706 0H488L438 258Q430 296 +425 335T414 410H410Q405 374 400 335T386 258L338 0H124Z" /> +<glyph unicode="X" glyph-name="X" horiz-adv-x="588" d="M10 0L186 334L20 650H212L256 544Q267 521 277 495T302 436H306Q317 468 327 494T346 544L384 650H568L402 326L578 0H386L334 116Q322 142 311 168T288 224H284Q273 194 263 168T242 116L194 0H10Z" /> +<glyph unicode="Y" glyph-name="Y" horiz-adv-x="544" d="M186 0V224L-10 650H174L222 514Q234 477 246 442T271 369H275Q288 407 300 442T326 514L374 650H554L358 224V0H186Z" /> +<glyph unicode="Z" glyph-name="Z" horiz-adv-x="542" d="M32 0V104L298 506H58V650H510V546L244 144H512V0H32Z" /> +<glyph unicode="[" glyph-name="bracketleft" horiz-adv-x="360" d="M84 -152V708H308V618H212V-62H308V-152H84Z" /> +<glyph unicode="\" glyph-name="backslash" horiz-adv-x="334" d="M210 -160L34 710H144L320 -160H210Z" /> +<glyph unicode="]" glyph-name="bracketright" horiz-adv-x="360" d="M52 -152V-62H148V618H52V708H276V-152H52Z" /> +<glyph unicode="^" glyph-name="asciicircum" horiz-adv-x="540" d="M46 270L202 670H338L494 270H354L316 380L272 516H268L224 380L186 270H46Z" /> +<glyph unicode="_" glyph-name="underscore" horiz-adv-x="500" d="M12 -146V-52H488V-146H12Z" /> +<glyph unicode="`" glyph-name="grave" horiz-adv-x="560" d="M260 572L70 730L186 844L344 656L260 572Z" /> +<glyph unicode="a" glyph-name="a" horiz-adv-x="536" d="M188 -12Q153 -12 125 0T78 34T48 83T38 142Q38 220 102 264T310 324Q304 376 240 376Q213 376 183 366T114 334L54 446Q107 478 161 495T274 512Q371 512 426 457T482 278V0H342L330 48H326Q296 21 263 +5T188 -12ZM248 120Q269 120 282 129T310 154V222Q248 213 225 195T202 156Q202 120 248 120Z" /> +<glyph unicode="b" glyph-name="b" horiz-adv-x="580" d="M336 -12Q303 -12 271 4T210 54H206L192 0H58V696H230V534L226 462Q252 486 284 499T349 512Q393 512 429 494T490 443T530 363T544 259Q544 194 527 144T480 59T414 6T336 -12ZM294 128Q324 128 346 156T368 +256Q368 318 351 345T298 372Q278 372 263 364T230 336V152Q245 138 261 133T294 128Z" /> +<glyph unicode="c" glyph-name="c" horiz-adv-x="472" d="M284 -12Q231 -12 185 5T105 56T52 139T32 250Q32 312 54 361T113 443T198 494T300 512Q345 512 381 498T446 460L366 350Q349 364 337 369T310 374Q262 374 235 341T208 250Q208 193 235 160T304 126Q325 +126 345 135T384 158L450 46Q412 13 368 1T284 -12Z" /> +<glyph unicode="d" glyph-name="d" horiz-adv-x="580" d="M240 -12Q193 -12 156 6T92 58T51 140T36 250Q36 311 53 360T99 442T165 494T240 512Q281 512 307 499T356 462L350 534V696H522V0H382L370 46H366Q340 20 307 4T240 -12ZM286 128Q306 128 321 135T350 +164V348Q335 362 317 367T282 372Q255 372 234 345T212 252Q212 184 231 156T286 128Z" /> +<glyph unicode="e" glyph-name="e" horiz-adv-x="526" d="M290 -12Q235 -12 188 5T107 56T52 139T32 250Q32 311 52 359T106 442T183 494T272 512Q327 512 368 493T436 441T476 364T490 270Q490 247 488 227T483 198H198Q210 153 241 136T314 118Q340 118 364 +125T416 148L472 46Q431 17 382 3T290 -12ZM196 310H344Q344 339 330 360T276 382Q247 382 226 365T196 310Z" /> +<glyph unicode="f" glyph-name="f" horiz-adv-x="360" d="M88 0V366H22V494L88 499V506Q88 546 98 582T131 647T192 691T286 708Q321 708 348 702T392 690L362 564Q350 569 337 571T312 574Q288 574 274 561T260 512V500H344V366H260V0H88Z" /> +<glyph unicode="g" glyph-name="g" horiz-adv-x="546" d="M240 -206Q197 -206 159 -200T93 -178T47 -140T30 -82Q30 -23 100 14V18Q80 32 67 52T54 104Q54 130 69 155T110 198V202Q83 220 63 253T42 330Q42 376 60 410T108 467T176 501T256 512Q300 512 336 500H522V376H450Q453 +367 455 353T458 324Q458 280 442 249T399 197T335 168T256 158Q231 158 200 165Q192 158 190 153T188 136Q188 119 204 113T258 106H333Q427 106 478 76T530 -24Q530 -65 510 -98T452 -156T361 -193T240 -206ZM256 260Q280 260 295 277T310 330Q310 365 295 381T256 +398Q232 398 217 382T202 330Q202 294 217 277T256 260ZM268 -100Q310 -100 338 -88T366 -54Q366 -34 349 -29T299 -24H260Q230 -24 215 -23T188 -18Q179 -27 175 -35T170 -54Q170 -78 197 -89T268 -100Z" /> +<glyph unicode="h" glyph-name="h" horiz-adv-x="582" d="M58 0V696H230V534L222 448Q248 471 284 491T372 512Q454 512 491 457T528 308V0H356V286Q356 334 344 350T306 366Q282 366 266 356T230 328V0H58Z" /> +<glyph unicode="i" glyph-name="i" horiz-adv-x="288" d="M58 0V500H230V0H58ZM144 562Q102 562 75 586T48 648Q48 686 75 710T144 734Q186 734 213 710T240 648Q240 610 213 586T144 562Z" /> +<glyph unicode="j" glyph-name="j" horiz-adv-x="290" d="M38 -188Q3 -188 -18 -184T-56 -174L-26 -48Q-15 -51 -7 -52T10 -54Q37 -54 48 -38T60 20V500H232V26Q232 -16 223 -54T192 -123T132 -170T38 -188ZM146 562Q104 562 77 586T50 648Q50 686 77 710T146 +734Q188 734 215 710T242 648Q242 610 215 586T146 562Z" /> +<glyph unicode="k" glyph-name="k" horiz-adv-x="568" d="M58 0V696H226V326H230L368 500H554L376 292L564 0H378L278 178L226 120V0H58Z" /> +<glyph unicode="l" glyph-name="l" horiz-adv-x="298" d="M212 -12Q168 -12 139 1T91 40T66 99T58 176V696H230V170Q230 144 239 135T258 126Q263 126 266 126T276 128L296 2Q282 -4 262 -8T212 -12Z" /> +<glyph unicode="m" glyph-name="m" horiz-adv-x="868" d="M58 0V500H198L210 439H214Q244 468 278 490T364 512Q415 512 448 492T502 432Q533 464 569 488T656 512Q738 512 776 457T814 308V0H642V286Q642 334 630 350T592 366Q560 366 522 328V0H350V286Q350 +334 338 350T300 366Q268 366 230 328V0H58Z" /> +<glyph unicode="n" glyph-name="n" horiz-adv-x="582" d="M58 0V500H198L210 440H214Q244 469 282 490T372 512Q454 512 491 457T528 308V0H356V286Q356 334 344 350T306 366Q282 366 266 356T230 328V0H58Z" /> +<glyph unicode="o" glyph-name="o" horiz-adv-x="560" d="M280 -12Q232 -12 187 5T108 56T53 139T32 250Q32 312 52 361T107 443T187 494T280 512Q328 512 372 495T451 444T507 361T528 250Q528 188 507 139T452 57T373 6T280 -12ZM280 126Q319 126 335 159T352 +250Q352 307 336 340T280 374Q241 374 225 341T208 250Q208 193 224 160T280 126Z" /> +<glyph unicode="p" glyph-name="p" horiz-adv-x="580" d="M58 -176V500H198L210 454H214Q242 480 277 496T350 512Q394 512 430 494T491 443T530 363T544 258Q544 193 527 143T480 59T414 6T336 -12Q274 -12 224 38L230 -38V-176H58ZM294 128Q324 128 346 156T368 +256Q368 318 351 345T298 372Q278 372 263 364T230 336V152Q245 138 261 133T294 128Z" /> +<glyph unicode="q" glyph-name="q" horiz-adv-x="580" d="M350 -176V-33L356 38Q333 15 302 2T240 -12Q193 -12 156 6T92 58T51 140T36 250Q36 311 53 360T99 442T165 494T240 512Q280 512 310 498T370 450H374L388 500H522V-176H350ZM286 128Q306 128 321 135T350 +164V348Q335 362 317 367T282 372Q255 372 234 345T212 252Q212 184 231 156T286 128Z" /> +<glyph unicode="r" glyph-name="r" horiz-adv-x="418" d="M58 0V500H198L210 414H214Q242 465 280 488T356 512Q379 512 393 510T418 502L390 354Q376 357 364 359T334 362Q307 362 278 344T230 278V0H58Z" /> +<glyph unicode="s" glyph-name="s" horiz-adv-x="452" d="M212 -12Q164 -12 111 7T18 58L94 164Q162 114 216 114Q243 114 254 121T266 144Q266 154 258 161T237 175T206 188T170 202Q148 211 126 223T85 254T56 295T44 350Q44 387 58 417T99 468T161 500T242 +512Q304 512 348 492T426 446L350 344Q323 364 297 375T248 386Q204 386 204 358Q204 348 211 341T232 328T262 317T298 304Q320 296 343 284T384 255T414 213T426 154Q426 119 412 89T371 36T304 1T212 -12Z" /> +<glyph unicode="t" glyph-name="t" horiz-adv-x="400" d="M264 -12Q215 -12 181 2T124 44T91 108T80 192V366H14V494L90 500L110 630H252V500H366V366H252V195Q252 153 270 138T312 122Q324 122 335 124T356 130L382 6Q362 0 334 -6T264 -12Z" /> +<glyph unicode="u" glyph-name="u" horiz-adv-x="578" d="M210 -12Q169 -12 140 2T91 43T63 107T54 192V500H226V214Q226 166 238 150T276 134Q300 134 315 144T348 178V500H520V0H380L368 66H364Q334 30 298 9T210 -12Z" /> +<glyph unicode="v" glyph-name="v" horiz-adv-x="544" d="M176 0L12 500H184L238 282Q256 207 274 126H278Q296 207 314 282L368 500H532L374 0H176Z" /> +<glyph unicode="w" glyph-name="w" horiz-adv-x="798" d="M144 0L24 500H194L232 290Q238 252 242 215T252 138H256Q262 177 268 215T284 290L330 500H476L524 290Q533 252 539 215T554 138H558Q564 177 568 214T578 290L616 500H774L660 0H460L424 174Q418 209 +412 244T400 321H396Q390 279 385 244T374 174L340 0H144Z" /> +<glyph unicode="x" glyph-name="x" horiz-adv-x="540" d="M14 0L164 260L22 500H206L242 430Q252 409 262 387T282 344H286Q293 365 301 387T316 430L340 500H518L376 240L526 0H342L302 70Q291 91 280 113T258 156H254Q246 135 237 114T220 70L192 0H14Z" /> +<glyph unicode="y" glyph-name="y" horiz-adv-x="542" d="M132 -188Q106 -188 90 -186T56 -178L86 -48Q93 -50 101 -52T118 -54Q153 -54 170 -41T196 -4L202 18L12 500H184L244 308Q255 273 263 239T280 166H284Q292 202 299 237T316 308L366 500H530L362 8Q342 +-43 322 -80T274 -141T213 -176T132 -188Z" /> +<glyph unicode="z" glyph-name="z" horiz-adv-x="474" d="M40 0V92L230 366H62V500H444V408L254 134H450V0H40Z" /> +<glyph unicode="{" glyph-name="braceleft" horiz-adv-x="360" d="M238 -152Q203 -152 179 -145T138 -120T114 -75T106 -6Q106 20 107 40T111 78T114 114T116 156Q116 182 97 204T30 228V328Q78 330 97 352T116 400Q116 423 115 441T111 478T108 516T106 562Q106 +644 137 676T238 708H308V618H292Q264 618 254 607T244 556Q244 518 246 481T248 400Q248 340 228 315T168 280V276Q208 267 228 242T248 156Q248 112 246 75T244 0Q244 -39 254 -50T292 -62H308V-152H238Z" /> +<glyph unicode="|" glyph-name="bar" horiz-adv-x="278" d="M84 -250V750H194V-250H84Z" /> +<glyph unicode="}" glyph-name="braceright" horiz-adv-x="360" d="M52 -152V-62H68Q96 -62 106 -51T116 0Q116 38 114 75T112 156Q112 216 132 241T192 276V280Q152 289 132 314T112 400Q112 444 114 481T116 556Q116 595 106 606T68 618H52V708H122Q191 708 +222 676T254 562Q254 536 253 516T249 478T246 442T244 400Q244 374 263 352T330 328V228Q282 226 263 204T244 156Q244 133 245 115T249 78T252 40T254 -6Q254 -47 247 -75T223 -120T181 -144T122 -152H52Z" /> +<glyph unicode="~" glyph-name="asciitilde" horiz-adv-x="540" d="M354 234Q322 234 300 245T258 269T222 294T184 306Q164 306 147 291T114 250L26 318Q67 378 107 402T186 426Q217 426 240 415T282 390T318 365T356 354Q376 354 393 369T426 410L514 342Q473 +282 433 258T354 234Z" /> +<glyph unicode=" " glyph-name="uni00A0" horiz-adv-x="210" /> +<glyph unicode="¡" glyph-name="exclamdown" horiz-adv-x="360" d="M94 -170L100 -22L124 256H236L260 -22L266 -170H94ZM180 304Q136 304 108 334T80 408Q80 452 108 482T180 512Q224 512 252 482T280 408Q280 364 252 334T180 304Z" /> +<glyph unicode="¢" glyph-name="cent" horiz-adv-x="540" d="M226 306Q226 230 280 199V413Q252 398 239 371T226 306ZM280 -44V47Q179 61 120 127T60 306Q60 359 76 402T122 478T191 532T280 562V656H372V567Q410 563 441 549T494 512L416 406Q393 424 372 +429V184Q389 188 404 196T432 214L500 106Q471 81 438 67T372 47V-44H280Z" /> +<glyph unicode="£" glyph-name="sterling" horiz-adv-x="540" d="M46 0V106Q88 124 120 160T152 250Q152 254 152 258T151 266H52V364L120 370H122Q117 387 114 402T110 432Q110 481 127 521T174 588T245 631T334 646Q391 646 434 625T514 562L422 470Q390 +508 352 508Q317 508 296 489T274 422Q274 409 276 397T280 370H424V266H301Q302 261 302 257T302 248Q302 219 294 197T264 148V144H514V0H46Z" /> +<glyph unicode="¤" glyph-name="currency" horiz-adv-x="540" d="M102 76L17 161L77 221Q44 268 44 330Q44 362 52 388T76 437L17 497L102 582L172 512Q220 532 270 532Q320 532 368 512L438 582L523 497L463 437Q479 415 487 389T496 330Q496 298 487 271T462 +221L523 161L438 76L367 147Q344 137 319 133T270 128Q218 128 173 147L102 76ZM270 246Q302 246 323 268T344 330Q344 369 323 391T270 414Q238 414 217 392T196 330Q196 291 217 269T270 246Z" /> +<glyph unicode="¥" glyph-name="yen" horiz-adv-x="540" d="M184 0V142H34V222H184V272H34V352H148L8 634H184L224 516Q235 483 246 451T270 386H274Q285 418 297 451T320 516L360 634H532L392 352H506V272H356V222H506V142H356V0H184Z" /> +<glyph unicode="¦" glyph-name="brokenbar" horiz-adv-x="278" d="M84 320V750H194V320H84ZM84 -250V200H194V-250H84Z" /> +<glyph unicode="§" glyph-name="section" horiz-adv-x="540" d="M178 332Q178 312 192 298T230 271T281 247T337 221Q362 239 362 270Q362 290 348 305T311 332T260 355T203 380Q178 361 178 332ZM242 -92Q186 -92 131 -71T40 -2L138 84Q162 58 189 46T242 +34Q269 34 280 42T292 66Q292 82 273 94T225 118T163 145T101 184T53 239T34 320Q34 355 54 389T111 447Q98 464 91 484T84 530Q84 604 134 648T272 692Q334 692 382 671T462 624L384 518Q361 538 333 552T282 566Q260 566 249 560T238 536Q238 522 258 511T307 +486T372 457T436 417T486 362T506 284Q506 201 425 149Q446 117 446 74Q446 39 434 9T396 -44T332 -79T242 -92Z" /> +<glyph unicode="¨" glyph-name="dieresis" horiz-adv-x="560" d="M166 562Q131 562 109 585T86 642Q86 676 108 699T166 722Q201 722 223 699T246 642Q246 608 224 585T166 562ZM394 562Q359 562 337 585T314 642Q314 676 336 699T394 722Q429 722 451 699T474 +642Q474 608 452 585T394 562Z" /> +<glyph unicode="©" glyph-name="copyright" horiz-adv-x="752" d="M376 -8Q309 -8 249 15T144 81T71 186T44 326Q44 404 71 465T143 569T249 633T376 656Q443 656 503 634T608 569T681 465T708 326Q708 248 681 186T609 81T503 15T376 -8ZM376 60Q431 60 +477 79T558 133T612 217T632 326Q632 386 613 434T559 517T478 569T376 588Q321 588 275 570T194 517T140 435T120 326Q120 266 139 217T193 133T274 79T376 60ZM390 128Q346 128 310 141T248 180T207 242T192 324Q192 368 208 404T252 465T314 504T388 518Q436 +518 468 500T524 458L461 388Q447 403 433 411T400 420Q355 420 334 392T313 324Q313 279 334 253T394 226Q417 226 432 234T466 256L520 178Q491 155 459 142T390 128Z" /> +<glyph unicode="ª" glyph-name="ordfeminine" horiz-adv-x="364" d="M128 360Q104 360 85 368T53 391T33 423T26 462Q26 515 68 544T208 582Q204 614 164 614Q146 614 125 607T78 586L36 664Q72 685 109 696T186 708Q251 708 289 671T328 554V368H232L222 +400H218Q200 382 178 371T128 360ZM169 450Q182 450 190 455T208 470V514Q169 509 155 498T140 472Q140 450 169 450Z" /> +<glyph unicode="«" glyph-name="guillemotleft" horiz-adv-x="500" d="M184 52L50 192V312L184 452L246 402L138 252L246 102L184 52ZM384 52L250 192V312L384 452L446 402L338 252L446 102L384 52Z" /> +<glyph unicode="¬" glyph-name="logicalnot" horiz-adv-x="540" d="M382 90V270H34V390H506V90H382Z" /> +<glyph unicode="" glyph-name="uni00AD" horiz-adv-x="340" d="M44 194V314H296V194H44Z" /> +<glyph unicode="®" glyph-name="registered" horiz-adv-x="477" d="M238 308Q196 308 159 323T95 366T52 430T36 512Q36 556 52 593T95 658T159 700T238 716Q280 716 317 701T381 658T424 594T440 512Q440 468 424 431T381 366T317 324T238 308ZM238 362Q301 +362 340 402T380 512Q380 581 341 621T238 662Q175 662 136 622T96 512Q96 443 135 403T238 362ZM154 416V610H248Q284 610 307 594T330 544Q330 527 322 513T296 490L336 416H270L242 472H218V416H154ZM218 515H236Q250 515 256 523T262 540Q262 550 255 556T236 +563H218V515Z" /> +<glyph unicode="¯" glyph-name="overscore" horiz-adv-x="560" d="M126 588V696H434V588H126Z" /> +<glyph unicode="°" glyph-name="degree" horiz-adv-x="378" d="M190 386Q158 386 130 397T82 429T50 476T38 536Q38 568 49 595T81 643T130 674T190 686Q222 686 250 675T298 643T330 596T342 536Q342 504 331 477T299 429T250 398T190 386ZM190 466Q219 +466 236 485T254 536Q254 568 237 587T190 606Q161 606 144 587T126 536Q126 504 143 485T190 466Z" /> +<glyph unicode="±" glyph-name="plusminus" horiz-adv-x="540" d="M208 170V290H34V410H208V570H332V410H506V290H332V170H208ZM34 0V120H506V0H34Z" /> +<glyph unicode="²" glyph-name="two.sups" horiz-adv-x="380" d="M42 368V434Q76 461 106 486T159 534T195 577T208 614Q208 640 195 654T158 668Q140 668 125 657T92 624L22 688Q55 730 93 750T178 770Q246 770 287 735T328 636Q328 592 301 552T240 472H340V368H42Z" +/> +<glyph unicode="³" glyph-name="three.sups" horiz-adv-x="380" d="M188 356Q135 356 93 375T24 436L98 494Q116 470 133 460T174 450Q194 450 208 460T222 488Q222 511 203 521T140 532V602Q171 602 189 610T208 642Q208 659 197 667T168 676Q150 676 136 +666T110 640L40 702Q75 738 108 754T190 770Q218 770 243 763T287 741T318 706T330 660Q330 630 317 610T278 572Q307 558 325 535T344 478Q344 451 331 429T297 390T247 365T188 356Z" /> +<glyph unicode="´" glyph-name="acute" horiz-adv-x="560" d="M300 572L216 656L374 844L490 730L300 572Z" /> +<glyph unicode="µ" glyph-name="uni00B5" horiz-adv-x="606" d="M58 -176V500H230V214Q230 166 242 150T280 134Q303 134 318 147T348 188V500H522Q520 459 518 412T515 320T512 236T510 170Q510 144 522 135T558 126Q564 126 573 127T590 132L610 6Q592 +-2 570 -7T512 -12Q456 -12 420 8T368 66H364Q349 31 325 13T270 -6Q256 -6 244 -4T220 8Q222 -41 224 -83T232 -176H58Z" /> +<glyph unicode="¶" glyph-name="paragraph" horiz-adv-x="666" d="M398 -80V650H570V-80H398ZM298 186Q245 186 198 201T116 247T59 321T38 424Q38 488 59 531T115 601T198 639T298 650H342V186H298Z" /> +<glyph unicode="·" glyph-name="middot" horiz-adv-x="320" d="M160 216Q116 216 88 246T60 320Q60 364 88 394T160 424Q204 424 232 394T260 320Q260 276 232 246T160 216Z" /> +<glyph unicode="¸" glyph-name="cedilla" horiz-adv-x="560" d="M172 -244L160 -178Q217 -175 238 -166T260 -136Q260 -123 245 -113T184 -96L234 4H332L304 -60Q343 -69 362 -86T382 -136Q382 -190 327 -215T172 -244Z" /> +<glyph unicode="¹" glyph-name="one.sups" horiz-adv-x="380" d="M162 368V638H72V714Q94 717 110 721T139 730T164 742T190 758H288V368H162Z" /> +<glyph unicode="º" glyph-name="ordmasculine" horiz-adv-x="376" d="M188 360Q156 360 126 371T73 405T36 460T22 533Q22 574 36 606T73 661T126 696T188 708Q220 708 250 696T303 662T340 607T354 533Q354 492 340 460T303 406T250 372T188 360ZM188 454Q213 +454 222 475T232 533Q232 570 223 592T188 614Q163 614 154 592T144 533Q144 497 153 476T188 454Z" /> +<glyph unicode="»" glyph-name="guillemotright" horiz-adv-x="500" d="M116 52L54 102L162 252L54 402L116 452L250 312V192L116 52ZM316 52L254 102L362 252L254 402L316 452L450 312V192L316 52Z" /> +<glyph unicode="¼" glyph-name="onequarter" horiz-adv-x="820" d="M131 260V530H41V606Q63 609 79 613T108 622T133 634T159 650H257V260H131ZM188 -12L536 662H632L284 -12H188ZM652 0V80H472V142L604 390H762V160H820V80H762V0H652ZM584 160H652V190L658 +310H654L618 234L584 160Z" /> +<glyph unicode="½" glyph-name="onehalf" horiz-adv-x="860" d="M131 260V530H41V606Q63 609 79 613T108 622T133 634T159 650H257V260H131ZM174 -12L522 662H618L270 -12H174ZM522 0V66Q556 93 586 118T639 166T675 209T688 246Q688 272 675 286T638 300Q620 +300 605 289T572 256L502 320Q535 362 573 382T658 402Q726 402 767 367T808 268Q808 224 781 184T720 104H820V0H522Z" /> +<glyph unicode="¾" glyph-name="threequarters" horiz-adv-x="826" d="M185 248Q132 248 90 267T21 328L95 386Q113 362 130 352T171 342Q191 342 205 352T219 380Q219 403 200 413T137 424V494Q168 494 186 502T205 534Q205 551 194 559T165 568Q147 568 +133 558T107 532L37 594Q72 630 105 646T187 662Q215 662 240 655T284 633T315 598T327 552Q327 522 314 502T275 464Q304 450 322 427T341 370Q341 343 328 321T294 282T244 257T185 248ZM204 -12L552 662H648L300 -12H204ZM658 0V80H478V142L610 390H768V160H826V80H768V0H658ZM590 +160H658V190L664 310H660L624 234L590 160Z" /> +<glyph unicode="¿" glyph-name="questiondown" horiz-adv-x="478" d="M238 -182Q197 -182 161 -172T98 -141T56 -87T40 -6Q40 24 51 47T77 91T111 129T145 166T169 206T176 256H326Q331 224 324 197T304 148T273 106T240 70T215 38T204 6Q204 -21 220 -32T260 +-44Q286 -44 304 -32T342 -2L436 -88Q398 -130 348 -156T238 -182ZM252 304Q208 304 180 334T152 408Q152 452 180 482T252 512Q296 512 324 482T352 408Q352 364 324 334T252 304Z" /> +<glyph unicode="À" glyph-name="Agrave" horiz-adv-x="584" d="M240 316L229 271H349L338 316Q326 363 314 418T290 522H286Q275 472 264 418T240 316ZM-10 0L188 650H396L594 0H412L380 138H198L166 0H-10ZM296 674L100 794L190 904L372 760L296 674Z" /> +<glyph unicode="Á" glyph-name="Aacute" horiz-adv-x="584" d="M240 316L229 271H349L338 316Q326 363 314 418T290 522H286Q275 472 264 418T240 316ZM-10 0L188 650H396L594 0H412L380 138H198L166 0H-10ZM280 674L204 760L386 904L476 794L280 674Z" /> +<glyph unicode="Â" glyph-name="Acircumflex" horiz-adv-x="584" d="M240 316L229 271H349L338 316Q326 363 314 418T290 522H286Q275 472 264 418T240 316ZM-10 0L188 650H396L594 0H412L380 138H198L166 0H-10ZM110 724L194 834H382L466 724L392 680L290 +760H286L184 680L110 724Z" /> +<glyph unicode="Ã" glyph-name="Atilde" horiz-adv-x="584" d="M240 316L229 271H349L338 316Q326 363 314 418T290 522H286Q275 472 264 418T240 316ZM-10 0L188 650H396L594 0H412L380 138H198L166 0H-10ZM358 686Q332 686 312 694T275 712T247 730T224 +738Q212 738 204 730T192 696L82 704Q84 745 95 774T125 821T167 847T218 856Q244 856 264 848T301 830T329 812T352 804Q364 804 372 812T384 846L494 838Q492 797 481 768T451 721T409 695T358 686Z" /> +<glyph unicode="Ä" glyph-name="Adieresis" horiz-adv-x="584" d="M240 316L229 271H349L338 316Q326 363 314 418T290 522H286Q275 472 264 418T240 316ZM-10 0L188 650H396L594 0H412L380 138H198L166 0H-10ZM174 694Q139 694 118 716T96 772Q96 805 117 +827T174 850Q209 850 230 828T252 772Q252 739 231 717T174 694ZM402 694Q367 694 346 716T324 772Q324 805 345 827T402 850Q437 850 458 828T480 772Q480 739 459 717T402 694Z" /> +<glyph unicode="Å" glyph-name="Aring" horiz-adv-x="584" d="M240 316L229 271H349L338 316Q326 363 314 418T290 522H286Q275 472 264 418T240 316ZM-10 0L188 650H396L594 0H412L380 138H198L166 0H-10ZM288 696Q234 696 201 723T168 798Q168 845 201 +872T288 900Q342 900 375 873T408 798Q408 751 375 724T288 696ZM288 758Q304 758 315 769T326 798Q326 816 315 827T288 838Q272 838 261 827T250 798Q250 780 261 769T288 758Z" /> +<glyph unicode="Æ" glyph-name="AE" horiz-adv-x="854" d="M308 348L272 265H380V522H376Q358 475 342 431T308 348ZM-22 0L274 650H790V506H552V404H754V260H552V144H800V0H380V132H215L158 0H-22Z" /> +<glyph unicode="Ç" glyph-name="Ccedilla" horiz-adv-x="586" d="M354 -12Q292 -12 236 8T137 70T69 174T44 320Q44 402 70 465T139 572T239 639T358 662Q423 662 474 637T560 576L470 466Q446 487 421 500T362 514Q333 514 308 501T263 464T232 405T220 +326Q220 234 258 185T360 136Q398 136 427 152T478 192L568 84Q526 36 472 12T354 -12ZM244 -244L232 -178Q289 -175 310 -166T332 -136Q332 -123 317 -113T256 -96L306 4H404L376 -60Q415 -69 434 -86T454 -136Q454 -190 399 -215T244 -244Z" /> +<glyph unicode="È" glyph-name="Egrave" horiz-adv-x="556" d="M72 0V650H492V506H244V404H456V260H244V144H502V0H72ZM298 674L102 794L192 904L374 760L298 674Z" /> +<glyph unicode="É" glyph-name="Eacute" horiz-adv-x="556" d="M72 0V650H492V506H244V404H456V260H244V144H502V0H72ZM282 674L206 760L388 904L478 794L282 674Z" /> +<glyph unicode="Ê" glyph-name="Ecircumflex" horiz-adv-x="556" d="M72 0V650H492V506H244V404H456V260H244V144H502V0H72ZM112 724L196 834H384L468 724L394 680L292 760H288L186 680L112 724Z" /> +<glyph unicode="Ë" glyph-name="Edieresis" horiz-adv-x="556" d="M72 0V650H492V506H244V404H456V260H244V144H502V0H72ZM176 694Q141 694 120 716T98 772Q98 805 119 827T176 850Q211 850 232 828T254 772Q254 739 233 717T176 694ZM404 694Q369 694 348 +716T326 772Q326 805 347 827T404 850Q439 850 460 828T482 772Q482 739 461 717T404 694Z" /> +<glyph unicode="Ì" glyph-name="Igrave" horiz-adv-x="316" d="M72 0V650H244V0H72ZM166 674L-30 794L60 904L242 760L166 674Z" /> +<glyph unicode="Í" glyph-name="Iacute" horiz-adv-x="316" d="M72 0V650H244V0H72ZM150 674L74 760L256 904L346 794L150 674Z" /> +<glyph unicode="Î" glyph-name="Icircumflex" horiz-adv-x="316" d="M72 0V650H244V0H72ZM-20 724L64 834H252L336 724L262 680L160 760H156L54 680L-20 724Z" /> +<glyph unicode="Ï" glyph-name="Idieresis" horiz-adv-x="316" d="M72 0V650H244V0H72ZM44 694Q9 694 -12 716T-34 772Q-34 805 -13 827T44 850Q79 850 100 828T122 772Q122 739 101 717T44 694ZM272 694Q237 694 216 716T194 772Q194 805 215 827T272 850Q307 +850 328 828T350 772Q350 739 329 717T272 694Z" /> +<glyph unicode="Ð" glyph-name="Eth" horiz-adv-x="668" d="M24 294V368L98 374V650H290Q364 650 425 632T531 575T599 475T624 328Q624 242 600 180T533 78T430 19T300 0H98V294H24ZM270 138H280Q315 138 346 146T399 176T435 234T448 328Q448 385 435 421T400 +477T346 504T280 512H270V374H386V294H270V138Z" /> +<glyph unicode="Ñ" glyph-name="Ntilde" horiz-adv-x="672" d="M72 0V650H248L392 360L454 214H458Q455 240 451 271T444 334T439 399T436 462V650H600V0H424L280 291L218 436H214Q220 380 228 314T236 188V0H72ZM406 686Q380 686 360 694T323 712T295 730T272 +738Q260 738 252 730T240 696L130 704Q132 745 143 774T173 821T215 847T266 856Q292 856 312 848T349 830T377 812T400 804Q412 804 420 812T432 846L542 838Q540 797 529 768T499 721T457 695T406 686Z" /> +<glyph unicode="Ò" glyph-name="Ograve" horiz-adv-x="692" d="M346 -12Q278 -12 223 11T128 77T66 184T44 328Q44 408 66 470T127 575T222 640T346 662Q413 662 469 640T564 575T626 470T648 328Q648 248 626 185T565 78T469 11T346 -12ZM346 136Q405 136 +438 187T472 328Q472 417 439 465T346 514Q287 514 254 466T220 328Q220 239 253 188T346 136ZM354 674L158 794L248 904L430 760L354 674Z" /> +<glyph unicode="Ó" glyph-name="Oacute" horiz-adv-x="692" d="M346 -12Q278 -12 223 11T128 77T66 184T44 328Q44 408 66 470T127 575T222 640T346 662Q413 662 469 640T564 575T626 470T648 328Q648 248 626 185T565 78T469 11T346 -12ZM346 136Q405 136 +438 187T472 328Q472 417 439 465T346 514Q287 514 254 466T220 328Q220 239 253 188T346 136ZM338 674L262 760L444 904L534 794L338 674Z" /> +<glyph unicode="Ô" glyph-name="Ocircumflex" horiz-adv-x="692" d="M346 -12Q278 -12 223 11T128 77T66 184T44 328Q44 408 66 470T127 575T222 640T346 662Q413 662 469 640T564 575T626 470T648 328Q648 248 626 185T565 78T469 11T346 -12ZM346 136Q405 +136 438 187T472 328Q472 417 439 465T346 514Q287 514 254 466T220 328Q220 239 253 188T346 136ZM168 724L252 834H440L524 724L450 680L348 760H344L242 680L168 724Z" /> +<glyph unicode="Õ" glyph-name="Otilde" horiz-adv-x="692" d="M346 -12Q278 -12 223 11T128 77T66 184T44 328Q44 408 66 470T127 575T222 640T346 662Q413 662 469 640T564 575T626 470T648 328Q648 248 626 185T565 78T469 11T346 -12ZM346 136Q405 136 +438 187T472 328Q472 417 439 465T346 514Q287 514 254 466T220 328Q220 239 253 188T346 136ZM416 686Q390 686 370 694T333 712T305 730T282 738Q270 738 262 730T250 696L140 704Q142 745 153 774T183 821T225 847T276 856Q302 856 322 848T359 830T387 812T410 +804Q422 804 430 812T442 846L552 838Q550 797 539 768T509 721T467 695T416 686Z" /> +<glyph unicode="Ö" glyph-name="Odieresis" horiz-adv-x="692" d="M346 -12Q278 -12 223 11T128 77T66 184T44 328Q44 408 66 470T127 575T222 640T346 662Q413 662 469 640T564 575T626 470T648 328Q648 248 626 185T565 78T469 11T346 -12ZM346 136Q405 +136 438 187T472 328Q472 417 439 465T346 514Q287 514 254 466T220 328Q220 239 253 188T346 136ZM232 694Q197 694 176 716T154 772Q154 805 175 827T232 850Q267 850 288 828T310 772Q310 739 289 717T232 694ZM460 694Q425 694 404 716T382 772Q382 805 403 +827T460 850Q495 850 516 828T538 772Q538 739 517 717T460 694Z" /> +<glyph unicode="×" glyph-name="multiply" horiz-adv-x="540" d="M132 106L47 191L185 329L47 467L132 552L270 414L408 552L493 467L355 329L493 191L408 106L270 244L132 106Z" /> +<glyph unicode="Ø" glyph-name="Oslash" horiz-adv-x="692" d="M346 -12Q253 -12 186 30L124 -46L36 22L105 106Q76 148 60 203T44 328Q44 408 66 470T127 575T222 640T346 662Q446 662 520 613L588 696L676 628L597 532Q622 492 635 441T648 328Q648 248 +626 185T565 78T469 11T346 -12ZM220 328Q220 286 227 255L418 488Q387 514 346 514Q287 514 254 466T220 328ZM346 136Q405 136 438 187T472 328Q472 354 469 375L287 153Q313 136 346 136Z" /> +<glyph unicode="Ù" glyph-name="Ugrave" horiz-adv-x="672" d="M338 -12Q201 -12 135 67T68 314V650H240V294Q240 207 263 172T338 136Q389 136 413 171T438 294V650H604V314Q604 147 539 68T338 -12ZM344 674L148 794L238 904L420 760L344 674Z" /> +<glyph unicode="Ú" glyph-name="Uacute" horiz-adv-x="672" d="M338 -12Q201 -12 135 67T68 314V650H240V294Q240 207 263 172T338 136Q389 136 413 171T438 294V650H604V314Q604 147 539 68T338 -12ZM328 674L252 760L434 904L524 794L328 674Z" /> +<glyph unicode="Û" glyph-name="Ucircumflex" horiz-adv-x="672" d="M338 -12Q201 -12 135 67T68 314V650H240V294Q240 207 263 172T338 136Q389 136 413 171T438 294V650H604V314Q604 147 539 68T338 -12ZM158 724L242 834H430L514 724L440 680L338 760H334L232 +680L158 724Z" /> +<glyph unicode="Ü" glyph-name="Udieresis" horiz-adv-x="672" d="M338 -12Q201 -12 135 67T68 314V650H240V294Q240 207 263 172T338 136Q389 136 413 171T438 294V650H604V314Q604 147 539 68T338 -12ZM222 694Q187 694 166 716T144 772Q144 805 165 827T222 +850Q257 850 278 828T300 772Q300 739 279 717T222 694ZM450 694Q415 694 394 716T372 772Q372 805 393 827T450 850Q485 850 506 828T528 772Q528 739 507 717T450 694Z" /> +<glyph unicode="Ý" glyph-name="Yacute" horiz-adv-x="544" d="M186 0V224L-10 650H174L222 514Q234 477 246 442T271 369H275Q288 407 300 442T326 514L374 650H554L358 224V0H186ZM264 674L188 760L370 904L460 794L264 674Z" /> +<glyph unicode="Þ" glyph-name="Thorn" horiz-adv-x="630" d="M72 0V650H244V556H324Q376 556 423 546T506 510T563 443T584 340Q584 280 563 237T505 167T422 126T324 112H244V0H72ZM244 248H316Q367 248 391 272T416 340Q416 384 390 402T316 420H244V248Z" /> +<glyph unicode="ß" glyph-name="germandbls" horiz-adv-x="654" d="M434 -12Q389 -12 354 -1T280 32L338 148Q362 130 384 122T428 114Q448 114 460 123T472 150Q472 165 460 176T429 198T388 221T348 250T317 289T304 344Q304 371 314 391T336 429T358 466T368 +512Q368 538 354 555T312 572Q269 572 249 541T228 458V0H58V476Q58 525 73 567T119 640T198 688T312 706Q367 706 408 691T477 652T518 597T532 532Q532 497 521 473T496 430T471 397T460 366Q460 352 472 342T503 322T544 298T584 267T615 222T628 158Q628 123 +616 92T580 38T520 2T434 -12Z" /> +<glyph unicode="à" glyph-name="agrave" horiz-adv-x="536" d="M188 -12Q153 -12 125 0T78 34T48 83T38 142Q38 220 102 264T310 324Q304 376 240 376Q213 376 183 366T114 334L54 446Q107 478 161 495T274 512Q371 512 426 457T482 278V0H342L330 48H326Q296 +21 263 5T188 -12ZM248 120Q269 120 282 129T310 154V222Q248 213 225 195T202 156Q202 120 248 120ZM261 572L71 730L187 844L345 656L261 572Z" /> +<glyph unicode="á" glyph-name="aacute" horiz-adv-x="536" d="M188 -12Q153 -12 125 0T78 34T48 83T38 142Q38 220 102 264T310 324Q304 376 240 376Q213 376 183 366T114 334L54 446Q107 478 161 495T274 512Q371 512 426 457T482 278V0H342L330 48H326Q296 +21 263 5T188 -12ZM248 120Q269 120 282 129T310 154V222Q248 213 225 195T202 156Q202 120 248 120ZM301 572L217 656L375 844L491 730L301 572Z" /> +<glyph unicode="â" glyph-name="acircumflex" horiz-adv-x="536" d="M188 -12Q153 -12 125 0T78 34T48 83T38 142Q38 220 102 264T310 324Q304 376 240 376Q213 376 183 366T114 334L54 446Q107 478 161 495T274 512Q371 512 426 457T482 278V0H342L330 48H326Q296 +21 263 5T188 -12ZM248 120Q269 120 282 129T310 154V222Q248 213 225 195T202 156Q202 120 248 120ZM87 618L193 746H369L475 618L411 558L283 642H279L151 558L87 618Z" /> +<glyph unicode="ã" glyph-name="atilde" horiz-adv-x="536" d="M188 -12Q153 -12 125 0T78 34T48 83T38 142Q38 220 102 264T310 324Q304 376 240 376Q213 376 183 366T114 334L54 446Q107 478 161 495T274 512Q371 512 426 457T482 278V0H342L330 48H326Q296 +21 263 5T188 -12ZM248 120Q269 120 282 129T310 154V222Q248 213 225 195T202 156Q202 120 248 120ZM345 572Q322 572 304 580T270 599T243 619T221 628Q209 628 202 619T191 582L85 588Q87 673 122 709T217 746Q239 746 258 737T292 718T319 699T341 690Q353 +690 360 699T371 736L477 730Q475 645 440 609T345 572Z" /> +<glyph unicode="ä" glyph-name="adieresis" horiz-adv-x="536" d="M188 -12Q153 -12 125 0T78 34T48 83T38 142Q38 220 102 264T310 324Q304 376 240 376Q213 376 183 366T114 334L54 446Q107 478 161 495T274 512Q371 512 426 457T482 278V0H342L330 48H326Q296 +21 263 5T188 -12ZM248 120Q269 120 282 129T310 154V222Q248 213 225 195T202 156Q202 120 248 120ZM167 562Q132 562 110 585T87 642Q87 676 109 699T167 722Q202 722 224 699T247 642Q247 608 225 585T167 562ZM395 562Q360 562 338 585T315 642Q315 676 337 +699T395 722Q430 722 452 699T475 642Q475 608 453 585T395 562Z" /> +<glyph unicode="å" glyph-name="aring" horiz-adv-x="536" d="M188 -12Q153 -12 125 0T78 34T48 83T38 142Q38 220 102 264T310 324Q304 376 240 376Q213 376 183 366T114 334L54 446Q107 478 161 495T274 512Q371 512 426 457T482 278V0H342L330 48H326Q296 +21 263 5T188 -12ZM248 120Q269 120 282 129T310 154V222Q248 213 225 195T202 156Q202 120 248 120ZM281 568Q210 568 176 599T141 674Q141 718 175 749T281 780Q352 780 386 749T421 674Q421 630 387 599T281 568ZM281 630Q297 630 308 642T319 674Q319 694 308 +706T281 718Q265 718 254 706T243 674Q243 654 254 642T281 630Z" /> +<glyph unicode="æ" glyph-name="ae" horiz-adv-x="786" d="M192 -12Q157 -12 129 0T82 34T52 83T42 142Q42 220 105 265T312 325Q309 351 294 363T244 376Q217 376 187 366T118 334L58 446Q111 478 162 495T268 512Q312 512 347 495T406 448Q439 480 472 +496T548 512Q599 512 637 493T700 440T737 361T750 266Q750 243 748 225T743 198H468Q479 156 507 139T574 122Q600 122 623 131T674 156L732 46Q691 17 642 3T550 -12Q497 -12 455 7T380 60Q353 39 330 26T284 4T240 -8T192 -12ZM252 120Q274 120 291 128T324 +150Q315 177 312 203L310 222Q253 213 230 196T206 156Q206 120 252 120ZM468 302H604Q604 335 591 358T542 382Q513 382 494 364T468 302Z" /> +<glyph unicode="ç" glyph-name="ccedilla" horiz-adv-x="472" d="M284 -12Q231 -12 185 5T105 56T52 139T32 250Q32 312 54 361T113 443T198 494T300 512Q345 512 381 498T446 460L366 350Q349 364 337 369T310 374Q262 374 235 341T208 250Q208 193 235 +160T304 126Q325 126 345 135T384 158L450 46Q412 13 368 1T284 -12ZM179 -244L167 -178Q224 -175 245 -166T267 -136Q267 -123 252 -113T191 -96L241 4H339L311 -60Q350 -69 369 -86T389 -136Q389 -190 334 -215T179 -244Z" /> +<glyph unicode="è" glyph-name="egrave" horiz-adv-x="526" d="M290 -12Q235 -12 188 5T107 56T52 139T32 250Q32 311 52 359T106 442T183 494T272 512Q327 512 368 493T436 441T476 364T490 270Q490 247 488 227T483 198H198Q210 153 241 136T314 118Q340 +118 364 125T416 148L472 46Q431 17 382 3T290 -12ZM196 310H344Q344 339 330 360T276 382Q247 382 226 365T196 310ZM252 572L62 730L178 844L336 656L252 572Z" /> +<glyph unicode="é" glyph-name="eacute" horiz-adv-x="526" d="M290 -12Q235 -12 188 5T107 56T52 139T32 250Q32 311 52 359T106 442T183 494T272 512Q327 512 368 493T436 441T476 364T490 270Q490 247 488 227T483 198H198Q210 153 241 136T314 118Q340 +118 364 125T416 148L472 46Q431 17 382 3T290 -12ZM196 310H344Q344 339 330 360T276 382Q247 382 226 365T196 310ZM292 572L208 656L366 844L482 730L292 572Z" /> +<glyph unicode="ê" glyph-name="ecircumflex" horiz-adv-x="526" d="M290 -12Q235 -12 188 5T107 56T52 139T32 250Q32 311 52 359T106 442T183 494T272 512Q327 512 368 493T436 441T476 364T490 270Q490 247 488 227T483 198H198Q210 153 241 136T314 118Q340 +118 364 125T416 148L472 46Q431 17 382 3T290 -12ZM196 310H344Q344 339 330 360T276 382Q247 382 226 365T196 310ZM78 618L184 746H360L466 618L402 558L274 642H270L142 558L78 618Z" /> +<glyph unicode="ë" glyph-name="edieresis" horiz-adv-x="526" d="M290 -12Q235 -12 188 5T107 56T52 139T32 250Q32 311 52 359T106 442T183 494T272 512Q327 512 368 493T436 441T476 364T490 270Q490 247 488 227T483 198H198Q210 153 241 136T314 118Q340 +118 364 125T416 148L472 46Q431 17 382 3T290 -12ZM196 310H344Q344 339 330 360T276 382Q247 382 226 365T196 310ZM158 562Q123 562 101 585T78 642Q78 676 100 699T158 722Q193 722 215 699T238 642Q238 608 216 585T158 562ZM386 562Q351 562 329 585T306 +642Q306 676 328 699T386 722Q421 722 443 699T466 642Q466 608 444 585T386 562Z" /> +<glyph unicode="ì" glyph-name="igrave" horiz-adv-x="288" d="M58 0V500H230V0H58ZM124 572L-66 730L50 844L208 656L124 572Z" /> +<glyph unicode="í" glyph-name="iacute" horiz-adv-x="288" d="M58 0V500H230V0H58ZM164 572L80 656L238 844L354 730L164 572Z" /> +<glyph unicode="î" glyph-name="icircumflex" horiz-adv-x="288" d="M58 0V500H230V0H58ZM-50 618L56 746H232L338 618L274 558L146 642H142L14 558L-50 618Z" /> +<glyph unicode="ï" glyph-name="idieresis" horiz-adv-x="288" d="M58 0V500H230V0H58ZM30 562Q-5 562 -27 585T-50 642Q-50 676 -28 699T30 722Q65 722 87 699T110 642Q110 608 88 585T30 562ZM258 562Q223 562 201 585T178 642Q178 676 200 699T258 722Q293 +722 315 699T338 642Q338 608 316 585T258 562Z" /> +<glyph unicode="ð" glyph-name="eth" horiz-adv-x="566" d="M274 -12Q226 -12 183 5T108 53T57 129T38 230Q38 285 55 327T101 399T166 443T240 458Q264 458 288 451T332 427Q307 488 258 536L116 465L72 539L183 595Q165 606 145 617T103 640L177 744Q212 +726 247 706T315 661L458 733L502 658L386 600Q446 540 483 460T520 270Q520 209 503 158T455 69T378 10T274 -12ZM280 126Q296 126 311 133T336 156T353 197T360 260Q360 271 360 280T359 299Q341 317 321 324T277 332Q242 332 218 309T194 230Q194 177 219 152T280 +126Z" /> +<glyph unicode="ñ" glyph-name="ntilde" horiz-adv-x="582" d="M58 0V500H198L210 440H214Q244 469 282 490T372 512Q454 512 491 457T528 308V0H356V286Q356 334 344 350T306 366Q282 366 266 356T230 328V0H58ZM378 572Q355 572 337 580T303 599T276 619T254 +628Q242 628 235 619T224 582L118 588Q120 673 155 709T250 746Q272 746 291 737T325 718T352 699T374 690Q386 690 393 699T404 736L510 730Q508 645 473 609T378 572Z" /> +<glyph unicode="ò" glyph-name="ograve" horiz-adv-x="560" d="M280 -12Q232 -12 187 5T108 56T53 139T32 250Q32 312 52 361T107 443T187 494T280 512Q328 512 372 495T451 444T507 361T528 250Q528 188 507 139T452 57T373 6T280 -12ZM280 126Q319 126 +335 159T352 250Q352 307 336 340T280 374Q241 374 225 341T208 250Q208 193 224 160T280 126ZM260 572L70 730L186 844L344 656L260 572Z" /> +<glyph unicode="ó" glyph-name="oacute" horiz-adv-x="560" d="M280 -12Q232 -12 187 5T108 56T53 139T32 250Q32 312 52 361T107 443T187 494T280 512Q328 512 372 495T451 444T507 361T528 250Q528 188 507 139T452 57T373 6T280 -12ZM280 126Q319 126 +335 159T352 250Q352 307 336 340T280 374Q241 374 225 341T208 250Q208 193 224 160T280 126ZM300 572L216 656L374 844L490 730L300 572Z" /> +<glyph unicode="ô" glyph-name="ocircumflex" horiz-adv-x="560" d="M280 -12Q232 -12 187 5T108 56T53 139T32 250Q32 312 52 361T107 443T187 494T280 512Q328 512 372 495T451 444T507 361T528 250Q528 188 507 139T452 57T373 6T280 -12ZM280 126Q319 +126 335 159T352 250Q352 307 336 340T280 374Q241 374 225 341T208 250Q208 193 224 160T280 126ZM86 618L192 746H368L474 618L410 558L282 642H278L150 558L86 618Z" /> +<glyph unicode="õ" glyph-name="otilde" horiz-adv-x="560" d="M280 -12Q232 -12 187 5T108 56T53 139T32 250Q32 312 52 361T107 443T187 494T280 512Q328 512 372 495T451 444T507 361T528 250Q528 188 507 139T452 57T373 6T280 -12ZM280 126Q319 126 +335 159T352 250Q352 307 336 340T280 374Q241 374 225 341T208 250Q208 193 224 160T280 126ZM344 572Q321 572 303 580T269 599T242 619T220 628Q208 628 201 619T190 582L84 588Q86 673 121 709T216 746Q238 746 257 737T291 718T318 699T340 690Q352 690 359 +699T370 736L476 730Q474 645 439 609T344 572Z" /> +<glyph unicode="ö" glyph-name="odieresis" horiz-adv-x="560" d="M280 -12Q232 -12 187 5T108 56T53 139T32 250Q32 312 52 361T107 443T187 494T280 512Q328 512 372 495T451 444T507 361T528 250Q528 188 507 139T452 57T373 6T280 -12ZM280 126Q319 126 +335 159T352 250Q352 307 336 340T280 374Q241 374 225 341T208 250Q208 193 224 160T280 126ZM166 562Q131 562 109 585T86 642Q86 676 108 699T166 722Q201 722 223 699T246 642Q246 608 224 585T166 562ZM394 562Q359 562 337 585T314 642Q314 676 336 699T394 +722Q429 722 451 699T474 642Q474 608 452 585T394 562Z" /> +<glyph unicode="÷" glyph-name="divide" horiz-adv-x="540" d="M34 270V390H506V270H34ZM270 64Q231 64 205 88T178 150Q178 188 204 212T270 236Q309 236 335 212T362 150Q362 112 336 88T270 64ZM270 424Q231 424 205 448T178 510Q178 548 204 572T270 +596Q309 596 335 572T362 510Q362 472 336 448T270 424Z" /> +<glyph unicode="ø" glyph-name="oslash" horiz-adv-x="560" d="M280 -12Q209 -12 149 25L108 -26L46 22L90 77Q63 109 48 152T32 250Q32 312 52 361T107 443T187 494T280 512Q351 512 410 476L452 528L514 480L469 424Q496 392 512 348T528 250Q528 188 507 +139T452 57T373 6T280 -12ZM198 260Q198 247 198 236T200 215L323 367Q306 380 280 380Q241 380 220 347T198 260ZM280 120Q319 120 340 153T362 240Q362 266 359 287L236 134Q253 120 280 120Z" /> +<glyph unicode="ù" glyph-name="ugrave" horiz-adv-x="578" d="M210 -12Q169 -12 140 2T91 43T63 107T54 192V500H226V214Q226 166 238 150T276 134Q300 134 315 144T348 178V500H520V0H380L368 66H364Q334 30 298 9T210 -12ZM270 572L80 730L196 844L354 +656L270 572Z" /> +<glyph unicode="ú" glyph-name="uacute" horiz-adv-x="578" d="M210 -12Q169 -12 140 2T91 43T63 107T54 192V500H226V214Q226 166 238 150T276 134Q300 134 315 144T348 178V500H520V0H380L368 66H364Q334 30 298 9T210 -12ZM310 572L226 656L384 844L500 +730L310 572Z" /> +<glyph unicode="û" glyph-name="ucircumflex" horiz-adv-x="578" d="M210 -12Q169 -12 140 2T91 43T63 107T54 192V500H226V214Q226 166 238 150T276 134Q300 134 315 144T348 178V500H520V0H380L368 66H364Q334 30 298 9T210 -12ZM96 618L202 746H378L484 +618L420 558L292 642H288L160 558L96 618Z" /> +<glyph unicode="ü" glyph-name="udieresis" horiz-adv-x="578" d="M210 -12Q169 -12 140 2T91 43T63 107T54 192V500H226V214Q226 166 238 150T276 134Q300 134 315 144T348 178V500H520V0H380L368 66H364Q334 30 298 9T210 -12ZM176 562Q141 562 119 585T96 +642Q96 676 118 699T176 722Q211 722 233 699T256 642Q256 608 234 585T176 562ZM404 562Q369 562 347 585T324 642Q324 676 346 699T404 722Q439 722 461 699T484 642Q484 608 462 585T404 562Z" /> +<glyph unicode="ý" glyph-name="yacute" horiz-adv-x="542" d="M132 -188Q106 -188 90 -186T56 -178L86 -48Q93 -50 101 -52T118 -54Q153 -54 170 -41T196 -4L202 18L12 500H184L244 308Q255 273 263 239T280 166H284Q292 202 299 237T316 308L366 500H530L362 +8Q342 -43 322 -80T274 -141T213 -176T132 -188ZM296 572L212 656L370 844L486 730L296 572Z" /> +<glyph unicode="þ" glyph-name="thorn" horiz-adv-x="580" d="M58 -176V696H230V533L226 468Q249 489 278 500T340 512Q386 512 424 494T488 443T529 363T544 258Q544 193 527 143T480 59T414 6T336 -12Q300 -12 275 -1T226 32L230 -38V-176H58ZM294 128Q324 +128 346 156T368 256Q368 318 351 345T298 372Q278 372 263 364T230 336V152Q245 138 261 133T294 128Z" /> +<glyph unicode="ÿ" glyph-name="ydieresis" horiz-adv-x="542" d="M132 -188Q106 -188 90 -186T56 -178L86 -48Q93 -50 101 -52T118 -54Q153 -54 170 -41T196 -4L202 18L12 500H184L244 308Q255 273 263 239T280 166H284Q292 202 299 237T316 308L366 500H530L362 +8Q342 -43 322 -80T274 -141T213 -176T132 -188ZM162 562Q127 562 105 585T82 642Q82 676 104 699T162 722Q197 722 219 699T242 642Q242 608 220 585T162 562ZM390 562Q355 562 333 585T310 642Q310 676 332 699T390 722Q425 722 447 699T470 642Q470 608 448 +585T390 562Z" /> +<glyph unicode="–" glyph-name="endash" horiz-adv-x="480" d="M44 200V308H436V200H44Z" /> +<glyph unicode="—" glyph-name="emdash" horiz-adv-x="800" d="M44 200V308H756V200H44Z" /> +<glyph unicode="‘" glyph-name="quoteleft" horiz-adv-x="320" d="M160 304Q107 304 81 342T54 450Q54 525 92 582T210 678L246 604Q198 583 174 553T150 477Q153 478 160 478Q196 478 221 456T246 396Q246 354 222 329T160 304Z" /> +<glyph unicode="’" glyph-name="quoteright" horiz-adv-x="320" d="M110 322L74 396Q122 417 146 447T170 523Q167 522 160 522Q124 522 99 544T74 604Q74 646 98 671T160 696Q213 696 239 658T266 550Q266 475 228 418T110 322Z" /> +<glyph unicode="‚" glyph-name="quotesinglbase" horiz-adv-x="320" d="M110 -177L74 -103Q122 -82 146 -52T170 24Q167 23 160 23Q124 23 99 45T74 105Q74 147 98 172T160 197Q213 197 239 159T266 51Q266 -24 228 -81T110 -177Z" /> +<glyph unicode="“" glyph-name="quotedblleft" horiz-adv-x="580" d="M160 304Q107 304 81 342T54 450Q54 525 92 582T210 678L246 604Q198 583 174 553T150 477Q153 478 160 478Q196 478 221 456T246 396Q246 354 222 329T160 304ZM420 304Q367 304 341 +342T314 450Q314 525 352 582T470 678L506 604Q458 583 434 553T410 477Q413 478 420 478Q456 478 481 456T506 396Q506 354 482 329T420 304Z" /> +<glyph unicode="”" glyph-name="quotedblright" horiz-adv-x="580" d="M110 322L74 396Q122 417 146 447T170 523Q167 522 160 522Q124 522 99 544T74 604Q74 646 98 671T160 696Q213 696 239 658T266 550Q266 475 228 418T110 322ZM370 322L334 396Q382 +417 406 447T430 523Q427 522 420 522Q384 522 359 544T334 604Q334 646 358 671T420 696Q473 696 499 658T526 550Q526 475 488 418T370 322Z" /> +<glyph unicode="„" glyph-name="quotedblbase" horiz-adv-x="580" d="M110 -177L74 -103Q122 -82 146 -52T170 24Q167 23 160 23Q124 23 99 45T74 105Q74 147 98 172T160 197Q213 197 239 159T266 51Q266 -24 228 -81T110 -177ZM370 -177L334 -103Q382 +-82 406 -52T430 24Q427 23 420 23Q384 23 359 45T334 105Q334 147 358 172T420 197Q473 197 499 159T526 51Q526 -24 488 -81T370 -177Z" /> +<glyph unicode="•" glyph-name="bullet" horiz-adv-x="360" d="M180 116Q150 116 125 127T80 158T51 204T40 262Q40 293 50 319T80 365T124 396T180 408Q210 408 235 397T280 366T309 320T320 262Q320 231 310 205T280 159T236 128T180 116Z" /> +<glyph unicode="‹" glyph-name="guilsinglleft" horiz-adv-x="300" d="M184 52L50 192V312L184 452L246 402L138 252L246 102L184 52Z" /> +<glyph unicode="›" glyph-name="guilsinglright" horiz-adv-x="300" d="M116 52L54 102L162 252L54 402L116 452L250 312V192L116 52Z" /> +</font> +</defs> +</svg> diff --git a/static/fonts/sourcesanspro/Source_Sans_Pro_900.ttf b/static/fonts/sourcesanspro/Source_Sans_Pro_900.ttf new file mode 100644 index 000000000..75257d047 Binary files /dev/null and b/static/fonts/sourcesanspro/Source_Sans_Pro_900.ttf differ diff --git a/static/fonts/sourcesanspro/Source_Sans_Pro_900.woff b/static/fonts/sourcesanspro/Source_Sans_Pro_900.woff new file mode 100644 index 000000000..de95d21bd Binary files /dev/null and b/static/fonts/sourcesanspro/Source_Sans_Pro_900.woff differ diff --git a/static/fonts/sourcesanspro/Source_Sans_Pro_900.woff2 b/static/fonts/sourcesanspro/Source_Sans_Pro_900.woff2 new file mode 100644 index 000000000..36278e155 Binary files /dev/null and b/static/fonts/sourcesanspro/Source_Sans_Pro_900.woff2 differ diff --git a/embedded/robots.txt b/static/robots.txt similarity index 100% rename from embedded/robots.txt rename to static/robots.txt diff --git a/templates/adminTest.hamlet b/templates/adminTest.hamlet index 651d6b6e0..8290759e6 100644 --- a/templates/adminTest.hamlet +++ b/templates/adminTest.hamlet @@ -32,5 +32,9 @@ ^{btnWdgt} <li><br> Modals: - ^{modal "Klick mich für Ajax-Test" (Left UsersR)} + ^{modal "Klick mich für Ajax-Test" (Left $ SomeRoute UsersR)} ^{modal "Klick mich für Content-Test" (Right "Test Inhalt für Modal")} + <li> + ^{modal "Email-Test" (Right emailWidget')} + <li> + ^{visibleWidget False} diff --git a/templates/authpreds.hamlet b/templates/authpreds.hamlet new file mode 100644 index 000000000..d7430fbae --- /dev/null +++ b/templates/authpreds.hamlet @@ -0,0 +1,4 @@ +<form method=post action=@{AuthPredsR} enctype=#{authActiveEnctype}> + $maybe referer <- mReferer + <input type=hidden name=#{toPathPiece GetReferer} value=#{toPathPiece referer}> + ^{authActiveWidget} diff --git a/templates/correction-user.cassius b/templates/correction-user.cassius new file mode 100644 index 000000000..2b7b13b7a --- /dev/null +++ b/templates/correction-user.cassius @@ -0,0 +1,3 @@ +.comment + white-space: pre-wrap + font-family: monospace \ No newline at end of file diff --git a/templates/correction-user.hamlet b/templates/correction-user.hamlet index d0b8976e2..0a639bf81 100644 --- a/templates/correction-user.hamlet +++ b/templates/correction-user.hamlet @@ -3,7 +3,7 @@ <tr .table__row> <th .table__th>_{MsgSubmission} <td .table__td>#{display cid} - $maybe Entity _ User{..} <- corrector + $maybe Entity _ User{userDisplayName} <- corrector <tr .table__row> <th .table__th>_{MsgRatingBy} <td .table__td>#{display userDisplayName} @@ -11,29 +11,35 @@ <tr .table__row> <th .table__th>_{MsgRatingTime} <td .table__td>^{formatTimeW SelFormatDateTime time} + $maybe points <- submissionRatingPoints - $case sheetType - $of Bonus{..} - <tr .table__row> - <th .table__th>_{MsgAchievedBonusPoints} - <td .table__td>_{MsgAchievedOf points maxPoints} - $of Normal{..} - <tr .table__row> - <th .table__th>_{MsgAchievedNormalPoints} - <td .table__td>_{MsgAchievedOf points maxPoints} - $of Pass{..} - <tr .table__row> - <th .table__th>_{MsgPassedResult} - <td .table__td> - $if points >= passingPoints - _{MsgPassed} - $else - _{MsgNotPassed} - <tr .table__row> - <th .table__th>_{MsgAchievedPassPoints} - <td .table__td>_{MsgPassAchievedOf points passingPoints maxPoints} - $of NotGraded + $maybe grading <- preview _grading sheetType + $case grading + $of Points{..} + <tr .table__row> + <th .table__th>#{sheetTypeDesc} + <td .table__td>_{MsgAchievedOf points maxPoints} + $of PassPoints{..} + <tr .table__row> + <th .table__th>#{sheetTypeDesc} + <td .table__td> + $if fromMaybe False (gradingPassed grading points) + _{MsgPassed} + $else + _{MsgNotPassed} + <tr .table__row> + <th .table__th>_{MsgAchievedPassPoints} + <td .table__td>_{MsgPassAchievedOf points passingPoints maxPoints} + $of PassBinary + <tr .table__row> + <th .table__th>#{sheetTypeDesc} + <td .table__td> + $if fromMaybe False (gradingPassed grading points) + _{MsgPassed} + $else + _{MsgNotPassed} + $maybe comment <- ratingComment <tr .table__row> <th .table__th>_{MsgRatingComment} - <td .table__td style="white-space: pre;">#{comment} + <td .table__td .comment>#{comment} diff --git a/templates/correction.hamlet b/templates/correction.hamlet index e26dbe7c4..871ec9aec 100644 --- a/templates/correction.hamlet +++ b/templates/correction.hamlet @@ -1,11 +1,15 @@ -^{userCorrection} +<section> + ^{userCorrection} -<hr> - -<form method=post enctype=#{corrEncoding}> - ^{corrForm} +$maybe marktxt <- sheetMarkingText + <section> + <h2>_{MsgSheetMarking} + <p> + #{marktxt} +<section> + <form method=post enctype=#{corrEncoding} action=@{CSubmissionR tid ssh csh shn cid CorrectionR}> + ^{corrForm} -<hr> - -<form method=post enctype=#{uploadEncoding}> - ^{uploadForm} +<section> + <form method=post enctype=#{uploadEncoding} action=@{CSubmissionR tid ssh csh shn cid CorrectionR}> + ^{uploadForm} diff --git a/templates/corrections-create.hamlet b/templates/corrections-create.hamlet new file mode 100644 index 000000000..4b1de86e1 --- /dev/null +++ b/templates/corrections-create.hamlet @@ -0,0 +1,2 @@ +<form method=post action=@{CorrectionsCreateR} enctype=#{pseudonymEncoding}> + ^{pseudonymWidget} diff --git a/templates/corrections-grade.hamlet b/templates/corrections-grade.hamlet new file mode 100644 index 000000000..2d2943787 --- /dev/null +++ b/templates/corrections-grade.hamlet @@ -0,0 +1,2 @@ +<div .container> + ^{table} diff --git a/templates/corrections-upload.hamlet b/templates/corrections-upload.hamlet index 7def9e44d..033eafe7c 100644 --- a/templates/corrections-upload.hamlet +++ b/templates/corrections-upload.hamlet @@ -1,2 +1,2 @@ -<form method=POST enctype=#{uploadEncoding}> +<form method=POST enctype=#{uploadEncoding} action=@{CorrectionsUploadR}> ^{upload} diff --git a/templates/corrections.hamlet b/templates/corrections.hamlet index 766cda831..e8e84e217 100644 --- a/templates/corrections.hamlet +++ b/templates/corrections.hamlet @@ -1,5 +1,5 @@ -<div .container> - <form method=POST enctype=#{tableEncoding}> - ^{table} - <button type=submit> - _{MsgBtnSubmit} +<section> + ^{table} +$if statistics /= mempty + <section> + ^{gradeSummaryWidget MsgSubmissionGradingSummaryTitle statistics} diff --git a/templates/course.hamlet b/templates/course.hamlet index 76bd9ba2a..130fe7f0a 100644 --- a/templates/course.hamlet +++ b/templates/course.hamlet @@ -1,10 +1,9 @@ <div .container> <dl .deflist> - $maybe school <- schoolMB - <dt .deflist__dt>Fakultät/Institut - <dd .deflist__dd> - <div> - #{schoolName school} + <dt .deflist__dt>Fakultät/Institut + <dd .deflist__dd> + <div> + #{schoolName} $maybe descr <- courseDescription course <dt .deflist__dt>_{MsgCourseDescription} @@ -33,20 +32,27 @@ $# $if NTop (Just 0) < NTop (courseCapacity course) #{participants} $maybe capacity <- courseCapacity course \ von #{capacity} - $maybe regFrom <- mRegFrom - <dt .deflist__dt>Anmeldezeitraum - <dd .deflist__dd> + $maybe regFrom <- mRegFrom + <dt .deflist__dt>Anmeldezeitraum + <dd .deflist__dd> + <div> + Ab #{regFrom} + $maybe regTo <- mRegTo + \ bis #{regTo} + $maybe dereg <- mDereg <div> - Ab #{regFrom} - $maybe regTo <- mRegTo - \ bis #{regTo} - $if registrationOpen + \ <em>Achtung:</em> + \ Abmeldung nur bis #{dereg} erlaubt. + $if registrationOpen || isJust mRegAt <dt .deflist__dt> <dd .deflist__dd> <div .course__registration> - <form method=post action=@{CourseR tid ssh csh CRegisterR} enctype=#{regEnctype}> - $# regWidget is defined through templates/widgets/registerForm - ^{regWidget} + $if registrationOpen + <form method=post action=@{CourseR tid ssh csh CRegisterR} enctype=#{regEnctype}> + $# regWidget is defined through templates/widgets/registerForm + ^{regWidget} + $maybe date <- mRegAt + _{MsgRegisteredSince date} <dt .deflist__dt> Material <dd .deflist__dd> diff --git a/templates/courses.hamlet b/templates/courses.hamlet index cc9106b21..6cc6a0c13 100644 --- a/templates/courses.hamlet +++ b/templates/courses.hamlet @@ -1,3 +1,2 @@ <div .container> - <div .scrolltable> - ^{coursesTable} + ^{coursesTable} diff --git a/templates/default-layout-wrapper.hamlet b/templates/default-layout-wrapper.hamlet index 014edc30f..c293b607a 100644 --- a/templates/default-layout-wrapper.hamlet +++ b/templates/default-layout-wrapper.hamlet @@ -12,7 +12,7 @@ $newline never ^{pageHead pc} - <body .no-js .theme--#{toPathPiece currentTheme} :isAuth:.logged-in> + <body .no-js .theme--#{toPathPiece currentTheme} :isAuth:.logged-in :isModal:.modal> <!-- removes no-js class from body if client supports javascript --> <script> document.body.classList.remove('no-js'); diff --git a/templates/default-layout.hamlet b/templates/default-layout.hamlet index 788577105..bf936affd 100644 --- a/templates/default-layout.hamlet +++ b/templates/default-layout.hamlet @@ -1,38 +1,42 @@ -<!-- navigation --> -^{navbar} +$if not isModal + <!-- secondary navigation at the side --> + ^{asidenav} + <!-- navigation --> + ^{navbar} <div .main> - <!-- secondary navigation at the side --> - ^{asidenav} - <div .main__content> - <!-- breadcrumbs --> - $if not $ Just HomeR == mcurrentRoute - ^{breadcrumbs} + $if not isModal + <!-- breadcrumbs --> + $if not $ Just HomeR == mcurrentRoute + ^{breadcrumbsWgt} <div .main__content-body> - <h1> - <!-- $maybe back <- lastMaybe parents - <a .breadcrumbs__link href="@{fst back}">#{snd back} --> + <section> $maybe headline <- contentHeadline - ^{headline} - $nothing - HEADLINE MISSING! + <h1 .headline-one> + <!-- $maybe back <- lastMaybe parents + <a .breadcrumbs__link href="@{fst back}">#{snd back} --> + ^{headline} - <!-- prime page actions --> - ^{pageactionprime} - - <!-- alerts --> - <div .alerts> - $forall (status, msg) <- mmsgs - $with status2 <- bool status "info" (status == "") - <div class="alert alert-#{status2}"> - <div .alert__content> - #{msg} + $if not isModal && hasPageActions + <!-- page actions --> + ^{pageaction} <!-- actual content --> - ^{widget} + + <!-- alerts --> + <div #alerts .alerts> + $forall (status, msg) <- mmsgs + $with status2 <- bool status "info" (status == "") + <div class="alert alert-#{status2}"> + <div .alert__content> + #{msg} + + <!-- footer --> + $if not isModal + ^{footer} diff --git a/templates/default-layout.lucius b/templates/default-layout.lucius index 97968130e..2280e1849 100644 --- a/templates/default-layout.lucius +++ b/templates/default-layout.lucius @@ -5,8 +5,10 @@ --color-success: #23d160; --color-info: #c4c4c4; --color-lightblack: #1A2A36; - --color-lightwhite: #FCFFFA; + --color-lightwhite: #fcfffa; --color-grey: #B1B5C0; + --color-grey-light: #efefef; + --color-grey-medium: #9A989E; --color-font: #34303a; --color-fontsec: #5b5861; @@ -18,6 +20,10 @@ /* DIMENSIONS */ --header-height: 100px; --header-height-collapsed: 60px; + + --asidenav-width-xl: 250px; + --asidenav-width-lg: 20%; + --asidenav-width-md: 50px; } * { @@ -40,7 +46,8 @@ body { body { /* DEFAULT LMU THEME */ - --color-primary: #0a9342; + --color-lmu-green: #0a9342; + --color-primary: var(--color-lmu-green); --color-light: #31cc72; --color-lighter: #35db7a; --color-dark: #087536; @@ -155,15 +162,12 @@ h4 { .main { position: relative; min-height: calc(100vh - var(--header-height)); - padding: 20px; - overflow: hidden; } @media (max-width: 768px) { .main { min-height: calc(100vh - var(--header-height-collapsed)); - padding: 10px; } } @@ -171,8 +175,8 @@ h4 { position: relative; background-color: white; transition: padding-left .2s ease-out; - max-width: 1200px; - margin: 0 auto; + margin-top: var(--header-height-collapsed); + margin-left: 0; > .container { margin: 20px 0; @@ -185,50 +189,51 @@ h4 { p { margin: 10px 0; } -} -.logged-in { - .main__content { - margin: 0; - max-width: none; + p:last-child { + margin: 10px 0 0; } } -@media (max-width: 768px) { - .logged-in { +@media (min-width: 426px) { + :not(.modal) { .main__content { - padding-left: 60px; - } - } -} - -@media (max-width: 425px) { - .logged-in { - .main__content { - padding-left: 0; + margin-left: var(--asidenav-width-md, 50px); } } } @media (min-width: 769px) { - .logged-in { + :not(.modal) { .main__content { - padding-left: calc(24% + 30px); + margin-left: var(--asidenav-width-lg, 20%); + margin-top: var(--header-height); } } } @media (min-width: 1200px) { - .logged-in { + :not(.modal) { .main__content { - padding-left: 320px; + margin-left: var(--asidenav-width-xl, 250px); } } } -/* sepcial case for breadcrumbs */ -.breadcrumbs__container + .main__content-body { - padding-top: 0; +.main__content-body { + padding: 13px; +} + +@media (min-width: 426px) { + .main__content-body { + padding: 13px 20px; + } +} + +@media (min-width: 769px) { + .main__content-body { + padding: 20px 40px; + } } .pseudo-focus { @@ -309,6 +314,10 @@ input[type="button"].btn-info:hover, width: 100%; } +.table:only-child { + margin: 0; +} + .table--striped { .table__row:not(.no-stripe):nth-child(even) { @@ -326,6 +335,8 @@ input[type="button"].btn-info:hover, /* SCROLLTABLE */ .scrolltable { overflow: auto; + box-shadow: 0 0 3px 0 var(--color-grey); + margin-bottom: 15px; } @media (max-width: 425px) { @@ -430,6 +441,19 @@ input[type="button"].btn-info:hover, } .list--inline { + ul { + display: inline-block; + margin-left: 0; + + li { + display: inline-block; + } + } +} + +ul.list--inline { + + display: inline-block; margin-left: 0; li { @@ -502,3 +526,26 @@ input[type="button"].btn-info:hover, padding-right: 15px; } } + +section { + padding-bottom: 20px; + margin-bottom: 20px; + border-bottom: 1px solid #d3d3d3; + + + section { + margin-top: 20px; + padding-top: 20px; + } + + section { + border-bottom: none; + } +} + +.pseudonym { + font-family: monospace; +} + +.headline-one { + margin-bottom: 15px; +} diff --git a/templates/deletedUser.hamlet b/templates/deletedUser.hamlet new file mode 100644 index 000000000..69b723987 --- /dev/null +++ b/templates/deletedUser.hamlet @@ -0,0 +1,16 @@ +<div .container> + <h1> + _{MsgUserAccountDeleted userDisplayName} + <div .container> + #{display deletedSubmissions} Abgaben wurden unwiederruflich gelöscht. + $if groupSubmissions > 0 + <div .container> + #{display groupSubmissions} Gruppenabgaben verbleiben in der Datenbank, + aber die Zuordnung zum Benutzer wurden gelöscht. + Gruppenabgaben können dadurch zu Einzelabgaben werden, + welche dann vom letzten Benutzer gelöscht werden können. + $if deletedSubmissionGroups > 0 + <div .container> + #{display deletedSubmissionGroups} benannte Abgabengruppen wurden gelöscht, da diese dadurch leer wurden. + <div .container> + Good Bye! diff --git a/templates/formPage.hamlet b/templates/formPage.hamlet index f75289e29..c0b36d13f 100644 --- a/templates/formPage.hamlet +++ b/templates/formPage.hamlet @@ -1,2 +1,2 @@ -<form .form-horizontal method=post action=@{actionUrl}#forms enctype=#{formEnctype}> +<form method=post action=@{actionUrl}#forms enctype=#{formEnctype}> ^{formWidget} diff --git a/templates/formPageI18n.hamlet b/templates/formPageI18n.hamlet index 34c3bd3f9..bf8b877ca 100644 --- a/templates/formPageI18n.hamlet +++ b/templates/formPageI18n.hamlet @@ -1,5 +1,5 @@ $maybe text <- formText <h3> _{text} -<form .form-horizontal method=post action=@{actionUrl}#forms enctype=#{formEnctype}> +<form method=post action=@{actionUrl}#forms enctype=#{formEnctype}> ^{formWidget} diff --git a/templates/help.hamlet b/templates/help.hamlet new file mode 100644 index 000000000..3fe70ebe6 --- /dev/null +++ b/templates/help.hamlet @@ -0,0 +1,4 @@ +_{MsgHelpIntroduction} + +<form method=post action=@{HelpR} enctype=#{formEnctype} :isModal:data-ajax-submit> + ^{formWidget} diff --git a/templates/home.hamlet b/templates/home.hamlet index 8f5c3bafb..3995b864f 100644 --- a/templates/home.hamlet +++ b/templates/home.hamlet @@ -1,11 +1,5 @@ <div .container> - - <h1> + <h2> Kurse mit offener Registrierung <div .container> ^{courseTable} - - <h3> - Re-Implementierung von <a href="https://uniworx.ifi.lmu.de/">UniWorX</a> - - ^{features} diff --git a/templates/homeUser.hamlet b/templates/homeUser.hamlet index c82ea98ef..479d27ab9 100644 --- a/templates/homeUser.hamlet +++ b/templates/homeUser.hamlet @@ -1,13 +1,10 @@ <div .container> - <h3> - Re-Implementierung von <a href="https://uniworx.ifi.lmu.de/">UniWorX</a> - -<div .container> - <h1> + <h2> Anstehende Übungsblätter <div .container> ^{sheetTable} +<!-- <div .container> <h1> Anstehende Klausuren @@ -17,3 +14,4 @@ <h1> Anstehende Kursanmeldungen TODO +--> diff --git a/templates/login.hamlet b/templates/login.hamlet index f3cf5ece8..f39c36e64 100644 --- a/templates/login.hamlet +++ b/templates/login.hamlet @@ -1,4 +1,4 @@ -$forall AuthPlugin{..} <- plugins +$forall AuthPlugin{apName, apLogin} <- plugins $if apName == "LDAP" <section> <h2>_{MsgLDAPLoginTitle} diff --git a/templates/mail/correctionsAssigned.hamlet b/templates/mail/correctionsAssigned.hamlet new file mode 100644 index 000000000..1f1b9c9e5 --- /dev/null +++ b/templates/mail/correctionsAssigned.hamlet @@ -0,0 +1,18 @@ +$newline never +\<!doctype html> +<html> + <head> + <meta charset="UTF-8"> + <style> + h1 { + font-size: 1.25em; + font-variant: small-caps; + font-weight: normal; + } + <body> + <h1> + _{MsgMailCorrectionsAssignedIntro (CI.original courseName) termDesc sheetName nbrSubs} + <p> + <a href=@{CorrectionsR}> + _{MsgCorrectionsTitle} + ^{editNotifications} \ No newline at end of file diff --git a/templates/mail/correctionsUndistributed.hamlet b/templates/mail/correctionsUndistributed.hamlet new file mode 100644 index 000000000..e1ae6e950 --- /dev/null +++ b/templates/mail/correctionsUndistributed.hamlet @@ -0,0 +1,17 @@ +$newline never +\<!doctype html> +<html> + <head> + <meta charset="UTF-8"> + <style> + h1 { + font-size: 1.25em; + font-variant: small-caps; + font-weight: normal; + } + <body> + <h1> + _{MsgMailSubmissionsUnassignedIntro nbrSubs (CI.original courseName) termDesc sheetName} + <p> + <a href=@{CSheetR tid ssh csh shn SSubsR}> + #{sheetName} diff --git a/templates/mail/editNotifications.hamlet b/templates/mail/editNotifications.hamlet new file mode 100644 index 000000000..7ca5d9f8b --- /dev/null +++ b/templates/mail/editNotifications.hamlet @@ -0,0 +1,4 @@ +<p> + <a href=@{ProfileR}> + _{MsgProfileHeading} + \ _{MsgMailEditNotifications} \ No newline at end of file diff --git a/templates/mail/sheetActive.hamlet b/templates/mail/sheetActive.hamlet new file mode 100644 index 000000000..330914bc4 --- /dev/null +++ b/templates/mail/sheetActive.hamlet @@ -0,0 +1,18 @@ +$newline never +\<!doctype html> +<html> + <head> + <meta charset="UTF-8"> + <style> + h1 { + font-size: 1.25em; + font-variant: small-caps; + font-weight: normal; + } + <body> + <h1> + _{MsgMailSheetActiveIntro (CI.original courseName) termDesc sheetName} + <p> + <a href=@{CSheetR tid ssh csh shn SShowR}> + #{sheetName} + ^{editNotifications} \ No newline at end of file diff --git a/templates/mail/sheetInactive.hamlet b/templates/mail/sheetInactive.hamlet new file mode 100644 index 000000000..756736f42 --- /dev/null +++ b/templates/mail/sheetInactive.hamlet @@ -0,0 +1,18 @@ +$newline never +\<!doctype html> +<html> + <head> + <meta charset="UTF-8"> + <style> + h1 { + font-size: 1.25em; + font-variant: small-caps; + font-weight: normal; + } + <body> + <h1> + _{MsgMailSheetInactiveIntro (CI.original courseName) termDesc sheetName} + <p> + <a href=@{CSheetR tid ssh csh shn SShowR}> + #{sheetName} + ^{editNotifications} \ No newline at end of file diff --git a/templates/mail/sheetSoonInactive.hamlet b/templates/mail/sheetSoonInactive.hamlet new file mode 100644 index 000000000..fb27ad1ed --- /dev/null +++ b/templates/mail/sheetSoonInactive.hamlet @@ -0,0 +1,18 @@ +$newline never +\<!doctype html> +<html> + <head> + <meta charset="UTF-8"> + <style> + h1 { + font-size: 1.25em; + font-variant: small-caps; + font-weight: normal; + } + <body> + <h1> + _{MsgMailSheetSoonInactiveIntro (CI.original courseName) termDesc sheetName} + <p> + <a href=@{CSheetR tid ssh csh shn SShowR}> + #{sheetName} + ^{editNotifications} \ No newline at end of file diff --git a/templates/mail/submissionRated.hamlet b/templates/mail/submissionRated.hamlet new file mode 100644 index 000000000..63afe4ee5 --- /dev/null +++ b/templates/mail/submissionRated.hamlet @@ -0,0 +1,65 @@ +$newline never +\<!doctype html> +<html> + <head> + <meta charset="UTF-8"> + <style> + h1 { + font-size: 1.25em; + font-variant: small-caps; + font-weight: normal; + } + + .comment { + white-space: pre-wrap; + font-family: monospace; + } + <body> + <h1> + _{MsgMailSubmissionRatedIntro (CI.original courseName) termDesc} + <dl> + <dt> + _{MsgSubmission} + <dd> + <a href=@{CSubmissionR tid ssh csh shn csid SubShowR}> + #{display csid} + $maybe User{userDisplayName} <- corrector + <dt> + _{MsgRatingBy} + <dd> + #{display userDisplayName} + $maybe time <- submissionRatingTime' + <dt> + _{MsgRatingTime} + <dd> + #{time} + <dt> #{sheetTypeDesc} + $maybe points <- submissionRatingPoints + $maybe grading <- preview _grading sheetType + $case grading + $of Points{..} + <dd> + _{MsgAchievedOf points maxPoints} + $of PassPoints{..} + <dd> + $if fromMaybe False (gradingPassed grading points) + _{MsgPassed} + $else + _{MsgNotPassed} + <dt> + _{MsgAchievedPassPoints} + <dd> + _{MsgPassAchievedOf points passingPoints maxPoints} + $of PassBinary + <dd> + $if fromMaybe False (gradingPassed grading points) + _{MsgPassed} + $else + _{MsgNotPassed} + + $maybe comment <- submissionRatingComment + <dt> + _{MsgRatingComment} + <dd .comment> + #{comment} + ^{editNotifications} diff --git a/templates/mail/submissionRated.txt b/templates/mail/submissionRated.txt new file mode 100644 index 000000000..1fa13f16f --- /dev/null +++ b/templates/mail/submissionRated.txt @@ -0,0 +1 @@ +#{mr (MsgMailSubmissionRatedIntro (CI.original courseName) termDesc)} diff --git a/templates/mail/support.hamlet b/templates/mail/support.hamlet new file mode 100644 index 000000000..da915339e --- /dev/null +++ b/templates/mail/support.hamlet @@ -0,0 +1,40 @@ +$newline never +\<!doctype html> +<html> + <head> + <meta charset="UTF-8"> + <body> + <dl> + $case userInfo + $of Left (Just Address{..}) + $maybe name <- addressName + <dt>Name + <dd>#{name} + <dt>E-Mail + <dd>#{addressEmail} + $of Left Nothing + $of Right Nothing + <dt>Ungültige UserId erhalten! + $of Right (Just (Entity _ User{userDisplayName, userSurname, userIdent, userEmail, userMatrikelnummer, userMailLanguages})) + <dt>Name + <dd>^{const (const (nameHtml userDisplayName userSurname))} + <dt>Identifikation + <dd>#{userIdent} + <dt>E-Mail + <dd>#{userEmail} + $maybe matrnr <- userMatrikelnummer + <dt>Matrikelnummer + <dd>#{matrnr} + $if not (null (mailLanguages userMailLanguages)) + <dt>Präferierte E-Mail Sprachen + $forall lang <- mailLanguages userMailLanguages + <dd>#{lang} + <dt>Zeit + <dd>#{rtime} + $maybe referer <- jReferer + <dt>Referer + <dd> + <a href=#{referer} style="font-family: monospace"> + #{referer} + <p style="white-space: pre-wrap; font-family: monospace"> + #{jHelpRequest} diff --git a/templates/messages/ignoredInvalidPseudonym.hamlet b/templates/messages/ignoredInvalidPseudonym.hamlet new file mode 100644 index 000000000..2e584f0e3 --- /dev/null +++ b/templates/messages/ignoredInvalidPseudonym.hamlet @@ -0,0 +1,7 @@ +<p>_{MsgInvalidPseudonymSubmissionIgnored oPseudonyms iPseudonym} +$if not (null alts) + <div> + <p>_{MsgPseudonymAutocorrections} + <ul> + $forall v <- alts + <li>#{review _PseudonymText v} diff --git a/templates/messages/submissionCreateDuplicates.hamlet b/templates/messages/submissionCreateDuplicates.hamlet new file mode 100644 index 000000000..d8df8af7b --- /dev/null +++ b/templates/messages/submissionCreateDuplicates.hamlet @@ -0,0 +1,6 @@ +_{MsgSheetDuplicatePseudonym} + +<ul> + $forall p <- duplicate + <li .pseudonym> + #{review _PseudonymText p} diff --git a/templates/messages/submissionCreateExisting.hamlet b/templates/messages/submissionCreateExisting.hamlet new file mode 100644 index 000000000..77e0f3977 --- /dev/null +++ b/templates/messages/submissionCreateExisting.hamlet @@ -0,0 +1,9 @@ +_{MsgSheetCreateExisting} + +<dl> + $forall (subId, pseudos) <- subs + <dt>#{toPathPiece subId} + <dd> + <ul> + $forall p <- pseudos + <li .pseudonym>#{review _PseudonymText p} diff --git a/templates/messages/submissionFilesIgnored.hamlet b/templates/messages/submissionFilesIgnored.hamlet index f02bed623..ebb61695e 100644 --- a/templates/messages/submissionFilesIgnored.hamlet +++ b/templates/messages/submissionFilesIgnored.hamlet @@ -1,6 +1,6 @@ _{MsgSubmissionFilesIgnored} <ul> - $forall ident <- ignored + $forall ident <- ignoredFiles $case ident $of Right fileTitle <li style="font-family: monospace">#{fileTitle} diff --git a/templates/messages/submissionsAssignUnauthorized.hamlet b/templates/messages/submissionsAssignUnauthorized.hamlet new file mode 100644 index 000000000..f0002faed --- /dev/null +++ b/templates/messages/submissionsAssignUnauthorized.hamlet @@ -0,0 +1,5 @@ +_{MsgSubmissionsAssignUnauthorized (fromIntegral (length unassignedUnauth'))} + +<ul> + $forall cID <- unassignedUnauth' + <li><pre>#{toPathPiece cID} diff --git a/templates/messages/systemMessagesDeleted.hamlet b/templates/messages/systemMessagesDeleted.hamlet new file mode 100644 index 000000000..0252043a2 --- /dev/null +++ b/templates/messages/systemMessagesDeleted.hamlet @@ -0,0 +1,6 @@ +_{MsgSystemMessagesDeleted} + +<ul> + $forall sel <- selection + <li style="white-space: nowrap"> + #{toPathPiece sel} diff --git a/templates/messages/systemMessagesSetFrom.hamlet b/templates/messages/systemMessagesSetFrom.hamlet new file mode 100644 index 000000000..521fe4124 --- /dev/null +++ b/templates/messages/systemMessagesSetFrom.hamlet @@ -0,0 +1,6 @@ +_{MsgSystemMessagesActivated} + +<ul> + $forall sel <- selection + <li style="white-space: nowrap"> + #{toPathPiece sel} diff --git a/templates/messages/systemMessagesSetTo.hamlet b/templates/messages/systemMessagesSetTo.hamlet new file mode 100644 index 000000000..a024f3341 --- /dev/null +++ b/templates/messages/systemMessagesSetTo.hamlet @@ -0,0 +1,6 @@ +_{MsgSystemMessagesDeactivated} + +<ul> + $forall sel <- selection + <li style="white-space: nowrap"> + #{toPathPiece sel} diff --git a/templates/multiFileField.lucius b/templates/multiFileField.lucius index 9f371dc11..21712010e 100644 --- a/templates/multiFileField.lucius +++ b/templates/multiFileField.lucius @@ -6,7 +6,7 @@ .checkbox { display: inline-block; - margin-left: 5px; + margin-left: 7px; } } diff --git a/templates/profile.hamlet b/templates/profile.hamlet index 45510425a..fc6a9bef7 100644 --- a/templates/profile.hamlet +++ b/templates/profile.hamlet @@ -1,62 +1,2 @@ <div .profile> - - <dl .deflist.profile-dl> - <dt .deflist__dt> _{MsgName} - <dd .deflist__dd> ^{nameWidget userDisplayName userSurname} - $maybe matnr <- userMatrikelnummer - <dt .deflist__dt> _{MsgMatrikelNr} - <dd .deflist__dd> #{matnr} - <dt .deflist__dt> _{MsgEMail} - <dd .deflist__dd> #{display userEmail} - <dt .deflist__dt> _{MsgIdent} - <dd .deflist__dd> #{display userIdent} - $if not $ null admin_rights - <dt .deflist__dt> Administrator - <dd .deflist__dd> - <ul .list-ul> - $forall (E.Value institute) <- admin_rights - <li .list-ul__item> - <a href=@{SchoolShowR $ SchoolKey institute}> - #{display institute} - $if not $ null lecturer_rights - <dt .deflist__dt> Lehrberechtigt - <dd .deflist__dd> - <ul .list-ul> - $forall (E.Value institute) <- lecturer_rights - <li .list-ul__item> - <a href=@{SchoolShowR $ SchoolKey institute}> - #{display institute} - $if not $ null lecture_corrector - <dt .deflist__dt> Korrektor - <dd .deflist__dd> - <ul .list-ul> - $forall (E.Value tid, E.Value ssh, E.Value csh) <- lecture_corrector - <li .list-ul__item> - <a href=@{CourseR tid ssh csh CShowR}>#{display tid}-#{display ssh}-#{display csh} - $if not $ null studies - <dt .deflist__dt> Studiengänge - <dd .deflist__dd> - <div .scrolltable> - <table .table.table--striped.table--hover.table--condensed> - <tr .table__row> - <th .table__th> Abschluss - <th .table__th> Studiengang - <th .table__th> Studienart - <th .table__th> Semester - - $forall ((degree, degreeKey),(field, fieldKey),fieldtype,semester) <- studies - <tr.table__row> - <td .table__td> - $maybe name <- E.unValue degree - #{display name} - $nothing - #{display degreeKey} - <td .table__td> - $maybe name <- E.unValue field - #{display name} - $nothing - #{display fieldKey} - <td .table__td>_{E.unValue fieldtype} - <td .table__td>#{display semester} - ^{settingsForm} diff --git a/templates/profile.julius b/templates/profile.julius index 578693cdc..af27cebab 100644 --- a/templates/profile.julius +++ b/templates/profile.julius @@ -1,6 +1,6 @@ -document.addEventListener('DOMContentLoaded', function () { +document.addEventListener('setup', function (e) { - var themeSelector = document.querySelector('#theme-select'); + var themeSelector = e.detail.scope.querySelector('#theme-select'); themeSelector.addEventListener('change', function() { // get rid of old themes on body var options = Array.from(themeSelector.options) diff --git a/templates/profileData.hamlet b/templates/profileData.hamlet index 8d2b42a71..5acedae8e 100644 --- a/templates/profileData.hamlet +++ b/templates/profileData.hamlet @@ -1,9 +1,70 @@ -<div .container> - $if hasRows - <div .container> - <h2> Eigene Kurse +<div .profile> + + <dl .deflist.profile-dl> + <dt .deflist__dt> _{MsgName} + <dd .deflist__dd> ^{nameWidget userDisplayName userSurname} + $maybe matnr <- userMatrikelnummer + <dt .deflist__dt> _{MsgMatrikelNr} + <dd .deflist__dd> #{matnr} + <dt .deflist__dt> _{MsgEMail} + <dd .deflist__dd> #{display userEmail} + <dt .deflist__dt> _{MsgIdent} + <dd .deflist__dd> #{display userIdent} + $if not $ null admin_rights + <dt .deflist__dt> Administrator + <dd .deflist__dd> + <ul .list-ul> + $forall (E.Value institute) <- admin_rights + <li .list-ul__item> + <a href=@{SchoolShowR $ SchoolKey institute}> + #{display institute} + $if not $ null lecturer_rights + <dt .deflist__dt> Lehrberechtigt + <dd .deflist__dd> + <ul .list-ul> + $forall (E.Value institute) <- lecturer_rights + <li .list-ul__item> + <a href=@{SchoolShowR $ SchoolKey institute}> + #{display institute} + $if not $ null lecture_corrector + <dt .deflist__dt> Korrektor + <dd .deflist__dd> + <ul .list-ul> + $forall (E.Value tid, E.Value ssh, E.Value csh) <- lecture_corrector + <li .list-ul__item> + <a href=@{CourseR tid ssh csh CShowR}>#{display tid}-#{display ssh}-#{display csh} + $if not $ null studies + <dt .deflist__dt> Studiengänge + <dd .deflist__dd> + <div .scrolltable> + <table .table.table--striped.table--hover.table--condensed> + <tr .table__row> + <th .table__th> Abschluss + <th .table__th> Studiengang + <th .table__th> Studienart + <th .table__th> Semester + + $forall ((degree, degreeKey),(field, fieldKey),fieldtype,semester) <- studies + <tr.table__row> + <td .table__td> + $maybe name <- E.unValue degree + #{display name} + $nothing + #{display degreeKey} + <td .table__td> + $maybe name <- E.unValue field + #{display name} + $nothing + #{display fieldKey} + <td .table__td>_{E.unValue fieldtype} + <td .table__td>#{display semester} + + <div .container> + $if hasRows <div .container> - ^{ownedCoursesTable} + <h2> Eigene Kurse + <div .container> + ^{ownedCoursesTable} <div .container> <h2> Kursanmeldungen diff --git a/templates/sheetList.hamlet b/templates/sheetList.hamlet index 697c30b25..1bff2f32a 100644 --- a/templates/sheetList.hamlet +++ b/templates/sheetList.hamlet @@ -1 +1,4 @@ -^{table} +<section> + ^{table} +<section> + ^{statistics} \ No newline at end of file diff --git a/templates/sheetShow.hamlet b/templates/sheetShow.hamlet index 012ada784..a901eef65 100644 --- a/templates/sheetShow.hamlet +++ b/templates/sheetShow.hamlet @@ -1,33 +1,50 @@ -<div .container> - $maybe descr <- sheetDescription sheet - <h2 #description>Hinweise - <p> #{descr} - - <h3>Bewertung - <p> - #{display $ sheetType sheet} - - $maybe marking <- sheetMarkingText sheet +$newline never +$maybe descr <- sheetDescription sheet + <section> + <h2 #description>_{MsgSheetDescription} <p> - #{marking} + #{descr} - <p> - Download und Abgabe freigeschaltet ab - #{sheetFrom} +<section> + <dl .deflist> + <dt .deflist__dt>_{MsgSheetActiveFrom} + <dd .deflist__dd>#{sheetFrom} + <dt .deflist__dt>_{MsgSheetActiveTo} + <dd .deflist__dd>#{sheetTo} + $maybe hints <- hintsFrom <* guard hasHints + <dt .deflist__dt>_{MsgSheetHintFrom} + <dd .deflist__dd>#{hints} + $maybe solution <- solutionFrom <* guard hasSolution + <dt .deflist__dt>_{MsgSheetSolutionFrom} + <dd .deflist__dd>#{solution} + <dt .deflist__dt>_{MsgSheetSubmissionMode} + <dd .deflist__dd>_{sheetSubmissionMode sheet} + $case sheetSubmissionMode sheet + $of CorrectorSubmissions + <div .js-tooltip> + <div .tooltip__handle> + <div .tooltip__content>_{MsgSheetCorrectorSubmissionsTip} + $of _ + $case sheetSubmissionMode sheet + $of CorrectorSubmissions + <dt .deflist__dt>_{MsgSheetPseudonym} + <dd .deflist__dd #pseudonym> + $maybe pseudonym <- mPseudonym + <span .pseudonym>#{pseudonym} + $nothing + <form method=post action=@{CSheetR tid ssh csh shn SPseudonymR} enctype=#{generateEnctype}> + ^{generateWidget} + $of _ + <dt .deflist__dt>_{MsgSheetType} + <dd .deflist__dd>_{sheetType sheet} - <p> - Abgabe bis - #{sheetTo} - - $maybe hints <- hintsFrom <* guard hasHints +$maybe marktxt <- markingText + <section> + <h2>_{MsgSheetMarking} <p> - Hinweise ab - #{hints} + #{marktxt} - $maybe solution <- solutionFrom <* guard hasSolution - <p> - Lösung ab - #{solution} - - <h2>Dateien - ^{fileTable} +$if hasFiles + <section> + <h2>_{MsgSheetFiles} + ^{fileTable} diff --git a/templates/standalone/alerts.julius b/templates/standalone/alerts.julius index a07a002e6..c8c04dc14 100644 --- a/templates/standalone/alerts.julius +++ b/templates/standalone/alerts.julius @@ -5,31 +5,33 @@ var ALERT_INVISIBLE_CLASS = 'alert--invisible'; var TOGGLER_INVISIBLE_CLASS = 'alerts__toggler--visible'; + var ALERT_AUTO_DISAPPEAR_DELAY = 10; + + var alertsShowingToggler = false; window.utils.alerts = function(alertsEl) { - var alerts = Array.from(alertsEl.querySelectorAll('.alert')); - var toggler; - var showingToggler = false; + var toggler = alertsEl.querySelector('.alerts__toggler'); function makeToggler() { toggler = document.createElement('DIV'); toggler.classList.add('alerts__toggler'); toggler.addEventListener('click', function() { - alerts.forEach(function(alert) { + Array.from(alertsEl.querySelectorAll('.alert')).forEach(function(alert) { alert.classList.remove(ALERT_INVISIBLE_CLASS); toggler.classList.remove(TOGGLER_INVISIBLE_CLASS); }); checkToggler(); }); alertsEl.appendChild(toggler); + alertsEl.classList.add('js-initialized'); } function makeAlert(alertEl) { var iconEl = document.createElement('DIV'); var closeEl = document.createElement('DIV'); var dataDecay = alertEl.dataset.decay; - var autoDecay = 30; + var autoDecay = ALERT_AUTO_DISAPPEAR_DELAY; if (dataDecay) { autoDecay = parseInt(dataDecay, 10); } @@ -47,6 +49,8 @@ closeAlert(alertEl); }, autoDecay * 1000); } + + alertEl.classList.add('js-initialized'); } function closeAlert(alertEl) { @@ -56,28 +60,42 @@ function checkToggler() { var hidden = true; - alerts.forEach(function(alert) { + Array.from(alertsEl.querySelectorAll('.alert')).forEach(function(alert) { if (hidden && !alert.classList.contains(ALERT_INVISIBLE_CLASS)) { hidden = false; } }); - if (!showingToggler) { - showingToggler = true; + if (!alertsShowingToggler) { + alertsShowingToggler = true; window.setTimeout(function() { toggler.classList.toggle(TOGGLER_INVISIBLE_CLASS, hidden); - showingToggler = false; + alertsShowingToggler = false; }, 120); } } - makeToggler(); - alerts.map(makeAlert); + if (!alertsEl.classList.contains('js-initialized') || !toggler) + makeToggler(); + Array.from(alertsEl.querySelectorAll('.alert:not(.js-initialized)')).map(makeAlert); } })(); -document.addEventListener('DOMContentLoaded', function() { +document.addEventListener('setup', function(e) { + if (e.detail.module && e.detail.module !== 'alerts') + return; + // setup alerts - window.utils.alerts(document.querySelector('.alerts')); + if (e.detail.scope.classList.contains('alerts')) { + window.utils.alerts(e.detail.scope); + } else { + var alertsEl = e.detail.scope.querySelector('.alerts'); + if (alertsEl) + window.utils.alerts(alertsEl); + } +}); + +document.addEventListener('DOMContentLoaded', function() { + document.dispatchEvent(new CustomEvent('setup', { detail: { scope: document.body, module: 'alerts' }, bubbles: true, cancelable: true })) }); diff --git a/templates/standalone/alerts.lucius b/templates/standalone/alerts.lucius index c1660b903..bc5603220 100644 --- a/templates/standalone/alerts.lucius +++ b/templates/standalone/alerts.lucius @@ -48,7 +48,7 @@ align-items: center; justify-content: center; width: 30px; - color: var(--color-lightblack); + color: var(--color-grey); font-size: 30px; transform: translateX(-50%); } @@ -82,6 +82,10 @@ transition: margin-bottom .2s ease-out; } +.alert a { + color: var(--color-lightwhite); +} + @keyframes slide-in-alert { from { transform: translateY(120%); diff --git a/templates/standalone/datepicker.julius b/templates/standalone/datepicker.julius index 640824a46..a7e956af4 100644 --- a/templates/standalone/datepicker.julius +++ b/templates/standalone/datepicker.julius @@ -1,5 +1,8 @@ -document.addEventListener('DOMContentLoaded', function() { +document.addEventListener('setup', function(e) { "use strict"; + + if (e.detail.module && e.detail.module !== 'datepicker') + return; var config = { dtLocal: { @@ -24,13 +27,17 @@ document.addEventListener('DOMContentLoaded', function() { } }; - Array.from(document.querySelectorAll('input[type="date"]')).forEach(function(el) { + Array.from(e.detail.scope.querySelectorAll('input[type="date"]')).forEach(function(el) { flatpickr(el, config.d); }); - Array.from(document.querySelectorAll('input[type="time"]')).forEach(function(el) { + Array.from(e.detail.scope.querySelectorAll('input[type="time"]')).forEach(function(el) { flatpickr(el, config.t); }); - Array.from(document.querySelectorAll('input[type="datetime-local"]')).forEach(function(el) { + Array.from(e.detail.scope.querySelectorAll('input[type="datetime-local"]')).forEach(function(el) { flatpickr(el, config.dtLocal); }); }); + +document.addEventListener('DOMContentLoaded', function() { + document.dispatchEvent(new CustomEvent('setup', { detail: { scope: document.body, module: 'datepicker' }, bubbles: true, cancelable: true })); +}); diff --git a/templates/standalone/inputs.julius b/templates/standalone/inputs.julius index ed129274e..f45a224c7 100644 --- a/templates/standalone/inputs.julius +++ b/templates/standalone/inputs.julius @@ -113,25 +113,35 @@ })(); -document.addEventListener('DOMContentLoaded', function() { +document.addEventListener('setup', function(e) { + if (e.detail.module && e.detail.module !== 'inputs') + return; // initialize checkboxes - Array.from(document.querySelectorAll('input[type="checkbox"]')).forEach(function(inp) { + Array.from(e.detail.scope.querySelectorAll('input[type="checkbox"]:not(.js-initialized)')).forEach(function(inp) { window.utils.initializeCheckboxRadio(inp, 'checkbox'); + inp.classList.add("js-initialized"); }); // initialize radios - Array.from(document.querySelectorAll('input[type="radio"]')).forEach(function(inp) { + Array.from(e.detail.scope.querySelectorAll('input[type="radio"]:not(.js-initialized)')).forEach(function(inp) { window.utils.initializeCheckboxRadio(inp, 'radio'); + inp.classList.add("js-initialized"); }); // initialize file-upload-fields - Array.from(document.querySelectorAll('input[type="file"]')).forEach(function(inp) { + Array.from(e.detail.scope.querySelectorAll('input[type="file"]:not(.js-initialized)')).forEach(function(inp) { window.utils.initializeFileUpload(inp); + inp.classList.add("js-initialized"); }); // initialize file-checkbox-fields - Array.from(document.querySelectorAll('.js-file-checkbox')).forEach(function(inp) { + Array.from(e.detail.scope.querySelectorAll('.js-file-checkbox:not(.js-initialized)')).forEach(function(inp) { window.utils.reactiveFileCheckbox(inp); + inp.classList.add("js-initialized"); }); }); + +document.addEventListener('DOMContentLoaded', function() { + document.dispatchEvent(new CustomEvent('setup', { detail: { scope: document.body, module: 'inputs' }, bubbles: true, cancelable: true })); +}); diff --git a/templates/standalone/inputs.lucius b/templates/standalone/inputs.lucius index 470efdb1b..3b0d11372 100644 --- a/templates/standalone/inputs.lucius +++ b/templates/standalone/inputs.lucius @@ -30,6 +30,12 @@ } } +.form-group--optional { + .form-group__label::after { + content: ''; + } +} + .form-group--submit .form-group__input { grid-column: 2; } @@ -59,6 +65,7 @@ /* TEXT INPUTS */ input[type="text"], +input[type="search"], input[type="password"], input[type="url"], input[type="number"], @@ -81,11 +88,29 @@ input[type*="time"] { font-family: var(--font-base); line-height: 1.5; padding: 4px 13px; + + &:focus { + border-color: #3273dc; + box-shadow: 0 0 0 0.125em rgba(50,115,220,.25); + outline: 0; + } + + &[disabled] { + background-color: #f5f5f5; + color: #7a7a7a; + box-shadow: none; + border-color: #dbdbdb; + } + + &[readonly] { + background-color: #f5f5f5; + box-shadow: none; + border-color: #dbdbdb; + } } input[type="number"] { width: 100px; - text-align: right; } input[type*="date"], @@ -95,19 +120,6 @@ input[type*="time"], width: 250px; } -input[type="text"]:focus, -input[type="password"]:focus, -input[type="url"]:focus, -input[type="number"]:focus, -input[type="email"]:focus { - /* border-bottom-color: var(--color-light); - background-color: transparent; - box-shadow: 0 0 13px var(--color-lighter); */ - border-color: #3273dc; - box-shadow: 0 0 0 0.125em rgba(50,115,220,.25); - outline: 0; -} - /* BUTTON STYLE SEE default-layout.lucius */ /* TEXTAREAS */ @@ -127,12 +139,25 @@ textarea { border-radius: 2px; box-shadow: inset 0 1px 2px 1px rgba(50,50,50,.05); vertical-align: top; -} -textarea:focus { - border-color: #3273dc; - box-shadow: 0 0 0 0.125em rgba(50,115,220,.25); - outline: 0; + &:focus { + border-color: #3273dc; + box-shadow: 0 0 0 0.125em rgba(50,115,220,.25); + outline: 0; + } + + &[disabled] { + background-color: #f3f3f3; + color: #7a7a7a; + box-shadow: none; + border-color: #dbdbdb; + } + + &[readonly] { + background-color: #f5f5f5; + box-shadow: none; + border-color: #dbdbdb; + } } /* OPTIONS */ @@ -209,7 +234,8 @@ input[type="checkbox"]:checked::after { height: 24px; width: 24px; background-color: #f3f3f3; - box-shadow: inset 0 1px 2px 1px rgba(50,50,50,.05); + box-shadow: inset 0 1px 2px 1px rgba(50, 50, 50, 0.05); + border: 2px solid var(--color-primary); border-radius: 4px; color: white; cursor: pointer; @@ -217,39 +243,43 @@ input[type="checkbox"]:checked::after { label::before, label::after { - content: ''; position: absolute; - top: 11px; - left: 3px; display: block; - width: 18px; + top: 12px; + left: 8px; height: 2px; + width: 8px; background-color: var(--color-font); - transition: all .2s; - transform: scale(0.5, 0.1); } :checked + label { background-color: var(--color-primary); - text-decoration: underline; + } + + :checked + label::before, + :checked + label::after { + content: ''; } :checked + label::before { background-color: white; - transform: scale(1, 1) rotate(45deg); + transform: rotate(45deg); + left: 4px; } :checked + label::after { background-color: white; - transform: scale(1, 1) rotate(-45deg); + transform: rotate(-45deg); + top: 11px; + width: 13px; } -} -.radio label::before { - transform: scale(0.01, 0.01) rotate(45deg); -} -.radio label::after { - transform: scale(0.01, 0.01) rotate(-45deg); + [disabled] + label { + pointer-events: none; + border: none; + opacity: 0.6; + filter: grayscale(1); + } } .radio::before { diff --git a/templates/standalone/modal.julius b/templates/standalone/modal.julius index fa32d2723..f624d1b46 100644 --- a/templates/standalone/modal.julius +++ b/templates/standalone/modal.julius @@ -7,20 +7,24 @@ var overlay = document.createElement('div'); var closer = document.createElement('div'); var trigger = document.querySelector('#' + modal.dataset.trigger); - var origParent = modal.parentNode; + // var origParent = modal.parentNode; function open(event) { + if (!modal.classList.contains('js-modal-initialized')) { + return; + } + // disable modals for narrow screens if (event) { event.preventDefault(); } modal.classList.add('modal--open'); overlay.classList.add('modal__overlay'); - document.body.insertBefore(modal, null); + // document.body.insertBefore(modal, null); document.body.insertBefore(overlay, modal); overlay.classList.add('modal__overlay--open'); - if (modal.dataset.closeable === 'true') { + if ('closeable' in modal.dataset) { closer.classList.add('modal__closer'); modal.insertBefore(closer, null); closer.addEventListener('click', close, false); @@ -37,52 +41,260 @@ } function close(event) { - if (typeof event === 'undefined' || event.target === closer || event.target === overlay) { - overlay.remove(); - origParent.insertBefore(modal, null); - modal.classList.remove('modal--open'); - closer.removeEventListener('click', close, false); - } + overlay.remove(); + // origParent.insertBefore(modal, null); + modal.classList.remove('modal--open'); + closer.removeEventListener('click', close, false); }; function setup() { + document.body.insertBefore(modal, null); + // every modal can be openend via document-wide event, see openOnEvent document.addEventListener('modal-open', openOnEvent, false); - // if modal has trigger assigned to it open modal on click - if (trigger) { + + if ('dynamic' in modal.dataset) { + function fetchModal(url, init) { + function responseHtml(body) { + var modalContent = document.createElement('div'); + modalContent.innerHTML = body; + + var contentBody = modalContent.querySelector('.main__content-body'); + var scriptTags = []; + if (contentBody) { + modalContent.querySelectorAll('script').forEach(function(scriptTag) { + var existsAlready = Array.from(document.body.querySelectorAll('script')).some(function(haystack) { + if (haystack.text === scriptTag.text && haystack.getAttribute('src') === scriptTag.getAttribute('src')) { + scriptTags.push(haystack); + return true; + } else { + return false; + } + }); + if (existsAlready) + return; + + var scriptClone = document.createElement('script'); + if (scriptTag.text) + scriptClone.text = scriptTag.text; + if (scriptTag.hasAttributes()) { + var attrs = scriptTag.attributes; + for (var i = attrs.length - 1; i >= 0; i--) { + scriptClone.setAttribute(attrs[i].name, attrs[i].value); + } + } + + document.body.insertBefore(scriptClone, null); + scriptTags.push(scriptClone); + }); + + modalContent.querySelectorAll('style').forEach(function(styleTag) { + if (Array.from(document.head.querySelectorAll('style')).some(function(haystack) { + return haystack.innerText === styleTag.innerText; + })) { return } + + document.head.insertBefore(styleTag, null); + }); + + modalContent.querySelectorAll('link').forEach(function(linkTag) { + if (linkTag.getAttribute('rel') !== 'stylesheet') + return; + + if (Array.from(document.head.querySelectorAll('link')).some(function(haystack) { + return haystack.getAttribute('href') === linkTag.getAttribute('href'); + })) { return } + + + document.head.insertBefore(linkTag, null); + }); + + var modalAlertsEl = modalContent.querySelector('#alerts'); + var alertsEl = document.body.querySelector('#alerts'); + if (alertsEl && modalAlertsEl) { + var modalAlerts = Array.from(modalAlertsEl.childNodes); + + modalAlerts.forEach(function(alertEl) { + alertsEl.insertBefore(alertEl, alertsEl.querySelector('.alerts__toggler')); + }); + + if (modalAlerts.length !== 0) + document.dispatchEvent(new CustomEvent('setup', { detail: { scope: alertsEl } })); + + contentBody.removeChild(modalAlertsEl); + } + + modalContent = contentBody; + } + modalContent.classList.add('modal__content'); + + var nudgeAttr = function(attr, x) { + var oldVal = x.getAttribute(attr); + var newVal = modal.getAttribute('id') + '__' + oldVal; + + // console.log(oldVal, newVal); + x.setAttribute(attr, newVal); + }; + + var idAttrs = ['id', 'for', 'data-conditional-id']; + idAttrs.map(function(attr) { + modalContent.querySelectorAll('[' + attr + ']').forEach(function(x) { nudgeAttr(attr, x); }); + }); + + modal.querySelectorAll('.modal__content').forEach(function(prev) { modal.removeChild(prev); }); + modal.insertBefore(modalContent, null); + + var triggerContentLoad = function() { + console.log('contentReady', modal); + + document.dispatchEvent(new CustomEvent('setup', { + detail: { scope: modal }, + bubbles: true, + cancelable: true + })); + } + + scriptTags.forEach(function(t) { t.addEventListener('load', triggerContentLoad); }); + triggerContentLoad(); + + return 'html'; + } + + function responseJson(data) { + var alertsEl = document.querySelector('#alerts'); + if (!alertsEl) + return null; + + for (var i = 0; i < data.length; i++) { + var alert = document.createElement('div'); + alert.classList.add('alert', 'alert-' + data[i].class); + var alertContent = document.createElement('div'); + alertContent.classList.add('alert__content'); + alertContent.innerHTML = data[i].content; + alert.appendChild(alertContent); + + alertsEl.insertBefore(alert, alertsEl.querySelector('.alerts__toggler')); + } + + document.dispatchEvent(new CustomEvent('setup', { detail: { scope: alertsEl }, bubbles: true, cancelable: true })); + + return 'json'; + } + + + return fetch(url, init).then(function(response) { + var contentType = response.headers.get('Content-Type') + if (contentType && contentType.includes('text/html')) { + return response.text().then(responseHtml); + } else if (contentType && contentType.includes('application/json')) { + return response.json().then(responseJson); + } else { + console.log(response); + return null; + } + }); + }; + + modal.addEventListener('modal-fetch', function(event) { + var dynamicContentURL = (event.detail && event.detail.url) || trigger.getAttribute('href'); + + var fetchInit = (event.detail && event.detail.init) || { + credentials: 'same-origin', + headers: { + #{String (toPathPiece HeaderIsModal)}: 'True' + } + }; + + if (dynamicContentURL.length > 0) { + fetchModal(dynamicContentURL, fetchInit).then((event.detail && event.detail.then) || (function(){})); + } + }); + modal.dispatchEvent(new CustomEvent('modal-fetch', { + detail: { + then: (function() { + if (!trigger) + return; + + trigger.classList.add('modal__trigger'); + trigger.addEventListener('click', open, false); + }) + } + })); + } else if (trigger) { // if modal has trigger assigned to it open modal on click + trigger.classList.add('modal__trigger'); trigger.addEventListener('click', open, false); } - if (modal.dataset.dynamic === 'True') { - var dynamicContentURL = trigger.getAttribute('href'); - if (dynamicContentURL.length > 0) { - fetch(dynamicContentURL, { - credentials: 'same-origin', - }).then(function(response) { - return response.text(); - }).then(function(body) { - var modalContent = document.createElement('div'); - modalContent.innerHTML = body; - var main = modalContent.querySelector('.main__content-body'); - if (main) { - modal.appendChild(main); - } else { - replaceMe.innerHTML = body; - } - }); - } - } + // tell further modals, that this one already got initialized modal.classList.add('js-modal-initialized'); + + modal.addEventListener('modal-close', close); } + setup(); }; + + window.utils.ajaxSubmit = function(modal, form) { + function doSubmit(event) { + event.preventDefault(); + + var modalContent = modal.querySelector('.modal__content'); + modalContent.style.pointerEvents = 'none'; + modalContent.style.opacity = 0.5; + + modal.dispatchEvent(new CustomEvent('modal-fetch', { + detail: { + url: form.target, + init: { + credentials: 'same-origin', + headers: { + #{String (toPathPiece HeaderIsModal)}: 'True' + }, + method: form.method, + body: new FormData(form) + }, + then: (function(typ) { + modal.dispatchEvent(new CustomEvent('modal-close')); + + modalContent.style.pointerEvents = 'auto'; + modalContent.style.opacity = 1; + + if (typ === 'json') { + modal.dispatchEvent(new CustomEvent('modal-fetch')); + } + }) + }, + bubbles: true, + cancelable: true + })); + }; + + form.addEventListener('submit', doSubmit); + form.classList.add('js-ajax-initialized'); + }; })(); -document.addEventListener('DOMContentLoaded', function() { +document.addEventListener('setup', function(e) { + if (e.detail.module && e.detail.module !== 'modal') + return; - Array.from(document.querySelectorAll('.js-modal:not(.js-modal-initialized)')).map(function(modal) { - new utils.modal(modal); + Array.from(e.detail.scope.querySelectorAll('.js-modal:not(.js-modal-initialized)')).forEach(function(modal) { + window.utils.modal(modal); }); + if (e.detail.scope.classList.contains('js-modal')) { + Array.from(e.detail.scope.querySelectorAll('form[data-ajax-submit]:not(.js-ajax-initialized)')).forEach(function(form) { + window.utils.ajaxSubmit(e.detail.scope, form); + }); + } else { + Array.from(e.detail.scope.querySelectorAll('.js-modal')).map(function(modal) { + Array.from(modal.querySelectorAll('form[data-ajax-submit]:not(.js-ajax-initialized)')).forEach(function(form) { + window.utils.ajaxSubmit(modal, form); + }); + }); + }; }, false); + +document.addEventListener('DOMContentLoaded', function() { + document.dispatchEvent(new CustomEvent('setup', { detail: { scope: document.body, module: 'modal' }, bubbles: true, cancelable: true })) +}); diff --git a/templates/standalone/modal.lucius b/templates/standalone/modal.lucius index 2379714ee..390a60a1e 100644 --- a/templates/standalone/modal.lucius +++ b/templates/standalone/modal.lucius @@ -4,24 +4,29 @@ top: 50%; transform: translate(-50%, -50%) scale(0.8, 0.8); display: block; - background-color: rgba(255, 255, 255, 0.99); + background-color: rgba(255, 255, 255, 1); min-width: 60vw; min-height: 100px; max-height: calc(100vh - 30px); border-radius: 2px; z-index: -1; color: var(--color-font); - padding: 20px; - padding-right: 65px; + padding: 0 65px 0 20px; overflow: auto; - opacity: 0; transition: all .15s ease; + pointer-events: none; + opacity: 0; &.modal--open { opacity: 1; + pointer-events: auto; z-index: 200; transform: translate(-50%, -50%) scale(1, 1); } + + .modal__content { + margin: 20px 0; + } } @media (max-width: 1024px) { @@ -48,10 +53,11 @@ width: 100%; background-color: transparent; z-index: -1; - opacity: 0; transition: all .2s ease; + display: none; &.modal__overlay--open { + display: block; z-index: 199; opacity: 1; background-color: rgba(0, 0, 0, 0.4); diff --git a/templates/standalone/showHide.julius b/templates/standalone/showHide.julius index 09b3c3e2e..d1a2945bf 100644 --- a/templates/standalone/showHide.julius +++ b/templates/standalone/showHide.julius @@ -6,7 +6,9 @@ * content here */ -document.addEventListener('DOMContentLoaded', function() { +document.addEventListener('setup', function(e) { + if (e.detail.module && e.detail.module !== 'showHide') + return; var LSNAME = 'SHOW_HIDE'; @@ -35,7 +37,7 @@ document.addEventListener('DOMContentLoaded', function() { } Array - .from(document.querySelectorAll('.js-show-hide__toggle')) + .from(e.detail.scope.querySelectorAll('.js-show-hide__toggle')) .forEach(function(el) { var index = el.dataset.shIndex || null; el.parentElement.classList.toggle( @@ -50,3 +52,7 @@ document.addEventListener('DOMContentLoaded', function() { addEventHandler(el); }); }); + +document.addEventListener('DOMContentLoaded', function() { + document.dispatchEvent(new CustomEvent('setup', { detail: { scope: document.body, module: 'showHide' }, bubbles: true, cancelable: true })) +}); diff --git a/templates/standalone/tooltip.julius b/templates/standalone/tooltip.julius index 42f283dd8..65cd709fa 100644 --- a/templates/standalone/tooltip.julius +++ b/templates/standalone/tooltip.julius @@ -52,17 +52,16 @@ })(); -document.addEventListener('DOMContentLoaded', function() { - +document.addEventListener('setup', function(e) { // JS-TOOLTIPS NOT USED CURRENTLY. // initialize tooltips set via `data-tooltip` - // Array.from(document.querySelectorAll('[data-tooltip]')).forEach(function(el) { + // Array.from(e.detail.scope.querySelectorAll('[data-tooltip]')).forEach(function(el) { // window.utils.tooltipFromAttribute(el) // }); // initialize tooltips - // Array.from(document.querySelectorAll('.js-tooltip')).forEach(function(tt) { + // Array.from(e.detail.scope.querySelectorAll('.js-tooltip')).forEach(function(tt) { // window.utils.tooltip(tt); // }); }); diff --git a/templates/standalone/tooltip.lucius b/templates/standalone/tooltip.lucius index d85415d97..0a2154768 100644 --- a/templates/standalone/tooltip.lucius +++ b/templates/standalone/tooltip.lucius @@ -1,6 +1,8 @@ .js-tooltip { position: relative; display: inline-block; + height: 1.5rem; + vertical-align: -0.375rem; &:hover .tooltip__content { display: inline-block; diff --git a/templates/submission-assign.hamlet b/templates/submission-assign.hamlet new file mode 100644 index 000000000..0c6d86757 --- /dev/null +++ b/templates/submission-assign.hamlet @@ -0,0 +1,2 @@ +<form method=post action=@{actionUrl} enctype=#{corrEncoding}> + ^{corrForm} \ No newline at end of file diff --git a/templates/submission.hamlet b/templates/submission.hamlet index aeaf9ca2f..c9686bd3b 100644 --- a/templates/submission.hamlet +++ b/templates/submission.hamlet @@ -13,7 +13,7 @@ $maybe cID <- mcid <p> _{MsgSubmissionNoUploadExpected} - $if not (null lastEdits) + $if maySubmit && not (null lastEdits) <h3>_{MsgLastEdits} <ul> $forall (mbName,time) <- lastEdits diff --git a/templates/system-message-list.hamlet b/templates/system-message-list.hamlet new file mode 100644 index 000000000..18b919bba --- /dev/null +++ b/templates/system-message-list.hamlet @@ -0,0 +1,6 @@ +<section> + ^{tableView} + +<section> + <form method=post action=@{MessageListR} enctype=#{addEncoding}> + ^{addView} diff --git a/templates/system-message.hamlet b/templates/system-message.hamlet new file mode 100644 index 000000000..577723162 --- /dev/null +++ b/templates/system-message.hamlet @@ -0,0 +1,12 @@ +<section> + $maybe summary' <- summary + <h2> + #{summary'} + <p> + #{content} + +$maybe (messageEditModal, translationAddModal, translationsEditModal) <- forms + <section> + ^{messageEditModal} + ^{translationAddModal} + ^{translationsEditModal} diff --git a/templates/table/cell/header.hamlet b/templates/table/cell/header.hamlet index 66ac4087e..d78d57e67 100644 --- a/templates/table/cell/header.hamlet +++ b/templates/table/cell/header.hamlet @@ -2,10 +2,10 @@ $maybe flag <- sortableKey $case directions $of [SortAsc] - <a .table__th-link href=#{tblLink $ setParam (wIdent "sorting") (Just $ CI.foldedCase flag <> "-desc")}> + <a .table__th-link href=#{tblLink $ setParam (wIdent "sorting") (Just $ toPathPiece (SortingSetting flag SortDesc))}> ^{widget} $of _ - <a .table__th-link href=#{tblLink $ setParam (wIdent "sorting") (Just $ CI.foldedCase flag <> "-asc")}> + <a .table__th-link href=#{tblLink $ setParam (wIdent "sorting") (Just $ toPathPiece (SortingSetting flag SortAsc))}> ^{widget} $nothing ^{widget} diff --git a/templates/table/colonnade.hamlet b/templates/table/colonnade.hamlet index 828b64111..9ccea4ef8 100644 --- a/templates/table/colonnade.hamlet +++ b/templates/table/colonnade.hamlet @@ -1,20 +1,21 @@ $newline never -<table *{dbsAttrs'}> - $maybe wHeaders' <- wHeaders - <thead> - <tr .table__row.table__row--head> - $forall widget <- wHeaders' - $# cell/header.hamlet - ^{widget} - $nothing - <tbody> - $if null wRows && (dbsEmptyStyle == DBESHeading) - <tr .table__row> - <td .table__td colspan=#{show columnCount}> - _{dbsEmptyMessage} - $else - $forall row <- wRows - <tr .table__row> - $forall widget <- row - $# cell/body.hamlet +<div .scrolltable> + <table *{dbsAttrs'}> + $maybe wHeaders' <- wHeaders + <thead> + <tr .table__row.table__row--head> + $forall widget <- wHeaders' + $# cell/header.hamlet ^{widget} + $nothing + <tbody> + $if null wRows && (dbsEmptyStyle == DBESHeading) + <tr .table__row> + <td .table__td colspan=#{show columnCount}> + _{dbsEmptyMessage} + $else + $forall row <- wRows + <tr .table__row> + $forall widget <- row + $# cell/body.hamlet + ^{widget} diff --git a/templates/table/form-wrap.hamlet b/templates/table/form-wrap.hamlet new file mode 100644 index 000000000..8f5b13b00 --- /dev/null +++ b/templates/table/form-wrap.hamlet @@ -0,0 +1,5 @@ +$newline never +<form method=#{decodeUtf8 (renderStdMethod dbParamsFormMethod)} action=#{fromMaybe "" act} *{dbParamsFormAttrs} enctype=#{enctype'}> + ^{fWidget} + $if dbParamsFormAddSubmit + ^{submitView} diff --git a/templates/table/layout-filter-default.hamlet b/templates/table/layout-filter-default.hamlet new file mode 100644 index 000000000..ccab35063 --- /dev/null +++ b/templates/table/layout-filter-default.hamlet @@ -0,0 +1,8 @@ +$newline never +<section> + <form method=GET action=#{filterAction} enctype=#{filterEnctype}> + ^{filterWgdt} + <button> + ^{btnLabel BtnSubmit} +<section> + ^{scrolltable} diff --git a/templates/table/layout.hamlet b/templates/table/layout.hamlet index 1c2fbf863..1a455c968 100644 --- a/templates/table/layout.hamlet +++ b/templates/table/layout.hamlet @@ -1,12 +1,21 @@ $newline never -$if null wRows && (dbsEmptyStyle == DBESNoHeading) +$if null rows && (dbsEmptyStyle == DBESNoHeading) _{dbsEmptyMessage} $else - <div .scrolltable> - ^{table} + ^{table} + + <div .table-footer> + <div .table__row-count> + _{MsgRowCount rowCount} + $# Since the current pagesize is always a member of pagesizeOptions we don't need to check `pageCount > 1` + $if toEnum (fromIntegral rowCount) > minimum (pagesizeOptions referencePagesize) + <form .pagesize ##{wIdent "pagesize-form"} method=GET enctype=#{pagesizeEnc} action=#{rawAction}> + ^{pagesizeWdgt} + $if pageCount > 1 - <ul ##{wIdent "pagination"} .pagination> - $forall p <- pageNumbers - <li .pagination-link :p == psPage:.current> - <a href=#{tblLink $ setParam (wIdent "page") (Just $ tshow p)}> - _{MsgPage (succ p)} + <div .pagination> + <ul ##{wIdent "pagination"} .pages> + $forall p <- pageNumbers + <li .page-link :p == psPage:.current> + <a href=#{tblLink $ setParam (wIdent "page") (Just $ tshow p)}> + _{MsgPage (succ p)} diff --git a/templates/table/layout.julius b/templates/table/layout.julius index 79862009f..43a6595a3 100644 --- a/templates/table/layout.julius +++ b/templates/table/layout.julius @@ -1,77 +1,175 @@ (function collonadeClosure() { 'use strict'; - document.addEventListener('DOMContentLoaded', function DOMContentLoaded() { + window.utils = window.utils || {}; - function setupAsync(wrapper) { + window.utils.asyncTable = function(wrapper, options) { - var table = wrapper.querySelector('#' + #{String $ dbtIdent}); - var ths = Array.from(table.querySelectorAll('th.sortable')); - var pagination = wrapper.querySelector('#' + #{String $ dbtIdent} + '-pagination'); + var tableIdent = #{String dbtIdent}; + var shortCircuitHeader = #{String (toPathPiece HeaderDBTableShortcircuit)}; - ths.forEach(function(th) { - th.addEventListener('click', clickHandler); + var ths = []; + var pageLinks = []; + var pagesizeForm; + var scrollTable; + + function init() { + var table = wrapper.querySelector('#' + tableIdent); + if (!table) { + return; + } + + scrollTable = wrapper.querySelector('.scrolltable'); + + // sortable table headers + ths = Array.from(table.querySelectorAll('th.sortable')).map(function(th) { + return { element: th }; }); + // pagination links + var pagination = wrapper.querySelector('#' + tableIdent + '-pagination'); if (pagination) { - Array.from(pagination.querySelectorAll('.pagination-link')) - .forEach(function(p) { - p.addEventListener('click', clickHandler); - }); - } - - function clickHandler(event) { - event.preventDefault(); - var url = new URL(window.location.origin + window.location.pathname + getClickDestination(this)); - url.searchParams.set(#{String $ wIdent "table-only"}, 'yes'); - updateTableFrom(url); - - - ths.forEach(function(th) { - // th.removeEventListener('click', clickHandler); - console.log('removed handler from', th); + pageLinks = Array.from(pagination.querySelectorAll('.page-link')).map(function(link) { + return { element: link }; }); } - function getClickDestination(el) { - console.log(el); - if (!el.querySelector('a')) { - return false; + // pagesize form + pagesizeForm = wrapper.querySelector('#' + tableIdent + '-pagesize-form'); + + // take options into account + if (options && options.scrollToTop) { + window.scrollTo(0, 0); + } + + if (options && options.horizPos && scrollTable) { + scrollTable.scrollLeft = options.horizPos; + } + + setupListeners(); + wrapper.classList.add('js-initialized'); + } + + function setupListeners() { + ths.forEach(function(th) { + th.clickHandler = function(event) { + var boundClickHandler = clickHandler.bind(this); + var horizPos = (scrollTable || {}).scrollLeft; + boundClickHandler(event, { horizPos }); + }; + th.element.addEventListener('click', th.clickHandler); + }); + + pageLinks.forEach(function(link) { + link.clickHandler = function(event) { + var boundClickHandler = clickHandler.bind(this); + boundClickHandler(event, { scrollToTop: true }); } - return el.querySelector('a').getAttribute('href'); - } + link.element.addEventListener('click', link.clickHandler); + }); - // fetches new sorted table from url with params and replaces contents of current table - function updateTableFrom(url) { - fetch(url, { - credentials: 'same-origin', - headers: { - 'Accept': 'text/html' - } - }).then(function(response) { - if (!response.ok) { - throw ('Looks like there was a problem fetching ' + url.toString() + '. Status Code: ' + response.status); - } - return response.text(); - }).then(function(data) { - // remove listeners - ths.forEach(function(th) { - th.removeEventListener('click', clickHandler); - }); - - // replace contents of table body - wrapper.innerHTML = data; - - // set up async functionality again - setupAsync(wrapper); - table.querySelector('tbody').innerHTML = data; - }).catch(function(err) { - console.error(err); - }); + if (pagesizeForm) { + var pagesizeSelect = pagesizeForm.querySelector('[name=' + tableIdent + '-pagesize]') + pagesizeSelect.addEventListener('change', changePagesizeHandler); } } - var selector = '#' + #{String $ dbtIdent} + '-table-wrapper'; - setupAsync(document.querySelector(selector)); - }); + function removeListeners() { + ths.forEach(function(th) { + th.element.removeEventListener('click', th.clickHandler); + }); + + pageLinks.forEach(function(link) { + link.element.removeEventListener('click', link.clickHandler); + }); + + if (pagesizeForm) { + var pagesizeSelect = pagesizeForm.querySelector('[name=' + tableIdent + '-pagesize]') + pagesizeSelect.removeEventListener('change', changePagesizeHandler); + } + } + + function clickHandler(event, options) { + event.preventDefault(); + var url = new URL(window.location.origin + window.location.pathname + getClickDestination(this)); + updateTableFrom(url, options); + } + + function getClickDestination(el) { + if (!el.querySelector('a')) { + return ''; + } + return el.querySelector('a').getAttribute('href'); + } + + function changePagesizeHandler(event) { + var currentTableUrl = wrapper.dataset.currentUrl || window.location.href; + var url = getUrlWithUpdatedPagesize(currentTableUrl, event.target.value); + url = getUrlWithResetPagenumber(url); + updateTableFrom(url); + } + + function getUrlWithUpdatedPagesize(url, pagesize) { + if (url.indexOf('pagesize') >= 0) { + return url.replace(/pagesize=(\d+|all)/, 'pagesize=' + pagesize); + } else if (url.indexOf('?') >= 0) { + return url += '&' + tableIdent + '-pagesize=' + pagesize; + } + + return url += '?' + tableIdent + '-pagesize=' + pagesize; + } + + function getUrlWithResetPagenumber(url) { + return url.replace(/-page=\d+/, '-page=0'); + } + + function updateWrapperContents(newHtml, options) { + wrapper.innerHTML = newHtml; + wrapper.classList.remove("js-initialized"); + + // setup the wrapper and its components to behave async again + window.utils.asyncTable(wrapper, options); + + // make sure to hide any new submit buttons + document.dispatchEvent(new CustomEvent('setup', { + detail: { + scope: wrapper, + module: 'autoSubmit' + } + })); + } + + // fetches new sorted table from url with params and replaces contents of current table + function updateTableFrom(url, options) { + + fetch(url, { + credentials: 'same-origin', + headers: { + 'Accept': 'text/html', + [shortCircuitHeader]: tableIdent + } + }).then(function(response) { + if (!response.ok) { + throw new Error('Looks like there was a problem fetching ' + url + '. Status Code: ' + response.status); + } + return response.text(); + }).then(function(data) { + wrapper.dataset.currentUrl = url; + removeListeners(); + updateWrapperContents(data, options); + }).catch(function(err) { + console.error(err); + }); + } + + init(); + }; })(); + +document.addEventListener('DOMContentLoaded', function() { + var selector = '#' + #{String $ dbtIdent} + '-table-wrapper:not(.js-initialized)'; + var wrapper = document.querySelector(selector); + if (wrapper) { + window.utils.asyncTable(wrapper); + } +}); diff --git a/templates/table/layout.lucius b/templates/table/layout.lucius index 8cdfa01c6..c35fcecde 100644 --- a/templates/table/layout.lucius +++ b/templates/table/layout.lucius @@ -1,39 +1,52 @@ +/* TABLE FOOTER */ +.table-footer { + display: flex; + flex-flow: row-reverse; + justify-content: space-between; +} + /* PAGINATION */ .pagination { - margin-top: 20px; - text-align: center; + margin-top: 20px; + overflow: auto; - .pagination-link { - margin: 0 7px; - display: inline-block; - background-color: var(--color-grey); + .pages { + text-align: center; + white-space: nowrap; + margin: 0; - a { - color: var(--color-lightwhite); - padding: 7px 13px; - display: inline-block; + .page-link { + margin-top: 7px; + display: inline-block; + background-color: var(--color-grey); + + + .page-link { + margin-left: 7px; + } + + a { + color: var(--color-lightwhite); + padding: 7px 13px; + display: inline-block; + } + + &:not(.current):hover { + background-color: var(--color-lighter); + + a { + color: var(--color-lightwhite); + } + } + + &.current { + pointer-events: none; + background-color: var(--color-light); + + a { + text-decoration: underline; + pointer-events: none; + } + } + } } - - &:not(.current):hover { - background-color: var(--color-lighter); - - a { - color: var(--color-lightwhite); - } - } - - &.current { - pointer-events: none; - background-color: var(--color-light); - - a { - text-decoration: underline; - pointer-events: none; - } - } - - &:last-child { - margin-right: 0; - } - } } diff --git a/templates/versionHistory.hamlet b/templates/versionHistory.hamlet index 859356ca5..bee7bee3e 100644 --- a/templates/versionHistory.hamlet +++ b/templates/versionHistory.hamlet @@ -10,11 +10,11 @@ Bekannte Bugs <ul> <li> - Umlaute in Benutzernamen werden durch externes LDAP-Plugin entfernt + Login ist u.U. anders als im alten System, z.B. <span style="font-family:monospace">@campus.lmu.de</span> statt <span style="font-family:monospace">@lmu.de</span> <li> - Auswahlbox "alle markieren" fehlt noch + Favicon ist default des Frameworks <li> - Tabellen über mehrere Seiten müssen vor Seitenwechsel manuell sortiert werden + Format von Bewertungsdateien ist provisorisch <section> <h2> @@ -26,7 +26,7 @@ <h2> Impressum - <ul> + <ul style="list-style-type: none"> <li> Dr Steffen Jost <li> diff --git a/templates/widgets/asidenav.hamlet b/templates/widgets/asidenav.hamlet index f75a8f162..ac8a1de6b 100644 --- a/templates/widgets/asidenav.hamlet +++ b/templates/widgets/asidenav.hamlet @@ -1,24 +1,25 @@ $newline never <aside .main__aside> + <div .asidenav__logo> + <a href="/" .asidenav__logo-link> + <span .asidenav__logo-link-item.asidenav__logo-lmu>LMU + <span .asidenav__logo-link-item.asidenav__logo-uni2work>UNI2WORK + <div .asidenav> - $forall tid@TermIdentifier{..} <- favouriteTerms + $forall tid <- favouriteTerms <div .asidenav__box.js-show-hide> - <h3 .asidenav__box-title.js-show-hide__toggle data-sh-index="#{display season}-#{year}"> - $case season - $of Winter - _{MsgWinterTermShort year} - $of Summer - _{MsgSummerTermShort year} + <h3 .asidenav__box-title.js-show-hide__toggle data-sh-index="#{termToText tid}"> + _{ShortTermIdentifier tid} <ul .asidenav__list.js-show-hide__target.list--iconless> - $forall (Course{..}, courseRoute, pageActions) <- favouriteTerm tid + $forall (Course{courseShorthand, courseName}, courseRoute, pageActions) <- favouriteTerm tid <li .asidenav__list-item :highlight courseRoute:.asidenav__list-item--active> <a .asidenav__link-wrapper href=@{courseRoute}> <div .asidenav__link-shorthand>#{courseShorthand} <div .asidenav__link-label>#{courseName} <ul .asidenav__nested-list.list--iconless> - $forall action <- pageActions - $case action - $of PageActionPrime (MenuItem{..}) + $forall (MenuItem{menuItemType, menuItemLabel}, route) <- pageActions + $case menuItemType + $of PageActionPrime <li .asidenav__nested-list-item> - <a .asidenav__link-wrapper href=@{menuItemRoute}>#{menuItemLabel} + <a .asidenav__link-wrapper href=#{route}>_{menuItemLabel} $of _ diff --git a/templates/widgets/asidenav.julius b/templates/widgets/asidenav.julius index b43b2f97c..238ca1f58 100644 --- a/templates/widgets/asidenav.julius +++ b/templates/widgets/asidenav.julius @@ -18,9 +18,6 @@ })(); document.addEventListener('DOMContentLoaded', function() { - var asidenavEl = document.querySelector('.main__aside'); - window.utils.aside(asidenavEl); - }); diff --git a/templates/widgets/asidenav.lucius b/templates/widgets/asidenav.lucius index 37db31849..4086d946e 100644 --- a/templates/widgets/asidenav.lucius +++ b/templates/widgets/asidenav.lucius @@ -1,35 +1,36 @@ .main__aside { - position: absolute; - display: none; - background-color: var(--color-dark); + position: fixed; box-shadow: 0 0 10px rgba(0, 0, 0, 0.3); z-index: 1; top: 0; left: 0; - flex: 0 0 300px; + flex: 0 0 0; + flex-basis: var(--asidenav-width-lg, 20%); min-height: calc(100% - var(--header-height)); transition: all .2s ease-out; - width: 24%; + width: var(--asidenav-width-lg, 20%); height: 100%; -} -.logged-in { - .main__aside { - display: block; + &::before { + position: absolute; + z-index: -1; + left: 0; + top: 0; + width: 100%; + height: 100%; + background-color: var(--color-dark); + opacity: 0.05; } -} -/* maximum width of 300px for wide screens */ -@media (min-width: 1200px) { - .main__aside { - width: 300px; - } -} - -@media (max-width: 768px) { - - .main__aside { - min-height: calc(100% - var(--header-height-collapsed)); + &::after { + content: ''; + position: absolute; + z-index: -2; + left: 0; + top: 0; + width: 100%; + height: 100%; + background-color: var(--color-grey-light); } } @@ -44,14 +45,12 @@ height: 100% !important; width: 100%; z-index: 5; - box-shadow: 0 0 13px var(--color-dark); - white-space: nowrap; overflow: hidden; - transform: translateX(0); + transform: translateX(-110%); transition: transform .2s ease-out; - &:not(.main__aside--expanded) { - transform: translateX(-110%); + &.main__aside--expanded { + transform: translateX(0%); } .asidenav__box-title { @@ -65,8 +64,14 @@ } } +@media (min-width: 1200px) { + .main__aside { + width: var(--asidenav-width-xl, 250px) + } +} + .asidenav { - color: white; + color: var(--color-font); } .asidenav__box { @@ -84,7 +89,7 @@ transition: all .2s ease; padding: 30px 13px 10px; margin: 0; - border-bottom: 1px solid var(--color-lightwhite); + border-bottom: 1px solid var(--color-grey); &.js-show-hide__toggle { @@ -92,24 +97,105 @@ left: auto; right: 20px; top: 30px; - color: white; + color: var(--color-font); } } } +/* LOGO */ + +.asidenav__logo { + height: var(--header-height); + display: flex; + align-items: center; +} + +@media (max-width: 768px) { + + .asidenav__logo { + display: none; + } +} + +.asidenav__logo-link { + flex: 1; + top: 10px; + left: 20px; + height: 80px; + padding: 0 20px; + display: flex; + flex-basis: var(--asidenav-width-xl, 250px); + font-size: 16px; + align-items: center; + color: var(--color-dark); + transform-origin: left; + + &:hover { + color: var(--color-dark); + + .asidenav__logo-link-item { + background-color: var(--color-grey-light); + } + } +} + +.asidenav__logo-link-item { + font-weight: bold; + display: flex; + align-items: flex-end; + height: calc(100% - 4px); + padding: 0 6px 4px; + border: 1px solid var(--color-dark); + letter-spacing: 2px; + background-color: var(--color-lightwhite); + transition: background-color .3s ease; +} + +.asidenav__logo-lmu { + font-family: var(--font-logo); + font-size: 30px; +} + +.asidenav__logo-uni2work { + min-width: 70px; + margin-left: 12px; + font-weight: normal; + text-transform: uppercase; + width: 100%; +} + +@media (max-width: 1199px) { + + .asidenav__logo-link { + flex-basis: var(--asidenav-width-lg, 20%); + font-size: 16px; + } + + .asidenav__logo-lmu { + display: none; + } + + .asidenav__logo-uni2work { + margin-left: 0; + } +} + +/* LIST-ITEM */ + .asidenav__list-item { position: relative; - color: var(--color-lightwhite); + color: var(--color-font); min-height: 50px; display: flex; + flex-direction: column; justify-content: flex-start; align-items: center; &:not(.asidenav__list-item--active):hover { - background-color: var(--color-darker); + background-color: var(--color-lightwhite); > .asidenav__link-wrapper { - color: var(--color-lightwhite); + color: var(--color-font); } } @@ -130,7 +216,7 @@ } /* small list-item-padding for medium to large screens */ -@media (min-width: 1024px) { +@media (min-width: 1025px) { .asidenav__list-item { padding-left: 10px; @@ -154,10 +240,11 @@ .asidenav__link-wrapper { position: relative; display: flex; + flex: 1; align-items: center; padding: 7px 10px; justify-content: flex-start; - color: var(--color-lightwhite); + color: var(--color-font); width: 100%; z-index: 1; } @@ -210,28 +297,30 @@ } /* TABLET */ -@media (min-width: 425px) and (max-width: 768px) { +@media (min-width: 426px) and (max-width: 768px) { .main__aside { - width: 50px; - flex-basis: 50px; + width: var(--asidenav-width-md, 50px); + flex-basis: var(--asidenav-width-md, 50px); overflow: hidden; min-height: calc(100% - var(--header-height-collapsed)); + top: var(--header-height-collapsed); .asidenav__box-title { - width: 50px; + width: var(--asidenav-width-md, 50px); font-size: 18px; text-align: center; padding: 10px 1px; word-break: break-all; - background-color: var(--color-darker); + background-color: var(--color-dark); + color: var(--color-lightwhite); } .asidenav__link-shorthand { display: flex; position: static; height: 50px; - width: 50px; + width: var(--asidenav-width-md, 50px); text-align: center; opacity: 1; font-size: 15px; @@ -254,7 +343,7 @@ } .asidenav__link-wrapper { - color: var(--color-lightwhite); + color: var(--color-font); padding: 0; } @@ -267,7 +356,6 @@ .asidenav__link-wrapper { background-color: var(--color-lightwhite); - color: var(--color-dark); } } diff --git a/templates/widgets/breadcrumbs.lucius b/templates/widgets/breadcrumbs.lucius index f817215e1..ca5dfd56c 100644 --- a/templates/widgets/breadcrumbs.lucius +++ b/templates/widgets/breadcrumbs.lucius @@ -1,20 +1,20 @@ .breadcrumbs__container { position: relative; color: var(--color-lightwhite); - margin-top: -11px; - margin-right: -20px; - margin-bottom: 20px; - margin-left: -42px; padding: 4px 13px; - padding-left: 42px; background-color: var(--color-dark); line-height: 30px; } -@media (min-width: 768px) { - +@media (min-width: 426px) { .breadcrumbs__container { - margin-top: -22px; + padding: 7px 20px; + } +} + +@media (min-width: 769px) { + .breadcrumbs__container { + padding: 7px 40px; } } diff --git a/templates/widgets/campus-login-form.hamlet b/templates/widgets/campus-login-form.hamlet index 634991289..fee3691a2 100644 --- a/templates/widgets/campus-login-form.hamlet +++ b/templates/widgets/campus-login-form.hamlet @@ -1,2 +1,2 @@ -<form method=POST action=@{toMaster $ PluginR "LDAP" []} enctype=#{loginEnctype}> +<form method=POST action=@{toMaster $ PluginR "LDAP" []} enctype=#{loginEnctype} #login--campus> ^{login} diff --git a/templates/widgets/data-delete.hamlet b/templates/widgets/data-delete.hamlet new file mode 100644 index 000000000..310e45b28 --- /dev/null +++ b/templates/widgets/data-delete.hamlet @@ -0,0 +1,27 @@ +<form .form-inline method=post action=@{ProfileDataR} enctype=#{btnEnctype}> + <h2> + Sind Sie sich absolut sicher, alle Ihre in Uni2work gespeicherten Daten zu löschen? + <div .container> + Während der Testphase von Uni2work können Sie hiermit + Ihren Account bei Uni2work vollständig löschen. + Mit Ihrem Campus-Account können Sie sich aber danach + jederzeit erneut einloggen, wodurch wieder ein leerer Account erstellt wird. + <div .container> + Hochgeladene Hausaufgaben-Dateien werden unabhhängig vom Urherber nur dann gelöscht, + wenn die Dateien ausschließlich Ihnen zugeordnet sind. + Dateien aus Gruppenabgaben werden also erst dann gelöscht, + wenn alle Gruppenmitglieder Ihren Account gelöscht haben. + <div .container> + <em>Achtung: + Auch abgegebene Hausübungen werden gelöscht! + Falls ein Veranstalter Informationen darüber nicht anderweitig gespeichert hat, + kann dadurch ein etwaiger Hausaufgabenbonus verloren gehen. + (Verbuchte Noten sollten dadurch nicht betroffen sein, aber in einem etwaigen + Streitfall konnen die per Uni2work verwalteten Hausaufgaben dann + auch nicht mehr rekonstruiert/berücksichtigt werden.) + <div .container> + <em>Nach der Testphase von Uni2work wird das Löschen eines Accounts etwas + eingeschränkt werden, da z.B. Klausurnoten 5 Jahre bis nach Exmatrikulation + aufbewahrt werden müssen. + <div .container> + ^{btnWdgt} diff --git a/templates/widgets/delete-confirmation.hamlet b/templates/widgets/delete-confirmation.hamlet new file mode 100644 index 000000000..2cff6fb4a --- /dev/null +++ b/templates/widgets/delete-confirmation.hamlet @@ -0,0 +1,13 @@ +<p>_{drCaption} +<ul> + $forall (wdgt, _) <- targets + <li> + ^{wdgt} + +<p>_{SomeMessage $ MsgDeleteCopyStringIfSure (Set.size drRecords)} + +<p .confirmationText> + #{confirmString} + +<form method=POST action=@{targetRoute} enctype=#{deleteFormEnctype}> + ^{deleteFormWdgt} diff --git a/templates/widgets/delete-confirmation.lucius b/templates/widgets/delete-confirmation.lucius new file mode 100644 index 000000000..daf5e5d29 --- /dev/null +++ b/templates/widgets/delete-confirmation.lucius @@ -0,0 +1,5 @@ +.confirmationText { + white-space: pre-wrap; + font-size: 14px; + font-family: monospace; +} diff --git a/templates/widgets/dummy-login-form.hamlet b/templates/widgets/dummy-login-form.hamlet index f44f82d91..c1c11574d 100644 --- a/templates/widgets/dummy-login-form.hamlet +++ b/templates/widgets/dummy-login-form.hamlet @@ -1,2 +1,2 @@ -<form method=POST action=@{toMaster $ PluginR "dummy" []} enctype=#{loginEnctype}> +<form method=POST action=@{toMaster $ PluginR "dummy" []} enctype=#{loginEnctype} #login--dummy> ^{login} diff --git a/templates/widgets/footer.hamlet b/templates/widgets/footer.hamlet new file mode 100644 index 000000000..e133ec47b --- /dev/null +++ b/templates/widgets/footer.hamlet @@ -0,0 +1,12 @@ +<footer .footer> + <div .footer-links> + $forall (MenuItem{menuItemType, menuItemRoute = _, menuItemIcon = _, menuItemLabel, menuItemModal = _}, menuIdent, route) <- menuTypes + $case menuItemType + $of Footer + $# Not used but available (remove ` = _` from the pattern match above, as needed): + $# highlight (urlRoute menuItemRoute) :: Bool -- ^ Is this menu item currently active (i.e.: are we on this page) + $# menuItemModal :: Bool -- ^ Should this menu item open a modal instead of being a normal link + $# menuItemIcon :: Maybe Text -- ^ Should this menu item have an icon, if yes, then the name of the icon + <a href=#{route} ##{menuIdent}> + _{SomeMessage menuItemLabel} + $of _ diff --git a/templates/widgets/footer.lucius b/templates/widgets/footer.lucius new file mode 100644 index 000000000..b00b13588 --- /dev/null +++ b/templates/widgets/footer.lucius @@ -0,0 +1,16 @@ +.footer { + text-align: center; + padding: 20px; + position: relative; + margin: 40px 0; + + &::before { + content: ''; + position: absolute; + top: 0; + left: 10%; + width: 80%; + height: 2px; + background-color: var(--color-grey-light); + } +} diff --git a/templates/widgets/form.hamlet b/templates/widgets/form.hamlet index 2c0cfc9b8..06578df77 100644 --- a/templates/widgets/form.hamlet +++ b/templates/widgets/form.hamlet @@ -1,15 +1,20 @@ $newline never #{fragment} $case formLayout - $of FormStandard - $forall view <- views + $of FormDBTablePagesize + $forall view <- fieldViews + <label .form-group__label.label-pagesize for=#{fvId view}>#{fvLabel view} + ^{fvInput view} + $of _ + $forall view <- fieldViews $# TODO: add class 'form-group--submit' if this is the submit-button view <div .form-group :fvRequired view:.form-group--required :not $ fvRequired view:.form-group--optional :isJust $ fvErrors view:.form-group--has-error> $if not (Blaze.null $ fvLabel view) - <label .form-group__label for=#{fvId view}>#{fvLabel view} + <label .form-group__label for=#{fvId view}> + #{fvLabel view} + $maybe tooltip <- fvTooltip view + <div .js-tooltip> + <div .tooltip__handle> + <div .tooltip__content>^{tooltip} <div .form-group__input> ^{fvInput view} - $maybe tooltip <- fvTooltip view - <div .js-tooltip> - <div .tooltip__handle> - <div .tooltip__content>^{tooltip} diff --git a/templates/widgets/form.julius b/templates/widgets/form.julius index b36ea327b..e318ca3f3 100644 --- a/templates/widgets/form.julius +++ b/templates/widgets/form.julius @@ -36,7 +36,6 @@ }; window.utils.interactiveFieldset = function(form, fieldSets) { - var fields = fieldSets.map(function(fs) { return { fieldSet: fs, @@ -67,12 +66,14 @@ }; })(); -document.addEventListener('DOMContentLoaded', function() { +document.addEventListener('setup', function(e) { + if (e.detail.module && e.detail.module !== 'showHide') + return; - var forms = document.querySelectorAll('form'); + var forms = e.detail.scope.querySelectorAll('form'); Array.from(forms).forEach(function(form) { // auto reactiveButton submit-buttons with required fields - var submitBtns = Array.from(form.querySelectorAll('[type=submit]')); + var submitBtns = Array.from(form.querySelectorAll('[type=submit]:not([formnovalidate])')); submitBtns.forEach(function(submitBtn) { window.utils.reactiveButton(form, submitBtn, validateForm); }); @@ -92,5 +93,29 @@ document.addEventListener('DOMContentLoaded', function() { }); return done; } - +}); + +document.addEventListener('DOMContentLoaded', function() { + document.dispatchEvent(new CustomEvent('setup', { detail: { scope: document.body, module: 'showHide' }, bubbles: true, cancelable: true })) +}); + + +document.addEventListener('setup', function(e) { + if (e.detail.module && e.detail.module !== 'autoSubmit') + return; + + Array.from(e.detail.scope.querySelectorAll('[data-autosubmit]:not(.js-initialized)')).forEach(function(elem) { + if ((elem instanceof HTMLInputElement && elem.type == 'submit') || (elem instanceof HTMLButtonElement && elem.type == 'submit')) { + var ancestor = elem.closest('.form-group'); + var target = ancestor || elem; + + target.classList.add('hidden'); + } + + elem.classList.add('js-initialized'); + }); +}); + +document.addEventListener('DOMContentLoaded', function() { + document.dispatchEvent(new CustomEvent('setup', { detail: { scope: document.body, module: 'autoSubmit' }, bubbles: true, cancelable: true })) }); diff --git a/templates/widgets/form.lucius b/templates/widgets/form.lucius index 094758416..9f330f75c 100644 --- a/templates/widgets/form.lucius +++ b/templates/widgets/form.lucius @@ -1,10 +1,3 @@ -.hidden { - visibility: hidden; - height: 0; - opacity: 0; -} - - fieldset { border: 0; margin: 20px 0 30px; @@ -13,3 +6,37 @@ fieldset { display: none; } } + +.form-group__input > fieldset { + margin-bottom: 0; +} + +[data-autosubmit][type="submit"] { + animation: fade-in 500ms ease-in-out backwards; + animation-delay: 500ms; +} + +@keyframes fade-in { + from { + opacity: 0; + } +} + +.hidden { + visibility: hidden !important; + height: 0 !important; + width: 0 !important; + opacity: 0 !important; + margin: 0 !important; + padding: 0 !important; + min-width: 0 !important; +} + +.select--pagesize { + width: 5em; + min-width: 75px; +} + +.label-pagesize { + margin-right: 13px; +} diff --git a/templates/widgets/gradingSummary.hamlet b/templates/widgets/gradingSummary.hamlet new file mode 100644 index 000000000..248c4b085 --- /dev/null +++ b/templates/widgets/gradingSummary.hamlet @@ -0,0 +1,46 @@ +$# Displays gradings Summary for various purposes +$# Expects several variables: +$# sumSummaries :: SheetGradeSummary -- summary over all grading types +$# hasPasses :: Maybe Int -- Should Passing be displayed? +$# hasMarkedPasses :: Maybe Int -- Number of marked pass-sheets +$# hasPoints :: Maybe Points -- Should Points be displayed? +$# hasMarkedPoints :: Maybe Int -- Number of marked point-sheets +$# rowWdgts :: Liste von Widgets für jede Zeile (Normal,Bonus,KeineWertung) +$# -- +<div> + <h3>_{MsgSummaryTitle} _{title $ getSum $ numSheets $ sumSummaries} + <div .scrolltable> + <table .table .table--striped> + <tr .table__row .table__row--head> + <th> + $# empty cell for row headers + $maybe _ <- hasMarkedPasses + <th .table__th colspan=2>_{MsgCorrected} + $maybe _ <- hasPasses + <th .table__th>_{MsgSheetGradingPassing'} + $maybe _ <- hasMarkedPoints + <th .table__th colspan=2>_{MsgCorrected} + $maybe _ <- hasPoints + <th .table__th>_{MsgSheetGradingPoints'} + <th .table__th>_{MsgSheetGradingCount'} + $# Number of Sheet/Submissions used for calculating maximum passes/points + $forall row <- rowWdgts + ^{row} + $maybe nrNoGrade <- positiveSum $ numNotGraded + <tr .table__row> + <th .table__th>_{MsgSheetTypeNotGraded} + $maybe _ <- hasMarkedPasses + <td colspan=2> + $maybe _ <- hasPasses + <td .table__td> + $maybe _ <- hasMarkedPoints + <td .table__td colspan=2> + $maybe _ <- hasPoints + <td .table__td> + <td .table__td>#{nrNoGrade} + $maybe _ <- positiveSum $ bonusSummary ^. _numSheets + <p>_{MsgSheetTypeInfoBonus} # + $maybe _ <- positiveSum $ bonusSummary ^. _achievedPoints + _{MsgSheetGradingBonusIncluded} + $maybe _ <- positiveSum $ informationalSummary ^. _numSheets + <p>_{MsgSheetTypeInfoNotGraded} diff --git a/templates/widgets/gradingSummaryRow.hamlet b/templates/widgets/gradingSummaryRow.hamlet new file mode 100644 index 000000000..16ef69f15 --- /dev/null +++ b/templates/widgets/gradingSummaryRow.hamlet @@ -0,0 +1,54 @@ +$# Displays one row of the grading summary +$# Expects several variables: +$# summary :: SheetGradeSummary -- summary to display +$# sumHeader :: UniWorXMessage -- row header +$# hasPasses :: Maybe Int -- Should Passing be displayed? +$# hasMarkedPasses :: Maybe Int -- Number of marked pass-sheets +$# hasPoints :: Maybe Points -- Should Points be displayed? +$# hasMarkedPoints :: Maybe Int -- Number of marked point-sheets +$# +$# TODO: Durschnittliche Punktzahl anzeigen +$# TODO: Extra-Spalte für Punkte Bewertet = numMarkedPoints / Punkte Gesamt = sumSheetPoints +$# + $maybe _ <- positiveSum $ summary ^. _numSheets + <tr .table__row> + <th .table__th>_{sumHeader} + $maybe _ <- hasMarkedPasses + $with Sum pmax <- summary ^. _numMarkedPasses + $if pmax > 0 + $with Sum pacv <- summary ^. _achievedPasses + <td .table__td> + $if pmax > 0 + #{textPercentInt pacv pmax} + <td .table__td> + #{display pacv} / #{display pmax} + $else + <td .table__td> + <td .table__td> + $maybe _ <- hasPasses + $with Sum numPass <- summary ^. _numSheetsPasses + <td .table__td> + $if numPass > 0 + #{display numPass} + $maybe _ <- hasMarkedPoints + $with Sum pmax <- summary ^. _sumMarkedPoints + $with Sum pacv <- summary ^. _achievedPoints + <td .table__td> + $if pmax > 0 + #{textPercent $ realToFrac $ pacv / pmax} + <td .table__td> + #{display pacv} / #{display pmax} + $if ((summary ^. _numMarkedPoints) /= (summary ^. _numSheets)) + $# Falls Anzahl Blätter der Zeile verschieden von Anzahl gewerterer Blätter + \ (_{title $ getSum $ summary ^. _numMarkedPoints}) + $# Kurze Alternative mit Hashtag-Symbol für "Anzahl" + $# \ (##{display $ summary ^. _numMarkedPoints}) + $maybe _ <- hasPoints + <td .table__td> + #{display (summary ^. _sumSheetsPoints)} + $if ((summary ^. _numSheetsPoints) /= (summary ^. _numSheets)) + $# Falls Anzahl Blätter der Zeile verschieden von Anzahl Blätter mit Punkten + \ (_{title $ getSum $ summary ^. _numSheetsPoints}) + $# Kurze Alternative mit Hashtag-Symbol für "Anzahl" + $# \ (##{display $ summary ^. _numSheetsPoints}) + <td .table__td>#{display $ summary ^. _numSheets} \ No newline at end of file diff --git a/templates/widgets/hash-login-form.hamlet b/templates/widgets/hash-login-form.hamlet index 203a02f2e..d097216bd 100644 --- a/templates/widgets/hash-login-form.hamlet +++ b/templates/widgets/hash-login-form.hamlet @@ -1,2 +1,2 @@ -<form method=POST action=@{toMaster $ PluginR "PWHash" []} enctype=#{loginEnctype}> +<form method=POST action=@{toMaster $ PluginR "PWHash" []} enctype=#{loginEnctype} #login--hash> ^{login} diff --git a/templates/widgets/modal.hamlet b/templates/widgets/modal.hamlet index a971aab83..767fde13b 100644 --- a/templates/widgets/modal.hamlet +++ b/templates/widgets/modal.hamlet @@ -1,5 +1,6 @@ -<div .modal.js-modal #modal-#{modalId} data-trigger=#{triggerId} data-closeable=true data-dynamic=#{modalDynamic}> +<div .modal.js-modal #modal-#{modalId} data-trigger=#{triggerId} data-closeable :modalDynamic:data-dynamic> $case modalContent $of Right content - ^{content} + <div .modal__content> + ^{content} $of Left _ diff --git a/templates/widgets/navbar.hamlet b/templates/widgets/navbar.hamlet index 7cac27a12..86f1a3246 100644 --- a/templates/widgets/navbar.hamlet +++ b/templates/widgets/navbar.hamlet @@ -3,8 +3,6 @@ $newline never <div .navbar-shadow> <nav .navbar.js-sticky-navbar> - <a href="/" .navbar__logo> - <ul .navbar__list.list--inline.navbar__list-left> $# manually add favorites to navbar for small screens <li .navbar__list-item.navbar__list-item--favorite> @@ -12,28 +10,32 @@ $newline never <i .fas.fa-star> <div .navbar__link-label> Favorites - $forall menuType <- menuTypes - $case menuType - $of NavbarAside (MenuItem label mIcon route _) - <li .navbar__list-item :highlight route:.navbar__list-item--active> - <a .navbar__link-wrapper href=@{route}> - <i .fas.fa-#{fromMaybe "none" mIcon}> - <div .navbar__link-label>#{label} + $forall (MenuItem{menuItemType, menuItemRoute, menuItemIcon, menuItemLabel, menuItemModal}, menuIdent, route) <- menuTypes + $case menuItemType + $of NavbarAside + <li .navbar__list-item :highlight (urlRoute menuItemRoute):.navbar__list-item--active> + $if menuItemModal + <div .modal.js-modal #modal-#{menuIdent} data-trigger=#{menuIdent} data-closeable data-dynamic> + <a .navbar__link-wrapper href=#{route} ##{menuIdent}> + <i .fas.fa-#{fromMaybe "none" menuItemIcon}> + <div .navbar__link-label>_{SomeMessage menuItemLabel} $of _ <ul .navbar__list.list--inline> - $forall menuType <- menuTypes - $case menuType - $of NavbarRight (MenuItem label mIcon route _) - <li .navbar__list-item :Just route == mcurrentRoute:.navbar__list-item--active> - <a .navbar__link-wrapper href=@{route}> - <i .fas.fa-#{fromMaybe "none" mIcon}> - <div .navbar__link-label>#{label} - $of NavbarSecondary (MenuItem label mIcon route _) - <li .navbar__list-item.navbar__list-item--secondary :Just route == mcurrentRoute:.navbar__list-item--active> - <a .navbar__link-wrapper href=@{route}> - <i .fas.fa-#{fromMaybe "none" mIcon}> - <div .navbar__link-label>#{label} + $forall (MenuItem{menuItemType, menuItemRoute, menuItemIcon, menuItemLabel, menuItemModal}, menuIdent, route) <- menuTypes + $case menuItemType + $of NavbarRight + <li .navbar__list-item :highlight (urlRoute menuItemRoute):.navbar__list-item--active> + $if menuItemModal + <div .modal.js-modal #modal-#{menuIdent} data-trigger=#{menuIdent} data-closeable data-dynamic> + <a .navbar__link-wrapper href=#{route} ##{menuIdent}> + <i .fas.fa-#{fromMaybe "none" menuItemIcon}> + <div .navbar__link-label>_{SomeMessage menuItemLabel} + $of NavbarSecondary + <li .navbar__list-item.navbar__list-item--secondary :highlight (urlRoute menuItemRoute):.navbar__list-item--active> + $if menuItemModal + <div .modal.js-modal #modal-#{menuIdent} data-trigger=#{menuIdent} data-closeable data-dynamic> + <a .navbar__link-wrapper href=#{route} ##{menuIdent}> + <i .fas.fa-#{fromMaybe "none" menuItemIcon}> + <div .navbar__link-label>_{SomeMessage menuItemLabel} $of _ - - <div .navbar__pushdown> diff --git a/templates/widgets/navbar.julius b/templates/widgets/navbar.julius index 31ad506b6..13dbe009a 100644 --- a/templates/widgets/navbar.julius +++ b/templates/widgets/navbar.julius @@ -26,6 +26,6 @@ })(); -document.addEventListener('DOMContentLoaded', function () { - // utils.stickynav(document.querySelector('.js-sticky-navbar')); +document.addEventListener('setup', function (e) { + // utils.stickynav(e.detail.scope.querySelector('.js-sticky-navbar')); }); diff --git a/templates/widgets/navbar.lucius b/templates/widgets/navbar.lucius index 81200d4e8..89c339c61 100644 --- a/templates/widgets/navbar.lucius +++ b/templates/widgets/navbar.lucius @@ -3,8 +3,9 @@ } .navbar-shadow { - position: absolute; + position: fixed; right: 0; + top: 0; height: var(--header-height-collapsed); width: 20px; z-index: 50; @@ -18,7 +19,7 @@ } } -@media (min-width: 1024px) { +@media (min-width: 1025px) { .navbar-shadow { display: none; @@ -31,109 +32,30 @@ flex-direction: row; align-items: center; justify-content: flex-start; - width: 100%; + right: 0; top: 0; - left: 0; + left: var(--asidenav-width-xl); height: var(--header-height); background: var(--color-darker); /* Old browsers */ background: -moz-linear-gradient(bottom, var(--color-dark) 0%, var(--color-darker) 100%); /* FF3.6-15 */ background: -webkit-linear-gradient(bottom, var(--color-dark) 0%,var(--color-darker) 100%); /* Chrome10-25,Safari5.1-6 */ background: linear-gradient(to top, var(--color-dark) 0%,var(--color-darker) 100%); /* W3C, IE10+, FF16+, Chrome26+, Opera12+, Safari7+ */ color: white; - margin-right: 40px; z-index: 20; box-shadow: 0 0 4px rgba(0, 0, 0, 0.2); overflow: auto; transition: all .2s cubic-bezier(0.03, 0.43, 0.58, 1); } -@media (max-width: 768px) { - - .navbar { - padding: 0px; - margin-right: 0; - } -} - -.navbar__logo { - top: 10px; - left: 20px; - height: 80px; - padding: 0 20px; - display: flex; - flex-basis: 300px; - font-size: 16px; - align-items: center; - color: var(--color-lightwhite); - transform-origin: left; - transition: all .2s ease-out; - - &:hover { - color: var(--color-lightwhite); - } - - &::before { - content: 'LMU'; - font-family: var(--font-logo); - font-weight: bold; - letter-spacing: 2px; - display: flex; - align-items: flex-end; - font-size: 30px; - min-width: 70px; - height: calc(100% - 4px); - padding: 0 6px 4px; - } - - &::after { - content: 'Uni2work'; - margin-left: 12px; - font-weight: normal; - letter-spacing: 2px; - display: flex; - align-items: flex-end; - text-transform: uppercase; - width: 100%; - height: calc(100% - 4px); - padding: 0 6px 4px; - } -} - -@media (min-width: 769px) { - - .navbar__logo::before, - .navbar__logo::after { - border: 1px solid var(--color-lmu-box-border); - } -} - @media (max-width: 1199px) { - - .navbar__logo { - flex-basis: 24%; - font-size: 16px; - } -} - -@media (max-width: 1024px) { - - .navbar__logo { - font-size: 14px; - - &::before { - content: none; - } - - &::after { - margin-left: 0; - } + .navbar { + left: var(--asidenav-width-lg); } } @media (max-width: 768px) { - - .navbar__logo { - display: none; + .navbar { + left: 0; } } @@ -180,13 +102,6 @@ } } -@media (max-width: 500px) { - - .navbar__link-label { - font-size: 12px; - } -} - /* navbar list */ .navbar__list { white-space: nowrap; @@ -194,24 +109,21 @@ + .navbar__list { margin-left: 12px; } +} - &:last-of-type { +@media (min-width: 769px) { + + .navbar__list:last-of-type { padding-right: 40px; } } -@media (min-width: 768px) { - - .navbar__list:last-of-type { - margin-right: 20px; - } -} - -@media (max-width: 425px) { +@media (max-width: 768px) { .navbar__list { + .navbar__list { margin-left: 0; + padding-right: 80px; } } } @@ -355,10 +267,6 @@ .navbar__link-wrapper { height: var(--header-height-collapsed); } - - .navbar__logo { - top: 5px; - } } .navbar__pushdown { @@ -393,9 +301,4 @@ .navbar__link-wrapper { height: var(--header-height-collapsed); } - - .navbar__logo { - top: 5px; - height: var(--header-height-collapsed); - } } diff --git a/templates/widgets/pageaction.hamlet b/templates/widgets/pageaction.hamlet new file mode 100644 index 000000000..b7dcfc86e --- /dev/null +++ b/templates/widgets/pageaction.hamlet @@ -0,0 +1,23 @@ +$newline never +<div .pagenav> + $if hasPrimaryPageActions + <div .pagenav-prime> + $forall (MenuItem{menuItemLabel, menuItemType, menuItemModal}, menuIdent, route) <- menuTypes + $case menuItemType + $of PageActionPrime + <div .pagenav__list-item> + $if menuItemModal + <div .modal.js-modal #modal-#{menuIdent} data-trigger=#{menuIdent} data-closeable data-dynamic> + <a .pagenav__link-wrapper href=#{route} ##{menuIdent}>_{SomeMessage menuItemLabel} + $of _ + $if hasSecondaryPageActions + <div .pagenav-secondary> + <div .pagenav-secondary__list> + $forall (MenuItem{menuItemLabel, menuItemType, menuItemModal}, menuIdent, route) <- menuTypes + $case menuItemType + $of PageActionSecondary + <div .pagenav__list-item.pagenav__list-item--secondary> + $if menuItemModal + <div .modal.js-modal #modal-#{menuIdent} data-trigger=#{menuIdent} data-closeable data-dynamic> + <a .pagenav__link-wrapper.pagenav__link-wrapper--secondary href=#{route} ##{menuIdent}>_{SomeMessage menuItemLabel} + $of _ diff --git a/templates/widgets/pageaction.julius b/templates/widgets/pageaction.julius new file mode 100644 index 000000000..e69de29bb diff --git a/templates/widgets/pageaction.lucius b/templates/widgets/pageaction.lucius new file mode 100644 index 000000000..29977228d --- /dev/null +++ b/templates/widgets/pageaction.lucius @@ -0,0 +1,73 @@ +.pagenav { + display: flex; + align-items: flex-start; +} + +.pagenav__list-item { + flex: 1; + position: relative; + display: inline-flex; + box-shadow: 0 0 2px 0 rgba(0, 0, 0, 0.6); + margin: 10px 10px 0 0; +} + +.pagenav__link-wrapper { + flex: 1; + padding: 10px 10px 12px; + text-decoration: none !important; + + &:hover { + background-color: var(--color-grey-light); + } +} + +@media (max-width: 1024px) { + + .pagenav { + flex-direction: column; + } +} + +@media (min-width: 1025px) { + .pagenav-secondary { + position: relative; + overflow: visible; + padding-top: 10px; + + &::after { + content: '\2026'; + display: inline-block; + padding: 10px 10px 12px; + width: 40px; + box-shadow: 0 0 2px 0 rgba(0, 0, 0, 0.6); + box-sizing: border-box; + text-align: center; + } + + &:hover { + .pagenav-secondary__list { + display: block; + } + } + } + + .pagenav-secondary__list { + position: absolute; + display: none; + left: 0; + top: 10px; + width: 250px; + background-color: white; + box-shadow: 0 0 6px 3px var(--color-grey-light); + } + + .pagenav__list-item--secondary { + display: flex; + box-shadow: none; + margin: 0; + + &:hover { + background-color: var(--color-grey-light); + } + } +} diff --git a/templates/widgets/pageactionprime.hamlet b/templates/widgets/pageactionprime.hamlet deleted file mode 100644 index cce7e13e3..000000000 --- a/templates/widgets/pageactionprime.hamlet +++ /dev/null @@ -1,13 +0,0 @@ -$newline never -$if hasPageActions - <div .page-nav-prime> - <ul .pagenav__list> - $forall menuType <- menuTypes - $case menuType - $of PageActionPrime (MenuItem label _mIcon route _callback) - <li .pagenav__list-item> - <a .pagenav__link-wrapper href=@{route}>#{label} - $of PageActionSecondary (MenuItem label _mIcon route _callback) - <li .pagenav__list-item> - <a .pagenav__link-wrapper href=@{route}>#{label} - $of _ diff --git a/templates/widgets/pageactionprime.lucius b/templates/widgets/pageactionprime.lucius deleted file mode 100644 index 5dba2f4c4..000000000 --- a/templates/widgets/pageactionprime.lucius +++ /dev/null @@ -1,19 +0,0 @@ -.page-nav-prime { - margin: 4px 0 13px; - border-left: 2px solid #c3c3c3; - padding-left: 10px; -} - -.pagenav__list { - display: block; - margin-left: 0; -} - -.pagenav__list-item { - display: inline-block; - - &:not(:last-child) { - margin-right: 7px; - padding-right: 7px; - } -} diff --git a/templates/widgets/permutation.hamlet b/templates/widgets/permutation.hamlet new file mode 100644 index 000000000..ac5ee008a --- /dev/null +++ b/templates/widgets/permutation.hamlet @@ -0,0 +1,7 @@ +$newline never +<ul ##{theId}> + $forall (n, selId) <- nums + <li> + <select ##{selId} name=#{name} :isReq:required *{attrs}> + $forall opt <- olOptions + <option value=#{withNum (optionExternalValue opt) n} :isSel n opt:selected>#{optionDisplay opt} diff --git a/templates/widgets/permutation.lucius b/templates/widgets/permutation.lucius new file mode 100644 index 000000000..0ae9d74e5 --- /dev/null +++ b/templates/widgets/permutation.lucius @@ -0,0 +1,3 @@ +##{theId} { + list-style-type: none; +} diff --git a/templates/widgets/rating.hamlet b/templates/widgets/rating.hamlet index 177119151..366769452 100644 --- a/templates/widgets/rating.hamlet +++ b/templates/widgets/rating.hamlet @@ -2,15 +2,20 @@ $# Display Rating, expects $# submissionRatingPoints :: Maybe points $maybe points <- submissionRatingPoints - $case sheetType - $of Bonus{..} - _{MsgAchievedOf points maxPoints} - $of Normal{..} - _{MsgAchievedOf points maxPoints} - $of Pass{..} - $if points >= passingPoints - _{MsgPassed} - $else - _{MsgNotPassed} - $of NotGraded - #{display tickmarkS} + $maybe grading <- preview _grading sheetType + $case grading + $of Points{..} + _{MsgAchievedOf points maxPoints} + $of PassPoints{maxPoints} + $if fromMaybe False (gradingPassed grading points) + _{MsgPassed}, _{MsgAchievedOf points maxPoints} + $else + _{MsgNotPassed}, _{MsgAchievedOf points maxPoints} + $of PassBinary + $if fromMaybe False (gradingPassed grading points) + _{MsgPassed} + $else + _{MsgNotPassed} + , _{SheetTypeHeader sheetType} + $nothing + #{tickmarkS} diff --git a/templates/widgets/registerForm.hamlet b/templates/widgets/registerForm.hamlet index d20fc0cc8..a2dd97af9 100644 --- a/templates/widgets/registerForm.hamlet +++ b/templates/widgets/registerForm.hamlet @@ -5,4 +5,3 @@ $maybe secretView <- msecretView ^{fvInput secretView} $# Always display register/deregister button ^{fvInput btnView} - diff --git a/templates/widgets/sheetTypeSummary.hamlet b/templates/widgets/sheetTypeSummary.hamlet deleted file mode 100644 index 581dc0791..000000000 --- a/templates/widgets/sheetTypeSummary.hamlet +++ /dev/null @@ -1,23 +0,0 @@ -<div> - $if 0 < getSum sumNormalPoints - Gesamtpunktzahl #{display (getSum sumNormalPoints)} - $maybe nPts <- (maybeAdd (getSum <$> achievedNormal) (getSum <$> achievedBonus)) - \ davon #{display nPts} erreicht - $maybe bPts <- getSum <$> achievedBonus - \ (inklusive #{display bPts} # - $if 0 < getSum sumBonusPoints - von #{display $ getSum sumBonusPoints} erreichbaren # - Bonuspunkten) - \ #{textPercent $ realToFrac $ nPts / (getSum sumNormalPoints)} - - -<div> - $if 0 < getSum numPassSheets - Blätter zum Bestehen: #{display (getSum numPassSheets)} - $maybe passed <- getSum <$> achievedPasses - \ davon #{display passed} bestanden. - -<div> - $if 0 < getSum numNotGraded - Unbewertet: #{display (getSum numNotGraded)} Blätter - diff --git a/test.sh b/test.sh new file mode 100755 index 000000000..09d4b3a53 --- /dev/null +++ b/test.sh @@ -0,0 +1,3 @@ +#!/usr/bin/env bash + +exec -- stack build --test --fast --flag uniworx:dev --flag uniworx:library-only ${@} diff --git a/test/CronSpec.hs b/test/CronSpec.hs new file mode 100644 index 000000000..79265811c --- /dev/null +++ b/test/CronSpec.hs @@ -0,0 +1,39 @@ +{-# LANGUAGE NoImplicitPrelude #-} + +module CronSpec where + +import TestImport + +import Cron + +import Data.Time +import Data.Time.Clock.System +import Data.Time.Zones + +import Data.List (iterate) + + +baseTime :: UTCTime +baseTime = UTCTime (addDays 58400 systemEpochDay) 50000 + + +sampleCron :: Natural -> Cron -> [UTCTime] +sampleCron n = go n baseTime Nothing + where + go 0 _ _ _ = [] + go (pred -> n') t mPrev cron = case nextCronMatch utcTZ mPrev 0 t cron of + MatchAsap -> t : go n' t (Just t) cron + MatchAt t' -> t' : go n' t' (Just t') cron + MatchNone -> [] + + +spec :: Spec +spec = do + describe "Cron" $ do + it "generates correct example series" . mapM_ seriesExample $ + [ (Cron CronAsap CronRepeatNever 0 (Right CronNotScheduled), [baseTime]) + , (Cron CronAsap (CronRepeatScheduled CronAsap) 10 (Right CronNotScheduled), iterate (addUTCTime 10) baseTime) + ] + +seriesExample :: (Cron, [UTCTime]) -> Expectation +seriesExample (cron, res) = example $ sampleCron 10 cron `shouldBe` take 10 res diff --git a/db.hs b/test/Database.hs similarity index 63% rename from db.hs rename to test/Database.hs index 3bb77bcf5..e13baca9b 100755 --- a/db.hs +++ b/test/Database.hs @@ -1,37 +1,44 @@ -#!/usr/bin/env stack --- stack runghc - -{-# LANGUAGE OverloadedStrings #-} -{-# LANGUAGE PackageImports #-} -{-# LANGUAGE NoImplicitPrelude #-} -{-# LANGUAGE LambdaCase #-} -{-# LANGUAGE RecordWildCards #-} +module Database + ( main + , fillDb + , truncateDb + ) where import "uniworx" Import hiding (Option(..)) import "uniworx" Application (db, getAppDevSettings) +import "uniworx" Jobs (stopJobCtl) + +import Data.Pool (destroyAllResources) import Database.Persist.Postgresql -import Database.Persist.Sql import Control.Monad.Logger +import Control.Monad.Trans.Resource import System.Console.GetOpt import System.Exit (exitWith, ExitCode(..)) import System.IO (hPutStrLn, stderr) +import System.FilePath ((</>)) + import qualified Data.ByteString as BS import Data.Time +import Utils.Lens (review) +import Control.Monad.Random.Class (MonadRandom(..)) + data DBAction = DBClear + | DBTruncate | DBMigrate | DBFill argsDescr :: [OptDescr DBAction] argsDescr = - [ Option ['c'] ["clear"] (NoArg DBClear) "Delete everything accessable by the current database user" - , Option ['m'] ["migrate"] (NoArg DBMigrate) "Perform database migration" - , Option ['f'] ["fill"] (NoArg DBFill) "Fill database with example data" + [ Option ['c'] ["clear"] (NoArg DBClear) "Delete everything accessable by the current database user" + , Option ['t'] ["truncate"] (NoArg DBTruncate) "Truncate all tables mentioned in the current schema (This cannot be run concurrently with any other activity accessing the database)" + , Option ['m'] ["migrate"] (NoArg DBMigrate) "Perform database migration" + , Option ['f'] ["fill"] (NoArg DBFill) "Fill database with example data" ] @@ -44,16 +51,32 @@ main = do settings <- liftIO getAppDevSettings withPostgresqlConn (pgConnStr $ appDatabaseConf settings) . runSqlConn $ do rawExecute "drop owned by current_user;" [] + DBTruncate -> db $ do + foundation <- getYesod + stopJobCtl foundation + release . fst $ appLogger foundation + liftIO . destroyAllResources $ appConnPool foundation + truncateDb DBMigrate -> db $ return () DBFill -> db $ fillDb (_, _, errs) -> do forM_ errs $ hPutStrLn stderr - hPutStrLn stderr $ usageInfo "db.hs" argsDescr + hPutStrLn stderr $ usageInfo "uniworxdb" argsDescr exitWith $ ExitFailure 2 +truncateDb :: MonadIO m => ReaderT SqlBackend m () +truncateDb = do + tables <- map unSingle <$> [sqlQQ|SELECT table_name FROM information_schema.tables WHERE table_schema = 'public'|] + sqlBackend <- ask + + let escapedTables = map (connEscapeName sqlBackend . DBName) $ filter (not . (`elem` protected)) tables + query = "TRUNCATE TABLE " ++ intercalate ", " escapedTables ++ " RESTART IDENTITY" + protected = ["applied_migration"] + rawExecute query [] + insertFile :: FilePath -> DB FileId insertFile fileTitle = do - fileContent <- liftIO $ Just <$> BS.readFile ("testdata/" <> fileTitle) + fileContent <- liftIO . fmap Just . BS.readFile $ "testdata" </> fileTitle fileModified <- liftIO getCurrentTime insert File{..} @@ -62,6 +85,8 @@ fillDb = do AppSettings{ appUserDefaults = UserDefaultConf{..}, .. } <- getsYesod appSettings now <- liftIO getCurrentTime let + insert' :: PersistRecordBackend r (YesodPersistBackend UniWorX) => r -> YesodDB UniWorX (Key r) + insert' = fmap (either entityKey id) . insertBy summer2017 = TermIdentifier 2017 Summer winter2017 = TermIdentifier 2017 Winter summer2018 = TermIdentifier 2018 Summer @@ -78,6 +103,8 @@ fillDb = do , userDateFormat = userDefaultDateFormat , userTimeFormat = userDefaultTimeFormat , userDownloadFiles = userDefaultDownloadFiles + , userMailLanguages = MailLanguages ["en"] + , userNotificationSettings = def } fhamann <- insert User { userIdent = "felix.hamann@campus.lmu.de" @@ -92,6 +119,8 @@ fillDb = do , userDateFormat = userDefaultDateFormat , userTimeFormat = userDefaultTimeFormat , userDownloadFiles = userDefaultDownloadFiles + , userMailLanguages = MailLanguages ["de"] + , userNotificationSettings = def } jost <- insert User { userIdent = "jost@tcs.ifi.lmu.de" @@ -106,8 +135,10 @@ fillDb = do , userDateFormat = userDefaultDateFormat , userTimeFormat = userDefaultTimeFormat , userDownloadFiles = userDefaultDownloadFiles + , userMailLanguages = MailLanguages ["de"] + , userNotificationSettings = def } - void . insert $ User + maxMuster <- insert User { userIdent = "max@campus.lmu.de" , userAuthentication = AuthLDAP , userMatrikelnummer = Nothing @@ -120,8 +151,10 @@ fillDb = do , userDateFormat = userDefaultDateFormat , userTimeFormat = userDefaultTimeFormat , userDownloadFiles = userDefaultDownloadFiles + , userMailLanguages = MailLanguages ["de"] + , userNotificationSettings = def } - void . insert $ User + tinaTester <- insert $ User { userIdent = "tester@campus.lmu.de" , userAuthentication = AuthLDAP , userMatrikelnummer = Just "999" @@ -134,8 +167,10 @@ fillDb = do , userDateFormat = userDefaultDateFormat , userTimeFormat = userDefaultTimeFormat , userDownloadFiles = userDefaultDownloadFiles + , userMailLanguages = MailLanguages ["de"] + , userNotificationSettings = def } - void . insert $ Term + void . repsert (TermKey summer2017) $ Term { termName = summer2017 , termStart = fromGregorian 2017 04 09 , termEnd = fromGregorian 2017 07 14 @@ -144,7 +179,7 @@ fillDb = do , termLectureEnd = fromGregorian 2018 07 14 , termActive = False } - void . insert $ Term + void . repsert (TermKey winter2017) $ Term { termName = winter2017 , termStart = fromGregorian 2017 10 16 , termEnd = fromGregorian 2018 02 10 @@ -153,7 +188,7 @@ fillDb = do , termLectureEnd = fromGregorian 2018 02 10 , termActive = True } - void . insert $ Term + void . repsert (TermKey summer2018) $ Term { termName = summer2018 , termStart = fromGregorian 2018 04 09 , termEnd = fromGregorian 2018 07 14 @@ -162,22 +197,28 @@ fillDb = do , termLectureEnd = fromGregorian 2018 07 14 , termActive = True } - ifi <- insert $ School "Institut für Informatik" "IfI" - mi <- insert $ School "Institut für Mathematik" "MI" - void . insert $ UserAdmin gkleen ifi - void . insert $ UserAdmin gkleen mi - void . insert $ UserAdmin fhamann ifi - void . insert $ UserAdmin jost ifi - void . insert $ UserAdmin jost mi - void . insert $ UserLecturer gkleen ifi - void . insert $ UserLecturer fhamann ifi - void . insert $ UserLecturer jost ifi - sdBsc <- insert $ StudyDegree 82 (Just "BSc") (Just "Bachelor" ) - sdMst <- insert $ StudyDegree 88 (Just "MSc") (Just "Master" ) - sdInf <- insert $ StudyTerms 79 (Just "Inf") (Just "Informatik") - sdMath <- insert $ StudyTerms 105 (Just "M" ) (Just "Mathematik") + ifi <- insert' $ School "Institut für Informatik" "IfI" + mi <- insert' $ School "Institut für Mathematik" "MI" + void . insert' $ UserAdmin gkleen ifi + void . insert' $ UserAdmin gkleen mi + void . insert' $ UserAdmin fhamann ifi + void . insert' $ UserAdmin jost ifi + void . insert' $ UserAdmin jost mi + void . insert' $ UserLecturer gkleen ifi + void . insert' $ UserLecturer fhamann ifi + void . insert' $ UserLecturer jost ifi + let + sdBsc = StudyDegreeKey' 82 + sdMst = StudyDegreeKey' 88 + repsert sdBsc $ StudyDegree 82 (Just "BSc") (Just "Bachelor" ) + repsert sdMst $ StudyDegree 88 (Just "MSc") (Just "Master" ) + let + sdInf = StudyTermsKey' 79 + sdMath = StudyTermsKey' 105 + repsert sdInf $ StudyTerms 79 (Just "IfI") (Just "Institut für Informatik") + repsert sdMath $ StudyTerms 105 (Just "MI" ) (Just "Mathematisches Institut") -- FFP - ffp <- insert Course + ffp <- insert' Course { courseName = "Fortgeschrittene Funktionale Programmierung" , courseDescription = Nothing , courseLinkExternal = Nothing @@ -186,7 +227,7 @@ fillDb = do , courseSchool = ifi , courseCapacity = Just 20 , courseRegisterFrom = Just now - , courseRegisterTo = Just ((3600 * 24 * 60) `addUTCTime` now ) + , courseRegisterTo = Just (nominalDay `addUTCTime` now ) , courseDeregisterUntil = Nothing , courseRegisterSecret = Nothing , courseMaterialFree = True @@ -196,14 +237,14 @@ fillDb = do void . insert $ DegreeCourse ffp sdMst sdInf void . insert $ Lecturer jost ffp void . insert $ Lecturer gkleen ffp - sheetkey <- insert $ Sheet ffp "AdHoc-Gruppen" Nothing NotGraded (Arbitrary 3) Nothing Nothing now now Nothing Nothing (Upload True) - insert_ $ SheetEdit gkleen now sheetkey - sheetkey <- insert $ Sheet ffp "Feste Gruppen" Nothing NotGraded RegisteredGroups Nothing Nothing now now Nothing Nothing (Upload True) - insert_ $ SheetEdit gkleen now sheetkey - sheetkey <- insert $ Sheet ffp "Keine Gruppen" Nothing NotGraded NoGroups Nothing Nothing now now Nothing Nothing (Upload True) - insert_ $ SheetEdit gkleen now sheetkey + adhoc <- insert $ Sheet ffp "AdHoc-Gruppen" Nothing NotGraded (Arbitrary 3) Nothing Nothing now now Nothing Nothing (Upload True) UserSubmissions False + insert_ $ SheetEdit gkleen now adhoc + feste <- insert $ Sheet ffp "Feste Gruppen" Nothing NotGraded RegisteredGroups Nothing Nothing now now Nothing Nothing (Upload True) UserSubmissions False + insert_ $ SheetEdit gkleen now feste + keine <- insert $ Sheet ffp "Keine Gruppen" Nothing NotGraded NoGroups Nothing Nothing now now Nothing Nothing (Upload True) UserSubmissions False + insert_ $ SheetEdit gkleen now keine -- EIP - eip <- insert Course + eip <- insert' Course { courseName = "Einführung in die Programmierung" , courseDescription = Nothing , courseLinkExternal = Nothing @@ -218,10 +259,10 @@ fillDb = do , courseMaterialFree = True } insert_ $ CourseEdit fhamann now eip - void . insert $ DegreeCourse eip sdBsc sdInf - void . insert $ Lecturer fhamann eip + void . insert' $ DegreeCourse eip sdBsc sdInf + void . insert' $ Lecturer fhamann eip -- interaction design - ixd <- insert Course + ixd <- insert' Course { courseName = "Interaction Design (User Experience Design I & II)" , courseDescription = Nothing , courseLinkExternal = Nothing @@ -230,16 +271,16 @@ fillDb = do , courseSchool = ifi , courseCapacity = Just 20 , courseRegisterFrom = Just now - , courseRegisterTo = Just ((3600 * 24 * 60) `addUTCTime` now ) + , courseRegisterTo = Just (nominalDay `addUTCTime` now ) , courseDeregisterUntil = Nothing , courseRegisterSecret = Nothing , courseMaterialFree = True } insert_ $ CourseEdit fhamann now ixd - void . insert $ DegreeCourse ixd sdBsc sdInf - void . insert $ Lecturer fhamann ixd + void . insert' $ DegreeCourse ixd sdBsc sdInf + void . insert' $ Lecturer fhamann ixd -- concept development - ux3 <- insert Course + ux3 <- insert' Course { courseName = "Concept Development (User Experience Design III)" , courseDescription = Nothing , courseLinkExternal = Nothing @@ -254,10 +295,10 @@ fillDb = do , courseMaterialFree = True } insert_ $ CourseEdit fhamann now ux3 - void . insert $ DegreeCourse ux3 sdBsc sdInf - void . insert $ Lecturer fhamann ux3 + void . insert' $ DegreeCourse ux3 sdBsc sdInf + void . insert' $ Lecturer fhamann ux3 -- promo - pmo <- insert Course + pmo <- insert' Course { courseName = "Programmierung und Modellierung" , courseDescription = Nothing , courseLinkExternal = Nothing @@ -274,21 +315,28 @@ fillDb = do insert_ $ CourseEdit jost now pmo void . insert $ DegreeCourse pmo sdBsc sdInf void . insert $ Lecturer jost pmo + void . insertMany $ map (\u -> CourseParticipant pmo u now) [fhamann, maxMuster, tinaTester] sh1 <- insert Sheet { sheetCourse = pmo , sheetName = "Blatt 1" , sheetDescription = Nothing - , sheetType = Normal 6 + , sheetType = Normal $ Points 6 , sheetGrouping = Arbitrary 3 , sheetMarkingText = Nothing , sheetVisibleFrom = Just now , sheetActiveFrom = now , sheetActiveTo = (14 * nominalDay) `addUTCTime` now + , sheetSubmissionMode = CorrectorSubmissions , sheetUploadMode = Upload True , sheetHintFrom = Nothing , sheetSolutionFrom = Nothing + , sheetAutoDistribute = True } void . insert $ SheetEdit jost now sh1 + forM_ [fhamann, maxMuster, tinaTester] $ \u -> do + p <- liftIO getRandom + $logDebug (review _PseudonymText p) + void . insert $ SheetPseudonym sh1 p u void . insert $ SheetCorrector jost sh1 (Load (Just True) 0) CorrectorNormal void . insert $ SheetCorrector gkleen sh1 (Load (Just True) 1) CorrectorNormal h102 <- insertFile "H10-2.hs" @@ -297,8 +345,14 @@ fillDb = do void . insert $ SheetFile sh1 h102 SheetHint void . insert $ SheetFile sh1 h103 SheetSolution void . insert $ SheetFile sh1 pdf10 SheetExercise + -- + sub1 <- insert $ Submission sh1 Nothing Nothing Nothing Nothing Nothing + void . insert $ SubmissionEdit maxMuster (nominalDay `addUTCTime` now) sub1 + void . insert $ SubmissionUser maxMuster sub1 + sub1fid1 <- insertFile "AbgabeH10-1.hs" + void . insert $ SubmissionFile sub1 sub1fid1 False False -- datenbanksysteme - dbs <- insert Course + dbs <- insert' Course { courseName = "Datenbanksysteme" , courseDescription = Nothing , courseLinkExternal = Nothing @@ -313,7 +367,7 @@ fillDb = do , courseMaterialFree = True } insert_ $ CourseEdit gkleen now dbs - void . insert $ DegreeCourse dbs sdBsc sdInf - void . insert $ DegreeCourse dbs sdBsc sdMath - void . insert $ Lecturer gkleen dbs - void . insert $ Lecturer jost dbs + void . insert' $ DegreeCourse dbs sdBsc sdInf + void . insert' $ DegreeCourse dbs sdBsc sdMath + void . insert' $ Lecturer gkleen dbs + void . insert' $ Lecturer jost dbs diff --git a/test/Handler/CorrectionsSpec.hs b/test/Handler/CorrectionsSpec.hs new file mode 100644 index 000000000..a26d1c1bd --- /dev/null +++ b/test/Handler/CorrectionsSpec.hs @@ -0,0 +1,11 @@ +module Handler.CorrectionsSpec where + +import TestImport + +import ModelSpec () + + +spec :: Spec +spec = withApp $ do + describe "CorrectionsR" $ do + return () diff --git a/test/Handler/HomeSpec.hs b/test/Handler/HomeSpec.hs index 5ad322254..35eb111d1 100644 --- a/test/Handler/HomeSpec.hs +++ b/test/Handler/HomeSpec.hs @@ -6,30 +6,11 @@ import TestImport spec :: Spec spec = withApp $ do - describe "Homepage" $ do it "loads the index and checks it looks right" $ do - get HomeR - statusIs 200 - htmlAnyContain "h1" "a modern framework for blazing fast websites" - request $ do - setMethod "POST" - setUrl HomeR - addToken - fileByLabel "Choose a file" "test/Spec.hs" "text/plain" -- talk about self-reference - byLabel "What's on the file?" "Some Content" - + setMethod "GET" + setUrl HomeR + addRequestHeader ("Accept-Language", "de") statusIs 200 - -- more debugging printBody - htmlAllContain ".upload-response" "text/plain" - htmlAllContain ".upload-response" "Some Content" - - -- This is a simple example of using a database access in a test. The - -- test will succeed for a fresh scaffolded site with an empty database, - -- but will fail on an existing database with a non-empty user table. - it "leaves the user table empty" $ do - get HomeR - statusIs 200 - users <- runDB $ selectList ([] :: [Filter User]) [] - assertEq "user table empty" 0 $ length users + htmlAnyContain "h1" "Aktuelle Termine" diff --git a/test/Handler/ProfileSpec.hs b/test/Handler/ProfileSpec.hs index dff41b58b..da8609703 100644 --- a/test/Handler/ProfileSpec.hs +++ b/test/Handler/ProfileSpec.hs @@ -4,25 +4,40 @@ module Handler.ProfileSpec (spec) where import TestImport +import qualified Data.CaseInsensitive as CI + +import Yesod.Core.Handler (toTextUrl) + spec :: Spec spec = withApp $ do + describe "Profile page" $ do + it "asserts no access to my-account for anonymous users" $ do + get ProfileR - describe "Profile page" $ do - it "asserts no access to my-account for anonymous users" $ do - get ProfileR - statusIs 403 + loginText <- runHandler . toTextUrl $ AuthR LoginR - it "asserts access to my-account for authenticated users" $ do - userEntity <- createUser "dummy" "foo" - authenticateAs userEntity + assertHeader "Location" $ encodeUtf8 loginText + + either (fail . unpack) (\_ -> return ()) =<< followRedirect + statusIs 200 - get ProfileR - statusIs 200 + it "asserts access to my-account for authenticated users" $ do + userEntity <- createUser id + authenticateAs userEntity - it "asserts user's information is shown" $ do - userEntity <- createUser "dummy" "bar" - authenticateAs userEntity + get ProfileR + statusIs 200 - get ProfileR - let (Entity _ user) = userEntity - htmlAnyContain ".username" . unpack $ userIdent user + it "displays basic user data" $ do + userEntity@(Entity _userId User{..}) <- createUser id + authenticateAs userEntity + + get ProfileDataR + statusIs 200 + + forM_ (words userDisplayName) $ \nameWord -> do + htmlAnyContain ".profile dd" $ unpack nameWord + htmlAnyContain ".profile dd" $ unpack userSurname + htmlAnyContain ".profile dd" . unpack $ CI.original userIdent + htmlAnyContain ".profile dd" . unpack $ CI.original userEmail + diff --git a/test/Handler/Utils/Table/Pagination/TypesSpec.hs b/test/Handler/Utils/Table/Pagination/TypesSpec.hs new file mode 100644 index 000000000..f1f29506a --- /dev/null +++ b/test/Handler/Utils/Table/Pagination/TypesSpec.hs @@ -0,0 +1,22 @@ +module Handler.Utils.Table.Pagination.TypesSpec where + +import TestImport + +import Handler.Utils.Table.Pagination.Types + + +instance Arbitrary FilterKey where + arbitrary = genericArbitrary + shrink = genericShrink + +instance Arbitrary SortingKey where + arbitrary = genericArbitrary + shrink = genericShrink + +spec :: Spec +spec = do + parallel $ do + lawsCheckHspec (Proxy @FilterKey) + [ eqLaws, ordLaws, showReadLaws, pathPieceLaws, jsonLaws, jsonKeyLaws ] + lawsCheckHspec (Proxy @SortingKey) + [ eqLaws, ordLaws, showReadLaws, pathPieceLaws, jsonLaws, jsonKeyLaws ] diff --git a/test/Handler/Utils/Table/PaginationSpec.hs b/test/Handler/Utils/Table/PaginationSpec.hs new file mode 100644 index 000000000..df8a7fd91 --- /dev/null +++ b/test/Handler/Utils/Table/PaginationSpec.hs @@ -0,0 +1,43 @@ +module Handler.Utils.Table.PaginationSpec where + +import TestImport + +import Handler.Utils.Table.Pagination +import Handler.Utils.Table.Pagination.TypesSpec () + +import Data.Aeson (encode) + + +instance Arbitrary SortDirection where + arbitrary = genericArbitrary + shrink = genericShrink + +instance Arbitrary SortingSetting where + arbitrary = genericArbitrary + shrink = genericShrink + +instance Arbitrary PaginationInput where + arbitrary = scale (`div` 2) genericArbitrary + shrink = genericShrink + +instance Arbitrary PagesizeLimit where + arbitrary = oneof + [ pure PagesizeAll + , PagesizeLimit . getNonNegative <$> arbitrary + ] + shrink = genericShrink + +spec :: Spec +spec = do + parallel $ do + lawsCheckHspec (Proxy @SortDirection) + [ eqLaws, ordLaws, showReadLaws, boundedEnumLaws, pathPieceLaws, finiteLaws, jsonLaws ] + lawsCheckHspec (Proxy @SortingSetting) + [ eqLaws, ordLaws, showReadLaws, jsonLaws, pathPieceLaws ] + lawsCheckHspec (Proxy @PaginationInput) + [ eqLaws, ordLaws, showReadLaws, jsonLaws ] + lawsCheckHspec (Proxy @PagesizeLimit) + [ eqLaws, ordLaws, showReadLaws, boundedEnumLaws, pathPieceLaws, jsonLaws ] + + describe "PaginationInput" $ do + it "is unset iff it encodes to {}" . property $ \inp -> piIsUnset inp == (encode inp == "{}") diff --git a/test/Handler/Utils/ZipSpec.hs b/test/Handler/Utils/ZipSpec.hs index b384143fd..eaa471881 100644 --- a/test/Handler/Utils/ZipSpec.hs +++ b/test/Handler/Utils/ZipSpec.hs @@ -1,47 +1,29 @@ -{-# LANGUAGE NoImplicitPrelude #-} -{-# LANGUAGE RecordWildCards #-} -{-# OPTIONS_GHC -fno-warn-orphans #-} - module Handler.Utils.ZipSpec where import TestImport import Handler.Utils.Zip -import System.FilePath - import Data.Conduit import qualified Data.Conduit.List as Conduit import Data.List (dropWhileEnd) -import Data.Time -instance Arbitrary File where - arbitrary = do - fileTitle <- joinPath <$> arbitrary - date <- addDays <$> arbitrary <*> pure (fromGregorian 2043 7 2) - fileModified <- addUTCTime <$> arbitrary <*> pure (UTCTime date 0) - fileContent <- arbitrary - return File{..} +import ModelSpec () + +import System.FilePath +import Data.Time spec :: Spec spec = describe "Zip file handling" $ do - it "has compatible encoding/decoding to/from zip files" . property $ - \zipFiles -> do + it "has compatible encoding/decoding to/from zip files" . property $ do + zipFiles <- listOf $ scale (`div` 2) arbitrary + return . property $ do zipFiles' <- runConduit $ Conduit.sourceList zipFiles =$= produceZip def =$= void consumeZip =$= Conduit.consume forM_ (zipFiles `zip` zipFiles') $ \(file, file') -> do let acceptableFilenameChanges - = makeValid . bool (dropWhileEnd isPathSeparator) addTrailingPathSeparator (isNothing $ fileContent file) . normalise . makeValid + = makeValid . dropWhile isPathSeparator . bool (dropWhileEnd isPathSeparator) addTrailingPathSeparator (isNothing $ fileContent file) . normalise . makeValid acceptableTimeDifference t1 t2 = abs (diffUTCTime t1 t2) <= 2 (shouldBe `on` acceptableFilenameChanges) (fileTitle file') (fileTitle file) - when (inZipRange $ fileModified file) $ - (fileModified file', fileModified file) `shouldSatisfy` uncurry acceptableTimeDifference + (fileModified file', fileModified file) `shouldSatisfy` uncurry acceptableTimeDifference (fileContent file') `shouldBe` (fileContent file) - -inZipRange :: UTCTime -> Bool -inZipRange time - | time > UTCTime (fromGregorian 1980 1 1) 0 - , time < UTCTime (fromGregorian 2107 1 1) 0 - = True - | otherwise - = False diff --git a/test/MailSpec.hs b/test/MailSpec.hs new file mode 100644 index 000000000..c9972548d --- /dev/null +++ b/test/MailSpec.hs @@ -0,0 +1,34 @@ +module MailSpec where + +import TestImport +import Utils.DateTimeSpec () + +import Mail + +instance Arbitrary MailSmtpData where + arbitrary = genericArbitrary + shrink = genericShrink + +instance Arbitrary MailLanguages where + arbitrary = fmap MailLanguages $ shuffle =<< sublistOf (toList appLanguages) + shrink = genericShrink + +instance Arbitrary MailContext where + arbitrary = genericArbitrary + shrink = genericShrink + +instance Arbitrary VerpMode where + arbitrary = genericArbitrary + shrink = genericShrink + +spec :: Spec +spec = do + parallel $ do + lawsCheckHspec (Proxy @MailSmtpData) + [ eqLaws, ordLaws, showReadLaws, monoidLaws ] + lawsCheckHspec (Proxy @MailLanguages) + [ eqLaws, ordLaws, showReadLaws, isListLaws, jsonLaws, hashableLaws ] + lawsCheckHspec (Proxy @MailContext) + [ eqLaws, ordLaws, showReadLaws, jsonLaws, hashableLaws ] + lawsCheckHspec (Proxy @VerpMode) + [ eqLaws, showReadLaws, jsonLaws ] diff --git a/test/Spec.hs b/test/Main.hs similarity index 100% rename from test/Spec.hs rename to test/Main.hs diff --git a/test/Model/TypesSpec.hs b/test/Model/TypesSpec.hs index 87302d3c7..bfe154a02 100644 --- a/test/Model/TypesSpec.hs +++ b/test/Model/TypesSpec.hs @@ -1,32 +1,222 @@ -{-# LANGUAGE RecordWildCards #-} -{-# LANGUAGE NoImplicitPrelude #-} -{-# LANGUAGE OverloadedStrings #-} -{-# OPTIONS_GHC -fno-warn-orphans #-} - module Model.TypesSpec where import TestImport +import Settings + +import Control.Lens (review, preview) +import Data.Aeson (Value) +import qualified Data.Aeson as Aeson + +import MailSpec () + +import System.IO.Unsafe +import Yesod.Auth.Util.PasswordStore + instance Arbitrary Season where - arbitrary = elements [minBound..maxBound] + arbitrary = genericArbitrary shrink = genericShrink instance Arbitrary TermIdentifier where arbitrary = do season <- arbitrary - year <- arbitrary + year <- arbitrary `suchThat` (\y -> abs y >= 100) return $ TermIdentifier{..} shrink = genericShrink +instance Arbitrary Pseudonym where + arbitrary = Pseudonym <$> arbitraryBoundedIntegral + +instance Arbitrary SheetGrading where + arbitrary = oneof + [ Points <$> arbitrary + , do + maxPoints <- getNonNegative <$> arbitrary + passingPoints <- (getNonNegative <$> arbitrary) `suchThat` (<= maxPoints) + return PassPoints{..} + , return PassBinary + ] + shrink = genericShrink + +instance Arbitrary SheetType where + arbitrary = genericArbitrary + shrink = genericShrink + +instance Arbitrary SheetGradeSummary where + arbitrary = genericArbitrary + shrink = genericShrink + +instance Arbitrary SheetGroup where + arbitrary = genericArbitrary + shrink = genericShrink + +instance Arbitrary SheetTypeSummary where + arbitrary = genericArbitrary + shrink = genericShrink + +instance Arbitrary SheetFileType where + arbitrary = genericArbitrary + shrink = genericShrink + +instance Arbitrary SubmissionFileType where + arbitrary = genericArbitrary + shrink = genericShrink + +instance Arbitrary UploadMode where + arbitrary = genericArbitrary + shrink = genericShrink + +instance Arbitrary SheetSubmissionMode where + arbitrary = genericArbitrary + shrink = genericShrink + +instance Arbitrary ExamStatus where + arbitrary = genericArbitrary + shrink = genericShrink + +instance Arbitrary Load where + arbitrary = do + byTutorial <- arbitrary + byProportion <- getNonNegative <$> arbitrary + return Load{..} + shrink = genericShrink + +instance Arbitrary StudyFieldType where + arbitrary = genericArbitrary + shrink = genericShrink + +instance Arbitrary Theme where + arbitrary = genericArbitrary + shrink = genericShrink + +instance Arbitrary CorrectorState where + arbitrary = genericArbitrary + shrink = genericShrink + +instance Arbitrary NotificationTrigger where + arbitrary = genericArbitrary + shrink = genericShrink +instance CoArbitrary NotificationTrigger where + coarbitrary = genericCoarbitrary + +instance Arbitrary NotificationSettings where + arbitrary = NotificationSettings <$> arbitrary + shrink = genericShrink + +instance Arbitrary AuthTag where + arbitrary = genericArbitrary + shrink = genericShrink +instance CoArbitrary AuthTag where + coarbitrary = genericCoarbitrary + +instance Arbitrary AuthTagActive where + arbitrary = AuthTagActive <$> arbitrary + shrink = genericShrink + +instance Arbitrary Value where + arbitrary = sized $ \n -> if + | n <= 0 -> oneof [ Aeson.Number <$> arbitrary, Aeson.Bool <$> arbitrary, pure Aeson.Null ] + | otherwise -> oneof + [ Aeson.Object <$> arbitrary' + , Aeson.Array <$> arbitrary' + , Aeson.String <$> arbitrary' + , resize 0 arbitrary + ] + where + arbitrary' :: forall a. Arbitrary a => Gen a + arbitrary' = scale (`div` 2) arbitrary + shrink = genericShrink + +instance Arbitrary AuthenticationMode where + arbitrary = oneof + [ pure AuthLDAP + , do + pw <- encodeUtf8 . pack . getPrintableString <$> arbitrary + let + PWHashConf{..} = appAuthPWHash compileTimeAppSettings + authPWHash = unsafePerformIO . fmap decodeUtf8 $ makePasswordWith pwHashAlgorithm pw (pwHashStrength `div` 2) + return $ AuthPWHash{..} + ] + + shrink AuthLDAP = [] + shrink (AuthPWHash _) = [AuthLDAP] + + spec :: Spec spec = do + parallel $ do + lawsCheckHspec (Proxy @UUID) + [ persistFieldLaws, pathPieceLaws, eqLaws, ordLaws, showReadLaws, hashableLaws, jsonLaws, storableLaws, jsonKeyLaws, httpApiDataLaws ] + lawsCheckHspec (Proxy @FilePath) + [ pathMultiPieceLaws ] + lawsCheckHspec (Proxy @(CI Text)) + [ httpApiDataLaws ] + lawsCheckHspec (Proxy @SheetGrading) + [ eqLaws, showReadLaws, jsonLaws, persistFieldLaws ] + lawsCheckHspec (Proxy @SheetGradeSummary) + [ eqLaws, showReadLaws, commutativeMonoidLaws, commutativeSemigroupLaws ] + lawsCheckHspec (Proxy @SheetType) + [ eqLaws, showReadLaws, jsonLaws, persistFieldLaws ] + lawsCheckHspec (Proxy @SheetTypeSummary) + [ eqLaws, showReadLaws, commutativeMonoidLaws ] + lawsCheckHspec (Proxy @SheetGroup) + [ eqLaws, showReadLaws, jsonLaws, persistFieldLaws ] + lawsCheckHspec (Proxy @SheetFileType) + [ eqLaws, showReadLaws, ordLaws, boundedEnumLaws, persistFieldLaws, pathPieceLaws, finiteLaws ] + lawsCheckHspec (Proxy @SubmissionFileType) + [ eqLaws, showReadLaws, ordLaws, boundedEnumLaws, pathPieceLaws, finiteLaws ] + lawsCheckHspec (Proxy @UploadMode) + [ eqLaws, showReadLaws, ordLaws, jsonLaws, persistFieldLaws, pathPieceLaws, finiteLaws ] + lawsCheckHspec (Proxy @SheetSubmissionMode) + [ eqLaws, showReadLaws, ordLaws, boundedEnumLaws, jsonLaws, persistFieldLaws, finiteLaws, pathPieceLaws ] + lawsCheckHspec (Proxy @ExamStatus) + [ eqLaws, showReadLaws, ordLaws, boundedEnumLaws, persistFieldLaws ] + lawsCheckHspec (Proxy @Load) + [ eqLaws, showReadLaws, ordLaws, jsonLaws, persistFieldLaws, commutativeSemigroupLaws, commutativeMonoidLaws ] + lawsCheckHspec (Proxy @Season) + [ eqLaws, showReadLaws, ordLaws, boundedEnumLaws ] + lawsCheckHspec (Proxy @TermIdentifier) + [ eqLaws, showReadLaws, ordLaws, enumLaws, persistFieldLaws, jsonLaws, httpApiDataLaws, pathPieceLaws ] + lawsCheckHspec (Proxy @StudyFieldType) + [ eqLaws, ordLaws, boundedEnumLaws, showReadLaws, persistFieldLaws ] + lawsCheckHspec (Proxy @Theme) + [ eqLaws, ordLaws, boundedEnumLaws, showReadLaws, jsonLaws, finiteLaws, pathPieceLaws, persistFieldLaws ] + lawsCheckHspec (Proxy @CorrectorState) + [ eqLaws, ordLaws, showReadLaws, boundedEnumLaws, jsonLaws, finiteLaws, pathPieceLaws, persistFieldLaws ] + lawsCheckHspec (Proxy @AuthenticationMode) + [ eqLaws, ordLaws, showReadLaws, jsonLaws, persistFieldLaws ] + lawsCheckHspec (Proxy @Value) + [ persistFieldLaws ] + lawsCheckHspec (Proxy @NotificationTrigger) + [ eqLaws, ordLaws, showReadLaws, jsonLaws, boundedEnumLaws, finiteLaws, hashableLaws, jsonLaws, jsonKeyLaws ] + lawsCheckHspec (Proxy @NotificationSettings) + [ eqLaws, ordLaws, showReadLaws, jsonLaws, persistFieldLaws ] + lawsCheckHspec (Proxy @MailLanguages) + [ persistFieldLaws ] + lawsCheckHspec (Proxy @Pseudonym) + [ eqLaws, ordLaws, showReadLaws, boundedEnumLaws, integralLaws, jsonLaws, persistFieldLaws ] + lawsCheckHspec (Proxy @AuthTag) + [ eqLaws, ordLaws, showReadLaws, boundedEnumLaws, finiteLaws, hashableLaws, jsonLaws, pathPieceLaws, jsonKeyLaws ] + lawsCheckHspec (Proxy @AuthTagActive) + [ eqLaws, ordLaws, showReadLaws, jsonLaws, persistFieldLaws ] + describe "TermIdentifier" $ do it "has compatible encoding/decoding to/from Text" . property $ \term -> termFromText (termToText term) == Right term it "works for some examples" . mapM_ termExample $ - [ (TermIdentifier 2017 Summer, "S2017") - , (TermIdentifier 1995 Winter, "W1995") + [ (TermIdentifier 2017 Summer, "S17") + , (TermIdentifier 1995 Winter, "W95") + , (TermIdentifier 3068 Winter, "W3068") ] + it "has compatbile encoding/decoding to/from Rational" . property $ + \term -> termFromRational (termToRational term) == term + describe "Pseudonym" $ do + it "has sufficient vocabulary" $ + (length pseudonymWordlist ^ 2) `shouldBe` (succ $ fromIntegral (maxBound - minBound :: Pseudonym)) + it "has compatible encoding/decoding to/from Text" . property $ + \pseudonym -> preview _PseudonymText (review _PseudonymText pseudonym) == Just pseudonym + it "encodes to Text injectively" . property $ + \p1 p2 -> p1 /= p2 ==> ((/=) `on` review _PseudonymText) p1 p2 termExample :: (TermIdentifier, Text) -> Expectation termExample (term, encoded) = example $ do diff --git a/test/ModelSpec.hs b/test/ModelSpec.hs new file mode 100644 index 000000000..33a54c2e3 --- /dev/null +++ b/test/ModelSpec.hs @@ -0,0 +1,107 @@ +module ModelSpec where + +import TestImport + +import Model.TypesSpec () + +import qualified Data.CaseInsensitive as CI +import qualified Data.ByteString.Char8 as CBS + +import Text.Email.Validate (emailAddress, EmailAddress) +import qualified Text.Email.Validate as Email (isValid, toByteString) + +import qualified Data.Set as Set + +import Handler.Utils.DateTime + +import qualified Data.Text as Text +import qualified Data.Char as Char + +import Utils + +import System.FilePath +import Data.Time + +instance Arbitrary EmailAddress where + arbitrary = do + local <- suchThat arbitrary (\l -> isEmail l (CBS.pack "example.com")) + domain <- suchThat arbitrary (\d -> isEmail (CBS.pack "example") d) + let (Just result) = emailAddress (makeEmailLike local domain) + pure result + + where + isEmail l d = Email.isValid (makeEmailLike l d) + makeEmailLike l d = CBS.concat [l, CBS.singleton '@', d] + +instance Arbitrary User where + arbitrary = do + userIdent <- CI.mk . pack <$> oneof + [ getPrintableString <$> arbitrary + , on (\l d -> l <> "@" <> d) getPrintableString <$> arbitrary <*> arbitrary + ] + userAuthentication <- arbitrary + userMatrikelnummer <- fmap pack . assertM' (not . null) <$> listOf (elements ['0'..'9']) + userEmail <- CI.mk . decodeUtf8 . Email.toByteString <$> arbitrary + + names <- listOf1 $ pack . getPrintableString <$> arbitrary + userDisplayName <- unwords <$> sublistOf names + userSurname <- unwords <$> sublistOf names + + userMaxFavourites <- getNonNegative <$> arbitrary + userTheme <- arbitrary + + let genDateTimeFormat sel = do + timeLocale <- elements . map getTimeLocale' . pure $ toList appLanguages + elements . Set.toList $ validDateTimeFormats timeLocale sel + userDateTimeFormat <- genDateTimeFormat SelFormatDateTime + userDateFormat <- genDateTimeFormat SelFormatDate + userTimeFormat <- genDateTimeFormat SelFormatTime + + userDownloadFiles <- arbitrary + userMailLanguages <- arbitrary + userNotificationSettings <- arbitrary + + return User{..} + shrink = genericShrink + +instance Arbitrary File where + arbitrary = do + fileTitle <- scale (`div` 2) $ (joinPath <$> arbitrary) `suchThat` (any $ not . isPathSeparator) + date <- addDays <$> arbitrary <*> pure (fromGregorian 2043 7 2) + fileModified <- (addUTCTime <$> arbitrary <*> pure (UTCTime date 0)) `suchThat` inZipRange + fileContent <- arbitrary + return File{..} + where + inZipRange :: UTCTime -> Bool + inZipRange time + | time > UTCTime (fromGregorian 1980 1 1) 0 + , time < UTCTime (fromGregorian 2107 1 1) 0 + = True + | otherwise + = False + shrink = genericShrink + +instance Arbitrary School where + arbitrary = do + names <- listOf1 $ pack . getPrintableString <$> arbitrary + let + name = Text.toTitle $ unwords names + schoolShorthand = CI.mk $ Text.filter Char.isUpper name + schoolName = CI.mk name + return School{..} + +instance Arbitrary Term where + arbitrary = genericArbitrary + shrink = genericShrink + +spec :: Spec +spec = do + parallel $ do + lawsCheckHspec (Proxy @User) + [ eqLaws, jsonLaws ] + lawsCheckHspec (Proxy @File) + [ eqLaws ] + lawsCheckHspec (Proxy @School) + [ eqLaws ] + lawsCheckHspec (Proxy @Term) + [ eqLaws, jsonLaws ] diff --git a/test/Test/QuickCheck/Classes/Hashable.hs b/test/Test/QuickCheck/Classes/Hashable.hs new file mode 100644 index 000000000..849511bd0 --- /dev/null +++ b/test/Test/QuickCheck/Classes/Hashable.hs @@ -0,0 +1,13 @@ +module Test.QuickCheck.Classes.Hashable + ( hashableLaws + ) where + +import ClassyPrelude +import Test.QuickCheck +import Test.QuickCheck.Classes +import Data.Proxy + +hashableLaws :: forall a. (Arbitrary a, Hashable a, Eq a, Show a) => Proxy a -> Laws +hashableLaws _ = Laws "Hashable" + [ ("Injectivity", property $ \(a :: a) (a' :: a) (s :: Int) -> hashWithSalt s a /= hashWithSalt s a' ==> a /= a') + ] diff --git a/test/Test/QuickCheck/Classes/HttpApiData.hs b/test/Test/QuickCheck/Classes/HttpApiData.hs new file mode 100644 index 000000000..75ab8fe6f --- /dev/null +++ b/test/Test/QuickCheck/Classes/HttpApiData.hs @@ -0,0 +1,25 @@ +module Test.QuickCheck.Classes.HttpApiData + ( httpApiDataLaws + ) where + +import ClassyPrelude +import Test.QuickCheck +import Test.QuickCheck.Classes +import Web.HttpApiData +import Data.Proxy +import Network.HTTP.Types.URI (encodePathSegmentsRelative) + +import qualified Data.ByteString.Lazy.Char8 as LCBS +import qualified Data.ByteString.Builder as BS + +httpApiDataLaws :: forall a. (Arbitrary a, ToHttpApiData a, FromHttpApiData a, Eq a, Show a) => Proxy a -> Laws +httpApiDataLaws _ = Laws "ToHttpApiData/FromHttpApiData" + [ ("Partial Isomorphism (UrlPiece)", property $ \(a :: a) -> parseUrlPiece (toUrlPiece a) == Right a) + , ("Encoding Equals Value (UrlPiece)", property $ \(a :: a) -> BS.toLazyByteString (toEncodedUrlPiece a) == BS.toLazyByteString (encodePathSegmentsRelative . pure $ toUrlPiece a)) + , ("Produces only valid characters (UrlPiece)", property $ \(a :: a) -> LCBS.all validUrlChar (BS.toLazyByteString $ toEncodedUrlPiece a) ) + , ("Partial Isomorphism (Header)", property $ \(a :: a) -> parseHeader (toHeader a) == Right a) + , ("Partial Isomorphism (QueryParam)", property $ \(a :: a) -> parseQueryParam (toQueryParam a) == Right a) + ] + where + validUrlChar :: Char -> Bool + validUrlChar = flip elem $ ['a'..'z'] ++ ['A'..'Z'] ++ ['0'..'9'] ++ "-_.~:@&=+$," ++ "%" diff --git a/test/Test/QuickCheck/Classes/JSON.hs b/test/Test/QuickCheck/Classes/JSON.hs new file mode 100644 index 000000000..78d586ec3 --- /dev/null +++ b/test/Test/QuickCheck/Classes/JSON.hs @@ -0,0 +1,38 @@ +module Test.QuickCheck.Classes.JSON + ( jsonKeyLaws + ) where + +import ClassyPrelude +import Test.QuickCheck +import Test.QuickCheck.Property (failed) +import Test.QuickCheck.Classes +import Data.Aeson +import Data.Aeson.Encoding.Internal +import Data.Aeson.Types (parseMaybe) +import Data.Proxy +import Unsafe.Coerce -- DON'T PANIC, it's aeson's fault + +jsonKeyLaws :: forall a. (Arbitrary a, FromJSONKey a, ToJSONKey a, Eq a, Show a, FromJSON a, ToJSON a) => Proxy a -> Laws +jsonKeyLaws _ = Laws "ToJSONKey/FromJSONKey" + [ ("Partial Isomorphism", property $ \(a :: a) -> partialIsomorphism a) + , ("Partial Isomorphism (List)", property $ \(as :: [a]) -> partialIsomorphism as) + , ("Encoding Equals Value", property $ \(a :: a) + -> let (toVal, toEnc) = case toJSONKey of + ToJSONKeyText toVal' toEnc' -> (String . toVal', retagEncoding . toEnc') + ToJSONKeyValue toVal' toEnc' -> (toVal', toEnc') + in decode (encodingToLazyByteString $ toEnc a) == Just (toVal a) + ) + ] + where + partialIsomorphism :: forall a'. (Arbitrary a', FromJSONKey a', ToJSONKey a', Eq a', Show a') => a' -> Property + partialIsomorphism a = case (toJSONKey, fromJSONKey) of + (ToJSONKeyText toVal _, FromJSONKeyCoerce _) + -> property $ unsafeCoerce (toVal a) == a + (ToJSONKeyText toVal _, FromJSONKeyText fromVal) + -> property $ fromVal (toVal a) == a + (ToJSONKeyText toVal _, FromJSONKeyTextParser parser) + -> property $ parseMaybe parser (toVal a) == Just a + (ToJSONKeyValue toVal _, FromJSONKeyValue parser) + -> property $ parseMaybe parser (toVal a) == Just a + (_, _) + -> property failed diff --git a/test/Test/QuickCheck/Classes/PathPiece.hs b/test/Test/QuickCheck/Classes/PathPiece.hs new file mode 100644 index 000000000..d7c95cef7 --- /dev/null +++ b/test/Test/QuickCheck/Classes/PathPiece.hs @@ -0,0 +1,20 @@ +module Test.QuickCheck.Classes.PathPiece + ( pathPieceLaws + , pathMultiPieceLaws + ) where + +import ClassyPrelude +import Test.QuickCheck +import Test.QuickCheck.Classes +import Web.PathPieces +import Data.Proxy + +pathPieceLaws :: forall a. (Arbitrary a, PathPiece a, Eq a, Show a) => Proxy a -> Laws +pathPieceLaws _ = Laws "PathPiece" + [ ("Partial Isomorphism", property $ \(a :: a) -> fromPathPiece (toPathPiece a) == Just a) + ] + +pathMultiPieceLaws :: forall a. (Arbitrary a, PathMultiPiece a, Eq a, Show a) => Proxy a -> Laws +pathMultiPieceLaws _ = Laws "PathMultiPiece" + [ ("Partial Isomorphism", property $ \(a :: a) -> fromPathMultiPiece (toPathMultiPiece a) == Just a) + ] diff --git a/test/Test/QuickCheck/Classes/PersistField.hs b/test/Test/QuickCheck/Classes/PersistField.hs new file mode 100644 index 000000000..53b6419d7 --- /dev/null +++ b/test/Test/QuickCheck/Classes/PersistField.hs @@ -0,0 +1,14 @@ +module Test.QuickCheck.Classes.PersistField + ( persistFieldLaws + ) where + +import ClassyPrelude +import Test.QuickCheck +import Test.QuickCheck.Classes +import Database.Persist +import Data.Proxy + +persistFieldLaws :: forall a. (Arbitrary a, PersistField a, Eq a, Show a) => Proxy a -> Laws +persistFieldLaws _ = Laws "PersistField" + [ ("Partial Isomorphism", property $ \(a :: a) -> fromPersistValue (toPersistValue a) == Right a) + ] diff --git a/test/Test/QuickCheck/Classes/Universe.hs b/test/Test/QuickCheck/Classes/Universe.hs new file mode 100644 index 000000000..60343d662 --- /dev/null +++ b/test/Test/QuickCheck/Classes/Universe.hs @@ -0,0 +1,24 @@ +module Test.QuickCheck.Classes.Universe + ( universeLaws + , finiteLaws + ) where + +import ClassyPrelude +import Test.QuickCheck +import Test.QuickCheck.Classes +import Data.Proxy +import Data.Universe +import Data.List (genericLength, elemIndices) + +universeLaws :: forall a. (Arbitrary a, Universe a, Eq a, Show a) => Proxy a -> Laws +universeLaws _ = Laws "Universe" + [ ("universe contains everything", property $ \(a :: a) -> a `elem` universe) + ] + +finiteLaws :: forall a. (Arbitrary a, Finite a, Eq a, Show a) => Proxy a -> Laws +finiteLaws _ = Laws "Finite" $ + [ ("universeF is small", property $ genericLength (universeF :: [a]) <= toInteger (maxBound :: Word32)) + , ("universeF contains everything once", property $ \(a :: a) -> length (elemIndices a universeF) == 1) + , ("universe is permutation of universeF", property $ all (\(a :: a) -> length (elemIndices a universeF) == 1) universeF) + ] + diff --git a/test/TestImport.hs b/test/TestImport.hs index 29f09bdc6..9d84e8722 100644 --- a/test/TestImport.hs +++ b/test/TestImport.hs @@ -1,21 +1,15 @@ -{-# LANGUAGE QuasiQuotes #-} -{-# LANGUAGE NoImplicitPrelude #-} -{-# LANGUAGE OverloadedStrings #-} -{-# LANGUAGE RecordWildCards #-} - module TestImport ( module TestImport , module X ) where import Application (makeFoundation, makeLogWare) -import ClassyPrelude as X hiding (delete, deleteBy, Handler) +import ClassyPrelude as X hiding (delete, deleteBy, Handler, Index, (<.>), (<|), index, uncons, unsnoc, cons, snoc) import Database.Persist as X hiding (get) -import Database.Persist.Sql (SqlPersistM, SqlBackend, runSqlPersistMPool, rawExecute, rawSql, unSingle, connEscapeName) +import Database.Persist.Sql (SqlPersistM, runSqlPersistMPool) import Foundation as X import Model as X import Test.Hspec as X -import Text.Shakespeare.Text (st) import Yesod.Default.Config2 (useEnv, loadYamlSettings) import Yesod.Auth as X import Yesod.Test as X @@ -23,68 +17,112 @@ import Yesod.Core.Unsafe (fakeHandlerGetLogger) import Test.QuickCheck as X import Test.QuickCheck.Gen as X import Data.Default as X -import Test.QuickCheck.Instances as X +import Test.QuickCheck.Instances as X () +import Test.QuickCheck.Arbitrary.Generic as X +import Test.QuickCheck.Classes as X +import Test.QuickCheck.Classes.PathPiece as X +import Test.QuickCheck.Classes.PersistField as X +import Test.QuickCheck.Classes.Hashable as X +import Test.QuickCheck.Classes.JSON as X +import Test.QuickCheck.Classes.HttpApiData as X +import Test.QuickCheck.Classes.Universe as X +import Data.Proxy as X +import Data.UUID as X (UUID) +import System.IO as X (hPrint, hPutStrLn, stderr) +import Jobs (handleJobs, stopJobCtl) + +import Control.Lens as X hiding ((<.), elements) + +import Database (truncateDb) +import Database as X (fillDb) + +import Control.Monad.Trans.Resource (runResourceT, MonadResourceBase) +import Data.Pool (destroyAllResources) + +import Settings + +import Data.CaseInsensitive as X (CI) +import qualified Data.CaseInsensitive as CI + +import Data.Typeable + runDB :: SqlPersistM a -> YesodExample UniWorX a runDB query = do - app <- getTestYesod - liftIO $ runDBWithApp app query + app <- getTestYesod + liftIO $ runDBWithApp app query -runDBWithApp :: UniWorX -> SqlPersistM a -> IO a -runDBWithApp app query = runSqlPersistMPool query (appConnPool app) +runDBWithApp :: MonadIO m => UniWorX -> SqlPersistM a -> m a +runDBWithApp app query = liftIO $ runSqlPersistMPool query (appConnPool app) runHandler :: Handler a -> YesodExample UniWorX a runHandler handler = do - app <- getTestYesod - fakeHandlerGetLogger appLogger app handler + app <- getTestYesod + logger <- liftIO . readTVarIO . snd $ appLogger app + fakeHandlerGetLogger (const logger) app handler -withApp :: SpecWith (TestApp UniWorX) -> Spec -withApp = before $ do - settings <- loadYamlSettings - ["config/test-settings.yml", "config/settings.yml"] - [] - useEnv - foundation <- makeFoundation settings - wipeDB foundation - logWare <- liftIO $ makeLogWare foundation - return (foundation, logWare) +withApp :: YSpec UniWorX -> Spec +withApp = around $ \act -> runResourceT $ do + settings <- liftIO $ loadYamlSettings + ["config/test-settings.yml", "config/settings.yml"] + [] + useEnv + foundation <- makeFoundation settings + let + stopDBAccess = do + stopJobCtl foundation + liftIO . destroyAllResources $ appConnPool foundation + bracket_ stopDBAccess (handleJobs foundation) $ wipeDB foundation + logWare <- makeLogWare foundation + lift $ act (foundation, logWare) -- This function will truncate all of the tables in your database. -- 'withApp' calls it before each test, creating a clean environment for each -- spec to run in. -wipeDB :: UniWorX -> IO () -wipeDB app = runDBWithApp app $ do - tables <- getTables - sqlBackend <- ask - - let escapedTables = map (connEscapeName sqlBackend . DBName) tables - query = "TRUNCATE TABLE " ++ intercalate ", " escapedTables - rawExecute query [] - -getTables :: MonadIO m => ReaderT SqlBackend m [Text] -getTables = do - tables <- rawSql [st| - SELECT table_name - FROM information_schema.tables - WHERE table_schema = 'public'; - |] [] - - return $ map unSingle tables +wipeDB :: (MonadResourceBase m, MonadMask m) => UniWorX -> m () +wipeDB app = runDBWithApp app Database.truncateDb -- | Authenticate as a user. This relies on the `auth-dummy-login: true` flag -- being set in test-settings.yaml, which enables dummy authentication in -- Foundation.hs authenticateAs :: Entity User -> YesodExample UniWorX () authenticateAs (Entity _ User{..}) = do - request $ do - setMethod "POST" - addPostParam "ident" $ userPlugin <> ":" <> userIdent - setUrl $ AuthR $ PluginR "dummy" [] + request $ do + setMethod "GET" + addRequestHeader ("Accept-Language", "de") + setUrl $ AuthR LoginR + + request $ do + setMethod "POST" + addToken_ "#login--dummy" + byLabelExact "Nutzer-Kennung" $ CI.original userIdent + setUrl $ AuthR $ PluginR "dummy" [] -- | Create a user. The dummy email entry helps to confirm that foreign-key -- checking is switched off in wipeDB for those database backends which need it. -createUser :: Text -> Text -> YesodExample UniWorX (Entity User) -createUser userPlugin userIdent = runDB $ insertEntity User{..} +createUser :: (User -> User) -> YesodExample UniWorX (Entity User) +createUser adjUser = do + UserDefaultConf{..} <- appUserDefaults . appSettings <$> getTestYesod + let + userMatrikelnummer = Nothing + userAuthentication = AuthLDAP + userIdent = "dummy@example.invalid" + userEmail = "dummy@example.invalid" + userDisplayName = "Dummy Example" + userSurname = "Example" + userTheme = userDefaultTheme + userMaxFavourites = userDefaultMaxFavourites + userDateTimeFormat = userDefaultDateTimeFormat + userDateFormat = userDefaultDateFormat + userTimeFormat = userDefaultTimeFormat + userDownloadFiles = userDefaultDownloadFiles + userMailLanguages = def + userNotificationSettings = def + runDB . insertEntity $ adjUser User{..} + +lawsCheckHspec :: Typeable a => Proxy a -> [Proxy a -> Laws] -> Spec +lawsCheckHspec p = parallel . describe (show $ typeRep p) . mapM_ (checkHspec . ($ p)) where - userMatrikelnummer = "DummyMatrikelnummer" + checkHspec (Laws className properties) = describe className $ + forM_ properties $ \(name, prop) -> it name $ property prop diff --git a/test/Utils/DateTimeSpec.hs b/test/Utils/DateTimeSpec.hs new file mode 100644 index 000000000..b2480749d --- /dev/null +++ b/test/Utils/DateTimeSpec.hs @@ -0,0 +1,21 @@ +module Utils.DateTimeSpec where + +import TestImport + +instance Arbitrary DateTimeFormat where + arbitrary = DateTimeFormat <$> arbitrary + shrink = genericShrink + +instance Arbitrary SelDateTimeFormat where + arbitrary = genericArbitrary + shrink = genericShrink +instance CoArbitrary SelDateTimeFormat where + coarbitrary = genericCoarbitrary + +spec :: Spec +spec = do + parallel $ do + lawsCheckHspec (Proxy @DateTimeFormat) + [ eqLaws, ordLaws, showReadLaws, jsonLaws, persistFieldLaws, hashableLaws ] + lawsCheckHspec (Proxy @SelDateTimeFormat) + [ eqLaws, ordLaws, showReadLaws, boundedEnumLaws, finiteLaws, hashableLaws, jsonLaws, jsonKeyLaws ] diff --git a/test/UtilsSpec.hs b/test/UtilsSpec.hs new file mode 100644 index 000000000..4eb5d9e1f --- /dev/null +++ b/test/UtilsSpec.hs @@ -0,0 +1,37 @@ +module UtilsSpec where + +import TestImport +import Utils + +import qualified Crypto.Saltine.Core.SecretBox as SecretBox +import Data.Aeson + +instance Arbitrary Value where + arbitrary = sized $ \size -> if + | size <= 0 -> oneof [pure Null, bool', number, string] + | otherwise -> resize (size `div` 2) $ oneof [pure Null, bool', number, string, array, object'] + where + bool' = Bool <$> arbitrary + number = Number <$> arbitrary + string = String <$> arbitrary + array = Array <$> arbitrary + object' = Object <$> arbitrary + shrink = genericShrink + +instance Arbitrary SecretBoxEncoding where + arbitrary = arbitraryBoundedEnum + +spec :: Spec +spec = do + describe "encodedSecretBox" $ do + it "has comptabile encryption/decryption" . property $ + \val pretty -> ioProperty $ do + sKey <- SecretBox.newKey + ciphertext <- encodedSecretBox' sKey pretty (val :: Value) + plaintext <- throwExceptT $ encodedSecretBoxOpen' sKey ciphertext + return $ plaintext == val + it "produces pretty ciphertext" . property $ + \val -> ioProperty $ do + sKey <- SecretBox.newKey + ciphertext <- encodedSecretBox' sKey SecretBoxPretty (val :: Value) + return . all ((<= 76) . length) $ lines ciphertext diff --git a/testdata/AbgabeH10-1.hs b/testdata/AbgabeH10-1.hs new file mode 100644 index 000000000..07a3d0124 --- /dev/null +++ b/testdata/AbgabeH10-1.hs @@ -0,0 +1,3 @@ +Abgabe zu H10-1: + + Ich habe keine Ahnung wie ich die H10-1 lösen soll, sorry!
+ #{encodePrettyToTextBuilder t} + +
^{nameWidget userDisplayName userSurname} |] getCHiWisR :: TermId -> SchoolId -> CourseShorthand -> Handler Html -getCHiWisR tid ssh csh = undefined -- TODO +getCHiWisR = error "CHiWisR: Not implemented" + +getCNotesR, postCNotesR :: TermId -> SchoolId -> CourseShorthand -> Handler Html +-- NOTE: The route getNotesR is abused for correctorORlecturer access rights! +getCNotesR = error "CNotesR: Not implemented" +postCNotesR = error "CNotesR: Not implemented" diff --git a/src/Handler/CryptoIDDispatch.hs b/src/Handler/CryptoIDDispatch.hs index 9a744f208..54c2ec760 100644 --- a/src/Handler/CryptoIDDispatch.hs +++ b/src/Handler/CryptoIDDispatch.hs @@ -1,23 +1,9 @@ -{-# LANGUAGE NoImplicitPrelude - , DataKinds - , KindSignatures - , TypeFamilies - , FlexibleInstances - , TypeOperators - , RankNTypes - , PolyKinds - , RecordWildCards - , MultiParamTypeClasses - , ScopedTypeVariables - , ViewPatterns - #-} - module Handler.CryptoIDDispatch ( getCryptoUUIDDispatchR , getCryptoFileNameDispatchR ) where -import Import hiding (Proxy) +import Import import Data.Proxy diff --git a/src/Handler/Home.hs b/src/Handler/Home.hs index 73aa370d2..ae3691266 100644 --- a/src/Handler/Home.hs +++ b/src/Handler/Home.hs @@ -1,48 +1,15 @@ -{-# LANGUAGE RecordWildCards #-} -{-# LANGUAGE NoImplicitPrelude #-} -{-# LANGUAGE OverloadedStrings #-} -{-# LANGUAGE TemplateHaskell #-} -{-# LANGUAGE QuasiQuotes #-} -{-# LANGUAGE MultiParamTypeClasses #-} -{-# LANGUAGE IncoherentInstances #-} -- why is this needed? Instance for "display deadline" ought to be clear -{-# LANGUAGE TypeFamilies #-} -{-# LANGUAGE FlexibleContexts #-} -{-# LANGUAGE PartialTypeSignatures #-} - module Handler.Home where import Import import Handler.Utils import qualified Data.Map as Map - -import Data.Time hiding (formatTime) --- import qualified Data.Text as T --- import Yesod.Form.Bootstrap3 - --- import Web.PathPieces (showToPathPiece, readFromPathPiece) - --- import Control.Lens --- import Colonnade hiding (fromMaybe, singleton) --- import Yesod.Colonnade +import qualified Data.Set as Set import qualified Database.Esqueleto as E --- import Text.Shakespeare.Text - +import Jobs import Development.GitRev --- import qualified Data.UUID.Cryptographic as UUID - - --- CONSTANTS: TODO: make configurable elsewhere -offSheetDeadlines :: NominalDiffTime -offSheetDeadlines = 15 -offCourseDeadlines :: NominalDiffTime -offCourseDeadlines = 15 ---offExamDeadlines :: NominalDiffTime ---offExamDeadlines = 15 - - getHomeR :: Handler Html getHomeR = do @@ -58,43 +25,45 @@ homeAnonymous = do let tableData :: E.SqlExpr (Entity Course) -> E.SqlQuery (E.SqlExpr (Entity Course)) tableData course = do - E.where_ $ (E.not_ $ E.isNothing $ course E.^. CourseRegisterFrom) -- DO: do this with isAuthorized in dbtProj + E.where_ $ E.not_ (E.isNothing $ course E.^. CourseRegisterFrom) -- DO: do this with isAuthorized in dbtProj E.&&. (course E.^. CourseRegisterFrom E.<=. E.val (Just cTime)) - E.&&. ((E.isNothing $ course E.^. CourseRegisterTo) - E.||. (course E.^. CourseRegisterTo E.>=. E.val (Just cTime))) + E.&&. ( E.isNothing (course E.^. CourseRegisterTo) + E.||. course E.^. CourseRegisterTo E.>=. E.val (Just cTime) + ) return course colonnade :: Colonnade Sortable (DBRow (Entity Course)) (DBCell (HandlerT UniWorX IO) ()) colonnade = mconcat [ -- dbRow - sortable (Just "term") (i18nCell MsgTerm) $ \DBRow{ dbrOutput=(Entity {entityVal = course}) } -> + sortable (Just "term") (i18nCell MsgTerm) $ \DBRow{ dbrOutput=Entity{entityVal = course} } -> textCell $ display $ courseTerm course - , sortable (Just "school") (i18nCell MsgCourseSchool) $ \DBRow{ dbrOutput=(Entity {entityVal = course}) } -> do + , sortable (Just "school") (i18nCell MsgCourseSchool) $ \DBRow{ dbrOutput=Entity{entityVal = course} } -> textCell $ display $ courseSchool course - , sortable (Just "course") (i18nCell MsgCourse) $ \DBRow{ dbrOutput=(Entity {entityVal = course}) } -> do + , sortable (Just "course") (i18nCell MsgCourse) $ \DBRow{ dbrOutput=Entity{entityVal = course} } -> do let tid = courseTerm course ssh = courseSchool course csh = courseShorthand course anchorCell (CourseR tid ssh csh CShowR) (toWidget $ display csh) - , sortable (Just "deadline") (i18nCell MsgRegisterTo) $ \DBRow{ dbrOutput=(Entity {entityVal = course}) } -> + , sortable (Just "deadline") (i18nCell MsgRegisterTo) $ \DBRow{ dbrOutput=Entity{entityVal = course} } -> cell $ traverse (formatTime SelFormatDateTime) (courseRegisterTo course) >>= maybe mempty toWidget ] - ((), courseTable) <- dbTable def $ DBTable + courseTable <- runDB $ dbTableWidget' def DBTable { dbtSQLQuery = tableData + , dbtRowKey = (E.^. CourseId) , dbtColonnade = colonnade , dbtProj = return , dbtSorting = Map.fromList [ ( "term" - , SortColumn $ \(course) -> course E.^. CourseTerm + , SortColumn $ \course -> course E.^. CourseTerm ) , ( "school" - , SortColumn $ \(course) -> course E.^. CourseSchool + , SortColumn $ \course -> course E.^. CourseSchool ) , ( "course" - , SortColumn $ \(course) -> course E.^. CourseShorthand + , SortColumn $ \course -> course E.^. CourseShorthand ) , ( "deadline" - , SortColumn $ \(course) -> course E.^. CourseRegisterTo + , SortColumn $ \course -> course E.^. CourseRegisterTo ) ] , dbtFilter = mempty {- [ ( "term" @@ -103,24 +72,24 @@ homeAnonymous = do | otherwise -> course E.^. CourseTerm `E.in_` E.valList (Set.toList tids) ) ] -} + , dbtFilterUI = mempty , dbtStyle = def + , dbtParams = def , dbtIdent = "upcomingdeadlines" :: Text } - let features = $(widgetFile "featureList") - addMessage Warning "Vorabversion! Die Implementierung von Uni2work ist noch nicht abgeschlossen!" - defaultLayout $ do - $(widgetFile "dsgvDisclaimer") + -- let features = $(widgetFile "featureList") + -- addMessage Warning "Vorabversion! Die Implementierung von Uni2work ist noch nicht abgeschlossen!" + defaultLayout + -- (widgetFile "dsgvDisclaimer") $(widgetFile "home") homeUser :: Key User -> Handler Html homeUser uid = do cTime <- liftIO getCurrentTime - let fTime = addUTCTime (offSheetDeadlines * nominalDay) cTime - - tableData :: -- E.InnerJoin (E.InnerJoin (E.SqlExpr (Entity CourseParticipant)) - -- (E.SqlExpr (Entity Course ))) - -- (E.SqlExpr (Entity Sheet )) - _ -> E.SqlQuery ( E.SqlExpr (E.Value (Key Term)) + let tableData :: E.LeftOuterJoin + (E.InnerJoin (E.InnerJoin (E.SqlExpr (Entity CourseParticipant)) (E.SqlExpr (Entity Course))) (E.SqlExpr (Entity Sheet))) + (E.InnerJoin (E.SqlExpr (Maybe (Entity Submission))) (E.SqlExpr (Maybe (Entity SubmissionUser)))) + -> E.SqlQuery ( E.SqlExpr (E.Value (Key Term)) , E.SqlExpr (E.Value SchoolId) , E.SqlExpr (E.Value CourseShorthand) , E.SqlExpr (E.Value SheetName) @@ -128,14 +97,12 @@ homeUser uid = do , E.SqlExpr (E.Value (Maybe SubmissionId))) tableData ((participant `E.InnerJoin` course `E.InnerJoin` sheet) `E.LeftOuterJoin` (submission `E.InnerJoin` subuser)) = do E.on $ submission E.?. SubmissionId E.==. subuser E.?. SubmissionUserSubmission - E.&&. (E.just $ E.val uid) E.==. subuser E.?. SubmissionUserUser + E.&&. E.just (E.val uid) E.==. subuser E.?. SubmissionUserUser E.on $ submission E.?. SubmissionSheet E.==. E.just(sheet E.^. SheetId) E.on $ course E.^. CourseId E.==. sheet E.^. SheetCourse E.on $ course E.^. CourseId E.==. participant E.^. CourseParticipantCourse E.where_ $ participant E.^. CourseParticipantUser E.==. E.val uid E.&&. sheet E.^. SheetActiveTo E.>=. E.val cTime - E.&&. sheet E.^. SheetActiveTo E.<=. E.val fTime - -- E.limit nrSheetDeadlines -- arbitrary limits are not intuitive return ( course E.^. CourseTerm , course E.^. CourseSchool @@ -166,15 +133,16 @@ homeUser uid = do anchorCell (CSheetR tid ssh csh shn SShowR) (toWidget $ display shn) , sortable (Just "deadline") (i18nCell MsgDeadline) $ \DBRow{ dbrOutput=(_, _, _, _, E.Value deadline, _) } -> cell $ formatTime SelFormatDateTime deadline >>= toWidget - , sortable (Just "done") (i18nCell MsgDone) $ \(DBRow{ dbrOutput=(E.Value tid, E.Value ssh, E.Value csh, E.Value shn, _, E.Value mbsid) }) -> + , sortable (Just "done") (i18nCell MsgDone) $ \DBRow{ dbrOutput=(E.Value tid, E.Value ssh, E.Value csh, E.Value shn, _, E.Value mbsid) } -> case mbsid of Nothing -> mempty (Just sid) -> anchorCellM (CSubmissionR tid ssh csh shn <$> encrypt sid <*> pure SubShowR) tickmark ] - let validator = def & defaultSorting [("done",SortDesc), ("deadline",SortDesc)] - ((), sheetTable) <- dbTable validator $ DBTable + let validator = def & defaultSorting [SortDescBy "done", SortAscBy "deadline"] + sheetTable <- runDB $ dbTableWidget' validator DBTable { dbtSQLQuery = tableData + , dbtRowKey = \((_ `E.InnerJoin` _ `E.InnerJoin` sheet) `E.LeftOuterJoin` _) -> sheet E.^. SheetId , dbtColonnade = colonnade , dbtProj = \row@DBRow{ dbrOutput = (E.Value tid, E.Value ssh, E.Value csh, E.Value shn, _, _) } -> row <$ guardM (lift $ (== Authorized) <$> evalAccessDB (CSheetR tid ssh csh shn SShowR) False) @@ -204,14 +172,16 @@ homeUser uid = do | otherwise -> course E.^. CourseTerm `E.in_` E.valList (Set.toList tids) ) ] -} + , dbtFilterUI = mempty , dbtStyle = def { dbsEmptyStyle = DBESNoHeading, dbsEmptyMessage = MsgNoUpcomingSheetDeadlines } + , dbtParams = def , dbtIdent = "upcomingdeadlines" :: Text } - addMessage Warning "Vorabversion! Die Implementierung von Uni2work ist noch nicht abgeschlossen." - defaultLayout $ do + -- addMessage Warning "Vorabversion! Die Implementierung von Uni2work ist noch nicht abgeschlossen." + defaultLayout $ -- setTitle "Willkommen zum Uni2work Test!" $(widgetFile "homeUser") - $(widgetFile "dsgvDisclaimer") + -- (widgetFile "dsgvDisclaimer") getVersionR :: Handler TypedContent @@ -224,3 +194,93 @@ getVersionR = selectRep $ do $(widgetFile "versionHistory") provideRep $ return ($gitDescribe :: Text) + + + + +data HelpIdentOptions = HIUser | HIEmail | HIAnonymous + deriving (Eq, Ord, Bounded, Enum, Show, Read) + +instance Universe HelpIdentOptions +instance Finite HelpIdentOptions + +nullaryPathPiece ''HelpIdentOptions (camelToPathPiece' 1) +embedRenderMessage ''UniWorX ''HelpIdentOptions (("Help" <>) . dropPrefix "HI") + +data HelpForm = HelpForm + { hfReferer:: Maybe (Route UniWorX) + , hfUserId :: Either (Maybe Address) UserId + , hfRequest:: Text + } + +helpForm :: Maybe (Route UniWorX) -> Maybe UserId -> AForm _ HelpForm +helpForm mReferer mUid = HelpForm + <$> aopt routeField (fslI MsgHelpProblemPage & inputReadonly) (Just <$> mReferer) + <*> multiActionA (fslI MsgHelpAnswer) identActions (HIUser <$ mUid) + <*> (unTextarea <$> areq textareaField (fslI MsgHelpRequest) Nothing) + <* submitButton + where + identActions :: Map _ (AForm _ (Either (Maybe Address) UserId)) + identActions = Map.fromList $ case mUid of + (Just uid) -> (HIUser, pure $ Right uid):defaultActions + Nothing -> defaultActions + + defaultActions = + [ (HIEmail, Left . Just <$> (Address <$> aopt textField (fslI MsgName) Nothing <*> apreq emailField (fslI MsgEMail) Nothing)) + , (HIAnonymous, pure $ Left Nothing) + ] + +getHelpR, postHelpR :: Handler Html +getHelpR = postHelpR +postHelpR = do + mUid <- maybeAuthId + mReferer <- flip formResultMaybe return <=< runInputGetResult $ iopt routeField (toPathPiece GetReferer) + + ((res,formWidget),formEnctype) <- runFormPost $ renderAForm FormStandard $ helpForm mReferer mUid + + formResultModal res HelpR $ \HelpForm{..} -> do + now <- liftIO getCurrentTime + hfReferer' <- traverse toTextUrl hfReferer + queueJob' JobHelpRequest + { jSender = hfUserId + , jHelpRequest = hfRequest + , jRequestTime = now + , jReferer = hfReferer' + } + tell . pure =<< messageI Success MsgHelpSent + + defaultLayout $ do + setTitle "Hilfe" -- TODO: International + isModal <- hasCustomHeader HeaderIsModal + $(widgetFile "help") + + +getAuthPredsR, postAuthPredsR :: Handler Html +getAuthPredsR = postAuthPredsR +postAuthPredsR = do + (AuthTagActive authTagCurrentActive) <- fromMaybe def <$> lookupSessionJson SessionActiveAuthTags + + let + blacklist = Set.fromList [ AuthFree, AuthDevelopment, AuthDeprecated ] + taForm authTag + | authTag `Set.member` blacklist = aforced checkBoxField (fslI authTag) (authTagIsActive def authTag) + | otherwise = fromMaybe False <$> aopt checkBoxField (fslI authTag) (Just . Just $ authTagCurrentActive authTag) + + ((authActiveRes, authActiveWidget), authActiveEnctype) <- runFormPost . renderAForm FormStandard + $ AuthTagActive + <$> (submitButton -- for convenience, avoids frequent scrolling + *> funcForm taForm (fslI MsgActiveAuthTags) True) + <* submitButton + + mReferer <- runMaybeT $ do + param <- MaybeT (lookupGetParam $ toPathPiece GetReferer) <|> MaybeT (lookupPostParam $ toPathPiece GetReferer) + MaybeT . return $ fromPathPiece param + formResult authActiveRes $ \authTagActive -> do + setSessionJson SessionActiveAuthTags authTagActive + modifySessionJson SessionInactiveAuthTags . fmap $ Set.filter (not . authTagIsActive authTagActive) + addMessageI Success MsgAuthPredsActiveChanged + redirect $ fromMaybe AuthPredsR mReferer + + defaultLayout $ do + setTitleI MsgAuthPredsActive + $(widgetFile "authpreds") diff --git a/src/Handler/Profile.hs b/src/Handler/Profile.hs index 874971fec..38f064dd8 100644 --- a/src/Handler/Profile.hs +++ b/src/Handler/Profile.hs @@ -1,17 +1,3 @@ -{-# LANGUAGE NoImplicitPrelude #-} -{-# LANGUAGE MultiWayIf, LambdaCase #-} -{-# LANGUAGE OverloadedStrings #-} -{-# LANGUAGE RecordWildCards #-} -{-# LANGUAGE PatternSynonyms #-} -{-# LANGUAGE PartialTypeSignatures #-} -{-# LANGUAGE ScopedTypeVariables #-} -{-# LANGUAGE QuasiQuotes #-} -{-# LANGUAGE TemplateHaskell #-} -{-# LANGUAGE MultiParamTypeClasses #-} -{-# LANGUAGE TypeFamilies #-} -{-# LANGUAGE TypeOperators #-} -{-# LANGUAGE FlexibleInstances #-} - module Handler.Profile where import Import @@ -37,6 +23,7 @@ data SettingsForm = SettingsForm , stgDate :: DateTimeFormat , stgTime :: DateTimeFormat , stgDownloadFiles :: Bool + , stgNotificationSettings :: NotificationSettings } makeSettingForm :: Maybe SettingsForm -> Form SettingsForm @@ -53,21 +40,25 @@ makeSettingForm template = identForm FIDsettings $ \html -> do <*> areq checkBoxField (fslI MsgDownloadFiles & setTooltip MsgDownloadFilesTip ) (stgDownloadFiles <$> template) + <*> (NotificationSettings <$> funcForm nsForm (fslI MsgNotificationSettings) True) <* submitButton return (result, widget) -- no validation required here + where + nsForm nt = fromMaybe False <$> aopt checkBoxField (fslI nt) (Just $ flip notificationAllowed nt . stgNotificationSettings <$> template) - -getProfileR :: Handler Html -getProfileR = do +getProfileR, postProfileR :: Handler Html +getProfileR = postProfileR +postProfileR = do (uid, User{..}) <- requireAuthPair - let settingsTemplate = Just $ SettingsForm + let settingsTemplate = Just SettingsForm { stgMaxFavourties = userMaxFavourites , stgTheme = userTheme , stgDateTime = userDateTimeFormat , stgDate = userDateFormat , stgTime = userTimeFormat , stgDownloadFiles = userDownloadFiles + , stgNotificationSettings = userNotificationSettings } ((res,formWidget), formEnctype) <- runFormPost $ makeSettingForm settingsTemplate case res of @@ -79,146 +70,167 @@ getProfileR = do , UserDateFormat =. stgDate , UserTimeFormat =. stgTime , UserDownloadFiles =. stgDownloadFiles + , UserNotificationSettings =. stgNotificationSettings ] when (stgMaxFavourties < userMaxFavourites) $ do -- prune Favourites to user-defined size oldFavs <- selectKeysList [ CourseFavouriteUser ==. uid] [ Desc CourseFavouriteTime - , OffsetBy $ stgMaxFavourties + , OffsetBy stgMaxFavourties ] mapM_ delete oldFavs - addMessageI Info $ MsgSettingsUpdate + addMessageI Info MsgSettingsUpdate redirect ProfileR -- TODO: them change does not happen without redirect - (FormFailure msgs) -> forM_ msgs $ (addMessage Warning) . toHtml + (FormFailure msgs) -> forM_ msgs $ addMessage Warning . toHtml _ -> return () - - (admin_rights,lecturer_rights,lecture_corrector,studies) <- runDB $ (,,,) <$> - (E.select $ E.from $ \(adright `E.InnerJoin` school) -> do - E.where_ $ adright E.^. UserAdminUser E.==. E.val uid - E.on $ adright E.^. UserAdminSchool E.==. school E.^. SchoolId - return (school E.^. SchoolShorthand) - ) - <*> - (E.select $ E.from $ \(lecright `E.InnerJoin` school) -> do - E.where_ $ lecright E.^. UserLecturerUser E.==. E.val uid - E.on $ lecright E.^. UserLecturerSchool E.==. school E.^. SchoolId - return (school E.^. SchoolShorthand) - ) - <*> - (E.select $ E.distinct $ E.from $ \(sheet `E.InnerJoin` corrector `E.InnerJoin` course) -> do - E.on $ sheet E.^. SheetCourse E.==. course E.^. CourseId - E.on $ sheet E.^. SheetId E.==. corrector E.^. SheetCorrectorSheet - E.where_ $ corrector E.^. SheetCorrectorUser E.==. E.val uid - return (course E.^. CourseTerm, course E.^. CourseSchool, course E.^. CourseShorthand) - ) - <*> - (E.select $ E.from $ \(studydegree `E.InnerJoin` studyfeat `E.InnerJoin` studyterms) -> 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) - ) - let formText = Just MsgSettings + let formText = Nothing :: Maybe UniWorXMessage actionUrl = ProfileR - settingsForm = $(widgetFile "formPageI18n") defaultLayout $ do setTitle . toHtml $ userIdent <> "'s User page" - $(widgetFile "profile") - $(widgetFile "dsgvDisclaimer") - -postProfileR :: Handler Html -postProfileR = do - -- TODO - getProfileR + $(widgetFile "formPageI18n") postProfileDataR :: Handler Html postProfileDataR = do - ((btnResult,_), _) <- runFormPost $ buttonForm + ((btnResult,_), _) <- runFormPost buttonForm case btnResult of (FormSuccess BtnDelete) -> do (uid, User{..}) <- requireAuthPair - addMessage Warning "Delete-Knopf gedrückt" - addMessage Error "Löschen der Daten wurde noch nicht implementiert." - -- first determine all submission that solely depend on this user: - -- SubmissionGroup / SubmissionGroupUser - -- Submission / SubmissionUser - -- runDB $ deleteCascade uid - (FormSuccess BtnAbort ) -> do - addMessageI Info MsgAborted - redirect ProfileDataR - _other -> return () - getProfileDataR + clearCreds False -- Logout-User + ((deletedSubmissions,groupSubmissions),deletedSubmissionGroups) <- runDB $ deleteUser uid + -- addMessageIHamlet + $(addMessageFile Success "templates/deletedUser.hamlet") -- USE THIS ONE + -- addMessageI Success $ MsgDeleteUser deletedSubmissions + -- when (groupSubmissions > 0) $ addMessageI Info $ MsgDeleteUserGroupSubmissions groupSubmissions + defaultLayout + $(widgetFile "deletedUser") + + -- (FormSuccess BtnAbort ) -> do + -- addMessageI Info MsgAborted + -- redirect ProfileDataR + _other -> getProfileDataR -getProfileDataR :: Handler Html +deleteUser :: UserId -> DB ((Int,Int),Int64) -- TODO: Restrict deletions for lecturers, tutors and students in course that won't allow deregistration +deleteUser duid = do + -- E.deleteCount for submissions is not cascading, hence we first select and then delete manually + -- We delete all files tied to submissions where the user is the lone submissionUser + + -- Do not deleteCascade submissions where duid is the corrector: + updateWhere [SubmissionRatingBy ==. Just duid] [SubmissionRatingBy =. Nothing] + + groupSubmissions <- selectSubmissionsWhere (\numBuddies -> numBuddies E.>. E.val (0::Int64)) + singleSubmissions <- selectSubmissionsWhere (\numBuddies -> numBuddies E.==. E.val (0::Int64)) + deleteCascade duid + forM_ singleSubmissions $ \(E.Value submissionId) -> do + deleteFileIds <- map E.unValue <$> getSubmissionFiles submissionId + deleteCascade submissionId + deleteCascadeWhere [FileId <-. deleteFileIds] -- TODO: throws exception for de-duplicated files + + deletedSubmissionGroups <- deleteSingleSubmissionGroups + return ((length singleSubmissions, length groupSubmissions),deletedSubmissionGroups) + where + selectSubmissionsWhere :: (E.SqlExpr (E.Value Int64) -> E.SqlExpr (E.Value Bool)) -> DB [E.Value (Key Submission)] + selectSubmissionsWhere whereBuddies = E.select $ E.from $ \(submission `E.InnerJoin` suser) -> do + E.on $ submission E.^. SubmissionId E.==. suser E.^. SubmissionUserSubmission + let numBuddies = E.sub_select $ E.from $ \subUsers -> do + E.where_ $ subUsers E.^. SubmissionUserSubmission E.==. submission E.^. SubmissionId + E.&&. subUsers E.^. SubmissionUserUser E.!=. E.val duid + return E.countRows + E.where_ $ suser E.^. SubmissionUserUser E.==. E.val duid + E.&&. whereBuddies numBuddies + return $ submission E.^. SubmissionId + + getSubmissionFiles :: SubmissionId -> DB [E.Value (Key File)] + getSubmissionFiles subId = E.select $ E.from $ \file -> do + E.where_ $ E.exists $ E.from $ \submissionFile -> + E.where_ $ submissionFile E.^. SubmissionFileSubmission E.==. E.val subId + E.&&. submissionFile E.^. SubmissionFileFile E.==. file E.^. FileId + return $ file E.^. FileId + + deleteSingleSubmissionGroups = E.deleteCount $ E.from $ \submissionGroup -> do + E.where_ $ E.exists $ E.from $ \subGroupUser -> + E.where_ $ subGroupUser E.^. SubmissionGroupUserSubmissionGroup E.==. submissionGroup E.^. SubmissionGroupId + E.&&. subGroupUser E.^. SubmissionGroupUserUser E.==. E.val duid + E.where_ $ E.notExists $ E.from $ \subGroupUser -> + E.where_ $ subGroupUser E.^. SubmissionGroupUserSubmissionGroup E.==. submissionGroup E.^. SubmissionGroupId + E.&&. subGroupUser E.^. SubmissionGroupUserUser E.!=. E.val duid + + + + + + +getProfileDataR :: Handler Html getProfileDataR = do (uid, User{..}) <- requireAuthPair -- mr <- getMessageRender - -- Tabelle mit eigenen Kursen - (hasRows, ownedCoursesTable) <- mkOwnedCoursesTable uid - -- Tabelle mit allen Teilnehmer: Kurs (link), Datum - enrolledCoursesTable <- mkEnrolledCoursesTable uid - -- Tabelle mit allen Klausuren und Noten - examTable <- return [whamlet| Klausuren werden momentan leider noch nicht unterstützt.|] - -- Tabelle mit allen Abgaben und Abgabe-Gruppen - submissionTable <- mkSubmissionTable uid - -- Tabelle mit allen Abgabegruppen - submissionGroupTable <- mkSubmissionGroupTable uid - -- Tabelle mit allen Korrektor-Aufgaben - correctionsTable <- mkCorrectionsTable uid - -- Tabelle mit allen eigenen Tutorials - ownTutorialTable <- return [whamlet| Übungsgruppen werden momentan leider noch nicht unterstützt.|] - -- Tabelle mit allen Tutorials - tutorialTable <- return [whamlet| Übungsgruppen werden momentan leider noch nicht unterstützt.|] + (admin_rights,lecturer_rights,lecture_corrector,studies) <- runDB $ (,,,) <$> + E.select + ( E.from $ \(adright `E.InnerJoin` school) -> do + E.where_ $ adright E.^. UserAdminUser E.==. E.val uid + E.on $ adright E.^. UserAdminSchool E.==. school E.^. SchoolId + return (school E.^. SchoolShorthand) + ) + <*> + E.select + ( E.from $ \(lecright `E.InnerJoin` school) -> do + E.where_ $ lecright E.^. UserLecturerUser E.==. E.val uid + E.on $ lecright E.^. UserLecturerSchool E.==. school E.^. SchoolId + return (school E.^. SchoolShorthand) + ) + <*> + E.select + ( E.distinct $ E.from $ \(sheet `E.InnerJoin` corrector `E.InnerJoin` course) -> do + E.on $ sheet E.^. SheetCourse E.==. course E.^. CourseId + E.on $ sheet E.^. SheetId E.==. corrector E.^. SheetCorrectorSheet + E.where_ $ corrector E.^. SheetCorrectorUser E.==. E.val uid + return (course E.^. CourseTerm, course E.^. CourseSchool, course E.^. CourseShorthand) + ) + <*> + E.select + ( E.from $ \(studydegree `E.InnerJoin` studyfeat `E.InnerJoin` studyterms) -> 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) + ) + ( (hasRows, ownedCoursesTable) + , enrolledCoursesTable + , submissionTable + , submissionGroupTable + , correctionsTable + ) <- runDB $ (,,,,) + <$> mkOwnedCoursesTable uid -- Tabelle mit eigenen Kursen + <*> mkEnrolledCoursesTable uid -- Tabelle mit allen Teilnehmer: Kurs (link), Datum + <*> mkSubmissionTable uid -- Tabelle mit allen Abgaben und Abgabe-Gruppen + <*> mkSubmissionGroupTable uid -- Tabelle mit allen Abgabegruppen + <*> mkCorrectionsTable uid -- Tabelle mit allen Korrektor-Aufgaben + + + let examTable = [whamlet| Klausuren werden momentan leider noch nicht unterstützt.|] + let ownTutorialTable = [whamlet|Übungsgruppen werden momentan leider noch nicht unterstützt.|] + let tutorialTable = [whamlet|Übungsgruppen werden momentan leider noch nicht unterstützt.|] + -- Delete Button - (btnWdgt, btnEnctype) <- generateFormPost (buttonForm :: Form BtnDelete) - -- TODO: move this into a Message and/or Widget-File - let delWdgt = [whamlet| -