From 6ff46b7eb7157c9084ab342bd9189ec7e9e52988 Mon Sep 17 00:00:00 2001 From: Sarah Vaupel Date: Tue, 13 Aug 2019 10:31:16 +0200 Subject: [PATCH 1/5] style(course-teaser): break sorting header line --- frontend/src/utils/course-teaser/course-teaser.scss | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/frontend/src/utils/course-teaser/course-teaser.scss b/frontend/src/utils/course-teaser/course-teaser.scss index 0baedd74c..a75be4053 100644 --- a/frontend/src/utils/course-teaser/course-teaser.scss +++ b/frontend/src/utils/course-teaser/course-teaser.scss @@ -141,15 +141,16 @@ course teaser: header styling */ .course-teaser-header { - padding-top: 20px; + padding-top: 10px; padding-bottom: 20px; + line-height: 2.7; .course-header { + white-space: nowrap; background-color: var(--color-dark); position: relative; font-size: 16px; color: #fff; - line-height: 1.4; padding-top: 10px; padding-bottom: 10px; padding-left: 10px; From 39978574feff5c1a761f84ab4e040dd53cc7f739 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Tue, 13 Aug 2019 13:25:13 +0200 Subject: [PATCH 2/5] fix(course-deregister): only delete relevant users exam results --- src/Handler/Course/Register.hs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Handler/Course/Register.hs b/src/Handler/Course/Register.hs index 36a82ac97..dbaaac8df 100644 --- a/src/Handler/Course/Register.hs +++ b/src/Handler/Course/Register.hs @@ -224,6 +224,7 @@ postCRegisterR tid ssh csh = do examRegistrations <- E.select . E.from $ \(examRegistration `E.InnerJoin` exam) -> do E.on $ examRegistration E.^. ExamRegistrationExam E.==. exam E.^. ExamId E.where_ $ exam E.^. ExamCourse E.==. E.val cid + E.&&. examRegistration E.^. ExamRegistrationUser E.==. E.val uid return examRegistration forM_ examRegistrations $ \(Entity erId ExamRegistration{..}) -> do delete erId @@ -232,6 +233,7 @@ postCRegisterR tid ssh csh = do examResults <- E.select . E.from $ \(examResult `E.InnerJoin` exam) -> do E.on $ examResult E.^. ExamResultExam E.==. exam E.^. ExamId E.where_ $ exam E.^. ExamCourse E.==. E.val cid + E.&&. examResult E.^. ExamResultUser E.==. E.val uid return examResult forM_ examResults $ \(Entity erId ExamResult{..}) -> do delete erId From 3a57c7ec6662d47aa883a8ab8ed2cec4f037d319 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Tue, 13 Aug 2019 13:28:45 +0200 Subject: [PATCH 3/5] chore(release): 5.0.2 --- CHANGELOG.md | 9 +++++++++ package-lock.json | 2 +- package.json | 2 +- package.yaml | 2 +- 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 646041fda..8755e90b0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,15 @@ All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. +### [5.0.2](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/compare/v5.0.1...v5.0.2) (2019-08-13) + + +### Bug Fixes + +* **course-deregister:** only delete relevant users exam results ([3997857](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/3997857)) + + + ### [5.0.1](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/compare/v5.0.0...v5.0.1) (2019-08-12) diff --git a/package-lock.json b/package-lock.json index 7e0180367..f27cdab3d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "uni2work", - "version": "5.0.1", + "version": "5.0.2", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index abebbfbe1..8914b3650 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "uni2work", - "version": "5.0.1", + "version": "5.0.2", "description": "", "keywords": [], "author": "", diff --git a/package.yaml b/package.yaml index 37a42e718..53e8c4d5e 100644 --- a/package.yaml +++ b/package.yaml @@ -1,5 +1,5 @@ name: uniworx -version: 5.0.1 +version: 5.0.2 dependencies: # Due to a bug in GHC 8.0.1, we block its usage From a2fe688eb539510fcb876e7b38abe8c070f1dd02 Mon Sep 17 00:00:00 2001 From: Sarah Vaupel Date: Tue, 13 Aug 2019 14:51:07 +0200 Subject: [PATCH 4/5] style(course-teaser): wrap sorting header line in firefox --- frontend/src/utils/course-teaser/course-teaser.scss | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/frontend/src/utils/course-teaser/course-teaser.scss b/frontend/src/utils/course-teaser/course-teaser.scss index a75be4053..a0a304f33 100644 --- a/frontend/src/utils/course-teaser/course-teaser.scss +++ b/frontend/src/utils/course-teaser/course-teaser.scss @@ -143,10 +143,11 @@ course teaser: header styling .course-teaser-header { padding-top: 10px; padding-bottom: 20px; - line-height: 2.7; + line-height: 1.4; + max-width: 85vw; .course-header { - white-space: nowrap; + float: left; background-color: var(--color-dark); position: relative; font-size: 16px; @@ -155,6 +156,7 @@ course teaser: header styling padding-bottom: 10px; padding-left: 10px; padding-right: 35px; + margin-bottom: 10px; font-weight: bold; text-align: left; border-radius: 20px 20px 20px 20px / 50% 50% 50% 50%; @@ -171,3 +173,9 @@ course teaser: header styling } } } + +.course-teaser-header:after { + content: ""; + display: table; + clear: both; +} From aeadd528d914ab057772289efd4547c09da810cb Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Thu, 15 Aug 2019 16:01:33 +0200 Subject: [PATCH 5/5] chore: move customized haskell-deps to github-org --- stack.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/stack.yaml b/stack.yaml index f9f48a935..0a748ab91 100644 --- a/stack.yaml +++ b/stack.yaml @@ -11,11 +11,11 @@ packages: - . extra-deps: - - git: https://github.com/pngwjpgh/zip-stream.git + - git: https://github.com/uni2work/zip-stream.git commit: 9272bbed000928d500febad1cdc98d1da29d399e - - git: https://github.com/pngwjpgh/encoding.git + - git: https://github.com/uni2work/encoding.git commit: 67bb87ceff53f0178c988dd4e15eeb2daee92b84 - - git: https://github.com/pngwjpgh/memcached-binary.git + - git: https://github.com/uni2work/memcached-binary.git commit: b5461747e7be226d3b67daebc3c9aefe8a4490ad - colonnade-1.2.0