.ics Download und PDF Layout korrigiert
This commit is contained in:
1 parent
dc20d7ec5a
commit
cc2e85c111
11 files changed
+424
-73
No files matched your search
@@ -1,6 +1,8 @@
|
||||
package web
|
||||
|
||||
import (
|
||||
"io"
|
||||
"net/http"
|
||||
"strings"
|
||||
"testing"
|
||||
"time"
|
||||
@@ -62,3 +64,47 @@ func TestDispatchEmailBodyMentionsBothAttachments(t *testing.T) {
|
||||
t.Fatalf("draft body must not mention attachments:\n%s", draft)
|
||||
}
|
||||
}
|
||||
|
||||
func TestDispatchCalendarDownload(t *testing.T) {
|
||||
ts, _ := newTestServer(t)
|
||||
client := newClient(t)
|
||||
login(t, client, ts.URL, "editor", "editor123")
|
||||
|
||||
resp, err := client.Get(ts.URL + "/dispatch/calendar?person=p-markus&start=2026-03-01&end=2026-03-31")
|
||||
if err != nil {
|
||||
t.Fatalf("GET calendar: %v", err)
|
||||
}
|
||||
defer resp.Body.Close()
|
||||
if resp.StatusCode != http.StatusOK {
|
||||
t.Fatalf("calendar download = %d, want 200", resp.StatusCode)
|
||||
}
|
||||
if got := resp.Header.Get("Content-Type"); !strings.HasPrefix(got, "text/calendar") {
|
||||
t.Fatalf("Content-Type = %q", got)
|
||||
}
|
||||
if got := resp.Header.Get("Content-Disposition"); !strings.Contains(got, ".ics") {
|
||||
t.Fatalf("Content-Disposition = %q", got)
|
||||
}
|
||||
body, err := io.ReadAll(resp.Body)
|
||||
if err != nil {
|
||||
t.Fatalf("read calendar: %v", err)
|
||||
}
|
||||
for _, want := range []string{"BEGIN:VCALENDAR", "VERSION:2.0", "END:VCALENDAR"} {
|
||||
if !strings.Contains(string(body), want) {
|
||||
t.Fatalf("calendar misses %q:\n%s", want, body)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func TestDispatchCalendarRequiresEditor(t *testing.T) {
|
||||
ts, _ := newTestServer(t)
|
||||
reader := newClient(t)
|
||||
login(t, reader, ts.URL, "reader", "reader123")
|
||||
resp, err := reader.Get(ts.URL + "/dispatch/calendar?person=p-markus&start=2026-03-01&end=2026-03-31")
|
||||
if err != nil {
|
||||
t.Fatalf("GET calendar: %v", err)
|
||||
}
|
||||
defer resp.Body.Close()
|
||||
if resp.StatusCode != http.StatusForbidden {
|
||||
t.Fatalf("reader calendar download = %d, want 403", resp.StatusCode)
|
||||
}
|
||||
}
|
||||
@@ -68,6 +68,7 @@ type dispatchPersonView struct {
|
||||
AssignmentText string
|
||||
MailText string
|
||||
Mailto string
|
||||
CalendarURL string
|
||||
}
|
||||
|
||||
type dispatchPageData struct {
|
||||
@@ -262,6 +263,12 @@ func dispatchCalendarEvents(assignments []dispatchAssignmentView) []domain.Calen
|
||||
return events
|
||||
}
|
||||
|
||||
// dispatchCalendarURL builds the download link for one recipient's calendar.
|
||||
func dispatchCalendarURL(personID string, rng domain.DayRange) string {
|
||||
return "/dispatch/calendar?person=" + url.QueryEscape(personID) +
|
||||
"&start=" + domain.Key(rng.Start) + "&end=" + domain.Key(rng.End)
|
||||
}
|
||||
|
||||
func (s *Server) dispatchPeople(ctx context.Context, tenantID string, rows []domain.DayPlanRow) ([]dispatchPersonView, error) {
|
||||
people, err := s.store.People(ctx, tenantID)
|
||||
if err != nil {
|
||||
@@ -325,6 +332,7 @@ func (s *Server) handleDispatch(w http.ResponseWriter, r *http.Request, user *st
|
||||
for index := range people {
|
||||
people[index].AssignmentText = emailAssignmentTable(people[index].Assignments)
|
||||
people[index].MailText = dispatchEmailBody(intro, greeting, rng, people[index].Assignments, false)
|
||||
people[index].CalendarURL = dispatchCalendarURL(people[index].Person.ID, rng)
|
||||
if email := strings.TrimSpace(people[index].Person.Email); email != "" {
|
||||
people[index].Mailto = dispatchMailto(email, subject, people[index].MailText)
|
||||
}
|
||||
@@ -379,6 +387,76 @@ func (s *Server) handleDispatch(w http.ResponseWriter, r *http.Request, user *st
|
||||
s.renderPage(w, r, "dispatch", data)
|
||||
}
|
||||
|
||||
// handleDispatchCalendar downloads one recipient's calendar file. Like the
|
||||
// e-mail attachment it only contains that person's own assignments.
|
||||
func (s *Server) handleDispatchCalendar(w http.ResponseWriter, r *http.Request, user *store.User, session *store.Session, tenant *store.Tenant) {
|
||||
if tenant == nil {
|
||||
s.redirect(w, r, "/plan")
|
||||
return
|
||||
}
|
||||
rng := s.rangeFromRequest(r)
|
||||
personID := strings.TrimSpace(r.URL.Query().Get("person"))
|
||||
if personID == "" {
|
||||
s.setFlash(w, "Für den Kalender-Download fehlt die Person.", "error")
|
||||
s.redirect(w, r, "/dispatch?start="+domain.Key(rng.Start)+"&end="+domain.Key(rng.End))
|
||||
return
|
||||
}
|
||||
people, err := s.store.People(r.Context(), tenant.ID)
|
||||
if err != nil {
|
||||
s.renderError(w, r, http.StatusInternalServerError, "Versendung", err.Error())
|
||||
return
|
||||
}
|
||||
var person domain.Person
|
||||
found := false
|
||||
for _, candidate := range people {
|
||||
if candidate.ID == personID {
|
||||
person = candidate
|
||||
found = true
|
||||
break
|
||||
}
|
||||
}
|
||||
if !found {
|
||||
s.renderError(w, r, http.StatusNotFound, "Versendung", "Die Person wurde nicht gefunden.")
|
||||
return
|
||||
}
|
||||
rows, err := s.store.PlanRows(r.Context(), tenant.ID, rng)
|
||||
if err != nil {
|
||||
s.renderError(w, r, http.StatusInternalServerError, "Versendung", err.Error())
|
||||
return
|
||||
}
|
||||
assignments := dispatchAssignments(rows, person.ID)
|
||||
calendar := domain.CalendarICS("Gottesdienstplan "+tenant.Name, dispatchCalendarEvents(assignments))
|
||||
prefix := tenant.Slug
|
||||
if component := dispatchFilenameComponent(person.LastName); component != "" {
|
||||
prefix += "-" + component
|
||||
}
|
||||
name := domain.CalendarFilename(prefix, domain.Key(rng.Start))
|
||||
w.Header().Set("Content-Type", "text/calendar; charset=utf-8")
|
||||
w.Header().Set("Content-Disposition", fmt.Sprintf(`attachment; filename="%s"`, name))
|
||||
w.Header().Set("Cache-Control", "no-store")
|
||||
w.Header().Set("Content-Length", strconv.Itoa(len(calendar)))
|
||||
_, _ = w.Write([]byte(calendar))
|
||||
}
|
||||
|
||||
// dispatchFilenameComponent keeps download names ASCII and filesystem-safe.
|
||||
func dispatchFilenameComponent(value string) string {
|
||||
replacer := strings.NewReplacer(
|
||||
"ä", "ae", "ö", "oe", "ü", "ue",
|
||||
"Ä", "Ae", "Ö", "Oe", "Ü", "Ue", "ß", "ss",
|
||||
)
|
||||
value = replacer.Replace(strings.TrimSpace(value))
|
||||
var builder strings.Builder
|
||||
for _, r := range value {
|
||||
switch {
|
||||
case r >= 'a' && r <= 'z', r >= 'A' && r <= 'Z', r >= '0' && r <= '9', r == '-', r == '_':
|
||||
builder.WriteRune(r)
|
||||
case r == ' ' || r == '.' || r == ',':
|
||||
builder.WriteRune('-')
|
||||
}
|
||||
}
|
||||
return strings.Trim(builder.String(), "-")
|
||||
}
|
||||
|
||||
func (s *Server) dispatchFormFromRequest(r *http.Request, people []domain.Person) dispatchForm {
|
||||
rng := formRange(r)
|
||||
form := dispatchForm{
|
||||
|
||||
@@ -32,6 +32,9 @@ func TestDispatchPageAndPreferences(t *testing.T) {
|
||||
if !strings.Contains(body, "Versendung") {
|
||||
t.Fatal("dispatch page is missing its heading")
|
||||
}
|
||||
if !strings.Contains(body, "/dispatch/calendar?person=") {
|
||||
t.Fatal("dispatch page is missing the calendar download links")
|
||||
}
|
||||
csrf := extractCSRF(t, body)
|
||||
|
||||
ctx := context.Background()
|
||||
|
||||
@@ -404,6 +404,7 @@ var iconPaths = map[string]string{
|
||||
"send": `<path d="M22 2L11 13M22 2l-7 20-4-9-9-4z"/>`,
|
||||
"mail": `<rect x="2" y="4" width="20" height="16" rx="2"/><path d="M3 6l9 7 9-7"/>`,
|
||||
"copy": `<rect x="9" y="9" width="12" height="12" rx="2"/><path d="M5 15H4a2 2 0 0 1-2-2V4a2 2 0 0 1 2-2h9a2 2 0 0 1 2 2v1"/>`,
|
||||
"download": `<path d="M12 3v12M7 10l5 5 5-5"/><path d="M5 21h14"/>`,
|
||||
"plus": `<path d="M12 5v14M5 12h14"/>`,
|
||||
"left": `<path d="M15 18l-6-6 6-6"/>`,
|
||||
"right": `<path d="M9 18l6-6-6-6"/>`,
|
||||
|
||||
@@ -183,6 +183,7 @@ func (s *Server) Handler() http.Handler {
|
||||
mux.HandleFunc("GET /pdf", s.auth(s.handlePDF))
|
||||
|
||||
mux.HandleFunc("GET /dispatch", s.editor(s.handleDispatch))
|
||||
mux.HandleFunc("GET /dispatch/calendar", s.editor(s.handleDispatchCalendar))
|
||||
mux.HandleFunc("POST /dispatch/save", s.editor(s.handleDispatchSave))
|
||||
mux.HandleFunc("POST /dispatch/send", s.editor(s.handleDispatchSend))
|
||||
mux.HandleFunc("POST /dispatch/print", s.editor(s.handleDispatchPrint))
|
||||
|
||||
@@ -108,7 +108,7 @@
|
||||
<th>Versandweg</th>
|
||||
<th>Liste</th>
|
||||
<th>Vorblatt</th>
|
||||
<th>Text</th>
|
||||
<th>Text / Kalender</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
@@ -168,6 +168,7 @@
|
||||
{{if and (not $.Data.SMTPConfigured) $person.Email}}
|
||||
<a class="icon-button" href="{{.Mailto}}" data-mailto-link data-mailto-email="{{$person.Email}}" data-mail-assignments="{{.AssignmentText}}" title="Entwurf im eigenen E-Mail-Programm öffnen" aria-label="E-Mail an {{$person.FullName}} im E-Mail-Programm öffnen">{{icon "mail"}}</a>
|
||||
{{end}}
|
||||
<a class="icon-button" href="{{.CalendarURL}}" download title="Kalenderdatei (.ics) für {{$person.FullName}} herunterladen" aria-label="Kalenderdatei für {{$person.FullName}} herunterladen">{{icon "download"}}</a>
|
||||
</td>
|
||||
</tr>
|
||||
{{else}}
|
||||
@@ -176,7 +177,7 @@
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
<p class="table-note">E-Mail-Empfänger erhalten den Plan als PDF-Anhang und zusätzlich eine Kalenderdatei (.ics) mit ihren eigenen Einsätzen zum Import in gängige Kalender-Apps. Personen ohne Adresse oder mit der Auswahl „Ausdruck“ werden in einem sammelbaren PDF zusammengefasst – nacheinander mit Vorblatt und gewählter Liste. In der Spalte „Text“ kopiert das erste Symbol das persönliche Anschreiben; ohne SMTP öffnet das zweite Symbol einen fertigen Entwurf im eigenen E-Mail-Programm.{{if not .Data.CanManageSecrets}} Empfängeradressen und SMTP-Zugangsdaten sind für dieses Konto gesperrt und werden von Redakteuren verwaltet.{{end}}</p>
|
||||
<p class="table-note">E-Mail-Empfänger erhalten den Plan als PDF-Anhang und zusätzlich eine Kalenderdatei (.ics) mit ihren eigenen Einsätzen zum Import in gängige Kalender-Apps. Über das Kalender-Symbol in der Spalte „Text / Kalender“ lässt sich die persönliche .ics-Datei auch einzeln herunterladen. Personen ohne Adresse oder mit der Auswahl „Ausdruck“ werden in einem sammelbaren PDF zusammengefasst – nacheinander mit Vorblatt und gewählter Liste. In der Spalte „Text“ kopiert das erste Symbol das persönliche Anschreiben; ohne SMTP öffnet das zweite Symbol einen fertigen Entwurf im eigenen E-Mail-Programm.{{if not .Data.CanManageSecrets}} Empfängeradressen und SMTP-Zugangsdaten sind für dieses Konto gesperrt und werden von Redakteuren verwaltet.{{end}}</p>
|
||||
<div class="card-foot dispatch-actions">
|
||||
<button class="btn btn-secondary" type="submit">{{icon "check"}} Auswahl speichern</button>
|
||||
{{if .Data.SMTPConfigured}}
|
||||
|
||||
Reference in new issue
Block a user