Details des Tickets

Beschreibung,Kommentare und Anhänge

merge request id 836
TitelFeature/ll 1433 classroom visualisation for user
BeschreibungLayout in "meine Unterweisungen" mit Michi abgesprochen. ![image](/uploads/935fd58089565aa59af760e16eca9012/image.png)
Statusmerged
Created at 2023-06-30T10:52:58.291Z
Updated at 2023-07-03T07:52:44.620Z
Source branchfeature/LL-1433--classroom-visualisation-for-user
Target branchdevelop
AuthorSascha Immig
AssigneeGregor Gabriel

Discussion notes

added 1 commit
  • 28744769 - resolved conflict manually
Compare with previous version
Sascha Immig 2023-06-30T10:57:59.282Z
hier sollte der Scope TrainingAssignment::scopePassedInClassroomTraining genutzt werden Gregor Gabriel 2023-07-03T06:51:28.794Z
resolved all discussions Gregor Gabriel 2023-07-03T07:43:29.955Z
changed this line in version 3 of the diff Gregor Gabriel 2023-07-03T07:44:31.023Z
resolved all discussions Gregor Gabriel 2023-07-03T07:44:31.279Z
added 1 commit
  • 4c7d6b01 - added slight optimizations
Compare with previous version
Gregor Gabriel 2023-07-03T07:44:31.440Z
enabled an automatic merge when the pipeline for 4c7d6b0130cf8fbe929347a6069bb1ef89d09c29 succeeds Gregor Gabriel 2023-07-03T07:44:44.395Z
merged Gregor Gabriel 2023-07-03T07:52:44.685Z
mentioned in commit c33c3446528f120be70d9973d272c14faafdcf09 Gregor Gabriel 2023-07-03T07:52:44.859Z

Merge Commits

Title Id Author Created at Message
added classroomTrainingUser->id to pivot between classroomTrainings and Users. 25f5ea3d8f4969735306f20b06595045a72a8a99 TUV\immigs 2023-06-22T09:00:17.000Z added classroomTrainingUser->id to pivot between classroomTrainings and Users.
resolved conflict manually 28744769f9260fca58eb7517fdc6d2e5ec53cdc4 TUV\immigs 2023-06-30T10:56:36.000Z resolved conflict manually
added slight optimizations 4c7d6b0130cf8fbe929347a6069bb1ef89d09c29 TUV\gabrielg 2023-07-03T07:44:27.000Z added slight optimizations
removed active assignments passed in classromm from list of current assignments 8c035cc76271acd7074b172897615c63baef34d8 TUV\immigs 2023-06-22T08:58:19.000Z removed active assignments passed in classromm from list of current assignments
overhauled my trainings page to differentiate between passed, not finished and passed in classroom. 954548f11ffc0e9e3a0ffeaef839c1d6ce2926ad TUV\immigs 2023-06-22T14:39:00.000Z overhauled my trainings page to differentiate between passed, not finished and passed in classroom.