- $if numApps == numFirstChoice - _{MsgCourseAllocationsBoundCoincide numFirstChoice} - $else - _{MsgCourseAllocationsBound numApps numFirstChoice} - $if capped -
- _{MsgCourseAllocationsBoundCapped} - $if registrationOpen allocationRegisterTo -
- _{MsgCourseAllocationsBoundWarningOpen}
+
+ $if numApps == numFirstChoice
+ _{MsgCourseAllocationsBoundCoincide numFirstChoice}
+ $else
+ _{MsgCourseAllocationsBound numApps numFirstChoice}
+ $if capped
+
+ _{MsgCourseAllocationsBoundCapped}
+ $if registrationOpen allocationRegisterTo
+
+ _{MsgCourseAllocationsBoundWarningOpen}
+$if mayAccept
+ _{MsgBtnAcceptApplicationsTip}
+ ^{acceptWgt}
-
Es werden nur konsistente Änderungen akzeptiert!
- Daraus folgt, dass es sinnvoll sein kann, gewisse Zellen frei zu lassen;
- z.B. ändert man ein Studienfachzuordnung eines Teilnehmers ab,
- dann müsste man auch Abschluss und Semesterzahl passend ändern.
+ Daraus folgt, dass es sinnvoll sein kann, gewisse Zellen frei zu lassen; #
+ ändert man z.B. die Studienfachzuordnung eines Teilnehmers ab, #
+ so müsste man auch Abschluss und Fachsemester passend ändern.
^{csvColExplanations'}
+
+ ^{modal (i18n MsgCsvChangeOptionsLabel) (Left (SomeRoute CsvOptionsR))}
^{csvExportWdgt'}
diff --git a/templates/widgets/bonusRule.hamlet b/templates/widgets/bonusRule.hamlet
index 3a5a2c775..1c59049c0 100644
--- a/templates/widgets/bonusRule.hamlet
+++ b/templates/widgets/bonusRule.hamlet
@@ -1,5 +1,7 @@
$newline never
$case bonusRule
+ $of ExamBonusManual _
+ _{MsgExamBonusManualParticipants}
$of ExamBonusPoints ps False _
_{MsgExamBonusPoints ps}
$of ExamBonusPoints ps True _
diff --git a/test.sh b/test.sh
index 4d2eca141..e0ef0b657 100755
--- a/test.sh
+++ b/test.sh
@@ -1,5 +1,7 @@
#!/usr/bin/env bash
+[[ -n "${FORCE_RELEASE}" ]] && exit 0
+
set -e
[ "${FLOCKER}" != "$0" ] && exec env FLOCKER="$0" flock -en .stack-work.lock "$0" "$@" || :
diff --git a/test/Database.hs b/test/Database.hs
index 140f0e490..78416f2fe 100755
--- a/test/Database.hs
+++ b/test/Database.hs
@@ -111,6 +111,7 @@ fillDb = do
, userNotificationSettings = def
, userCreated = now
, userLastLdapSynchronisation = Nothing
+ , userCsvOptions = csvPreset # CsvPresetRFC
}
fhamann <- insert User
{ userIdent = "felix.hamann@campus.lmu.de"
@@ -135,6 +136,7 @@ fillDb = do
, userNotificationSettings = def
, userCreated = now
, userLastLdapSynchronisation = Nothing
+ , userCsvOptions = csvPreset # CsvPresetExcel
}
jost <- insert User
{ userIdent = "jost@tcs.ifi.lmu.de"
@@ -159,6 +161,7 @@ fillDb = do
, userNotificationSettings = def
, userCreated = now
, userLastLdapSynchronisation = Nothing
+ , userCsvOptions = def
}
maxMuster <- insert User
{ userIdent = "max@campus.lmu.de"
@@ -183,6 +186,7 @@ fillDb = do
, userNotificationSettings = def
, userCreated = now
, userLastLdapSynchronisation = Nothing
+ , userCsvOptions = def
}
tinaTester <- insert $ User
{ userIdent = "tester@campus.lmu.de"
@@ -207,6 +211,7 @@ fillDb = do
, userNotificationSettings = def
, userCreated = now
, userLastLdapSynchronisation = Nothing
+ , userCsvOptions = def
}
svaupel <- insert User
{ userIdent = "vaupel.sarah@campus.lmu.de"
@@ -231,6 +236,7 @@ fillDb = do
, userNotificationSettings = def
, userCreated = now
, userLastLdapSynchronisation = Nothing
+ , userCsvOptions = def
}
void . repsert (TermKey summer2017) $ Term
{ termName = summer2017
diff --git a/test/FoundationSpec.hs b/test/FoundationSpec.hs
index 2386c7ba6..953c65b17 100644
--- a/test/FoundationSpec.hs
+++ b/test/FoundationSpec.hs
@@ -18,10 +18,11 @@ instance Arbitrary (Route Auth) where
instance Arbitrary (Route EmbeddedStatic) where
arbitrary = do
let printableText = pack . filter (/= '/') . getPrintableString <$> arbitrary
+ printableText' = printableText `suchThat` (not . null)
pathLength <- getPositive <$> arbitrary
- path <- replicateM pathLength printableText
+ path <- replicateM pathLength printableText'
paramNum <- getNonNegative <$> arbitrary
- params <- replicateM paramNum $ (,) <$> printableText <*> printableText
+ params <- replicateM paramNum $ (,) <$> printableText' <*> printableText
return $ embeddedResourceR path params
instance Arbitrary SchoolR where
diff --git a/test/Model/MigrationSpec.hs b/test/Model/MigrationSpec.hs
new file mode 100644
index 000000000..87d367d74
--- /dev/null
+++ b/test/Model/MigrationSpec.hs
@@ -0,0 +1,12 @@
+module Model.MigrationSpec where
+
+import TestImport
+
+import Model.Migration
+
+
+spec :: Spec
+spec = withApp $ -- `withApp` does migration, if needed
+ describe "Migration" $
+ it "is idempotent" $
+ (`shouldBe` False) <$> runDB requiresMigration -- Migration shouldn't be needed after `withApp` above
diff --git a/test/Model/TypesSpec.hs b/test/Model/TypesSpec.hs
index c27083034..2aac97b8d 100644
--- a/test/Model/TypesSpec.hs
+++ b/test/Model/TypesSpec.hs
@@ -8,6 +8,7 @@ import Settings
import Control.Lens (review, preview)
import Data.Aeson (Value)
import qualified Data.Aeson as Aeson
+import qualified Data.Aeson.Types as Aeson
import MailSpec ()
@@ -32,6 +33,8 @@ import Data.Scientific
import Utils.Lens
+import qualified Data.Char as Char
+
instance (Arbitrary a, MonoFoldable a) => Arbitrary (NonNull a) where
arbitrary = arbitrary `suchThatMap` fromNullable
@@ -250,6 +253,28 @@ instance Arbitrary ExamPassed where
arbitrary = genericArbitrary
shrink = genericShrink
+instance Arbitrary Quoting where
+ arbitrary = genericArbitrary
+ shrink = genericShrink
+
+instance Arbitrary CsvOptions where
+ arbitrary = CsvOptions
+ <$> suchThat arbitrary validDelimiter
+ <*> arbitrary
+ <*> arbitrary
+ where
+ validDelimiter c = and
+ [ Char.isLatin1 c
+ , c /= '"'
+ , c /= '\r'
+ , c /= '\n'
+ ]
+ shrink = genericShrink
+
+instance Arbitrary CsvPreset where
+ arbitrary = genericArbitrary
+ shrink = genericShrink
+
spec :: Spec
spec = do
@@ -334,6 +359,12 @@ spec = do
[ eqLaws, ordLaws, showReadLaws, jsonLaws, persistFieldLaws ]
lawsCheckHspec (Proxy @ExamPassed)
[ eqLaws, ordLaws, showReadLaws, finiteLaws, jsonLaws, pathPieceLaws, persistFieldLaws, csvFieldLaws ]
+ lawsCheckHspec (Proxy @Quoting)
+ [ eqLaws, ordLaws, jsonLaws, showReadLaws, finiteLaws, pathPieceLaws ]
+ lawsCheckHspec (Proxy @CsvOptions)
+ [ eqLaws, ordLaws, showReadLaws, jsonLaws, persistFieldLaws ]
+ lawsCheckHspec (Proxy @CsvPreset)
+ [ eqLaws, ordLaws, showReadLaws, boundedEnumLaws, finiteLaws, pathPieceLaws ]
describe "TermIdentifier" $ do
it "has compatible encoding/decoding to/from Text" . property $
@@ -365,6 +396,9 @@ spec = do
parse "1.8" `shouldSatisfy` is _Left
parse "voided" `shouldBe` Right ExamVoided
parse "no-show" `shouldBe` Right ExamNoShow
+ describe "CsvOptions" $
+ it "json-decodes from empty object" . example $
+ Aeson.parseMaybe Aeson.parseJSON (Aeson.object []) `shouldBe` Just (def :: CsvOptions)
termExample :: (TermIdentifier, Text) -> Expectation
termExample (term, encoded) = example $ do
diff --git a/test/ModelSpec.hs b/test/ModelSpec.hs
index a0139e9a8..a3d8de2c9 100644
--- a/test/ModelSpec.hs
+++ b/test/ModelSpec.hs
@@ -22,10 +22,13 @@ import Utils
import System.FilePath
import Data.Time
+import Mail (MailLanguages(..))
+
+
instance Arbitrary EmailAddress where
arbitrary = do
- local <- suchThat arbitrary (\l -> isEmail l (CBS.pack "example.com"))
- domain <- suchThat arbitrary (\d -> isEmail (CBS.pack "example") d)
+ local <- suchThat (CBS.pack . getPrintableString <$> arbitrary) (\l -> isEmail l (CBS.pack "example.com"))
+ domain <- suchThat (CBS.pack . getPrintableString <$> arbitrary) (\d -> isEmail (CBS.pack "example") d)
let (Just result) = emailAddress (makeEmailLike local domain)
pure result
@@ -100,8 +103,9 @@ instance Arbitrary User where
userDownloadFiles <- arbitrary
userWarningDays <- arbitrary
- userMailLanguages <- arbitrary
+ userMailLanguages <- fmap MailLanguages $ sublistOf =<< shuffle (toList appLanguages)
userNotificationSettings <- arbitrary
+ userCsvOptions <- arbitrary
userCreated <- arbitrary
userLastLdapSynchronisation <- arbitrary
diff --git a/test/TestImport.hs b/test/TestImport.hs
index d14c8ae07..af8b15be8 100644
--- a/test/TestImport.hs
+++ b/test/TestImport.hs
@@ -140,6 +140,7 @@ createUser adjUser = do
userNotificationSettings = def
userCreated = now
userLastLdapSynchronisation = Nothing
+ userCsvOptions = def
runDB . insertEntity $ adjUser User{..}
lawsCheckHspec :: Typeable a => Proxy a -> [Proxy a -> Laws] -> Spec
_{MsgCourseAllocationsBounds (length allocationsBounds)}
+
+ $forall (Allocation{allocationName, allocationRegisterTo}, numApps, numFirstChoice, capped) <- allocationsBounds
+
_{MsgMenuCourseApplications}
-^{table}
+
_{MsgMenuCourseApplications}
+ ^{table}
diff --git a/templates/exam-show.hamlet b/templates/exam-show.hamlet
index b05d2c2b6..44ff63632 100644
--- a/templates/exam-show.hamlet
+++ b/templates/exam-show.hamlet
@@ -114,7 +114,7 @@ $if not (null occurrences)
_{MsgExamRoomDescription}
$forall (Entity _occId ExamOccurrence{examOccurrenceName, examOccurrenceRoom, examOccurrenceStart, examOccurrenceEnd, examOccurrenceDescription}, registered) <- occurrences
-
+
$if occurrenceNamesShown
#{examOccurrenceName}
$if occurrenceAssignmentsShown
diff --git a/templates/i18n/changelog/de.hamlet b/templates/i18n/changelog/de.hamlet
index 4502079c5..866cb0f55 100644
--- a/templates/i18n/changelog/de.hamlet
+++ b/templates/i18n/changelog/de.hamlet
@@ -1,5 +1,20 @@
$newline never
+
+
+
Hinweise zum Import von CSV-Dateien
+
+ Spalten können beliebig permutiert werden und dürfen auch fehlen (in #
+ diesem Fall wird die fehlende Spalte so behandelt als enthielte sie in #
+ jeder Zeile eine leere Zelle).
+ Spalten werden an ihrer Überschrift identifiziert. #
+ Die Überschrift darf daher nicht verändert oder entfernt werden.
Nicht-änderbare Zellen werden ignoriert, falls diese verändert wurden.
In der Vorschau können dann auch nur teilweise Änderungen ausgewählt werden.
Da diese jedoch eindeutig sind, kann man diese Zellen einfach frei lassen.
+ Es muss nicht in jeder Spalte der Zeile ein Wert vorhanden sein, #
+ so lange die Identifikation noch eindeutig ist.
Sind mehrere Werte vorhanden, so müssen diese natürlich zueinander passen.
_{MsgCourseParticipantsAlreadyRegistered (length aurAlreadyRegistered)}
- $forall email <- aurAlreadyRegistered
+ $forall email <- aurAlreadyRegistered'
_{MsgCourseParticipantsRegisteredWithoutField (length aurNoUniquePrimaryField)}
- $forall email <- aurNoUniquePrimaryField
+ $forall email <- aurNoUniquePrimaryField'