refactor(csv): change new user default to xlsx working now
This commit is contained in:
parent
fcc2c1b3ab
commit
eba437de33
@ -177,7 +177,8 @@ getLmsUsersDirectR sid qsh = do
|
|||||||
--csvRenderedHeader = lmsUserTableCsvHeader
|
--csvRenderedHeader = lmsUserTableCsvHeader
|
||||||
--cvsRendered = CsvRendered {..}
|
--cvsRendered = CsvRendered {..}
|
||||||
csvRendered = toCsvRendered lmsUserTableCsvHeader $ lmsUser2csv cutoff . entityVal <$> lms_users
|
csvRendered = toCsvRendered lmsUserTableCsvHeader $ lmsUser2csv cutoff . entityVal <$> lms_users
|
||||||
fmtOpts = def { csvIncludeHeader = lmsDownloadHeader
|
fmtOpts = (review csvPreset CsvPresetRFC)
|
||||||
|
{ csvIncludeHeader = lmsDownloadHeader
|
||||||
, csvDelimiter = lmsDownloadDelimiter
|
, csvDelimiter = lmsDownloadDelimiter
|
||||||
, csvUseCrLf = lmsDownloadCrLf
|
, csvUseCrLf = lmsDownloadCrLf
|
||||||
}
|
}
|
||||||
|
|||||||
@ -97,7 +97,8 @@ getQualificationSAPDirectR = do
|
|||||||
, qual Ex.^. QualificationSapId
|
, qual Ex.^. QualificationSapId
|
||||||
)
|
)
|
||||||
let csvRendered = toCsvRendered sapUserTableCsvHeader $ sapRes2csv qualUsers
|
let csvRendered = toCsvRendered sapUserTableCsvHeader $ sapRes2csv qualUsers
|
||||||
fmtOpts = def { csvIncludeHeader = True
|
fmtOpts = (review csvPreset CsvPresetRFC)
|
||||||
|
{ csvIncludeHeader = True
|
||||||
, csvDelimiter = ','
|
, csvDelimiter = ','
|
||||||
, csvUseCrLf = True
|
, csvUseCrLf = True
|
||||||
}
|
}
|
||||||
|
|||||||
@ -45,7 +45,8 @@ getLmsCsvDecoder :: (MonadHandler m, HandlerSite m ~ UniWorX, MonadThrow m, From
|
|||||||
getLmsCsvDecoder = do
|
getLmsCsvDecoder = do
|
||||||
LmsConf{..} <- getsYesod $ view _appLmsConf
|
LmsConf{..} <- getsYesod $ view _appLmsConf
|
||||||
if | Just upDelim <- lmsUploadDelimiter -> do
|
if | Just upDelim <- lmsUploadDelimiter -> do
|
||||||
let fmtOpts = def { csvDelimiter = upDelim
|
let fmtOpts = (review csvPreset CsvPresetRFC)
|
||||||
|
{ csvDelimiter = upDelim
|
||||||
, csvIncludeHeader = lmsUploadHeader
|
, csvIncludeHeader = lmsUploadHeader
|
||||||
}
|
}
|
||||||
csvOpts = def { csvFormat = fmtOpts }
|
csvOpts = def { csvFormat = fmtOpts }
|
||||||
|
|||||||
@ -85,7 +85,7 @@ instance Default CsvOptions where
|
|||||||
}
|
}
|
||||||
|
|
||||||
instance Default CsvFormatOptions where
|
instance Default CsvFormatOptions where
|
||||||
def = CsvXlsxFormatOptions -- csvPreset # CsvPresetRFC
|
def = csvPreset # CsvPresetRFC -- changing the default here to CsvPresetXlsx will cause internal server errors to to partial record selectors failing
|
||||||
|
|
||||||
data CsvPreset = CsvPresetRFC
|
data CsvPreset = CsvPresetRFC
|
||||||
| CsvPresetXlsx
|
| CsvPresetXlsx
|
||||||
|
|||||||
@ -73,7 +73,7 @@ addNewUser AddUserData{..} = do
|
|||||||
, userExamOfficeGetLabels = userDefaultExamOfficeGetLabels
|
, userExamOfficeGetLabels = userDefaultExamOfficeGetLabels
|
||||||
, userNotificationSettings = def
|
, userNotificationSettings = def
|
||||||
, userLanguages = Nothing
|
, userLanguages = Nothing
|
||||||
, userCsvOptions = def
|
, userCsvOptions = def { csvFormat = review csvPreset CsvPresetXlsx }
|
||||||
, userTokensIssuedAfter = Nothing
|
, userTokensIssuedAfter = Nothing
|
||||||
, userCreated = now
|
, userCreated = now
|
||||||
, userLastLdapSynchronisation = Nothing
|
, userLastLdapSynchronisation = Nothing
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user