merge request id	177
Titel	Feature/ll 247 refactor training supervisor
Beschreibung	Beschreibung - [x] Keinen Betreuer im Trainings-Datenblatt definieren > Feld raus - [x] eigenes Recht als Betreuer zu fungieren: Das Recht Anfragen zu sehen qualifiziert einen User als potenziellen Betreuer (ggf. Rolle "Betreuer" hierfür anlegen) - [x] Betreuer für ein einzelnes Training macht wenig Sinn, Betreuer für Kategorien wäre besser - [x] es wurde für die Hauptkategorie kein Betreuer festgelegt => es werden dann alle Kategorien für die Ermittlung der Betreuer herangezogen - [x] Im User-Datenblatt wird unterhalb der Rollen und Rechte eine Option zur Auswahl der Kategorien (Selectize, Multi, mit 'X') angezeigt.). - [x] Anzeige des Betreuers am Training (Reiter "Fragen und Diskussion") - [x] Namen anzeigen "Ihr Betreuer für Kategorie X ist Herr Müller" / "Ihre Betreuer für die Kategorie X sind Herr Müller, Frau Maier" - [x] Relevant für die Anzeige ist nur die Hauptkategorie! - [x] Gibt keine dedizierten Betreuer im System wird statt Eingabefeld nur eine Info angezeigt "keine Betreuer, wenden Sie sich an Ihren Administrator". (Trainingsdetails)
Status	merged
Created at	2020-04-30T15:16:59.632Z
Updated at	2020-05-11T21:54:32.888Z
Source branch	feature/LL-247-refactor-training-supervisor
Target branch	develop
Author	Gregor Gabriel
Assignee	Sascha Immig

Discussion notes

changed the description	Sascha Immig	2020-05-11T20:38:27.322Z
changed the description	Sascha Immig	2020-05-11T20:39:14.088Z
added 37 commits 9eb2f70e...939a2172 - 36 commits from branch develop cc5e2214 - Merge branch 'develop' into 'feature/LL-247-refactor-training-supervisor' Compare with previous version	Sascha Immig	2020-05-11T20:46:56.626Z
added 2 commits 5f1abb23 - style upgrade 30aa42ac - Merge branch 'feature/LL-247-refactor-training-supervisor' of… Compare with previous version	Sascha Immig	2020-05-11T21:05:34.974Z
merged	Sascha Immig	2020-05-11T21:54:32.942Z
mentioned in commit 53f4410295cae8be41df49978653aa466f4e4736	Sascha Immig	2020-05-11T21:54:33.151Z

Merge Commits

Title	Id	Author	Created at	Message
handled exception, when user of an corresponcence does not exist in correspondence administration	1a0edfe2811bdb7290757e73a5eb8e247c395590	TUV\gabrielg	2020-04-29T14:06:55.000Z	handled exception, when user of an corresponcence does not exist in correspondence administration
Scoped Correspondence to Client	2257998ae2e1faef795f9c1358bde634bf72c872	TUV\gabrielg	2020-04-29T16:09:41.000Z	Scoped Correspondence to Client
hiding correspondance form when no supervisor was found	2c008f64d28f07af39ea61732e123d7cfb0bdae7	TUV\gabrielg	2020-04-30T14:12:47.000Z	hiding correspondance form when no supervisor was found
Merge branch 'feature/LL-247-refactor-training-supervisor' of…	30aa42ac693b63d57bebc408d3d7ff6a36be258f	TUV\immigs	2020-05-11T21:05:20.000Z	Merge branch 'feature/LL-247-refactor-training-supervisor' of https://gitlab.learningsystem.de/lms/seventeen into feature/LL-247-refactor-training-supervisor # Conflicts: # resources/views/admin/correspondences/table.blade.php
style upgrade	5f1abb235cf2ee7720f136719b4716d4fb4e171b	TUV\immigs	2020-05-11T20:14:29.000Z	style upgrade
added missing use of class Client	6ab8e03e6078359b19b63e4a0517c4a2254bc40a	TUV\gabrielg	2020-04-30T06:06:51.000Z	added missing use of class Client
fixed error found in test	77a91ae3d430275b78187e85d4586191a4011a0f	TUV\gabrielg	2020-04-24T11:12:46.000Z	fixed error found in test
show now all correspondence not only the one of the categories one supervises	7860acfe279cbaf8e25ba98acfb6d5cc4a039443	TUV\gabrielg	2020-04-30T14:31:06.000Z	show now all correspondence not only the one of the categories one supervises
added catergory filtre to correspondence	9eb2f70e2b3f964d6e22fac382d5852058b025e0	TUV\gabrielg	2020-04-30T15:14:43.000Z	added catergory filtre to correspondence
Merge branch 'develop' into 'feature/LL-247-refactor-training-supervisor'	cc5e221411968fbae5f14b339a6550b47c1e7af8	Sascha Immig	2020-05-11T20:46:54.000Z	Merge branch 'develop' into 'feature/LL-247-refactor-training-supervisor' # Conflicts: # app/Http/Controllers/Admin/CorrespondenceController.php # resources/lang/de.json
Merge branch 'develop' of https://gitlab.learningsystem.de/lms/seventeen into…	d0c822513061fe7ce0007ae1f5bd6fce8f4072c2	TUV\gabrielg	2020-04-30T07:22:35.000Z	Merge branch 'develop' of https://gitlab.learningsystem.de/lms/seventeen into feature/LL-247-refactor-training-supervisor
+ users now supervise categories and not trainings	fd7de5005abfa841ecbeefd0b893782afe24d186	TUV\gabrielg	2020-04-24T10:52:31.000Z	+ users now supervise categories and not trainings + we to test if all the rest of the logic still is ok
displays supervisors in Training	fdeaddebec50916727f43c217f70d44662a8cc8c	TUV\gabrielg	2020-04-30T13:24:47.000Z	displays supervisors in Training + only primary category when present + all other assigned categories' supervisors when primary category has no supervisor + all client's users capable of being supervisor, when no category has a supervisor