Skip to content

Commit

Permalink
Merge pull request #223 from dbarzin/dev
Browse files Browse the repository at this point in the history
Dev
  • Loading branch information
dbarzin authored Nov 11, 2024
2 parents 9c56cf2 + ee31560 commit ec3df2e
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 2 deletions.
4 changes: 3 additions & 1 deletion ROADMAP.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,11 @@ This document contains the evolutions planned in 2024.
* [ ] Non-regression tests
* [o] Continuous integration in GitHub
* [ ] Docker
* [ ] Create action plans not linked to a measurement
* [x] Create action plans not linked to a measurement
* [ ] Change Logs
* [ ] Automatically remove measurements after a defined number of months
* [x] Measurement not linked to a control
* [x] Measurement linked to multiple controls

## Improvements

Expand Down
1 change: 1 addition & 0 deletions resources/lang/en/cruds.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
'action' => [
'index' => 'Action plans',
'show' => 'Action plan',
'create' => 'Create an action plan',
'edit' => 'Edit action plan',
'title' => 'Actions',
'fields' => [
Expand Down
1 change: 1 addition & 0 deletions resources/lang/fr/cruds.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
'action' => [
'index' => 'Liste des plans d\'action',
'show' => 'Plan d\'action',
'create' => 'Créer un plan d\'action',
'edit' => 'Modifier un plan d\'action',
'title' => 'Actions',
'fields' => [
Expand Down
2 changes: 1 addition & 1 deletion resources/views/actions/create.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
</style>

<div class="p-3">
<div data-role="panel" data-title-caption="{{ trans('cruds.action.edit') }}" data-collapsible="true" data-title-icon="<span class='mif-chart-line'></span>">
<div data-role="panel" data-title-caption="{{ trans('cruds.action.create') }}" data-collapsible="true" data-title-icon="<span class='mif-chart-line'></span>">

@if (count($errors))
<div class= “form-group”>
Expand Down

0 comments on commit ec3df2e

Please sign in to comment.