Details des Tickets

Beschreibung,Kommentare und Anhänge

merge request id 793
TitelFeature/ll 1379 maintainability of the training levels
Beschreibung
Statusmerged
Created at 2023-05-10T11:53:11.494Z
Updated at 2023-05-15T16:15:44.590Z
Source branchfeature/LL-1379-maintainability-of-the-training-levels
Target branchdevelop
AuthorMarkus Gerlach
AssigneeSascha Immig

Discussion notes

das mit dem is_default / vordefiniert passt hier nicht... Es wurde die Logik übernommen, dass die vordefinierten nicht gelöscht werden können. Das ist nicht zielführend. CTS will die komplett bearbeiten können. Und wenn es keine Unterscheidung bezüglich Löschen gibt, hat die Spalte keinen Sinn und kann eigentlich raus... Sascha Immig 2023-05-15T12:47:09.494Z
s.u. role und is_default ist hier nicht zielführend / zu viel Sascha Immig 2023-05-15T12:54:34.400Z
s.u. Sascha Immig 2023-05-15T12:55:09.462Z
added 1 commit
  • 40e75520 - small corrections
Compare with previous version
Sascha Immig 2023-05-15T12:57:31.173Z
changed this line in version 3 of the diff Markus Gerlach 2023-05-15T14:41:49.490Z
changed this line in version 3 of the diff Markus Gerlach 2023-05-15T14:41:49.631Z
added 1 commit
  • b5298e4f - LL-1379-maintainability-of-the-training-levels
Compare with previous version
Markus Gerlach 2023-05-15T14:41:50.091Z
changed this line in version 4 of the diff Sascha Immig 2023-05-15T15:23:32.906Z
resolved all discussions Sascha Immig 2023-05-15T15:23:33.006Z
added 1 commit
  • 83aed889 - removed unneccessary migration (the corresponding are not live and it throws an error)
Compare with previous version
Sascha Immig 2023-05-15T15:23:33.201Z
added 2 commits
  • 0fc540e3 - optimized table layout
  • 75117943 - fixed condition för delete button
Compare with previous version
Sascha Immig 2023-05-15T16:03:48.904Z
enabled an automatic merge when the pipeline for 7511794371a4a067d401593eeb3dbeedc9f4500c succeeds Sascha Immig 2023-05-15T16:05:10.663Z
merged Sascha Immig 2023-05-15T16:15:44.646Z
mentioned in commit 511963bccad3303a2d8c20810d6ff7d08ee1decf Sascha Immig 2023-05-15T16:15:44.972Z

Merge Commits

Title Id Author Created at Message
LL-1379 fix contentServerTrainingController 0eb5195141b1e634b87a71c78d1909dbf2646877 gerlachm 2023-05-10T11:39:02.000Z LL-1379 fix contentServerTrainingController
optimized table layout 0fc540e31e04fb559b5f6712038bcf49e6bfde1f TUV\immigs 2023-05-15T16:02:58.000Z optimized table layout
LL-1436 add catalog filter 32bb63e370d81103fd059bdf3bf5e67787902548 gerlachm 2023-05-09T07:41:26.000Z LL-1436 add catalog filter
LL-1379-maintainability-of-the-training-levels 3697abd3d55b9b74b7ba631f249cadc379a8cb9a gerlachm 2023-03-17T12:21:36.000Z LL-1379-maintainability-of-the-training-levels trainings are now maintainable (ToDo-implementation for import) commit for backup
small corrections 40e75520b4a9cded378b0e06b2b818cab959d2b1 TUV\immigs 2023-05-15T12:53:19.000Z small corrections
Merge branch 'develop' into feature/LL-1379-maintainability-of-the-training-levels 49d423f0d2e5f0b4d667066ae2781b68cd59102a gerlachm 2023-05-05T07:24:51.000Z Merge branch 'develop' into feature/LL-1379-maintainability-of-the-training-levels # Conflicts: # app/Http/Controllers/Admin/RoleController.php # app/Models/Training.php # app/Providers/AppServiceProvider.php # resources/lang/de/trainings.php # resources/lang/en/trainings.php # resources/lang/es/permissions.php # resources/lang/fr/permissions.php # routes/web.php
LL-1379-maintainability-of-the-training-levels 4d3b4724b51f5e53f0f182ccf38bae8a3bc4bffb gerlachm 2023-05-08T16:26:53.000Z LL-1379-maintainability-of-the-training-levels add filter to ui
LL-1379-maintainability-of-the-training-levels 4ec0da2fbcf09b617bc92c23527db951d28bb6e5 gerlachm 2023-05-10T10:43:17.000Z LL-1379-maintainability-of-the-training-levels Remove config/level fix training import bugs Updates to training import for levels fix translation for users following_columns_can_be_imported and importable_columns
LL-1379-maintainability-of-the-training-levels fix selectbox 6270af62159998bf2119354a9823212cc2cb36e2 gerlachm 2023-05-08T16:34:49.000Z LL-1379-maintainability-of-the-training-levels fix selectbox
Merge branch 'develop' into feature/LL-1379-maintainability-of-the-training-levels 6fa118139e00a54d53b4eb2a4fc61c5cae99e778 gerlachm 2023-05-08T09:46:29.000Z Merge branch 'develop' into feature/LL-1379-maintainability-of-the-training-levels # Conflicts: # app/Enums/Permissions.php # app/Providers/AppServiceProvider.php # resources/js/laroute.js
fixed condition för delete button 7511794371a4a067d401593eeb3dbeedc9f4500c TUV\immigs 2023-05-15T16:03:23.000Z fixed condition för delete button
removed unneccessary migration (the corresponding are not live and it throws an error) 83aed88989d3095319be0a0279d591db764efc20 TUV\immigs 2023-05-15T15:23:20.000Z removed unneccessary migration (the corresponding are not live and it throws an error)
update with ForeignKey Referencing TrainingLevels Error abb39dc08a4b8aa786fb07f67af4e7f7e3842c58 gerlachm 2023-05-08T09:12:21.000Z update with ForeignKey Referencing TrainingLevels Error
LL-1379-maintainability-of-the-training-levels b5298e4f52374e12f3707f29400a362ec4d217d6 gerlachm 2023-05-15T14:41:41.000Z LL-1379-maintainability-of-the-training-levels remode trainingLevel>default