From a65ad84282a79225072da60cced9d1d95cd9cdba Mon Sep 17 00:00:00 2001 From: Bereczki Sandor <bsandor453@gmail.com> Date: Thu, 31 Jan 2019 16:54:59 +0100 Subject: [PATCH] You can no longer send expired homeworks. --- src/components/forms/AddSolutionForm.js | 56 ++++++++++++++----------- src/components/pages/Homework.js | 1 + 2 files changed, 33 insertions(+), 24 deletions(-) diff --git a/src/components/forms/AddSolutionForm.js b/src/components/forms/AddSolutionForm.js index 254d291..7105e36 100644 --- a/src/components/forms/AddSolutionForm.js +++ b/src/components/forms/AddSolutionForm.js @@ -4,6 +4,7 @@ import { connect } from 'react-redux'; import { addSolution, writeSolution, writeSolutionFile, addDocument, clearWrite } from '../../actions/homework'; import './Forms.css'; import ConfirmModal from '../forms/ConfirmModal'; +import { emptyMessage } from '../pages/Homework'; class AddSolutionForm extends Component { constructor(props) { @@ -22,46 +23,53 @@ class AddSolutionForm extends Component { const accepted = false; const sentences = this.props.taskdesc.split('\n'); const note = ''; + const disabledText = 'A hatĂĄridĹ lejĂĄrt, tovĂĄbbi beadĂĄs nem lehetsĂŠges.' return ( <Modal open={this.state.showModal} trigger={ - <button id='task' onClick={() => { this.setState({ showModal: true }); }}> + <button + id='task' + onClick={() => { this.setState({ showModal: true }); }} + > <Icon name='external' /> {this.props.tasktitle} </button> } > <Modal.Header> - {this.props.multiple ? 'MĂĄsik' : 'Ăj'} 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.Content> <Modal.Description style={{ marginBottom: '2em' }}> <Header as='h5'>Feladat leĂrĂĄsa:</Header> {sentences.map(s => (<p>{s}</p>))} </Modal.Description> - <Form> - <Form.Field - control={Input} - label='MegoldĂĄs cĂme:' - name='name' - onChange={e => this.props.writeSolution(e)} - value={name} - placeholder='Adj meg egy cĂmet a beadandĂł megoldĂĄsodnak...' - /> - <Form.Field - control={TextArea} - label='MegoldĂĄs leĂrĂĄsa:' - name='description' - onChange={e => this.props.writeSolution(e)} - value={description} - placeholder='Add meg a megoldĂĄs leĂrĂĄsĂĄt...' - /> - <Form.Field> - <label>FĂĄjl:</label> - <Input type='file' onChange={e => this.props.writeSolutionFile(e)} /> - </Form.Field> - </Form> + {this.props.disabled ? + emptyMessage(disabledText, undefined, undefined, this.props.disabled) : + <Form> + <Form.Field + control={Input} + label='MegoldĂĄs cĂme:' + name='name' + onChange={e => this.props.writeSolution(e)} + value={name} + placeholder='Adj meg egy cĂmet a beadandĂł megoldĂĄsodnak...' + /> + <Form.Field + control={TextArea} + label='MegoldĂĄs leĂrĂĄsa:' + name='description' + onChange={e => this.props.writeSolution(e)} + value={description} + placeholder='Add meg a megoldĂĄs leĂrĂĄsĂĄt...' + /> + <Form.Field> + <label>FĂĄjl:</label> + <Input type='file' onChange={e => this.props.writeSolutionFile(e)} /> + </Form.Field> + </Form> + } </Modal.Content> <Modal.Actions> <Button diff --git a/src/components/pages/Homework.js b/src/components/pages/Homework.js index 530a533..813992a 100644 --- a/src/components/pages/Homework.js +++ b/src/components/pages/Homework.js @@ -120,6 +120,7 @@ class Homework extends Component { tasktitle={task.title} taskdesc={task.text} multiple={this.getTaskDisplayStyle(task) !== 'can_submit'} + disabled={moment().isAfter(task.deadline)} /> </Table.Cell> <Table.Cell> -- GitLab