diff --git a/templates/profile/exam-office-labels/add.hamlet b/templates/profile/exam-office-labels/add.hamlet
new file mode 100644
index 000000000..2935c0b46
--- /dev/null
+++ b/templates/profile/exam-office-labels/add.hamlet
@@ -0,0 +1,6 @@
+$newline never
+|
+ #{csrf}
+ ^{fvWidget addView}
+ |
+ ^{fvWidget submitView}
diff --git a/templates/profile/exam-office-labels/cell.hamlet b/templates/profile/exam-office-labels/cell.hamlet
new file mode 100644
index 000000000..32d4fab7b
--- /dev/null
+++ b/templates/profile/exam-office-labels/cell.hamlet
@@ -0,0 +1,8 @@
+$newline never
+ |
+ ^{labelIdent}
+ |
+ #{csrf}
+ ^{fvWidget statusView}
+ |
+ ^{fvWidget priorityView}
diff --git a/templates/profile/exam-office-labels/layout.hamlet b/templates/profile/exam-office-labels/layout.hamlet
new file mode 100644
index 000000000..95f9a9c00
--- /dev/null
+++ b/templates/profile/exam-office-labels/layout.hamlet
@@ -0,0 +1,17 @@
+$newline never
+
+
+
+ | _{MsgTableExamOfficeLabel}
+ | _{MsgTableExamOfficeLabelStatus}
+ | _{MsgTableExamOfficeLabelPriority}
+ |
+ |
+ $forall coord <- review liveCoords lLength
+
+ ^{cellWdgts ! coord}
+ |
+ ^{fvWidget (delButtons ! coord)}
+ |
+
+ ^{addWdgets ! (0, 0)}
diff --git a/templates/widgets/exam-office-label.hamlet b/templates/widgets/exam-office-label.hamlet
new file mode 100644
index 000000000..db8d43354
--- /dev/null
+++ b/templates/widgets/exam-office-label.hamlet
@@ -0,0 +1,4 @@
+$newline never
+
+
+ #{examOfficeLabelName}
diff --git a/test/Database/Fill.hs b/test/Database/Fill.hs
index b57095456..4ed996c40 100644
--- a/test/Database/Fill.hs
+++ b/test/Database/Fill.hs
@@ -150,6 +150,8 @@ fillDb = do
, userCsvOptions = def { csvFormat = csvPreset # CsvPresetRFC }
, userSex = Just SexMale
, userShowSex = userDefaultShowSex
+ , userExamOfficeGetSynced = userDefaultExamOfficeGetSynced
+ , userExamOfficeGetLabels = userDefaultExamOfficeGetLabels
}
fhamann <- insert User
{ userIdent = "felix.hamann@campus.lmu.de"
@@ -179,6 +181,8 @@ fillDb = do
, userCsvOptions = def { csvFormat = csvPreset # CsvPresetExcel }
, userSex = Just SexMale
, userShowSex = userDefaultShowSex
+ , userExamOfficeGetSynced = userDefaultExamOfficeGetSynced
+ , userExamOfficeGetLabels = userDefaultExamOfficeGetLabels
}
jost <- insert User
{ userIdent = "jost@tcs.ifi.lmu.de"
@@ -208,6 +212,8 @@ fillDb = do
, userSex = Just SexMale
, userCsvOptions = def
, userShowSex = userDefaultShowSex
+ , userExamOfficeGetSynced = userDefaultExamOfficeGetSynced
+ , userExamOfficeGetLabels = userDefaultExamOfficeGetLabels
}
maxMuster <- insert User
{ userIdent = "max@campus.lmu.de"
@@ -237,6 +243,8 @@ fillDb = do
, userCsvOptions = def
, userSex = Just SexMale
, userShowSex = userDefaultShowSex
+ , userExamOfficeGetSynced = userDefaultExamOfficeGetSynced
+ , userExamOfficeGetLabels = userDefaultExamOfficeGetLabels
}
tinaTester <- insert $ User
{ userIdent = "tester@campus.lmu.de"
@@ -266,6 +274,8 @@ fillDb = do
, userCsvOptions = def
, userSex = Just SexNotApplicable
, userShowSex = userDefaultShowSex
+ , userExamOfficeGetSynced = userDefaultExamOfficeGetSynced
+ , userExamOfficeGetLabels = userDefaultExamOfficeGetLabels
}
svaupel <- insert User
{ userIdent = "vaupel.sarah@campus.lmu.de"
@@ -295,6 +305,8 @@ fillDb = do
, userCsvOptions = def
, userSex = Just SexFemale
, userShowSex = userDefaultShowSex
+ , userExamOfficeGetSynced = userDefaultExamOfficeGetSynced
+ , userExamOfficeGetLabels = userDefaultExamOfficeGetLabels
}
sbarth <- insert User
{ userIdent = "Stephan.Barth@campus.lmu.de"
@@ -324,6 +336,8 @@ fillDb = do
, userCsvOptions = def
, userSex = Just SexMale
, userShowSex = userDefaultShowSex
+ , userExamOfficeGetSynced = False
+ , userExamOfficeGetLabels = True
}
let
@@ -383,6 +397,8 @@ fillDb = do
, userCsvOptions = def
, userSex = Nothing
, userShowSex = userDefaultShowSex
+ , userExamOfficeGetSynced = userDefaultExamOfficeGetSynced
+ , userExamOfficeGetLabels = userDefaultExamOfficeGetLabels
}
where
userIdent :: IsString t => t
@@ -472,6 +488,22 @@ fillDb = do
void . insert' $ UserSchool uid ifi False
for_ [gkleen, tinaTester] $ \uid ->
void . insert' $ UserSchool uid mi False
+
+ let
+ examLabels = Map.fromList
+ [ ( sbarth
+ , [ ("In Bearbeitung" , Success , 4)
+ , ("Sonderfall" , Warning , 1)
+ , ("Zu überprüfen" , Error , 1)
+ , ("Weiterzuleiten" , Info , 3)
+ , ("Nicht zu bearbeiten" , Nonactive , -1)
+ ]
+ )
+ ]
+ for_ (Map.toList examLabels) $ \(examOfficeLabelUser, labels) ->
+ for_ labels $ \(examOfficeLabelName, examOfficeLabelStatus, examOfficeLabelPriority) ->
+ void $ insert' ExamOfficeLabel{..}
+
let
sdBsc = StudyDegreeKey' 82
sdMst = StudyDegreeKey' 88
diff --git a/test/Model/TypesSpec.hs b/test/Model/TypesSpec.hs
index fad24d3f7..10da379ed 100644
--- a/test/Model/TypesSpec.hs
+++ b/test/Model/TypesSpec.hs
@@ -298,6 +298,7 @@ instance Arbitrary CsvOptions where
arbitrary = CsvOptions
<$> arbitrary
<*> arbitrary
+ <*> suchThat arbitrary (maybe True $ not . elem (Char.chr 0))
shrink = genericShrink
instance Arbitrary CsvPreset where
diff --git a/test/ModelSpec.hs b/test/ModelSpec.hs
index 66b90b480..27a5bed3f 100644
--- a/test/ModelSpec.hs
+++ b/test/ModelSpec.hs
@@ -128,6 +128,8 @@ instance Arbitrary User where
userNotificationSettings <- arbitrary
userCsvOptions <- arbitrary
userShowSex <- arbitrary
+ userExamOfficeGetSynced <- arbitrary
+ userExamOfficeGetLabels <- arbitrary
userCreated <- arbitrary
userLastLdapSynchronisation <- arbitrary
diff --git a/test/User.hs b/test/User.hs
index 35ba6a848..ff7e14c62 100644
--- a/test/User.hs
+++ b/test/User.hs
@@ -37,6 +37,8 @@ fakeUser adjUser = adjUser User{..}
userLanguages = Nothing
userWarningDays = userDefaultWarningDays
userCsvOptions = def
+ userExamOfficeGetSynced = True
+ userExamOfficeGetLabels = True
userSex = Nothing
userShowSex = userDefaultShowSex
userNotificationSettings = def
|