From b43a55719afb0e400f3b750d185b3c9941253cec Mon Sep 17 00:00:00 2001 From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" Date: Wed, 5 Nov 2025 12:20:38 +0700 Subject: [PATCH 1/2] fix:bug format datjs --- cms/src/routes/competitive/+page.server.ts | 2 +- cms/src/routes/qualifying/+page.server.ts | 2 +- cms/src/routes/qualifying/[id]/+page.svelte | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cms/src/routes/competitive/+page.server.ts b/cms/src/routes/competitive/+page.server.ts index ca7fa08..ab943d9 100644 --- a/cms/src/routes/competitive/+page.server.ts +++ b/cms/src/routes/competitive/+page.server.ts @@ -12,7 +12,7 @@ export const load: PageServerLoad = async ({ fetch }) => { exams.forEach((ex) => { const { id, title, announcement_startDate } = ex; const url = '/competitive/' + id; - ex.date = dayjs(announcement_startDate).format('DD MMM BBBB'); + ex.date = dayjs(announcement_startDate).format('DD MMM YYYY'); ex.image = ex.image ? ex.image : '/images/exam_place_holder.png'; if (!ex.announcementExam) return; //ignore other date for normal post diff --git a/cms/src/routes/qualifying/+page.server.ts b/cms/src/routes/qualifying/+page.server.ts index 77bfaab..86eb9c0 100644 --- a/cms/src/routes/qualifying/+page.server.ts +++ b/cms/src/routes/qualifying/+page.server.ts @@ -12,7 +12,7 @@ export const load: PageServerLoad = async ({ fetch }) => { exams.forEach((ex) => { const { id, title, announcement_startDate } = ex; const url = '/qualifying/' + id; - ex.date = dayjs(announcement_startDate).format('DD MMM BBBB'); + ex.date = dayjs(announcement_startDate).format('DD MMM YYYY'); ex.image = ex.image ? ex.image : '/images/exam_place_holder.png'; if (!ex.announcementExam) return; //ignore other date for normal post diff --git a/cms/src/routes/qualifying/[id]/+page.svelte b/cms/src/routes/qualifying/[id]/+page.svelte index 39498b6..3cf9931 100644 --- a/cms/src/routes/qualifying/[id]/+page.svelte +++ b/cms/src/routes/qualifying/[id]/+page.svelte @@ -7,8 +7,8 @@ import dayjs from 'dayjs'; import { each } from 'svelte/internal'; function formatDate(start: string, end: string | undefined = undefined) { - if (!end) return dayjs(start).format('DD MMM BBBB'); - return dayjs(start).format('DD MMM BBBB') + ' - ' + dayjs(end).format('DD MMM BBBB'); + if (!end) return dayjs(start).format('DD MMM YYYY'); + return dayjs(start).format('DD MMM YYYY') + ' - ' + dayjs(end).format('DD MMM YYYY'); } function isEndDatePassed(endDate: string | undefined) { if (endDate) { From a07b69042166a579ed56af90e7b0f67eca4743f4 Mon Sep 17 00:00:00 2001 From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" Date: Wed, 5 Nov 2025 13:08:41 +0700 Subject: [PATCH 2/2] fix:format year --- cms/src/routes/competitive/+page.server.ts | 2 +- cms/src/routes/qualifying/+page.server.ts | 2 +- cms/src/routes/qualifying/[id]/+page.svelte | 8 ++++++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/cms/src/routes/competitive/+page.server.ts b/cms/src/routes/competitive/+page.server.ts index ab943d9..4c31d82 100644 --- a/cms/src/routes/competitive/+page.server.ts +++ b/cms/src/routes/competitive/+page.server.ts @@ -12,7 +12,7 @@ export const load: PageServerLoad = async ({ fetch }) => { exams.forEach((ex) => { const { id, title, announcement_startDate } = ex; const url = '/competitive/' + id; - ex.date = dayjs(announcement_startDate).format('DD MMM YYYY'); + ex.date = dayjs(announcement_startDate).add(543, 'year').format('DD MMM YYYY'); ex.image = ex.image ? ex.image : '/images/exam_place_holder.png'; if (!ex.announcementExam) return; //ignore other date for normal post diff --git a/cms/src/routes/qualifying/+page.server.ts b/cms/src/routes/qualifying/+page.server.ts index 86eb9c0..95cb3a3 100644 --- a/cms/src/routes/qualifying/+page.server.ts +++ b/cms/src/routes/qualifying/+page.server.ts @@ -12,7 +12,7 @@ export const load: PageServerLoad = async ({ fetch }) => { exams.forEach((ex) => { const { id, title, announcement_startDate } = ex; const url = '/qualifying/' + id; - ex.date = dayjs(announcement_startDate).format('DD MMM YYYY'); + ex.date = dayjs(announcement_startDate).add(543, 'year').format('DD MMM YYYY'); ex.image = ex.image ? ex.image : '/images/exam_place_holder.png'; if (!ex.announcementExam) return; //ignore other date for normal post diff --git a/cms/src/routes/qualifying/[id]/+page.svelte b/cms/src/routes/qualifying/[id]/+page.svelte index 3cf9931..1a64c95 100644 --- a/cms/src/routes/qualifying/[id]/+page.svelte +++ b/cms/src/routes/qualifying/[id]/+page.svelte @@ -7,8 +7,12 @@ import dayjs from 'dayjs'; import { each } from 'svelte/internal'; function formatDate(start: string, end: string | undefined = undefined) { - if (!end) return dayjs(start).format('DD MMM YYYY'); - return dayjs(start).format('DD MMM YYYY') + ' - ' + dayjs(end).format('DD MMM YYYY'); + if (!end) return dayjs(start).add(543, 'year').format('DD MMM YYYY'); + return ( + dayjs(start).add(543, 'year').format('DD MMM YYYY') + + ' - ' + + dayjs(end).add(543, 'year').format('DD MMM YYYY') + ); } function isEndDatePassed(endDate: string | undefined) { if (endDate) {