merge request id	2
Titel	Feature/training start behaviour
Beschreibung	Determine Chapter & TrainingItem for Training start/continue/repeat within the UCP
Status	merged
Created at	2018-08-06T08:58:17.007Z
Updated at	2018-08-13T15:00:54.739Z
Source branch	feature/training_start_behaviour
Target branch	develop
Author	Zoltan Schnepf
Assignee	Marcel Pociot

Discussion notes

added 1 commit 6e13d02f - less @php. exchanged @if for a @switch. optimized checks. Compare with previous version	Sascha Immig	2018-08-08T08:50:43.553Z
@schnepfz Eigentlich muss nur diese Methode public sein, alle anderen können protected oder private werden, oder?	Marcel Pociot	2018-08-08T09:56:54.245Z
@schnepfz wenn ich als Gast ein Kostenloses Training starten möchte wird hier `null` zurück gegeben - im Template wird aber ein array erwartet. Grundsätzlich würde ich anstatt ein Array als Rückgabewert ein Objekt bevorzugen, welches zwei getter Methoden hat: `getChapterId()` und `getItemId()` - so bleibt immer ersichtlich was hier zurück gegeben wird.	Marcel Pociot	2018-08-08T09:57:13.055Z
Stimmt; habe ausser getChapterAndItemToExecute() alle anderen als protected umdeklariert.	Zoltan Schnepf	2018-08-09T13:21:22.757Z
Habe nach deinem Vorschlag implementiert - liest sich klarer.	Zoltan Schnepf	2018-08-09T13:23:26.518Z
resolved all discussions	Zoltan Schnepf	2018-08-09T13:23:27.244Z
changed this line in version 3 of the diff	Zoltan Schnepf	2018-08-09T13:31:39.378Z
changed this line in version 3 of the diff	Zoltan Schnepf	2018-08-09T13:31:39.522Z
added 1 commit 340cdc1b - Resolved GitLab discussions: scopes of some functions changed; returning object instead of attay Compare with previous version	Zoltan Schnepf	2018-08-09T13:31:39.636Z
@schnepfz kannst du hier bitte noch alle auskommentierten Log Befehle entfernen?	Marcel Pociot	2018-08-13T08:03:07.940Z
Gerne.	Zoltan Schnepf	2018-08-13T08:53:05.656Z
resolved all discussions	Zoltan Schnepf	2018-08-13T08:53:07.435Z
changed this line in version 4 of the diff	Zoltan Schnepf	2018-08-13T08:58:46.580Z
added 2 commits 50601cec - Debug logs removed 478cfd1a - cs fixes Compare with previous version	Zoltan Schnepf	2018-08-13T08:58:46.736Z
added 75 commits 478cfd1a...96df796f - 74 commits from branch develop 0c52a367 - Merge branch 'develop' into 'feature/training_start_behaviour' Compare with previous version	Zoltan Schnepf	2018-08-13T14:55:01.151Z
merged	Marcel Pociot	2018-08-13T15:00:54.789Z
mentioned in commit b31d8fe7e4431695c49e52f91bdbf230f489bcab	Marcel Pociot	2018-08-13T15:00:54.891Z

Merge Commits

Title	Id	Author	Created at	Message
VIP - progress-data-added	098f1ddd7be059f3bbd849309950ffedec4afa00	schnepfz	2018-07-20T12:34:16.000Z	VIP - progress-data-added
Merge branch 'develop' into 'feature/training_start_behaviour'	0c52a367d77d0751f7dc1722a34332008d334dfb	Zoltan Schnepf	2018-08-13T14:54:58.000Z	Merge branch 'develop' into 'feature/training_start_behaviour' # Conflicts: # resources/views/trainings/includes/detail_box.blade.php # resources/views/trainings/includes/section_learning_content.blade.php
Merge branch 'develop' of git.learningsystem.de:/lms/seventeen into…	18103f06d78f30f3ef8f50b3968d4f65fc29110f	schnepfz	2018-07-20T14:05:09.000Z	Merge branch 'develop' of git.learningsystem.de:/lms/seventeen into feature/training_start_behaviour # Conflicts: # resources/lang/de.json # resources/views/trainings/includes/detail_box.blade.php # resources/views/trainings/includes/section_learning_content.blade.php
Resolved GitLab discussions: scopes of some functions changed; returning object instead of attay	340cdc1bc83a12338637736d65f366d1a69e35a0	schnepfz	2018-08-09T13:30:40.000Z	Resolved GitLab discussions: scopes of some functions changed; returning object instead of attay
determine_chapter_and_item_to_start	3490547c87d47346fbdf8bddf82dcf484883dc01	schnepfz	2018-08-06T07:19:08.000Z	determine_chapter_and_item_to_start
determine_chapter_and_item_to_start	3fdc3a4234e3becacf08fbce45ddeb1833c67ebc	schnepfz	2018-08-06T07:14:45.000Z	determine_chapter_and_item_to_start
cs fixes	478cfd1aec32331428d6dc67a5c9520821de24d3	schnepfz	2018-08-13T08:58:18.000Z	cs fixes
Debug logs removed	50601cecb8b31123a4d064170e9d5ff622ffecad	schnepfz	2018-08-13T08:56:11.000Z	Debug logs removed
Merge branch 'develop' into feature/training_start_behaviour	5a96afe0699cdd942e587c2a0cfd9fd4dbb5f97e	schnepfz	2018-07-19T07:32:55.000Z	Merge branch 'develop' into feature/training_start_behaviour
less @php. exchanged @if for a @switch. optimized checks.	6e13d02fb5e242cf015e8bc75af2fcec53c65cca	TUV\immigs	2018-08-08T08:50:29.000Z	less @php. exchanged @if for a @switch. optimized checks.
submit test	81fd3214830d0ed6c81b4c151917774324aa4111	schnepfz	2018-07-10T09:49:45.000Z	submit test
submit security update	85e83884452fd2f41c591d03f89d095ea33a6770	schnepfz	2018-08-06T08:54:14.000Z	submit security update
WIP - start-button-text	bb02381a60914a07433f12a050f3d4ac6321e562	schnepfz	2018-07-20T12:32:08.000Z	WIP - start-button-text