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

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

View File

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

View File

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

View File

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