mirror of
https://github.com/Theodor-Springmann-Stiftung/musenalm.git
synced 2025-10-29 09:15:33 +00:00
Slight page refactoring, text pages, tooltips
This commit is contained in:
@@ -22,7 +22,7 @@ const (
|
||||
|
||||
func init() {
|
||||
rp := &ReihenPage{
|
||||
Page: pagemodels.Page{
|
||||
DefaultPage: pagemodels.DefaultPage{
|
||||
Name: pagemodels.P_REIHEN_NAME,
|
||||
},
|
||||
}
|
||||
@@ -30,7 +30,7 @@ func init() {
|
||||
}
|
||||
|
||||
type ReihenPage struct {
|
||||
pagemodels.Page
|
||||
pagemodels.DefaultPage
|
||||
}
|
||||
|
||||
func (p *ReihenPage) Setup(router *router.Router[*core.RequestEvent], app core.App, engine *templating.Engine) error {
|
||||
@@ -65,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, data)
|
||||
return engine.Response404(e, err, data)
|
||||
}
|
||||
|
||||
series, relations, entries, err := dbmodels.SeriesForYear(app, y)
|
||||
if err != nil {
|
||||
return Error404(e, engine, err, data)
|
||||
return engine.Response404(e, err, data)
|
||||
}
|
||||
data["entries"] = entries
|
||||
data["relations"] = relations
|
||||
@@ -83,13 +83,14 @@ func (p *ReihenPage) LetterRequest(app core.App, engine *templating.Engine, e *c
|
||||
letter := e.Request.URL.Query().Get(PARAM_LETTER)
|
||||
data := map[string]interface{}{}
|
||||
if letter == "" {
|
||||
data["startpage"] = true
|
||||
letter = "A"
|
||||
}
|
||||
data[PARAM_LETTER] = letter
|
||||
|
||||
series, err := dbmodels.SeriesForLetter(app, letter)
|
||||
if err != nil {
|
||||
return Error404(e, engine, err, data)
|
||||
return engine.Response404(e, err, data)
|
||||
}
|
||||
// INFO: We sort again since the query can't sort german umlauts correctly
|
||||
dbmodels.SortSeriessesByTitle(series)
|
||||
@@ -97,7 +98,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, data)
|
||||
return engine.Response404(e, err, data)
|
||||
}
|
||||
data["entries"] = bmap
|
||||
data["relations"] = rmap
|
||||
@@ -112,13 +113,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, data)
|
||||
return engine.Response404(e, err, data)
|
||||
}
|
||||
data["a"] = agent
|
||||
|
||||
series, relations, entries, err := dbmodels.SeriesForAgent(app, person)
|
||||
if err != nil {
|
||||
return Error404(e, engine, err, data)
|
||||
return engine.Response404(e, err, data)
|
||||
}
|
||||
dbmodels.SortSeriessesByTitle(series)
|
||||
data["series"] = series
|
||||
@@ -135,13 +136,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, data)
|
||||
return engine.Response404(e, err, data)
|
||||
}
|
||||
data["p"] = pl
|
||||
|
||||
series, relations, entries, err := dbmodels.SeriesForPlace(app, place)
|
||||
if err != nil {
|
||||
return Error404(e, engine, err, data)
|
||||
return engine.Response404(e, err, data)
|
||||
}
|
||||
data["series"] = series
|
||||
data["relations"] = relations
|
||||
@@ -159,7 +160,7 @@ func (p *ReihenPage) SearchRequest(app core.App, engine *templating.Engine, e *c
|
||||
series, altseries, err := dbmodels.BasicSearchSeries(app, search)
|
||||
|
||||
if err != nil {
|
||||
return Error404(e, engine, err, data)
|
||||
return engine.Response404(e, err, data)
|
||||
}
|
||||
dbmodels.SortSeriessesByTitle(series)
|
||||
dbmodels.SortSeriessesByTitle(altseries)
|
||||
@@ -168,12 +169,12 @@ 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, data)
|
||||
return engine.Response404(e, err, data)
|
||||
}
|
||||
|
||||
rmap2, bmap2, err := dbmodels.EntriesForSeriesses(app, altseries)
|
||||
if err != nil {
|
||||
return Error404(e, engine, err, data)
|
||||
return engine.Response404(e, err, data)
|
||||
}
|
||||
|
||||
for k, v := range rmap2 {
|
||||
@@ -187,21 +188,21 @@ func (p *ReihenPage) SearchRequest(app core.App, engine *templating.Engine, e *c
|
||||
if searchint, err := strconv.Atoi(search); err == nil {
|
||||
identries, err := dbmodels.EntriesForID(app, searchint)
|
||||
if err != nil {
|
||||
return Error404(e, engine, err, data)
|
||||
return engine.Response404(e, err, data)
|
||||
}
|
||||
|
||||
if len(identries) != 0 {
|
||||
|
||||
idseries, rmap3, bmap3, err := dbmodels.SeriesForEntries(app, identries)
|
||||
if err != nil {
|
||||
return Error404(e, engine, err, data)
|
||||
return engine.Response404(e, err, data)
|
||||
}
|
||||
|
||||
dbmodels.SortSeriessesByTitle(idseries)
|
||||
data["idseries"] = idseries
|
||||
|
||||
if err != nil {
|
||||
return Error404(e, engine, err, data)
|
||||
return engine.Response404(e, err, data)
|
||||
}
|
||||
|
||||
for k, v := range rmap3 {
|
||||
@@ -246,13 +247,19 @@ func (p *ReihenPage) CommonData(app core.App, data map[string]interface{}) error
|
||||
}
|
||||
data["years"] = years
|
||||
|
||||
record, err := p.GetLatestData(app)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
data["record"] = pagemodels.NewReihen(record)
|
||||
return nil
|
||||
}
|
||||
|
||||
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, data)
|
||||
return engine.Response404(request, err, data)
|
||||
}
|
||||
|
||||
return engine.Response200(request, URL_REIHEN, data)
|
||||
|
||||
Reference in New Issue
Block a user