diff --git a/routes b/routes index 7cffd79ba..c36635632 100644 --- a/routes +++ b/routes @@ -291,6 +291,7 @@ /lms/#SchoolId/#QualificationShorthand LmsR GET POST -- new V2 LMS Interface /lms/#SchoolId/#QualificationShorthand/learners LmsLearnersR GET +/lms/#SchoolId/#QualificationShorthand/learners/orphans LmsOrphansR GET /lms/#SchoolId/#QualificationShorthand/learners/direct LmsLearnersDirectR GET !token -- LMS /lms/#SchoolId/#QualificationShorthand/report LmsReportR GET POST /lms/#SchoolId/#QualificationShorthand/report/upload LmsReportUploadR GET POST diff --git a/src/Foundation/Navigation.hs b/src/Foundation/Navigation.hs index 42e00cbd1..979fc277c 100644 --- a/src/Foundation/Navigation.hs +++ b/src/Foundation/Navigation.hs @@ -200,6 +200,7 @@ breadcrumb (LmsR ssh qsh) = useRunDB . maybeT (i18nCrumb MsgBrea -- v2 breadcrumb (LmsLearnersR ssh qsh) = i18nCrumb MsgMenuLmsLearners $ Just $ LmsR ssh qsh breadcrumb (LmsLearnersDirectR ssh qsh) = i18nCrumb MsgMenuLmsLearners $ Just $ LmsLearnersR ssh qsh -- never displayed, TypedContent +breadcrumb (LmsOrphansR ssh qsh) = i18nCrumb MsgLmsOrphans $ Just $ LmsLearnersR ssh qsh breadcrumb (LmsReportR ssh qsh) = i18nCrumb MsgMenuLmsReport $ Just $ LmsR ssh qsh breadcrumb (LmsReportUploadR ssh qsh) = i18nCrumb MsgMenuLmsUpload $ Just $ LmsReportR ssh qsh breadcrumb (LmsReportDirectR ssh qsh) = i18nCrumb MsgMenuLmsUpload $ Just $ LmsReportR ssh qsh -- never displayed @@ -2436,6 +2437,12 @@ pageActions (LmsR sid qsh) = return -- navLink = defNavLink MsgMenuLmsFake $ LmsFakeR sid qsh -- } ] +pageActions (LmsLearnersR sid qsh) = return + [ NavPageActionPrimary + { navLink = defNavLink MsgLmsOrphans $ LmsOrphansR sid qsh + , navChildren = [] + } + ] pageActions ApiDocsR = return [ NavPageActionPrimary { navLink = NavLink diff --git a/src/Handler/LMS.hs b/src/Handler/LMS.hs index a03d9432e..74598dee9 100644 --- a/src/Handler/LMS.hs +++ b/src/Handler/LMS.hs @@ -14,6 +14,7 @@ module Handler.LMS , getLmsLearnersR , getLmsLearnersDirectR , getLmsReportR , postLmsReportR , getLmsReportUploadR , postLmsReportUploadR , postLmsReportDirectR + , getLmsOrphansR -- , getLmsFakeR , postLmsFakeR , getLmsUserR diff --git a/src/Handler/LMS/Learners.hs b/src/Handler/LMS/Learners.hs index 26fb0c1f6..1145c4d95 100644 --- a/src/Handler/LMS/Learners.hs +++ b/src/Handler/LMS/Learners.hs @@ -133,7 +133,7 @@ mkUserTable _sid qsh qid cutoff = do ] dbtFilter = Map.fromList [ (csvLmsIdent , FilterColumn $ E.mkContainsFilterWithCommaPlus LmsIdent (E.^. LmsUserIdent )) - , (csvLmsResetPin , FilterColumn $ E.mkExactFilterLast (E.^. LmsUserResetPin)) + , (csvLmsResetPin , FilterColumn $ E.mkExactFilterLast (E.^. LmsUserResetPin)) ] dbtFilterUI = \mPrev -> mconcat [ prismAForm (singletonFilter csvLmsIdent . maybePrism _PathPiece) mPrev $ aopt (hoistField lift textField) (fslI MsgTableLmsIdent & setTooltip MsgTableFilterCommaPlus) diff --git a/templates/i18n/lms-orphans/en-eu.hamlet b/templates/i18n/lms-orphans/en-eu.hamlet index 98e2ff1a2..4729f6d1f 100644 --- a/templates/i18n/lms-orphans/en-eu.hamlet +++ b/templates/i18n/lms-orphans/en-eu.hamlet @@ -7,7 +7,7 @@ $# SPDX-License-Identifier: AGPL-3.0-or-later
TODO