Details des Tickets

Beschreibung,Kommentare und Anhänge

merge request id 563
TitelFeature/ll 1038 classroom training reporting
BeschreibungBitte noch genutzte Style-Tags eliminieren
Statusmerged
Created at 2022-02-03T09:51:32.941Z
Updated at 2022-02-10T20:08:04.745Z
Source branchfeature/LL-1038-classroom-training-reporting
Target branchdevelop
AuthorGregor Gabriel
AssigneeSascha Immig

Discussion notes

added 151 commits
  • 715afcff...10966c08 - 150 commits from branch develop
  • 618e551b - Merge branch 'develop' of https://gitlab.learningsystem.de/lms/seventeen into…
Compare with previous version
Gregor Gabriel 2022-02-03T10:04:19.683Z
added 1 commit
  • daf82e2f - reduced number of queries in classroom training administration
Compare with previous version
Gregor Gabriel 2022-02-03T15:19:50.434Z
added 2 commits
  • 34f10124 - removed class "badge-pill" from all representations for training status / classroom status.
  • c5ae02ad - Reworked status badges
Compare with previous version
Sascha Immig 2022-02-04T20:32:20.019Z
added 1 commit
  • e1f27e7f - added corrected classroom status classes to blade templates;
Compare with previous version
Sascha Immig 2022-02-04T20:39:26.903Z
added 1 commit
  • 9329fde4 - recalculate relation from classroom training and online training, if start or…
Compare with previous version
Gregor Gabriel 2022-02-07T12:57:26.479Z
added 1 commit
  • 2a10b304 - only display classroom trainings in report charts, when feature is available and…
Compare with previous version
Gregor Gabriel 2022-02-07T13:12:08.402Z
added 1 commit
  • d92f3221 - corrected remaining badge styles
Compare with previous version
Sascha Immig 2022-02-10T19:50:20.363Z
merged Sascha Immig 2022-02-10T20:08:04.791Z
mentioned in commit 844af7fb7137cc10061ce04fff2df725cc8b818d Sascha Immig 2022-02-10T20:08:05.014Z

Merge Commits

Title Id Author Created at Message
WIP: Colors 0406381ecf0095d0f65b394bb396784af80fee91 TUV\immigs 2022-01-19T19:50:47.000Z WIP: Colors
only display classroom trainings in report charts, when feature is available and… 2a10b3046aac52c95f53c940dd66d526384e5198 TUV\gabrielg 2022-02-07T13:11:44.000Z only display classroom trainings in report charts, when feature is available and at least one passed classroom training is related to a training assignment
applied requested changes to employee report 2c863112fb27ef4473fc914539a0037f86d5b4cc TUV\gabrielg 2022-02-01T15:49:55.000Z applied requested changes to employee report
removed class "badge-pill" from all representations for training status / classroom status. 34f101243f6e64b49beb53e8ddc1bb1e89f8f267 TUV\immigs 2022-02-04T20:03:20.000Z removed class "badge-pill" from all representations for training status / classroom status. Reworked badge-status class to be a little smaller.
+ fixed error with test data 3684cc747882e6ba5d18de5c27aeeeae514b2117 TUV\gabrielg 2021-11-30T15:30:24.000Z + fixed error with test data + display (*) for training assignments that are passed in a classroom training - next will be a split of special functionality and base functionality
Merge branch 'develop' of https://gitlab.learningsystem.de/lms/seventeen into… 618e551bfecb0d1d11d48eeab7ba1de2556e916b TUV\gabrielg 2022-02-03T10:04:05.000Z Merge branch 'develop' of https://gitlab.learningsystem.de/lms/seventeen into feature/LL-1038-classroom-training-reporting # Conflicts: # app/Models/Client.php # resources/lang/de.json
fixed wrong function name 61cf951a2ad8b3638c247a839150d407eb5c29c2 TUV\gabrielg 2021-12-15T11:22:31.000Z fixed wrong function name
reworked status display in profile 715afcff2a89128bd0d6278c83fb4dc2b6495a63 TUV\gabrielg 2022-02-03T09:48:02.000Z reworked status display in profile
+ extended employee report, chart, kpi and export for classroom trainings 752a9444111253828d8ec2a7d4cfeea00af9153e TUV\gabrielg 2022-02-02T11:25:37.000Z + extended employee report, chart, kpi and export for classroom trainings
+ overworked user detail report 84b519a79722bebd2cfb97ef09f7e9a8cdaca84e TUV\gabrielg 2022-02-02T13:04:24.000Z + overworked user detail report
copy-paste-error 8cbc937bc010e88df799841b5659dd137a01ec86 TUV\immigs 2022-01-19T19:55:48.000Z copy-paste-error
made sure training assignment manipulation synchronizes with classtoom training user entries 9269ba5f3fd7774324e15f3cfa42472265786883 TUV\gabrielg 2021-11-30T12:36:02.000Z made sure training assignment manipulation synchronizes with classtoom training user entries
recalculate relation from classroom training and online training, if start or… 9329fde4d6d9278395d992d1e8d8f2cbe20fef41 TUV\gabrielg 2022-02-07T12:57:04.000Z recalculate relation from classroom training and online training, if start or end of classroom training was modified
added classroom training support to group and organization unit report 995de2639e48385f09a49e4457a4073b9ac95603 TUV\gabrielg 2022-02-02T13:53:04.000Z added classroom training support to group and organization unit report
Merge branch 'develop' of https://gitlab.learningsystem.de/lms/seventeen into… ab26a78934593f18a12320facbc93172c7c4f2b9 TUV\gabrielg 2021-12-16T07:04:34.000Z Merge branch 'develop' of https://gitlab.learningsystem.de/lms/seventeen into feature/LL-1038-classroom-training-reporting # Conflicts: # app/Http/Controllers/Admin/EmployeeTrainingStatusReportController.php # app/Models/ClassroomTraining.php # app/Models/ClassroomTrainingUser.php # resources/views/admin/employeeTrainingStatusReports/classroomTrainings/table.blade.php
+ show correct status color for status badges b35c550001dc468167ca43fcdfcd65afe5fc6a28 TUV\gabrielg 2022-02-02T16:08:49.000Z + show correct status color for status badges + show "in classroom training" status in user data sheet when training is not passed online but in classroom training
Reworked status badges c5ae02ad754492692fea586a2e253c6437e006bd TUV\immigs 2022-02-04T20:30:44.000Z Reworked status badges added badge-via-classroom to the set of status-badges and replaced occurence (badge-info to badge-via-classroom) to be in line with other status badges. moved classroom statusbadges to become a subset of badge status, also to be more consistent woth other badges. corrected sizesto avoid iregular lines and paddings due to subpixel rendering. + Removed now unneeded inline styles
corrected remaining badge styles d92f322153f27e82d89ce35a398f641d3883f57d TUV\immigs 2022-02-10T19:50:12.000Z corrected remaining badge styles
reduced number of queries in classroom training administration daf82e2f51682c34df95016d3ddb930e15005eb0 TUV\gabrielg 2022-02-03T15:19:38.000Z reduced number of queries in classroom training administration
added corrected classroom status classes to blade templates; e1f27e7f17a3a2c347f120da973b0e889a337e02 TUV\immigs 2022-02-04T20:39:15.000Z added corrected classroom status classes to blade templates; + further fix for subpixel rendering