Skip to content
Snippets Groups Projects
Commit 6bcd005b authored by Rafael László's avatar Rafael László :speech_balloon:
Browse files

fix and cleanup

parent 8538d59c
No related branches found
No related tags found
No related merge requests found
...@@ -14,7 +14,7 @@ class Events extends Component { ...@@ -14,7 +14,7 @@ class Events extends Component {
renderEvents() { renderEvents() {
return this.props.events.map((event) => { return this.props.events.map((event) => {
return ( return (
<Table.Row > <Table.Row key={event.id}>
<Table.Cell textAlign='center'> <Table.Cell textAlign='center'>
<Link to={`events/${event.id}`}> <Link to={`events/${event.id}`}>
{event.name} {event.name}
......
import React, { Component } from 'react'; import React, { Component } from 'react';
import { Container, Table, Icon } from 'semantic-ui-react'; import { Container, Table } from 'semantic-ui-react';
import { connect } from 'react-redux'; import { connect } from 'react-redux';
import { getTrainees } from '../../actions/statistics'; import { getTrainees } from '../../actions/statistics';
...@@ -15,11 +15,11 @@ class LeaderBoard extends Component { ...@@ -15,11 +15,11 @@ class LeaderBoard extends Component {
- (Number(a.homework_bits) + a.events_visited) - (Number(a.homework_bits) + a.events_visited)
}).map((trainee) => { }).map((trainee) => {
return ( return (
<Table.Row> <Table.Row key={trainee.nick}>
<Table.Cell textAlign='center'> <Table.Cell textAlign='center'>
{trainee.full_name} {trainee.full_name}
</Table.Cell> </Table.Cell>
<Table.Cell textAlign='center'> <Table.Cell textAlign='center' >
{trainee.events_visited} {trainee.events_visited}
</Table.Cell> </Table.Cell>
<Table.Cell textAlign='center'> <Table.Cell textAlign='center'>
...@@ -54,11 +54,14 @@ class LeaderBoard extends Component { ...@@ -54,11 +54,14 @@ class LeaderBoard extends Component {
</Table.Row> </Table.Row>
</Table.Header> </Table.Header>
<Table.Body> <Table.Body>
{this.props.trainees ? {this.props.trainees ?
this.renderTraineeBits() this.renderTraineeBits()
: :
'Nincsenek képződők' <Table.Row>
<Table.Cell>
Nincsenek képződők
</Table.Cell>
</Table.Row>
} }
</Table.Body> </Table.Body>
</Table> </Table>
......
...@@ -14,13 +14,13 @@ class Presence extends Component { ...@@ -14,13 +14,13 @@ class Presence extends Component {
return (this.props.events.map((event) => { return (this.props.events.map((event) => {
if (event.visitors.includes(trainee.id)) { if (event.visitors.includes(trainee.id)) {
return ( return (
<Table.Cell textAlign='center'> <Table.Cell textAlign='center' key={Math.random()}>
<Icon color='green' name='checkmark' /> <Icon color='green' name='checkmark' />
</Table.Cell> </Table.Cell>
); );
} }
return ( return (
<Table.Cell textAlign='center'> <Table.Cell textAlign='center' key={Math.random()}>
<Icon color='red' name='cancel' /> <Icon color='red' name='cancel' />
</Table.Cell> </Table.Cell>
); );
...@@ -31,7 +31,7 @@ class Presence extends Component { ...@@ -31,7 +31,7 @@ class Presence extends Component {
renderTraineesWithEvents() { renderTraineesWithEvents() {
return this.props.trainees.map((trainee) => return this.props.trainees.map((trainee) =>
{ return ( { return (
<Table.Row> <Table.Row key={Math.random()}>
<Table.Cell textAlign='center'> <Table.Cell textAlign='center'>
{trainee.full_name} {trainee.full_name}
</Table.Cell> </Table.Cell>
...@@ -44,7 +44,8 @@ class Presence extends Component { ...@@ -44,7 +44,8 @@ class Presence extends Component {
// Column for each event // Column for each event
renderTableHeaderEvents() { renderTableHeaderEvents() {
return (this.props.events.map(event => { return (this.props.events.map(event => {
return (<Table.HeaderCell textAlign='center'> return (
<Table.HeaderCell textAlign='center' key={event.id}>
{event.name} {event.name}
</Table.HeaderCell> </Table.HeaderCell>
) )
...@@ -68,7 +69,11 @@ class Presence extends Component { ...@@ -68,7 +69,11 @@ class Presence extends Component {
{this.props.trainees ? {this.props.trainees ?
this.renderTraineesWithEvents() this.renderTraineesWithEvents()
: :
'Nincsenek képződők' <Table.Row>
<Table.Cell>
Nincsenek képződők
</Table.Cell>
</Table.Row>
} }
</Table.Body> </Table.Body>
</Table> </Table>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment