diff --git a/src/components/pages/LeaderBoard.js b/src/components/pages/LeaderBoard.js index d4211db91d8f3f9608a2403477780a5b53c112b4..5e1596aa827a14bef46920aa68aae31ecf3265b8 100644 --- a/src/components/pages/LeaderBoard.js +++ b/src/components/pages/LeaderBoard.js @@ -14,9 +14,8 @@ class LeaderBoard extends Component { return this.props.trainees .sort( (a, b) => - Number(b.homework_bits) + - b.events_visited - - (Number(a.homework_bits) + a.events_visited) + (Number(b.homework_bits) + Number(b.events_visited) + Number(b.extra_bits)) - + (Number(a.homework_bits) + Number(a.events_visited) + Number(a.extra_bits)) ) .map((trainee) => trainee.role === 'Student' ? ( @@ -24,10 +23,10 @@ class LeaderBoard extends Component { <Table.Cell textAlign="center">{trainee.full_name}</Table.Cell> <Table.Cell textAlign="center">{trainee.events_visited}</Table.Cell> <Table.Cell textAlign="center"> - {Number(trainee.homework_bits)} + {Number(trainee.homework_bits) + Number(trainee.extra_bits)} </Table.Cell> <Table.Cell textAlign="center"> - {Number(trainee.homework_bits) + trainee.events_visited} + {Number(trainee.homework_bits) + trainee.events_visited + Number(trainee.extra_bits)} </Table.Cell> </Table.Row> ) : null