fix(lms): move lms reuse info from QualificationR to LmsR

LmsR is intended to be seen by Fraport Admins only, while QualificationR is intended to be seen by Supervisors (in the future).

The LMS reuse information might confuse non-admins and is irrelevant to them.

src/Handler/LMS.hs

@@ -155,6 +155,8 @@ mkLmsAllTable isAdmin lmsDeletionDays = do
               foldMap (textCell . formatCalendarDiffDays . fromMonths) . view (resultAllQualification . _qualificationAuditDuration)
           , sortable (Just "qelearning") (i18nCell MsgTableLmsElearning & cellTooltip MsgQualificationElearningStart)
                                                                         $ tickmarkCell . view (resultAllQualification . _qualificationElearningStart)
+          , sortable Nothing (i18nCell MsgTableQualificationLmsReuses & cellTooltip MsgTableQualificationLmsReusesTooltip)
+                  $ \(view (resultAllQualification . _qualificationLmsReuses) -> reuseQid) -> maybeCell reuseQid qualificationIdShortCell
           , sortable Nothing (i18nCell MsgTableQualificationIsAvsLicence & cellTooltip MsgTableQualificationIsAvsLicenceTooltip)
                   $ \(view (resultAllQualification . _qualificationAvsLicence) -> licence) -> maybeCell licence $ textCell . T.singleton . licence2char
           , sortable Nothing (i18nCell MsgTableQualificationSapExport & cellTooltip MsgTableQualificationSapExportTooltip)
@@ -596,8 +598,9 @@ postLmsR sid qsh = do
   msgResetInfo      <- messageIconI Info    IconNotificationNonactive MsgLmsActResetInfo
   msgRestartWarning <- messageIconI Warning IconWarning               MsgLmsActRestartWarning
 
-  ((lmsRes, lmsTable), Entity qid quali) <- runDB $ do
+  ((lmsRes, lmsTable), Entity qid quali, lmsQualiReused) <- runDB $ do
-    qent <- getBy404 $ SchoolQualificationShort sid qsh
+    qent@Entity{entityVal=Qualification{qualificationLmsReuses = reuseQuali}} <- getBy404 $ SchoolQualificationShort sid qsh
+    lmsQualiReused <- traverseJoin get reuseQuali
     let acts :: Map LmsTableAction (AForm Handler LmsTableActionData)
         acts = mconcat
           [ singletonMap LmsActNotify       $ pure LmsActNotifyData
@@ -694,7 +697,7 @@ postLmsR sid qsh = do
             i18nLms msg = cell [whamlet|LMS #|] <> i18nCell msg
         psValidator = def & defaultSorting [SortDescBy "started", SortDescBy "status"]
     tbl <- mkLmsTable isAdmin qent acts colChoices psValidator
-    return (tbl, qent)
+    return (tbl, qent, lmsQualiReused)
 
   formResult lmsRes $ \case
     _ | not isAdmin -> addMessageI Error MsgUnauthorized -- only admins can use the form on this page

src/Handler/Qualification.hs

@@ -106,8 +106,8 @@ mkQualificationAllTable isAdmin = do
                                                                         $ tickmarkCell . view (resultAllQualification . _qualificationElearningRenews)
           , sortable (Just "noteexpiry") (i18nCell MsgQualificationExpiryNotification & cellTooltip MsgQualificationExpiryNotificationTooltip)
                                                                         $ tickmarkCell . view (resultAllQualification . _qualificationExpiryNotification)
-          , sortable Nothing (i18nCell MsgTableQualificationLmsReuses & cellTooltip MsgTableQualificationLmsReusesTooltip)
+          -- , sortable Nothing (i18nCell MsgTableQualificationLmsReuses & cellTooltip MsgTableQualificationLmsReusesTooltip)
-                  $ \(view (resultAllQualification . _qualificationLmsReuses) -> reuseQid) -> maybeCell reuseQid qualificationIdShortCell
+          --         $ \(view (resultAllQualification . _qualificationLmsReuses) -> reuseQid) -> maybeCell reuseQid qualificationIdShortCell
           , sortable Nothing (i18nCell MsgTableQualificationIsAvsLicence & cellTooltip MsgTableQualificationIsAvsLicenceTooltip)
                   $ \(view (resultAllQualification . _qualificationAvsLicence) -> licence) -> maybeCell licence $ textCell . T.singleton . licence2char
           , sortable Nothing (i18nCell MsgTableQualificationSapExport & cellTooltip MsgTableQualificationSapExportTooltip)

templates/lms.hamlet

@@ -16,7 +16,17 @@ $# SPDX-License-Identifier: AGPL-3.0-or-later
 
   $maybe daudit <- qualificationAuditDuration quali
     <dt .deflist__dt>_{MsgQualificationAuditDuration} ^{iconTooltip (msg2widget (MsgQualificationAuditDurationTooltip lmsDeletionDays)) Nothing True}
-    <dd .deflist__dd>_{MsgMonths (fromIntegral daudit)}      
+    <dd .deflist__dd>
+      $maybe lqre <- lmsQualiReused
+        $maybe daudit <- qualificationAuditDuration lqre
+          _{MsgMonths (fromIntegral daudit)}
+      $nothing
+        _{MsgMonths (fromIntegral daudit)}
+  $nothing
+    $maybe lqre <- lmsQualiReused
+      $maybe daudit <- qualificationAuditDuration lqre
+        <dt .deflist__dt>_{MsgQualificationAuditDuration} ^{iconTooltip (msg2widget (MsgQualificationAuditDurationTooltip lmsDeletionDays)) Nothing True}
+        <dd .deflist__dd>_{MsgMonths (fromIntegral daudit)}
 
   $maybe drefresh <- qualificationRefreshWithin quali
     <dt .deflist__dt>_{MsgQualificationRefreshWithin} ^{iconTooltip (msg2widget  MsgQualificationRefreshWithinTooltip) Nothing True}
@@ -41,6 +51,10 @@ $# SPDX-License-Identifier: AGPL-3.0-or-later
           $if drd > 0
             _{MsgDays   (fromIntegral drd)}
 
+  $maybe lqre <- lmsQualiReused
+      <dt .deflist__dt>_{MsgTableQualificationLmsReusesTooltip}
+      <dd .deflist__dd>^{simpleLink (citext2widget (qualificationName lqre)) (QualificationR (qualificationSchool lqre) (qualificationShorthand lqre))}
+
   <dt .deflist__dt>_{MsgQualificationElearningStart}
   <dd .deflist__dd>#{boolSymbol (qualificationElearningStart quali)}
     $if (qualificationElearningStart quali) && isNothing (qualificationRefreshWithin quali)

templates/qualification.hamlet

@@ -55,10 +55,6 @@ $# SPDX-License-Identifier: AGPL-3.0-or-later
             $if drd > 0
               _{MsgDays   (fromIntegral drd)}
     
-    $maybe lqre <- lmsQualiReused
-      <dt .deflist__dt>_{MsgTableQualificationLmsReusesTooltip}
-      <dd .deflist__dd>^{simpleLink (citext2widget (qualificationName lqre)) (QualificationR (qualificationSchool lqre) (qualificationShorthand lqre))}
-
     <dt .deflist__dt>_{MsgQualificationElearningStart}
     <dd .deflist__dd>#{boolSymbol (qualificationElearningStart quali)}
       $if (qualificationElearningStart quali) && isNothing (qualificationRefreshWithin quali)