From 42cd3e7f08128804ab54a7241863e831b7489ddc Mon Sep 17 00:00:00 2001 From: Steffen Jost Date: Fri, 18 Nov 2022 16:44:09 +0100 Subject: [PATCH] chore(lms): write users download to log --- src/Handler/LMS/Result.hs | 2 +- src/Handler/LMS/Userlist.hs | 2 +- src/Handler/LMS/Users.hs | 5 ++++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/Handler/LMS/Result.hs b/src/Handler/LMS/Result.hs index d6c152c91..be5ac16f4 100644 --- a/src/Handler/LMS/Result.hs +++ b/src/Handler/LMS/Result.hs @@ -277,7 +277,7 @@ postLmsResultDirectR sid qsh = do $logWarnS "LMS" $ "Result upload failed parsing: " <> tshow e return (badRequest400, "Exception: " <> tshow e) Right nr -> do - let msg = "Success. LMS Result upload file " <> fileName file <> " containing " <> tshow nr <> " rows for file " <> fhead + let msg = "Success. LMS Result upload file " <> fileName file <> " containing " <> tshow nr <> " rows for " <> fhead <> ". " $logInfoS "LMS" msg when (nr > 0) $ queueDBJob $ JobLmsResults qid return (ok200, msg) diff --git a/src/Handler/LMS/Userlist.hs b/src/Handler/LMS/Userlist.hs index 3a9c83de4..0104f7eb0 100644 --- a/src/Handler/LMS/Userlist.hs +++ b/src/Handler/LMS/Userlist.hs @@ -273,7 +273,7 @@ postLmsUserlistDirectR sid qsh = do $logWarnS "LMS" $ "Userlist upload failed parsing: " <> tshow e return (badRequest400, "Exception: " <> tshow e) Right nr -> do - let msg = "Success. LMS Userlist upload file " <> fileName file <> " containing " <> tshow nr <> " rows for file " <> fhead + let msg = "Success. LMS Userlist upload file " <> fileName file <> " containing " <> tshow nr <> " rows for " <> fhead <> ". " $logInfoS "LMS" msg when (nr > 0) $ queueDBJob $ JobLmsUserlist qid return (ok200, msg) diff --git a/src/Handler/LMS/Users.hs b/src/Handler/LMS/Users.hs index 6c5d69e9e..2127a0f09 100644 --- a/src/Handler/LMS/Users.hs +++ b/src/Handler/LMS/Users.hs @@ -180,8 +180,11 @@ getLmsUsersDirectR sid qsh = do } csvOpts = def { csvFormat = fmtOpts } csvSheetName <- csvFilenameLmsUser qsh + let nr = length lms_users + msg = "Success. LMS Users download file " <> csvSheetName <> " containing " <> tshow nr <> " rows" + $logInfoS "LMS" msg addHeader "Content-Disposition" $ "attachment; filename=\"" <> csvSheetName <> "\"" - csvRenderedToTypedContentWith csvOpts csvSheetName csvRendered + csvRenderedToTypedContentWith csvOpts csvSheetName csvRendered -- direct Download see: -- https://ersocon.net/blog/2017/2/22/creating-csv-files-in-yesod \ No newline at end of file