From 24d85ea44c2f74d03dcdd295321c8c09c8e32708 Mon Sep 17 00:00:00 2001 From: itskovacs Date: Tue, 30 Sep 2025 17:48:46 +0200 Subject: [PATCH] :bug: Fix Trip days order --- backend/trip/__init__.py | 2 +- backend/trip/models/models.py | 2 +- src/src/app/components/trip/trip.component.ts | 5 ----- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/backend/trip/__init__.py b/backend/trip/__init__.py index 3024410..c7bbe49 100644 --- a/backend/trip/__init__.py +++ b/backend/trip/__init__.py @@ -1 +1 @@ -__version__ = "1.17.0" +__version__ = "1.17.1" diff --git a/backend/trip/models/models.py b/backend/trip/models/models.py index 7bb5eff..396d1e5 100644 --- a/backend/trip/models/models.py +++ b/backend/trip/models/models.py @@ -260,7 +260,7 @@ class Trip(TripBase, table=True): user: str = Field(foreign_key="user.username", ondelete="CASCADE") places: list["Place"] = Relationship(back_populates="trips", link_model=TripPlaceLink) - days: list["TripDay"] = Relationship(back_populates="trip", cascade_delete=True) + days: list["TripDay"] = Relationship(back_populates="trip", sa_relationship_kwargs={"order_by": "TripDay.label"}, cascade_delete=True) shares: list["TripShare"] = Relationship(back_populates="trip", cascade_delete=True) packing_items: list["TripPackingListItem"] = Relationship(back_populates="trip", cascade_delete=True) checklist_items: list["TripChecklistItem"] = Relationship(back_populates="trip", cascade_delete=True) diff --git a/src/src/app/components/trip/trip.component.ts b/src/src/app/components/trip/trip.component.ts index ada50d9..f0564f0 100644 --- a/src/src/app/components/trip/trip.component.ts +++ b/src/src/app/components/trip/trip.component.ts @@ -363,10 +363,6 @@ export class TripComponent implements AfterViewInit { }, 100); } - sortTripDays() { - this.trip?.days.sort((a, b) => a.label.localeCompare(b.label)); - } - toggleFiltering() { this.isFilteringMode = !this.isFilteringMode; if (!this.isFilteringMode) this.flattenTripDayItems(); @@ -412,7 +408,6 @@ export class TripComponent implements AfterViewInit { } flattenTripDayItems(searchValue?: string) { - this.sortTripDays(); let prevLat: number, prevLng: number; this.flattenedTripItems = this.trip!.days.flatMap((day) => [...day.items]