Skip to content

add filter on clause #295

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 1 commit into from
Mar 6, 2025
Merged

add filter on clause #295

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 25 additions & 1 deletion app/Http/Controllers/ControlController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ public function index(Request $request)
// get all domains
$domains = Domain::All();

/*
// get all attributes
$attributes = [];
$allAttributes = DB::table('measures')->select('attributes')->get();
Expand All @@ -47,6 +48,9 @@ public function index(Request $request)
}
sort($attributes);
$attributes = array_unique($attributes);
*/
// get all clauses
$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 @@ -95,6 +99,19 @@ public function index(Request $request)
$domain = $request->session()->get('domain');
}

// Clause filter
$clause = $request->get('clause');
if ($clause !== null) {
if ($clause === 'none') {
$request->session()->forget('clause');
$clause=null;
} else {
$request->session()->put('clause', $clause);
}
} else {
$clause = $request->session()->get('clause');
}

// Scope filter
$scope = $request->get('scope');
if ($scope !== null) {
Expand Down Expand Up @@ -184,6 +201,11 @@ public function index(Request $request)
$controls = $controls->where('measures.domain_id', '=', $domain);
}

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

// Filter on scope
if ($scope !== null) {
$controls = $controls->where('c1.scope', '=', $scope);
Expand Down Expand Up @@ -246,13 +268,15 @@ public function index(Request $request)
}

// Filter on attribute
/*
if ($attribute !== null) {
$controls = $controls->where(
'c1.attributes',
'LIKE',
'%' . $attribute . '%'
);
}
*/

// get action plan associated
$controls = $controls->leftjoin('actions', 'actions.control_id', '=', 'c1.id');
Expand Down Expand Up @@ -301,7 +325,7 @@ public function index(Request $request)
// return view
return view('controls.index')
->with('controls', $controls)
->with('attributes', $attributes)
->with('clauses', $clauses)
->with('scopes', $scopes)
->with('domains', $domains);
}
Expand Down
1 change: 1 addition & 0 deletions resources/lang/de/cruds.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
'choose_scope' => 'Wähle Geltungsbereich',
'choose_period' => 'Wähle Periode',
'choose_attribute' => 'Wähle Attribute',
'choose_clause' => 'Wähle Clause',
'domain' => 'Domäne',
'indicator' => 'Funktion',
'measure' => 'Maßnahme',
Expand Down
1 change: 1 addition & 0 deletions resources/lang/en/cruds.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@
'choose_scope' => 'Choose scope',
'choose_period' => 'Choose period',
'choose_attribute' => 'Choose attribute',
'choose_clause' => 'Choose clause',
'domain' => 'Domain',
'indicator' => 'Function',
'measure' => 'Measure',
Expand Down
1 change: 1 addition & 0 deletions resources/lang/fr/cruds.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@
'choose_scope' => 'Choisir un périmètre',
'choose_period' => 'Choisir une periode',
'choose_attribute' => 'Choisir un attribut',
'choose_clause' => 'Choisir une clause',
'clause' => 'Clause',
'clauses' => 'Clauses',
'domain' => 'Domaine',
Expand Down
28 changes: 15 additions & 13 deletions resources/views/controls/index.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,34 +19,36 @@
@endforeach
</select>
</div>

<div class="cell-2">
<select id='scope' name="scope" data-role="select">
<option value="none">-- {{ trans("cruds.control.fields.choose_scope")}} --</option>
@foreach ($scopes as $scope)
<select id='clause' name="clause" data-role="select">
<option value="none">-- {{ trans("cruds.control.fields.choose_clause")}} --</option>
@foreach ($clauses as $clause)
<option
@if (Session::get("scope")==$scope)
@if (Session::get("clause")==trim($clause))
selected
@endif >
{{ $scope }}
{{ $clause }}
</option>
@endforeach
</select>
</div>

<div class="cell-2">
<select id='attribute' name="attribute" data-role="select">
<option value="none">-- {{ trans("cruds.control.fields.choose_attribute")}} --</option>
@foreach ($attributes as $attribute)
<select id='scope' name="scope" data-role="select">
<option value="none">-- {{ trans("cruds.control.fields.choose_scope")}} --</option>
@foreach ($scopes as $scope)
<option
@if (Session::get("attribute")==$attribute)
@if (Session::get("scope")==$scope)
selected
@endif >
{{ $attribute }}
{{ $scope }}
</option>
@endforeach
</select>
</div>
<div class="cell-3">

<div class="cell-3">
<select id='cur_period' name="period" data-role="select">
<option value="99"
@if (Session::get("period")==="99")
Expand Down Expand Up @@ -105,9 +107,9 @@
window.location = '/bob/index?scope=' + this.value;
}, false);

var select = document.getElementById('attribute');
var select = document.getElementById('clause');
select.addEventListener('change', function(){
window.location = '/bob/index?attribute=' + encodeURIComponent(this.value);
window.location = '/bob/index?clause=' + this.value;
}, false);

select = document.getElementById('cur_period');
Expand Down
⚡