diff --git a/routes b/routes index b340da62e..63263989e 100644 --- a/routes +++ b/routes @@ -255,8 +255,9 @@ !/*WellKnownFileName WellKnownR GET !free -- OSIS CSV Export Demo -/lms/#SchoolId/#QualificationShorthand LmsR GET POST -/lms/#SchoolId/#QualificationShorthand/users LmsUsersR GET POST -/lms/#SchoolId/#QualificationShorthand/userlist LmsUserlistR GET POST -/lms/#SchoolId/#QualificationShorthand/result LmsResultR GET POST - \ No newline at end of file +/lms/#SchoolId/#QualificationShorthand LmsR GET POST +/lms/#SchoolId/#QualificationShorthand/users LmsUsersR GET POST +/lms/#SchoolId/#QualificationShorthand/userlist LmsUserlistR GET POST +/lms/#SchoolId/#QualificationShorthand/result LmsResultR GET POST +/lms/#SchoolId/#QualificationShorthand/result/upload LmsResultUploadR GET POST +/lms/test LmsTestR GET \ No newline at end of file diff --git a/src/Foundation/Navigation.hs b/src/Foundation/Navigation.hs index f9b973078..5d1b5c677 100644 --- a/src/Foundation/Navigation.hs +++ b/src/Foundation/Navigation.hs @@ -137,6 +137,8 @@ breadcrumb (LmsR _sid _qsh) = i18nCrumb MsgMenuLms Nothing breadcrumb (LmsUsersR sid qsh) = i18nCrumb MsgMenuLmsUsers $ Just $ LmsR sid qsh breadcrumb (LmsUserlistR sid qsh) = i18nCrumb MsgMenuLmsUserlist $ Just $ LmsR sid qsh breadcrumb (LmsResultR sid qsh) = i18nCrumb MsgMenuLmsResult $ Just $ LmsR sid qsh +breadcrumb (LmsResultUploadR sid qsh) = i18nCrumb MsgMenuLmsResult $ Just $ LmsResultR sid qsh +breadcrumb LmsTestR = i18nCrumb MsgMenuLmsResult Nothing breadcrumb ProfileR = i18nCrumb MsgBreadcrumbProfile Nothing breadcrumb SetDisplayEmailR = i18nCrumb MsgUserDisplayEmail $ Just ProfileR diff --git a/src/Handler/LMS.hs b/src/Handler/LMS.hs index c757d23fb..be6dd5a8c 100644 --- a/src/Handler/LMS.hs +++ b/src/Handler/LMS.hs @@ -9,6 +9,8 @@ module Handler.LMS , getLmsUsersR , postLmsUsersR , getLmsUserlistR, postLmsUserlistR , getLmsResultR , postLmsResultR + , getLmsResultUploadR , postLmsResultUploadR + , getLmsTestR ) where diff --git a/src/Handler/LMS/Result.hs b/src/Handler/LMS/Result.hs index 473f1443a..9f04c35bf 100644 --- a/src/Handler/LMS/Result.hs +++ b/src/Handler/LMS/Result.hs @@ -2,6 +2,8 @@ module Handler.LMS.Result ( getLmsResultR, postLmsResultR + , getLmsResultUploadR, postLmsResultUploadR + , getLmsTestR ) where @@ -199,3 +201,73 @@ postLmsResultR sid qsh = do siteLayoutMsg MsgMenuLmsResult $ do setTitleI MsgMenuLmsResult $(widgetFile "lms-result") + + +-- Direct File Upload/Download +getLmsTestR :: Handler Html +getLmsTestR = siteLayoutMsg MsgMenuLmsResult $ do + setTitleI MsgMenuLmsResult + [whamlet|$newline never + Hello! + |] + + +getLmsResultUploadR :: SchoolId -> QualificationShorthand -> Handler Html +getLmsResultUploadR _sid _qsh = do + -- _qid <- runDB $ getKeyBy404 $ UniqueSchoolShort sid qsh + ((_,widget), enctype) <- runFormPost makeResultUploadForm + siteLayoutMsg MsgMenuLmsResult $ do + setTitleI MsgMenuLmsResult + [whamlet|$newline never +