fraport/fradrive
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Show files that were deleted during correction properly

Browse Source
This commit is contained in:
Gregor Kleen 2018-07-03 16:54:58 +02:00
parent 115eaa70f2
commit 429869b58a
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
messages/de.msg
View File

@ -166,6 +166,7 @@ FileTitle: Dateiname
FileModified: Letzte Änderung FileModified: Letzte Änderung
FileCorrected: Korrigiert FileCorrected: Korrigiert
FileCorrectedDeleted: Korrigiert (gelöscht)
RatingUpdated: Korrektur gespeichert RatingUpdated: Korrektur gespeichert
RatingDeleted: Korrektur zurückgesetzt RatingDeleted: Korrektur zurückgesetzt
RatingFilesUpdated: Korrigierte Dateien überschrieben RatingFilesUpdated: Korrigierte Dateien überschrieben

5
src/Handler/Submission.hs
View File

@ -252,7 +252,8 @@ submissionHelper tid csh shn (SubmissionMode mcid) = do
| otherwise -> textCell $ bool (<> "/") id isFile fileTitle' | otherwise -> textCell $ bool (<> "/") id isFile fileTitle'
, sortable Nothing (cell mempty) $ \(coalesce -> (_, mCorr)) -> case mCorr of , sortable Nothing (cell mempty) $ \(coalesce -> (_, mCorr)) -> case mCorr of
Nothing -> cell mempty Nothing -> cell mempty
Just (_, Entity _ File{..}) Just (Entity _ SubmissionFile{..}, Entity _ File{..})
| submissionFileIsDeletion -> textCell MsgFileCorrectedDeleted
| isJust fileContent -> anchorCell (\() -> CSubmissionR tid csh shn cid $ SubDownloadR SubmissionCorrected fileTitle) | isJust fileContent -> anchorCell (\() -> CSubmissionR tid csh shn cid $ SubDownloadR SubmissionCorrected fileTitle)
(\() -> [whamlet|_{MsgFileCorrected}|]) (\() -> [whamlet|_{MsgFileCorrected}|])
() ()
@ -270,7 +271,7 @@ submissionHelper tid csh shn (SubmissionMode mcid) = do
E.on $ f2 E.?. FileId E.==. sf2 E.?. SubmissionFileFile E.on $ f2 E.?. FileId E.==. sf2 E.?. SubmissionFileFile
E.on $ f1 E.?. FileTitle E.==. f2 E.?. FileTitle E.on $ f1 E.?. FileTitle E.==. f2 E.?. FileTitle
E.&&. sf1 E.?. SubmissionFileSubmission E.==. sf2 E.?. SubmissionFileSubmission E.&&. sf1 E.?. SubmissionFileSubmission E.==. sf2 E.?. SubmissionFileSubmission
E.&&. f1 E.?. FileId E.!=. f2 E.?. FileId E.&&. sf1 E.?. SubmissionFileId E.!=. sf2 E.?. SubmissionFileId
E.on $ f1 E.?. FileId E.==. sf1 E.?. SubmissionFileFile E.on $ f1 E.?. FileId E.==. sf1 E.?. SubmissionFileFile
E.where_ $ (sf1 E.?. SubmissionFileIsUpdate E.==. E.val (Just False) E.||. E.isNothing (sf1 E.?. SubmissionFileIsUpdate)) E.where_ $ (sf1 E.?. SubmissionFileIsUpdate E.==. E.val (Just False) E.||. E.isNothing (sf1 E.?. SubmissionFileIsUpdate))