Details des Tickets

Beschreibung,Kommentare und Anhänge

merge request id 937
TitelFeature/ll 1368 optionally exclude supervisors from unit orders
Beschreibung
Statusmerged
Created at 2024-02-22T09:45:00.945Z
Updated at 2024-03-11T14:12:43.499Z
Source branchfeature/LL-1368-optionally-exclude-supervisors-from-unit-orders
Target branchrelease/4.5.2
AuthorGregor Gabriel
AssigneeSascha Immig

Discussion notes

added 1 commit
  • 71dd0112 - Order model is now capable to react correctly on change of attribute include_supervisors
Compare with previous version
Gregor Gabriel 2024-02-22T12:01:29.211Z
added 1 commit
  • fbaca18a - added ui for changing "include_supervisors" for organizational unit orders
Compare with previous version
Gregor Gabriel 2024-02-22T16:11:32.060Z
assigned to @immigs Gregor Gabriel 2024-02-27T14:27:55.268Z
added 38 commits
  • fbaca18a...6e2fc238 - 37 commits from branch develop
  • 5ca21031 - Merge branch 'develop' of https://gitlab.learningsystem.de/lms/seventeen into…
Compare with previous version
Gregor Gabriel 2024-02-27T14:51:32.304Z
added 1 commit
  • 9b3aaef1 - minor UI fixes
Compare with previous version
Sascha Immig 2024-03-05T16:53:31.520Z
added 1 commit
  • cc739303 - + use checkbox instead of selectbox to select if supervisors should be included or not in booking
Compare with previous version
Gregor Gabriel 2024-03-06T15:50:19.552Z
added 1 commit
  • a1c69614 - optimized UI
Compare with previous version
Sascha Immig 2024-03-11T11:02:59.356Z
added 1 commit
  • dc9a599c - changed ui from "include_supervisors" to "exclude_supervisors"
Compare with previous version
Gregor Gabriel 2024-03-11T11:23:34.415Z
changed target branch from `develop` to `release/4.5.2` Sascha Immig 2024-03-11T14:12:37.246Z
merged Sascha Immig 2024-03-11T14:12:43.564Z
mentioned in commit 27102eb6e0d38e8f8aa7304e67fb643f821b0244 Sascha Immig 2024-03-11T14:12:43.708Z

Merge Commits

Title Id Author Created at Message
one now can book for an organizational unit without including supervisors 0c99279e8d237f2eecc71051143286ade267d323 TUV\gabrielg 2024-02-22T09:39:42.000Z one now can book for an organizational unit without including supervisors + booking ui adapted + listing of bookings in organizational unit extended for new column
implemented functionality in model 241686c598aa9c24cde767e5386c46964572ec2c TUV\gabrielg 2024-02-21T12:17:47.000Z implemented functionality in model - ui missing - tests missing
Merge branch 'develop' of https://gitlab.learningsystem.de/lms/seventeen into… 5ca210312f7aca745830f08e20b1418059a70918 TUV\gabrielg 2024-02-27T14:51:21.000Z Merge branch 'develop' of https://gitlab.learningsystem.de/lms/seventeen into feature/LL-1368-optionally-exclude-supervisors-from-unit-orders # Conflicts: # resources/views/admin/organizationUnits/orders/table.blade.php
Order model is now capable to react correctly on change of attribute include_supervisors 71dd0112a0b4a355380a4ec7191d1f86eaf0f52c TUV\gabrielg 2024-02-22T12:01:20.000Z Order model is now capable to react correctly on change of attribute include_supervisors
minor UI fixes 9b3aaef15815ee78f8bf600d24a899f1f1a777f1 TUV\immigs 2024-03-05T16:53:19.000Z minor UI fixes
optimized UI a1c69614ce06daf62e6fe8dd726a3a931944aa09 TUV\immigs 2024-03-11T11:02:49.000Z optimized UI
+ added tests aa0d8014261dabf9c74a505f4f4bb8a233af5021 TUV\gabrielg 2024-02-21T15:27:10.000Z + added tests + added fix based on error found in tests
+ use checkbox instead of selectbox to select if supervisors should be included or not in booking cc73930340e645baecbcc48115bad75153cf0e26 TUV\gabrielg 2024-03-06T15:50:10.000Z + use checkbox instead of selectbox to select if supervisors should be included or not in booking - ui is ugly - please make it beautifyl
changed ui from "include_supervisors" to "exclude_supervisors" dc9a599c8698858c74223e0292bee56234fe6bf2 TUV\gabrielg 2024-03-11T11:23:29.000Z changed ui from "include_supervisors" to "exclude_supervisors"
added ui for changing "include_supervisors" for organizational unit orders fbaca18a92c6b538db715d332433d2beb3a7f0bd TUV\gabrielg 2024-02-22T16:11:22.000Z added ui for changing "include_supervisors" for organizational unit orders