fraport/fradrive-old
Archived
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Model change: term aware of lecturing times now

Browse Source
This commit is contained in:
SJost 2017-10-08 08:51:22 +02:00
parent 6d1c3bad06
commit e6ee9070ea
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
models
View File

@ -4,11 +4,13 @@ User
matrikelnummer Text matrikelnummer Text
UniqueAuthentication plugin ident UniqueAuthentication plugin ident
Term json Term json
name TermIdentifier name TermIdentifier
start Day start Day
end Day end Day
holidays [Day] holidays [Day]
active Bool lectureStart Day
lectureEnd Day
active Bool
Primary name Primary name
deriving Show deriving Show
School json School json

2
src/Handler/Term.hs
View File

@ -130,6 +130,8 @@ newTermForm template =
<*> areq dayField (bfs ("Erster Tag" :: Text)) (termStart <$> template) <*> areq dayField (bfs ("Erster Tag" :: Text)) (termStart <$> template)
<*> areq dayField (set "Letzer Tag") (termEnd <$> template) <*> areq dayField (set "Letzer Tag") (termEnd <$> template)
<*> pure [] -- TODO: List of Day field required, must probably be done as its own form and then combined <*> pure [] -- TODO: List of Day field required, must probably be done as its own form and then combined
<*> areq dayField (bfs ("Beginn Vorlesungen" :: Text)) (termLectureStart <$> template)
<*> areq dayField (set "Ende Vorlesungen") (termLectureEnd <$> template)
<*> areq checkBoxField (set "Aktiv") (termActive <$> template) <*> areq checkBoxField (set "Aktiv") (termActive <$> template)
-- <* bootstrapSubmit (bsSubmit "Semester bearbeiten") -- <* bootstrapSubmit (bsSubmit "Semester bearbeiten")
where set txt = FieldSettings where set txt = FieldSettings