From ab76d28b43fca8a0eeb49292efba6121ce537d28 Mon Sep 17 00:00:00 2001 From: Filip Gralinski Date: Tue, 3 Oct 2017 22:16:00 +0200 Subject: [PATCH] filtre out closed courses in achievements --- Handler/Achievements.hs | 3 ++- config/models | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Handler/Achievements.hs b/Handler/Achievements.hs index 2501ff7..20ccd33 100644 --- a/Handler/Achievements.hs +++ b/Handler/Achievements.hs @@ -45,7 +45,8 @@ postAchievementsR = do doAchievements mUser formWidget formEnctype = do achievements <- runDB $ selectList [] [Asc AchievementName] mUser <- maybeAuth - achievementInfos <- runDB $ mapM (getAchievementInfo mUser) achievements + achievementInfos' <- runDB $ mapM (getAchievementInfo mUser) achievements + let achievementInfos = Import.filter (not . courseClosed . entityVal . achievementInfoCourse) achievementInfos' tagsAvailableAsJSON <- runDB $ getAvailableTagsAsJSON diff --git a/config/models b/config/models index f15e41a..daeb2d2 100644 --- a/config/models +++ b/config/models @@ -104,7 +104,8 @@ WorkingOn UniqueWorkingOnAchievementUser achievement user Course name Text - code Text Maybe - closed Bool Maybe + code Text + closed Bool UniqueCourseName name + UniqueCourseCode code -- By default this file is used in Model.hs (which is imported by Foundation.hs)