Beginn Personenansicht Beiträge / Anzahl Personenübersicht

pages/person.go

@@ -62,6 +62,7 @@ type AgentResult struct {
 	CResult        []*dbmodels.Entry                      /// Sorted
 	Contents       map[string][]*dbmodels.Content         // KEY: entry ID
 	ContentsAgents map[string][]*dbmodels.RContentsAgents // KEY: Content ID
+	Agents         map[string]*dbmodels.Agent             // KEY: Agent ID
 }
 
 func NewAgentResult(app core.App, id string) (*AgentResult, error) {
@@ -79,6 +80,11 @@ func NewAgentResult(app core.App, id string) (*AgentResult, error) {
 		return nil, err
 	}
 
+	err = res.FilterContentsByEntry(app, id, res)
+	if err != nil {
+		return nil, err
+	}
+
 	return res, nil
 }
 
@@ -146,9 +152,8 @@ func (p *AgentResult) FilterEntriesByPerson(app core.App, id string, res *AgentR
 }
 
 func (p *AgentResult) FilterContentsByEntry(app core.App, id string, res *AgentResult) error {
-	// 1. DB Hit
 	relations, err := dbmodels.RContentsAgents_Agent(app, id)
-	if err != nil && err != sql.ErrNoRows {
+	if err != nil {
 		return err
 	}
 
@@ -158,13 +163,24 @@ func (p *AgentResult) FilterContentsByEntry(app core.App, id string, res *AgentR
 
 	contentsagents := make(map[string][]*dbmodels.RContentsAgents)
 	contentIds := []any{}
+	agentids := []any{}
 	for _, r := range relations {
 		contentIds = append(contentIds, r.Content())
+		agentids = append(agentids, r.Agent())
 		contentsagents[r.Content()] = append(contentsagents[r.Content()], r)
 	}
 	res.ContentsAgents = contentsagents
 
-	// 2. DB Hit
+	agents, err := dbmodels.Agents_IDs(app, agentids)
+	if err != nil {
+		return err
+	}
+	aMap := make(map[string]*dbmodels.Agent, len(agents))
+	for _, a := range agents {
+		aMap[a.Id] = a
+	}
+	res.Agents = aMap
+
 	contents, err := dbmodels.Contents_IDs(app, contentIds)
 	if err != nil {
 		return err
@@ -178,7 +194,6 @@ func (p *AgentResult) FilterContentsByEntry(app core.App, id string, res *AgentR
 	}
 	res.Contents = contentMap
 
-	// 3. DB Hit
 	entries, err := dbmodels.Entries_IDs(app, entrykeys)
 	if err != nil {
 		return err

pages/personen.go

@@ -91,6 +91,16 @@ func (p *PersonenPage) FilterRequest(app core.App, engine *templating.Engine, e
 	data["filter"] = filter
 	data["letter"] = letter
 
+	bcount, err := dbmodels.CountAgentsBaende(app)
+	if err == nil {
+		data["bcount"] = bcount
+	}
+
+	count, err := dbmodels.CountAgentsContents(app)
+	if err == nil {
+		data["ccount"] = count
+	}
+
 	letters, err := dbmodels.LettersForAgents(app, filter)
 	if err != nil {
 		return engine.Response404(e, err, data)
@@ -132,6 +142,16 @@ func (p *PersonenPage) SearchRequest(app core.App, engine *templating.Engine, e
 	data["agents"] = agents
 	data["altagents"] = altagents
 
+	bcount, err := dbmodels.CountAgentsBaende(app)
+	if err == nil {
+		data["bcount"] = bcount
+	}
+
+	count, err := dbmodels.CountAgentsContents(app)
+	if err == nil {
+		data["ccount"] = count
+	}
+
 	return p.Get(e, engine, data)
 }