| _{field}
| _{degree}
| _{studyFeaturesType}
| #{studyFeaturesSemester}
| #{hasTickmark studyFeaturesValid}
- | ^{formatTimeW SelFormatDate studyFeaturesUpdated}
- $maybe _ <- mRegistration
- _{MsgCourseStudyFeature}
- ^{regFieldWidget}
+ |
+ $maybe fObs <- studyFeaturesFirstObserved
+ ^{formatTimeRangeW SelFormatDate fObs $ Just studyFeaturesLastObserved}
+ $nothing
+ ^{formatTimeW SelFormatDate studyFeaturesLastObserved}
diff --git a/templates/profileData.hamlet b/templates/profileData.hamlet
index fe327abe3..231082dbc 100644
--- a/templates/profileData.hamlet
+++ b/templates/profileData.hamlet
@@ -43,14 +43,18 @@ $newline never
| _{MsgStudyFeatureValid}
| _{MsgStudyFeatureUpdate}
- $forall ((Entity _ StudyFeatures{studyFeaturesType, studyFeaturesSemester, studyFeaturesValid, studyFeaturesUpdated}), (Entity _ degree), (Entity _ field)) <- studies
+ $forall ((Entity _ StudyFeatures{studyFeaturesType, studyFeaturesSemester, studyFeaturesValid, studyFeaturesFirstObserved, studyFeaturesLastObserved}), (Entity _ degree), (Entity _ field)) <- studies
| _{field}
| _{degree}
| _{studyFeaturesType}
| #{studyFeaturesSemester}
| #{hasTickmark studyFeaturesValid}
- | ^{formatTimeW SelFormatDateTime studyFeaturesUpdated}
+ |
+ $maybe fObs <- studyFeaturesFirstObserved
+ ^{formatTimeRangeW SelFormatDateTime fObs $ Just studyFeaturesLastObserved}
+ $nothing
+ ^{formatTimeW SelFormatDateTime studyFeaturesLastObserved}
$if hasRows
diff --git a/templates/table/cell/user-study-feature.hamlet b/templates/table/cell/user-study-feature.hamlet
new file mode 100644
index 000000000..94cd12b61
--- /dev/null
+++ b/templates/table/cell/user-study-feature.hamlet
@@ -0,0 +1,2 @@
+$newline never
+#{userTableField} #{userTableDegree} (_{userTableFieldType} #{userTableSemester})
diff --git a/test/Database/Fill.hs b/test/Database/Fill.hs
index b1a49ec07..1543441d8 100644
--- a/test/Database/Fill.hs
+++ b/test/Database/Fill.hs
@@ -473,58 +473,64 @@ fillDb = do
void . insert $ StudyTermNameCandidate incidence12 21 "Deutsch"
void . insert $ StudyTermNameCandidate incidence12 21 "Betriebswirtschaftslehre"
- sfMMp <- insert $ StudyFeatures -- keyword type prevents record syntax here
+ insert_ $ StudyFeatures -- keyword type prevents record syntax here
maxMuster
sdBsc
sdInf
Nothing
FieldPrimary
2
+ (Just now)
now
True
- sfMMs <- insert $ StudyFeatures
+ insert_ $ StudyFeatures
maxMuster
sdBsc
sdMath
Nothing
FieldSecondary
2
+ (Just now)
now
True
- _sfTTa <- insert $ StudyFeatures
+ insert_ $ StudyFeatures
tinaTester
sdBsc
sdInf
Nothing
FieldPrimary
4
+ (Just now)
now
False
- sfTTb <- insert $ StudyFeatures
+ insert_ $ StudyFeatures
tinaTester
sdLAG
sdPhys
Nothing
FieldPrimary
1
+ (Just now)
now
True
- sfTTc <- insert $ StudyFeatures
+ insert_ $ StudyFeatures
tinaTester
sdLAR
sdMedi
Nothing
FieldPrimary
7
+ (Just now)
now
True
- _sfTTd <- insert $ StudyFeatures
+ insert_ $ StudyFeatures
tinaTester
sdMst
sdMath
Nothing
FieldPrimary
3
+ (Just now)
now
True
@@ -626,10 +632,10 @@ fillDb = do
, sheetAllowNonPersonalisedSubmission = True
}
insert_ $ SheetEdit gkleen now keine
- void . insertMany $ map (\(u,sf) -> CourseParticipant ffp u now sf Nothing CourseParticipantActive)
- [(fhamann , Nothing)
- ,(maxMuster , Just sfMMs)
- ,(tinaTester, Just sfTTc)
+ void . insertMany $ map (\u -> CourseParticipant ffp u now Nothing CourseParticipantActive)
+ [ fhamann
+ , maxMuster
+ , tinaTester
]
examFFP <- insert' $ Exam
@@ -762,10 +768,10 @@ fillDb = do
insert_ $ CourseEdit jost now pmo
void . insert $ DegreeCourse pmo sdBsc sdInf
void . insert $ Lecturer jost pmo CourseAssistant
- void . insertMany $ map (\(u,sf) -> CourseParticipant pmo u now sf Nothing CourseParticipantActive)
- [(fhamann , Nothing)
- ,(maxMuster , Just sfMMp)
- ,(tinaTester, Just sfTTb)
+ void . insertMany $ map (\u -> CourseParticipant pmo u now Nothing CourseParticipantActive)
+ [ fhamann
+ , maxMuster
+ , tinaTester
]
let shTypes = NotGraded : [ shType g | g <- shGradings, shType <- [ Normal, Bonus, Informational ] ]
@@ -1032,7 +1038,7 @@ fillDb = do
insert_ $ AllocationCourse funAlloc pmo 100
insert_ $ AllocationCourse funAlloc ffp 2
- void . insertMany $ map (\(u, pState) -> CourseParticipant ffp u now Nothing (Just funAlloc) pState)
+ void . insertMany $ map (\(u, pState) -> CourseParticipant ffp u now (Just funAlloc) pState)
[ (svaupel, CourseParticipantInactive False)
, (jost, CourseParticipantActive)
]
@@ -1066,7 +1072,7 @@ fillDb = do
void . insert' $ Lecturer gkleen bs CourseLecturer
void . insertMany $ do
uid <- take 1024 manyUsers
- return $ CourseParticipant bs uid now Nothing Nothing CourseParticipantActive
+ return $ CourseParticipant bs uid now Nothing CourseParticipantActive
forM_ [1..14] $ \shNr -> do
shId <- insert Sheet
{ sheetCourse = bs
@@ -1141,7 +1147,7 @@ fillDb = do
participants <- getRandomR (0, 50)
manyUsers' <- shuffleM $ take 1024 manyUsers
forM_ (take participants manyUsers') $ \uid ->
- void . insertUnique $ CourseParticipant cid uid now Nothing Nothing CourseParticipantActive
+ void . insertUnique $ CourseParticipant cid uid now Nothing CourseParticipantActive
aSeedBig <- liftIO $ getRandomBytes 40
bigAlloc <- insert' Allocation
@@ -1223,7 +1229,6 @@ fillDb = do
void $ insert CourseApplication
{ courseApplicationCourse = cid
, courseApplicationUser = uid
- , courseApplicationField = Nothing
, courseApplicationText = Nothing
, courseApplicationRatingVeto = maybe False (view _1) rating
, courseApplicationRatingPoints = view _2 <$> rating
diff --git a/test/Handler/Sheet/PersonalisedFilesSpec.hs b/test/Handler/Sheet/PersonalisedFilesSpec.hs
index 64b5e1dc1..8dacb3eca 100644
--- a/test/Handler/Sheet/PersonalisedFilesSpec.hs
+++ b/test/Handler/Sheet/PersonalisedFilesSpec.hs
@@ -61,7 +61,7 @@ spec = withApp . describe "Personalised sheet file zip encoding" $ do
let res = res' { personalisedSheetFileResidualSheet = shid, personalisedSheetFileResidualUser = uid }
fRef <- lift (sinkFile f :: DB FileReference)
now <- liftIO getCurrentTime
- void . lift . insert $ CourseParticipant cid (personalisedSheetFileResidualUser res) now Nothing Nothing CourseParticipantActive
+ void . lift . insert $ CourseParticipant cid (personalisedSheetFileResidualUser res) now Nothing CourseParticipantActive
void . lift . insert $ _FileReference # (fRef, res)
return (f, res)
| | |