Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX

frontend/vendor/flatpickr.css

@@ -1,3 +1,18 @@
+/*
+  custom code
+  hides the up/down arrows in time (number) inputs
+*/
+/* webkit */
+.flatpickr-calendar input[type=number]::-webkit-inner-spin-button,
+.flatpickr-calendar input[type=number]::-webkit-outer-spin-button {
+  -webkit-appearance: none;
+  margin: 0;
+}
+/* firefox */
+.flatpickr-calendar input[type=number] {
+  -moz-appearance:textfield;
+}
+/* vendor code */
 .flatpickr-calendar {
   background: transparent;
   opacity: 0;

src/Handler/Corrections.hs

@@ -1141,6 +1141,12 @@ assignHandler tid ssh csh cid assignSids = do
               in  Map.insertWith (\(usr, ma) (_, mb) -> (usr, Map.union ma mb))  uid (user, Map.singleton shn sheetcorr) acc
             )
 
+      -- -- lecturerNames :: Map UserId User
+      -- lecturerNames <- fmap entities2map $ E.select $ E.from $ \(user `E.InnerJoin` lecturer) -> do
+      --     E.on $ user E.^. UserId E.==. lecturer E.^. LecturerUser
+      --     E.where_ $ lecturer E.^. LecturerCourse E.==. E.val cid
+      --     return user
+
       submissions <- E.select . E.from $ \submission -> do
           E.where_ $ submission E.^. SubmissionSheet `E.in_` E.valList sheetIds
           let numSubmittors = E.sub_select . E.from $ \subUser -> do
@@ -1177,8 +1183,10 @@ assignHandler tid ssh csh cid assignSids = do
 
   let -- infoMap  :: Map SheetName (Map (Maybe UserId) CorrectionInfo) -- repeated here for easier reference
       -- create aggregate maps
-      sheetNames :: [SheetName]
-      sheetNames = Map.keys infoMap
+
+      -- Always iterate over sheetList for consistent sorting!
+      sheetList :: [(SheetName, CorrectionInfo)]
+      sheetList = Map.toDescList sheetMap -- newest Sheet first, except for CorrectionSheetTable
 
       sheetMap :: Map SheetName CorrectionInfo
       sheetMap = Map.map fold infoMap
@@ -1197,6 +1205,10 @@ assignHandler tid ssh csh cid assignSids = do
       corrMap  :: Map (Maybe UserId) CorrectionInfo
       corrMap  = Map.unionsWith (<>) $ Map.elems infoMap
 
+      corrInfos :: [CorrectionInfo]
+      corrInfos = sortBy (compare `on` (byName . ciCorrector) ) $ Map.elems corrMap
+        where byName Nothing    = Nothing
+              byName (Just uid) = Map.lookup uid correctorMap
       corrMapSum :: CorrectionInfo
       corrMapSum = fold corrMap
 
@@ -1206,6 +1218,8 @@ assignHandler tid ssh csh cid assignSids = do
       getCorrector (Just uid)
         | Just (User{..},loadMap) <- Map.lookup uid correctorMap
         = (nameEmailWidget userEmail userDisplayName userSurname, loadMap)
+        -- | Just (User{..} ) <- Map.lookup uid lecturerNames
+        -- = (nameEmailWidget userEmail userDisplayName userSurname, mempty)  -- lecturers may also correct in rare cases
       getCorrector _ = ([whamlet|_{MsgNoCorrectorAssigned}|], mempty)
       -- avoid nestes hamlet $maybe with duplicated $nothing
       getCorrSheetStatus :: Maybe UserId -> SheetName -> Maybe CorrectionInfo
@@ -1235,7 +1249,9 @@ assignHandler tid ssh csh cid assignSids = do
       showAvgsDays Nothing   _ = mempty
       showAvgsDays (Just dt) n = formatDiffDays $ dt / fromIntegral n
       heat :: Integer -> Integer -> Double
-      heat full achieved = roundToDigits 3 $ cutOffPercent 0.4 (fromIntegral full) (fromIntegral achieved)
+      heat = heat' 0.3
+      heat' :: Double -> Integer -> Integer -> Double
+      heat' cut full achieved = roundToDigits 3 $ cutOffPercent cut (fromIntegral full^2) (fromIntegral achieved^2)
   let headingShort
         | 0 < Map.size assignment = MsgMenuCorrectionsAssignSheet $ Text.intercalate ", " $ fmap CI.original $ Map.keys assignment
         | otherwise               = MsgMenuCorrectionsAssign

src/Handler/Utils/Corrections.hs

@@ -30,6 +30,8 @@ instance Semigroup CorrectionInfo where
       mergeWith prj f = on f prj corrA corrB
 
       keepEqual (Just x) (Just y) | x==y = Just x
+      keepEqual Nothing other = other
+      keepEqual other Nothing = other
       keepEqual _ _ = Nothing
 
 instance Monoid CorrectionInfo where

src/Model.hs

@@ -37,5 +37,14 @@ deriving instance Eq (Unique Material)  -- instance Eq UniqueMaterial
 deriving instance Eq (Unique Tutorial)  -- instance Eq Tutorial
 deriving instance Eq (Unique Exam)
 
+instance Ord User where
+  compare User{userSurname=surnameA, userDisplayName=displayNameA, userEmail=emailA}
+          User{userSurname=surnameB, userDisplayName=displayNameB, userEmail=emailB}
+    =    compare     surnameA     surnameB
+      <> compare displayNameA displayNameB
+      <> compare       emailA       emailB  -- userEmail is unique, so this suffices
+
+
+
 submissionRatingDone :: Submission -> Bool
 submissionRatingDone Submission{..} = isJust submissionRatingTime

templates/corrections-overview.hamlet

@@ -1,5 +1,6 @@
 <div>
   <h2>_{MsgCorrectionSheets}
+
   _{MsgCourseParticipants nrParticipants}
   <table .table .table--striped .table--hover>
     <tr .table__row .table__row--head>
@@ -16,7 +17,8 @@
       <th .table__th>_{MsgGenericMin}
       <th .table__th>_{MsgGenericAvg}
       <th .table__th>_{MsgGenericMax}
-    $forall (sheetName, CorrectionInfo{ciSubmittors, ciSubmissions, ciAssigned, ciCorrected, ciMin, ciTot, ciMax}) <- Map.toList sheetMap
+    $#  Always iterate over sheetList for consistent sorting! Newest first, except in this table
+    $forall (sheetName, CorrectionInfo{ciSubmittors, ciSubmissions, ciAssigned, ciCorrected, ciMin, ciTot, ciMax}) <- reverse sheetList
       <tr .table__row>
         <td .table__td>^{simpleLink (toWidget sheetName) (CSheetR tid ssh csh sheetName SSubsR)}
         $if groupsPossible
@@ -39,15 +41,19 @@
         <td .table__td>#{showDiffDays ciMin}
         <td .table__td>#{showAvgsDays ciTot ciCorrected}
         <td .table__td>#{showDiffDays ciMax}
+
+
 <div>
   <h2>_{MsgCorrectionCorrectors}
+
   <table .table .table--striped .table--hover>
     <tr .table__row .table__row--head>
       <th .table__th rowspan=2>_{MsgCorrector}
       <th .table__th colspan=2>_{MsgGenericAll}
       <th .table__th rowspan=2>_{MsgCorDeficitProportion}
       <th .table__th colspan=3>_{MsgCorrectionTime}
-      $forall shn <- sheetNames
+      $#  Always iterate over sheetList for consistent sorting! Newest first, except in this table
+      $forall (shn,_) <- sheetList
         <th .table__th colspan=5>#{shn}
         $# ^{simpleLinkI (SomeMessage MsgMenuCorrectors) (CSheetR tid ssh csh shn SCorrR)}
     <tr .table__row .table__row--head>
@@ -56,13 +62,14 @@
       <th .table__th>_{MsgGenericMin}
       <th .table__th>_{MsgGenericAvg}
       <th .table__th>_{MsgGenericMax}
-      $forall _shn <- sheetNames
+      $#  Always iterate over sheetList for consistent sorting! Newest first, except in this table
+      $forall _shn <- sheetList
         <th .table__th>_{MsgCorProportion}
         <th .table__th>_{MsgNrSubmissionsTotalShort}
         <th .table__th>_{MsgGenericNumChange}
         <th .table__th>_{MsgNrSubmissionsNotCorrectedShort}
         <th .table__th>_{MsgGenericAvg}
-    $forall (CorrectionInfo{ciCorrector, ciSubmissions=ciSubmissionsNr, ciCorrected, ciMin, ciTot, ciMax}) <- Map.elems corrMap
+    $forall (CorrectionInfo{ciCorrector, ciSubmissions=ciSubmissionsNr, ciCorrected, ciMin, ciTot, ciMax}) <- corrInfos
       $with (nameW,loadM) <- getCorrector ciCorrector
         <tr .table__row>
           <td .table__td>^{nameW}
@@ -77,7 +84,8 @@
           <td .table__td>#{showDiffDays ciMin}
           <td .table__td>#{showAvgsDays ciTot ciCorrected}
           <td .table__td>#{showDiffDays ciMax}
-          $forall (shn, CorrectionInfo{ciSubmissions=sheetSubmissionsNr}) <- Map.toList sheetMap
+          $#  Always iterate over sheetList for consistent sorting! Newest first, except in this table
+          $forall (shn, CorrectionInfo{ciSubmissions=sheetSubmissionsNr}) <- sheetList
             <td .table__td>
               $maybe SheetCorrector{sheetCorrectorLoad, sheetCorrectorState} <- Map.lookup shn loadM
                 #{showCompactCorrectorLoad sheetCorrectorLoad sheetCorrectorState}
@@ -101,7 +109,7 @@
               <td .table__td>
               <td .table__td>
               <td .table__td>
-    $if 0 < length sheetNames
+    $if not (null sheetList)
       <tr .table__row>
         <td .table__th>Σ
         $with ciSubmissionsNr <- ciSubmissions corrMapSum
@@ -112,9 +120,11 @@
         <td .table__th>#{showDiffDays (ciMin corrMapSum)}
         <td .table__th>#{showAvgsDays (ciTot corrMapSum) (ciCorrected corrMapSum)}
         <td .table__th>#{showDiffDays (ciMax corrMapSum)}
-        $forall shn <- sheetNames
+        $#  Always iterate over sheetList for consistent sorting! Newest first, except in this table
+        $forall (shn, CorrectionInfo{ciSubmissions}) <- sheetList
           <td .table__th>#{getLoadSum shn}
-          <td .table__td colspan=4>^{simpleLinkI (SomeMessage MsgMenuCorrectorsChange) (CSheetR tid ssh csh shn SCorrR)}
+          <td .table__th>#{ciSubmissions}
+          <td .table__td colspan=3>^{simpleLinkI (SomeMessage MsgMenuCorrectorsChange) (CSheetR tid ssh csh shn SCorrR)}
   ^{btnWdgt}
  <div>
   <p>_{MsgAssignSubmissionsRandomWarning}