Details des Tickets

Beschreibung,Kommentare und Anhänge

merge request id 987
TitelFeature/ll 1414 access to trained version from employee report
Beschreibunghttp://jira.learningsystem.de/browse/LL-1414
Statusmerged
Created at 2024-07-02T16:13:00.682Z
Updated at 2024-10-01T11:57:34.294Z
Source branchfeature/LL-1414-access-to-trained-version
Target branchdevelop
AuthorGregor Gabriel
AssigneeMarkus Gerlach

Discussion notes

added 1 commit
  • 458abb6e - LL-1702 > LL-1414 : added missing translation
Compare with previous version
Gregor Gabriel 2024-07-02T16:18:49.159Z
added 1 commit
  • d94a3699 - display estimated training time in employee report and export
Compare with previous version
Gregor Gabriel 2024-07-15T08:16:09.384Z
added 1 commit
  • 5b8cb396 - LL-1733 added "assigned by" information to report and export
Compare with previous version
Gregor Gabriel 2024-07-15T11:30:19.241Z
added 4 commits
  • b3d05ecd - - one can declare a training as a newer version of another training now
  • fd27dad7 - - fix query as union did not the job we use merge
  • af71f435 - - display training with a declared newer trainig as at least one version back in…
  • 15c7e662 - did some code refacturing / rmoved calculations from template to model and controller
Compare with previous version
Gregor Gabriel 2024-07-18T08:38:22.009Z
added 1 commit
  • 6ee476b6 - + added extended training filtering to user report
Compare with previous version
Gregor Gabriel 2024-07-18T09:41:47.511Z
assigned to @gerlachm Sascha Immig 2024-09-26T15:57:27.986Z
added 1 commit
  • 0773dd7e - LL-1414 access to trained version from employee report
Compare with previous version
Markus Gerlach 2024-09-27T10:36:17.799Z
added 1 commit
  • 37a34dcb - fixed logic
Compare with previous version
Gregor Gabriel 2024-09-27T11:29:44.304Z
added 1 commit
  • 0b1fe89f - fixed problem when training is called in none catalog mode
Compare with previous version
Gregor Gabriel 2024-09-27T11:50:07.661Z
added 365 commits
  • 0b1fe89f...c9c0e78b - 364 commits from branch develop
  • 398dc0d0 - Merge branch 'develop' of https://gitlab.learningsystem.de/lms/seventeen into…
Compare with previous version
Gregor Gabriel 2024-10-01T11:47:12.356Z
merged Markus Gerlach 2024-10-01T11:57:34.386Z
mentioned in commit 7f73e3f9d7ce1d36bb64793f5e7ebc8773fa72d7 Markus Gerlach 2024-10-01T11:57:34.730Z

Merge Commits

Title Id Author Created at Message
LL-1414 access to trained version from employee report 0773dd7ea046cd82f033a812eca50d8e37aae053 gerlachm 2024-09-27T10:36:12.000Z LL-1414 access to trained version from employee report add camelCase so that the value is passed for versionsBehind check varaiable to prevent the message undefined variable $newer_versions_count
fixed problem when training is called in none catalog mode 0b1fe89fb90f2c650635bbe2d4a3feed5b7a3808 TUV\gabrielg 2024-09-27T11:49:59.000Z fixed problem when training is called in none catalog mode
did some code refacturing / rmoved calculations from template to model and controller 15c7e6623527fd7b59ee60a954e5c0620b88fe4c TUV\gabrielg 2024-07-18T08:38:09.000Z did some code refacturing / rmoved calculations from template to model and controller
LL-1702 > LL-1414 : reworked display in employee report in accordance with Sascha 2143896b2d69f752357cfb159d6ab90730ff544a TUV\gabrielg 2024-07-02T16:09:34.000Z LL-1702 > LL-1414 : reworked display in employee report in accordance with Sascha + provided controller and view to display concrete version of a training
fixed logic 37a34dcb92ef6aeaeefc8080f8e7453b485e9be8 TUV\gabrielg 2024-09-27T11:29:38.000Z fixed logic
Merge branch 'develop' of https://gitlab.learningsystem.de/lms/seventeen into… 398dc0d066e2b4f08756c02167b9a56db2ecd65e TUV\gabrielg 2024-10-01T11:47:05.000Z Merge branch 'develop' of https://gitlab.learningsystem.de/lms/seventeen into feature/LL-1414-access-to-trained-version # Conflicts: # app/Http/Controllers/TrainingController.php # app/Models/TrainingAssignment.php # resources/lang/de/base.php # resources/lang/de/trainings.php # resources/lang/en/base.php # resources/lang/es/trainings.php # resources/lang/fr/trainings.php
LL-1702 > LL-1414 : added missing translation 458abb6eb856b951d4c43071221e9486cedf312a TUV\gabrielg 2024-07-02T16:18:44.000Z LL-1702 > LL-1414 : added missing translation
LL-1733 added "assigned by" information to report and export 5b8cb3961754f20b0cd4b6839dd137f675641b0b TUV\gabrielg 2024-07-15T11:30:09.000Z LL-1733 added "assigned by" information to report and export
+ added extended training filtering to user report 6ee476b6e0af1660f37151d63977dfb56e7a4b46 TUV\gabrielg 2024-07-18T09:41:37.000Z + added extended training filtering to user report + added version info in details of user report
LL-1702 > LL-1414 : show training version in employee report a41f18083aadd7c58549d945578560680795bdcc TUV\gabrielg 2024-07-02T13:20:45.000Z LL-1702 > LL-1414 : show training version in employee report
- display training with a declared newer trainig as at least one version back in… af71f435fbaa922c333b05190383609db11f1e4a TUV\gabrielg 2024-07-18T06:27:27.000Z - display training with a declared newer trainig as at least one version back in employee report and linked training view
- one can declare a training as a newer version of another training now b3d05ecd3b91d7446c125b9563b032187eedd894 TUV\gabrielg 2024-07-17T14:43:02.000Z - one can declare a training as a newer version of another training now - employee report does not display "older" versions of training in filter select box - employee report filters for training and older versions of training now
display estimated training time in employee report and export d94a3699c15fbc0896211494c6732b6d30d471f1 TUV\gabrielg 2024-07-15T08:15:57.000Z display estimated training time in employee report and export
- fix query as union did not the job we use merge fd27dad7fc054fd0b84d79b93e84b7e1ce64b6b8 TUV\gabrielg 2024-07-17T15:18:41.000Z - fix query as union did not the job we use merge