merge request id	1005
Titel	LL-1785 extended order report and export for organizational units
Beschreibung	LL-1785 - Erweiterung myC-Buchungen GUI und Export um Abteilungen s. http://jira.learningsystem.de/browse/LL-1785
Status	merged
Created at	2024-08-14T13:39:56.158Z
Updated at	2024-10-01T12:33:04.749Z
Source branch	feature/LL-1785-org-unit-info-in-myc-view-and-export
Target branch	release/6.2.1
Author	Gregor Gabriel
Assignee	Markus Gerlach

Discussion notes

changed the description	Sascha Immig	2024-09-27T06:39:27.599Z
changed target branch from `develop` to `release/6.2.1`	Sascha Immig	2024-09-27T06:39:27.765Z
added 1 commit f8aa323d - - run php cs fixer Compare with previous version	Gregor Gabriel	2024-09-27T10:25:10.652Z
assigned to @gerlachm	Sascha Immig	2024-09-27T10:55:30.078Z
added 221 commits f8aa323d...67afddff - 220 commits from branch release/6.2.1 e67d7072 - Merge branch 'release/6.2.1' of https://gitlab.learningsystem.de/lms/seventeen… Compare with previous version	Gregor Gabriel	2024-09-27T10:58:10.217Z
logger kann entfernt werden app/Http/Controllers/Admin/MyCompetenceOrderController.php:319	Markus Gerlach	2024-09-30T11:18:09.523Z
Wenn man die Fortbildungsreport als Superadmin (im Mandanten z.B. 2335 MSAsafety gibt es nicht den Bug) aufruft unter http://seventeen/app/course/orders funktioniert es mit Änderung des Datum-Filters z.B. http://seventeen/app/course/orders?sort=&order=&created_since=01.01.2024&created_until=30.09.2024&affiliate_id=&training_status=&training_id= erhält man die Meldung: json_decode(): Argument #1 ($json) must be of type string, null given MyCompetenceOrderController.php:291 json_decode	Markus Gerlach	2024-09-30T11:24:35.192Z
resources/views/admin/mycompetence/orders/table.blade.php:70 {{ __('mycompetence.' . $assignment['status']) }} zu {{ __('mycompetence.' . str_replace(" ", "_", $assignment['status'])) }}	Markus Gerlach	2024-09-30T11:48:55.870Z
added 1 commit 4c94b43b - fixed some problems identified by Markus Compare with previous version	Gregor Gabriel	2024-10-01T08:04:23.294Z
merged	Markus Gerlach	2024-10-01T12:33:04.809Z
mentioned in commit cf0efd0bf313af8eff396562f365c96ddff7473f	Markus Gerlach	2024-10-01T12:33:04.888Z

Merge Commits

Title	Id	Author	Created at	Message
fixed some problems identified by Markus	4c94b43be36ae7a8a9c9e22b21fcdb28a24ca0f6	TUV\gabrielg	2024-10-01T08:04:18.000Z	fixed some problems identified by Markus + removed debug usage of "logger(...)" + fixed broken display of status
LL-1785 extended order report and export for organizational units	87d55aa88b394f548649933aa92c00c40a8339e0	TUV\gabrielg	2024-08-06T11:50:24.000Z	LL-1785 extended order report and export for organizational units
Merge branch 'release/6.2.1' of https://gitlab.learningsystem.de/lms/seventeen…	e67d7072d661b04e9051d8c8d648b441aedf204c	TUV\gabrielg	2024-09-27T10:58:01.000Z	Merge branch 'release/6.2.1' of https://gitlab.learningsystem.de/lms/seventeen into feature/LL-1785-org-unit-info-in-myc-view-and-export # Conflicts: # app/Http/Controllers/Admin/MyCompetenceOrderController.php
- run php cs fixer	f8aa323db497dedc20b5c2a9f74c5838395d51da	TUV\gabrielg	2024-09-27T10:25:02.000Z	- run php cs fixer - exploded orders to single user orders in export