diff options
Diffstat (limited to 'src/components/ScheduleInteractive.astro')
| -rw-r--r-- | src/components/ScheduleInteractive.astro | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/components/ScheduleInteractive.astro b/src/components/ScheduleInteractive.astro index 129b38a..58574ce 100644 --- a/src/components/ScheduleInteractive.astro +++ b/src/components/ScheduleInteractive.astro @@ -247,7 +247,8 @@ function matchesCategory(e) { if (activeCategory === 'all') return true; if (activeCategory === COUNCIL_KEY) return isCouncil(e); - if (activeCategory === MEETING_ICON) return e.type === 'meeting'; + // 「審議会等」は市議会を除く（市議会は別のボタンで絞り込む）。 + if (activeCategory === MEETING_ICON) return e.type === 'meeting' && !isCouncil(e); return e.category === activeCategory; } @@ -429,7 +430,7 @@ const eventStatus = ensureStatus(eventsTable.parentElement, 'event'); function updateTableStatus(status, type, total, visible) { - const tableLabel = type === 'meeting' ? '審議会等' : 'イベント'; + const tableLabel = type === 'meeting' ? '審議会等・市議会' : 'イベント'; const filtered = activeCategory !== 'all'; status.classList.toggle('is-filtered', filtered); const text = filtered @@ -500,17 +501,17 @@ const buttonDefs = [ { category: 'all', icon: '', label: 'すべて', count: entries.length }, { - category: MEETING_ICON, - icon: MEETING_ICON, - label: '審議会等', - count: meetingEntries.length, - }, - { category: COUNCIL_KEY, icon: MEETING_ICON, label: '市議会', count: entries.filter(isCouncil).length, }, + { + category: MEETING_ICON, + icon: MEETING_ICON, + label: '審議会等', + count: meetingEntries.length, + }, ...CATEGORY_DEFS.map((c) => ({ category: c.icon, icon: c.icon, |