Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • kszk/devteam/kszkepzes/old/kszkepzes-frontend
  • kbgergely/kszkepzes-frontend
2 results
Show changes
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 1159 additions and 938 deletions
src/components/Footer.js
View file @ 2eef83d2
import React from 'react'; import { Container, Segment } from "semantic-ui-react";
import { Container, Segment } from 'semantic-ui-react';
import React from "react";
const Footer = () => ( const Footer = () => (
<Segment inverted vertical textAlign='center' > <Segment inverted vertical textAlign="center">
<Container> <Container>
<p textalign='center' >Created by DevTeam &copy; 2018-2020.</p> <p textalign="center">Created by DevTeam &copy; 2018-2025.</p>
</Container> </Container>
</Segment> </Segment>
); );
export default Footer; export default Footer;
src/components/Header.js
View file @ 2eef83d2
import React, { Component } from 'react';
import { Link } from 'react-router-dom';
import { import {
Menu,
Container,
Button, Button,
Segment, Container,
Icon,
Image, Image,
Menu,
Popup, Popup,
Icon,
Responsive, Responsive,
} from 'semantic-ui-react'; Segment,
} from "semantic-ui-react";
import React, { Component } from "react";
import { connect } from 'react-redux'; import KSZKlogo from "./images/kszk_logo.svg";
import { getUserData } from '../actions'; import { Link } from "react-router-dom";
import KSZKlogo from './images/kszk_logo.svg'; import { connect } from "react-redux";
import { getUserData } from "../actions";
// Objects that will be converted to menu items in the render method // Objects that will be converted to menu items in the render method
const menuItems = [ const menuItems = [
{ {
text: 'Főoldal', text: "Főoldal",
to: '/home', to: "/home",
prefix: <Image size='mini' src={KSZKlogo} style={{ marginRight: '1.5em' }} />, prefix: (
<Image size="mini" src={KSZKlogo} style={{ marginRight: "1.5em" }} />
),
permissionLevel: 0, permissionLevel: 0,
}, },
{ {
text: 'Hírek', text: "Hírek",
to: '/news', to: "/news",
prefix: '', prefix: "",
permissionLevel: 0, permissionLevel: 0,
}, },
{ {
text: 'Köreink', text: "Köreink",
to: '/groups', to: "/groups",
prefix: '', prefix: "",
permissionLevel: 0, permissionLevel: 0,
}, },
{ {
text: 'Ütemterv', text: "Ütemterv",
to: '/schedule', to: "/schedule",
prefix: '', prefix: "",
permissionLevel: 1, permissionLevel: 1,
}, },
{ {
text: 'Mentorok', text: "Mentorok",
to: '/mentors', to: "/mentors",
prefix: '', prefix: "",
permissionLevel: 2, permissionLevel: 1,
}, },
{ {
text: 'Statisztika', text: "Statisztika",
to: '/statistics', to: "/statistics",
prefix: '', prefix: "",
permissionLevel: 3, permissionLevel: 3,
}, },
{ {
text: 'Jelentkezések', text: "Jelentkezések",
to: '/applications', to: "/applications",
prefix: '', prefix: "",
permissionLevel: 3, permissionLevel: 3,
}, },
{ {
text: 'Házi feladatok', text: "Házi feladatok",
to: '/homework', to: "/homework",
prefix: '', prefix: "",
permissionLevel: 2, permissionLevel: 2,
}, },
]; ];
...@@ -74,6 +76,7 @@ class Header extends Component { ...@@ -74,6 +76,7 @@ class Header extends Component {
isOpen: false, isOpen: false,
}; };
} }
// Fetch the userData-s // Fetch the userData-s
UNSAFE_componentWillMount() { UNSAFE_componentWillMount() {
this.props.getUserData(); this.props.getUserData();
...@@ -82,100 +85,106 @@ class Header extends Component { ...@@ -82,100 +85,106 @@ class Header extends Component {
// Hide the menu after clicking an item on mobile // Hide the menu after clicking an item on mobile
handleOpen = () => { handleOpen = () => {
this.setState({ isOpen: true }); this.setState({ isOpen: true });
} };
handleClose = () => { handleClose = () => {
this.setState({ isOpen: false }); this.setState({ isOpen: false });
} };
renderHeader(inHeader, hasArrowMenu) { renderHeader(inHeader) {
let renderedItemNum = 0 let renderedItemNum = 0;
let current = 0 let current = 0;
let maxNum = 0 let maxNum = 0;
if(this.props.user.id) { if (this.props.user.id) {
maxNum = menuItems.filter(item => { maxNum = menuItems.filter(
return this.props.user.permission >= item.permissionLevel (item) => this.props.user.permission >= item.permissionLevel,
}).length ).length;
} else { } else {
maxNum = 3 maxNum = 3;
} }
return ( return (
<Segment inverted textAlign='center' vertical> <Segment inverted textAlign="center" vertical>
<Container> <Container>
<Menu inverted secondary size='large'> <Menu inverted secondary size="large">
{/* Default Menu items */} {/* Default Menu items */}
{menuItems.map((item, i) => { {menuItems.map((item) => {
if (item.permissionLevel === 0) { if (item.permissionLevel === 0) {
renderedItemNum += 1 renderedItemNum += 1;
return ( return (
<Menu.Item key={i} as={Link} to={item.to}> <Menu.Item key={Math.random()} as={Link} to={item.to}>
{item.prefix}{item.text} {item.prefix}
</Menu.Item> {item.text}
) </Menu.Item>
}else { );
return null
} }
}) return null;
} })}
{/* After default menu items */} {/* After default menu items */}
{menuItems.map((item, i) => { {menuItems.map((item, i) => {
if (
if (this.props.user.permission >= item.permissionLevel this.props.user.permission >= item.permissionLevel &&
&& item.permissionLevel > 0 item.permissionLevel > 0 &&
&& renderedItemNum < inHeader renderedItemNum < inHeader &&
&& current < i) { current < i
renderedItemNum += 1 ) {
current = i renderedItemNum += 1;
current = i;
return ( return (
<Menu.Item key={i} as={Link} to={item.to}> <Menu.Item key={Math.random()} as={Link} to={item.to}>
{item.prefix}{item.text} {item.prefix}
{item.text}
</Menu.Item> </Menu.Item>
) );
} else {
return null
} }
}) return null;
} })}
{/* Arrow menu */} {/* Arrow menu */}
{ this.props.user.id && (current + 1) < maxNum ? {this.props.user.id && current + 1 < maxNum ? (
<Popup flowing hoverable inverted <Popup
flowing
hoverable
inverted
trigger={ trigger={
<Menu.Item> <Menu.Item>
<Icon name='angle down' size='large' /> <Icon name="angle down" size="large" />
</Menu.Item> </Menu.Item>
} }
position='top center' position="top center"
> >
<Menu inverted secondary size='large'> <Menu inverted secondary size="large">
{menuItems.map((item, i) => { {menuItems.map((item, i) =>
return (this.props.user.permission >= item.permissionLevel this.props.user.permission >= item.permissionLevel &&
&& item.permissionLevel > 0 item.permissionLevel > 0 &&
&& current < i ? current < i ? (
<Menu.Item key={i} as={Link} to={item.to}> <Menu.Item key={Math.random()} as={Link} to={item.to}>
{item.prefix}{item.text} {item.prefix}
</Menu.Item> {item.text}
: null </Menu.Item>
)}) ) : null,
} )}
</Menu> </Menu>
</Popup> </Popup>
: null ) : null}
}
{/* Login Button */} {/* Login Button */}
<Menu.Item position='right'> <Menu.Item position="right">
{this.props.user.id ? {this.props.user.id ? (
<Button.Group> <Button.Group>
<Button inverted as={Link} to='/profile'>Profilom</Button> <Button inverted as={Link} to="/profile">
<Button as='a' href='/api/v1/logout/' icon='sign out' /> Profilom
</Button>
<Button as="a" href="/oidc/logout/" icon="sign out" />
</Button.Group> </Button.Group>
: ) : (
<Button as='a' href='/api/v1/login/authsch/' inverted>Bejelentkezés</Button> <Button as="a" href="/oidc/authenticate/" inverted>
} Bejelentkezés
</Button>
)}
</Menu.Item> </Menu.Item>
</Menu> </Menu>
</Container> </Container>
</Segment> </Segment>
) );
} }
render() { render() {
...@@ -197,51 +206,77 @@ class Header extends Component { ...@@ -197,51 +206,77 @@ class Header extends Component {
<Responsive minWidth={1101} maxWidth={1200}> <Responsive minWidth={1101} maxWidth={1200}>
{this.renderHeader(7)} {this.renderHeader(7)}
</Responsive> </Responsive>
<Responsive minWidth={1201}> <Responsive minWidth={1201}>{this.renderHeader(8)}</Responsive>
{this.renderHeader(8)}
</Responsive>
{/* Mobile view */} {/* Mobile view */}
<Responsive maxWidth={599}> <Responsive maxWidth={599}>
<Segment inverted textAlign='center' vertical> <Segment inverted textAlign="center" vertical>
<Container> <Container>
<Menu inverted secondary size='large'> <Menu inverted secondary size="large">
{/* kszk logo + home link */} {/* kszk logo + home link */}
<Menu.Item as={Link} to={menuItems[0].to}> <Menu.Item as={Link} to={menuItems[0].to}>
{menuItems[0].prefix}{menuItems[0].text} {menuItems[0].prefix}
</Menu.Item> {menuItems[0].text}
</Menu.Item>
{/* Sandwich menu */} {/* Sandwich menu */}
<Popup flowing hoverable inverted trigger={ <Popup
<Menu.Item onClick={this.handleClose} flowing
position='right'> hoverable
<Icon name='bars' size='large' /> inverted
trigger={
<Menu.Item onClick={this.handleClose} position="right">
<Icon name="bars" size="large" />
</Menu.Item> </Menu.Item>
} }
position='top center' position="top center"
open={this.state.isOpen} open={this.state.isOpen}
onOpen={this.handleOpen} onOpen={this.handleOpen}
on='click' on="click"
size='huge' size="huge"
> >
<Menu vertical inverted secondary size='large'> <Menu vertical inverted secondary size="large">
{menuItems.map((item, i) => {menuItems.map((item, i) =>
((this.props.user.permission >= item.permissionLevel (this.props.user.permission >= item.permissionLevel ||
||item.permissionLevel === 0) && i>0? item.permissionLevel === 0) &&
<Menu.Item onClick={this.handleClose} i > 0 ? (
key={i} as={Link} to={item.to}> <Menu.Item
{item.prefix}{item.text} onClick={this.handleClose}
</Menu.Item> key={Math.random()}
: null as={Link}
)) to={item.to}
} >
{item.prefix}
{item.text}
</Menu.Item>
) : null,
)}
<Menu.Item> <Menu.Item>
{this.props.user.id ? {this.props.user.id ? (
<Button.Group> <Button.Group>
<Button onClick={this.handleClose} inverted as={Link} to='/profile'>Profilom</Button> <Button
<Button onClick={this.handleClose} as='a' href='/api/v1/logout/' icon='sign out' /> onClick={this.handleClose}
inverted
as={Link}
to="/profile"
>
Profilom
</Button>
<Button
onClick={this.handleClose}
as="a"
href="/oidc/logout/"
icon="sign out"
/>
</Button.Group> </Button.Group>
: ) : (
<Button onClick={this.handleClose} as='a' href='/api/v1/login/authsch/' inverted>Bejelentkezés</Button> <Button
} onClick={this.handleClose}
as="a"
href="/oidc/authenticate/"
inverted
>
Bejelentkezés
</Button>
)}
</Menu.Item> </Menu.Item>
</Menu> </Menu>
</Popup> </Popup>
...@@ -258,4 +293,4 @@ const mapStateToProps = ({ user }) => ({ ...@@ -258,4 +293,4 @@ const mapStateToProps = ({ user }) => ({
user, user,
}); });
export default connect(mapStateToProps, { getUserData })(Header); export default connect(mapStateToProps, { getUserData })(Header);
\ No newline at end of file
src/components/Main.js
View file @ 2eef83d2
import React from 'react'; import { Redirect, Route, Switch, withRouter } from 'react-router-dom';
import { Switch, Route, Redirect, withRouter } from 'react-router-dom';
import ApplicantProfile from './pages/ApplicantProfile';
import Applications from './pages/Applications';
import EventDetail from './pages/EventDetail';
import Groups from './pages/Groups';
import Home from './pages/Home'; import Home from './pages/Home';
import Homework from './pages/Homework';
import Mentors from './pages/Mentors'; import Mentors from './pages/Mentors';
import Schedule from './pages/Schedule'; import News from './pages/News';
import NotFound from './pages/NotFound'; import NotFound from './pages/NotFound';
import Profile from './pages/Profile'; import Profile from './pages/Profile';
import React from 'react';
import Schedule from './pages/Schedule';
import Statistics from './pages/Statistics'; import Statistics from './pages/Statistics';
import Groups from './pages/Groups';
import News from './pages/News';
import Homework from './pages/Homework';
import Applications from './pages/Applications';
import EventDetail from './pages/EventDetail';
import ApplicantProfile from './pages/ApplicantProfile';
const Main = () => ( const Main = () => (
<Switch> <Switch>
<Redirect exact from='/' to='/home' /> <Redirect exact from="/" to="/home" />
<Route exact path='/home' component={Home} /> <Route exact path="/home" component={Home} />
<Route path='/news' component={News} /> <Route path="/news" component={News} />
<Route path='/mentors' component={Mentors} /> <Route path="/mentors" component={Mentors} />
<Route path='/schedule' component={Schedule} /> <Route path="/schedule" component={Schedule} />
<Route path='/profile' component={withRouter(Profile)} /> <Route path="/profile" component={withRouter(Profile)} />
<Route path='/statistics' component={Statistics} /> <Route path="/statistics" component={Statistics} />
<Route path='/groups' component={Groups} /> <Route path="/groups" component={Groups} />
<Route path='/homework' component={Homework} /> <Route path="/homework" component={Homework} />
<Route path='/events/:id' component={EventDetail} /> <Route path="/events/:id" component={EventDetail} />
<Route path='/applications' component={Applications} /> <Route path="/applications" component={Applications} />
<Route path='/applicant/:id' component={ApplicantProfile} /> <Route path="/applicant/:id" component={ApplicantProfile} />
<Route component={NotFound} /> <Route component={NotFound} />
</Switch> </Switch>
); );
......
src/components/extra/GroupCard.js
View file @ 2eef83d2
import React, {Component} from 'react' import { Divider, Header, Segment } from 'semantic-ui-react';
import { Segment, Header, Divider } from 'semantic-ui-react'; import React, { Component } from 'react';
class GroupCard extends Component { class GroupCard extends Component {
render(){ render() {
return ( return (
<Segment style={{ marginTop: 0 }}> <Segment style={{ marginTop: 0 }}>
<Divider style={{ fontSize: '2em'}} horizontal><Header as='h3' style={{ fontSize: '1.2em'}}>{this.props.label}</Header></Divider> <Divider style={{ fontSize: '2em' }} horizontal>
<div className='paragraph' dangerouslySetInnerHTML={{__html: this.props.value}}> <Header as="h3" style={{ fontSize: '1.2em' }}>
</div> {this.props.label}
</Segment> </Header>
) </Divider>
} <div
className="paragraph"
dangerouslySetInnerHTML={{ __html: this.props.value }}
/>
</Segment>
);
}
} }
export default GroupCard export default GroupCard;
\ No newline at end of file
src/components/forms/AddEventForm.js
View file @ 2eef83d2
import { Button, Form, Icon, Input, Modal } from 'semantic-ui-react';
import React, { Component } from 'react'; import React, { Component } from 'react';
import { Modal, Button, Form, Input, Icon } from 'semantic-ui-react'; import { addEvent, eventDate, writeEvent } from '../../actions/statistics';
import { connect } from 'react-redux';
import { DateTimeInput } from 'semantic-ui-calendar-react'; import { DateTimeInput } from 'semantic-ui-calendar-react';
import { writeEvent, eventDate, addEvent } from '../../actions/statistics' import { clearWrite } from '../../actions/news';
import { clearWrite } from '../../actions/news' import { connect } from 'react-redux';
class AddEventForm extends Component { class AddEventForm extends Component {
constructor(props) { constructor(props) {
...@@ -14,15 +15,14 @@ class AddEventForm extends Component { ...@@ -14,15 +15,14 @@ class AddEventForm extends Component {
}; };
} }
// Handling change in redux action creator throws an exception // Handling change in redux action creator throws an exception
// Temporal solotion using the components state to display, instead redux state // Temporal solotion using the components state to display, instead redux state
handleChange = (event, {name, value}) => { handleChange = (event, { name, value }) => {
if (this.state.hasOwnProperty(name)) { if (this.state.hasOwnProperty(name)) {
this.setState({ [name]: value }); this.setState({ [name]: value });
} }
this.props.eventDate(name, value) this.props.eventDate(name, value);
} };
render() { render() {
const { name, description } = this.props.newEvent; const { name, description } = this.props.newEvent;
...@@ -31,9 +31,12 @@ class AddEventForm extends Component { ...@@ -31,9 +31,12 @@ class AddEventForm extends Component {
open={this.state.showModal} open={this.state.showModal}
trigger={ trigger={
<Button <Button
size='big' size="big"
onClick={() => { this.setState({ showModal: true }); }} onClick={() => {
>Alkalom hozzáadása this.setState({ showModal: true });
}}
>
Alkalom hozzáadása
</Button> </Button>
} }
> >
...@@ -46,26 +49,26 @@ class AddEventForm extends Component { ...@@ -46,26 +49,26 @@ class AddEventForm extends Component {
<Form> <Form>
<Form.Field <Form.Field
control={Input} control={Input}
label='Név' label="Név"
name='name' name="name"
onChange={e => this.props.writeEvent(e)} onChange={(e) => this.props.writeEvent(e)}
value={name} value={name}
style={{ style={{
marginBottom: '20px', marginBottom: '20px',
}} }}
placeholder='Title' placeholder="Title"
/> />
<Form.TextArea <Form.TextArea
name='description' name="description"
label='Leírás:' label="Leírás:"
placeholder='Rövid leírás' placeholder="Rövid leírás"
value={description} value={description}
onChange={e => this.props.writeEvent(e)} onChange={(e) => this.props.writeEvent(e)}
/> />
<DateTimeInput <DateTimeInput
name="date" name="date"
label="Dátum:" label="Dátum:"
dateFormat='YYYY-MM-DD' dateFormat="YYYY-MM-DD"
placeholder="Date" placeholder="Date"
value={this.state.date} value={this.state.date}
iconPosition="left" iconPosition="left"
...@@ -76,22 +79,24 @@ class AddEventForm extends Component { ...@@ -76,22 +79,24 @@ class AddEventForm extends Component {
<Modal.Actions> <Modal.Actions>
<Button <Button
inverted inverted
color='red' color="red"
onClick={() => { this.setState({ showModal: false }); onClick={() => {
this.props.clearWrite();}} this.setState({ showModal: false });
this.props.clearWrite();
}}
> >
<Icon name='remove' /> <Icon name="remove" />
Cancel Cancel
</Button> </Button>
<Button <Button
inverted inverted
color='green' color="green"
onClick={() => { onClick={() => {
this.props.addEvent(this.props.newEvent); this.props.addEvent(this.props.newEvent);
this.setState({ showModal: false, date: '' }); this.setState({ showModal: false, date: '' });
}} }}
> >
<Icon name='checkmark' /> Add <Icon name="checkmark" /> Add
</Button> </Button>
</Modal.Actions> </Modal.Actions>
</Modal> </Modal>
...@@ -101,4 +106,9 @@ class AddEventForm extends Component { ...@@ -101,4 +106,9 @@ class AddEventForm extends Component {
const mapStateToProps = ({ events: { newEvent } }) => ({ newEvent }); const mapStateToProps = ({ events: { newEvent } }) => ({ newEvent });
export default connect(mapStateToProps, { writeEvent, addEvent, eventDate, clearWrite })(AddEventForm); export default connect(mapStateToProps, {
writeEvent,
addEvent,
eventDate,
clearWrite,
})(AddEventForm);
src/components/forms/AddNewsForm.js
View file @ 2eef83d2
import { Button, Form, Icon, Input, Modal, TextArea } from 'semantic-ui-react';
import React, { Component } from 'react'; import React, { Component } from 'react';
import { Modal, Button, Form, Input, TextArea, Icon } from 'semantic-ui-react'; import { clearWrite, postNews, writeNews } from '../../actions/news';
import { connect } from 'react-redux';
import { postNews, writeNews, clearWrite } from '../../actions/news'; import { connect } from 'react-redux';
class AddNewsForm extends Component { class AddNewsForm extends Component {
constructor(props) { constructor(props) {
...@@ -20,9 +20,12 @@ class AddNewsForm extends Component { ...@@ -20,9 +20,12 @@ class AddNewsForm extends Component {
open={this.state.showModal} open={this.state.showModal}
trigger={ trigger={
<Button <Button
size='big' size="big"
onClick={() => { this.setState({ showModal: true }); }} onClick={() => {
>Hír hozzáadása this.setState({ showModal: true });
}}
>
Hír hozzáadása
</Button> </Button>
} }
> >
...@@ -31,41 +34,43 @@ class AddNewsForm extends Component { ...@@ -31,41 +34,43 @@ class AddNewsForm extends Component {
<Form> <Form>
<Form.Field <Form.Field
control={Input} control={Input}
label='Title' label="Title"
name='title' name="title"
onChange={e => this.props.writeNews(e)} onChange={(e) => this.props.writeNews(e)}
value={title} value={title}
placeholder='Title' placeholder="Title"
/> />
<Form.Field <Form.Field
control={TextArea} control={TextArea}
label='Text' label="Text"
name='text' name="text"
onChange={e => this.props.writeNews(e)} onChange={(e) => this.props.writeNews(e)}
value={text} value={text}
placeholder='Tell us what you want...' placeholder="Tell us what you want..."
/> />
</Form> </Form>
</Modal.Content> </Modal.Content>
<Modal.Actions> <Modal.Actions>
<Button <Button
inverted inverted
color='red' color="red"
onClick={() => { this.setState({ showModal: false }); }} onClick={() => {
this.setState({ showModal: false });
}}
> >
<Icon name='remove' /> <Icon name="remove" />
Cancel Cancel
</Button> </Button>
<Button <Button
inverted inverted
color='green' color="green"
onClick={() => { onClick={() => {
this.props.postNews({ title, text, updated_by }); this.props.postNews({ title, text, updated_by });
this.setState({ showModal: false }); this.setState({ showModal: false });
this.props.clearWrite(); this.props.clearWrite();
}} }}
> >
<Icon name='checkmark' /> Add <Icon name="checkmark" /> Add
</Button> </Button>
</Modal.Actions> </Modal.Actions>
</Modal> </Modal>
...@@ -75,4 +80,6 @@ class AddNewsForm extends Component { ...@@ -75,4 +80,6 @@ class AddNewsForm extends Component {
const mapStateToProps = ({ newNews, user }) => ({ newNews, user }); const mapStateToProps = ({ newNews, user }) => ({ newNews, user });
export default connect(mapStateToProps, { postNews, writeNews, clearWrite })(AddNewsForm); export default connect(mapStateToProps, { postNews, writeNews, clearWrite })(
AddNewsForm
);
src/components/forms/AddSolutionForm.js
View file @ 2eef83d2
import React, { Component } from 'react';
import { Modal, Button, Form, Input, TextArea, Icon, Header, Segment, Divider, Dimmer, Loader } from 'semantic-ui-react';
import { connect } from 'react-redux';
import { addSolution, writeSolution, writeSolutionFile, addDocument, clearWrite } from '../../actions/homework';
import './Forms.css'; import './Forms.css';
import ConfirmModal from '../forms/ConfirmModal';
import { customMessage } from '../pages/Homework';
import { import {
Button,
Dimmer,
Divider,
Form,
Header,
Icon,
Input,
Loader,
Modal,
Segment,
TextArea,
} from 'semantic-ui-react';
import React, { Component } from 'react';
import {
addDocument,
addSolution,
clearWrite,
getDocuments, getDocuments,
getSolutions, getSolutions,
writeSolution,
writeSolutionFile,
} from '../../actions/homework'; } from '../../actions/homework';
import ConfirmModal from './ConfirmModal';
import { connect } from 'react-redux';
import { customMessage } from '../pages/Homework';
const allowedFileTypes = [ const allowedFileTypes = [
'image/jpeg', 'image/jpeg',
'image/png', 'image/png',
'application/x-zip-compressed', 'application/zip',
'application/x-zip',
]; ];
const allowedFileEnds = ['.zip', '.jpeg', '.jpg', '.jpe', '.png'];
function validateFileName(fileNameToValidate) {
return (
allowedFileEnds.find((typeName) => {
return fileNameToValidate.toLowerCase().endsWith(typeName);
}).length > 0
);
}
// in megabytes // in megabytes
const maxFileSize = 50; const maxFileSize = 50;
class AddSolutionForm extends Component { class AddSolutionForm extends Component {
constructor(props) { constructor(props) {
super(props); super(props);
this.state = { this.state = {
showModal: false, showModal: false,
uploadState: true, loading: false,
}; };
} }
render() { render() {
const { const { name, description, file } = this.props.newSolution;
name, description, file
} = this.props.newSolution
const task = this.props.taskid; const task = this.props.taskid;
const thisTaskSolution = this.props.homeworks.solutions const thisTaskSolution = this.props.homeworks.solutions.filter(
.filter(solution => solution.task === task) (solution) => solution.task === task
const thisTaskDocument = this.props.homeworks.documents );
.filter(document => document.solution === thisTaskSolution[0]?.id) const thisTaskDocument = this.props.homeworks.documents.filter(
(document) => document.solution === thisTaskSolution[0]?.id
);
const lastName = thisTaskDocument[0]?.name const lastName = thisTaskDocument[0]?.name;
const lastDesc = thisTaskDocument[0]?.description const lastDesc = thisTaskDocument[0]?.description;
const lastFile = thisTaskDocument[0]?.file_url const lastFile = thisTaskDocument[0]?.file_url;
const corrected = false; const corrected = false;
const accepted = false; const accepted = false;
...@@ -58,182 +86,231 @@ class AddSolutionForm extends Component { ...@@ -58,182 +86,231 @@ class AddSolutionForm extends Component {
onClose={() => this.setState({ showModal: false })} onClose={() => this.setState({ showModal: false })}
trigger={ trigger={
<button <button
id='task' type="button"
onClick={() => { id="task"
onClick={() => {
this.setState({ showModal: true }); this.setState({ showModal: true });
}} }}
> >
<Icon name='external' /> <Icon name="external" />
{this.props.tasktitle} {this.props.tasktitle}
</button> </button>
} }
> >
<Modal.Header> <Modal.Header>
{this.props.multiple ? 'Másik megoldás' : 'Megoldás'} beadása a(z) {this.props.tasktitle} nevű feladathoz: {this.props.multiple ? 'Másik megoldás' : 'Megoldás'} beadása a(z)
{this.props.tasktitle} nevű feladathoz:
</Modal.Header> </Modal.Header>
<Modal.Content> <Modal.Content>
<Modal.Description style={{ marginBottom: '2em' }}> <Modal.Description style={{ marginBottom: '2em' }}>
<Header as='h5'>Feladat leírása:</Header> <Header as="h5">Feladat leírása:</Header>
{sentences.map(s => (<p key={Math.random()}>{s}</p>))} {sentences.map((s) => (
<p key={Math.random()}>{s}</p>
))}
</Modal.Description> </Modal.Description>
{this.props.disabled ? {this.props.disabled ? (
<div> <div>
{lastName ? {lastName ? (
<div style={{paddingBottom: '1em'}}> <div style={{ paddingBottom: '1em' }}>
<div style={{ marginBottom: '1em', fontWeight: 'bold' }}>Legutóbbi megoldásod:</div> <div style={{ marginBottom: '1em', fontWeight: 'bold' }}>
<Segment attached='top'> Legutóbbi megoldásod:
<h5 style={{paddingBottom: '0.4em'}}>Cím:</h5> </div>
<Segment attached="top">
<h5 style={{ paddingBottom: '0.4em' }}>Cím:</h5>
{lastName} {lastName}
</Segment> </Segment>
<Segment attached> <Segment attached>
<h5 style={{paddingBottom: '0.4em'}}>Leírás:</h5> <h5 style={{ paddingBottom: '0.4em' }}>Leírás:</h5>
{lastDesc} {lastDesc}
</Segment> </Segment>
<Segment attached='bottom'> <Segment attached="bottom">
<h5>Beadott fájl:</h5> <h5>Beadott fájl:</h5>
{lastFile ? {lastFile ? (
<a href={lastFile} rel='noreferrer noopener' target='_blank'>Fájl letöltése</a> <a href={lastFile} rel="noreferrer noopener" download>
: Fájl letöltése
</a>
) : (
<span>-</span> <span>-</span>
} )}
</Segment> </Segment>
</div> </div>
: ) : (
customMessage(disabledText, undefined, undefined, this.props.disabled) customMessage(
} disabledText,
undefined,
undefined,
this.props.disabled
)
)}
</div> </div>
) : (
:
<Form> <Form>
{lastName ? {lastName ? (
<div style={{paddingBottom: '1em'}}> <div style={{ paddingBottom: '1em' }}>
<div style={{ fontWeight: 'bold' }}>Legutóbbi megoldásod:</div> <div style={{ fontWeight: 'bold' }}>
<Segment attached='top'> Legutóbbi megoldásod:
<h5 style={{paddingBottom: '0.4em'}}>Cím:</h5> </div>
<Segment attached="top">
<h5 style={{ paddingBottom: '0.4em' }}>Cím:</h5>
{lastName} {lastName}
</Segment> </Segment>
<Segment attached> <Segment attached>
<h5 style={{paddingBottom: '0.4em'}}>Leírás:</h5> <h5 style={{ paddingBottom: '0.4em' }}>Leírás:</h5>
{lastDesc} {lastDesc}
</Segment> </Segment>
<Segment attached='bottom'> <Segment attached="bottom">
<h5>Beadott fájl:</h5> <h5>Beadott fájl:</h5>
{lastFile ? {lastFile ? (
<a href={lastFile} rel='noreferrer noopener' target='_blank'>Fájl letöltése</a> <a href={lastFile} rel="noreferrer noopener" download>
: Fájl letöltése
</a>
) : (
<span>-</span> <span>-</span>
} )}
</Segment> </Segment>
</div> </div>
) : null}
:
null
}
<Divider /> <Divider />
<Form.Field <Form.Field
control={Input} control={Input}
label='Megoldás címe:' label="Megoldás címe:"
name='name' name="name"
onChange={e => this.props.writeSolution(e)} onChange={(e) => this.props.writeSolution(e)}
value={name} value={name}
placeholder='Adj meg egy címet a beadandó megoldásodnak...' placeholder="Adj meg egy címet a beadandó megoldásodnak..."
/> />
<Form.Field <Form.Field
control={TextArea} control={TextArea}
label='Megoldás leírása:' label="Megoldás leírása:"
name='description' name="description"
onChange={e => this.props.writeSolution(e)} onChange={(e) => this.props.writeSolution(e)}
value={description} value={description}
placeholder='Add meg a megoldás leírását...' placeholder="Add meg a megoldás leírását..."
/> />
<Form.Field> <Form.Field>
<label>Fájl (Megengedett fájltípusok: png, jpeg, jpg, zip. Maximum 50 MB.):</label> <label>
<Input type='file' onChange={e => this.props.writeSolutionFile(e)} /> Fájl (Megengedett fájltípusok: png, jpeg, jpg, zip. Maximum 50
MB.):
</label>
<Input
type="file"
accept={allowedFileTypes.join(',')}
onChange={(e) => this.props.writeSolutionFile(e)}
/>
</Form.Field> </Form.Field>
</Form> </Form>
} )}
</Modal.Content> </Modal.Content>
<Modal.Actions> <Modal.Actions>
<Button <Button
inverted inverted
color='red' color="red"
onClick={() => { onClick={() => {
this.setState({ showModal: false }); this.setState({ showModal: false });
this.props.clearWrite(); this.props.clearWrite();
}} }}
> >
<Icon name='remove' /> Mégse <Icon name="remove" /> Mégse
</Button> </Button>
{this.props.multiple {this.props.multiple ? (
? <ConfirmModal
<ConfirmModal button={
button={ <Button
<Button disabled={
disabled={ !name ||
!name || !description || !description ||
(!file ? false : !allowedFileTypes.includes(file.type) || (!file
file.size > (maxFileSize) * (1024 ** 2)) ? false
} : !validateFileName(file.name) ||
inverted file.size > maxFileSize * 1024 ** 2)
color='green' }
> inverted
<Icon name='checkmark' /> color="green"
Beadás >
{this.state.uploadState? <Icon name="checkmark" />
null Beadás
: {this.state.loading ? (
<Dimmer active> <Dimmer active>
<Loader size='massive'/> <Loader size="massive" />
</Dimmer>} </Dimmer>
</Button> ) : null}
} </Button>
text='beadod az új megoldást, ami felülírja az előzőt' }
onAccept={() => { text="beadod az új megoldást, ami felülírja az előzőt"
this.setState({ onAccept={() => {
uploadState: false this.setState({
loading: true,
});
this.props
.addSolution({
task,
accepted,
corrected,
note,
name,
description,
file,
}) })
this.props.addSolution({ .then(
task, accepted, corrected, note, name, description, file, () => {
}).then( (response)=> {
this.setState({ this.setState({
uploadState: true, loading: false,
showModal: false showModal: false,
}) });
this.props.clearWrite(); this.props.clearWrite();
}, (response)=> { },
alert('Sikertelen feltöltés!') () => {
}); this.setState({
} loading: false,
} });
/> alert('Sikertelen feltöltés!');
: }
<Button )
inverted .finally(() => {
color='green' window.location.reload(false);
disabled={
!name || !description ||
(!file ? false : !allowedFileTypes.includes(file.type) ||
file.size > (maxFileSize) * (1024 ** 2))
}
onClick={() => {
this.props.addSolution({
task, accepted, corrected, note, name, description, file,
}); });
}}
/>
) : (
<Button
inverted
color="green"
disabled={
!name ||
!description ||
(!file
? false
: !validateFileName(file.name) ||
file.size > maxFileSize * 1024 ** 2)
}
onClick={() => {
this.props.addSolution({
task,
accepted,
corrected,
note,
name,
description,
file,
});
this.setState({ showModal: false }); this.setState({ showModal: false });
this.props.clearWrite(); this.props.clearWrite();
} }}
} >
> <Icon name="checkmark" /> Beadás
<Icon name='checkmark' /> Beadás </Button>
</Button> )}
}
</Modal.Actions> </Modal.Actions>
</Modal> </Modal>
); );
} }
} }
const mapStateToProps = ({ newSolution, homeworks, user }) => ({ newSolution, homeworks, user }); const mapStateToProps = ({ newSolution, homeworks, user }) => ({
newSolution,
homeworks,
user,
});
export default connect(mapStateToProps, { export default connect(mapStateToProps, {
addSolution, addSolution,
......
src/components/forms/AddTaskForm.js
View file @ 2eef83d2
import {
Button,
Form,
Icon,
Input,
Modal,
TextArea,
} from 'semantic-ui-react';
import React, { Component } from 'react'; import React, { Component } from 'react';
import { Modal, Button, Form, Input, TextArea, Icon } from 'semantic-ui-react'; import {
import { connect } from 'react-redux'; addTask,
clearWrite,
writeTask,
writeTaskDeadline,
} from '../../actions/homework';
import { DateTimeInput } from 'semantic-ui-calendar-react'; import { DateTimeInput } from 'semantic-ui-calendar-react';
import { connect } from 'react-redux';
import moment from 'moment'; import moment from 'moment';
import { addTask, writeTask, writeTaskDeadline, clearWrite } from '../../actions/homework';
class AddTaskForm extends Component { class AddTaskForm extends Component {
constructor(props) { constructor(props) {
...@@ -14,22 +27,26 @@ class AddTaskForm extends Component { ...@@ -14,22 +27,26 @@ class AddTaskForm extends Component {
} }
render() { render() {
const { title, text, deadline, bits = 1 } = this.props.newTask; const {
title, text, deadline, bits = 1,
} = this.props.newTask;
return ( return (
<Modal <Modal
open={this.state.showModal} open={this.state.showModal}
closeOnDimmerClick closeOnDimmerClick
onClose={() => this.setState({ showModal: false })} onClose={() => this.setState({ showModal: false })}
trigger={ trigger={(
<Button <Button
inverted inverted
style={{ marginRight: '2em' }} style={{ marginRight: '2em' }}
color='blue' color='blue'
onClick={() => { this.setState({ showModal: true }); }} onClick={() => { this.setState({ showModal: true }); }}
> >
<Icon name='plus' /> Új feladat hozzáadása <Icon name='plus' />
{' '}
Új feladat hozzáadása
</Button> </Button>
} )}
> >
<Modal.Header>Új feladat:</Modal.Header> <Modal.Header>Új feladat:</Modal.Header>
<Modal.Content> <Modal.Content>
...@@ -38,7 +55,7 @@ class AddTaskForm extends Component { ...@@ -38,7 +55,7 @@ class AddTaskForm extends Component {
control={Input} control={Input}
label='Cím:' label='Cím:'
name='title' name='title'
onChange={e => this.props.writeTask(e)} onChange={(e) => this.props.writeTask(e)}
value={title} value={title}
placeholder='Add meg a feladat címét.' placeholder='Add meg a feladat címét.'
/> />
...@@ -46,7 +63,7 @@ class AddTaskForm extends Component { ...@@ -46,7 +63,7 @@ class AddTaskForm extends Component {
control={TextArea} control={TextArea}
label='Leírás:' label='Leírás:'
name='text' name='text'
onChange={e => this.props.writeTask(e)} onChange={(e) => this.props.writeTask(e)}
value={text} value={text}
placeholder='Add meg a feladat leírását...' placeholder='Add meg a feladat leírását...'
/> />
...@@ -67,7 +84,7 @@ class AddTaskForm extends Component { ...@@ -67,7 +84,7 @@ class AddTaskForm extends Component {
type='number' type='number'
label='Bitek száma:' label='Bitek száma:'
name='bits' name='bits'
onChange={e => this.props.writeTask(e)} onChange={(e) => this.props.writeTask(e)}
value={bits} value={bits}
placeholder='Add meg a feladatért kapható bitek számát ...' placeholder='Add meg a feladatért kapható bitek számát ...'
/> />
...@@ -82,24 +99,30 @@ class AddTaskForm extends Component { ...@@ -82,24 +99,30 @@ class AddTaskForm extends Component {
this.props.clearWrite(); this.props.clearWrite();
}} }}
> >
<Icon name='remove' /> Mégse <Icon name='remove' />
{' '}
Mégse
</Button> </Button>
<Button <Button
inverted inverted
color='green' color='green'
disabled={ disabled={
title === '' || title === ''
title.length > 150 || || title.length > 150
text === '' || || text === ''
deadline === '' || moment().isAfter(deadline) || deadline === '' || moment().isAfter(deadline)
} }
onClick={() => { onClick={() => {
this.props.addTask({ title, text, deadline, bits }); this.props.addTask({
title, text, deadline, bits,
});
this.setState({ showModal: false }); this.setState({ showModal: false });
this.props.clearWrite(); this.props.clearWrite();
}} }}
> >
<Icon name='checkmark' /> Hozzáadás <Icon name='checkmark' />
{' '}
Hozzáadás
</Button> </Button>
</Modal.Actions> </Modal.Actions>
</Modal> </Modal>
......
src/components/forms/ConfirmModal.js
View file @ 2eef83d2
import React, { Component } from 'react';
import { Button, Header, Icon, Modal } from 'semantic-ui-react'; import { Button, Header, Icon, Modal } from 'semantic-ui-react';
import React, { Component } from 'react';
class ConfirmModal extends Component { class ConfirmModal extends Component {
constructor(props) { constructor(props) {
...@@ -9,9 +9,9 @@ class ConfirmModal extends Component { ...@@ -9,9 +9,9 @@ class ConfirmModal extends Component {
}; };
} }
close = () => this.setState({ showModal: false }) close = () => this.setState({ showModal: false });
open = () => this.setState({ showModal: true}) open = () => this.setState({ showModal: true });
render() { render() {
const { button, text, onAccept } = this.props; const { button, text, onAccept } = this.props;
...@@ -23,30 +23,26 @@ class ConfirmModal extends Component { ...@@ -23,30 +23,26 @@ class ConfirmModal extends Component {
trigger={button} trigger={button}
onOpen={this.open} onOpen={this.open}
onClose={this.close} onClose={this.close}
size='small' size="small"
basic basic
> >
<Header icon='question' content='Megerősítés' /> <Header icon="question" content="Megerősítés" />
<Modal.Content> <Modal.Content>
<p> <p>Biztos hogy {text}?</p>
Biztos hogy {text}?
</p>
</Modal.Content> </Modal.Content>
<Modal.Actions> <Modal.Actions>
<Button <Button basic color="red" inverted onClick={() => this.close()}>
basic <Icon name="remove" /> Nem
color='red'
inverted
onClick={() => this.close()}
>
<Icon name='remove' /> Nem
</Button> </Button>
<Button <Button
color='green' color="green"
inverted inverted
onClick={() => { onAccept(); this.close(); }} onClick={() => {
onAccept();
this.close();
}}
> >
<Icon name='checkmark' /> Igen <Icon name="checkmark" /> Igen
</Button> </Button>
</Modal.Actions> </Modal.Actions>
</Modal> </Modal>
......
src/components/forms/CorrectSolutionForm.js
View file @ 2eef83d2
import {
Button,
Checkbox,
Form,
Header,
Icon,
Modal,
TextArea,
} from 'semantic-ui-react';
import React, { Component } from 'react'; import React, { Component } from 'react';
import { Modal, Button, Icon, Checkbox, Form, TextArea, Header } from 'semantic-ui-react'; import {
import { connect } from 'react-redux';
import { correctSolution,
writeSolution,
check, check,
setchecktrue,
clearWrite, clearWrite,
getSolutions, correctSolution,
getDocuments, getDocuments,
selectSolution } from '../../actions/homework'; getSolutions,
selectSolution,
setchecktrue,
writeSolution,
} from '../../actions/homework';
import { connect } from 'react-redux';
class CorrectSolutionForm extends Component { class CorrectSolutionForm extends Component {
constructor(props) { constructor(props) {
...@@ -19,15 +30,14 @@ class CorrectSolutionForm extends Component { ...@@ -19,15 +30,14 @@ class CorrectSolutionForm extends Component {
} }
render() { render() {
const { const { studentFullName, studentId, taskTitle, taskSolutions } = this.props;
studentFullName, studentId, taskTitle, taskSolutions, const taskSolutionsProfile = taskSolutions.filter(
} = this.props; (solution) => solution.created_by === studentId
const taskSolutionsProfile = );
taskSolutions.filter(solution => solution.created_by === studentId);
const relevantSolution = taskSolutionsProfile.slice(-1)[0]; const relevantSolution = taskSolutionsProfile.slice(-1)[0];
const relevantDocuments = this.props.homeworks.documents.filter(document => const relevantDocuments = this.props.homeworks.documents
document.solution === relevantSolution.id).filter(document => .filter((document) => document.solution === relevantSolution.id)
document.uploaded_by_name === studentFullName); .filter((document) => document.uploaded_by_name === studentFullName);
const relevantDocument = relevantDocuments.slice(-1)[0]; const relevantDocument = relevantDocuments.slice(-1)[0];
let fileLink; let fileLink;
if (relevantDocument && relevantDocument.file_url) { if (relevantDocument && relevantDocument.file_url) {
...@@ -35,11 +45,7 @@ class CorrectSolutionForm extends Component { ...@@ -35,11 +45,7 @@ class CorrectSolutionForm extends Component {
} else { } else {
fileLink = null; fileLink = null;
} }
const { const { corrected, accepted, note } = this.props.correction;
corrected,
accepted,
note,
} = this.props.correction;
return ( return (
<Modal <Modal
open={this.state.showModal} open={this.state.showModal}
...@@ -60,96 +66,95 @@ class CorrectSolutionForm extends Component { ...@@ -60,96 +66,95 @@ class CorrectSolutionForm extends Component {
} }
> >
<Modal.Header> <Modal.Header>
A(z) {taskTitle} nevű feladat {studentFullName} által beadott megoldásának kijavítása: A(z) {taskTitle} nevű feladat {studentFullName} által beadott
megoldásának kijavítása:
</Modal.Header> </Modal.Header>
<Modal.Content> <Modal.Content>
<Header as='h5'>A megoldás címe:</Header> <Header as="h5">A megoldás címe:</Header>
{(relevantDocument && relevantDocument.description) {relevantDocument && relevantDocument.description ? (
? <p>{relevantDocument.name}</p> <p>{relevantDocument.name}</p>
: <p>Nincs cím.</p> ) : (
} <p>Nincs cím.</p>
<Header as='h5'>A megoldás leírása:</Header> )}
{(relevantDocument && relevantDocument.description) <Header as="h5">A megoldás leírása:</Header>
? relevantDocument.description.split('\n').map(s => (<p key={Math.random()}>{s}</p>)) {relevantDocument && relevantDocument.description ? (
: <p>Nincs leírás.</p> relevantDocument.description
} .split('\n')
<Header as='h5'>A beadott dokumentum:</Header> .map((s) => <p key={Math.random()}>{s}</p>)
{fileLink ) : (
? <a href={fileLink} rel='noreferrer noopener' target='_blank'>Fájl letöltése</a> <p>Nincs leírás.</p>
: <p>Nincs fájl.</p> )}
} <Header as="h5">A beadott dokumentum:</Header>
<Header as='h5'>Kijavítás állapotának változtatása:</Header> {fileLink ? (
<a href={fileLink} rel="noreferrer noopener" target>
Fájl letöltése
</a>
) : (
<p>Nincs fájl.</p>
)}
<Header as="h5">Kijavítás állapotának változtatása:</Header>
<Button <Button
color='orange' color="orange"
inverted={corrected} inverted={corrected}
onClick={() => this.props.check('corrected')} onClick={() => this.props.check('corrected')}
> >
<Checkbox <Checkbox label="Nincs kijavítva" checked={!corrected} />
label='Nincs kijavítva'
checked={!corrected}
/>
</Button> </Button>
<Header as='h5'>Elfogadás/elutasítás:</Header> <Header as="h5">Elfogadás/elutasítás:</Header>
<Button <Button
color='green' color="green"
inverted={!accepted} inverted={!accepted}
onClick={() => { onClick={() => {
this.props.check('accepted') this.props.check('accepted');
this.props.setchecktrue('corrected') this.props.setchecktrue('corrected');
}} }}
> >
<Checkbox <Checkbox label="Elfogadható" checked={accepted} />
label='Elfogadható'
checked={accepted}
/>
</Button> </Button>
<Button <Button
color='red' color="red"
inverted={accepted} inverted={accepted}
onClick={() => this.props.check('accepted')} onClick={() => this.props.check('accepted')}
> >
<Checkbox <Checkbox label="Nem elfogadható" checked={!accepted} />
label='Nem elfogadható'
checked={!accepted}
/>
</Button> </Button>
<Header as='h5'>A feladat megoldásának szöveges értékelése:</Header> <Header as="h5">A feladat megoldásának szöveges értékelése:</Header>
<Form> <Form>
<Form.Field <Form.Field
control={TextArea} control={TextArea}
name='note' name="note"
onChange={e => this.props.writeSolution(e)} onChange={(e) => this.props.writeSolution(e)}
value={note} value={note}
placeholder='Írhatsz megjegyzést a megoldásra...' placeholder="Írhatsz megjegyzést a megoldásra..."
/> />
</Form> </Form>
</Modal.Content> </Modal.Content>
<Modal.Actions> <Modal.Actions>
<Button <Button
inverted inverted
color='red' color="red"
onClick={() => { onClick={() => {
this.setState({ showModal: false }); this.setState({ showModal: false });
this.props.clearWrite(); this.props.clearWrite();
}} }}
> >
<Icon name='remove' /> Mégse <Icon name="remove" /> Mégse
</Button> </Button>
<Button <Button
inverted inverted
color='green' color="green"
onClick={() => { onClick={() => {
this.props.correctSolution( this.props.correctSolution(
relevantSolution.id, relevantSolution.id,
corrected, corrected,
accepted, accepted,
note, note
); );
this.setState({ showModal: false }); this.setState({ showModal: false });
this.props.clearWrite(); this.props.clearWrite();
}} }}
> >
<Icon name='checkmark' /> Beadás <Icon name="checkmark" /> Beadás
</Button> </Button>
</Modal.Actions> </Modal.Actions>
</Modal> </Modal>
...@@ -157,7 +162,11 @@ class CorrectSolutionForm extends Component { ...@@ -157,7 +162,11 @@ class CorrectSolutionForm extends Component {
} }
} }
const mapStateToProps = ({ homeworks, correction, user }) => ({ homeworks, correction, user }); const mapStateToProps = ({ homeworks, correction, user }) => ({
homeworks,
correction,
user,
});
export default connect(mapStateToProps, { export default connect(mapStateToProps, {
correctSolution, correctSolution,
......
src/components/forms/EditNewsForm.js
View file @ 2eef83d2
import { Button, Form, Icon, Input, Modal, TextArea } from 'semantic-ui-react';
import React, { Component } from 'react'; import React, { Component } from 'react';
import { Modal, Button, Form, Input, TextArea, Icon } from 'semantic-ui-react'; import { clearWrite, editNews, writeNews } from '../../actions/news';
import { connect } from 'react-redux'; import { connect } from 'react-redux';
import moment from 'moment'; import moment from 'moment';
import { writeNews, editNews, clearWrite } from '../../actions/news';
class EditNewsForm extends Component { class EditNewsForm extends Component {
constructor(props) { constructor(props) {
super(props); super(props);
...@@ -14,7 +14,15 @@ class EditNewsForm extends Component { ...@@ -14,7 +14,15 @@ class EditNewsForm extends Component {
} }
render() { render() {
const { id, title, text, author, last_update_by, created_at, updated_at } = this.props.selectedNews; const {
id,
title,
text,
author,
last_update_by,
created_at,
updated_at,
} = this.props.selectedNews;
const updated_by = this.props.user.id; const updated_by = this.props.user.id;
return ( return (
<Modal <Modal
...@@ -23,8 +31,10 @@ class EditNewsForm extends Component { ...@@ -23,8 +31,10 @@ class EditNewsForm extends Component {
trigger={ trigger={
<Button <Button
compact compact
onClick={() => { this.setState({ showModal: true }); }} onClick={() => {
size='mini' this.setState({ showModal: true });
}}
size="mini"
> >
Edit Edit
</Button> </Button>
...@@ -32,49 +42,56 @@ class EditNewsForm extends Component { ...@@ -32,49 +42,56 @@ class EditNewsForm extends Component {
> >
<Modal.Header>Szerkesztés:</Modal.Header> <Modal.Header>Szerkesztés:</Modal.Header>
<Modal.Content> <Modal.Content>
<p style={{fontStyle: 'italic' }}><b>Közzétéve:</b> {moment(created_at).format('LLLL')} <br /> <p style={{ fontStyle: 'italic' }}>
<b>Írta:</b> {author} <br /> <b>Közzétéve:</b> {moment(created_at).format('LLLL')} <br />
<b>Szerkesztve:</b> {moment(updated_at).format('LLLL')} <br /> <b>Írta:</b> {author} <br />
<b>Szerkesztette:</b> {last_update_by}</p> <b>Szerkesztve:</b> {moment(updated_at).format('LLLL')} <br />
<b>Szerkesztette:</b> {last_update_by}
</p>
<Form> <Form>
<Form.Field <Form.Field
control={Input} control={Input}
label='Title' label="Title"
name='title' name="title"
onChange={e => this.props.writeNews(e)} onChange={(e) => this.props.writeNews(e)}
value={title} value={title}
placeholder='Title' placeholder="Title"
/> />
<Form.Field <Form.Field
control={TextArea} control={TextArea}
label='Text' label="Text"
name='text' name="text"
onChange={e => this.props.writeNews(e)} onChange={(e) => this.props.writeNews(e)}
value={text} value={text}
placeholder='Tell us what you want...' placeholder="Tell us what you want..."
/> />
</Form> </Form>
</Modal.Content> </Modal.Content>
<Modal.Actions> <Modal.Actions>
<Button <Button
inverted inverted
color='red' color="red"
onClick={() => { this.setState({ showModal: false }); }} onClick={() => {
this.setState({ showModal: false });
}}
> >
<Icon name='remove' /> Cancel <Icon name="remove" /> Cancel
</Button> </Button>
<Button <Button
inverted inverted
color='green' color="green"
onClick={() => { onClick={() => {
this.props.editNews({ this.props.editNews({
id, title, text, updated_by, id,
}); title,
this.setState({ showModal: false }); text,
this.props.clearWrite(); updated_by,
}} });
this.setState({ showModal: false });
this.props.clearWrite();
}}
> >
<Icon name='checkmark' /> Edit <Icon name="checkmark" /> Edit
</Button> </Button>
</Modal.Actions> </Modal.Actions>
</Modal> </Modal>
...@@ -85,5 +102,7 @@ class EditNewsForm extends Component { ...@@ -85,5 +102,7 @@ class EditNewsForm extends Component {
const mapStateToProps = ({ user, selectedNews }) => ({ user, selectedNews }); const mapStateToProps = ({ user, selectedNews }) => ({ user, selectedNews });
export default connect(mapStateToProps, { export default connect(mapStateToProps, {
editNews, writeNews, clearWrite, editNews,
writeNews,
clearWrite,
})(EditNewsForm); })(EditNewsForm);
src/components/forms/EditTaskForm.js
View file @ 2eef83d2
import { Button, Form, Icon, Input, Modal, TextArea } from 'semantic-ui-react';
import React, { Component } from 'react'; import React, { Component } from 'react';
import { Modal, Button, Form, Input, TextArea, Icon } from 'semantic-ui-react'; import {
import { connect } from 'react-redux'; clearWrite,
editTask,
writeTask,
writeTaskDeadline,
} from '../../actions/homework';
import { DateTimeInput } from 'semantic-ui-calendar-react'; import { DateTimeInput } from 'semantic-ui-calendar-react';
import { connect } from 'react-redux';
import moment from 'moment'; import moment from 'moment';
import { writeTask, writeTaskDeadline, editTask, clearWrite } from '../../actions/homework';
class EditTaskForm extends Component { class EditTaskForm extends Component {
constructor(props) { constructor(props) {
...@@ -14,13 +20,7 @@ class EditTaskForm extends Component { ...@@ -14,13 +20,7 @@ class EditTaskForm extends Component {
} }
render() { render() {
const { const { id, title, text, deadline, bits } = this.props.selectedTask;
id,
title,
text,
deadline,
bits,
} = this.props.selectedTask;
return ( return (
<Modal <Modal
open={this.state.showModal} open={this.state.showModal}
...@@ -31,39 +31,41 @@ class EditTaskForm extends Component { ...@@ -31,39 +31,41 @@ class EditTaskForm extends Component {
<Button <Button
inverted inverted
style={{ marginRight: '2em' }} style={{ marginRight: '2em' }}
color='orange' color="orange"
onClick={() => { this.setState({ showModal: true }); }} onClick={() => {
this.setState({ showModal: true });
}}
> >
<Icon name='edit' /> Módosítás <Icon name="edit" /> Módosítás
</Button> </Button>
} }
> >
<Modal.Header>A {title} nevű feladat módosítása:</Modal.Header> <Modal.Header>A{title} nevű feladat módosítása:</Modal.Header>
<Modal.Content> <Modal.Content>
<Form> <Form>
<Form.Field <Form.Field
control={Input} control={Input}
label='Cím:' label="Cím:"
name='title' name="title"
onChange={e => this.props.writeTask(e)} onChange={(e) => this.props.writeTask(e)}
value={title} value={title}
placeholder='Add meg a feladat címét.' placeholder="Add meg a feladat címét."
/> />
<Form.Field <Form.Field
control={TextArea} control={TextArea}
label='Leírás:' label="Leírás:"
name='text' name="text"
onChange={e => this.props.writeTask(e)} onChange={(e) => this.props.writeTask(e)}
value={text} value={text}
placeholder='Add meg a feladat leírását...' placeholder="Add meg a feladat leírását..."
/> />
<Form.Field <Form.Field
control={DateTimeInput} control={DateTimeInput}
label='Beadási határidő (a jelenlegi időnél későbbi időpont):' label="Beadási határidő (a jelenlegi időnél későbbi időpont):"
name='deadline' name="deadline"
placeholder='Beadási határidő' placeholder="Beadási határidő"
iconPosition='left' iconPosition="left"
dateTimeFormat='YYYY-MM-DDTHH:mm' dateTimeFormat="YYYY-MM-DDTHH:mm"
onChange={(e, { name, value }) => { onChange={(e, { name, value }) => {
this.props.writeTaskDeadline({ name, value }); this.props.writeTaskDeadline({ name, value });
}} }}
...@@ -71,34 +73,35 @@ class EditTaskForm extends Component { ...@@ -71,34 +73,35 @@ class EditTaskForm extends Component {
/> />
<Form.Field <Form.Field
control={Input} control={Input}
type='number' type="number"
label='Bitek száma:' label="Bitek száma:"
name='bits' name="bits"
onChange={e => this.props.writeTask(e)} onChange={(e) => this.props.writeTask(e)}
value={bits} value={bits}
placeholder='Add meg a feladatért kapható bitek számát ...' placeholder="Add meg a feladatért kapható bitek számát ..."
/> />
</Form> </Form>
</Modal.Content> </Modal.Content>
<Modal.Actions> <Modal.Actions>
<Button <Button
inverted inverted
color='red' color="red"
onClick={() => { onClick={() => {
this.setState({ showModal: false }); this.setState({ showModal: false });
this.props.clearWrite(); this.props.clearWrite();
}} }}
> >
<Icon name='remove' /> Mégse <Icon name="remove" /> Mégse
</Button> </Button>
<Button <Button
inverted inverted
color='green' color="green"
disabled={ disabled={
title === '' || title === '' ||
(title !== undefined ? title.length > 150 : false) || (title !== undefined ? title.length > 150 : false) ||
text === '' || text === '' ||
deadline === '' || moment().isAfter(deadline) deadline === '' ||
moment().isAfter(deadline)
} }
onClick={() => { onClick={() => {
this.props.editTask({ this.props.editTask({
...@@ -110,9 +113,9 @@ class EditTaskForm extends Component { ...@@ -110,9 +113,9 @@ class EditTaskForm extends Component {
}); });
this.setState({ showModal: false }); this.setState({ showModal: false });
this.props.clearWrite(); this.props.clearWrite();
}} }}
> >
<Icon name='checkmark' /> Módosítás <Icon name="checkmark" /> Módosítás
</Button> </Button>
</Modal.Actions> </Modal.Actions>
</Modal> </Modal>
......
src/components/forms/Forms.css
View file @ 2eef83d2
#task, #tasknote{ #task,
#tasknote {
border: none; border: none;
background-color: inherit; background-color: inherit;
color: teal; color: teal;
...@@ -8,7 +9,8 @@ ...@@ -8,7 +9,8 @@
color: black; color: black;
} }
#task:hover, #tasknote:hover { #task:hover,
#tasknote:hover {
color: red; color: red;
cursor: pointer; cursor: pointer;
} }
src/components/forms/HiddenForm.js
View file @ 2eef83d2
import React, {Component} from 'react' import React, { Component } from 'react';
import { Segment } from 'semantic-ui-react'; import { Segment } from 'semantic-ui-react';
class HiddenForm extends Component { class HiddenForm extends Component {
render(){ render() {
return ( return (
<div> <div>
<div style={{ marginBottom: 0, fontWeight: this.props.fontWeight }}>{this.props.label}</div> <div style={{ marginBottom: 0, fontWeight: this.props.fontWeight }}>
<Segment style={{ marginTop: 0 }}> {this.props.label}
<div> </div>
{this.props.value} <Segment style={{ marginTop: 0 }}>
</div> <div>{this.props.value}</div>
</Segment> </Segment>
</div> </div>
) );
} }
} }
export default HiddenForm export default HiddenForm;
\ No newline at end of file
src/components/forms/InfoModal.js
View file @ 2eef83d2
import React, { Component } from 'react';
import { Button, Header, Icon, Modal } from 'semantic-ui-react'; import { Button, Header, Icon, Modal } from 'semantic-ui-react';
import React, { Component } from 'react';
class InfoModal extends Component { class InfoModal extends Component {
constructor(props) { constructor(props) {
...@@ -9,9 +9,9 @@ class InfoModal extends Component { ...@@ -9,9 +9,9 @@ class InfoModal extends Component {
}; };
} }
close = () => this.setState({ showModal: false }) close = () => this.setState({ showModal: false });
open = () => this.setState({ showModal: true}) open = () => this.setState({ showModal: true });
render() { render() {
const { button, title, content } = this.props; const { button, title, content } = this.props;
...@@ -23,20 +23,18 @@ class InfoModal extends Component { ...@@ -23,20 +23,18 @@ class InfoModal extends Component {
trigger={button} trigger={button}
onOpen={this.open} onOpen={this.open}
onClose={this.close} onClose={this.close}
size='small' size="small"
basic basic
> >
<Header icon='info' content={title} /> <Header icon="info" content={title} />
<Modal.Content> <Modal.Content>
{content.split('\n').map(s => (<p key={Math.random()}>{s}</p>))} {content.split('\n').map((s) => (
<p key={Math.random()}>{s}</p>
))}
</Modal.Content> </Modal.Content>
<Modal.Actions> <Modal.Actions>
<Button <Button color="green" inverted onClick={() => this.close()}>
color='green' <Icon name="checkmark" /> Rendben
inverted
onClick= {() => this.close()}
>
<Icon name='checkmark' /> Rendben
</Button> </Button>
</Modal.Actions> </Modal.Actions>
</Modal> </Modal>
......
src/components/forms/SolutionDetailsForm.js
View file @ 2eef83d2
import './Forms.css';
import { Button, Divider, Header, Icon, Modal } from 'semantic-ui-react';
import React, { Component } from 'react'; import React, { Component } from 'react';
import { Modal, Button, Header, Icon, Divider } from 'semantic-ui-react'; import { getDocuments, getSolutions } from '../../actions/homework';
import { connect } from 'react-redux';
import CorrectSolutionForm from './CorrectSolutionForm'; import CorrectSolutionForm from './CorrectSolutionForm';
import { connect } from 'react-redux';
import { customMessage } from '../pages/Homework'; import { customMessage } from '../pages/Homework';
import './Forms.css';
import {
getSolutions,
getDocuments,
} from '../../actions/homework';
class SolutionDetailsForm extends Component { class SolutionDetailsForm extends Component {
constructor(props) { constructor(props) {
...@@ -18,8 +17,9 @@ class SolutionDetailsForm extends Component { ...@@ -18,8 +17,9 @@ class SolutionDetailsForm extends Component {
} }
render() { render() {
const taskSolutions = this.props.homeworks.solutions.filter(solution => const taskSolutions = this.props.homeworks.solutions.filter(
solution.task === this.props.taskid); (solution) => solution.task === this.props.taskid
);
const noSubmitStudents = []; const noSubmitStudents = [];
const waitForCorrectionStudents = []; const waitForCorrectionStudents = [];
...@@ -27,15 +27,20 @@ class SolutionDetailsForm extends Component { ...@@ -27,15 +27,20 @@ class SolutionDetailsForm extends Component {
const acceptedStudents = []; const acceptedStudents = [];
this.props.homeworks.profiles.forEach((profile) => { this.props.homeworks.profiles.forEach((profile) => {
const profileSolutions = taskSolutions.filter(solution => const profileSolutions = taskSolutions.filter(
solution.created_by === profile.id); (solution) => solution.created_by === profile.id
);
if (profile.role === 'Student') { if (profile.role === 'Student') {
if (profileSolutions.length === 0) { if (profileSolutions.length === 0) {
noSubmitStudents.push(profile); noSubmitStudents.push(profile);
} else if (profileSolutions[profileSolutions.length - 1].corrected === false) { } else if (
profileSolutions[profileSolutions.length - 1].corrected === false
) {
waitForCorrectionStudents.push(profile); waitForCorrectionStudents.push(profile);
} else if (profileSolutions[profileSolutions.length - 1].accepted === false) { } else if (
profileSolutions[profileSolutions.length - 1].accepted === false
) {
noAcceptStudents.push(profile); noAcceptStudents.push(profile);
} else { } else {
acceptedStudents.push(profile); acceptedStudents.push(profile);
...@@ -52,90 +57,103 @@ class SolutionDetailsForm extends Component { ...@@ -52,90 +57,103 @@ class SolutionDetailsForm extends Component {
onClose={() => this.setState({ showModal: false })} onClose={() => this.setState({ showModal: false })}
trigger={ trigger={
<button <button
id='task' type="button"
id="task"
onClick={() => { onClick={() => {
this.setState({ showModal: true }); this.setState({ showModal: true });
this.props.getSolutions(); this.props.getSolutions();
this.props.getDocuments(); this.props.getDocuments();
}} }}
> >
<Icon name='external' /> <Icon name="external" />
{this.props.tasktitle} {this.props.tasktitle}
</button> </button>
} }
> >
<Modal.Header> <Modal.Header>
A megoldások beadásának állapota a(z) {this.props.tasktitle} nevű feladatnál: A megoldások beadásának állapota a(z) {this.props.tasktitle} nevű
feladatnál:
</Modal.Header> </Modal.Header>
<Modal.Content> <Modal.Content>
<Header as='h3'>A feladat leírása:</Header> <Header as="h3">A feladat leírása:</Header>
{this.props.taskdesc.split('\n').map(s => (<p key={Math.random()}>{s}</p>))} {this.props.taskdesc.split('\n').map((s) => (
<p key={Math.random()}>{s}</p>
))}
<Divider /> <Divider />
<Header as='h3'>Nem érkezett még megoldás:</Header> <Header as="h3">Nem érkezett még megoldás:</Header>
{noSubmitStudents.length === 0 ? {noSubmitStudents.length === 0
customMessage(noStudentText) : ? customMessage(noStudentText)
noSubmitStudents.map(student => ( : noSubmitStudents.map((student) => (
<Button key={Math.random()} color='blue' style={{ marginRight: '1.5em', marginTop: '1.5em' }}>{student.full_name}</Button> <Button
)) key={Math.random()}
} color="blue"
style={{ marginRight: '1.5em', marginTop: '1.5em' }}
>
{student.full_name}
</Button>
))}
<Divider /> <Divider />
<Header as='h3'>Javításra vár (A névre kattintva kijavítható a megoldás):</Header> <Header as="h3">
{waitForCorrectionStudents.length === 0 ? Javításra vár (A névre kattintva kijavítható a megoldás):
customMessage(noStudentText) : </Header>
waitForCorrectionStudents.map(student => ( {waitForCorrectionStudents.length === 0
<CorrectSolutionForm ? customMessage(noStudentText)
key={Math.random()} : waitForCorrectionStudents.map((student) => (
color='orange' <CorrectSolutionForm
studentName={student.nick} key={Math.random()}
studentFullName={student.full_name} color="orange"
studentId={student.id} studentName={student.nick}
taskTitle={this.props.tasktitle} studentFullName={student.full_name}
taskSolutions={taskSolutions} studentId={student.id}
/> taskTitle={this.props.tasktitle}
)) taskSolutions={taskSolutions}
} />
))}
<Divider /> <Divider />
<Header as='h3'>A megoldás nem elfogadható (A névre kattintva módosítható a javítás):</Header> <Header as="h3">
{noAcceptStudents.length === 0 ? A megoldás nem elfogadható (A névre kattintva módosítható a
customMessage(noStudentText) : javítás):
noAcceptStudents.map(student => ( </Header>
<CorrectSolutionForm {noAcceptStudents.length === 0
key={Math.random()} ? customMessage(noStudentText)
color='red' : noAcceptStudents.map((student) => (
studentName={student.nick} <CorrectSolutionForm
studentFullName={student.full_name} key={Math.random()}
studentId={student.id} color="red"
taskTitle={this.props.tasktitle} studentName={student.nick}
taskSolutions={taskSolutions} studentFullName={student.full_name}
/> studentId={student.id}
)) taskTitle={this.props.tasktitle}
} taskSolutions={taskSolutions}
/>
))}
<Divider /> <Divider />
<Header as='h3'>Elfogadva (A névre kattintva módosítható a javítás):</Header> <Header as="h3">
{acceptedStudents.length === 0 ? Elfogadva (A névre kattintva módosítható a javítás):
customMessage(noStudentText) : </Header>
acceptedStudents.map(student => ( {acceptedStudents.length === 0
<CorrectSolutionForm ? customMessage(noStudentText)
key={Math.random()} : acceptedStudents.map((student) => (
color='green' <CorrectSolutionForm
studentName={student.nick} key={Math.random()}
studentFullName={student.full_name} color="green"
studentId={student.id} studentName={student.nick}
taskTitle={this.props.tasktitle} studentFullName={student.full_name}
taskSolutions={taskSolutions} studentId={student.id}
/> taskTitle={this.props.tasktitle}
)) taskSolutions={taskSolutions}
} />
))}
</Modal.Content> </Modal.Content>
<Modal.Actions> <Modal.Actions>
<Button <Button
inverted inverted
color='green' color="green"
onClick={() => { onClick={() => {
this.setState({ showModal: false }); this.setState({ showModal: false });
}} }}
> >
<Icon name='checkmark' /> Kész <Icon name="checkmark" /> Kész
</Button> </Button>
</Modal.Actions> </Modal.Actions>
</Modal> </Modal>
...@@ -146,5 +164,6 @@ class SolutionDetailsForm extends Component { ...@@ -146,5 +164,6 @@ class SolutionDetailsForm extends Component {
const mapStateToProps = ({ homeworks, user }) => ({ homeworks, user }); const mapStateToProps = ({ homeworks, user }) => ({ homeworks, user });
export default connect(mapStateToProps, { export default connect(mapStateToProps, {
getSolutions, getDocuments, getSolutions,
})(SolutionDetailsForm); getDocuments,
\ No newline at end of file })(SolutionDetailsForm);
src/components/pages/ApplicantProfile.js
View file @ 2eef83d2
import { Button, Container, Header, Item, Label } from 'semantic-ui-react';
import React, { Component } from 'react'; import React, { Component } from 'react';
import { Container, Header, Item, Button, Label } from 'semantic-ui-react';
import { connect } from 'react-redux';
import { getSelectedProfile, setStatus } from '../../actions/statistics'; import { getSelectedProfile, setStatus } from '../../actions/statistics';
import ConfirmModal from '../forms/ConfirmModal'; import ConfirmModal from '../forms/ConfirmModal';
import { connect } from 'react-redux';
const groupTypes = { const groupTypes = {
HAT: { HAT: {
...@@ -33,102 +34,110 @@ class ApplicantProfile extends Component { ...@@ -33,102 +34,110 @@ class ApplicantProfile extends Component {
} }
render() { render() {
const { id, signed, role, full_name, const {
nick, motivation_about, motivation_exercise, id,
motivation_profession, groups } signed,
= this.props.selectedProfile; role,
full_name,
nick,
motivation_about,
motivation_exercise,
motivation_profession,
groups,
} = this.props.selectedProfile;
return ( return (
<Container style={{ paddingTop: '3em', paddingBottom: '6em' }}> <Container style={{ paddingTop: '3em', paddingBottom: '6em' }}>
<Item> <Item>
<Item.Content> <Item.Content>
<Container textAlign='center' style={{paddingBottom: '2em'}}> <Container textAlign="center" style={{ paddingBottom: '2em' }}>
<Header as='h2'>{full_name}</Header> <Header as="h2">{full_name}</Header>
<Item.Meta>{nick}</Item.Meta> <Item.Meta>{nick}</Item.Meta>
<Header as='h2'>{groups?.map(group => { <Header as="h2">
return ( {groups?.map((group) => (
<Label color={groupTypes[group].color}> <Label color={groupTypes[group].color}>
{groupTypes[group].name} {groupTypes[group].name}
</Label> </Label>
) ))}
})}</Header> </Header>
</Container> </Container>
<Item.Description> <Item.Description>
<Container textAlign='justified' style={{ padding: '1em' }}> <Container textAlign="justified" style={{ padding: '1em' }}>
<Header as='h3'>Magamról, eddigi tevékenységem:</Header> <Header as="h3">Magamról, eddigi tevékenységem:</Header>
<p>{motivation_about <p>
?.split ('\n').map ((item, i) => <div key={i}>{item}</div>)} {motivation_about?.split('\n').map((item, i) => (
<div key={i}>{item}</div>
))}
</p> </p>
<Header as='h3'>Szakmai motiváció:</Header> <Header as="h3">Szakmai motiváció:</Header>
<p>{motivation_profession <p>
?.split ('\n').map ((item, i) => <div key={i}>{item}</div>)} {motivation_profession?.split('\n').map((item, i) => (
<div key={i}>{item}</div>
))}
</p> </p>
<Header as='h3'>Feladatok megoldása:</Header> <Header as="h3">Feladatok megoldása:</Header>
<p>{motivation_exercise <p>
?.split ('\n').map ((item, i) => <div key={i}>{item}</div>)} {motivation_exercise?.split('\n').map((item, i) => (
<div key={i}>{item}</div>
))}
</p> </p>
</Container> </Container>
<Container textAlign='center' style={{ padding: '1em' }}> <Container textAlign="center" style={{ padding: '1em' }}>
<Header as='h3'>Státusz:</Header> <Header as="h3">Státusz:</Header>
{ signed ? {signed ? (
<div> <div>
{ role === 'Student' ? {role === 'Student' ? (
<Label color='green' size='huge'>Elfogadva</Label> <Label color="green" size="huge">
: Elfogadva
null </Label>
} ) : null}
{ role === 'Staff' ? {role === 'Staff' ? (
<Label color='blue' size='huge'>Staff</Label> <Label color="blue" size="huge">
: Staff
null </Label>
} ) : null}
{ role === 'Applicant' ? {role === 'Applicant' ? (
<Label color='orange' size='huge'>Jelentkezett</Label> <Label color="orange" size="huge">
: Jelentkezett
null </Label>
} ) : null}
{ role === 'Denied' ? {role === 'Denied' ? (
<Label color='red' size='huge'>Elutasítva</Label> <Label color="red" size="huge">
: Elutasítva
null </Label>
} ) : null}
</div> </div>
: ) : (
<Label color='red' size='huge'>Nem jelentkezett</Label> <Label color="red" size="huge">
} Nem jelentkezett
</Label>
)}
</Container> </Container>
</Item.Description> </Item.Description>
</Item.Content> </Item.Content>
</Item> </Item>
{ signed && role !== 'Staff' ? {signed && role !== 'Staff' ? (
<Container textAlign='center'> <Container textAlign="center">
<ConfirmModal <ConfirmModal
button={ button={<Button color="green">Jelentkezés elfogadása</Button>}
<Button text="elfogadod a jelentkezést"
color='green'
>Jelentkezés elfogadása
</Button>}
text='elfogadod a jelentkezést'
onAccept={() => this.props.setStatus(id, 'Student')} onAccept={() => this.props.setStatus(id, 'Student')}
/> />
<ConfirmModal <ConfirmModal
button={ button={<Button color="red">Jelentkezés elutasítása</Button>}
<Button text="elutasítod a jelentkezést"
color='red'
>Jelentkezés elutasítása
</Button>}
text='elutasítod a jelentkezést'
onAccept={() => this.props.setStatus(id, 'Denied')} onAccept={() => this.props.setStatus(id, 'Denied')}
/> />
</Container> </Container>
: ) : null}
null
}
</Container> </Container>
); );
} }
} }
const mapStateToProps = ({ trainees: { selectedProfile } }) => ({ selectedProfile }); const mapStateToProps = ({ trainees: { selectedProfile } }) => ({
selectedProfile,
});
export default connect(mapStateToProps, { getSelectedProfile, setStatus })(ApplicantProfile); export default connect(mapStateToProps, { getSelectedProfile, setStatus })(
ApplicantProfile
);
src/components/pages/Applications.js
View file @ 2eef83d2
import { Button, Container, Label, Table } from 'semantic-ui-react';
import React, { Component } from 'react'; import React, { Component } from 'react';
import { Link } from 'react-router-dom';
import { Container, Table, Label, Button } from 'semantic-ui-react';
import { connect } from 'react-redux';
import { getProfiles, setStatus } from '../../actions/statistics'; import { getProfiles, setStatus } from '../../actions/statistics';
import ConfirmModal from '../forms/ConfirmModal'; import ConfirmModal from '../forms/ConfirmModal';
import { Link } from 'react-router-dom';
import { connect } from 'react-redux';
const role = [ const role = [
{ {
role: 'Staff', role: 'Staff',
text: 'Staff', text: 'Staff',
color: 'blue' color: 'blue',
}, },
{ {
role: 'Student', role: 'Student',
text: 'Elfogadott', text: 'Elfogadott',
color: 'green' color: 'green',
}, },
{ {
role: 'Applicant', role: 'Applicant',
text: 'Jelentkezett', text: 'Jelentkezett',
color: 'orange' color: 'orange',
}, },
{ {
role: 'Denied', role: 'Denied',
text: 'Elutasított', text: 'Elutasított',
color: 'red' color: 'red',
}, },
{ {
role: 'no', role: 'no',
text: 'Nem jelentkezett', text: 'Nem jelentkezett',
color: 'red' color: 'red',
}, },
]; ];
...@@ -40,118 +41,100 @@ class Applications extends Component { ...@@ -40,118 +41,100 @@ class Applications extends Component {
renderApplicants(format) { renderApplicants(format) {
return this.props.profiles.map((profile) => return this.props.profiles.map((profile) =>
{ return ( profile.role === format.role &&
profile.role === format.role (profile.signed === true || profile.role === 'Staff') ? (
&& (profile.signed === true ||
profile.role === 'Staff') ?
<Table.Row key={profile.id}> <Table.Row key={profile.id}>
<Table.Cell textAlign='center'> <Table.Cell textAlign="center">
<Link to={`applicant/${profile.id}`}> <Link to={`applicant/${profile.id}`}>{profile.full_name}</Link>
{profile.full_name}
</Link>
</Table.Cell> </Table.Cell>
{ format.role === 'Staff' ? null : {format.role === 'Staff' ? null : (
<Table.Cell textAlign='center'> <Table.Cell textAlign="center">
<ConfirmModal <ConfirmModal
button = {<Button button={
color='blue' <Button color="blue" size="tiny">
size='tiny' ADD STAFF STATUS
> </Button>
ADD STAFF STATUS }
</Button>} text="staff jogot adsz neki"
text='staff jogot adsz neki' onAccept={() => this.props.setStatus(profile.id, 'Staff')}
onAccept={() => this.props.setStatus(profile.id, 'Staff')}
/> />
</Table.Cell> </Table.Cell>
} )}
</Table.Row> </Table.Row>
: null ) : null
); );
});
} }
renderNotApplicants(format) { renderNotApplicants(format) {
return this.props.profiles.map((profile) => return this.props.profiles.map((profile) =>
{ return ( profile.signed === false && profile.role !== 'Staff' ? (
profile.signed === false && profile.role !== 'Staff'?
<Table.Row key={profile.id}> <Table.Row key={profile.id}>
<Table.Cell textAlign='center'> <Table.Cell textAlign="center">
<Link to={`applicant/${profile.id}`}> <Link to={`applicant/${profile.id}`}>{profile.full_name}</Link>
{profile.full_name}
</Link>
</Table.Cell> </Table.Cell>
{ format.role === 'Staff' ? null : {format.role === 'Staff' ? null : (
<Table.Cell textAlign='center'> <Table.Cell textAlign="center">
<ConfirmModal <ConfirmModal
button = {<Button button={
color='blue' <Button color="blue" size="tiny">
size='tiny' ADD STAFF STATUS
> </Button>
ADD STAFF STATUS }
</Button>} text="staff jogot adsz neki"
text='staff jogot adsz neki' onAccept={() => this.props.setStatus(profile.id, 'Staff')}
onAccept={() => this.props.setStatus(profile.id, 'Staff')}
/> />
</Table.Cell> </Table.Cell>
} )}
</Table.Row> </Table.Row>
: null ) : null
); );
});
} }
renderTable(format) { renderTable(format) {
return ( return (
<Table color='blue' unstackable celled selectable compact> <Table color="blue" unstackable celled selectable compact>
<Table.Header> <Table.Header>
<Table.Row> <Table.Row>
<Table.HeaderCell textAlign='center'> <Table.HeaderCell textAlign="center">
<Label color={format.color}>{format.text}</Label> <Label color={format.color}>{format.text}</Label>
</Table.HeaderCell> </Table.HeaderCell>
{format.role !== 'Staff' ? {format.role !== 'Staff' ? (
<Table.HeaderCell width={3} textAlign='center'> <Table.HeaderCell width={3} textAlign="center">
<Label color={null}> <Label color={null}>
{format.role === 'no' ? {format.role === 'no'
this.props.profiles.filter(profile => { ? this.props.profiles.filter(
return profile.signed === false (profile) =>
&& profile.role !== 'Staff' profile.signed === false && profile.role !== 'Staff'
}).length ).length
: : this.props.profiles.filter(
this.props.profiles.filter(profile => { (profile) =>
return profile.role === format.role profile.role === format.role &&
&& (profile.signed === true (profile.signed === true || profile.role === 'Staff')
|| profile.role === 'Staff') ).length}{' '}
}).length fő
} fő
</Label> </Label>
</Table.HeaderCell> </Table.HeaderCell>
: null ) : null}
}
</Table.Row> </Table.Row>
</Table.Header> </Table.Header>
<Table.Body> <Table.Body>
{format.role === 'no' ? {format.role === 'no'
this.renderNotApplicants(format) ? this.renderNotApplicants(format)
: : this.renderApplicants(format)}
this.renderApplicants(format)
}
</Table.Body> </Table.Body>
</Table> </Table>
) );
} }
render() { render() {
return ( return (
<Container <Container
textAlign='center' style={{paddingTop: '1em', paddingBottom: '5em'}} textAlign="center"
style={{ paddingTop: '1em', paddingBottom: '5em' }}
> >
{this.renderTable(role[2])} {/* Applicant */} {this.renderTable(role[2])} {/* Applicant */}
{this.renderTable(role[1])} {/* Student */} {this.renderTable(role[1])} {/* Student */}
{this.renderTable(role[0])} {/* Staff */} {this.renderTable(role[0])} {/* Staff */}
{this.renderTable(role[3])} {/* Denied */} {this.renderTable(role[3])} {/* Denied */}
{this.renderTable(role[4])} {/* Not Signed */} {this.renderTable(role[4])} {/* Not Signed */}
</Container> </Container>
...@@ -159,6 +142,11 @@ class Applications extends Component { ...@@ -159,6 +142,11 @@ class Applications extends Component {
} }
} }
const mapStateToProps = ({ trainees: { profiles }, user }) => ({ profiles, user }); const mapStateToProps = ({ trainees: { profiles }, user }) => ({
profiles,
user,
});
export default connect(mapStateToProps, { getProfiles, setStatus })(Applications); export default connect(mapStateToProps, { getProfiles, setStatus })(
Applications
);
src/components/pages/EventDetail.js
View file @ 2eef83d2
import React, { Component } from 'react';
import { import {
Container,
Item,
Button, Button,
Comment, Comment,
Container,
Divider,
Form, Form,
Header, Header,
Table, Item,
Segment, Segment,
Divider, Table,
} from 'semantic-ui-react'; } from "semantic-ui-react";
import { connect } from 'react-redux'; import React, { Component } from "react";
import moment from 'moment'; import {
import { getEventById, getTrainees, visitorChange, submitVisitors } from '../../actions/statistics'; clearWrite,
import { getNotesByEvent, writeNote, clearWrite, postEventNote } from '../../actions/notes'; getNotesByEvent,
import TraineeTableRow from './EventDetailTableRow'; postEventNote,
writeNote,
} from "../../actions/notes";
import {
getEventById,
getTrainees,
submitVisitors,
visitorChange,
} from "../../actions/statistics";
import TraineeTableRow from "./EventDetailTableRow";
import { connect } from "react-redux";
import moment from "moment";
class EventDetail extends Component { class EventDetail extends Component {
constructor(props) { constructor(props) {
...@@ -31,13 +41,23 @@ class EventDetail extends Component { ...@@ -31,13 +41,23 @@ class EventDetail extends Component {
this.props.getNotesByEvent(this.props.match.params.id); this.props.getNotesByEvent(this.props.match.params.id);
} }
renderTrainees() { renderTrainees() {
const event = this.props.selectedEvent; const event = this.props.selectedEvent;
return this.props.trainees?.map((item) => { return this.props.trainees
const notes = this.props.eventNotes?.filter(note => note.profile === item.id); ?.sort(function (a, b) {
return ( var nameA = a.full_name.toLowerCase(),
item.role === 'Student' ? 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(
(note) => note.profile === item.id
);
return item.role === "Student" ? (
<TraineeTableRow <TraineeTableRow
selectedEvent={event} selectedEvent={event}
notes={notes} notes={notes}
...@@ -45,9 +65,8 @@ class EventDetail extends Component { ...@@ -45,9 +65,8 @@ class EventDetail extends Component {
edit={this.state.edit} edit={this.state.edit}
key={item.id} key={item.id}
/> />
: null ) : null;
); });
});
} }
renderEvent() { renderEvent() {
...@@ -55,16 +74,16 @@ class EventDetail extends Component { ...@@ -55,16 +74,16 @@ 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>
<Container textAlign='justified'> <Container textAlign="justified">
<Item.Header as='h3'>Leírás</Item.Header> <Item.Header as="h3">Leírás</Item.Header>
<Item.Content>{description}</Item.Content> <Item.Content>{description}</Item.Content>
</Container> </Container>
</Item> </Item>
...@@ -82,16 +101,15 @@ class EventDetail extends Component { ...@@ -82,16 +101,15 @@ 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> <Comment.Text>{note.note}</Comment.Text>
{note.note}
</Comment.Text>
</Comment.Content> </Comment.Content>
</Comment> </Comment>
</Segment>); </Segment>
);
} }
return ''; return "";
}); });
} }
...@@ -99,66 +117,57 @@ class EventDetail extends Component { ...@@ -99,66 +117,57 @@ 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 ? (
<Button onClick={() => this.setState({ edit: true })}>
Módosítás
</Button>
) : (
<Button
onClick={() => {
this.setState({ edit: false });
}}
>
{" "}
Kész
</Button>
)}
<Table celled unstackable> <Table celled unstackable>
<Table.Header> <Table.Header>
<Table.Row textAlign='center'> <Table.Row textAlign="center">
<Table.HeaderCell>Név</Table.HeaderCell> <Table.HeaderCell>Név</Table.HeaderCell>
<Table.HeaderCell>Jelen volt</Table.HeaderCell> <Table.HeaderCell>Jelen volt</Table.HeaderCell>
<Table.HeaderCell>Megjegyzések</Table.HeaderCell> <Table.HeaderCell>Megjegyzések</Table.HeaderCell>
</Table.Row> </Table.Row>
</Table.Header> </Table.Header>
<Table.Body> <Table.Body>
{ this.props.selectedEvent ? {this.props.selectedEvent ? this.renderTrainees() : null}
this.renderTrainees()
:
null
}
</Table.Body> </Table.Body>
</Table> </Table>
{!this.state.edit ?
<Button onClick={() => this.setState({ edit: true })}>
Módosítás
</Button>
:
<Button onClick={() => {
this.setState({ edit: false });
this.props.submitVisitors(this.props.selectedEvent);
}}
> Kész
</Button>
}
<Comment.Group> <Comment.Group>
<Header dividing> <Header dividing>Megjegyzések</Header>
Megjegyzések {this.props.eventNotes ? this.renderComments() : ""}
</Header>
{this.props.eventNotes ?
this.renderComments()
:
''
}
<Form reply> <Form reply>
<Form.TextArea <Form.TextArea
value={note.note} value={note.note}
onChange={e => this.props.writeNote(e)} onChange={(e) => this.props.writeNote(e)}
/> />
<Button <Button
onClick={() => { onClick={() => {
this.props.postEventNote({ eventid: event.id, this.props.postEventNote({
note: note.note }); eventid: event.id,
this.props.clearWrite(); note: note.note,
} });
} this.props.clearWrite();
content='Megjegyzés hozzáadása' }}
labelPosition='left' content="Megjegyzés hozzáadása"
icon='edit' labelPosition="left"
icon="edit"
primary primary
/> />
</Form> </Form>
...@@ -171,8 +180,13 @@ class EventDetail extends Component { ...@@ -171,8 +180,13 @@ class EventDetail extends Component {
const mapStateToProps = ({ const mapStateToProps = ({
notes: { eventNotes, actualNote }, notes: { eventNotes, actualNote },
events: { selectedEvent }, events: { selectedEvent },
trainees: { trainees } trainees: { trainees },
}) => ({ eventNotes, selectedEvent, trainees, actualNote }); }) => ({
eventNotes,
selectedEvent,
trainees,
actualNote,
});
export default connect(mapStateToProps, { export default connect(mapStateToProps, {
getEventById, getEventById,
......

Hosted with :heart: by KSZK