+exemplate, +fields

This commit is contained in:
Simon Martens
2026-01-07 16:43:35 +01:00
parent 02d78388e7
commit f9fb077518
13 changed files with 897 additions and 272 deletions

View File

@@ -64,6 +64,7 @@ type AlmanachResult struct {
Places []*dbmodels.Place
Series []*dbmodels.Series
Contents []*dbmodels.Content
Items []*dbmodels.Item
Agents map[string]*dbmodels.Agent // <- Key is agent id
EntriesSeries map[string]*dbmodels.REntriesSeries // <- Key is series id
EntriesAgents []*dbmodels.REntriesAgents
@@ -109,6 +110,11 @@ func NewAlmanachResult(app core.App, id string, params BeitraegeFilterParameters
return nil, err
}
items, err := dbmodels.Items_Entry(app, entry.Id)
if err != nil {
return nil, err
}
types := Types_Contents(contents)
hs := HasScans(contents)
@@ -171,6 +177,7 @@ func NewAlmanachResult(app core.App, id string, params BeitraegeFilterParameters
Places: places,
Series: series,
Contents: contents,
Items: items,
Agents: agentsMap,
EntriesSeries: srelationsMap,
EntriesAgents: entriesagents,

View File

@@ -51,6 +51,7 @@ func (p *AlmanachEditPage) GET(engine *templating.Engine, app core.App) HandleFu
data["result"] = result
data["filters"] = filters
data["csrf_token"] = req.Session().Token
data["item_types"] = dbmodels.ITEM_TYPE_VALUES
abbrs, err := pagemodels.GetAbks(app)
if err == nil {

View File

@@ -1,6 +1,7 @@
package dbmodels
import (
"github.com/pocketbase/dbx"
"github.com/pocketbase/pocketbase/core"
)
@@ -186,6 +187,17 @@ func Contents_Entry(app core.App, id string) ([]*Content, error) {
)
}
func Items_Entry(app core.App, id string) ([]*Item, error) {
var ret []*Item
err := app.RecordQuery(ITEMS_TABLE).
Where(dbx.NewExp(
ENTRIES_TABLE+" = {:id} OR (json_valid("+ENTRIES_TABLE+") = 1 AND EXISTS (SELECT 1 FROM json_each("+ENTRIES_TABLE+") WHERE value = {:id}))",
dbx.Params{"id": id},
)).
All(&ret)
return ret, err
}
func Contents_MusenalmID(app core.App, id string) (*Content, error) {
ret, err := TableByField[Content](app, CONTENTS_TABLE, MUSENALMID_FIELD, id)
return &ret, err

View File

@@ -27,6 +27,7 @@ func ItemsFromBändeAndBIBLIO(
}
for i := 0; i < len(entries.Bände); i++ {
bandItems := []*dbmodels.Item{}
band := entries.Bände[i]
banddb, ok := entriesmap[band.ID]
if !ok {
@@ -81,6 +82,7 @@ func ItemsFromBändeAndBIBLIO(
}
records = append(records, exem)
bandItems = append(bandItems, exem)
}
for nr, m := range t {
@@ -102,11 +104,12 @@ func ItemsFromBändeAndBIBLIO(
if exem.Identifier() != "" {
records = append(records, exem)
bandItems = append(bandItems, exem)
}
}
if len(records) > 0 {
for _, exem := range records {
if len(bandItems) > 0 {
for _, exem := range bandItems {
exem.SetEntry(banddb.Id)
exem.SetOwner("Theodor Springmann Stiftung")

File diff suppressed because it is too large Load Diff

File diff suppressed because one or more lines are too long

View File

@@ -7,6 +7,7 @@
Places []*dbmodels.Place
Series []*dbmodels.Series
Contents []*dbmodels.Content
Items []*dbmodels.Item
Agents map[string]*dbmodels.Agent // <- Key is agent id
EntriesSeries map[string]*dbmodels.REntriesSeries // <- Key is series id
EntriesAgents []*dbmodels.REntriesAgents

View File

@@ -5,6 +5,7 @@
Places []*dbmodels.Place
Series []*dbmodels.Series
Contents []*dbmodels.Content
Items []*dbmodels.Item
Agents map[string]*dbmodels.Agent // <- Key is agent id
EntriesSeries map[string]*dbmodels.REntriesSeries // <- Key is series id
EntriesAgents []*dbmodels.REntriesAgents

View File

@@ -5,6 +5,7 @@ type AlmanachResult struct {
Places []*dbmodels.Place
Series []*dbmodels.Series
Contents []*dbmodels.Content
Items []*dbmodels.Item
Agents map[string]*dbmodels.Agent // <- Key is agent id
EntriesSeries map[string]*dbmodels.REntriesSeries // <- Key is series id
EntriesAgents []*dbmodels.REntriesAgents
@@ -101,47 +102,25 @@ type AlmanachResult struct {
<div class="container-normal mx-auto mt-4 !px-0">
{{ template "_usermessage" $model }}
<form class="w-full grid grid-cols-12 gap-4 dbform" id="changealmanachform" x-target="changealmanachform user-message almanach-header-data" hx-boost="false" method="POST">
<form class="w-full flex gap-4 dbform" id="changealmanachform" x-target="changealmanachform user-message almanach-header-data" hx-boost="false" method="POST">
<input type="hidden" name="csrf_token" value="{{ $model.csrf_token }}" />
<input type="hidden" name="last_edited" value="{{ $model.result.Entry.Updated }}" />
<div class="inputwrapper col-span-8">
<div class="flex flex-row justify-between">
<label for="preferred_title" class="inputlabel"><i class="ri-text"></i> Kurztitel</label>
</div>
<textarea name="preferred_title" id="preferred_title" class="inputinput no-enter" placeholder="" required autocomplete="off" rows="1">
{{- $model.result.Entry.PreferredTitle -}}
</textarea
>
</div>
<div class="col-span-3 col-start-10">
<!-- Left Column -->
<div class="flex-1 flex flex-col gap-4">
<!-- Kurztitel -->
<div class="inputwrapper">
<label for="type" class="inputlabel">Status <i class="ri-alarm-warning-line"></i></label>
<select name="type" id="type" autocomplete="off" class="inputselect font-bold">
<option value="Unknown" {{ if eq $model.result.Entry.EditState "Unknown" }}selected{{ end }}>Unbekannt</option>
<option value="ToDo" {{ if eq $model.result.Entry.EditState "ToDo" }}selected{{ end }}>Zu erledigen</option>
<option value="Review" {{ if eq $model.result.Entry.EditState "Review" }}selected{{ end }}>Überprüfen</option>
<option value="Seen" {{ if eq $model.result.Entry.EditState "Seen" }}selected{{ end }}>Autopsiert</option>
<option value="Edited" {{ if eq $model.result.Entry.EditState "Edited" }}selected{{ end }}>Vollständig Erfasst</option>
</select>
<div class="flex flex-row justify-between">
<label for="preferred_title" class="inputlabel"><i class="ri-text"></i> Kurztitel</label>
</div>
<textarea name="preferred_title" id="preferred_title" class="inputinput no-enter" placeholder="" required autocomplete="off" rows="1">
{{- $model.result.Entry.PreferredTitle -}}
</textarea>
</div>
</div>
<div class="col-span-8" id="titles"></div>
<div class="col-span-4 col-start-10 row-span-2">
<div class="inputwrapper">
<label for="type" class="languages inputlabel" for="languages">Sprachen <i class="ri-earth-line"></i></label>
<multi-select-simple id="languages" show-create-button="false" placeholder="Sprachen suchen..."></multi-select-simple>
<script type="module">
// Initialize the multi-select with the languages
const smlang = document.getElementById("languages");
smlang.value = {{ $model.result.Entry.Language }};
</script>
</div>
</div>
<div-manager dm-target="titles" class="col-span-2 col-start-7">
<!-- Titles Section -->
<div id="titles"></div>
<div-manager dm-target="titles">
<button class="dm-menu-button text-right w-full cursor-pointer"><i class="ri-add-line"></i>
Titeldaten hinzufügen</button>
@@ -223,5 +202,371 @@ type AlmanachResult struct {
</textarea>
</div>
</div-manager>
<!-- Publication Information: Year and Edition - Always visible -->
<div class="flex gap-4">
<div class="flex-1 inputwrapper">
<label for="year" class="inputlabel"><i class="ri-calendar-line"></i> Jahr</label>
<input type="number" name="year" id="year" class="inputinput" placeholder="" autocomplete="off" value="{{ $model.result.Entry.Year }}" />
</div>
<div class="flex-1 inputwrapper">
<label for="edition" class="inputlabel"><i class="ri-file-copy-line"></i> Ausgabe</label>
<textarea name="edition" id="edition" class="inputinput" placeholder="" autocomplete="off" rows="1">{{- $model.result.Entry.Edition -}}</textarea>
</div>
</div>
<!-- Publication Information: Optional fields -->
<div id="publication"></div>
<div-manager dm-target="publication">
<button class="dm-menu-button text-right w-full cursor-pointer"><i class="ri-add-line"></i>
Publikationsdaten hinzufügen</button>
<div class="inputwrapper {{ if eq $model.result.Entry.ResponsibilityStmt "" }}hidden{{ end }}">
<div class="flex flex-row justify-between">
<label for="responsibility_statement" class="inputlabel menu-label"><i class="ri-user-line"></i> Autorangabe</label>
<div class="pr-2">
<button class="dm-close-button font-bold input-label">
<i class="ri-close-line"></i>
</button>
</div>
</div>
<textarea name="responsibility_statement" id="responsibility_statement" class="inputinput" placeholder="" autocomplete="off" rows="1">{{- $model.result.Entry.ResponsibilityStmt -}}</textarea>
</div>
<div class="mt-3 inputwrapper {{ if eq $model.result.Entry.PublicationStmt "" }}hidden{{ end }}">
<div class="flex flex-row justify-between">
<label for="publication_statement" class="inputlabel menu-label"><i class="ri-book-line"></i> Publikationsangabe</label>
<div class="pr-2">
<button class="dm-close-button font-bold input-label">
<i class="ri-close-line"></i>
</button>
</div>
</div>
<textarea name="publication_statement" id="publication_statement" class="inputinput" placeholder="" autocomplete="off" rows="1">{{- $model.result.Entry.PublicationStmt -}}</textarea>
</div>
<div class="mt-3 inputwrapper {{ if eq $model.result.Entry.PlaceStmt "" }}hidden{{ end }}">
<div class="flex flex-row justify-between">
<label for="place_statement" class="inputlabel menu-label"><i class="ri-map-pin-line"></i> Ortsangabe</label>
<div class="pr-2">
<button class="dm-close-button font-bold input-label">
<i class="ri-close-line"></i>
</button>
</div>
</div>
<textarea name="place_statement" id="place_statement" class="inputinput" placeholder="" autocomplete="off" rows="1">{{- $model.result.Entry.PlaceStmt -}}</textarea>
</div>
</div-manager>
<!-- Annotationen -->
<div id="annotation_section"></div>
<div-manager dm-target="annotation_section">
<button class="dm-menu-button text-right w-full cursor-pointer"><i class="ri-add-line"></i>
Annotationen hinzufügen</button>
<div class="inputwrapper {{ if eq $model.result.Entry.Annotation "" }}hidden{{ end }}">
<div class="flex flex-row justify-between">
<label for="annotation" class="inputlabel menu-label"><i class="ri-sticky-note-line"></i> Annotationen</label>
<div class="pr-2">
<button class="dm-close-button font-bold input-label">
<i class="ri-close-line"></i>
</button>
</div>
</div>
<textarea name="annotation" id="annotation" class="inputinput" placeholder="" autocomplete="off">{{- $model.result.Entry.Annotation -}}</textarea>
</div>
</div-manager>
</div>
<!-- End Left Column -->
<!-- Right Column -->
<div class="w-[28rem] shrink-0 flex flex-col gap-4">
<!-- Status -->
<div class="inputwrapper">
<label for="type" class="inputlabel"><i class="ri-alarm-warning-line"></i> Status</label>
<select name="type" id="type" autocomplete="off" class="inputselect font-bold">
<option value="Unknown" {{ if eq $model.result.Entry.EditState "Unknown" }}selected{{ end }}>Unbekannt</option>
<option value="ToDo" {{ if eq $model.result.Entry.EditState "ToDo" }}selected{{ end }}>Zu erledigen</option>
<option value="Review" {{ if eq $model.result.Entry.EditState "Review" }}selected{{ end }}>Überprüfen</option>
<option value="Seen" {{ if eq $model.result.Entry.EditState "Seen" }}selected{{ end }}>Autopsiert</option>
<option value="Edited" {{ if eq $model.result.Entry.EditState "Edited" }}selected{{ end }}>Vollständig Erfasst</option>
</select>
</div>
<!-- Bearbeitungsvermerk -->
<div id="edit_comment_section"></div>
<div-manager dm-target="edit_comment_section">
<button class="dm-menu-button text-right w-full cursor-pointer"><i class="ri-add-line"></i>
Bearbeitungsvermerk hinzufügen</button>
<div class="inputwrapper {{ if eq $model.result.Entry.Comment "" }}hidden{{ end }}">
<div class="flex flex-row justify-between">
<label for="edit_comment" class="inputlabel menu-label"><i class="ri-chat-1-line"></i> Bearbeitungsvermerk</label>
<div class="pr-2">
<button class="dm-close-button font-bold input-label">
<i class="ri-close-line"></i>
</button>
</div>
</div>
<textarea name="edit_comment" id="edit_comment" class="inputinput" placeholder="" autocomplete="off">{{- $model.result.Entry.Comment -}}</textarea>
</div>
</div-manager>
<!-- Languages -->
<div class="inputwrapper">
<label for="languages" class="inputlabel"><i class="ri-earth-line"></i> Sprachen</label>
<multi-select-simple id="languages" show-create-button="false" placeholder="Sprachen suchen..."></multi-select-simple>
<script type="module">
const smlang = document.getElementById("languages");
smlang.value = {{ $model.result.Entry.Language }};
</script>
</div>
<!-- Nachweise - Always visible -->
<div class="inputwrapper">
<label for="refs" class="inputlabel"><i class="ri-links-line"></i> Nachweise</label>
<textarea name="refs" id="refs" class="inputinput" placeholder="" autocomplete="off" rows="1">{{- $model.result.Entry.References -}}</textarea>
</div>
<!-- Physical Description -->
<div id="physical"></div>
<div-manager dm-target="physical">
<button class="dm-menu-button text-right w-full cursor-pointer"><i class="ri-add-line"></i>
Physische Beschreibung hinzufügen</button>
<div class="inputwrapper {{ if eq $model.result.Entry.Extent "" }}hidden{{ end }}">
<div class="flex flex-row justify-between">
<label for="extent" class="inputlabel menu-label"><i class="ri-file-text-line"></i> Struktur/Umfang</label>
<div class="pr-2">
<button class="dm-close-button font-bold input-label">
<i class="ri-close-line"></i>
</button>
</div>
</div>
<textarea name="extent" id="extent" class="inputinput" placeholder="" autocomplete="off" rows="1">{{- $model.result.Entry.Extent -}}</textarea>
</div>
<div class="mt-3 inputwrapper {{ if eq $model.result.Entry.Dimensions "" }}hidden{{ end }}">
<div class="flex flex-row justify-between">
<label for="dimensions" class="inputlabel menu-label"><i class="ri-ruler-line"></i> Maße</label>
<div class="pr-2">
<button class="dm-close-button font-bold input-label">
<i class="ri-close-line"></i>
</button>
</div>
</div>
<textarea name="dimensions" id="dimensions" class="inputinput" placeholder="" autocomplete="off" rows="1">{{- $model.result.Entry.Dimensions -}}</textarea>
</div>
</div-manager>
<!-- Exemplare -->
<div class="mt-8">
<div class="flex items-center gap-2 text-lg font-bold text-gray-700">
<i class="ri-archive-line"></i>
<span>Exemplare</span>
</div>
<hr class="border-stone-200 mt-2" />
<items-editor class="block mt-4">
<div class="items-list flex flex-col gap-3">
{{- range $i, $item := $model.result.Items -}}
<div class="items-row border border-stone-200 rounded-xs bg-stone-50 flex flex-col gap-3 shadow-sm" data-item-id="{{ $item.Id }}">
<input type="hidden" name="items_id[]" value="{{ $item.Id }}" />
<div class="items-summary flex flex-col gap-2">
<div class="flex items-center justify-between bg-stone-100 px-3 py-2 rounded-xs">
<div class="text-base font-bold" data-summary-container>
<span data-summary-field="owner" data-summary-hide-empty="true">{{ $item.Owner }}</span>
</div>
<div class="px-2 py-0.5 rounded-full bg-stone-200 text-sm font-bold" data-summary-container>
<span data-summary-field="identifier" data-summary-hide-empty="true">{{ $item.Identifier }}</span>
</div>
</div>
<div class="flex flex-col lg:flex-row lg:items-start lg:justify-between gap-4 px-3
py-1">
<div class="text-sm text-gray-700">
<div class="flex flex-col gap-1 text-base">
<div class="grid grid-cols-[6rem_1fr] gap-x-4 items-baseline" data-summary-container>
<span class="text-xs uppercase tracking-wide text-gray-500">Standort</span>
<span class="items-summary-value" data-summary-field="location" data-summary-hide-empty="true">{{ $item.Location }}</span>
</div>
<div class="grid grid-cols-[6rem_1fr] gap-x-4 items-baseline" data-summary-container>
<span class="text-xs uppercase tracking-wide text-gray-500">Vorhanden als</span>
<span class="items-summary-value" data-summary-field="media" data-summary-hide-empty="true">
{{- range $j, $m := $item.Media -}}{{- if $j -}}, {{- end -}}{{- $m -}}{{- end -}}
</span>
</div>
<div class="grid grid-cols-[6rem_1fr] gap-x-4 items-baseline" data-summary-container>
<span class="text-xs uppercase tracking-wide text-gray-500">URL</span>
<span class="items-summary-value" data-summary-field="uri" data-summary-hide-empty="true">
<a class="no-underline" data-summary-link href="{{ $item.Uri }}" target="_blank" rel="noopener">{{ $item.Uri }}</a>
</span>
</div>
<div class="grid grid-cols-[6rem_1fr] gap-x-4 items-baseline" data-summary-container>
<span class="text-xs uppercase tracking-wide text-gray-500">Annotationen</span>
<span class="items-summary-value" data-summary-field="annotation" data-summary-hide-empty="true">{{ $item.Annotation }}</span>
</div>
</div>
</div>
</div>
<div class="flex justify-end mt-2 px-3">
<div class="flex flex-row gap-3 text-lg">
<button type="button" class="items-edit-button text-gray-700 hover:text-gray-900" aria-label="Bearbeiten">
<i class="ri-edit-line"></i>
</button>
<button type="button" class="items-remove-button text-red-700 hover:text-red-900" aria-label="Entfernen">
<i class="ri-delete-bin-line"></i>
</button>
</div>
</div>
</div>
<div class="items-edit-panel hidden">
<div class="flex flex-col gap-3 mt-3">
<div class="inputwrapper">
<label class="inputlabel" data-field-label="owner">Besitzer</label>
<input class="inputinput" data-field="owner" name="items_owner[]" autocomplete="off" value="{{ $item.Owner }}" />
</div>
<div class="inputwrapper">
<label class="inputlabel" data-field-label="identifier">Signatur</label>
<input class="inputinput" data-field="identifier" name="items_identifier[]" autocomplete="off" value="{{ $item.Identifier }}" />
</div>
<div class="inputwrapper">
<label class="inputlabel" data-field-label="location">Standort</label>
<input class="inputinput" data-field="location" name="items_location[]" autocomplete="off" value="{{ $item.Location }}" />
</div>
<div class="inputwrapper">
<label class="inputlabel" data-field-label="media">Vorhanden als</label>
<select class="inputselect" data-field="media" name="items_media[]" autocomplete="off">
<option value=""></option>
{{- range $t := $model.item_types -}}
<option value="{{- $t -}}" {{ if Contains $item.Media $t }}selected{{ end }}>{{- $t -}}</option>
{{- end -}}
</select>
</div>
<div class="inputwrapper">
<label class="inputlabel" data-field-label="annotation">Annotationen</label>
<textarea class="inputtextarea min-h-[8rem]" data-field="annotation" name="items_annotation[]" autocomplete="off">{{- $item.Annotation -}}</textarea>
</div>
<div class="inputwrapper">
<label class="inputlabel" data-field-label="uri">URI</label>
<input class="inputinput" data-field="uri" name="items_uri[]" autocomplete="off" value="{{ $item.Uri }}" />
</div>
</div>
<div class="flex justify-end gap-3 mt-3 px-3 py-2">
<button type="button" class="items-close-button resetbutton w-auto px-2 py-1 text-base">
<i class="ri-check-line mr-2"></i> Fertig
</button>
<button type="button" class="items-remove-button resetbutton w-auto px-2 py-1 text-base text-red-700 hover:text-red-900">
<i class="ri-delete-bin-line mr-2"></i> Entfernen
</button>
</div>
</div>
</div>
{{- end -}}
</div>
<div class="flex justify-end mt-2">
<button type="button" class="items-add-button text-gray-700 hover:text-gray-900">
<i class="ri-add-line"></i> Exemplar hinzufügen
</button>
</div>
<template class="items-template">
<div class="items-row border border-stone-200 rounded-xs bg-stone-50 p-4 flex flex-col gap-3 shadow-sm">
<input type="hidden" name="items_id[]" value="" />
<div class="items-summary hidden flex flex-col gap-2">
<div class="flex items-center justify-between bg-stone-100 px-3 py-2 rounded-xs">
<div class="text-base font-bold" data-summary-container>
<span data-summary-field="owner" data-summary-hide-empty="true">—</span>
</div>
<div class="px-2 py-0.5 rounded-full bg-stone-200 text-sm font-bold" data-summary-container>
<span data-summary-field="identifier" data-summary-hide-empty="true">—</span>
</div>
</div>
<div class="flex flex-col lg:flex-row lg:items-start lg:justify-between gap-4">
<div class="text-sm text-gray-700">
<div class="flex flex-col gap-1 text-base">
<div class="grid grid-cols-[6rem_1fr] gap-x-4 items-baseline" data-summary-container>
<span class="text-xs uppercase tracking-wide text-gray-500">Standort</span>
<span class="items-summary-value" data-summary-field="location" data-summary-hide-empty="true">—</span>
</div>
<div class="grid grid-cols-[6rem_1fr] gap-x-4 items-baseline" data-summary-container>
<span class="text-xs uppercase tracking-wide text-gray-500">Vorh. als</span>
<span class="items-summary-value" data-summary-field="media" data-summary-hide-empty="true">—</span>
</div>
<div class="grid grid-cols-[6rem_1fr] gap-x-4 items-baseline" data-summary-container>
<span class="text-xs uppercase tracking-wide text-gray-500">URL</span>
<span class="items-summary-value" data-summary-field="uri" data-summary-hide-empty="true">
<a class="no-underline" data-summary-link href="#" target="_blank" rel="noopener">—</a>
</span>
</div>
<div class="grid grid-cols-[6rem_1fr] gap-x-4 items-baseline" data-summary-container>
<span class="text-xs uppercase tracking-wide text-gray-500">Annotationen</span>
<span class="items-summary-value" data-summary-field="annotation" data-summary-hide-empty="true">—</span>
</div>
</div>
</div>
</div>
<div class="flex justify-end mt-2 px-3 py-1">
<div class="flex flex-row gap-3 text-lg">
<button type="button" class="items-edit-button text-gray-700 hover:text-gray-900" aria-label="Bearbeiten">
<i class="ri-edit-line"></i>
</button>
<button type="button" class="items-remove-button text-red-700 hover:text-red-900" aria-label="Entfernen">
<i class="ri-delete-bin-line"></i>
</button>
</div>
</div>
</div>
<div class="items-edit-panel">
<div class="flex flex-col gap-3 mt-3">
<div class="inputwrapper">
<label class="inputlabel" data-field-label="owner">Besitzer</label>
<input class="inputinput" data-field="owner" name="items_owner[]" autocomplete="off" value="" />
</div>
<div class="inputwrapper">
<label class="inputlabel" data-field-label="identifier">Signatur</label>
<input class="inputinput" data-field="identifier" name="items_identifier[]" autocomplete="off" value="" />
</div>
<div class="inputwrapper">
<label class="inputlabel" data-field-label="location">Standort</label>
<input class="inputinput" data-field="location" name="items_location[]" autocomplete="off" value="" />
</div>
<div class="inputwrapper">
<label class="inputlabel" data-field-label="media">Vorhanden als</label>
<select class="inputselect" data-field="media" name="items_media[]" autocomplete="off">
<option value=""></option>
{{- range $t := $model.item_types -}}
<option value="{{- $t -}}">{{- $t -}}</option>
{{- end -}}
</select>
</div>
<div class="inputwrapper">
<label class="inputlabel" data-field-label="annotation">Annotationen</label>
<textarea class="inputtextarea min-h-[8rem]" data-field="annotation" name="items_annotation[]" autocomplete="off"></textarea>
</div>
<div class="inputwrapper">
<label class="inputlabel" data-field-label="uri">URI</label>
<input class="inputinput" data-field="uri" name="items_uri[]" autocomplete="off" value="" />
</div>
</div>
<div class="flex justify-end gap-3 mt-3 px-3 py-1">
<button type="button" class="items-close-button resetbutton w-auto px-2 py-1 text-base">
<i class="ri-check-line mr-2"></i> Fertig
</button>
<button type="button" class="items-remove-button resetbutton w-auto px-2 py-1 text-base text-red-700 hover:text-red-900">
<i class="ri-delete-bin-line mr-2"></i> Entfernen
</button>
</div>
</div>
</div>
</template>
</items-editor>
</div>
</div>
<!-- End Right Column -->
</form>
</div>

View File

@@ -5,6 +5,7 @@
Places []*dbmodels.Place
Series []*dbmodels.Series
Contents []*dbmodels.Content
Items []*dbmodels.Item
Agents map[string]*dbmodels.Agent // <- Key is agent id
EntriesSeries map[string]*dbmodels.REntriesSeries // <- Key is series id
EntriesAgents []*dbmodels.REntriesAgents

View File

@@ -27,6 +27,7 @@ export class DivManager extends HTMLElement {
this._target = null;
this._button = null;
this._menu = null;
this._originalButtonText = null;
}
connectedCallback() {
@@ -41,6 +42,10 @@ export class DivManager extends HTMLElement {
const label = node.querySelector("label");
return label ? label.innerHTML : node.hasAttribute(DM_TITLE_ATTRIBUTE) ? node.getAttribute(DM_TITLE_ATTRIBUTE) : "";
},
nameText: () => {
const label = node.querySelector("label");
return label ? label.textContent.trim() : node.hasAttribute(DM_TITLE_ATTRIBUTE) ? node.getAttribute(DM_TITLE_ATTRIBUTE) : "";
},
};
});
@@ -54,6 +59,9 @@ export class DivManager extends HTMLElement {
console.error("DivManagerMenu needs a button element.");
return;
}
if (!this._originalButtonText) {
this._originalButtonText = this._button.innerHTML;
}
for (const child of this._cildren) {
this.removeChild(child.node);
@@ -70,56 +78,113 @@ export class DivManager extends HTMLElement {
});
}
this.renderMenu();
this.renderIntoTarget();
this.refresh();
this._observer = new MutationObserver(() => {
this.refresh();
});
this._cildren.forEach((child) => {
this._observer.observe(child.node, { attributes: true, attributeFilter: ["class"] });
});
}
disconnectedCallback() {
if (this._observer) {
this._observer.disconnect();
}
document.removeEventListener("click", this.boundHandleClickOutside);
}
refresh() {
this.renderButton();
this.renderMenu();
this.updateTargetVisibility();
}
_toggleMenu(event) {
event.preventDefault();
event.stopPropagation();
if (!this._menu) {
this._menu = this.querySelector(`.${DM_MENU_CLASS}`);
}
if (!this._menu) {
console.error("DivManagerMenu: Menu not found.");
const hiddenChildren = this._cildren.filter((c) => c.hidden());
if (hiddenChildren.length === 1) {
const index = this._cildren.indexOf(hiddenChildren[0]);
this.showDiv(event, index);
return;
}
if (hiddenChildren.length === 0) {
this.hideMenu();
return;
}
this.renderMenu();
if (this._menu.classList.contains(TAILWIND_HIDDEN_CLASS)) {
this._menu.classList.remove(TAILWIND_HIDDEN_CLASS);
document.addEventListener("click", this.handleClickOutside);
document.addEventListener("click", this.boundHandleClickOutside);
} else {
this._menu.classList.add(TAILWIND_HIDDEN_CLASS);
document.removeEventListener("click", this.handleClickOutside);
document.removeEventListener("click", this.boundHandleClickOutside);
}
}
handleClickOutside(event) {
if (!this._menu) return;
if (!this._menu.contains(event.target) && !this._button.contains(event.target)) {
this._menu.classList.add(TAILWIND_HIDDEN_CLASS);
this.hideMenu();
}
}
hideMenu() {
if (!this._menu) return;
this._menu.classList.add(TAILWIND_HIDDEN_CLASS);
document.removeEventListener("click", this.boundHandleClickOutside);
}
renderButton() {
if (!this._button) {
return;
}
for (const child of this._cildren) {
if (child.hidden()) {
if (this._button.parentElement !== this) {
this._button.classList.remove(TAILWIND_HIDDEN_CLASS);
this.appendChild(this._button);
}
return;
}
// Store original button text if not already stored (do this first)
if (!this._originalButtonText) {
this._originalButtonText = this._button.innerHTML;
}
this._button.classList.add(TAILWIND_HIDDEN_CLASS);
this.removeChild(this._button);
// Check if there are any hidden children
const hiddenChildren = this._cildren.filter((c) => c.hidden());
if (hiddenChildren.length === 0) {
// No hidden children, hide and remove the button completely
this._button.classList.add(TAILWIND_HIDDEN_CLASS);
if (this._button.parentElement) {
this._button.parentElement.removeChild(this._button);
}
this._menu = null;
this.hideMenu();
return;
}
// There are hidden children, ensure button is in the DOM and visible
if (!this._button.parentElement) {
this.appendChild(this._button);
}
this._button.classList.remove(TAILWIND_HIDDEN_CLASS);
// Update button text based on number of hidden children
if (hiddenChildren.length === 1) {
// Only one option left - show its name
const icon = this._button.querySelector("i");
const iconHTML = icon ? icon.outerHTML : '<i class="ri-add-line"></i>';
this._button.innerHTML = `${iconHTML}\n${hiddenChildren[0].nameText()} hinzufügen`;
this._menu = null;
this.hideMenu();
} else {
// Multiple options - restore original text
this._button.innerHTML = this._originalButtonText;
this._menu = null;
}
}
hideDiv(event, node) {
@@ -139,9 +204,8 @@ export class DivManager extends HTMLElement {
return;
}
if (!child.hidden()) {
child.node.classList.add(TAILWIND_HIDDEN_CLASS);
}
// Always ensure the hidden class is added
child.node.classList.add(TAILWIND_HIDDEN_CLASS);
this._target.removeChild(child.node);
// INFO: the order of these matter, dont fuck it up
@@ -161,37 +225,42 @@ export class DivManager extends HTMLElement {
}
const child = this._cildren[index];
if (child.hidden()) {
child.node.classList.remove(TAILWIND_HIDDEN_CLASS);
}
// Always ensure the hidden class is removed
child.node.classList.remove(TAILWIND_HIDDEN_CLASS);
this._target.appendChild(child.node);
this.insertChildInOrder(child);
// INFO: the order of these matter, dont fuck it up
this.renderMenu();
this.renderButton();
this.updateTargetVisibility();
}
renderMenu() {
if (!this._menu) {
this._button.innerHTML += `<div class="${DM_MENU_CLASS} absolute hidden"></div>`;
const hiddenChildren = this._cildren.filter((c) => c.hidden());
if (hiddenChildren.length <= 1) {
this.hideMenu();
return;
}
if (!this._menu || !this._button.contains(this._menu)) {
this._button.insertAdjacentHTML("beforeend", `<div class="${DM_MENU_CLASS} absolute hidden"></div>`);
this._menu = this._button.querySelector(`.${DM_MENU_CLASS}`);
}
this._menu.innerHTML = `${this._cildren
this._menu.innerHTML = `${hiddenChildren
.map((c, index) => {
if (!c.hidden()) return "";
return `
<button type="button" class="${DM_ITEM_CLASS}" dm-itemno="${index}">
<button type="button" class="${DM_ITEM_CLASS}" dm-itemno="${this._cildren.indexOf(c)}">
${c.name()}
</button>`;
})
.join("")}`;
this._menu = this.querySelector(`.${DM_MENU_CLASS}`);
const buttons = this._menu.querySelectorAll(`.${DM_ITEM_CLASS}`);
buttons.forEach((button) => {
button.addEventListener("click", (event) => {
this.showDiv(event, parseInt(button.getAttribute("dm-itemno")));
this._toggleMenu(event);
this.hideMenu();
this.renderButton();
});
});
}
@@ -199,8 +268,34 @@ export class DivManager extends HTMLElement {
renderIntoTarget() {
this._cildren.forEach((child) => {
if (!child.hidden()) {
this._target.appendChild(child.node);
this.insertChildInOrder(child);
}
});
this.updateTargetVisibility();
}
insertChildInOrder(child) {
const currentIndex = this._cildren.indexOf(child);
const nextVisibleSibling = this._cildren
.slice(currentIndex + 1)
.map((c) => c.node)
.find((node) => this._target.contains(node));
if (nextVisibleSibling) {
this._target.insertBefore(child.node, nextVisibleSibling);
} else {
this._target.appendChild(child.node);
}
}
updateTargetVisibility() {
if (!this._target || this._target === this) {
return;
}
const hasVisibleChild = Array.from(this._target.children).some(
(node) => !node.classList.contains(TAILWIND_HIDDEN_CLASS),
);
this._target.classList.toggle(TAILWIND_HIDDEN_CLASS, !hasVisibleChild);
}
}

View File

@@ -27,7 +27,7 @@
.dbform .inputwrapper .inputselect {
@apply mt-1 block w-full rounded-md focus:border-none focus:outline-none
disabled:opacity-50;
disabled:opacity-50 py-1 px-3;
}
.dbform .submitbutton {
@apply w-full inline-flex justify-center py-2 px-4 border border-transparent rounded-md shadow-sm text-sm font-medium text-white bg-slate-700 hover:bg-slate-800 cursor-pointer focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-slate-500 active:bg-slate-900 transition-all duration-75;
@@ -176,6 +176,7 @@
/* --- MultiSelectSimple Component Base Styles (using @apply) --- */
.mss-component-wrapper {
/* 'relative' is set inline for positioning dropdown */
@apply px-3 py-1;
}
.mss-selected-items-container {

View File

@@ -14,6 +14,7 @@ import { MultiSelectRole } from "./multi-select-role.js";
import { MultiSelectSimple } from "./multi-select-simple.js";
import { ResetButton } from "./reset-button.js";
import { DivManager } from "./div-menu.js";
import { ItemsEditor } from "./items-editor.js";
const FILTER_LIST_ELEMENT = "filter-list";
const SCROLL_BUTTON_ELEMENT = "scroll-button";
@@ -28,6 +29,7 @@ const MULTI_SELECT_ROLE_ELEMENT = "multi-select-places";
const MULTI_SELECT_SIMPLE_ELEMENT = "multi-select-simple";
const RESET_BUTTON_ELEMENT = "reset-button";
const DIV_MANAGER_ELEMENT = "div-manager";
const ITEMS_EDITOR_ELEMENT = "items-editor";
customElements.define(INT_LINK_ELEMENT, IntLink);
customElements.define(ABBREV_TOOLTIPS_ELEMENT, AbbreviationTooltips);
@@ -42,6 +44,7 @@ customElements.define(MULTI_SELECT_ROLE_ELEMENT, MultiSelectRole);
customElements.define(MULTI_SELECT_SIMPLE_ELEMENT, MultiSelectSimple);
customElements.define(RESET_BUTTON_ELEMENT, ResetButton);
customElements.define(DIV_MANAGER_ELEMENT, DivManager);
customElements.define(ITEMS_EDITOR_ELEMENT, ItemsEditor);
function PathPlusQuery() {
const path = window.location.pathname;
@@ -277,4 +280,4 @@ window.PathPlusQuery = PathPlusQuery;
window.HookupRBChange = HookupRBChange;
window.FormLoad = FormLoad;
export { FilterList, ScrollButton, AbbreviationTooltips, MultiSelectSimple, MultiSelectRole, ToolTip, PopupImage, TabList, FilterPill, ImageReel, IntLink };
export { FilterList, ScrollButton, AbbreviationTooltips, MultiSelectSimple, MultiSelectRole, ToolTip, PopupImage, TabList, FilterPill, ImageReel, IntLink, ItemsEditor };