fillDB adjusted for StudyFeatues

src/Handler/Course.hs

@@ -302,8 +302,8 @@ registerForm registered msecret extra = do
   (msecretRes', msecretView) <- case msecret of
     (Just _) | not registered -> bimap Just Just <$> mreq textField (fslpI MsgCourseSecret "Code") Nothing
     _ -> return (Nothing,Nothing)
-  (sfRes' , sfView) <- if not registered then return (Nothing,Nothing) else
-                       mopt (studyFeaturesPrimaryFieldFor (error "TODO SJ REMOVE")) (fslI MsgCourseStudyFeature) Nothing
+  (_sfRes' , _sfView) <- if not registered then return (Nothing,Nothing) else
+                        bimap Just Just <$> mopt (studyFeaturesPrimaryFieldFor (error "TODO SJ REMOVE")) (fslI MsgCourseStudyFeature) Nothing
   (btnRes, btnView) <- mreq (buttonField $ bool BtnRegister BtnDeregister registered) "buttonField ignores settings anyway" Nothing
 
   let widget = $(widgetFile "widgets/register-form/register-form")

test/Database.hs

@@ -198,7 +198,7 @@ fillDb = do
     , termActive       = True
     }
   ifi <- insert' $ School "Institut für Informatik" "IfI"
-  mi <- insert' $ School "Institut für Mathematik" "MI"
+  mi  <- insert' $ School "Institut für Mathematik" "MI"
   void . insert' $ UserAdmin gkleen ifi
   void . insert' $ UserAdmin gkleen mi
   void . insert' $ UserAdmin fhamann ifi
@@ -210,13 +210,70 @@ fillDb = do
   let
     sdBsc = StudyDegreeKey' 82
     sdMst = StudyDegreeKey' 88
+    sdLAR = StudyDegreeKey' 33
+    sdLAG = StudyDegreeKey' 35
   repsert sdBsc  $ StudyDegree 82 (Just "BSc") (Just "Bachelor"  )
   repsert sdMst  $ StudyDegree 88 (Just "MSc") (Just "Master"    )
+  repsert sdLAR  $ StudyDegree 33 (Just "LAR") Nothing -- intentionally left unknown
+  repsert sdLAG  $ StudyDegree 35 Nothing      Nothing -- intentionally left unknown
   let
     sdInf  = StudyTermsKey' 79
     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
+  sfMMp <- insert $ StudyFeatures -- keyword type prevents record syntax here
+    maxMuster
+    sdBsc
+    sdInf
+    FieldPrimary
+    2
+    now
+    True
+  sfMMs <- insert $ StudyFeatures
+    maxMuster
+    sdBsc
+    sdMath
+    FieldSecondary
+    2
+    now
+    True
+  _sfTTa <- insert $ StudyFeatures
+    tinaTester
+    sdBsc
+    sdInf
+    FieldPrimary
+    4
+    now
+    False
+  sfTTb <- insert $ StudyFeatures
+    tinaTester
+    sdLAG
+    sdPhys
+    FieldPrimary
+    1
+    now
+    True
+  sfTTc <- insert $ StudyFeatures
+    tinaTester
+    sdLAR
+    sdMedi
+    FieldPrimary
+    7
+    now
+    True
+  _sfTTd <- insert $ StudyFeatures
+    tinaTester
+    sdMst
+    sdMath
+    FieldPrimary
+    3
+    now
+    True
+
   -- FFP
   let nbrs :: [Int]
       nbrs = [1,2,3,27,7,1]
@@ -256,6 +313,12 @@ fillDb = do
   insert_ $ SheetEdit gkleen now feste
   keine <- insert $ Sheet ffp "Keine Gruppen" Nothing NotGraded NoGroups Nothing Nothing now now Nothing Nothing (Upload True) UserSubmissions False
   insert_ $ SheetEdit gkleen now keine
+  void . insertMany $ map (\(u,sf) -> CourseParticipant ffp u now sf)
+    [(fhamann   , Nothing)
+    ,(maxMuster , Just sfMMs)
+    ,(tinaTester, Just sfTTc)
+    ]
+
   -- EIP
   eip <- insert' Course
     { courseName = "Einführung in die Programmierung"
@@ -328,7 +391,11 @@ fillDb = do
   insert_ $ CourseEdit jost now pmo
   void . insert $ DegreeCourse pmo sdBsc sdInf
   void . insert $ Lecturer jost pmo
-  void . insertMany $ map (\u -> CourseParticipant pmo u now) [fhamann, maxMuster, tinaTester]
+  void . insertMany $ map (\(u,sf) -> CourseParticipant pmo u now sf)
+    [(fhamann   , Nothing)
+    ,(maxMuster , Just sfMMp)
+    ,(tinaTester, Just sfTTb)
+    ]
   sh1 <- insert Sheet
     { sheetCourse = pmo
     , sheetName = "Blatt 1"