fraport/fradrive-old
fraport/fradrive-old
Archived
3
1
Fork 0
Code Issues 65 Pull Requests 5 Actions Packages Projects Releases 197 Wiki Activity

fix: add missing schedule fields to db fill, rename field

Browse Source
This commit is contained in:
Sarah Vaupel 2020-10-29 14:27:55 +01:00
parent 8b49bf866e
commit e21536f85d
3 changed files with 37 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Foundation/Yesod/Auth.hs
View File

@ -261,7 +261,7 @@ upsertCampusUser upsertMode ldapData = do
, userScheduleWeekTimeFrom = userDefaultScheduleWeekTimeFrom
, userScheduleWeekTimeTo = userDefaultScheduleWeekTimeTo
, userScheduleWeekTimeslotLength = userDefaultScheduleWeekTimeslotLength
, userScheduleNewCoursesDisplayDefault = userDefaultScheduleNewCoursesDisplayDefault
, userScheduleOccurrenceDisplayDefault = userDefaultScheduleOccurrenceDisplayDefault
, userNotificationSettings = def
, userLanguages = Nothing
, userCsvOptions = def

2
src/Handler/Users/Add.hs
View File

@ -80,7 +80,7 @@ postAdminUserAddR = do
, userScheduleWeekTimeFrom = userDefaultScheduleWeekTimeFrom
, userScheduleWeekTimeTo = userDefaultScheduleWeekTimeTo
, userScheduleWeekTimeslotLength = userDefaultScheduleWeekTimeslotLength
, userScheduleNewCoursesDisplayDefault = userDefaultScheduleNewCoursesDisplayDefault
, userScheduleOccurrenceDisplayDefault = userDefaultScheduleOccurrenceDisplayDefault
, userNotificationSettings = def
, userLanguages = Nothing
, userCsvOptions = def

35
test/Database/Fill.hs
View File

@ -113,6 +113,7 @@ fillDb = do
, userDateTimeFormat = userDefaultDateTimeFormat
, userDateFormat = userDefaultDateFormat
, userTimeFormat = userDefaultTimeFormat
, userWeekStart = userDefaultWeekStart
, userDownloadFiles = userDefaultDownloadFiles
, userWarningDays = userDefaultWarningDays
, userLanguages = Just $ Languages ["en"]
@ -124,6 +125,10 @@ fillDb = do
, userSex = Just SexMale
, userShowSex = userDefaultShowSex
, userScheduleView = userDefaultScheduleView
, userScheduleWeekTimeFrom = userDefaultScheduleWeekTimeFrom
, userScheduleWeekTimeTo = userDefaultScheduleWeekTimeTo
, userScheduleWeekTimeslotLength = userDefaultScheduleWeekTimeslotLength
, userScheduleOccurrenceDisplayDefault = userDefaultScheduleOccurrenceDisplayDefault
}
fhamann <- insert User
{ userIdent = "felix.hamann@campus.lmu.de"
@ -143,6 +148,7 @@ fillDb = do
, userDateTimeFormat = userDefaultDateTimeFormat
, userDateFormat = userDefaultDateFormat
, userTimeFormat = userDefaultTimeFormat
, userWeekStart = userDefaultWeekStart
, userDownloadFiles = userDefaultDownloadFiles
, userWarningDays = userDefaultWarningDays
, userLanguages = Nothing
@ -154,6 +160,10 @@ fillDb = do
, userSex = Just SexMale
, userShowSex = userDefaultShowSex
, userScheduleView = userDefaultScheduleView
, userScheduleWeekTimeFrom = userDefaultScheduleWeekTimeFrom
, userScheduleWeekTimeTo = userDefaultScheduleWeekTimeTo
, userScheduleWeekTimeslotLength = userDefaultScheduleWeekTimeslotLength
, userScheduleOccurrenceDisplayDefault = userDefaultScheduleOccurrenceDisplayDefault
}
jost <- insert User
{ userIdent = "jost@tcs.ifi.lmu.de"
@ -173,6 +183,7 @@ fillDb = do
, userDateTimeFormat = userDefaultDateTimeFormat
, userDateFormat = userDefaultDateFormat
, userTimeFormat = userDefaultTimeFormat
, userWeekStart = userDefaultWeekStart
, userDownloadFiles = userDefaultDownloadFiles
, userWarningDays = userDefaultWarningDays
, userLanguages = Nothing
@ -184,6 +195,10 @@ fillDb = do
, userCsvOptions = def
, userShowSex = userDefaultShowSex
, userScheduleView = userDefaultScheduleView
, userScheduleWeekTimeFrom = userDefaultScheduleWeekTimeFrom
, userScheduleWeekTimeTo = userDefaultScheduleWeekTimeTo
, userScheduleWeekTimeslotLength = userDefaultScheduleWeekTimeslotLength
, userScheduleOccurrenceDisplayDefault = userDefaultScheduleOccurrenceDisplayDefault
}
maxMuster <- insert User
{ userIdent = "max@campus.lmu.de"
@ -203,6 +218,7 @@ fillDb = do
, userMaxFavouriteTerms = userDefaultMaxFavouriteTerms
, userDateFormat = userDefaultDateFormat
, userTimeFormat = userDefaultTimeFormat
, userWeekStart = userDefaultWeekStart
, userDownloadFiles = userDefaultDownloadFiles
, userWarningDays = userDefaultWarningDays
, userLanguages = Just $ Languages ["de"]
@ -214,6 +230,10 @@ fillDb = do
, userSex = Just SexMale
, userShowSex = userDefaultShowSex
, userScheduleView = userDefaultScheduleView
, userScheduleWeekTimeFrom = userDefaultScheduleWeekTimeFrom
, userScheduleWeekTimeTo = userDefaultScheduleWeekTimeTo
, userScheduleWeekTimeslotLength = userDefaultScheduleWeekTimeslotLength
, userScheduleOccurrenceDisplayDefault = userDefaultScheduleOccurrenceDisplayDefault
}
tinaTester <- insert $ User
{ userIdent = "tester@campus.lmu.de"
@ -233,6 +253,7 @@ fillDb = do
, userDateTimeFormat = userDefaultDateTimeFormat
, userDateFormat = userDefaultDateFormat
, userTimeFormat = userDefaultTimeFormat
, userWeekStart = userDefaultWeekStart
, userDownloadFiles = userDefaultDownloadFiles
, userWarningDays = userDefaultWarningDays
, userLanguages = Just $ Languages ["sn"]
@ -244,6 +265,10 @@ fillDb = do
, userSex = Just SexNotApplicable
, userShowSex = userDefaultShowSex
, userScheduleView = userDefaultScheduleView
, userScheduleWeekTimeFrom = userDefaultScheduleWeekTimeFrom
, userScheduleWeekTimeTo = userDefaultScheduleWeekTimeTo
, userScheduleWeekTimeslotLength = userDefaultScheduleWeekTimeslotLength
, userScheduleOccurrenceDisplayDefault = userDefaultScheduleOccurrenceDisplayDefault
}
svaupel <- insert User
{ userIdent = "vaupel.sarah@campus.lmu.de"
@ -263,6 +288,7 @@ fillDb = do
, userDateTimeFormat = userDefaultDateTimeFormat
, userDateFormat = userDefaultDateFormat
, userTimeFormat = userDefaultTimeFormat
, userWeekStart = userDefaultWeekStart
, userDownloadFiles = userDefaultDownloadFiles
, userWarningDays = userDefaultWarningDays
, userLanguages = Nothing
@ -274,6 +300,10 @@ fillDb = do
, userSex = Just SexFemale
, userShowSex = userDefaultShowSex
, userScheduleView = userDefaultScheduleView
, userScheduleWeekTimeFrom = userDefaultScheduleWeekTimeFrom
, userScheduleWeekTimeTo = userDefaultScheduleWeekTimeTo
, userScheduleWeekTimeslotLength = userDefaultScheduleWeekTimeslotLength
, userScheduleOccurrenceDisplayDefault = userDefaultScheduleOccurrenceDisplayDefault
}
let
@ -323,6 +353,7 @@ fillDb = do
, userDateTimeFormat = userDefaultDateTimeFormat
, userDateFormat = userDefaultDateFormat
, userTimeFormat = userDefaultTimeFormat
, userWeekStart = userDefaultWeekStart
, userDownloadFiles = userDefaultDownloadFiles
, userWarningDays = userDefaultWarningDays
, userLanguages = Nothing
@ -334,6 +365,10 @@ fillDb = do
, userSex = Nothing
, userShowSex = userDefaultShowSex
, userScheduleView = userDefaultScheduleView
, userScheduleWeekTimeFrom = userDefaultScheduleWeekTimeFrom
, userScheduleWeekTimeTo = userDefaultScheduleWeekTimeTo
, userScheduleWeekTimeslotLength = userDefaultScheduleWeekTimeslotLength
, userScheduleOccurrenceDisplayDefault = userDefaultScheduleOccurrenceDisplayDefault
}
where
userIdent :: IsString t => t