merge request id	1002
Titel	LL-1779 - Fortbildungen buchen als optionale Berechtigung bei Vorgesetzten
Beschreibung	s. http://jira.learningsystem.de/browse/LL-1779 Bitte die Umstellungen in der Rechteprüfung. genau ansehen. Kritisch sind die Methoden: * User::canBookMyCompetenceTraining() und * User::canApproveMycompetenceTrainingRequests() die sich nur darin unterscheiden, dass beim Allgemeinen Recht noch geprüft wird, ob man die Preise sehen kann
Status	merged
Created at	2024-08-09T09:46:11.377Z
Updated at	2024-09-18T10:49:06.573Z
Source branch	feature/LL-1779-finegrain-supervisor-permission-to-book-myc-trainings
Target branch	develop
Author	Gregor Gabriel
Assignee	Sascha Immig

Discussion notes

added 1 commit 9a7fc729 - removed price ceck for booking in myc Compare with previous version	Sascha Immig	2024-09-18T08:18:40.257Z
added 1 commit 9614775b - skipping authoring tool api tests, when api is not available Compare with previous version	Sascha Immig	2024-09-18T10:15:20.741Z
added 92 commits 9614775b...f6679200 - 91 commits from branch develop 71ca2f8b - Merge branch 'develop' into 'feature/LL-1779-finegrain-supervisor-permission-to-book-myc-trainings' Compare with previous version	Sascha Immig	2024-09-18T10:26:10.736Z
merged	Sascha Immig	2024-09-18T10:49:06.683Z
mentioned in commit f7282c30d50dfc8b918754afc2619e00447b7746	Sascha Immig	2024-09-18T10:49:07.149Z

Merge Commits

Title	Id	Author	Created at	Message
implemented display logic described in ticket…	42f7141d4db6d908b2445898a3d4765e5f737ad1	TUV\gabrielg	2024-08-08T16:16:28.000Z	implemented display logic described in ticket http://jira.learningsystem.de/browse/LL-1779 by Sascha
optimized user settings code	624401409d1a3b53b160dea7027841ce57160802	TUV\gabrielg	2024-08-09T07:12:11.000Z	optimized user settings code
Merge branch 'develop' into 'feature/LL-1779-finegrain-supervisor-permission-to-book-myc-trainings'	71ca2f8b76b27027729cc0d9f7eef240b73a8c04	Sascha Immig	2024-09-18T10:26:06.000Z	Merge branch 'develop' into 'feature/LL-1779-finegrain-supervisor-permission-to-book-myc-trainings' # Conflicts: # app/Services/AuthoringTool/AuthoringTool.php
skipping authoring tool api tests, when api is not available	9614775bb8ba4d1be3d9f23387346463f1e9878b	TUV\gabrielg	2024-09-18T10:15:12.000Z	skipping authoring tool api tests, when api is not available (cherry picked from commit 2b857fe6c37325e253234a35a633421ac8525970) (cherry picked from commit 36d86b3720837a1b90d916b32b0d65e2cd218d7f)
removed price ceck for booking in myc	9a7fc72947a327f4821189eacb8c577f90b6e2d3	Sascha Immig	2024-09-18T08:18:16.000Z	removed price ceck for booking in myc
LL-1779 - provided field users.is_myc_booker and made it available in user administration	ab9488807d07e49028294f5b6102d634967de401	TUV\gabrielg	2024-08-08T15:04:44.000Z	LL-1779 - provided field users.is_myc_booker and made it available in user administration (no logic for myc courses implemented yet)
+ optimized logic for displaying is_myc_booker switch in user settings - takes…	b0bc2f2e726d70202bc7770f291ed3de428fd480	TUV\gabrielg	2024-08-09T09:28:48.000Z	+ optimized logic for displaying is_myc_booker switch in user settings - takes account of detailed implemention of used functions to reduce code ant to improve readability + use User::canBookMyCompetenceTraining() everywhere instead of directly checking several permissions + adapted all other MYC related can methods in User model to respect User::is_myc_booker
adapted MYC permission validation functions in User model	e3c155319b75b02d5a7b863434da9e57505f01a3	TUV\gabrielg	2024-08-09T07:15:14.000Z	adapted MYC permission validation functions in User model + additionally checking, that MYC catalog is enabled + for supervisors additionally check User::is_myc_booker