Merge branch 'master' into 155-zentralanmeldungen

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)
 
 

frontend/src/utils/course-teaser/course-teaser.scss

@@ -141,19 +141,22 @@
 course teaser: header styling
 */
 .course-teaser-header {
-  padding-top: 20px;
+  padding-top: 10px;
   padding-bottom: 20px;
+  line-height: 1.4;
+  max-width: 85vw;
 
   .course-header {
+    float: left;
     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;
     padding-right: 35px;
+    margin-bottom: 10px;
     font-weight: bold;
     text-align: left;
     border-radius: 20px 20px 20px 20px / 50% 50% 50% 50%;
@@ -170,3 +173,9 @@ course teaser: header styling
     }
   }
 }
+
+.course-teaser-header:after {
+  content: "";
+  display: table;
+  clear: both;
+}

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "uni2work",
-  "version": "5.0.1",
+  "version": "5.0.2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "uni2work",
-  "version": "5.0.1",
+  "version": "5.0.2",
   "description": "",
   "keywords": [],
   "author": "",

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

src/Handler/Course/Register.hs

@@ -230,6 +230,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
@@ -238,6 +239,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

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