Details des Tickets

Beschreibung,Kommentare und Anhänge

merge request id 193
TitelFeature/ll 383 verify certificates
BeschreibungHabe die Änderung in User::trainingAssignments(...) die an Marcel gehen sollte zurückgenommen, und stattdessen die 4 Stellen wo User::trainingAssignments(...) verwendet wurde durch die Nutzung von User::assignments(...) ersetzt. Damit wird momentan angenommen, dass training_assignments.user_id immer gesetzt ist. Sollten wir das wieder fallen lassen, so muss User::assignments(...) erweiter werden.
Statusmerged
Created at 2020-05-29T07:37:30.284Z
Updated at 2020-06-16T11:24:21.417Z
Source branchfeature/LL-383-verify-certificates
Target branchdevelop
AuthorGregor Gabriel
AssigneeMarcel Pociot

Discussion notes

assigned to @pociotm Sascha Immig 2020-06-15T11:47:30.117Z
added 116 commits
  • e8594361...a3fdcbf9 - 115 commits from branch develop
  • 8b09eb9c - Merge branch 'develop' of https://gitlab.learningsystem.de/lms/seventeen into…
Compare with previous version
Gregor Gabriel 2020-06-16T10:12:22.309Z
merged Sascha Immig 2020-06-16T11:24:21.515Z
mentioned in commit b270dc71e68d8e2b507e0316b7fd83590ba2ecf0 Sascha Immig 2020-06-16T11:24:21.694Z

Merge Commits

Title Id Author Created at Message
Merge branch 'develop' of https://gitlab.learningsystem.de/lms/seventeen into… 8b09eb9c4a37772896a86e6ece8ec1a30f1a51d1 TUV\gabrielg 2020-06-16T10:12:13.000Z Merge branch 'develop' of https://gitlab.learningsystem.de/lms/seventeen into feature/LL-383-verify-certificates # Conflicts: # resources/views/admin/dashboard/includes/certificates.blade.php # resources/views/admin/users/includes/trainings.blade.php
+ replaced use of User::trainingAssignments by User::assignments (might be changed back later on) df8d4b34f5d451b9e705f09d52fbca9cc8e31955 TUV\gabrielg 2020-05-29T06:52:00.000Z + replaced use of User::trainingAssignments by User::assignments (might be changed back later on) + fixed link to certificate in Dashboard +made sure correct progress is retrieved
+ added suggestion for training history in profile with progress data e8594361ede88a0584675f039765a8c136af57e1 TUV\gabrielg 2020-05-29T07:29:25.000Z + added suggestion for training history in profile with progress data