merge request id	1001
Titel	Feature/ll 1746 rework myc training display on dashboard
Beschreibung	Umsetzung erfolgt sowohl in myCompetence as auch in der UWL im gleichnamigen Zweig feature/LL-1746-rework-myc-training-display-on-dashboard Hier im UWL Zweig sind in der Datei DashboardController.php die Zeilen 67-68 Code auskommentiert. Sobald der Zweig in myCompetence integriert wurde, dürfen diese Kommentare entfernt werden. Solange die Kommentare gesetzt sind, wird nicht absteigend nach Zuweisungsdatum sortiert und es werden auch nicht bestandene Fortbildungen herausgefiltert, wohl aber nicht angezeigt. Ticket: http://jira.learningsystem.de/browse/LL-1746 MYC-Merge-Request: https://gitlabnew.learningsystem.de/lms/mycompetence/-/merge_requests/3
Status	merged
Created at	2024-08-08T13:56:32.573Z
Updated at	2024-09-18T10:38:24.359Z
Source branch	feature/LL-1746-rework-myc-training-display-on-dashboard
Target branch	develop
Author	Gregor Gabriel
Assignee	Sascha Immig

Discussion notes

added 1 commit 06a33bac - activated new filters Compare with previous version	Sascha Immig	2024-09-18T10:06:17.815Z
enabled an automatic merge when the pipeline for 06a33bac8abee53b930a2a3b7f264949b2faf94c succeeds	Sascha Immig	2024-09-18T10:11:58.477Z
added 1 commit 567ea688 - skipping authoring tool api tests, when api is not available Compare with previous version	Sascha Immig	2024-09-18T10:16:24.145Z
added 92 commits 567ea688...f6679200 - 91 commits from branch develop 64e56620 - Merge branch 'develop' into 'feature/LL-1746-rework-myc-training-display-on-dashboard' Compare with previous version	Sascha Immig	2024-09-18T10:22:38.775Z
enabled an automatic merge when the pipeline for 64e5662012662d747c30d7a2f85fb77c25a20ed2 succeeds	Sascha Immig	2024-09-18T10:31:27.900Z
merged	Sascha Immig	2024-09-18T10:38:24.572Z
mentioned in commit 9900cfc668698f59e3d1d8ca33411217e7436794	Sascha Immig	2024-09-18T10:38:24.772Z

Merge Commits

Title	Id	Author	Created at	Message
activated new filters	06a33bac8abee53b930a2a3b7f264949b2faf94c	Sascha Immig	2024-09-18T10:04:47.000Z	activated new filters
LL-1746 adapted dashboard UI according to ticket http://jira.learningsystem.de/browse/LL-1746	1f9fbeeb351e5e1fae2424cbc6679a503bf1b3c8	TUV\gabrielg	2024-08-08T13:52:56.000Z	LL-1746 adapted dashboard UI according to ticket http://jira.learningsystem.de/browse/LL-1746 please remove autcommenting of line 67-68 when corresponding branch in MYC is merged. MYC-Merge-Request: s. https://gitlabnew.learningsystem.de/lms/mycompetence/-/merge_requests/3
skipping authoring tool api tests, when api is not available	567ea6888faac3cb56e4ecfc4753c2639383bc48	TUV\gabrielg	2024-09-18T10:16:13.000Z	skipping authoring tool api tests, when api is not available (cherry picked from commit 2b857fe6c37325e253234a35a633421ac8525970)
Merge branch 'develop' into 'feature/LL-1746-rework-myc-training-display-on-dashboard'	64e5662012662d747c30d7a2f85fb77c25a20ed2	Sascha Immig	2024-09-18T10:22:35.000Z	Merge branch 'develop' into 'feature/LL-1746-rework-myc-training-display-on-dashboard' # Conflicts: # app/Services/AuthoringTool/AuthoringTool.php
wip	944060a1de89da0649602a7ec77e3bfaf0a081fe	TUV\gabrielg	2024-08-08T13:14:53.000Z	wip