From a40bc81e24a1de22b2b2f38445b56980b126b2ae Mon Sep 17 00:00:00 2001
From: danieldeng2 <danieldeng223@gmail.com>
Date: Sat, 5 Sep 2020 23:52:05 +0100
Subject: [PATCH] Fix dateToColumn mistake
---
src/components/pages/Timeline/components/EventGrid/index.tsx | 4 ++--
src/components/pages/Timeline/index.tsx | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/components/pages/Timeline/components/EventGrid/index.tsx b/src/components/pages/Timeline/components/EventGrid/index.tsx
index 4f8a35e7c..4f58c5c04 100644
--- a/src/components/pages/Timeline/components/EventGrid/index.tsx
+++ b/src/components/pages/Timeline/components/EventGrid/index.tsx
@@ -41,8 +41,8 @@ const EventGrid: React.FC<EventGridProps> = ({
eventPositions.push({
title: event.title,
id: event.id,
- startColumn: dateToColumn(event.startDate) - 1,
- endColumn: dateToColumn(event.endDate),
+ startColumn: dateToColumn(event.startDate),
+ endColumn: dateToColumn(event.endDate) + 1,
rowNumber: currRow,
});
}
diff --git a/src/components/pages/Timeline/index.tsx b/src/components/pages/Timeline/index.tsx
index 53e62edfe..2f9e46882 100644
--- a/src/components/pages/Timeline/index.tsx
+++ b/src/components/pages/Timeline/index.tsx
@@ -136,7 +136,7 @@ class Timeline extends React.Component<TimelineProps, TimelineState> {
trackHeight={trackHeight}
modulesList={currModules}
modulesTracks={this.state.modulesTracks}
- dateToColumn={(date) => this.dateToColumn(date, termStart) + 1}
+ dateToColumn={(date) => this.dateToColumn(date, termStart)}
isInTerm={(date) => this.isInTerm(date, termStart, numWeeks)}
/>
</div>
--
GitLab