Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: APPS-2970 dateTimes incorrect in ftva #47

Merged
merged 1 commit into from
Oct 4, 2024
Merged

fix: APPS-2970 dateTimes incorrect in ftva #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions gql/queries/EventDetail.gql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ query FTVADetail($slug: [String!]) {


# BlockEventDetail
startDate: startDateWithTime @formatDateTime(format: "Y-m-d", timezone: "America/Los_Angeles")
startTime: startDateWithTime @formatDateTime(format: "TH:i:s", timezone: "America/Los_Angeles")
startDate: startDateWithTime @formatDateTime(format: "Y-m-d\\TH:i", timezone: "America/Los_Angeles")
startTime: startDateWithTime @formatDateTime(format: "Y-m-d\\TH:i", timezone: "America/Los_Angeles")
location {
title
uri
Expand Down
14 changes: 9 additions & 5 deletions gql/queries/FTVAEventDetail.gql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,13 @@ query FTVAEventDetail($slug: [String!]) {

# SIDEBAR
# BlockEventDetail
startDateWithTime
startDate: startDateWithTime @formatDateTime(format: "Y-m-d", timezone: "America/Los_Angeles")
startTime: startDateWithTime @formatDateTime(format: "TH:i:s", timezone: "America/Los_Angeles")
startDateWithTime
@formatDateTime(
format: "Y-m-d\\TH:i"
timezone: "America/Los_Angeles"
)
startDate: startDateWithTime @formatDateTime(format: "Y-m-d\\TH:i:s", timezone: "America/Los_Angeles")
startTime: startDateWithTime @formatDateTime(format: "Y-m-d\\TH:i:s", timezone: "America/Los_Angeles")
location {
title
campusMapId
Expand Down Expand Up @@ -89,8 +93,8 @@ query FTVAEventDetail($slug: [String!]) {
id
to: slug
title: eventTitle
startDate: startDateWithTime @formatDateTime(format: "Y-m-d", timezone: "America/Los_Angeles")
startTime: startDateWithTime @formatDateTime(format: "TH:i:s", timezone: "America/Los_Angeles")
startDate: startDateWithTime @formatDateTime(format: "Y-m-d\\TH:i:s", timezone: "America/Los_Angeles")
startTime: startDateWithTime @formatDateTime(format: "Y-m-d\\TH:i:s", timezone: "America/Los_Angeles")
image: ftvaImage {
...Image
}
Expand Down
8 changes: 6 additions & 2 deletions gql/queries/FTVAEventList.gql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,12 @@ query FTVAEventList {
# ...Image
# }
startDateWithTime
startDate: startDateWithTime @formatDateTime(format: "Y-m-d", timezone: "America/Los_Angeles")
startTime: startDateWithTime @formatDateTime(format: "TH:i:s", timezone: "America/Los_Angeles")
@formatDateTime(
format: "Y-m-d\\TH:i"
timezone: "America/Los_Angeles"
)
startDate: startDateWithTime @formatDateTime(format: "Y-m-d\\TH:i:s", timezone: "America/Los_Angeles")
startTime: startDateWithTime @formatDateTime(format: "Y-m-d\\TH:i:s", timezone: "America/Los_Angeles")

ftvaEventFilters {
title
Expand Down
59 changes: 23 additions & 36 deletions gql/queries/FTVAEventSeriesDetail.gql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,16 @@ query FTVAEventSeriesDetail ($slug: [String!]) {
ftvaEventIntroduction
eventDescription
acknowledgement: richText
startDate
startDate
@formatDateTime(
format: "Y-m-d\\TH:i"
timezone: "America/Los_Angeles"
)
endDate
@formatDateTime(
format: "Y-m-d\\TH:i"
timezone: "America/Los_Angeles"
)
ongoing
location {
title
Expand All @@ -37,7 +45,7 @@ query FTVAEventSeriesDetail ($slug: [String!]) {
ftvaEvent {
uri
eventTitle
startDateWithTime
startDateWithTime @formatDateTime(format: "Y-m-d\\TH:i", timezone: "America/Los_Angeles")
ftvaImage {
...Image
}
Expand All @@ -50,9 +58,13 @@ query FTVAEventSeriesDetail ($slug: [String!]) {
to: uri
sectionHandle
title: eventTitle
startDateWithTime
startDate: startDateWithTime @formatDateTime(format: "Y-m-d", timezone: "America/Los_Angeles")
startTime: startDateWithTime @formatDateTime(format: "TH:i:s", timezone: "America/Los_Angeles")
startDateWithTime
@formatDateTime(
format: "Y-m-d\\TH:i"
timezone: "America/Los_Angeles"
)
startDate: startDateWithTime @formatDateTime(format: "Y-m-d\\TH:i", timezone: "America/Los_Angeles")
startTime: startDateWithTime @formatDateTime(format: "Y-m-d\\TH:i", timezone: "America/Los_Angeles")
image: ftvaImage {
...Image
}
Expand All @@ -67,46 +79,21 @@ query FTVAEventSeriesDetail ($slug: [String!]) {
format: "Y-m-d\\TH:i"
timezone: "America/Los_Angeles"
)
startDate: startDateWithTime @formatDateTime(format: "Y-m-d", timezone: "America/Los_Angeles")
startTime: startDateWithTime @formatDateTime(format: "TH:i:s", timezone: "America/Los_Angeles")
startDate: startDateWithTime @formatDateTime(format: "Y-m-d\\TH:i", timezone: "America/Los_Angeles")
startTime: startDateWithTime @formatDateTime(format: "Y-m-d\\TH:i", timezone: "America/Los_Angeles")
image: ftvaImage {
...Image
}
tagLabels: ftvaEventFilters {
title
}
}
# CAN BE REMOVED ONCE NEW ONES ARE WORKING
# upcomingEvents: entries(section: "ftvaEvent", relatedToEntries: { section: "ftvaEventSeries", slug: $slug }, startDateWithTime: ">= now", orderBy: "startDateWithTime ASC") {
# uri
# sectionHandle
# eventTitle
# startDateWithTime
# ftvaImage {
# ...Image
# }
# ftvaEventFilters {
# title
# }
# }
# pastEvents: entries(section: "ftvaEvent", relatedToEntries: { section: "ftvaEventSeries", slug: $slug }, startDateWithTime: "< now", orderBy: "startDateWithTime ASC") {
# uri
# sectionHandle
# eventTitle
# startDateWithTime
# ftvaImage {
# ...Image
# }
# ftvaEventFilters {
# title
# }
# }
otherSeriesOngoing: entries(section: "ftvaEventSeries", limit: 3, ongoing: true) {
uri
sectionHandle
title
startDate
endDate
startDate @formatDateTime(format: "Y-m-d\\TH:i", timezone: "America/Los_Angeles")
endDate @formatDateTime(format: "Y-m-d\\TH:i", timezone: "America/Los_Angeles")
ongoing
ftvaImage {
...Image
Expand All @@ -116,8 +103,8 @@ query FTVAEventSeriesDetail ($slug: [String!]) {
uri
sectionHandle
title
startDate
endDate
startDate @formatDateTime(format: "Y-m-d\\TH:i", timezone: "America/Los_Angeles")
endDate @formatDateTime(format: "Y-m-d\\TH:i", timezone: "America/Los_Angeles")
ongoing
ftvaImage {
...Image
Expand Down
4 changes: 2 additions & 2 deletions gql/queries/FTVAEventSeriesList.gql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ query FTVAEventSeriesList {
# image: ftvaImage {
# ...Image
# }
startDate @formatDateTime(format: "Y-m-d", timezone: "America/Los_Angeles")
endDate @formatDateTime(format: "Y-m-d", timezone: "America/Los_Angeles")
startDate @formatDateTime(format: "Y-m-d\\TH:i:s", timezone: "America/Los_Angeles")
endDate @formatDateTime(format: "Y-m-d\\TH:i:s", timezone: "America/Los_Angeles")
}
}
}
Loading