diff --git a/.hlint.yaml b/.hlint.yaml index b9203d95b..ecd17c599 100644 --- a/.hlint.yaml +++ b/.hlint.yaml @@ -1,5 +1,5 @@ -# HLint configuration file -# https://github.com/ndmitchell/hlint +# HLint configuration file +# https://github.com/ndmitchell/hlint ########################## - ignore: { name: "Parse error" } @@ -7,6 +7,7 @@ - ignore: { name: "Use ||" } - ignore: { name: "Use &&" } - ignore: { name: "Use ++" } + - ignore: { name: "Use ***" } - arguments: - -XQuasiQuotes diff --git a/db.sh b/db.sh index 2e6f5026a..82d89d19f 100755 --- a/db.sh +++ b/db.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env -S bash -xe +#!/bin/bash # Options: see /test/Database.hs (Main) stack build --fast --flag uniworx:library-only --flag uniworx:dev stack exec uniworxdb -- $@ diff --git a/messages/uniworx/de.msg b/messages/uniworx/de.msg index d92e4810a..17602162c 100644 --- a/messages/uniworx/de.msg +++ b/messages/uniworx/de.msg @@ -421,6 +421,7 @@ StudyTermsName: Studiengang StudyTermsShort: Studiengangkürzel StudyTermsChangeSuccess: Zuordnung Abschlüsse aktualisiert StudyDegreeChangeSuccess: Zuordnung Studiengänge aktualisiert +StudyCandidateIncidienc: Anmeldevorgang MailTestFormEmail: Email-Addresse MailTestFormLanguages: Spracheinstellungen diff --git a/src/Handler/Admin.hs b/src/Handler/Admin.hs index da90c398f..47bf781dd 100644 --- a/src/Handler/Admin.hs +++ b/src/Handler/Admin.hs @@ -217,7 +217,7 @@ postAdminFeaturesR = do mkDegreeTable = let dbtIdent = "admin-studydegrees" :: Text dbtStyle = def - dbtSQLQuery :: (E.SqlExpr (Entity StudyDegree)) -> E.SqlQuery ( E.SqlExpr (Entity StudyDegree)) + dbtSQLQuery :: E.SqlExpr (Entity StudyDegree) -> E.SqlQuery ( E.SqlExpr (Entity StudyDegree)) dbtSQLQuery = return dbtRowKey = (E.^. StudyDegreeKey) dbtProj = return @@ -241,7 +241,7 @@ postAdminFeaturesR = do mkStudytermsTable = let dbtIdent = "admin-studyterms" :: Text dbtStyle = def - dbtSQLQuery :: (E.SqlExpr (Entity StudyTerms)) -> E.SqlQuery ( E.SqlExpr (Entity StudyTerms)) + dbtSQLQuery :: E.SqlExpr (Entity StudyTerms) -> E.SqlQuery ( E.SqlExpr (Entity StudyTerms)) dbtSQLQuery = return dbtRowKey = (E.^. StudyTermsKey) dbtProj = return @@ -264,7 +264,7 @@ postAdminFeaturesR = do mkCandidateTable = let dbtIdent = "admin-termcandidate" :: Text dbtStyle = def - dbtSQLQuery :: (E.SqlExpr (Entity StudyTermCandidate)) -> E.SqlQuery ( E.SqlExpr (Entity StudyTermCandidate)) + dbtSQLQuery :: E.SqlExpr (Entity StudyTermCandidate) -> E.SqlQuery ( E.SqlExpr (Entity StudyTermCandidate)) dbtSQLQuery = return dbtRowKey = (E.^. StudyTermCandidateId) dbtProj = return diff --git a/test/Database.hs b/test/Database.hs index aa6d5a0f0..df9afb496 100755 --- a/test/Database.hs +++ b/test/Database.hs @@ -226,10 +226,59 @@ fillDb = do sdMath = StudyTermsKey' 105 sdMedi = StudyTermsKey' 121 sdPhys = StudyTermsKey' 128 - repsert sdInf $ StudyTerms 79 (Just "IfI") (Just "Institut für Informatik") - repsert sdMath $ StudyTerms 105 (Just "MI" ) (Just "Mathematisches Institut") - repsert sdMedi $ StudyTerms 121 (Just "MnfI") Nothing -- intentionally left unknown - repsert sdPhys $ StudyTerms 128 Nothing Nothing -- intentionally left unknown + sdBioI1 = StudyTermsKey' 221 + sdBioI2 = StudyTermsKey' 228 + sdBiol = StudyTermsKey' 26 + sdChem1 = StudyTermsKey' 61 + sdChem2 = StudyTermsKey' 113 + repsert sdInf $ StudyTerms 79 (Just "Inf") (Just "Informatik") + repsert sdMath $ StudyTerms 105 (Just "Math" ) (Just "Mathematik") + repsert sdMedi $ StudyTerms 121 Nothing (Just "Medieninformatik") -- intentionally left unknown + repsert sdPhys $ StudyTerms 128 Nothing Nothing -- intentionally left unknown + repsert sdBioI1 $ StudyTerms 221 Nothing Nothing -- intentionally left unknown + repsert sdBioI2 $ StudyTerms 228 Nothing Nothing -- intentionally left unknown + repsert sdBiol $ StudyTerms 26 Nothing Nothing -- intentionally left unknown + repsert sdChem1 $ StudyTerms 61 Nothing Nothing -- intentionally left unknown + repsert sdChem2 $ StudyTerms 113 Nothing Nothing -- intentionally left unknown + incidence1 <- liftIO getRandom + void . insert $ StudyTermCandidate incidence1 221 "Bioinformatik" + void . insert $ StudyTermCandidate incidence1 221 "Mathematik" + void . insert $ StudyTermCandidate incidence1 105 "Bioinformatik" + void . insert $ StudyTermCandidate incidence1 105 "Mathematik" + incidence2 <- liftIO getRandom + void . insert $ StudyTermCandidate incidence2 221 "Bioinformatik" + void . insert $ StudyTermCandidate incidence2 221 "Chemie" + void . insert $ StudyTermCandidate incidence2 61 "Bioinformatik" + void . insert $ StudyTermCandidate incidence2 61 "Chemie" + incidence3 <- liftIO getRandom + void . insert $ StudyTermCandidate incidence3 113 "Chemie" + incidence4 <- liftIO getRandom + void . insert $ StudyTermCandidate incidence4 221 "Bioinformatik" + void . insert $ StudyTermCandidate incidence4 221 "Chemie" + void . insert $ StudyTermCandidate incidence4 221 "Biologie" + void . insert $ StudyTermCandidate incidence4 61 "Bioinformatik" + void . insert $ StudyTermCandidate incidence4 61 "Chemie" + void . insert $ StudyTermCandidate incidence4 61 "Biologie" + void . insert $ StudyTermCandidate incidence4 61 "Chemie" + void . insert $ StudyTermCandidate incidence4 26 "Bioinformatik" + void . insert $ StudyTermCandidate incidence4 26 "Chemie" + void . insert $ StudyTermCandidate incidence4 26 "Biologie" + incidence5 <- liftIO getRandom + void . insert $ StudyTermCandidate incidence5 228 "Bioinformatik" + void . insert $ StudyTermCandidate incidence5 228 "Physik" + void . insert $ StudyTermCandidate incidence5 128 "Bioinformatik" + void . insert $ StudyTermCandidate incidence5 128 "Physik" + incidence6 <- liftIO getRandom + void . insert $ StudyTermCandidate incidence6 228 "Bioinformatik" + void . insert $ StudyTermCandidate incidence6 228 "Physik" + void . insert $ StudyTermCandidate incidence6 128 "Bioinformatik" + void . insert $ StudyTermCandidate incidence6 128 "Physik" + incidence7 <- liftIO getRandom + void . insert $ StudyTermCandidate incidence7 228 "Physik" + void . insert $ StudyTermCandidate incidence7 228 "Bioinformatik" + void . insert $ StudyTermCandidate incidence7 128 "Physik" + void . insert $ StudyTermCandidate incidence7 128 "Bioinformatik" + sfMMp <- insert $ StudyFeatures -- keyword type prevents record syntax here maxMuster sdBsc