merge request id	185
Titel	Feature/ll 373 combine filtering and sorting in training request administration
Beschreibung	☑ Wird sortiert, geht der aktuelle Filter, z.B. Status "alle" verloren. ☑ Zudem scheint das Datum falsch herum sortiert zu werden... ☑ Dann gab es die Sortierung nach dem Frage-Inhalt, was keinen Sinn macht. Diese Sortierung wurde im Template bereits beim Merge entfernt. Bitte im Controller ebenfalls entfernen, falls nötig. ☑ Letzter Punkt: es macht Sinn, neben "Darum" und "Status" auch nach "Training" und - der Vollständigkeit halber - "Benutzer" zu sortieren. + Sortieren entfernt nicht mehr die Filterung + Filtern entfernt nicht mehr die Sortierung + Sortierung nach User und Ttraining hinzugefügt
Status	merged
Created at	2020-05-14T16:06:04.364Z
Updated at	2020-05-19T14:10:55.684Z
Source branch	feature/LL-373-combine-filtering-and-sorting-in-training-request-administration
Target branch	develop
Author	Gregor Gabriel
Assignee	Sascha Immig

Discussion notes

added 1 commit baab88c7 - called code fixer Compare with previous version	Gregor Gabriel	2020-05-14T16:08:23.727Z
added 1 commit 3c430ab5 - + conected filtering and sorting for trinings Compare with previous version	Gregor Gabriel	2020-05-15T07:23:45.185Z
added 1 commit ed0a2874 - + conected filtering and sorting for categories Compare with previous version	Gregor Gabriel	2020-05-15T07:33:51.352Z
added 1 commit 1715118e - + made filtering and sort of contents work together Compare with previous version	Gregor Gabriel	2020-05-15T16:01:39.021Z
merged	Sascha Immig	2020-05-19T14:10:55.770Z
mentioned in commit 9f987f8a9fe4ea91109fdd4a5d7c19ab63e8bf4c	Sascha Immig	2020-05-19T14:10:56.026Z

Merge Commits

Title	Id	Author	Created at	Message
+ made filtering and sort of contents work together	1715118e976c99785cd1232cc4ac40cbfd89ebb1	TUV\gabrielg	2020-05-15T16:01:33.000Z	+ made filtering and sort of contents work together + added SortScopes to Content class for some generic fields
+ conected filtering and sorting for trinings	3c430ab58e51d77fb608cae9eab2385d3c52ede5	TUV\gabrielg	2020-05-15T07:23:39.000Z	+ conected filtering and sorting for trinings + fixed paging bug
added training sort	92df1439a8bd4494d18b7fe1c19c4953c9c4540b	TUV\gabrielg	2020-05-14T15:57:54.000Z	added training sort
+ sorting does not remove filters any more	9413471ae3f42c226f2f91a3efb27f04a2f5e981	TUV\gabrielg	2020-05-14T15:23:12.000Z	+ sorting does not remove filters any more + filtering does not remove sorting any more
sorting for user added	ad99dba984e28c993859ee765c3b75766d329952	TUV\gabrielg	2020-05-14T16:02:42.000Z	sorting for user added
called code fixer	baab88c775bd6962add2afb331ec7b9e28543185	TUV\gabrielg	2020-05-14T16:08:18.000Z	called code fixer
removed initial filtering by latest, as this breakes filtering	c6cd0a5ff6ae38b061cd12297f7bc8ff6254f29b	TUV\gabrielg	2020-05-14T15:32:21.000Z	removed initial filtering by latest, as this breakes filtering
+ conected filtering and sorting for categories	ed0a28748aac907cf5d1976e57370b03793bf4dc	TUV\gabrielg	2020-05-15T07:33:46.000Z	+ conected filtering and sorting for categories