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

chore(add-users): display user name in confirmation form

Browse Source
This commit is contained in:
Sarah Vaupel 2022-12-12 07:33:52 +01:00
parent 94a96352cc
commit 0b3e54022b
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/Handler/Course/ParticipantInvite.hs
View File

@ -70,17 +70,17 @@ instance Finite CourseRegisterAction
data CourseRegisterActionData data CourseRegisterActionData
= CourseRegisterActionAddParticipantData = CourseRegisterActionAddParticipantData
{ crActAddParticipantIdent :: UserSearchKey { crActAddParticipantIdent :: UserSearchKey
, crActAddParticipantUser :: UserId , crActAddParticipantUser :: (UserId, User)
} }
| CourseRegisterActionAddTutorialMemberData | CourseRegisterActionAddTutorialMemberData
{ crActAddTutorialMemberIdent :: UserSearchKey { crActAddTutorialMemberIdent :: UserSearchKey
, crActAddTutorialMemberUser :: UserId , crActAddTutorialMemberUser :: (UserId, User)
, crActAddTutorialMemberTutorial :: TutorialIdent , crActAddTutorialMemberTutorial :: TutorialIdent
} }
-- | CourseRegisterActionUnknownPersonData -- pseudo-action; just for display -- | CourseRegisterActionUnknownPersonData -- pseudo-action; just for display
-- { crActUnknownPersonIdent :: Text -- { crActUnknownPersonIdent :: Text
-- } -- }
deriving (Eq, Ord, Read, Show, Generic, Typeable) deriving (Eq, Ord, Generic, Typeable)
makeLenses_ ''CourseRegisterActionData makeLenses_ ''CourseRegisterActionData
@ -104,8 +104,8 @@ courseRegisterRenderActionClass = \case
courseRegisterRenderAction :: CourseRegisterActionData -> Widget courseRegisterRenderAction :: CourseRegisterActionData -> Widget
courseRegisterRenderAction = \case courseRegisterRenderAction = \case
CourseRegisterActionAddParticipantData{..} -> [whamlet|TODO USER (#{crActAddParticipantIdent})|] CourseRegisterActionAddParticipantData{..} -> [whamlet|^{userWidget (view _2 crActAddParticipantUser)} (#{crActAddParticipantIdent})|]
CourseRegisterActionAddTutorialMemberData{..} -> [whamlet|TODO USER (#{crActAddTutorialMemberIdent})|] CourseRegisterActionAddTutorialMemberData{..} -> [whamlet|^{userWidget (view _2 crActAddTutorialMemberUser)} (#{crActAddTutorialMemberIdent}), _{MsgCourseParticipantsRegisterTutorialField}: #{crActAddTutorialMemberTutorial}|]
--data CourseRegisterActionClass --data CourseRegisterActionClass
-- = CourseRegisterActionClassNew -- = CourseRegisterActionClassNew
@ -232,9 +232,10 @@ postCAddUserR tid ssh csh = do
(_, Nothing) -> error "Found user in AVS, but response is Nothing!" -- this should not be possible (_, Nothing) -> error "Found user in AVS, but response is Nothing!" -- this should not be possible
(ukey, Just uid) -> do (ukey, Just uid) -> do
-- isParticipant <- exists [CourseParticipantCourse ==. cid, CourseParticipantUser ==. uid, CourseParticipantState ==. CourseParticipantActive] -- isParticipant <- exists [CourseParticipantCourse ==. cid, CourseParticipantUser ==. uid, CourseParticipantState ==. CourseParticipantActive]
user <- liftHandler . runDBRead $ get404 uid
case auReqTutorial of case auReqTutorial of
Nothing -> return . Map.singleton CourseRegisterActionAddParticipant . Set.singleton $ CourseRegisterActionAddParticipantData ukey uid Nothing -> return . Map.singleton CourseRegisterActionAddParticipant . Set.singleton $ CourseRegisterActionAddParticipantData ukey (uid,user)
Just crActAddTutorialMemberTutorial -> return . Map.singleton CourseRegisterActionAddTutorialMember . Set.singleton $ CourseRegisterActionAddTutorialMemberData ukey uid crActAddTutorialMemberTutorial Just crActAddTutorialMemberTutorial -> return . Map.singleton CourseRegisterActionAddTutorialMember . Set.singleton $ CourseRegisterActionAddTutorialMemberData ukey (uid,user) crActAddTutorialMemberTutorial
let let
precomputeIdents :: forall f m. (Eq (Element f), MonoFoldable f, MonadHandler m) => f -> m (Element f -> Text) precomputeIdents :: forall f m. (Eq (Element f), MonoFoldable f, MonadHandler m) => f -> m (Element f -> Text)