Skip to content

Commit

Permalink
Merge pull request #462 from gdg-x/fix-speaker-session-binding
Browse files Browse the repository at this point in the history
Fix sessions to speakers binding
  • Loading branch information
ozasadnyy committed Jul 3, 2018
2 parents cf79547 + 1480697 commit dfde0d9
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 14 deletions.
8 changes: 4 additions & 4 deletions scripts/redux/actions.js
Original file line number Diff line number Diff line change
Expand Up @@ -471,11 +471,11 @@ const scheduleActions = {

sessionsList.forEach((session) => {
if (Array.isArray(session.speakers)) {
session.speakers.forEach((speakerId) => {
if (Array.isArray(sessionsObjBySpeaker[speakerId])) {
sessionsObjBySpeaker[speakerId].push(session);
session.speakers.forEach((speaker) => {
if (Array.isArray(sessionsObjBySpeaker[speaker.id])) {
sessionsObjBySpeaker[speaker.id].push(session);
} else {
sessionsObjBySpeaker[speakerId] = [session];
sessionsObjBySpeaker[speaker.id] = [session];
}
});
}
Expand Down
18 changes: 9 additions & 9 deletions scripts/schedule-webworker.js
Original file line number Diff line number Diff line change
Expand Up @@ -66,11 +66,11 @@ self.addEventListener('message', ({ data }) => {
const timeslotLen = day.timeslots.length;
for (let timeslotsIndex = 0; timeslotsIndex < timeslotLen; timeslotsIndex++) {
const timeslot = day.timeslots[timeslotsIndex];
let innnerSessions = [];
let innerSessions = [];

const sessionsLen = timeslot.sessions.length;
for (let sessionIndex = 0; sessionIndex < sessionsLen; sessionIndex++) {
let subsessions = [];
let subSessions = [];

const subSessionsLen = timeslot.sessions[sessionIndex].items.length;
for (let subSessionIndex = 0; subSessionIndex < subSessionsLen; subSessionIndex++) {
Expand Down Expand Up @@ -98,7 +98,7 @@ self.addEventListener('message', ({ data }) => {
}
scheduleTags = addTagTo(scheduleTags || [], mainTag);

const finalSubsession = Object.assign({}, subsession, {
const finalSubSession = Object.assign({}, subsession, {
mainTag,
id: sessionId.toString(),
day: dayKey,
Expand All @@ -114,13 +114,13 @@ self.addEventListener('message', ({ data }) => {
})) : [],
});

subsessions.push(finalSubsession);
sessions[sessionId] = finalSubsession;
subSessions.push(finalSubSession);
sessions[sessionId] = finalSubSession;
if (subsession.speakers) {
speakers = Object.assign(
{},
speakers,
updateSpeakersSessions(speakersRaw, subsession.speakers, finalSubsession)
updateSpeakersSessions(speakersRaw, subsession.speakers, finalSubSession)
);
}
}
Expand All @@ -135,9 +135,9 @@ self.addEventListener('message', ({ data }) => {
extensions[sessionIndex + 1] = timeslot.sessions[sessionIndex].extend;
}

innnerSessions = [...innnerSessions, {
innerSessions = [...innerSessions, {
gridArea: `${start} / ${end}`,
items: subsessions,
items: subSessions,
}];
}

Expand All @@ -150,7 +150,7 @@ self.addEventListener('message', ({ data }) => {
}

timeslots.push(Object.assign({}, timeslot, {
sessions: innnerSessions,
sessions: innerSessions,
}));
}

Expand Down
2 changes: 1 addition & 1 deletion src/pages/home-page.html
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@
}

.hero-logo {
max-width: unset;
max-width: 320px;
}

.info-items {
Expand Down
1 change: 1 addition & 0 deletions src/pages/team-page.html
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@

.name {
padding-left: 6px;
line-height: 1.2;
}

.activity {
Expand Down

0 comments on commit dfde0d9

Please sign in to comment.