From 6b2aa698a5e89d8a026dbcf6bb823e6710641df8 Mon Sep 17 00:00:00 2001 From: carlobeltrame Date: Thu, 1 Feb 2024 16:03:59 +0100 Subject: [PATCH 1/6] Be more precise in description of field --- api/src/Entity/ScheduleEntry.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/api/src/Entity/ScheduleEntry.php b/api/src/Entity/ScheduleEntry.php index 28e34ef9fb..267883d062 100644 --- a/api/src/Entity/ScheduleEntry.php +++ b/api/src/Entity/ScheduleEntry.php @@ -251,8 +251,9 @@ public function getDayNumber(): int { /** * The cardinal number of this schedule entry, when chronologically ordering all - * schedule entries that start on the same day. I.e. if the schedule entry is the - * second entry on a given day, its number will be 2. + * schedule entries WITH THE SAME NUMBERING STYLE that start on the same day. I.e. + * if the schedule entry is the second entry with roman numbering on a given day, + * its number will be 2. */ #[ApiProperty(example: '2')] #[Groups(['read'])] From 8ef77ad780b976229639ddf7e11a38ad860d44bb Mon Sep 17 00:00:00 2001 From: carlobeltrame Date: Thu, 1 Feb 2024 16:04:14 +0100 Subject: [PATCH 2/6] Remove unnecessary sorting We don't need to sort because all schedule entries of the period are fetched when printing is started, and the schedule entries of a period are ordered correctly when fetching from the API. This might become relevant again far in the future if we introduce more offline functionality. For now, the sorting was incorrect anyways, because it assumed that the scheduleEntryNumber was unique per day, which it isn't (there can be multiple numbering schemes leading to multiple of the same scheduleEntryNumbers on the same day). --- pdf/src/campPrint/program/ProgramPeriod.vue | 5 +---- pdf/src/campPrint/tableOfContents/entry/ProgramPeriod.vue | 5 +---- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/pdf/src/campPrint/program/ProgramPeriod.vue b/pdf/src/campPrint/program/ProgramPeriod.vue index 19e3aeb974..e12c02ae72 100644 --- a/pdf/src/campPrint/program/ProgramPeriod.vue +++ b/pdf/src/campPrint/program/ProgramPeriod.vue @@ -25,10 +25,7 @@ export default { }, computed: { sortedScheduleEntries() { - return sortBy(this.period.scheduleEntries().items, [ - 'dayNumber', - 'scheduleEntryNumber', - ]) + return this.period.scheduleEntries().items }, }, } diff --git a/pdf/src/campPrint/tableOfContents/entry/ProgramPeriod.vue b/pdf/src/campPrint/tableOfContents/entry/ProgramPeriod.vue index 3f277276e2..ba1362bd68 100644 --- a/pdf/src/campPrint/tableOfContents/entry/ProgramPeriod.vue +++ b/pdf/src/campPrint/tableOfContents/entry/ProgramPeriod.vue @@ -31,10 +31,7 @@ export default { return this.period.scheduleEntries().items.length }, scheduleEntries() { - return sortBy(this.period.scheduleEntries().items, [ - 'dayNumber', - 'scheduleEntryNumber', - ]).map((scheduleEntry) => { + return this.period.scheduleEntries().items.map((scheduleEntry) => { const activity = scheduleEntry.activity() return { ...scheduleEntry, From 05a2af534164146ea3e27424688e0f47b845a553 Mon Sep 17 00:00:00 2001 From: carlobeltrame Date: Thu, 1 Feb 2024 21:32:40 +0100 Subject: [PATCH 3/6] Cleanup --- pdf/src/campPrint/program/ProgramPeriod.vue | 5 ++--- pdf/src/campPrint/tableOfContents/entry/ProgramPeriod.vue | 1 - 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/pdf/src/campPrint/program/ProgramPeriod.vue b/pdf/src/campPrint/program/ProgramPeriod.vue index e12c02ae72..c1c2af1fd1 100644 --- a/pdf/src/campPrint/program/ProgramPeriod.vue +++ b/pdf/src/campPrint/program/ProgramPeriod.vue @@ -6,7 +6,7 @@ >{{ $tc('print.program.title') }}: {{ period.description }} @@ -14,7 +14,6 @@