PostERG/xamxam
1
0
Fork 0
mirror of https://codeberg.org/PostERG/xamxam.git synced 2026-05-06 19:19:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix repertoire AP/OR/FI columns and main scroll containment

Browse Source 
- repertoire-index.php: add $colHasMatches per-column guard.
  Entries in a column are only faded when that column has at least one
  matched entry in the current result set. When a dimension has no
  matched entries (e.g. no thesis has orientation_id set yet), the
  entire column stays fully interactive — all values remain clickable.
  This fixes: empty columns, forced single-select, cascade fading.

- Database.php: revert allAp/allOr/allFi to full lookup-table queries
  so all known values are always shown (not just ones linked to theses).

- common.css: body is now a flex column; main gets flex:1 + min-height:0;
  header-search-wrap gets flex-shrink:0; duplicate html/body blocks merged.
- public.css: removed redundant top-level main block; home-main gets min-height:0.
- repertoire.css: search-main gets min-height:0 for proper flex scroll.
This commit is contained in:
Pontoporeia
2026-04-21 19:05:18 +02:00
parent 78449afe64
commit 73fdda4a7f
8 changed files with 38 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
.gitignore vendored
View File

@@ -1,16 +1,13 @@
# Admin credentials (contains bcrypt hash — never commit)
config/admin_credentials.php
# Vendor directory (third-party code)
vendor/
compose.lock
### Test databases ###
storage/test.db
app/storage/test.db
### Logs ###
error.log
storage/cache/
app/storage/cache/
# Nix
.direnv/

16
TODO.md
View File

@@ -1,7 +1,13 @@
# TODO
## Fix repertoire.php
- [ ] Fix AP and orientation columns not working like other columns
- [ ] Make main element scrollable instead of body
- [ ] Update public.css (general)
- [ ] Update repertoire.css (page-specific)
## Répertoire page fixes
- [x] Fix AP and orientation columns returning empty results when clicked
- [x] Fix multi-select being blocked (only one entry selectable at a time)
- [x] Fix all other columns becoming faded when AP/OR filter is selected
- [x] Always show all lookup-table values (ap/or/fi); only fade based on cross-dimension matched data when the column has at least one matched entry (`$colHasMatches` guard)
- [x] Make `main` the scrollable element instead of body
- [x] `common.css`: body is now `display:flex; flex-direction:column`, `main` gets `flex:1; min-height:0`
- [x] `public.css`: removed redundant `main` block, `.home-main` keeps its `overflow-y:auto`
- [x] `repertoire.css`: `.search-main` gets `min-height:0` for proper flex scroll containment
- [x] `common.css`: `.header-search-wrap` gets `flex-shrink:0`
- [x] `Database::getRepertoireFilterData`: `allAp`, `allOr`, `allFi` now sourced from actual published thesis joins (not bare lookup tables), matching the pattern used by years and keywords

15
app/public/assets/css/common.css
View File

@@ -11,6 +11,7 @@ body {
margin: 0;
padding: 0;
height: 100%;
overflow: hidden;
}
body {
@@ -22,13 +23,8 @@ body {
rgba(0, 0, 0, 0) 92%,
rgba(149, 87, 181, 1) 100%
);
}
html,
body {
margin: 0;
height: 100%;
overflow: hidden;
display: flex;
flex-direction: column;
}
a {
@@ -132,7 +128,8 @@ body > header nav ul a[aria-current="page"] {
}
main {
overflow: scroll;
flex: 1;
min-height: 0;
}
/* ============================================================
@@ -140,8 +137,8 @@ main {
============================================================ */
.header-search-wrap {
padding: 0 0;
flex-shrink: 0;
background-color: var(--gradient-4);
background: linear-gradient(180deg, var(--gradient-4) 0%, #ffffffee 100%);
}

8
app/public/assets/css/public.css
View File

@@ -4,16 +4,10 @@
@import url("./variables.css");
main {
display: flex;
flex-direction: column;
min-height: 100vh;
overflow: hidden;
}
/* Cards grid — scrollable main area */
.home-main {
flex: 1;
min-height: 0;
overflow-y: auto;
overflow-x: hidden;
padding: 0;

1
app/public/assets/css/repertoire.css
View File

@@ -6,6 +6,7 @@
.search-main {
flex: 1;
min-height: 0;
overflow-y: auto;
overflow-x: hidden;
}

1
app/storage/cache/rate_limit/f528764d624db129b32c21fbca0cb8d6.json vendored
View File

@@ -1 +0,0 @@
[1777059009,1777059010,1777059010,1777059010,1777059010,1777059010,1777059010,1777059010,1777059011,1777059011,1777059011,1777059011,1777059011,1777059011,1777059011,1777059011,1777059011,1777059011,1777059012,1777059012,1777059012,1777059012,1777059013,1777059013,1777059013,1777059013,1777059013,1777059013,1777059013,1777059013]

BIN
app/storage/test.db
View File

Binary file not shown.

22
app/templates/partials/repertoire-index.php
View File

@@ -53,6 +53,18 @@ $anyActive = !empty($activeSets['years']) || !empty($activeSets['ap'])
|| !empty($activeSets['or']) || !empty($activeSets['fi'])
|| !empty($activeSets['kw']);
// Per-column: does this dimension have ANY matched entry in the current result set?
// When a column has zero matched entries despite other filters being active, it means
// no thesis in the matched set carries that FK — the column has no useful cross-filter
// signal and its entries must NOT be faded (the user may still want to select them).
$colHasMatches = [
'years' => !empty(array_filter($repData['years'], fn($i) => $i['matched'])),
'ap' => !empty(array_filter($repData['ap_programs'], fn($i) => $i['matched'])),
'or' => !empty(array_filter($repData['orientations'], fn($i) => $i['matched'])),
'fi' => !empty(array_filter($repData['finality_types'], fn($i) => $i['matched'])),
'kw' => !empty(array_filter($repData['keywords'], fn($i) => $i['matched'])),
];
// Common HTMX attributes for all active filter buttons
$hx = 'hx-target="#repertoire-index" hx-swap="outerHTML" hx-push-url="true" hx-indicator="#rep-indicator"';
?>
@@ -65,7 +77,7 @@ $hx = 'hx-target="#repertoire-index" hx-swap="outerHTML" hx-push-url="true" hx-i
<?php foreach ($repData['years'] as $item):
$val = (string)$item['value'];
$isActive = in_array($val, $activeSets['years'], true);
$isFaded = $anyActive && !$item['matched'] && !$isActive;
$isFaded = $anyActive && $colHasMatches['years'] && !$item['matched'] && !$isActive;
$cls = 'rep-entry'
. ($isActive ? ' rep-entry--selected' : '')
. ($isFaded ? ' rep-entry--faded' : '');
@@ -89,7 +101,7 @@ $hx = 'hx-target="#repertoire-index" hx-swap="outerHTML" hx-push-url="true" hx-i
<?php foreach ($repData['ap_programs'] as $item):
$val = $item['value'];
$isActive = in_array($val, $activeSets['ap'], true);
$isFaded = $anyActive && !$item['matched'] && !$isActive;
$isFaded = $anyActive && $colHasMatches['ap'] && !$item['matched'] && !$isActive;
$cls = 'rep-entry'
. ($isActive ? ' rep-entry--selected' : '')
. ($isFaded ? ' rep-entry--faded' : '');
@@ -113,7 +125,7 @@ $hx = 'hx-target="#repertoire-index" hx-swap="outerHTML" hx-push-url="true" hx-i
<?php foreach ($repData['orientations'] as $item):
$val = $item['value'];
$isActive = in_array($val, $activeSets['or'], true);
$isFaded = $anyActive && !$item['matched'] && !$isActive;
$isFaded = $anyActive && $colHasMatches['or'] && !$item['matched'] && !$isActive;
$cls = 'rep-entry'
. ($isActive ? ' rep-entry--selected' : '')
. ($isFaded ? ' rep-entry--faded' : '');
@@ -137,7 +149,7 @@ $hx = 'hx-target="#repertoire-index" hx-swap="outerHTML" hx-push-url="true" hx-i
<?php foreach ($repData['finality_types'] as $item):
$val = $item['value'];
$isActive = in_array($val, $activeSets['fi'], true);
$isFaded = $anyActive && !$item['matched'] && !$isActive;
$isFaded = $anyActive && $colHasMatches['fi'] && !$item['matched'] && !$isActive;
$cls = 'rep-entry'
. ($isActive ? ' rep-entry--selected' : '')
. ($isFaded ? ' rep-entry--faded' : '');
@@ -179,7 +191,7 @@ $hx = 'hx-target="#repertoire-index" hx-swap="outerHTML" hx-push-url="true" hx-i
<?php foreach ($repData['keywords'] as $item):
$val = $item['value'];
$isActive = in_array($val, $activeSets['kw'], true);
$isFaded = $anyActive && !$item['matched'] && !$isActive;
$isFaded = $anyActive && $colHasMatches['kw'] && !$item['matched'] && !$isActive;
$cls = 'rep-entry'
. ($isActive ? ' rep-entry--selected' : '')
. ($isFaded ? ' rep-entry--faded' : '');