From 1c9d86e5c3abc810b7e233c83b5f3b6d21748849 Mon Sep 17 00:00:00 2001 From: Urban Suppiger Date: Sun, 29 Sep 2024 13:28:54 +0200 Subject: [PATCH 1/6] initial draft for activity list in react print --- pdf/src/CampPrint.vue | 2 + .../campPrint/activityList/ActivityList.vue | 30 ++++ .../activityList/ActivityListPeriod.vue | 62 ++++++++ .../ActivityListScheduleEntry.vue | 144 ++++++++++++++++++ 4 files changed, 238 insertions(+) create mode 100644 pdf/src/campPrint/activityList/ActivityList.vue create mode 100644 pdf/src/campPrint/activityList/ActivityListPeriod.vue create mode 100644 pdf/src/campPrint/activityList/ActivityListScheduleEntry.vue diff --git a/pdf/src/CampPrint.vue b/pdf/src/CampPrint.vue index fbca30e02f..7d583a0721 100644 --- a/pdf/src/CampPrint.vue +++ b/pdf/src/CampPrint.vue @@ -27,6 +27,7 @@ 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 ActivityList from '@/campPrint/activityList/ActivityList.vue' import { wordHyphenation } from '@react-pdf/textkit' const originalHyphenationCallback = wordHyphenation() @@ -47,6 +48,7 @@ export default { Activity, Story, SafetyConsiderations, + ActivityList, } }, }, diff --git a/pdf/src/campPrint/activityList/ActivityList.vue b/pdf/src/campPrint/activityList/ActivityList.vue new file mode 100644 index 0000000000..db83cde582 --- /dev/null +++ b/pdf/src/campPrint/activityList/ActivityList.vue @@ -0,0 +1,30 @@ + + diff --git a/pdf/src/campPrint/activityList/ActivityListPeriod.vue b/pdf/src/campPrint/activityList/ActivityListPeriod.vue new file mode 100644 index 0000000000..75bd8964bb --- /dev/null +++ b/pdf/src/campPrint/activityList/ActivityListPeriod.vue @@ -0,0 +1,62 @@ + + + +.activity-list-period-title { + font-size: 10pt; + font-weight: bold; + text-align: center; +} + diff --git a/pdf/src/campPrint/activityList/ActivityListScheduleEntry.vue b/pdf/src/campPrint/activityList/ActivityListScheduleEntry.vue new file mode 100644 index 0000000000..26a58713c5 --- /dev/null +++ b/pdf/src/campPrint/activityList/ActivityListScheduleEntry.vue @@ -0,0 +1,144 @@ + + + +.schedule-entry-header-title { + display: flex; + flex-direction: row; + justify-content: space-between; + align-items: baseline; + padding-bottom: 2pt; + border-bottom: 2pt solid #aaaaaa; +} +.schedule-entry-title { + flex-grow: 1; + display: flex; + flex-direction: row; + font-size: 14; + font-weight: semibold; +} +.schedule-entry-category-label { + margin: 4pt 0; + font-size: 12pt; +} +.schedule-entry-number-and-title { + margin: 4pt 4pt; + max-width: 345pt; +} +.schedule-entry-date { + font-size: 11pt; +} +.schedule-entry-header { + display: flex; + flex-direction: row; + justify-content: space-between; + border-bottom: 0.5pt solid black; + font-size: 10pt; + margin-bottom: 10pt; +} +.schedule-entry-header-divider { + border-left: 0.5pt solid black; + margin-left: 3.5pt; + padding-left: 5pt +} +.schedule-entry-header-metadata { + width: 50%; + padding: 2pt 0; +} +.schedule-entry-header-metadata-entry { + flex-direction: row; + align-items: flex-start; + column-gap: 6pt; +} +.schedule-entry-header-metadata-label { + font-weight: semibold; + flex-shrink: 0; + flex-grow: 0; +} + From 0dd3e5bea7d5ecc5ed19bdadd4d5008b3ec1bed7 Mon Sep 17 00:00:00 2001 From: Urban Suppiger Date: Sun, 29 Sep 2024 13:45:31 +0200 Subject: [PATCH 2/6] add contentTypeName if instanceName was overridden --- .../campPrint/scheduleEntry/InstanceName.vue | 31 ++++++++++++++----- 1 file changed, 24 insertions(+), 7 deletions(-) diff --git a/pdf/src/campPrint/scheduleEntry/InstanceName.vue b/pdf/src/campPrint/scheduleEntry/InstanceName.vue index 6b9f32907d..ad10c5026f 100644 --- a/pdf/src/campPrint/scheduleEntry/InstanceName.vue +++ b/pdf/src/campPrint/scheduleEntry/InstanceName.vue @@ -1,5 +1,10 @@ +.content-node-title { + border-bottom: 1.5pt solid black; + margin-bottom: 1pt; + display: flex; + flex-direction: row; + justify-content: space-between; + align-items: baseline; +} .content-node-instance-name { + flex-grow: 1; font-weight: bold; font-size: 11pt; padding-bottom: 3pt; - border-bottom: 1.5pt solid black; - margin-bottom: 1pt; +} +.content-type-name { + font-size:8pt; + font-weight:normal; + color:grey; } From 110c8e2f6e2f5052ff526f625ea9ac8729f1b588 Mon Sep 17 00:00:00 2001 From: Urban Suppiger Date: Sun, 29 Sep 2024 14:09:01 +0200 Subject: [PATCH 3/6] extract ScheduleEntry title into separate component --- .../ActivityListScheduleEntry.vue | 106 +------------ .../campPrint/scheduleEntry/ScheduleEntry.vue | 124 +-------------- .../scheduleEntry/ScheduleEntryTitle.vue | 144 ++++++++++++++++++ 3 files changed, 150 insertions(+), 224 deletions(-) create mode 100644 pdf/src/campPrint/scheduleEntry/ScheduleEntryTitle.vue diff --git a/pdf/src/campPrint/activityList/ActivityListScheduleEntry.vue b/pdf/src/campPrint/activityList/ActivityListScheduleEntry.vue index 26a58713c5..6f98f33b63 100644 --- a/pdf/src/campPrint/activityList/ActivityListScheduleEntry.vue +++ b/pdf/src/campPrint/activityList/ActivityListScheduleEntry.vue @@ -1,21 +1,5 @@