Skip to content

Dev #296

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dbarzin merged 2 commits into from
Mar 6, 2025
Merged

Dev #296

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a55a9b9
fix filter
dbarzin Mar 6, 2025
c706511
code quality
dbarzin Mar 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions app/Http/Controllers/ControlController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ public function index(Request $request)
$attributes = array_unique($attributes);
*/
// get all clauses
$clauses = DB::table('measures')->select('clause')->get()->pluck("clause")->toArray();
$clauses = DB::table('measures')->select('clause')->get()->pluck('clause')->toArray();

// get domain base on his title
$domain_title = $request->get('domain_title');
Expand Down Expand Up @@ -104,7 +104,7 @@ public function index(Request $request)
if ($clause !== null) {
if ($clause === 'none') {
$request->session()->forget('clause');
$clause=null;
$clause = null;
} else {
$request->session()->put('clause', $clause);
}
Expand All @@ -126,6 +126,7 @@ public function index(Request $request)
}

// Attribute filter
/*
$attribute = $request->get('attribute');
if ($attribute !== null) {
if ($attribute === 'none') {
Expand All @@ -137,6 +138,7 @@ public function index(Request $request)
} else {
$attribute = $request->session()->get('attribute');
}
*/

// Period filter
$period = $request->get('period');
Expand Down Expand Up @@ -203,7 +205,7 @@ public function index(Request $request)

// Filter on clause
if ($clause !== null) {
$controls = $controls->where('clause','=', $clause);
$controls = $controls->where('clause', '=', $clause);
}

// Filter on scope
Expand All @@ -212,13 +214,15 @@ public function index(Request $request)
}

// filter on measure
/*
if ($request->measure !== null) {
$controls = $controls->where(
'control_measure.measure_id',
'=',
$request->measure
);
}
*/

// Filter on period
if ($period !== null && $period !== 99) {
Expand Down
2 changes: 1 addition & 1 deletion resources/views/measures/index.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
<td>{{ $measure->name }}</td>
<td id="{{ $measure->control_count }}">
@if ($measure->control_count>0)
<a href="/bob/index?period=99&domain=0&scope=none&status=2&measure={{ $measure->id }}">
<a href="/bob/index?period=99&domain=0&scope=none&status=2&clause={{ htmlentities($measure->clause) }}">
{{ $measure->control_count }}
</a>
@else
Expand Down
⚡