From eb05e2ada67e7a4c4362716e02225f7ff4468e01 Mon Sep 17 00:00:00 2001 From: Francis Cao Date: Tue, 20 Aug 2024 09:21:15 -0700 Subject: [PATCH 1/2] fix getDateWeeklySQL --- src/lib/prisma.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/prisma.ts b/src/lib/prisma.ts index 85b1bea7..8c4f8c5c 100644 --- a/src/lib/prisma.ts +++ b/src/lib/prisma.ts @@ -88,11 +88,11 @@ function getDateWeeklySQL(field: string) { const db = getDatabaseType(); if (db === POSTGRESQL) { - return `EXTRACT(DOW FROM ${field})`; + return `concat(extract(dow from ${field}), ':', to_char(${field}, 'HH24'))`; } if (db === MYSQL) { - return `DAYOFWEEK(${field})-1`; + return `date_format(${field}, '%w:%H')`; } } From 8ee4fc32fdf453aa9975cb3cce64b0aacd6af65b Mon Sep 17 00:00:00 2001 From: Francis Cao Date: Tue, 20 Aug 2024 09:28:10 -0700 Subject: [PATCH 2/2] fix css console errors --- .../websites/[websiteId]/WebsiteExpandedView.module.css | 2 +- .../websites/[websiteId]/events/EventProperties.module.css | 2 +- .../[websiteId]/sessions/SessionProperties.module.css | 2 +- .../websites/[websiteId]/sessions/SessionsWeekly.module.css | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/app/(main)/websites/[websiteId]/WebsiteExpandedView.module.css b/src/app/(main)/websites/[websiteId]/WebsiteExpandedView.module.css index f71032ae..d17fad88 100644 --- a/src/app/(main)/websites/[websiteId]/WebsiteExpandedView.module.css +++ b/src/app/(main)/websites/[websiteId]/WebsiteExpandedView.module.css @@ -38,7 +38,7 @@ } .back { - align-self: start; + align-self: flex-start; margin: 0; } diff --git a/src/app/(main)/websites/[websiteId]/events/EventProperties.module.css b/src/app/(main)/websites/[websiteId]/events/EventProperties.module.css index 4f6a65ec..0b9c011d 100644 --- a/src/app/(main)/websites/[websiteId]/events/EventProperties.module.css +++ b/src/app/(main)/websites/[websiteId]/events/EventProperties.module.css @@ -6,7 +6,7 @@ } .table { - align-self: start; + align-self: flex-start; } .link:hover { diff --git a/src/app/(main)/websites/[websiteId]/sessions/SessionProperties.module.css b/src/app/(main)/websites/[websiteId]/sessions/SessionProperties.module.css index 4f6a65ec..0b9c011d 100644 --- a/src/app/(main)/websites/[websiteId]/sessions/SessionProperties.module.css +++ b/src/app/(main)/websites/[websiteId]/sessions/SessionProperties.module.css @@ -6,7 +6,7 @@ } .table { - align-self: start; + align-self: flex-start; } .link:hover { diff --git a/src/app/(main)/websites/[websiteId]/sessions/SessionsWeekly.module.css b/src/app/(main)/websites/[websiteId]/sessions/SessionsWeekly.module.css index ba15dfcc..35361643 100644 --- a/src/app/(main)/websites/[websiteId]/sessions/SessionsWeekly.module.css +++ b/src/app/(main)/websites/[websiteId]/sessions/SessionsWeekly.module.css @@ -13,8 +13,8 @@ .day { display: flex; flex-direction: column; - align-items: start; - justify-content: start; + align-items: flex-start; + justify-content: flex-start; gap: 1px; position: relative; } @@ -26,7 +26,7 @@ height: 20px; margin: auto; border-radius: 100%; - align-items: start; + align-items: flex-start; } .hour {