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

Add sorting in event detail page

parent 97eaba04
No related branches found
No related tags found
No related merge requests found
Pipeline #23496 passed
...@@ -8,24 +8,24 @@ import { ...@@ -8,24 +8,24 @@ import {
Item, Item,
Segment, Segment,
Table, Table,
} from 'semantic-ui-react'; } from "semantic-ui-react";
import React, { Component } from 'react'; import React, { Component } from "react";
import { import {
clearWrite, clearWrite,
getNotesByEvent, getNotesByEvent,
postEventNote, postEventNote,
writeNote, writeNote,
} from '../../actions/notes'; } from "../../actions/notes";
import { import {
getEventById, getEventById,
getTrainees, getTrainees,
submitVisitors, submitVisitors,
visitorChange, visitorChange,
} from '../../actions/statistics'; } from "../../actions/statistics";
import TraineeTableRow from './EventDetailTableRow'; import TraineeTableRow from "./EventDetailTableRow";
import { connect } from 'react-redux'; import { connect } from "react-redux";
import moment from 'moment'; import moment from "moment";
class EventDetail extends Component { class EventDetail extends Component {
constructor(props) { constructor(props) {
...@@ -43,11 +43,21 @@ class EventDetail extends Component { ...@@ -43,11 +43,21 @@ class EventDetail extends Component {
renderTrainees() { renderTrainees() {
const event = this.props.selectedEvent; const event = this.props.selectedEvent;
return this.props.trainees?.map((item) => { return this.props.trainees
?.sort(function (a, b) {
var nameA = a.full_name.toLowerCase(),
nameB = b.full_name.toLowerCase();
if (nameA < nameB)
//sort string ascending
return -1;
if (nameA > nameB) return 1;
return 0; //default return value (no sorting)
})
.map((item) => {
const notes = this.props.eventNotes?.filter( const notes = this.props.eventNotes?.filter(
(note) => note.profile === item.id (note) => note.profile === item.id
); );
return item.role === 'Student' ? ( return item.role === "Student" ? (
<TraineeTableRow <TraineeTableRow
selectedEvent={event} selectedEvent={event}
notes={notes} notes={notes}
...@@ -64,11 +74,11 @@ class EventDetail extends Component { ...@@ -64,11 +74,11 @@ class EventDetail extends Component {
return ( return (
<Segment> <Segment>
<Item> <Item>
<Divider style={{ fontSize: '2em' }} horizontal> <Divider style={{ fontSize: "2em" }} horizontal>
<Header as="h1"> <Header as="h1">
{name} {name}
<Item.Header style={{ fontSize: '0.6em' }}> <Item.Header style={{ fontSize: "0.6em" }}>
{moment(date).format('LL')} {moment(date).format("LL")}
</Item.Header> </Item.Header>
</Header> </Header>
</Divider> </Divider>
...@@ -91,7 +101,7 @@ class EventDetail extends Component { ...@@ -91,7 +101,7 @@ class EventDetail extends Component {
<Comment.Content> <Comment.Content>
<Comment.Author>{note.created_by_name}</Comment.Author> <Comment.Author>{note.created_by_name}</Comment.Author>
<Comment.Metadata> <Comment.Metadata>
{moment(note.created_at).format('LL')} {moment(note.created_at).format("LL")}
</Comment.Metadata> </Comment.Metadata>
<Comment.Text>{note.note}</Comment.Text> <Comment.Text>{note.note}</Comment.Text>
</Comment.Content> </Comment.Content>
...@@ -99,7 +109,7 @@ class EventDetail extends Component { ...@@ -99,7 +109,7 @@ class EventDetail extends Component {
</Segment> </Segment>
); );
} }
return ''; return "";
}); });
} }
...@@ -107,11 +117,11 @@ class EventDetail extends Component { ...@@ -107,11 +117,11 @@ class EventDetail extends Component {
const event = this.props.selectedEvent; const event = this.props.selectedEvent;
const note = this.props.actualNote; const note = this.props.actualNote;
return ( return (
<Container style={{ paddingTop: '1em', paddingBottom: '7em' }}> <Container style={{ paddingTop: "1em", paddingBottom: "7em" }}>
<Container textAlign="center"> <Container textAlign="center">
{this.props.selectedEvent && this.props.trainees {this.props.selectedEvent && this.props.trainees
? this.renderEvent() ? this.renderEvent()
: ''} : ""}
</Container> </Container>
{!this.state.edit ? ( {!this.state.edit ? (
<Button onClick={() => this.setState({ edit: true })}> <Button onClick={() => this.setState({ edit: true })}>
...@@ -123,7 +133,7 @@ class EventDetail extends Component { ...@@ -123,7 +133,7 @@ class EventDetail extends Component {
this.setState({ edit: false }); this.setState({ edit: false });
}} }}
> >
{' '} {" "}
Kész Kész
</Button> </Button>
)} )}
...@@ -141,7 +151,7 @@ class EventDetail extends Component { ...@@ -141,7 +151,7 @@ class EventDetail extends Component {
</Table> </Table>
<Comment.Group> <Comment.Group>
<Header dividing>Megjegyzések</Header> <Header dividing>Megjegyzések</Header>
{this.props.eventNotes ? this.renderComments() : ''} {this.props.eventNotes ? this.renderComments() : ""}
<Form reply> <Form reply>
<Form.TextArea <Form.TextArea
value={note.note} value={note.note}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment