Skip to content

UHF-12819 fix highschool search #1001

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
rpnykanen merged 6 commits into from
Feb 4, 2026
Merged

UHF-12819 fix highschool search #1001

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
67cc028
UHF-12819: query does not allow array of values by default. IN-operat…
rpnykanen Feb 2, 2026
cdb70b7
UHF-12819: Disable the field with css. Disabling with js causes ajax …
rpnykanen Feb 3, 2026
79684d1
UHF-12819: replace bad comment with accurate one
rpnykanen Feb 3, 2026
ec6fca6
UHF-12819: built code
rpnykanen Feb 3, 2026
edce67d
UHF-12819: better comment
rpnykanen Feb 4, 2026
fbb5eba
UHF-12819: Merge branch 'dev' into UHF-12819
rpnykanen Feb 4, 2026
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
2 changes: 1 addition & 1 deletion public/modules/custom/helfi_kasko_content/src/Plugin/views/filter/SchoolDetailsBase.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ protected function queryByWordId(int $wordId) {
$this->query->addWhere('AND', 'di.detail_items_schoolyear', $schoolYear);
}

$this->query->addWhere('AND', 'di.detail_items_clarification', $this->value);
$this->query->addWhere('AND', 'di.detail_items_clarification', $this->value, 'IN');
}

/**
Expand Down
2 changes: 1 addition & 1 deletion public/themes/custom/hdbt_subtheme/dist/js/high-school-search.min.js
View file
Open in desktop

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

15 changes: 9 additions & 6 deletions public/themes/custom/hdbt_subtheme/src/js/high-school-search.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,21 @@
'filters that were dimmed, select the option "All" on the selected filter.',
);
select.parentElement?.classList.add('hdbt--select-wrapper--disabled');
select.disabled = true;
select.dataset.ariaDisabled = 'true';

// Disabling the field by `select.disabled=true` interferes with ajax.
select.classList.add('disabled', 'noclick');
select.value = 'All';
select.setAttribute('aria-disabled', 'true');
} else {
helpText.textContent = '';

select.classList.remove('disabled', 'noclick');
select.parentElement?.classList.remove('hdbt--select-wrapper--disabled');
select.disabled = false;
select.dataset.ariaDisabled = 'false';
select.setAttribute('aria-disabled', 'false');
}
};

// Disable all other selects except the one that has some OTHER option selected
// than 'All' and enable them all if they all have 'All' option selected.
// Only one of the two emphasis fields may be selected.
const disableOtherSelects = (selected, selectElements) => {
if (selected.value !== 'All') {
/** biome-ignore lint/suspicious/useIterableCallbackReturn: @todo UHF-12501 */
Expand Down