Skip to content

Commit 112990b

Browse files
authored
Merge pull request #525 from dbarzin/dev
Dev
2 parents bb4632f + c4a7e64 commit 112990b

File tree

8 files changed

+9
-9
lines changed

8 files changed

+9
-9
lines changed

app/Models/UserGroup.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,6 @@ public function users()
2424

2525
public function controls()
2626
{
27-
return $this->belongsToMany(Control::class)->orderBy('plan_date');
27+
return $this->belongsToMany(Control::class)->whereNull('realisation_date')->orderBy('plan_date');
2828
}
2929
}

package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "2025.09.08",
2+
"version": "2025.09.19",
33
"license": "GPL-3.0",
44
"author": "Didier Barzin",
55
"repository": "https://www.github.com/dbarzin/deming",

resources/lang/en/cruds.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@
9090
'periodicity' => 'Periodicity',
9191
'planned' => 'Planned',
9292
'realisation_date' => 'Realization date',
93-
'realized' => 'Realized',
93+
'realized' => 'Made',
9494
'evidence' => 'Evidence',
9595
'score' => 'Score',
9696
'status' => 'State',

resources/views/controls/create.blade.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@
130130
<strong>{{ trans('cruds.control.fields.owners') }}</strong>
131131
</div>
132132
<div class="cell-lg-6 cell-md-8">
133-
<select data-role="select" name="owners[]" id="owners" multiple>
133+
<select data-role="select" name="owners[]" id="owners" data-filter="true" multiple>
134134
@foreach($owners as $id => $name)
135135
<option value="{{ $id }}" {{ in_array($id, old('owners', [])) ? 'selected' : '' }}>{{ $name }}</option>
136136
@endforeach

resources/views/controls/edit.blade.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@
221221
<strong>{{ trans('cruds.control.fields.owners') }}</strong>
222222
</div>
223223
<div class="cell-lg-6 cell-md-10">
224-
<select data-role="select" name="owners[]" id="owners" multiple>
224+
<select data-role="select" name="owners[]" id="owners" data-filter="true" multiple>
225225
@foreach($owners as $id => $name)
226226
<option
227227
value="{{ $id }}"

resources/views/radar/domains.blade.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
</div>
4848

4949
<div class="panel mt-2">
50-
<div data-role="panel" data-title-caption="{{ trans("cruds.control.status_date") }} {{date('d/m/Y')}}" data-collapsible="true" data-title-icon="<span class='mif-chart-line'></span>">
50+
<div data-role="panel" data-title-caption="{{ trans("cruds.control.status_date") }} {{date('d/m/Y')}}" data-collapsible="true" data-title-icon="<span class='mif-bar-vertical-chart'></span>">
5151
<div class="p-8">
5252
<canvas id="canvas-status" class="chartjs-render-monitor"></canvas>
5353
</div>

version.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2025.09.08
1+
2025.09.19

0 commit comments

Comments
 (0)