From 22426db241d3619001dd96414151b9ff478925de Mon Sep 17 00:00:00 2001
From: Steffen Jost <S.Jost@Fraport.de>
Date: Mon, 19 Jun 2023 09:50:21 +0000
Subject: [PATCH] chore(course): unlink course certificates from course
 qualification

---
 src/Handler/Tutorial/Users.hs | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/src/Handler/Tutorial/Users.hs b/src/Handler/Tutorial/Users.hs
index 207bc1731..fc278f84c 100644
--- a/src/Handler/Tutorial/Users.hs
+++ b/src/Handler/Tutorial/Users.hs
@@ -1,4 +1,4 @@
--- SPDX-FileCopyrightText: 2022 Gregor Kleen <gregor.kleen@ifi.lmu.de>,Sarah Vaupel <sarah.vaupel@ifi.lmu.de>
+-- SPDX-FileCopyrightText: 2022-23 Gregor Kleen <gregor.kleen@ifi.lmu.de>,Sarah Vaupel <sarah.vaupel@ifi.lmu.de>,Steffen Jost <s.jost@fraport.de>
 --
 -- SPDX-License-Identifier: AGPL-3.0-or-later
 
@@ -45,8 +45,6 @@ embedRenderMessage ''UniWorX ''TutorialUserAction id
 
 data TutorialUserActionData
   = TutorialUserPrintQualificationData
-    { tuQualification :: QualificationId    
-    }  
   | TutorialUserRenewQualificationData
     { tuQualification :: QualificationId }
   | TutorialUserGrantQualificationData
@@ -98,11 +96,7 @@ postTUsersR tid ssh csh tutn = do
       acts :: Map TutorialUserAction (AForm Handler TutorialUserActionData)
       acts = Map.fromList $
         (if null qualifications then mempty else
-          [ ( TutorialUserPrintQualification
-            , TutorialUserPrintQualificationData
-              <$> apopt (selectField . fmap mkOptionList $ mapM qualOpt qualifications) (fslI MsgQualificationName) Nothing            
-            )
-          , ( TutorialUserRenewQualification
+          [ ( TutorialUserRenewQualification
             , TutorialUserRenewQualificationData
               <$> apopt (selectField . fmap mkOptionList $ mapM qualOpt qualifications) (fslI MsgQualificationName) Nothing            
             )
@@ -113,16 +107,16 @@ postTUsersR tid ssh csh tutn = do
             )                     
           ] 
         ) ++
-        [ ( TutorialUserSendMail, pure TutorialUserSendMailData )
-        , ( TutorialUserDeregister, pure TutorialUserDeregisterData )
+        [ ( TutorialUserSendMail          , pure TutorialUserSendMailData           )
+        , ( TutorialUserDeregister        , pure TutorialUserDeregisterData         )
+        , ( TutorialUserPrintQualification, pure TutorialUserPrintQualificationData )
         ]
     table <- makeCourseUserTable cid acts isInTut colChoices psValidator (Just csvColChoices)
     return (tutEnt, table, qualifications)
 
   let courseQids = Set.fromList (entityKey <$> qualifications)
   tcontent <- formResultMaybe participantRes $ \case
-    (TutorialUserPrintQualificationData{..}, selectedUsers)
-      | tuQualification `Set.member` courseQids -> do
+    (TutorialUserPrintQualificationData, selectedUsers) -> do
         rcvr <- requireAuth
         encRcvr <- encrypt $ entityKey rcvr
         letters <- runDB $ makeCourseCertificates tut Nothing $ toList selectedUsers