merge request id	415
Titel	LL-881 Report-Optimierung
Beschreibung
Status	merged
Created at	2021-05-04T10:51:05.876Z
Updated at	2021-05-07T13:57:41.332Z
Source branch	feature/LL-881-reporting-optimization
Target branch	develop
Author	Markus Gerlach
Assignee	Gregor Gabriel

Discussion notes

…\app\Models\TrainingProgress.php return $this->trainingAssignment && Unabhängig vom Ticket für QS eingefügt: (nach ausführen der Seeder konnte user/edit nicht aufgerufen werden)	Markus Gerlach	2021-05-04T10:53:12.085Z
changed title from **{-rebase to develop-}** to **{+LL-881 Report-Optimierung+}**	Sascha Immig	2021-05-05T07:52:30.191Z
assigned to @gabrielg	Sascha Immig	2021-05-05T07:52:38.818Z
added 1 commit 63f5c098 - overworked EmployeeTrainingStatus report Compare with previous version	Gregor Gabriel	2021-05-05T13:42:54.354Z
added 1 commit ea98b833 - + i18n Compare with previous version	Gregor Gabriel	2021-05-05T14:26:52.508Z
added 1 commit 3754af6c - + added expired column to organization report Compare with previous version	Gregor Gabriel	2021-05-05T15:25:11.624Z
added 1 commit f3382130 - overworked ou report Compare with previous version	Gregor Gabriel	2021-05-06T08:26:33.329Z
added 1 commit 7021ff00 - update trainingStatusReports check progress Compare with previous version	Markus Gerlach	2021-05-06T10:24:41.167Z
added 13 commits 7021ff00...cd20dfe8 - 12 commits from branch develop d77a57b5 - Merge branch 'develop' into 'feature/LL-881-reporting-optimization' Compare with previous version	Sascha Immig	2021-05-07T13:48:57.731Z
enabled an automatic merge when the pipeline for d77a57b5c715d37b5a74665aebaa2a2fb34130ab succeeds	Sascha Immig	2021-05-07T13:49:29.016Z
merged	Sascha Immig	2021-05-07T13:57:41.381Z
mentioned in commit cfabc698d942ef36f2a616074c10344b518b25e4	Sascha Immig	2021-05-07T13:57:41.619Z

Merge Commits

Title	Id	Author	Created at	Message
+ added expired column to organization report	3754af6c3befb1af638d07e182dc5663cf2c3f38	TUV\gabrielg	2021-05-05T15:25:03.000Z	+ added expired column to organization report
rebase to develop	3a948b2a0a4809b66531916f2c3e2fab881b3065	gerlachm	2021-05-04T10:29:43.000Z	rebase to develop
overworked EmployeeTrainingStatus report	63f5c09821a38e49d8d9ffe258626085571a55a4	TUV\gabrielg	2021-05-05T13:42:45.000Z	overworked EmployeeTrainingStatus report + show all assignments that are valid for given time interval + refactured to new base objecte
update trainingStatusReports check progress	7021ff0038961089e99973467ec6358213894a10	gerlachm	2021-05-06T10:22:40.000Z	update trainingStatusReports check progress
Merge branch 'develop' into 'feature/LL-881-reporting-optimization'	d77a57b5c715d37b5a74665aebaa2a2fb34130ab	Sascha Immig	2021-05-07T13:48:55.000Z	Merge branch 'develop' into 'feature/LL-881-reporting-optimization' # Conflicts: # app/Models/OrganizationUnit.php
+ i18n	ea98b833defa5494e70ec620be4ad5383480a3ce	TUV\gabrielg	2021-05-05T14:26:47.000Z	+ i18n + links to sub reports now filled with missing active filters + removed unused code
overworked ou report	f3382130c63f978ccbcb3a39928505e9ede5dbd5	TUV\gabrielg	2021-05-06T08:26:24.000Z	overworked ou report + added pager + query reworked so that it uses eloquent now