From ec3ccabb624a86330975e8e6c3c2b559a6834e32 Mon Sep 17 00:00:00 2001 From: NeilClack Date: Thu, 23 Apr 2026 17:10:56 -0500 Subject: [PATCH] Remove Universal Wellbeing from visual and toggle-able list --- internal/page/proclamationOptions.go | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/internal/page/proclamationOptions.go b/internal/page/proclamationOptions.go index e57f6b7..61343ff 100644 --- a/internal/page/proclamationOptions.go +++ b/internal/page/proclamationOptions.go @@ -108,19 +108,26 @@ func (p *ProclamationOptions) Init(ctx *PageCtx) error { // Load current selections var selected []db.Proclamation - p.Context.DbPtr.Where("selected = ?", true).Find(&selected) + p.Context.DbPtr.Where("selected = ?", true).Where("id != ?", defaultProclamationID).Find(&selected) for _, s := range selected { + if s.ID == defaultProclamationID { + logger.Debug("Found default proclamation in selected list: %s", s.ID) + } p.activeMap[s.ID] = true } // Load ALL proclamations into a lookup map for SearchText population var allProcs []db.Proclamation - if err := p.Context.DbPtr.Find(&allProcs).Error; err != nil { + if err := p.Context.DbPtr.Where("id != ?", defaultProclamationID).Find(&allProcs).Error; err != nil { logger.Error("Failed to fetch proclamations: %s", err) return err } + procContentMap := make(map[string]string, len(allProcs)) for _, pr := range allProcs { + if pr.ID == defaultProclamationID { + logger.Debug("Found default proclamation in allProcs list: %s", pr.ID) + } procContentMap[pr.ID] = pr.Content } p.allProclamations = []*FlatItem{} @@ -245,7 +252,7 @@ func (p *ProclamationOptions) expand(index int) { // Load proclamations var procs []db.Proclamation - p.Context.DbPtr.Where("category_id = ?", parentID).Find(&procs) + p.Context.DbPtr.Where("category_id = ?", parentID).Where("ID != ?", defaultProclamationID).Find(&procs) for _, pr := range procs { var fi *FlatItem // Reuse existing proclamation from allProclamations if available @@ -487,8 +494,9 @@ func (p *ProclamationOptions) HandleEvent(event *sdl.Event) error { p.acceptChanges() case sdl.K_SPACE: item := p.allItems[p.highlightIndex] - if !item.IsCategory { - p.activeMap[item.ID] = !p.activeMap[item.ID] + if !item.IsCategory { // If the item is NOT a Category + p.activeMap[item.ID] = !p.activeMap[item.ID] // Toggle it from the 'selected' list + logger.Debug("Select/Deselect Proclamation: %s %s", item.Label, item.ID) } else if !item.IsSubCategory { p.toggleExpansion(p.highlightIndex) }