diff --git a/common/locales/de.json b/common/locales/de.json
index 22fdfeeebe..2f2afc70a8 100644
--- a/common/locales/de.json
+++ b/common/locales/de.json
@@ -1,8 +1,8 @@
{
"components": {
- "story": {
- "storyDay": {
- "noStory": "Die Blöcke an diesem Tag enthalten keinen roten Faden."
+ "summary": {
+ "summaryDay": {
+ "noContent": "Die Blöcke an diesem Tag enthalten keine '{contentType}' Inhalte."
}
}
},
@@ -244,6 +244,9 @@
"shortScheduleEntryDescription": "Tag\u202f{dayNumber} {startTime}"
},
"print": {
+ "config": {
+ "periods": "Lagerabschnitt(e)"
+ },
"cover": {
"title": "Titelseite"
},
@@ -259,8 +262,13 @@
"program": {
"title": "Detailprogramm"
},
- "story": {
- "title": "Roter Faden"
+ "summary": {
+ "safetyConsiderations": {
+ "title": "Sicherheitsüberlegungen"
+ },
+ "storycontext": {
+ "title": "Roter Faden"
+ }
},
"toc": {
"title": "Inhaltsverzeichnis"
diff --git a/common/locales/en.json b/common/locales/en.json
index 302b326ea9..2f33b5a304 100644
--- a/common/locales/en.json
+++ b/common/locales/en.json
@@ -1,8 +1,8 @@
{
"components": {
- "story": {
- "storyDay": {
- "noStory": "The activities on this day do not contain any story content."
+ "summary": {
+ "summaryDay": {
+ "noContent": "The activities on this day do not contain any {contentType} content."
}
}
},
@@ -251,6 +251,9 @@
"shortScheduleEntryDescription": "day {dayNumber} {startTime}"
},
"print": {
+ "config": {
+ "periods": "Period(s)"
+ },
"cover": {
"title": "Cover page"
},
@@ -266,8 +269,13 @@
"program": {
"title": "Program"
},
- "story": {
- "title": "Storyline"
+ "summary": {
+ "safetyConsiderations": {
+ "title": "Safety considerations"
+ },
+ "storycontext": {
+ "title": "Story"
+ }
},
"toc": {
"title": "Table of contents"
diff --git a/common/locales/fr.json b/common/locales/fr.json
index 803341e7bd..893e313ad2 100644
--- a/common/locales/fr.json
+++ b/common/locales/fr.json
@@ -1,8 +1,8 @@
{
"components": {
- "story": {
- "storyDay": {
- "noStory": "Aucun file rouge trouvé ce jour-là..."
+ "summary": {
+ "summaryDay": {
+ "noContent": "Aucun {contentType} trouvé ce jour-là..."
}
}
},
@@ -231,6 +231,9 @@
}
},
"print": {
+ "config": {
+ "periods": "Période(s) du camp"
+ },
"cover": {
"title": "Page de couverture"
},
@@ -246,8 +249,13 @@
"program": {
"title": "Programme"
},
- "story": {
- "title": "Histoire"
+ "summary": {
+ "safetyConsiderations": {
+ "title": "Considérations de sécurité"
+ },
+ "storycontext": {
+ "title": "Histoire"
+ }
},
"toc": {
"title": "Table des matières"
diff --git a/common/locales/it.json b/common/locales/it.json
index 799d9086dc..ea6c611789 100644
--- a/common/locales/it.json
+++ b/common/locales/it.json
@@ -1,8 +1,8 @@
{
"components": {
- "story": {
- "storyDay": {
- "noStory": "Nessun contenuto di storia trovato in questo giorno..."
+ "summary": {
+ "summaryDay": {
+ "noContent": "Nessun contenuto '{contentType}' trovato in questo giorno..."
}
}
},
@@ -221,6 +221,9 @@
}
},
"print": {
+ "config": {
+ "periods": "Sezione/i portante/i"
+ },
"cover": {
"title": "Pagina di copertina"
},
@@ -230,8 +233,13 @@
"program": {
"title": "Programma"
},
- "story": {
- "title": "Trama"
+ "summary": {
+ "safetyConsiderations": {
+ "title": "Considerazioni sulla sicurezza"
+ },
+ "storycontext": {
+ "title": "Storia"
+ }
},
"toc": {
"title": "Indice dei contenuti"
diff --git a/frontend/eslint.config.mjs b/frontend/eslint.config.mjs
index cd3bfc8a0f..437b437b7f 100644
--- a/frontend/eslint.config.mjs
+++ b/frontend/eslint.config.mjs
@@ -82,7 +82,7 @@ export default [
'error',
{
ignoreKeysRegex:
- '^(global|entity|contentNode\\.[a-z][a-zA-Z]+|print\\.(global|activity|cover|picasso|program|story|toc))\\..+',
+ '^(global|entity|contentNode\\.[a-z][a-zA-Z]+|print\\.(global|activity|cover|picasso|program|config|summary|toc))\\..+',
translationKeyPropRegex: '[a-zA-Z0-9]-i18n-key$',
},
],
diff --git a/frontend/src/components/print/PrintConfigurator.vue b/frontend/src/components/print/PrintConfigurator.vue
index a72c3d04fa..bc4091fc53 100644
--- a/frontend/src/components/print/PrintConfigurator.vue
+++ b/frontend/src/components/print/PrintConfigurator.vue
@@ -100,7 +100,7 @@ import PrintPreviewNuxt from './print-nuxt/PrintPreviewNuxt.vue'
import Draggable from 'vuedraggable'
import CoverConfig from './config/CoverConfig.vue'
import PicassoConfig from './config/PicassoConfig.vue'
-import StoryConfig from './config/StoryConfig.vue'
+import SummaryConfig from './config/SummaryConfig.vue'
import ProgramConfig from './config/ProgramConfig.vue'
import ActivityConfig from './config/ActivityConfig.vue'
import TocConfig from './config/TocConfig.vue'
@@ -112,6 +112,8 @@ import { getEnv } from '@/environment.js'
import cloneDeep from 'lodash/cloneDeep'
import VueI18n from '../../plugins/i18n/index.js'
import repairConfig from './repairPrintConfig.js'
+import StoryConfig from '@/components/print/config/StoryConfig.vue'
+import SafetyConsiderationsConfig from '@/components/print/config/SafetyConsiderationsConfig.vue'
import campShortTitle from '@/common/helpers/campShortTitle.js'
export default {
@@ -126,7 +128,7 @@ export default {
PrintPreviewNuxt,
CoverConfig,
PicassoConfig,
- StoryConfig,
+ SummaryConfig,
ProgramConfig,
ActivityConfig,
TocConfig,
@@ -143,6 +145,7 @@ export default {
Cover: CoverConfig,
Picasso: PicassoConfig,
Story: StoryConfig,
+ SafetyConsiderations: SafetyConsiderationsConfig,
Program: ProgramConfig,
Activity: ActivityConfig,
Toc: TocConfig,
@@ -209,6 +212,7 @@ export default {
type: 'Story',
options: {
periods: [period._meta.self],
+ contentType: 'Storycontext',
},
})
contents.push({
diff --git a/frontend/src/components/print/__tests__/repairPrintConfig.spec.js b/frontend/src/components/print/__tests__/repairPrintConfig.spec.js
index 9b8ecd272e..c78b3f84a6 100644
--- a/frontend/src/components/print/__tests__/repairPrintConfig.spec.js
+++ b/frontend/src/components/print/__tests__/repairPrintConfig.spec.js
@@ -4,6 +4,7 @@ import ActivityConfig from '../config/ActivityConfig.vue'
import CoverConfig from '../config/CoverConfig.vue'
import ProgramConfig from '../config/ProgramConfig.vue'
import StoryConfig from '../config/StoryConfig.vue'
+import SafetyConsiderationsConfig from '../config/SafetyConsiderationsConfig.vue'
import TocConfig from '../config/TocConfig.vue'
describe('repairConfig', () => {
@@ -25,6 +26,7 @@ describe('repairConfig', () => {
CoverConfig,
PicassoConfig,
ProgramConfig,
+ SafetyConsiderationsConfig,
StoryConfig,
TocConfig,
].map((component) => [component.name.replace(/Config$/, ''), component.repairConfig])
@@ -840,7 +842,7 @@ describe('repairConfig', () => {
contents: [
{
type: 'Story',
- options: { periods: [] },
+ options: { periods: [], contentType: 'Storycontext' },
},
],
documentName: 'test camp',
@@ -855,7 +857,7 @@ describe('repairConfig', () => {
contents: [
{
type: 'Story',
- options: { periods: [] },
+ options: { periods: [], contentType: 'Storycontext' },
},
],
documentName: 'test camp',
@@ -871,7 +873,7 @@ describe('repairConfig', () => {
contents: [
{
type: 'Story',
- options: { periods: [] },
+ options: { periods: [], contentType: 'Storycontext' },
},
],
documentName: 'test camp',
@@ -888,6 +890,7 @@ describe('repairConfig', () => {
type: 'Story',
options: {
periods: ['/periods/11112222', '/periods/1a2b3c4d'],
+ contentType: 'Storycontext',
},
},
],
@@ -904,7 +907,184 @@ describe('repairConfig', () => {
contents: [
{
type: 'Story',
- options: { periods: ['/periods/1a2b3c4d'] },
+ options: {
+ periods: ['/periods/1a2b3c4d'],
+ contentType: 'Storycontext',
+ },
+ },
+ ],
+ documentName: 'test camp',
+ language: 'en-GB',
+ })
+ })
+
+ test('uses known contentType', async () => {
+ // given
+ const config = {
+ camp: '/camps/1a2b3c4d',
+ contents: [
+ {
+ type: 'Story',
+ options: {
+ periods: ['/periods/1a2b3c4d'],
+ contentType: 'Storyboard',
+ },
+ },
+ ],
+ documentName: 'test camp',
+ language: 'en-GB',
+ }
+
+ // when
+ const result = repairConfig(config, ...args)
+
+ // then
+ expect(result).toEqual({
+ camp: '/camps/1a2b3c4d',
+ contents: [
+ {
+ type: 'Story',
+ options: {
+ periods: ['/periods/1a2b3c4d'],
+ contentType: 'Storycontext',
+ },
+ },
+ ],
+ documentName: 'test camp',
+ language: 'en-GB',
+ })
+ })
+ })
+
+ describe('safetyConsiderations', () => {
+ test('adds missing options', async () => {
+ // given
+ const config = {
+ camp: '/camps/1a2b3c4d',
+ contents: [
+ {
+ type: 'SafetyConsiderations',
+ },
+ ],
+ documentName: 'test camp',
+ language: 'en-GB',
+ }
+
+ // when
+ const result = repairConfig(config, ...args)
+
+ // then
+ expect(result).toEqual({
+ camp: '/camps/1a2b3c4d',
+ contents: [
+ {
+ type: 'SafetyConsiderations',
+ options: { periods: [], contentType: 'SafetyConsiderations' },
+ },
+ ],
+ documentName: 'test camp',
+ language: 'en-GB',
+ })
+ })
+
+ test('allows empty periods', async () => {
+ // given
+ const config = {
+ camp: '/camps/1a2b3c4d',
+ contents: [
+ {
+ type: 'SafetyConsiderations',
+ options: { periods: [], contentType: 'SafetyConsiderations' },
+ },
+ ],
+ documentName: 'test camp',
+ language: 'en-GB',
+ }
+
+ // when
+ const result = repairConfig(config, ...args)
+
+ // then
+ expect(result).toEqual({
+ camp: '/camps/1a2b3c4d',
+ contents: [
+ {
+ type: 'SafetyConsiderations',
+ options: { periods: [], contentType: 'SafetyConsiderations' },
+ },
+ ],
+ documentName: 'test camp',
+ language: 'en-GB',
+ })
+ })
+
+ test('filters out unknown periods', async () => {
+ // given
+ const config = {
+ camp: '/camps/1a2b3c4d',
+ contents: [
+ {
+ type: 'SafetyConsiderations',
+ options: {
+ periods: ['/periods/11112222', '/periods/1a2b3c4d'],
+ contentType: 'SafetyConsiderations',
+ },
+ },
+ ],
+ documentName: 'test camp',
+ language: 'en-GB',
+ }
+
+ // when
+ const result = repairConfig(config, ...args)
+
+ // then
+ expect(result).toEqual({
+ camp: '/camps/1a2b3c4d',
+ contents: [
+ {
+ type: 'SafetyConsiderations',
+ options: {
+ periods: ['/periods/1a2b3c4d'],
+ contentType: 'SafetyConsiderations',
+ },
+ },
+ ],
+ documentName: 'test camp',
+ language: 'en-GB',
+ })
+ })
+
+ test('uses known contentType', async () => {
+ // given
+ const config = {
+ camp: '/camps/1a2b3c4d',
+ contents: [
+ {
+ type: 'SafetyConsiderations',
+ options: {
+ periods: ['/periods/1a2b3c4d'],
+ contentType: 'Storyboard',
+ },
+ },
+ ],
+ documentName: 'test camp',
+ language: 'en-GB',
+ }
+
+ // when
+ const result = repairConfig(config, ...args)
+
+ // then
+ expect(result).toEqual({
+ camp: '/camps/1a2b3c4d',
+ contents: [
+ {
+ type: 'SafetyConsiderations',
+ options: {
+ periods: ['/periods/1a2b3c4d'],
+ contentType: 'SafetyConsiderations',
+ },
},
],
documentName: 'test camp',
diff --git a/frontend/src/components/print/config/PicassoConfig.vue b/frontend/src/components/print/config/PicassoConfig.vue
index 49e767cc05..9f49c0961e 100644
--- a/frontend/src/components/print/config/PicassoConfig.vue
+++ b/frontend/src/components/print/config/PicassoConfig.vue
@@ -2,7 +2,7 @@
+
+
+
+
+
+
diff --git a/frontend/src/components/print/config/StoryConfig.vue b/frontend/src/components/print/config/StoryConfig.vue
index 6576b5cc6c..74af6dc76a 100644
--- a/frontend/src/components/print/config/StoryConfig.vue
+++ b/frontend/src/components/print/config/StoryConfig.vue
@@ -3,7 +3,7 @@
diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index 4aa9021392..f2395d1b3f 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -314,11 +314,7 @@
"periods": "Lagerabschnitt(e)"
},
"programConfig": {
- "dayOverview": "Tagesübersicht",
- "periods": "Lagerabschnitt(e)"
- },
- "storyConfig": {
- "periods": "Lagerabschnitt(e)"
+ "dayOverview": "Tagesübersicht"
}
},
"documents": {
@@ -354,6 +350,7 @@
"Cover": "Titelseite",
"Picasso": "Grobprogramm",
"Program": "Detailprogramm",
+ "SafetyConsiderations": "Sicherheitsüberlegungen",
"Story": "Roter Faden",
"Toc": "Inhaltsverzeichnis"
}
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index 39a95331b5..27f7c52dc0 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -309,15 +309,10 @@
"activity": "Activity"
},
"picassoConfig": {
- "orientation": "Page layout",
- "periods": "Period(s)"
+ "orientation": "Page layout"
},
"programConfig": {
- "dayOverview": "print day overview",
- "periods": "Period(s)"
- },
- "storyConfig": {
- "periods": "Period(s)"
+ "dayOverview": "print day overview"
}
},
"documents": {
@@ -353,7 +348,8 @@
"Cover": "Cover page",
"Picasso": "Picasso",
"Program": "Program",
- "Story": "Story summary",
+ "SafetyConsiderations": "Safety considerations",
+ "Story": "Story",
"Toc": "Table of contents"
}
},
diff --git a/frontend/src/locales/fr.json b/frontend/src/locales/fr.json
index d1ce0a9d15..afeb1d59d1 100644
--- a/frontend/src/locales/fr.json
+++ b/frontend/src/locales/fr.json
@@ -289,15 +289,10 @@
"activity": "Activité"
},
"picassoConfig": {
- "orientation": "Mise en page",
- "periods": "Période(s) du camp"
+ "orientation": "Mise en page"
},
"programConfig": {
- "dayOverview": "Aperçu des jours",
- "periods": "Période(s) du camp"
- },
- "storyConfig": {
- "periods": "Période(s) du camp"
+ "dayOverview": "Aperçu des jours"
}
},
"documents": {
@@ -333,6 +328,7 @@
"Cover": "Page de couverture",
"Picasso": "Picasso",
"Program": "Programme",
+ "SafetyConsiderations": "Considérations de sécurité",
"Story": "Histoire",
"Toc": "Table des matières"
}
diff --git a/frontend/src/locales/it.json b/frontend/src/locales/it.json
index 398aed55aa..e994a0db59 100644
--- a/frontend/src/locales/it.json
+++ b/frontend/src/locales/it.json
@@ -281,15 +281,10 @@
"activity": "Attività"
},
"picassoConfig": {
- "orientation": "Layout della pagina",
- "periods": "Sezione/i portante/i"
+ "orientation": "Layout della pagina"
},
"programConfig": {
- "dayOverview": "Panoramica della giornata di stampa",
- "periods": "Sezione/i portante/i"
- },
- "storyConfig": {
- "periods": "Sezione/i portante/i"
+ "dayOverview": "Panoramica della giornata di stampa"
}
},
"documents": {
@@ -325,6 +320,7 @@
"Cover": "Pagina di copertina",
"Picasso": "Picasso",
"Program": "Programma",
+ "SafetyConsiderations": "Considerazioni sulla sicurezza",
"Story": "Riassunto della storia",
"Toc": "Indice dei contenuti"
}
diff --git a/frontend/src/locales/rm.json b/frontend/src/locales/rm.json
index ae73401546..489707cbe2 100644
--- a/frontend/src/locales/rm.json
+++ b/frontend/src/locales/rm.json
@@ -245,15 +245,10 @@
"activity": "Activitad"
},
"picassoConfig": {
- "orientation": "Layout da la pagina",
- "periods": "Part(s) dal champ"
+ "orientation": "Layout da la pagina"
},
"programConfig": {
- "dayOverview": "Survista dal di",
- "periods": "Part(s) dal champ"
- },
- "storyConfig": {
- "periods": "Part(s) dal champ"
+ "dayOverview": "Survista dal di"
}
},
"documents": {
diff --git a/pdf/eslint.config.mjs b/pdf/eslint.config.mjs
index f3a56433b8..8e152813d3 100644
--- a/pdf/eslint.config.mjs
+++ b/pdf/eslint.config.mjs
@@ -77,7 +77,7 @@ export default [
'error',
{
ignoreKeysRegex:
- '^(global|entity|contentNode\\.[a-z][a-zA-Z]+|print\\.(global|activity|cover|picasso|program|story|toc))\\..+',
+ '^(global|entity|contentNode\\.[a-z][a-zA-Z]+|print\\.(global|activity|cover|picasso|program|config|summary|toc))\\..+',
translationKeyPropRegex: '[a-zA-Z0-9]-i18n-key$',
},
],
diff --git a/pdf/src/CampPrint.vue b/pdf/src/CampPrint.vue
index 23bd137b56..fbca30e02f 100644
--- a/pdf/src/CampPrint.vue
+++ b/pdf/src/CampPrint.vue
@@ -23,7 +23,8 @@ import InterDisplayBoldItalic from '@/assets/fonts/Inter/InterDisplay-BoldItalic
import Cover from '@/campPrint/cover/Cover.vue'
import TableOfContents from '@/campPrint/tableOfContents/TableOfContents.vue'
import Picasso from '@/campPrint/picasso/Picasso.vue'
-import Story from '@/campPrint/story/Story.vue'
+import Story from '@/campPrint/summary/Story.vue'
+import SafetyConsiderations from '@/campPrint/summary/SafetyConsiderations.vue'
import Program from '@/campPrint/program/Program.vue'
import Activity from '@/campPrint/activity/Activity.vue'
import { wordHyphenation } from '@react-pdf/textkit'
@@ -45,6 +46,7 @@ export default {
Program,
Activity,
Story,
+ SafetyConsiderations,
}
},
},
diff --git a/pdf/src/campPrint/story/StoryPeriod.vue b/pdf/src/campPrint/story/StoryPeriod.vue
deleted file mode 100644
index 5389c95f91..0000000000
--- a/pdf/src/campPrint/story/StoryPeriod.vue
+++ /dev/null
@@ -1,35 +0,0 @@
-
- {{ $tc('print.story.title') }}: {{ period.description }}
-
-
-
-
-.story-period-title {
- font-size: 10pt;
- font-weight: bold;
- text-align: center;
-}
-
diff --git a/pdf/src/campPrint/summary/SafetyConsiderations.vue b/pdf/src/campPrint/summary/SafetyConsiderations.vue
new file mode 100644
index 0000000000..ff329c87ef
--- /dev/null
+++ b/pdf/src/campPrint/summary/SafetyConsiderations.vue
@@ -0,0 +1,29 @@
+
+
+
+
+
+
diff --git a/pdf/src/campPrint/story/Story.vue b/pdf/src/campPrint/summary/Story.vue
similarity index 65%
rename from pdf/src/campPrint/story/Story.vue
rename to pdf/src/campPrint/summary/Story.vue
index 30573dce91..1c061eebf1 100644
--- a/pdf/src/campPrint/story/Story.vue
+++ b/pdf/src/campPrint/summary/Story.vue
@@ -1,15 +1,20 @@
-
+
-
-
diff --git a/pdf/src/campPrint/story/StoryDay.vue b/pdf/src/campPrint/summary/SummaryDay.vue
similarity index 74%
rename from pdf/src/campPrint/story/StoryDay.vue
rename to pdf/src/campPrint/summary/SummaryDay.vue
index e3645d5c08..cfa4179f3e 100644
--- a/pdf/src/campPrint/story/StoryDay.vue
+++ b/pdf/src/campPrint/summary/SummaryDay.vue
@@ -1,11 +1,11 @@
-
- {{ $tc('entity.day.name') }} {{ day.number }}
- {{ date }}
+
+ {{ $tc('entity.day.name') }} {{ day.number }}
+ {{ date }}
-
-
-
+
+
+
({
scheduleEntry,
- storyChapters: this.period
+ contentNodes: this.period
.contentNodes()
.items.filter(
(contentNode) =>
- contentNode.contentTypeName === 'Storycontext' &&
+ contentNode.contentTypeName === this.contentType &&
contentNode.root()._meta.self ===
scheduleEntry.activity().rootContentNode()._meta.self &&
!isEmptyHtml(contentNode.data.html)
@@ -62,8 +63,8 @@ export default {
})),
}))
},
- entriesWithStory() {
- return this.entries.filter(({ storyChapters }) => storyChapters.length)
+ entriesWithContentNodes() {
+ return this.entries.filter(({ contentNodes }) => contentNodes.length)
},
},
methods: {
@@ -77,7 +78,7 @@ export default {
}
-.story-day-title-container {
+.summary-day-title-container {
display: flex;
flex-direction: row;
justify-content: space-between;
@@ -86,15 +87,15 @@ export default {
padding-bottom: 2pt;
margin-bottom: 1pt;
}
-.story-day-title {
+.summary-day-title {
font-size: 14;
font-weight: semibold;
margin: 10pt 0 3pt;
}
-.story-day-date {
+.summary-day-date {
font-size: 11pt;
}
-.story-chapter-title {
+.summary-chapter-title {
display: flex;
flex-direction: row;
align-items: center;
diff --git a/pdf/src/campPrint/summary/SummaryPeriod.vue b/pdf/src/campPrint/summary/SummaryPeriod.vue
new file mode 100644
index 0000000000..7c655f69ff
--- /dev/null
+++ b/pdf/src/campPrint/summary/SummaryPeriod.vue
@@ -0,0 +1,47 @@
+
+ {{ title }}: {{ period.description }}
+
+
+
+
+.summary-period-title {
+ font-size: 10pt;
+ font-weight: bold;
+ text-align: center;
+}
+
diff --git a/pdf/src/campPrint/tableOfContents/TableOfContents.vue b/pdf/src/campPrint/tableOfContents/TableOfContents.vue
index cbe37ffab3..036ca5dce9 100644
--- a/pdf/src/campPrint/tableOfContents/TableOfContents.vue
+++ b/pdf/src/campPrint/tableOfContents/TableOfContents.vue
@@ -23,6 +23,7 @@ import Toc from './entry/Toc.vue'
import Picasso from './entry/Picasso.vue'
import Program from './entry/Program.vue'
import Activity from './entry/Activity.vue'
+import SafetyConsiderations from './entry/SafetyConsiderations.vue'
import Story from './entry/Story.vue'
export default {
@@ -40,6 +41,7 @@ export default {
Picasso,
Program,
Activity,
+ SafetyConsiderations,
Story,
}
},
diff --git a/pdf/src/campPrint/tableOfContents/entry/SafetyConsiderations.vue b/pdf/src/campPrint/tableOfContents/entry/SafetyConsiderations.vue
new file mode 100644
index 0000000000..7bc890bfc5
--- /dev/null
+++ b/pdf/src/campPrint/tableOfContents/entry/SafetyConsiderations.vue
@@ -0,0 +1,16 @@
+
+
+ {{ $tc('print.summary.safetyConsiderations.title') }}:
+ {{ period.description }}
+
+
+
diff --git a/pdf/src/campPrint/tableOfContents/entry/Story.vue b/pdf/src/campPrint/tableOfContents/entry/Story.vue
index a205af4c87..32e02e7711 100644
--- a/pdf/src/campPrint/tableOfContents/entry/Story.vue
+++ b/pdf/src/campPrint/tableOfContents/entry/Story.vue
@@ -1,23 +1,13 @@
- {{ $tc('print.story.title') }}: {{ period.description }}
+ {{ $tc('print.summary.storycontext.title') }}: {{ period.description }}
-
-
diff --git a/pdf/src/campPrint/tableOfContents/entry/Summary.vue b/pdf/src/campPrint/tableOfContents/entry/Summary.vue
new file mode 100644
index 0000000000..58ef06ec95
--- /dev/null
+++ b/pdf/src/campPrint/tableOfContents/entry/Summary.vue
@@ -0,0 +1,16 @@
+
diff --git a/pdf/src/renderer/__tests__/__snapshots__/story_overview.spec.json.snap b/pdf/src/renderer/__tests__/__snapshots__/story_overview.spec.json.snap
index cc45d81b2c..67ccc1d63e 100644
--- a/pdf/src/renderer/__tests__/__snapshots__/story_overview.spec.json.snap
+++ b/pdf/src/renderer/__tests__/__snapshots__/story_overview.spec.json.snap
@@ -10,16 +10,16 @@
{
"parent": [Circular],
"type": "TEXT_INSTANCE",
- "value": "Storyline: Hauptlager",
+ "value": "print.summary..title: Hauptlager",
},
],
"parent": [Circular],
"props": {
"bookmark": {
"fit": true,
- "title": "Storyline: Hauptlager",
+ "title": "print.summary..title: Hauptlager",
},
- "class": "story-period-title",
+ "class": "summary-period-title",
"id": "entry-0-16b2fcffdd8e",
},
"style": {
@@ -43,7 +43,7 @@
],
"parent": [Circular],
"props": {
- "class": "story-day-title",
+ "class": "summary-day-title",
},
"style": {
"fontSize": "14",
@@ -63,7 +63,7 @@
],
"parent": [Circular],
"props": {
- "class": "story-day-date",
+ "class": "summary-day-date",
},
"style": {
"fontSize": "11pt",
@@ -73,7 +73,7 @@
],
"parent": [Circular],
"props": {
- "class": "story-day-title-container",
+ "class": "summary-day-title-container",
"id": "entry-0-16b2fcffdd8e-f036e9302f67",
},
"style": {
@@ -96,690 +96,17 @@
{
"parent": [Circular],
"type": "TEXT_INSTANCE",
- "value": "LS",
- },
- ],
- "parent": [Circular],
- "props": {
- "class": "category-label",
- "style": {
- "backgroundColor": "#4DBB52",
- "color": "#000",
- "font-size": "10pt",
- },
- },
- "style": {
- "alignSelf": "center",
- "backgroundColor": "#4DBB52",
- "borderRadius": "50%",
- "color": "#000",
- "fontSize": "10pt",
- "lineHeight": "1",
- "padding": "2pt 8pt 4pt",
- },
- "type": "TEXT",
- },
- {
- "box": {},
- "children": [
- {
- "parent": [Circular],
- "type": "TEXT_INSTANCE",
- "value": "1.1 Stadt Game 🐭",
- },
- ],
- "parent": [Circular],
- "props": {
- "id": "entry-0-16b2fcffdd8e-4bc1873a73f2",
- "style": {
- "margin": "0 3pt",
- },
- },
- "style": {
- "margin": "0 3pt",
- },
- "type": "TEXT",
- },
- ],
- "parent": [Circular],
- "props": {
- "class": "story-chapter-title",
- "minPresenceAhead": 30,
- },
- "style": {
- "alignItems": "center",
- "display": "flex",
- "flexDirection": "row",
- "fontWeight": "bold",
- "margin": "10pt 0 4.5pt",
- },
- "type": "VIEW",
- },
- {
- "box": {},
- "children": [
- {
- "box": {},
- "children": [
- {
- "parent": [Circular],
- "type": "TEXT_INSTANCE",
- "value": "Unsere Flugtickets sind davongeflogen (Wind) wir müssen sie wieder einsammeln",
- },
- ],
- "parent": [Circular],
- "props": {
- "class": "p",
- },
- "style": {
- "marginBottom": "2pt",
- },
- "type": "TEXT",
- },
- ],
- "parent": [Circular],
- "props": {
- "style": {
- "line-height": "1.6",
- },
- },
- "style": {
- "lineHeight": "1.6",
- },
- "type": "VIEW",
- },
- {
- "box": {},
- "children": [
- {
- "box": {},
- "children": [
- {
- "parent": [Circular],
- "type": "TEXT_INSTANCE",
- "value": "LP",
- },
- ],
- "parent": [Circular],
- "props": {
- "class": "category-label",
- "style": {
- "backgroundColor": "#90B7E4",
- "color": "#000",
- "font-size": "10pt",
- },
- },
- "style": {
- "alignSelf": "center",
- "backgroundColor": "#90B7E4",
- "borderRadius": "50%",
- "color": "#000",
- "fontSize": "10pt",
- "lineHeight": "1",
- "padding": "2pt 8pt 4pt",
- },
- "type": "TEXT",
- },
- {
- "box": {},
- "children": [
- {
- "parent": [Circular],
- "type": "TEXT_INSTANCE",
- "value": "1.4 Takeoff",
- },
- ],
- "parent": [Circular],
- "props": {
- "id": "entry-0-16b2fcffdd8e-b12d0af13de0",
- "style": {
- "margin": "0 3pt",
- },
- },
- "style": {
- "margin": "0 3pt",
- },
- "type": "TEXT",
- },
- ],
- "parent": [Circular],
- "props": {
- "class": "story-chapter-title",
- "minPresenceAhead": 30,
- },
- "style": {
- "alignItems": "center",
- "display": "flex",
- "flexDirection": "row",
- "fontWeight": "bold",
- "margin": "10pt 0 4.5pt",
- },
- "type": "VIEW",
- },
- {
- "box": {},
- "children": [
- {
- "box": {},
- "children": [
- {
- "parent": [Circular],
- "type": "TEXT_INSTANCE",
- "value": "Wir fliegen Ab. Die Flugbegleiter erklären uns wie wir in Notfallsituationen handeln müssen.",
- },
- ],
- "parent": [Circular],
- "props": {
- "class": "p",
- },
- "style": {
- "marginBottom": "2pt",
- },
- "type": "TEXT",
- },
- ],
- "parent": [Circular],
- "props": {
- "style": {
- "line-height": "1.6",
- },
- },
- "style": {
- "lineHeight": "1.6",
- },
- "type": "VIEW",
- },
- {
- "box": {},
- "children": [
- {
- "box": {},
- "children": [
- {
- "parent": [Circular],
- "type": "TEXT_INSTANCE",
- "value": "LP",
- },
- ],
- "parent": [Circular],
- "props": {
- "class": "category-label",
- "style": {
- "backgroundColor": "#90B7E4",
- "color": "#000",
- "font-size": "10pt",
- },
- },
- "style": {
- "alignSelf": "center",
- "backgroundColor": "#90B7E4",
- "borderRadius": "50%",
- "color": "#000",
- "fontSize": "10pt",
- "lineHeight": "1",
- "padding": "2pt 8pt 4pt",
- },
- "type": "TEXT",
- },
- {
- "box": {},
- "children": [
- {
- "parent": [Circular],
- "type": "TEXT_INSTANCE",
- "value": "1.5 Flugzeugabsturz",
- },
- ],
- "parent": [Circular],
- "props": {
- "id": "entry-0-16b2fcffdd8e-4b4f2d67ee32",
- "style": {
- "margin": "0 3pt",
- },
- },
- "style": {
- "margin": "0 3pt",
- },
- "type": "TEXT",
- },
- ],
- "parent": [Circular],
- "props": {
- "class": "story-chapter-title",
- "minPresenceAhead": 30,
- },
- "style": {
- "alignItems": "center",
- "display": "flex",
- "flexDirection": "row",
- "fontWeight": "bold",
- "margin": "10pt 0 4.5pt",
- },
- "type": "VIEW",
- },
- {
- "box": {},
- "children": [
- {
- "box": {},
- "children": [
- {
- "parent": [Circular],
- "type": "TEXT_INSTANCE",
- "value": "Wir stürzen ab. Der Pilot verlässt das Flugzeug früher, weil die Steuerung nicht mehr funktioniert und er der Meinung ist, dass wir in die Insel stürzen würden und er nicht sterben will. oder so ähnlch de Pilot isch denn eifach verscholle",
- },
- ],
- "parent": [Circular],
- "props": {
- "class": "p",
- },
- "style": {
- "marginBottom": "2pt",
- },
- "type": "TEXT",
- },
- ],
- "parent": [Circular],
- "props": {
- "style": {
- "line-height": "1.6",
- },
- },
- "style": {
- "lineHeight": "1.6",
- },
- "type": "VIEW",
- },
- {
- "box": {},
- "children": [
- {
- "box": {},
- "children": [
- {
- "parent": [Circular],
- "type": "TEXT_INSTANCE",
- "value": "Day 2",
- },
- ],
- "parent": [Circular],
- "props": {
- "class": "story-day-title",
- },
- "style": {
- "fontSize": "14",
- "fontWeight": "semibold",
- "margin": "10pt 0 3pt",
- },
- "type": "TEXT",
- },
- {
- "box": {},
- "children": [
- {
- "parent": [Circular],
- "type": "TEXT_INSTANCE",
- "value": "Sa 05/11/2024",
- },
- ],
- "parent": [Circular],
- "props": {
- "class": "story-day-date",
- },
- "style": {
- "fontSize": "11pt",
- },
- "type": "TEXT",
- },
- ],
- "parent": [Circular],
- "props": {
- "class": "story-day-title-container",
- "id": "entry-0-16b2fcffdd8e-f036e9302f68",
- },
- "style": {
- "alignItems": "baseline",
- "borderBottom": "2pt solid #aaaaaa",
- "display": "flex",
- "flexDirection": "row",
- "justifyContent": "space-between",
- "marginBottom": "1pt",
- "paddingBottom": "2pt",
- },
- "type": "VIEW",
- },
- {
- "box": {},
- "children": [
- {
- "box": {},
- "children": [
- {
- "parent": [Circular],
- "type": "TEXT_INSTANCE",
- "value": "LS",
- },
- ],
- "parent": [Circular],
- "props": {
- "class": "category-label",
- "style": {
- "backgroundColor": "#4DBB52",
- "color": "#000",
- "font-size": "10pt",
- },
- },
- "style": {
- "alignSelf": "center",
- "backgroundColor": "#4DBB52",
- "borderRadius": "50%",
- "color": "#000",
- "fontSize": "10pt",
- "lineHeight": "1",
- "padding": "2pt 8pt 4pt",
- },
- "type": "TEXT",
- },
- {
- "box": {},
- "children": [
- {
- "parent": [Circular],
- "type": "TEXT_INSTANCE",
- "value": "2.4 Insel erkunden",
- },
- ],
- "parent": [Circular],
- "props": {
- "id": "entry-0-16b2fcffdd8e-46cad2b11017",
- "style": {
- "margin": "0 3pt",
- },
- },
- "style": {
- "margin": "0 3pt",
- },
- "type": "TEXT",
- },
- ],
- "parent": [Circular],
- "props": {
- "class": "story-chapter-title",
- "minPresenceAhead": 30,
- },
- "style": {
- "alignItems": "center",
- "display": "flex",
- "flexDirection": "row",
- "fontWeight": "bold",
- "margin": "10pt 0 4.5pt",
- },
- "type": "VIEW",
- },
- {
- "box": {},
- "children": [
- {
- "box": {},
- "children": [
- {
- "parent": [Circular],
- "type": "TEXT_INSTANCE",
- "value": "Wir müssen die Insel erkunden",
- },
- ],
- "parent": [Circular],
- "props": {
- "class": "p",
- },
- "style": {
- "marginBottom": "2pt",
- },
- "type": "TEXT",
- },
- ],
- "parent": [Circular],
- "props": {
- "style": {
- "line-height": "1.6",
- },
- },
- "style": {
- "lineHeight": "1.6",
- },
- "type": "VIEW",
- },
- {
- "box": {},
- "children": [
- {
- "box": {},
- "children": [
- {
- "parent": [Circular],
- "type": "TEXT_INSTANCE",
- "value": "LS",
- },
- ],
- "parent": [Circular],
- "props": {
- "class": "category-label",
- "style": {
- "backgroundColor": "#4DBB52",
- "color": "#000",
- "font-size": "10pt",
- },
- },
- "style": {
- "alignSelf": "center",
- "backgroundColor": "#4DBB52",
- "borderRadius": "50%",
- "color": "#000",
- "fontSize": "10pt",
- "lineHeight": "1",
- "padding": "2pt 8pt 4pt",
- },
- "type": "TEXT",
- },
- {
- "box": {},
- "children": [
- {
- "parent": [Circular],
- "type": "TEXT_INSTANCE",
- "value": "2.6 Angriff der Aborigines",
- },
- ],
- "parent": [Circular],
- "props": {
- "id": "entry-0-16b2fcffdd8e-9c5b963da5e1",
- "style": {
- "margin": "0 3pt",
- },
- },
- "style": {
- "margin": "0 3pt",
- },
- "type": "TEXT",
- },
- ],
- "parent": [Circular],
- "props": {
- "class": "story-chapter-title",
- "minPresenceAhead": 30,
- },
- "style": {
- "alignItems": "center",
- "display": "flex",
- "flexDirection": "row",
- "fontWeight": "bold",
- "margin": "10pt 0 4.5pt",
- },
- "type": "VIEW",
- },
- {
- "box": {},
- "children": [
- {
- "box": {},
- "children": [
- {
- "parent": [Circular],
- "type": "TEXT_INSTANCE",
- "value": "Die eingeborenen greifen uns an und klauen uns unser essen.",
- },
- ],
- "parent": [Circular],
- "props": {
- "class": "p",
- },
- "style": {
- "marginBottom": "2pt",
- },
- "type": "TEXT",
- },
- ],
- "parent": [Circular],
- "props": {
- "style": {
- "line-height": "1.6",
- },
- },
- "style": {
- "lineHeight": "1.6",
- },
- "type": "VIEW",
- },
- {
- "box": {},
- "children": [
- {
- "box": {},
- "children": [
- {
- "parent": [Circular],
- "type": "TEXT_INSTANCE",
- "value": "LP",
- },
- ],
- "parent": [Circular],
- "props": {
- "class": "category-label",
- "style": {
- "backgroundColor": "#90B7E4",
- "color": "#000",
- "font-size": "10pt",
- },
- },
- "style": {
- "alignSelf": "center",
- "backgroundColor": "#90B7E4",
- "borderRadius": "50%",
- "color": "#000",
- "fontSize": "10pt",
- "lineHeight": "1",
- "padding": "2pt 8pt 4pt",
- },
- "type": "TEXT",
- },
- {
- "box": {},
- "children": [
- {
- "parent": [Circular],
- "type": "TEXT_INSTANCE",
- "value": "2.7 Pfadiversprechen",
- },
- ],
- "parent": [Circular],
- "props": {
- "id": "entry-0-16b2fcffdd8e-f2923b997126",
- "style": {
- "margin": "0 3pt",
- },
- },
- "style": {
- "margin": "0 3pt",
- },
- "type": "TEXT",
- },
- ],
- "parent": [Circular],
- "props": {
- "class": "story-chapter-title",
- "minPresenceAhead": 30,
- },
- "style": {
- "alignItems": "center",
- "display": "flex",
- "flexDirection": "row",
- "fontWeight": "bold",
- "margin": "10pt 0 4.5pt",
- },
- "type": "VIEW",
- },
- {
- "box": {},
- "children": [
- {
- "box": {},
- "children": [
- {
- "parent": [Circular],
- "type": "TEXT_INSTANCE",
- "value": "Pfadigesetzt und Pfadiversprechen durch verschiedene Methoden lernen",
- },
- ],
- "parent": [Circular],
- "props": {
- "class": "p",
- },
- "style": {
- "marginBottom": "2pt",
- },
- "type": "TEXT",
- },
- ],
- "parent": [Circular],
- "props": {
- "style": {
- "line-height": "1.6",
- },
- },
- "style": {
- "lineHeight": "1.6",
- },
- "type": "VIEW",
- },
- {
- "box": {},
- "children": [
- {
- "box": {},
- "children": [
- {
- "parent": [Circular],
- "type": "TEXT_INSTANCE",
- "value": "LP",
+ "value": "Day 2",
},
],
"parent": [Circular],
"props": {
- "class": "category-label",
- "style": {
- "backgroundColor": "#90B7E4",
- "color": "#000",
- "font-size": "10pt",
- },
+ "class": "summary-day-title",
},
"style": {
- "alignSelf": "center",
- "backgroundColor": "#90B7E4",
- "borderRadius": "50%",
- "color": "#000",
- "fontSize": "10pt",
- "lineHeight": "1",
- "padding": "2pt 8pt 4pt",
+ "fontSize": "14",
+ "fontWeight": "semibold",
+ "margin": "10pt 0 3pt",
},
"type": "TEXT",
},
@@ -789,66 +116,32 @@
{
"parent": [Circular],
"type": "TEXT_INSTANCE",
- "value": "2.9 Essen zurückerobern",
+ "value": "Sa 05/11/2024",
},
],
"parent": [Circular],
"props": {
- "id": "entry-0-16b2fcffdd8e-3da4545af722",
- "style": {
- "margin": "0 3pt",
- },
+ "class": "summary-day-date",
},
"style": {
- "margin": "0 3pt",
+ "fontSize": "11pt",
},
"type": "TEXT",
},
],
"parent": [Circular],
"props": {
- "class": "story-chapter-title",
- "minPresenceAhead": 30,
+ "class": "summary-day-title-container",
+ "id": "entry-0-16b2fcffdd8e-f036e9302f68",
},
"style": {
- "alignItems": "center",
+ "alignItems": "baseline",
+ "borderBottom": "2pt solid #aaaaaa",
"display": "flex",
"flexDirection": "row",
- "fontWeight": "bold",
- "margin": "10pt 0 4.5pt",
- },
- "type": "VIEW",
- },
- {
- "box": {},
- "children": [
- {
- "box": {},
- "children": [
- {
- "parent": [Circular],
- "type": "TEXT_INSTANCE",
- "value": "wir müssen uns unser Essen zurückholen (evtl. Lasergame oder suscht was Geils)",
- },
- ],
- "parent": [Circular],
- "props": {
- "class": "p",
- },
- "style": {
- "marginBottom": "2pt",
- },
- "type": "TEXT",
- },
- ],
- "parent": [Circular],
- "props": {
- "style": {
- "line-height": "1.6",
- },
- },
- "style": {
- "lineHeight": "1.6",
+ "justifyContent": "space-between",
+ "marginBottom": "1pt",
+ "paddingBottom": "2pt",
},
"type": "VIEW",
},
@@ -866,7 +159,7 @@
],
"parent": [Circular],
"props": {
- "class": "story-day-title",
+ "class": "summary-day-title",
},
"style": {
"fontSize": "14",
@@ -886,7 +179,7 @@
],
"parent": [Circular],
"props": {
- "class": "story-day-date",
+ "class": "summary-day-date",
},
"style": {
"fontSize": "11pt",
@@ -896,7 +189,7 @@
],
"parent": [Circular],
"props": {
- "class": "story-day-title-container",
+ "class": "summary-day-title-container",
"id": "entry-0-16b2fcffdd8e-f036e9302f69",
},
"style": {
@@ -910,208 +203,6 @@
},
"type": "VIEW",
},
- {
- "box": {},
- "children": [
- {
- "box": {},
- "children": [
- {
- "parent": [Circular],
- "type": "TEXT_INSTANCE",
- "value": "LP",
- },
- ],
- "parent": [Circular],
- "props": {
- "class": "category-label",
- "style": {
- "backgroundColor": "#90B7E4",
- "color": "#000",
- "font-size": "10pt",
- },
- },
- "style": {
- "alignSelf": "center",
- "backgroundColor": "#90B7E4",
- "borderRadius": "50%",
- "color": "#000",
- "fontSize": "10pt",
- "lineHeight": "1",
- "padding": "2pt 8pt 4pt",
- },
- "type": "TEXT",
- },
- {
- "box": {},
- "children": [
- {
- "parent": [Circular],
- "type": "TEXT_INSTANCE",
- "value": "3.3 Atelier",
- },
- ],
- "parent": [Circular],
- "props": {
- "id": "entry-0-16b2fcffdd8e-69226b3e49d7",
- "style": {
- "margin": "0 3pt",
- },
- },
- "style": {
- "margin": "0 3pt",
- },
- "type": "TEXT",
- },
- ],
- "parent": [Circular],
- "props": {
- "class": "story-chapter-title",
- "minPresenceAhead": 30,
- },
- "style": {
- "alignItems": "center",
- "display": "flex",
- "flexDirection": "row",
- "fontWeight": "bold",
- "margin": "10pt 0 4.5pt",
- },
- "type": "VIEW",
- },
- {
- "box": {},
- "children": [
- {
- "box": {},
- "children": [
- {
- "parent": [Circular],
- "type": "TEXT_INSTANCE",
- "value": "Was könnte man machen um Rettung zu holen? Blubb meint wir sollten warten bis wir gerettet werden und uns ein wenig die Zeit vertreiben",
- },
- ],
- "parent": [Circular],
- "props": {
- "class": "p",
- },
- "style": {
- "marginBottom": "2pt",
- },
- "type": "TEXT",
- },
- ],
- "parent": [Circular],
- "props": {
- "style": {
- "line-height": "1.6",
- },
- },
- "style": {
- "lineHeight": "1.6",
- },
- "type": "VIEW",
- },
- {
- "box": {},
- "children": [
- {
- "box": {},
- "children": [
- {
- "parent": [Circular],
- "type": "TEXT_INSTANCE",
- "value": "LS",
- },
- ],
- "parent": [Circular],
- "props": {
- "class": "category-label",
- "style": {
- "backgroundColor": "#4DBB52",
- "color": "#000",
- "font-size": "10pt",
- },
- },
- "style": {
- "alignSelf": "center",
- "backgroundColor": "#4DBB52",
- "borderRadius": "50%",
- "color": "#000",
- "fontSize": "10pt",
- "lineHeight": "1",
- "padding": "2pt 8pt 4pt",
- },
- "type": "TEXT",
- },
- {
- "box": {},
- "children": [
- {
- "parent": [Circular],
- "type": "TEXT_INSTANCE",
- "value": "3.5 Abschluss geländegame",
- },
- ],
- "parent": [Circular],
- "props": {
- "id": "entry-0-16b2fcffdd8e-501abe71a6ab",
- "style": {
- "margin": "0 3pt",
- },
- },
- "style": {
- "margin": "0 3pt",
- },
- "type": "TEXT",
- },
- ],
- "parent": [Circular],
- "props": {
- "class": "story-chapter-title",
- "minPresenceAhead": 30,
- },
- "style": {
- "alignItems": "center",
- "display": "flex",
- "flexDirection": "row",
- "fontWeight": "bold",
- "margin": "10pt 0 4.5pt",
- },
- "type": "VIEW",
- },
- {
- "box": {},
- "children": [
- {
- "box": {},
- "children": [
- {
- "parent": [Circular],
- "type": "TEXT_INSTANCE",
- "value": "Plottwist der Pilot hat sich zum Anführer der eingeborenen hochgekämpft. und wir müssen ein Notsignal senden",
- },
- ],
- "parent": [Circular],
- "props": {
- "class": "p",
- },
- "style": {
- "marginBottom": "2pt",
- },
- "type": "TEXT",
- },
- ],
- "parent": [Circular],
- "props": {
- "style": {
- "line-height": "1.6",
- },
- },
- "style": {
- "lineHeight": "1.6",
- },
- "type": "VIEW",
- },
{
"box": {},
"children": [
@@ -1126,7 +217,7 @@
],
"parent": [Circular],
"props": {
- "class": "story-day-title",
+ "class": "summary-day-title",
},
"style": {
"fontSize": "14",
@@ -1146,7 +237,7 @@
],
"parent": [Circular],
"props": {
- "class": "story-day-date",
+ "class": "summary-day-date",
},
"style": {
"fontSize": "11pt",
@@ -1156,7 +247,7 @@
],
"parent": [Circular],
"props": {
- "class": "story-day-title-container",
+ "class": "summary-day-title-container",
"id": "entry-0-16b2fcffdd8e-f036e9302f70",
},
"style": {
diff --git a/print/components/Toc/TocSafetyConsiderations.vue b/print/components/Toc/TocSafetyConsiderations.vue
new file mode 100644
index 0000000000..ffb8d2db2d
--- /dev/null
+++ b/print/components/Toc/TocSafetyConsiderations.vue
@@ -0,0 +1,38 @@
+
+
+
+ {{ $t('print.summary.safetyConsiderations.title') }}
+
+
+
+
+
+
diff --git a/print/components/Toc/TocStory.vue b/print/components/Toc/TocStory.vue
index e02afb5698..f2e143527f 100644
--- a/print/components/Toc/TocStory.vue
+++ b/print/components/Toc/TocStory.vue
@@ -1,7 +1,7 @@
- {{ $t('print.story.title') }}
+ {{ $t('print.summary.storycontext.title') }}
diff --git a/print/components/config/SafetyConsiderations.vue b/print/components/config/SafetyConsiderations.vue
new file mode 100644
index 0000000000..21e73d94a5
--- /dev/null
+++ b/print/components/config/SafetyConsiderations.vue
@@ -0,0 +1,40 @@
+
+
+
+
+
+
+
+
diff --git a/print/components/config/Story.vue b/print/components/config/Story.vue
index fec2e004ea..d952c22570 100644
--- a/print/components/config/Story.vue
+++ b/print/components/config/Story.vue
@@ -1,12 +1,13 @@
-
diff --git a/print/components/config/Toc.vue b/print/components/config/Toc.vue
index 1d20f8f2b0..e8f72c3577 100644
--- a/print/components/config/Toc.vue
+++ b/print/components/config/Toc.vue
@@ -4,16 +4,15 @@
{{ $t('print.toc.title') }}
diff --git a/print/components/story/StoryDay.vue b/print/components/summary/SummaryDay.vue
similarity index 71%
rename from print/components/story/StoryDay.vue
rename to print/components/summary/SummaryDay.vue
index 3b7f8f90ab..56415d0643 100644
--- a/print/components/story/StoryDay.vue
+++ b/print/components/summary/SummaryDay.vue
@@ -11,10 +11,14 @@
-
+
-
-
+
+
@@ -24,17 +28,21 @@
{{ scheduleEntry.activity().title }}
-
- - {{ chapter.instanceName }}
+
+ - {{ contentNode.instanceName }}
-
+
- {{ $t('components.story.storyDay.noStory') }}
+ {{
+ $t('components.summary.summaryDay.noContent', {
+ contentType: $t(`contentNode.${camelCase(contentType)}.name`),
+ })
+ }}
@@ -43,6 +51,7 @@
import CategoryLabel from '@/components/generic/CategoryLabel.vue'
import RichText from '@/components/generic/RichText.vue'
import { dateHelperUTCFormatted } from '@/mixins/dateHelperUTCFormatted.js'
+import camelCase from 'lodash/camelCase.js'
function isEmptyHtml(html) {
if (html === null) {
@@ -58,7 +67,8 @@ export default {
props: {
day: { type: Object, required: true },
index: { type: Number, required: true },
- periodStoryChapters: { type: Array, required: true },
+ allContentNodes: { type: Array, required: true },
+ contentType: { type: String, required: true },
},
computed: {
// returns scheduleEntries of current day without the need for an additional API call
@@ -74,7 +84,7 @@ export default {
entries() {
return this.scheduleEntries.map((scheduleEntry) => ({
scheduleEntry,
- storyChapters: this.periodStoryChapters.filter(
+ contentNodes: this.allContentNodes.filter(
(contentNode) =>
contentNode.root()._meta.self ===
scheduleEntry.activity().rootContentNode()._meta.self &&
@@ -82,9 +92,10 @@ export default {
),
}))
},
- entriesWithStory() {
- return this.entries.filter(({ storyChapters }) => storyChapters.length)
+ entriesWithContentNode() {
+ return this.entries.filter(({ contentNodes }) => contentNodes.length)
},
},
+ methods: { camelCase },
}
diff --git a/print/components/story/StoryPeriod.vue b/print/components/summary/SummaryPeriod.vue
similarity index 61%
rename from print/components/story/StoryPeriod.vue
rename to print/components/summary/SummaryPeriod.vue
index 0f8f65f0be..4cd139679a 100644
--- a/print/components/story/StoryPeriod.vue
+++ b/print/components/summary/SummaryPeriod.vue
@@ -4,21 +4,25 @@
:id="`content_${index}_period_${period.id}`"
class="tw-text-center tw-font-semibold tw-mb-6"
>
- {{ $t('print.story.title') }}: {{ period.description }}
+ {{ $t('print.summary.' + camelCase(contentType) + '.title') }}:
+ {{ period.description }}
-