Details des Tickets

Beschreibung,Kommentare und Anhänge

merge request id 1021
TitelLL-1832-further-fields-in-the-client-data-sheet
Beschreibung* added free text field for entering the sales contact person, placed below contact person * inserted in the settings tab switch for online client field after the internal account field * added useMycompetence indicator * added useChargeablecatalog indicator * added useOwnCatalogs field indicator * added authoring_tool_indicator added all files to the gui and to the export list
Statusmerged
Created at 2024-10-08T11:36:14.430Z
Updated at 2024-10-16T12:46:14.487Z
Source branchfeature/LL-1832-further-fields-in-the-client-data-sheet
Target branchdevelop
AuthorMarkus Gerlach
AssigneeSascha Immig

Discussion notes

added 5 commits
  • 220b34f7 - refactored translations: optimized texts and removed redundancies.
  • 8ed3affe - replaced read only information with checkboxes (insted of switches) and added…
  • 1b43634e - refactored client: removed unnecessary append for a propert function to…
  • df1bd69d - clean up: restored former calculation (15px indent plus 8px border) and removed old commentary
  • 4a54151c - UI: Optmized inputs for support employee and sales contact
Compare with previous version
Sascha Immig 2024-10-14T15:54:58.089Z
added 1 commit
  • 8605fdac - updated twig due to vulnerability. used the opportunity to switch from version 2.* to 3.*
Compare with previous version
Sascha Immig 2024-10-15T08:46:13.401Z
added 83 commits
  • 8605fdac...92156493 - 82 commits from branch develop
  • 55a56b6a - Merge branch 'develop' into feature/LL-1832-further-fields-in-the-client-data-sheet
Compare with previous version
Markus Gerlach 2024-10-16T09:12:46.584Z
added 1 commit
  • af2dde11 - exchanged checkboxes for an info alert outside the tabs. used icons and shorter…
Compare with previous version
Sascha Immig 2024-10-16T11:09:54.981Z
merged Sascha Immig 2024-10-16T12:44:47.688Z
mentioned in commit ce8e62a89e19d5e662054bc1871aebc71c4d273b Sascha Immig 2024-10-16T12:44:47.921Z
changed the description Sascha Immig 2024-10-16T12:45:55.452Z
changed the description Sascha Immig 2024-10-16T12:46:14.538Z

Merge Commits

Title Id Author Created at Message
refactored client: removed unnecessary append for a propert function to… 1b43634e2bec7b1b07e68365625ace47c26c34e3 Sascha Immig 2024-10-14T15:53:14.000Z refactored client: removed unnecessary append for a propert function to determine the availability of myCompetence use
refactored translations: optimized texts and removed redundancies. 220b34f723209792fe0e779853a70243d228554e Sascha Immig 2024-10-14T15:17:51.000Z refactored translations: optimized texts and removed redundancies.
UI: Optmized inputs for support employee and sales contact 4a54151c3050e8e1624d7395e93c16b072c55540 Sascha Immig 2024-10-14T15:54:12.000Z UI: Optmized inputs for support employee and sales contact
Merge branch 'develop' into feature/LL-1832-further-fields-in-the-client-data-sheet 55a56b6a0c349d1ffb0b0bfe66e8d2d65c3ccbab gerlachm 2024-10-16T09:12:38.000Z Merge branch 'develop' into feature/LL-1832-further-fields-in-the-client-data-sheet # Conflicts: # resources/views/admin/clients/fields.blade.php
LL-1832-further-fields-in-the-client-data-sheet 671f8c36f0693fc5e5318392c12ec17fb130311e gerlachm 2024-10-08T08:42:11.000Z LL-1832-further-fields-in-the-client-data-sheet added free text field for entering the sales contact person, placed below contact person inserted in the settings tab added online client field after the internal account field added useMycompetence field after the online client field added useChargeablecatalog field after the useMycompetence field added useOwnCatalogs field after the useChargeablecatalog field added authoring_tool_active field after the useOwnCatalogs field added all files to the gui and to the export list
updated twig due to vulnerability. used the opportunity to switch from version 2.* to 3.* 8605fdacb1dadb07da265c7dd3fa7249b5ac7540 Sascha Immig 2024-10-15T08:45:51.000Z updated twig due to vulnerability. used the opportunity to switch from version 2.* to 3.* (cherry picked from commit 9d7e79c7c0e4e236cfe8019d24b41e31f72097d7)
replaced read only information with checkboxes (insted of switches) and added… 8ed3affe17512cc879b8405a8e6f6dca5eaac627 Sascha Immig 2024-10-14T15:25:15.000Z replaced read only information with checkboxes (insted of switches) and added section heading (with hr)
exchanged checkboxes for an info alert outside the tabs. used icons and shorter… af2dde11d612207057725ad447f3cba55a22251a Sascha Immig 2024-10-16T11:09:44.000Z exchanged checkboxes for an info alert outside the tabs. used icons and shorter texts to represent the client state.
clean up: restored former calculation (15px indent plus 8px border) and removed old commentary df1bd69d0dd22e440bffd2e7005a7f3160a36fb8 Sascha Immig 2024-10-14T15:53:34.000Z clean up: restored former calculation (15px indent plus 8px border) and removed old commentary