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: Always label agenda session headers with day in meeting time zone #5282

Merged
merged 3 commits into from
Mar 6, 2023
Merged

fix: Always label agenda session headers with day in meeting time zone #5282

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2452789
fix: Always label agenda session headers with day in meeting time zone
jennifer-richards Mar 3, 2023
4ceb170
test: Test day labeling on agenda session header when changing tz
jennifer-richards Mar 3, 2023
e637169
test: Label timeslot, not session, as 'Session I' etc for agenda tests
jennifer-richards Mar 3, 2023
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
2 changes: 1 addition & 1 deletion client/agenda/AgendaScheduleList.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ const meetingEvents = computed(() => {
key: `sesshd-${item.id}`,
displayType: 'session-head',
timeslot: itemTimeSlot,
name: `${item.adjustedStart.toFormat('cccc')} ${item.slotName}`,
name: `${item.adjustedStart.setZone(agendaStore.meeting.timezone).toFormat('cccc')} ${item.slotName}`,
cssClasses: 'agenda-table-display-session-head' + (isLive ? ' agenda-table-live' : '')
})
}
Expand Down
8 changes: 5 additions & 3 deletions playwright/helpers/meeting.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,7 @@ let lastSessionId = 25000
let lastRecordingId = 150000
function createEvent ({
name = '',
slotName = '',
startDateTime,
duration = '1h',
area,
Expand Down Expand Up @@ -152,6 +153,7 @@ function createEvent ({
acronym: group.keyword,
duration: typeof duration === 'string' ? ms(duration) / 1000 : duration,
name: eventName,
slotName: slotName,
startDateTime: startDateTime.toISO({ includeOffset: false, suppressMilliseconds: true }),
status,
type,
Expand Down Expand Up @@ -514,7 +516,7 @@ module.exports = {
_.times(8, () => { // 8 lanes per session time
const { area, ...group } = daySessions.pop()
schedule.push(createEvent({
name: 'Session I',
slotName: 'Session I',
startDateTime: curDay.set({ hour: 10 }),
duration: '2h',
type: 'regular',
Expand Down Expand Up @@ -543,7 +545,7 @@ module.exports = {
_.times(8, () => { // 8 lanes per session time
const { area, ...group } = daySessions.pop()
schedule.push(createEvent({
name: 'Session II',
slotName: 'Session II',
startDateTime: curDay.set({ hour: 13, minute: 30 }),
duration: '1h',
type: 'regular',
Expand Down Expand Up @@ -574,7 +576,7 @@ module.exports = {
_.times(8, () => { // 8 lanes per session time
const { area, ...group } = daySessions.pop()
schedule.push(createEvent({
name: 'Session III',
slotName: 'Session III',
startDateTime: curDay.set({ hour: 15 }),
duration: '2h',
type: 'regular',
Expand Down
3 changes: 3 additions & 0 deletions playwright/tests/meeting/agenda.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,7 @@ test.describe('past - desktop', () => {
.setLocale(BROWSER_LOCALE)
.toFormat('DD \'at\' T ZZZZ')
await expect(page.locator('.agenda h6').first()).toContainText(localDateTime)
await expect(page.locator('.agenda .agenda-table-display-session-head .agenda-table-cell-name').first()).toContainText('Monday Session I')
// Switch to UTC
await tzUtcBtnLocator.click()
await expect(tzUtcBtnLocator).toHaveClass(/n-button--primary-type/)
Expand All @@ -148,10 +149,12 @@ test.describe('past - desktop', () => {
.toFormat('DD \'at\' T ZZZZ')
await expect(page.locator('.agenda h6').first()).toContainText(utcDateTime)
await expect(page.locator('.agenda .agenda-timezone-ddn')).toContainText('UTC')
await expect(page.locator('.agenda .agenda-table-display-session-head .agenda-table-cell-name').first()).toContainText('Monday Session I')
// Switch back to meeting timezone
await tzMeetingBtnLocator.click()
await expect(tzMeetingBtnLocator).toHaveClass(/n-button--primary-type/)
await expect(page.locator('.agenda .agenda-timezone-ddn')).toContainText('Tokyo')
await expect(page.locator('.agenda .agenda-table-display-session-head .agenda-table-cell-name').first()).toContainText('Monday Session I')
})
})

Expand Down