Remove Universal Wellbeing from visual and toggle-able list

This commit is contained in:
NeilClack
2026-04-23 17:30:33 -05:00
parent cfd67f3545
commit ec3ccabb62
+13 -5
View File
@@ -108,19 +108,26 @@ func (p *ProclamationOptions) Init(ctx *PageCtx) error {
// Load current selections // Load current selections
var selected []db.Proclamation 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 { for _, s := range selected {
if s.ID == defaultProclamationID {
logger.Debug("Found default proclamation in selected list: %s", s.ID)
}
p.activeMap[s.ID] = true p.activeMap[s.ID] = true
} }
// Load ALL proclamations into a lookup map for SearchText population // Load ALL proclamations into a lookup map for SearchText population
var allProcs []db.Proclamation 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) logger.Error("Failed to fetch proclamations: %s", err)
return err return err
} }
procContentMap := make(map[string]string, len(allProcs)) procContentMap := make(map[string]string, len(allProcs))
for _, pr := range 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 procContentMap[pr.ID] = pr.Content
} }
p.allProclamations = []*FlatItem{} p.allProclamations = []*FlatItem{}
@@ -245,7 +252,7 @@ func (p *ProclamationOptions) expand(index int) {
// Load proclamations // Load proclamations
var procs []db.Proclamation 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 { for _, pr := range procs {
var fi *FlatItem var fi *FlatItem
// Reuse existing proclamation from allProclamations if available // Reuse existing proclamation from allProclamations if available
@@ -487,8 +494,9 @@ func (p *ProclamationOptions) HandleEvent(event *sdl.Event) error {
p.acceptChanges() p.acceptChanges()
case sdl.K_SPACE: case sdl.K_SPACE:
item := p.allItems[p.highlightIndex] item := p.allItems[p.highlightIndex]
if !item.IsCategory { if !item.IsCategory { // If the item is NOT a Category
p.activeMap[item.ID] = !p.activeMap[item.ID] 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 { } else if !item.IsSubCategory {
p.toggleExpansion(p.highlightIndex) p.toggleExpansion(p.highlightIndex)
} }