Theodor-Springmann-Stiftung/musenalm
1
0
Fork 0
mirror of https://github.com/Theodor-Springmann-Stiftung/musenalm.git synced 2025-10-30 01:35:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Some changes, path specific data

Browse Source
This commit is contained in:
Simon Martens
2025-02-18 18:39:30 +01:00
parent 0f32f38b5e
commit 3be64bd10d
19 changed files with 237 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
pages/reihen.go
View File

@@ -1,9 +1,7 @@
package pages
import (
"net/http"
"strconv"
"strings"
"github.com/Theodor-Springmann-Stiftung/musenalm/app"
"github.com/Theodor-Springmann-Stiftung/musenalm/dbmodels"
@@ -67,12 +65,12 @@ func (p *ReihenPage) YearRequest(app core.App, engine *templating.Engine, e *cor
y, err := strconv.Atoi(year)
if err != nil {
return Error404(e, engine, err)
return Error404(e, engine, err, data)
}
series, relations, entries, err := dbmodels.SeriesForYear(app, y)
if err != nil {
return Error404(e, engine, err)
return Error404(e, engine, err, data)
}
data["entries"] = entries
data["relations"] = relations
@@ -91,7 +89,7 @@ func (p *ReihenPage) LetterRequest(app core.App, engine *templating.Engine, e *c
series, err := dbmodels.SeriesForLetter(app, letter)
if err != nil {
return Error404(e, engine, err)
return Error404(e, engine, err, data)
}
// INFO: We sort again since the query can't sort german umlauts correctly
dbmodels.SortSeriessesByTitle(series)
@@ -99,7 +97,7 @@ func (p *ReihenPage) LetterRequest(app core.App, engine *templating.Engine, e *c
rmap, bmap, err := dbmodels.EntriesForSeriesses(app, series)
if err != nil {
return Error404(e, engine, err)
return Error404(e, engine, err, data)
}
data["entries"] = bmap
data["relations"] = rmap
@@ -114,13 +112,13 @@ func (p *ReihenPage) PersonRequest(app core.App, engine *templating.Engine, e *c
agent, err := dbmodels.AgentForId(app, person)
if err != nil {
return Error404(e, engine, err)
return Error404(e, engine, err, data)
}
data["a"] = agent
series, relations, entries, err := dbmodels.SeriesForAgent(app, person)
if err != nil {
return Error404(e, engine, err)
return Error404(e, engine, err, data)
}
dbmodels.SortSeriessesByTitle(series)
data["series"] = series
@@ -137,13 +135,13 @@ func (p *ReihenPage) PlaceRequest(app core.App, engine *templating.Engine, e *co
pl, err := dbmodels.PlaceForId(app, place)
if err != nil {
return Error404(e, engine, err)
return Error404(e, engine, err, data)
}
data["p"] = pl
series, relations, entries, err := dbmodels.SeriesForPlace(app, place)
if err != nil {
return Error404(e, engine, err)
return Error404(e, engine, err, data)
}
data["series"] = series
data["relations"] = relations
@@ -158,7 +156,7 @@ func (p *ReihenPage) SearchRequest(app core.App, engine *templating.Engine, e *c
data[PARAM_SEARCH] = search
series, altseries, err := dbmodels.BasicSearchSeries(app, search)
if err != nil {
return Error404(e, engine, err)
return Error404(e, engine, err, data)
}
dbmodels.SortSeriessesByTitle(series)
dbmodels.SortSeriessesByTitle(altseries)
@@ -167,7 +165,7 @@ func (p *ReihenPage) SearchRequest(app core.App, engine *templating.Engine, e *c
rmap, bmap, err := dbmodels.EntriesForSeriesses(app, series)
if err != nil {
return Error404(e, engine, err)
return Error404(e, engine, err, data)
}
data["entries"] = bmap
data["relations"] = rmap
@@ -207,13 +205,8 @@ func (p *ReihenPage) CommonData(app core.App, data map[string]interface{}) error
func (p *ReihenPage) Get(request *core.RequestEvent, engine *templating.Engine, data map[string]interface{}) error {
err := p.CommonData(request.App, data)
if err != nil {
return Error404(request, engine, err)
return Error404(request, engine, err, data)
}
var builder strings.Builder
err = engine.Render(&builder, URL_REIHEN, data)
if err != nil {
return err
}
return request.HTML(http.StatusOK, builder.String())
return engine.Response200(request, URL_REIHEN, data)
}