From f54dd4ec8f1da2bc42b2b94a7a9dfe78b20056c5 Mon Sep 17 00:00:00 2001
From: Filip Gralinski <filipg@amu.edu.pl>
Date: Fri, 29 Sep 2017 15:53:20 +0200
Subject: [PATCH] achievement can be linked to a course now

---
 Handler/Achievements.hs | 16 ++++++++++++----
 config/models           |  1 +
 messages/en.msg         |  1 +
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/Handler/Achievements.hs b/Handler/Achievements.hs
index 3c04427..58502b1 100644
--- a/Handler/Achievements.hs
+++ b/Handler/Achievements.hs
@@ -30,8 +30,8 @@ postAchievementsR = do
   mUser <- maybeAuth
   when (checkIfAdmin mUser) $ do
      case result of
-      FormSuccess (name, description, points, deadlineDay, deadlineTime, maxSubmitters, mTags, challengeId) -> do
-                            achievementId <- runDB $ insert $ Achievement name challengeId points description (UTCTime { utctDay = deadlineDay, utctDayTime = timeOfDayToTime deadlineTime }) maxSubmitters
+      FormSuccess (name, description, points, deadlineDay, deadlineTime, maxSubmitters, mTags, challengeId, courseId) -> do
+                            achievementId <- runDB $ insert $ Achievement name challengeId points description (UTCTime { utctDay = deadlineDay, utctDayTime = timeOfDayToTime deadlineTime }) maxSubmitters (Just courseId)
 
                             tids <- runDB $ tagsAsTextToTagIds mTags
 
@@ -159,8 +159,8 @@ formatMaxSubmitters :: Maybe Int -> String
 formatMaxSubmitters Nothing = "no limit"
 formatMaxSubmitters (Just m) = show m
 
-achievementForm :: Form (Text, Maybe Text, Int, Day, TimeOfDay, Maybe Int, Maybe Text, ChallengeId)
-achievementForm = renderBootstrap3 BootstrapBasicForm $ (,,,,,,,)
+achievementForm :: Form (Text, Maybe Text, Int, Day, TimeOfDay, Maybe Int, Maybe Text, ChallengeId, CourseId)
+achievementForm = renderBootstrap3 BootstrapBasicForm $ (,,,,,,,,)
     <$> areq textField (bfs MsgAchievementName) Nothing
     <*> aopt textField (bfs MsgAchievementDescription) Nothing
     <*> areq intField (bfs MsgAchievementPoints) Nothing
@@ -169,9 +169,17 @@ achievementForm = renderBootstrap3 BootstrapBasicForm $ (,,,,,,,)
     <*> aopt intField (bfs MsgAchievementMaxWinners) Nothing
     <*> aopt textField (tagsfs MsgAchievementTags) Nothing
     <*> challengesSelectFieldList
+    <*> coursesSelectFieldList
 
 challengesSelectFieldList = areq (selectField challenges) (bfs MsgChallenge) Nothing
     where
       challenges = do
         challengeEnts <- runDB $ selectList [] [Asc ChallengeTitle]
         optionsPairs $ Import.map (\ch -> (challengeTitle $ entityVal ch, entityKey ch)) challengeEnts
+
+
+coursesSelectFieldList = areq (selectField courses) (bfs MsgCourse) Nothing
+    where
+      courses = do
+        courseEnts <- runDB $ selectList [] [Asc CourseName]
+        optionsPairs $ Import.map (\ch -> (courseName $ entityVal ch, entityKey ch)) courseEnts
diff --git a/config/models b/config/models
index cb937ca..45e068b 100644
--- a/config/models
+++ b/config/models
@@ -91,6 +91,7 @@ Achievement
     description Text Maybe
     deadline UTCTime
     maxWinners Int Maybe
+    coarse CourseId Maybe
     UniqueAchievementName name
 AchievementTag
     achievement AchievementId
diff --git a/messages/en.msg b/messages/en.msg
index c89ae96..5e4a8f1 100644
--- a/messages/en.msg
+++ b/messages/en.msg
@@ -49,3 +49,4 @@ YourScore: your score
 PasswordForNewAccount: enter a password for your new account
 SubmissionDescriptionTooltip: the first non-empty line of the commit message will be used, if this is left empty
 Challenge: challenge
+Course: course