fix(front): Fix event list month order
Closes #1244 Signed-off-by: Thomas Citharel <tcit@tcit.fr>
This commit is contained in:
@@ -22,8 +22,9 @@ const props = withDefaults(
|
||||
defineProps<{
|
||||
events: IEvent[];
|
||||
isCurrentActorMember?: boolean;
|
||||
order: "ASC" | "DESC";
|
||||
}>(),
|
||||
{ isCurrentActorMember: false }
|
||||
{ isCurrentActorMember: false, order: "ASC" }
|
||||
);
|
||||
|
||||
const monthlyGroupedEvents = computed((): Map<string, IEvent[]> => {
|
||||
@@ -48,7 +49,9 @@ const keys = computed((): string[] => {
|
||||
number
|
||||
];
|
||||
const bDate = new Date(...bParams);
|
||||
return bDate.getTime() - aDate.getTime();
|
||||
return props.order === "DESC"
|
||||
? bDate.getTime() - aDate.getTime()
|
||||
: aDate.getTime() - bDate.getTime();
|
||||
});
|
||||
});
|
||||
|
||||
|
||||
@@ -424,6 +424,8 @@ export const FETCH_GROUP_EVENTS = gql`
|
||||
$name: String!
|
||||
$afterDateTime: DateTime
|
||||
$beforeDateTime: DateTime
|
||||
$order: EventOrderBy
|
||||
$orderDirection: SortDirection
|
||||
$organisedEventsPage: Int
|
||||
$organisedEventsLimit: Int
|
||||
) {
|
||||
@@ -431,6 +433,8 @@ export const FETCH_GROUP_EVENTS = gql`
|
||||
organizedEvents(
|
||||
afterDatetime: $afterDateTime
|
||||
beforeDatetime: $beforeDateTime
|
||||
order: $order
|
||||
orderDirection: $orderDirection
|
||||
page: $organisedEventsPage
|
||||
limit: $organisedEventsLimit
|
||||
) {
|
||||
|
||||
@@ -48,8 +48,10 @@
|
||||
t("Past events")
|
||||
}}</o-switch>
|
||||
<grouped-multi-event-minimalist-card
|
||||
class="mb-6"
|
||||
:events="group.organizedEvents.elements"
|
||||
:isCurrentActorMember="isCurrentActorMember"
|
||||
:order="showPassedEvents ? 'DESC' : 'ASC'"
|
||||
/>
|
||||
<empty-content
|
||||
v-if="
|
||||
@@ -77,6 +79,7 @@
|
||||
</template>
|
||||
</empty-content>
|
||||
<o-pagination
|
||||
v-if="group.organizedEvents.total > EVENTS_PAGE_LIMIT"
|
||||
class="mt-4"
|
||||
:total="group.organizedEvents.total"
|
||||
v-model:current="page"
|
||||
@@ -150,6 +153,8 @@ const variables = computed(() => ({
|
||||
name: route.params.preferredUsername as string,
|
||||
beforeDateTime: showPassedEvents.value ? new Date() : null,
|
||||
afterDateTime: showPassedEvents.value ? null : new Date(),
|
||||
order: "BEGINS_ON",
|
||||
orderDirection: showPassedEvents.value ? "DESC" : "ASC",
|
||||
organisedEventsPage: page.value,
|
||||
organisedEventsLimit: EVENTS_PAGE_LIMIT,
|
||||
}));
|
||||
|
||||
@@ -431,8 +431,8 @@ const eventDeleted = (eventid: string): void => {
|
||||
}),
|
||||
});
|
||||
if (!upcomingEventsData) return;
|
||||
let loggedUser = upcomingEventsData?.loggedUser;
|
||||
let participations = loggedUser?.participations;
|
||||
const loggedUser = upcomingEventsData?.loggedUser;
|
||||
const participations = loggedUser?.participations;
|
||||
apollo.client.cache.writeQuery<{ loggedUser: IUser }>({
|
||||
query: LOGGED_USER_UPCOMING_EVENTS,
|
||||
variables: () => ({
|
||||
|
||||
Reference in New Issue
Block a user