From bc6cbd839ff213ac49ad821650adee100b400e64 Mon Sep 17 00:00:00 2001 From: Alexis <35.alexis.pele@gmail.com> Date: Thu, 19 Dec 2024 20:18:41 +0100 Subject: [PATCH] Added event count for calendars --- i18n.config.ts | 2 ++ models/CalendarConfig.ts | 1 + pages/explore.vue | 4 +++- server/api/calendars/query.get.ts | 4 +++- 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/i18n.config.ts b/i18n.config.ts index 56f6938..1237cd9 100644 --- a/i18n.config.ts +++ b/i18n.config.ts @@ -102,6 +102,7 @@ export default defineI18nConfig(() => ({ notFoundDescription: "The link is not valid or the calendar has been deleted / archived.", notFoundForWorld: "No calendar for this world… yet !", isLoading: "Calendar is loading…", + hasXEvents: "This calendar has {count} public events", date: { start: "Start date", end: "End date", @@ -339,6 +340,7 @@ export default defineI18nConfig(() => ({ notFoundDescription: "Le lien n'est pas valide ou le calendrier a été supprimé / archivé.", notFoundForWorld: "Aucun calendrier pour ce monde… pour l'instant !", isLoading: "Chargement du calendrier…", + hasXEvents: "Ce calendrier contient {count} évènements publiques", date: { start: "Date de début", end: "Date de fin", diff --git a/models/CalendarConfig.ts b/models/CalendarConfig.ts index a3fa150..cd5f348 100644 --- a/models/CalendarConfig.ts +++ b/models/CalendarConfig.ts @@ -16,6 +16,7 @@ export interface Calendar extends CalendarConfig { shortId?: string name: string events: CalendarEvent[] + eventNb?: Array<{ count: number }> state: CalendarState color?: string world?: World diff --git a/pages/explore.vue b/pages/explore.vue index 57efd2f..32d3587 100644 --- a/pages/explore.vue +++ b/pages/explore.vue @@ -33,7 +33,9 @@ const availableCalendars = data.value?.data as Calendar[] -

Description future (ou alors des informations sur le nb d'évènements)

+

+ {{ $t("entity.calendar.hasXEvents", { count: calendar.eventNb?.[0].count }) }} +

diff --git a/server/api/calendars/query.get.ts b/server/api/calendars/query.get.ts index a0efcf3..c7d7e23 100644 --- a/server/api/calendars/query.get.ts +++ b/server/api/calendars/query.get.ts @@ -20,7 +20,8 @@ export default defineEventHandler(async (event) => { name, today, months:calendar_months (*), - state + state, + eventNb:calendar_events(count) ` const fullFields = ` @@ -42,6 +43,7 @@ export default defineEventHandler(async (event) => { category:calendar_event_categories!calendar_events_category_fkey (*), secondaryCategories:calendar_event_categories!calendar_event_categories_links (*) ), + eventNb:calendar_events(count), world:worlds ( id, gmId:gm_id