Merge pull request #4600 from carlobeltrame/schedule-entry-number-cle…

…anup

Schedule entry number cleanup

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'])]

api/tests/Api/SnapshotTests/__snapshots__/ResponseSnapshotTest__testOpenApiSpecMatchesSnapshot__1.yml

@@ -15395,8 +15395,9 @@ components:
         scheduleEntryNumber:
           description: |-
             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.
           example: '2'
           readOnly: true
           type: integer
@@ -15482,8 +15483,9 @@ components:
         scheduleEntryNumber:
           description: |-
             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.
           example: '2'
           readOnly: true
           type: integer
@@ -15570,8 +15572,9 @@ components:
         scheduleEntryNumber:
           description: |-
             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.
           example: '2'
           readOnly: true
           type: integer
@@ -15660,8 +15663,9 @@ components:
         scheduleEntryNumber:
           description: |-
             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.
           example: '2'
           readOnly: true
           type: integer
@@ -15860,8 +15864,9 @@ components:
         scheduleEntryNumber:
           description: |-
             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.
           example: '2'
           readOnly: true
           type: integer
@@ -15947,8 +15952,9 @@ components:
         scheduleEntryNumber:
           description: |-
             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.
           example: '2'
           readOnly: true
           type: integer
@@ -16035,8 +16041,9 @@ components:
         scheduleEntryNumber:
           description: |-
             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.
           example: '2'
           readOnly: true
           type: integer
@@ -16134,8 +16141,9 @@ components:
         scheduleEntryNumber:
           description: |-
             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.
           example: '2'
           readOnly: true
           type: integer
@@ -16310,8 +16318,9 @@ components:
         scheduleEntryNumber:
           description: |-
             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.
           example: '2'
           readOnly: true
           type: integer
@@ -16420,8 +16429,9 @@ components:
         scheduleEntryNumber:
           description: |-
             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.
           example: '2'
           readOnly: true
           type: integer
@@ -16531,8 +16541,9 @@ components:
         scheduleEntryNumber:
           description: |-
             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.
           example: '2'
           readOnly: true
           type: integer
@@ -16644,8 +16655,9 @@ components:
         scheduleEntryNumber:
           description: |-
             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.
           example: '2'
           readOnly: true
           type: integer

frontend/src/components/story/StoryDay.vue

@@ -52,7 +52,6 @@
   </v-expansion-panel>
 </template>
 <script>
-import { sortBy } from 'lodash'
 import ApiForm from '@/components/form/api/ApiForm.vue'
 import { dateHelperUTCFormatted } from '@/mixins/dateHelperUTCFormatted.js'
 import CategoryChip from '@/components/generic/CategoryChip.vue'
@@ -79,11 +78,8 @@ export default {
           return scheduleEntry.day()._meta.self === this.day._meta.self
         })
     },
-    sortedScheduleEntries() {
-      return sortBy(this.scheduleEntries, (scheduleEntry) => scheduleEntry.start)
-    },
     entries() {
-      return this.sortedScheduleEntries.map((scheduleEntry) => ({
+      return this.scheduleEntries.map((scheduleEntry) => ({
         scheduleEntry: scheduleEntry,
         storyChapters: this.periodStoryChapters.filter(
           (contentNode) =>

pdf/src/campPrint/program/ProgramPeriod.vue

@@ -6,15 +6,14 @@
     >{{ $tc('print.program.title') }}: {{ period.description }}</Text
   >
   <ScheduleEntry
-    v-for="scheduleEntry in sortedScheduleEntries"
+    v-for="scheduleEntry in scheduleEntries"
     :id="`${id}-${period.id}-${scheduleEntry.id}`"
     :schedule-entry="scheduleEntry"
   />
 </template>
 <script>
 import PdfComponent from '@/PdfComponent.js'
 import ScheduleEntry from '../scheduleEntry/ScheduleEntry.vue'
-import sortBy from 'lodash/sortBy.js'
 
 export default {
   name: 'ProgramPeriod',
@@ -24,11 +23,8 @@ export default {
     period: { type: Object, required: true },
   },
   computed: {
-    sortedScheduleEntries() {
-      return sortBy(this.period.scheduleEntries().items, [
-        'dayNumber',
-        'scheduleEntryNumber',
-      ])
+    scheduleEntries() {
+      return this.period.scheduleEntries().items
     },
   },
 }

pdf/src/campPrint/story/StoryDay.vue

@@ -25,7 +25,6 @@ import PdfComponent from '@/PdfComponent.js'
 import { dateLong } from '../../../common/helpers/dateHelperUTCFormatted.js'
 import CategoryLabel from '../CategoryLabel.vue'
 import RichText from '../RichText.vue'
-import sortBy from 'lodash/sortBy.js'
 import { isEmptyHtml } from '../helpers.js'
 
 export default {
@@ -40,16 +39,13 @@ export default {
     date() {
       return dateLong(this.day.start, this.$tc)
     },
-    sortedScheduleEntries() {
-      return sortBy(
-        this.period.scheduleEntries().items.filter((scheduleEntry) => {
-          return scheduleEntry.day()._meta.self === this.day._meta.self
-        }),
-        (scheduleEntry) => scheduleEntry.start
-      )
+    scheduleEntries() {
+      return this.period.scheduleEntries().items.filter((scheduleEntry) => {
+        return scheduleEntry.day()._meta.self === this.day._meta.self
+      })
     },
     entries() {
-      return this.sortedScheduleEntries.map((scheduleEntry) => ({
+      return this.scheduleEntries.map((scheduleEntry) => ({
         scheduleEntry,
         storyChapters: this.period
           .contentNodes()

pdf/src/campPrint/tableOfContents/entry/ProgramPeriod.vue

@@ -18,7 +18,6 @@
 </template>
 <script>
 import PdfComponent from '@/PdfComponent.js'
-import sortBy from 'lodash/sortBy.js'
 
 export default {
   name: 'Program',
@@ -31,10 +30,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,