Corrector can always see sheet list. SheetList shows VisibleFrom

routes

@@ -70,7 +70,7 @@
   /users/#CryptoUUIDUser      CUserR          GET             !lecturerANDparticipant
   /correctors                 CHiWisR         GET
   /subs                       CCorrectionsR   GET POST
-  /ex                         SheetListR      GET             !registered !materials
+  /ex                         SheetListR      GET             !registered !materials !corrector
   !/ex/new                    SheetNewR       GET POST
   /ex/#SheetName SheetR:
     /                           SShowR        GET             !timeANDregistered !timeANDmaterials !corrector

src/Handler/Course.hs

@@ -611,6 +611,7 @@ getCUserR _tid _ssh _csh uCId = do
   --   - User is a lecturer for course
   uid <- decrypt uCId
   User{..} <- runDB $ get404 uid
+  -- USE src/utils/Form.formResult
   defaultLayout -- TODO
     [whamlet|
       <p>^{nameWidget userDisplayName userSurname}

src/Handler/Sheet.hs

@@ -164,6 +164,8 @@ getSheetListR tid ssh csh = do
           $ \DBRow{dbrOutput=(Entity _ Sheet{..}, _, _)} -> anchorCell (CSheetR tid ssh csh sheetName SShowR) (toWidget sheetName)
       , sortable (Just "last-edit") (i18nCell MsgLastEdit)
           $ \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)
           $ \DBRow{dbrOutput=(Entity _ Sheet{..}, _, _)} -> timeCell sheetActiveFrom
       , sortable (Just "submission-until") (i18nCell MsgSheetActiveTo)
@@ -219,6 +221,9 @@ getSheetListR tid ssh csh = do
         , ( "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
           )
@@ -409,6 +414,11 @@ getSheetNewR tid ssh csh = do
       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 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

src/Handler/Utils/Submission.hs

@@ -613,9 +613,7 @@ submissionDeleteRoute drRecords = DeleteRoute
       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
-            E.orderBy [E.desc $ submissionEdit E.^. SubmissionEditTime]
+            return . E.max_ $ submissionEdit E.^. SubmissionEditTime
-            E.limit 1
-            return $ 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