merge request id	771
Titel	Feature/ll 1420 training reminder status is reported incorrectly
Beschreibung
Status	merged
Created at	2023-03-30T12:24:37.168Z
Updated at	2023-03-31T12:48:28.161Z
Source branch	feature/LL-1420-training-reminder-status-is-reported-incorrectly
Target branch	develop
Author	Markus Gerlach
Assignee	Gregor Gabriel

Discussion notes

assigned to @gabrielg	Sascha Immig	2023-03-30T13:25:02.147Z
das orWhereHas ist a) nicht notwendig, da die Verknüpfung nur erzeugt wird, wenn der User das Training in Präsenz bestanden hat und b) falsch, das der User ja auch zwei Präsenzunterweisungen gemacht haben könnte und nur eine davon nicht erfolgreich.	Gregor Gabriel	2023-03-30T15:03:24.591Z
added 7 commits 3f1a171a...ddc4f330 - 6 commits from branch develop ade6f04f - Merge branch 'develop' into feature/LL-1420-training-reminder-status-is-reported-incorrectly Compare with previous version	Markus Gerlach	2023-03-31T06:41:55.991Z
resolved all discussions	Markus Gerlach	2023-03-31T06:52:22.667Z
Noch nicht mergen...	Markus Gerlach	2023-03-31T07:17:38.863Z
changed this line in version 3 of the diff	Markus Gerlach	2023-03-31T10:38:31.988Z
resolved all discussions	Markus Gerlach	2023-03-31T10:38:32.096Z
added 1 commit 4926a647 - remove additional query Compare with previous version	Markus Gerlach	2023-03-31T10:38:32.305Z
merged	Gregor Gabriel	2023-03-31T12:48:28.266Z
mentioned in commit 26eef1484dbeda841a36d1b40de9e720e34ea5de	Gregor Gabriel	2023-03-31T12:48:28.557Z

Merge Commits

Title	Id	Author	Created at	Message
Merge branch 'develop' into feature/LL-1420-training-reminder-status-is-reported-incorrectly	3f1a171aef9f496bc96fe2796484d4e32a8f9308	gerlachm	2023-03-30T09:55:15.000Z	Merge branch 'develop' into feature/LL-1420-training-reminder-status-is-reported-incorrectly # Conflicts: # resources/views/dashboard/customer.blade.php
remove additional query	4926a6478809c7a3ae9d9976cbe2b8d7493ffe10	gerlachm	2023-03-31T10:38:29.000Z	remove additional query
Merge branch 'develop' into feature/LL-1420-training-reminder-status-is-reported-incorrectly	ade6f04fbca04b4494eca6a37449fbcf01330782	gerlachm	2023-03-31T06:41:51.000Z	Merge branch 'develop' into feature/LL-1420-training-reminder-status-is-reported-incorrectly # Conflicts: # app/Notifications/SupervisorReminder.php
LL-1420-training-reminder-status-is-reported-incorrectly 1h 30m, 1055-1205 4h	d722aba6b4e6f1c2d4a2ff5b7e8f0d2d67b1db6a	gerlachm	2023-03-29T15:57:18.000Z	LL-1420-training-reminder-status-is-reported-incorrectly 1h 30m, 1055-1205 4h Added check for assigned users in classroom training with scopeNotPassedInClassroomTraining Bug - query added to undefined variable currentMyCompetenceTrainings Bug - Typed property App\Notifications\SupervisorReminder::$assignments must not be accessed before initialization Bug – changed return type supervisedTrainings Bug – string given for count in ContentItem