Skip to content

Commit 68b062a

Browse files
author
Jonas Gossens
committed
🐛 Fix GridCalendar
1 parent 0ebe2b5 commit 68b062a

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

src/react-chayns-gridcalendar/component/GridCalendar.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -392,7 +392,7 @@ export default class ProgressCalendar extends Component {
392392
const { data } = this.props;
393393
if (this.content && data) {
394394
return (
395-
<div className="calendar__content_groups">
395+
<div className="calendar__content_groups" style={{ width: '35%', paddingRight: '5px' }}>
396396
{
397397
data.map(user => (
398398
<div className="calendar__user ellipsis" key={user.id}>

src/react-chayns-gridcalendar/component/content/Navigator.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ export default class Navigator extends PureComponent {
3636

3737
return (
3838
<div className="calendar__navigator no_select">
39-
<div className="calendar__navigator_wrapper">
39+
<div className="calendar__navigator_wrapper" style={{ width: '35%' }}>
4040
<div className="calendar__navigator_icon" style={{ transform: 'rotate(180deg)' }}>
4141
{hidden.left ? '' : (
4242
<span onClick={onClick.left}>

src/react-chayns-gridcalendar/component/content/User.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ export default class User extends PureComponent {
3939
<div className="calendar__content_userEntries">
4040
{entries.map((e, i) => (
4141
<Week
42-
data={entries}
42+
data={e}
4343
groups={groups}
4444
key={e[0].date.getTime() + i}
4545
onClick={onClick}

src/react-chayns-gridcalendar/component/content/Week.jsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@ export default class Week extends Component {
3131
const {
3232
onClick, focus, groupFocus, data,
3333
} = this.props;
34-
const days = []; let
35-
i = 0;
34+
const days = [];
35+
let i = 0;
3636
for (i; i < data.length; i += 1) {
3737
let background = '';
38-
const day = data[i][0];
38+
const day = data[i];
3939
let percentage;
4040
let start;
4141
let color = this.schemeColor;
@@ -70,7 +70,7 @@ export default class Week extends Component {
7070
const { weekWidth } = this.props;
7171
const days = this.renderDays();
7272
return (
73-
<div className="week" style={{ width: `${weekWidth * 0.9}px`, marginRight: `${weekWidth * 0.1}px` }}>
73+
<div className="week" style={{ width: `${weekWidth * 0.9}px`, marginLeft: `${weekWidth * 0.1}px` }}>
7474
<div className="week_table">
7575
<div className="week_row">
7676
{days}

0 commit comments

Comments
 (0)