Skip to content

Client print detail improvements #3861

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pmattmann merged 4 commits into from
Sep 29, 2023
Merged

Client print detail improvements #3861

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ceb3b0f
Adjust font size for extremely short schedule entries
carlobeltrame Sep 20, 2023
1d3e45e
Fix font coloring
carlobeltrame Sep 20, 2023
49c0099
Work around react-pdf bug
carlobeltrame Sep 29, 2023
7e1112d
Update snapshots
carlobeltrame Sep 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions pdf/src/campPrint/picasso/DayColumn.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
...positionStyles[scheduleEntry.id],
...borderRadiusStyles[scheduleEntry.id],
}"
:percentage-height="positionStyles[scheduleEntry.id].percentageHeight"
/>
</View>
</View>
Expand Down Expand Up @@ -86,6 +87,7 @@ export default {
bottom: bottom + '%',
left: left + '%',
right: 100 - width - left + '%',
percentageHeight: 100 - bottom - top,
}
}),
'id'
Expand Down
15 changes: 9 additions & 6 deletions pdf/src/campPrint/picasso/ScheduleEntry.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<template>
<View
class="picasso-schedule-entry"
:style="{ backgroundColor: color, color: textColor }"
>
<View class="picasso-schedule-entry" :style="{ backgroundColor: color }">
<View class="picasso-schedule-entry-spacer" />
<Link class="picasso-schedule-entry-link" :href="linkTarget">
<Text class="picasso-schedule-entry-title">
<Text
class="picasso-schedule-entry-title"
:style="{ fontSize: fontSize, color: textColor }"
>
{{ category }} {{ scheduleEntry.number }} {{ title }}
</Text>
</Link>
Expand All @@ -32,6 +32,7 @@ export default {
extends: PdfComponent,
props: {
scheduleEntry: { type: Object, required: true },
percentageHeight: { type: Number, default: 10 },
},
computed: {
color() {
Expand All @@ -49,6 +50,9 @@ export default {
linkTarget() {
return `#scheduleEntry_${this.scheduleEntry.id}`
},
fontSize() {
return Math.min(8, 3 * this.percentageHeight) + 'pt'
},
},
}
</script>
Expand All @@ -69,7 +73,6 @@ export default {
flex-grow: 1;
}
.picasso-schedule-entry-title {
fontSize: 8pt;
height: 16pt;
line-height: 1;
flex-grow: 1;
Expand Down
2 changes: 1 addition & 1 deletion pdf/src/campPrint/scheduleEntry/ScheduleEntry.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
</View>
</View>
</View>
<View style="margin-bottom: 20pt; font-size: 10pt">
<View style="padding-bottom: 20pt; font-size: 10pt">
<ContentNode :content-node="activity.rootContentNode()" />
</View>
</template>
Expand Down
Loading