diff --git a/config/settings.yml b/config/settings.yml index e714cd3e9..255beab18 100644 --- a/config/settings.yml +++ b/config/settings.yml @@ -276,6 +276,7 @@ user-defaults: show-sex: false exam-office-get-synced: true exam-office-get-labels: true + prefers-postal: true # During central allocations lecturer-given ratings of applications (as # ExamGrades) are combined with a central priority. diff --git a/src/Foundation/Yesod/Auth.hs b/src/Foundation/Yesod/Auth.hs index e43fa0b7b..7d2c4be8a 100644 --- a/src/Foundation/Yesod/Auth.hs +++ b/src/Foundation/Yesod/Auth.hs @@ -291,7 +291,7 @@ decodeUser now UserDefaultConf{..} upsertMode ldapData = do , userMatrikelnummer = Nothing -- not known from LDAP, must be derived from REST interface to AVS TODO , userPostAddress = Nothing -- not known from LDAP, must be derived from REST interface to AVS TODO , userPinPassword = Nothing -- must be derived via AVS - , userPrefersPostal = False + , userPrefersPostal = userDefaultPrefersPostal , .. } userUpdate = [ diff --git a/src/Handler/Utils/Avs.hs b/src/Handler/Utils/Avs.hs index 79835197e..20bb62ae6 100644 --- a/src/Handler/Utils/Avs.hs +++ b/src/Handler/Utils/Avs.hs @@ -318,7 +318,7 @@ upsertAvsUserById api = do , aufFPersonalNumber = avsInternalPersonalNo <$> canonical avsPersonInternalPersonalNo , aufFDepartment = Nothing , aufPostAddress = userFirmAddr - , aufPrefersPostal = isJust firmAddress + , aufPrefersPostal = True , aufPinPassword = userPin , aufEmail = fakeNo -- Email is unknown in this version of the avs query, to be updated later (FUTURE TODO) , aufIdent = fakeIdent -- use AvsPersonId instead diff --git a/src/Settings.hs b/src/Settings.hs index 7d1274058..f31fe0f38 100644 --- a/src/Settings.hs +++ b/src/Settings.hs @@ -281,6 +281,7 @@ data UserDefaultConf = UserDefaultConf , userDefaultShowSex :: Bool , userDefaultExamOfficeGetSynced :: Bool , userDefaultExamOfficeGetLabels :: Bool + , userDefaultPrefersPostal :: Bool } deriving (Show) data PWHashConf = PWHashConf diff --git a/test/Database/Fill.hs b/test/Database/Fill.hs index 7fbe85af6..bcea55e67 100644 --- a/test/Database/Fill.hs +++ b/test/Database/Fill.hs @@ -199,7 +199,7 @@ fillDb = do , userCompanyDepartment = Just "AVN-AR2" , userPinPassword = Nothing , userPostAddress = Nothing - , userPrefersPostal = False + , userPrefersPostal = True , userExamOfficeGetSynced = userDefaultExamOfficeGetSynced , userExamOfficeGetLabels = userDefaultExamOfficeGetLabels } diff --git a/test/User.hs b/test/User.hs index 2fa5518e2..f863e1327 100644 --- a/test/User.hs +++ b/test/User.hs @@ -55,4 +55,4 @@ fakeUser adjUser = adjUser User{..} userCompanyDepartment = Nothing userPinPassword = Nothing userPostAddress = Nothing - userPrefersPostal = False + userPrefersPostal = userDefaultPrefersPostal