Skip to content

Sit 138 applying filters #88

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
cz-lucas merged 4 commits into from
Nov 11, 2025
Merged

Sit 138 applying filters #88

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c395219
fixed Bug with blinking filterSection
JonasGoseberg Nov 11, 2025
f32cce6
removed EditModalParameter
JonasGoseberg Nov 11, 2025
5e6b0d1
removed comments
JonasGoseberg Nov 11, 2025
3ba86d3
Merge SIT-138-ApplyingFilters in develop
cz-lucas Nov 11, 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
15 changes: 2 additions & 13 deletions app/Http/Controllers/Assets/AssetsController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,20 +74,9 @@ public function index(Request $request): View
->orderBy('name')
->get();*/

$predefined_filter_edit_modal_open = $request->input('predefinedFilterEditModalOpen');
// $predefined_filter_edit_modal_open = $request->input('predefinedFilterEditModalOpen');
$predefined_filter_id = $request->input('predefinedFilterId');

if ($predefined_filter_edit_modal_open === null) {
$predefined_filter_edit_modal_open = false;
}

if ($predefined_filter_edit_modal_open !== 'true' && $predefined_filter_edit_modal_open !== 'false' && $predefined_filter_edit_modal_open != null) {
throw new InvalidArgumentException("You provided an invalid parameter for predefinedFilterModalOpen (must be true or false).");
} else {
// Convert string to boolean
$predefined_filter_edit_modal_open = $predefined_filter_edit_modal_open == 'true' ? true : false;
}

// Validate if it's a valid integer
if (filter_var($predefined_filter_id, FILTER_VALIDATE_INT) === false && $predefined_filter_id != null) {
throw new InvalidArgumentException('You provided an invalid parameter for predefinedFilterId (must be an integer).');
Expand All @@ -101,7 +90,7 @@ public function index(Request $request): View


// TODO maybe switch later to user / role based view
return view('hardware/index')->with('company', $company)->with('predefined_filter_edit_modal_open', $predefined_filter_edit_modal_open)->with('predefined_filter_id', $predefined_filter_id);
return view('hardware/index')->with('company', $company)/*->with('predefined_filter_edit_modal_open', $predefined_filter_edit_modal_open)*/->with('predefined_filter_id', $predefined_filter_id);
}

/**
Expand Down
5 changes: 5 additions & 0 deletions public/css/dist/filterInputs.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,6 +351,11 @@ When .hide is applied, the filter section is hidden.
box-sizing: border-box;
}

.select2-container--open {
width: unset;
box-sizing: border-box;
}

.select2-container--default .select2-selection--single,
.select2-container--default .select2-selection--multiple {
height: 38px;
Expand Down
2 changes: 1 addition & 1 deletion public/css/dist/filterInputs.min.css
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions public/mix-manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@
"/css/dist/advanced-search.min.css": "/css/dist/advanced-search.min.css?id=2a854b83e82e229aba501f329c060fe0",
"/css/dist/modal.css": "/css/dist/modal.css?id=52cec51e3f1db875dd7cc586f7ed5593",
"/css/dist/modal.min.css": "/css/dist/modal.min.css?id=52cec51e3f1db875dd7cc586f7ed5593",
"/css/dist/filterInputs.css": "/css/dist/filterInputs.css?id=f4f1d563934f4d5b952f01a63dfdb259",
"/css/dist/filterInputs.min.css": "/css/dist/filterInputs.min.css?id=f4f1d563934f4d5b952f01a63dfdb259",
"/css/dist/filterInputs.css": "/css/dist/filterInputs.css?id=ff5cc49deb56a56997a9424367555838",
"/css/dist/filterInputs.min.css": "/css/dist/filterInputs.min.css?id=ff5cc49deb56a56997a9424367555838",
"/js/dist/floating-buttons.js": "/js/dist/floating-buttons.js?id=5d571b93e0e3b820cbc76ef91295b18d",
"/js/dist/floating-buttons.min.js": "/js/dist/floating-buttons.min.js?id=5d571b93e0e3b820cbc76ef91295b18d",
"/js/dist/apiService.js": "/js/dist/apiService.js?id=fcaa03a7b041bdfbfb064f093ec69c8e",
Expand Down
5 changes: 5 additions & 0 deletions resources/assets/css/components/advancedSearch/filterInputs.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,6 +351,11 @@ When .hide is applied, the filter section is hidden.
box-sizing: border-box;
}

.select2-container--open {
width: unset;
box-sizing: border-box;
}

.select2-container--default .select2-selection--single,
.select2-container--default .select2-selection--multiple {
height: 38px;
Expand Down
1 change: 0 additions & 1 deletion resources/views/hardware/index.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@
<!-- Filter Section -->
<div class="filter-section hide" id="filterSection">
@include('partials.advanced-search.advanced-search', [
'predefined_filter_edit_modal_open' => $predefined_filter_edit_modal_open,
'predefined_filter_id' => $predefined_filter_id,
])
</div>
Expand Down
22 changes: 11 additions & 11 deletions resources/views/partials/advanced-search/advanced-search.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,17 +216,6 @@ class FilterUIController {
controller.bindEvents();


(async () => {
setTimeout(async () => {
const filterSection = document.getElementById('filterSection');
filterSection.classList.remove('hide');
container.resolve("filterFormManager").clearAll();

await new Promise(resolve => setTimeout(resolve, 0));
filterSection.classList.add('hide');
}, 0);
})();


@if(isset($predefined_filter_id))
controller.updateFilterWithPredefined(null, {{ $predefined_filter_id }});
Expand All @@ -243,6 +232,17 @@ class FilterUIController {
});
});
@endif
@else
(async () => {
setTimeout(async () => {
const filterSection = document.getElementById('filterSection');
filterSection.classList.remove('hide');
container.resolve("filterFormManager").clearAll();

await new Promise(resolve => setTimeout(resolve, 0));
filterSection.classList.add('hide');
}, 0);
})();
@endif
});

Expand Down
2 changes: 1 addition & 1 deletion resources/views/partials/bootstrap-table.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1464,7 +1464,7 @@ function assetSerialLinkFormatter(value, row) {
// this Links to '/hardware' with the filter id
function predefinedFiltersLinkFormatter(value, row){
if (value && row.id){
return `<a href="{{ config('app.url') }}/hardware?predefinedFilterEditModalOpen=false&predefinedFilterId=${row.id}">${value}</a>`;
return `<a href="{{ config('app.url') }}/hardware?predefinedFilterId=${row.id}">${value}</a>`;
}
}

Expand Down