chore(tutorial): WIP towards tutorial templates, part 2
This commit is contained in:
parent
5400c32477
commit
314e661108
@ -78,7 +78,7 @@ data CourseRegisterActionData
|
|||||||
| CourseRegisterActionAddTutorialMemberData
|
| CourseRegisterActionAddTutorialMemberData
|
||||||
{ crActIdent :: UserSearchKey
|
{ crActIdent :: UserSearchKey
|
||||||
, crActUser :: (UserId, User)
|
, crActUser :: (UserId, User)
|
||||||
, crActTutorial :: TutorialName
|
, crActTutorial :: (Maybe TutorialName, Maybe TutorialType, Maybe Day)
|
||||||
}
|
}
|
||||||
-- | CourseRegisterActionUnknownPersonData -- pseudo-action; just for display
|
-- | CourseRegisterActionUnknownPersonData -- pseudo-action; just for display
|
||||||
-- { crActUnknownPersonIdent :: Text
|
-- { crActUnknownPersonIdent :: Text
|
||||||
@ -168,8 +168,8 @@ postTAddUserR tid ssh csh tut = do
|
|||||||
tutActs = Set.filter (is _CourseRegisterActionAddTutorialMemberData) confirmedActs
|
tutActs = Set.filter (is _CourseRegisterActionAddTutorialMemberData) confirmedActs
|
||||||
actTutorial = crActTutorial <$> Set.lookupMin tutActs -- tutorial ident must be the same for every added member!
|
actTutorial = crActTutorial <$> Set.lookupMin tutActs -- tutorial ident must be the same for every added member!
|
||||||
registeredUsers <- registerUsers cid users
|
registeredUsers <- registerUsers cid users
|
||||||
forM_ actTutorial $ \tutName -> do
|
forM_ actTutorial $ \(tutName,tutType,tutDay) -> do
|
||||||
tutId <- upsertNewTutorial cid tutName --TODO
|
tutId <- upsertNewTutorial cid (fromMaybe "TODO" tutName) tutType tutDay
|
||||||
registerTutorialMembers tutId registeredUsers
|
registerTutorialMembers tutId registeredUsers
|
||||||
|
|
||||||
if
|
if
|
||||||
@ -323,7 +323,7 @@ upsertNewTutorial cid newTutorialName newTutorialType anchorDay = runDB $ do
|
|||||||
, tutorialDeregisterUntil = mvTime tutorialDeregisterUntil
|
, tutorialDeregisterUntil = mvTime tutorialDeregisterUntil
|
||||||
, tutorialLastChanged = now
|
, tutorialLastChanged = now
|
||||||
, ..
|
, ..
|
||||||
} [] -- update cannot happen due to previous case
|
} [] -- update cannot happen due to previous case
|
||||||
audit $ TransactionTutorialEdit tutId
|
audit $ TransactionTutorialEdit tutId
|
||||||
return tutId
|
return tutId
|
||||||
_ -> do
|
_ -> do
|
||||||
@ -343,8 +343,7 @@ upsertNewTutorial cid newTutorialName newTutorialType anchorDay = runDB $ do
|
|||||||
, tutorialLastChanged = now
|
, tutorialLastChanged = now
|
||||||
, tutorialTutorControlled = False
|
, tutorialTutorControlled = False
|
||||||
, tutorialFirstDay = anchorDay
|
, tutorialFirstDay = anchorDay
|
||||||
}
|
} [] -- update cannot happen due to previous cases
|
||||||
[ ] -- update cannot happen due to previous cases
|
|
||||||
audit $ TransactionTutorialEdit tutId
|
audit $ TransactionTutorialEdit tutId
|
||||||
return tutId
|
return tutId
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user