merge request id	411
Titel	Feature/ll 876 extend reports for head of department
Beschreibung
Status	merged
Created at	2021-04-23T06:23:42.879Z
Updated at	2021-04-27T07:37:43.206Z
Source branch	feature/LL-876-extend-reports-for-head-of-department
Target branch	develop
Author	Gregor Gabriel
Assignee	Sascha Immig

Discussion notes

added 30 commits 65226033...1ab05050 - 29 commits from branch develop 38ab1ea4 - Merge branch 'develop' of https://gitlab.learningsystem.de/lms/seventeen into… Compare with previous version	Gregor Gabriel	2021-04-26T09:13:14.171Z
added 1 commit e556b7b1 - adapted text according to wishes of uli müller Compare with previous version	Gregor Gabriel	2021-04-26T10:37:20.615Z
added 1 commit 43ee2648 - fixed bug that comes from code refactoring that invisible conflicted with a code… Compare with previous version	Gregor Gabriel	2021-04-26T11:34:19.160Z
merged	Sascha Immig	2021-04-27T07:37:43.323Z
mentioned in commit bc33d37d830517c62015bed7a8527e2b930faf25	Sascha Immig	2021-04-27T07:37:43.349Z

Merge Commits

Title	Id	Author	Created at	Message
wip - first changes for employee report	2f4274f53d79f3e3c84763982fc42bc39316ee22	TUV\gabrielg	2021-04-19T13:11:34.000Z	wip - first changes for employee report
wip + reworked group report	355439e07adbd7c26409400387eed3f467a894a9	TUV\gabrielg	2021-04-20T15:26:29.000Z	wip + reworked group report - still button logic missing
Merge branch 'develop' of https://gitlab.learningsystem.de/lms/seventeen into…	38ab1ea45aafda75ce96426ad0a51b49f455b022	TUV\gabrielg	2021-04-26T09:13:08.000Z	Merge branch 'develop' of https://gitlab.learningsystem.de/lms/seventeen into feature/LL-876-extend-reports-for-head-of-department # Conflicts: # app/Http/Controllers/Admin/EmployeeTrainingStatusReportController.php # app/Http/Controllers/Admin/GroupTrainingStatusReportController.php # app/Http/Controllers/Admin/OrganizationUnitTrainingStatusReportController.php # app/Http/Controllers/Admin/UserTrainingStatusReportController.php
+ reworked permission report logic according to rules aligned with Sascha	41d8be80d2f2280ce63f6095fd9275915c740fca	TUV\gabrielg	2021-04-21T07:36:25.000Z	+ reworked permission report logic according to rules aligned with Sascha + links to details and more now available for department supervisor
fixed bug that comes from code refactoring that invisible conflicted with a code…	43ee2648b737239b4d9d7d949233a861b882ae68	TUV\gabrielg	2021-04-26T11:34:13.000Z	fixed bug that comes from code refactoring that invisible conflicted with a code change in another feature branch
added 3rd variant for displaying ou's	65226033f1f1cce2ea8b4b9110702df80c9e387f	TUV\gabrielg	2021-04-21T09:29:33.000Z	added 3rd variant for displaying ou's
employee report now works fine for heads of units and controllers	79b8c918c55e29e75c0a6911c52cb27446ae4cb1	TUV\gabrielg	2021-04-19T15:28:59.000Z	employee report now works fine for heads of units and controllers
+ reworkrd ou report for proper work for supervisors	c0103c25fddab3ce1abff29c66cafff0b8f81e48	TUV\gabrielg	2021-04-21T09:13:35.000Z	+ reworkrd ou report for proper work for supervisors + fixed logic error in all other reports + smoothlined code
overworked user report	dfcf3081343dcbefcc6b641e8e07148e8a34dc52	TUV\gabrielg	2021-04-20T10:22:17.000Z	overworked user report
adapted text according to wishes of uli müller	e556b7b1e3342993ee1540f90fdc693e32879c26	TUV\gabrielg	2021-04-26T10:37:15.000Z	adapted text according to wishes of uli müller