From 550aa63b6696d9424852c4db20d9ac631f40bdb9 Mon Sep 17 00:00:00 2001 From: rlacko <rlacko@sch.bme.hu> Date: Thu, 6 Feb 2020 21:55:38 +0100 Subject: [PATCH] admin edit and show Task bits --- src/actions/homework.js | 2 ++ src/components/forms/EditTaskForm.js | 11 +++++++++++ src/components/pages/Homework.js | 8 ++++++++ 3 files changed, 21 insertions(+) diff --git a/src/actions/homework.js b/src/actions/homework.js index 3d24ed5..741e1e4 100644 --- a/src/actions/homework.js +++ b/src/actions/homework.js @@ -71,6 +71,7 @@ export const editTask = ({ title, text, deadline, + bits, }) => ( async (dispatch) => { try { @@ -78,6 +79,7 @@ export const editTask = ({ title, text, deadline, + bits, }); if (response.data.id) { dispatch({ diff --git a/src/components/forms/EditTaskForm.js b/src/components/forms/EditTaskForm.js index 0574f3a..83b4ad2 100644 --- a/src/components/forms/EditTaskForm.js +++ b/src/components/forms/EditTaskForm.js @@ -19,6 +19,7 @@ class EditTaskForm extends Component { title, text, deadline, + bits, } = this.props.selectedTask; return ( <Modal @@ -68,6 +69,15 @@ class EditTaskForm extends Component { }} value={deadline} /> + <Form.Field + control={Input} + type='number' + label='Bitek szĂĄma:' + name='bits' + onChange={e => this.props.writeTask(e)} + value={bits} + placeholder='Add meg a feladatĂŠrt kaphatĂł bitek szĂĄmĂĄt ...' + /> </Form> </Modal.Content> <Modal.Actions> @@ -96,6 +106,7 @@ class EditTaskForm extends Component { title, text, deadline, + bits, }); this.setState({ showModal: false }); this.props.clearWrite(); diff --git a/src/components/pages/Homework.js b/src/components/pages/Homework.js index 3729780..1b3b0eb 100644 --- a/src/components/pages/Homework.js +++ b/src/components/pages/Homework.js @@ -218,6 +218,12 @@ class Homework extends Component { <Table.Cell> {moment(task.deadline).format('YYYY. MM. DD. HH:mm')} </Table.Cell> + {/* Bits */} + <Table.Cell> + <Label color={null}> + {task.bits} bit + </Label> + </Table.Cell> {/* Admin buttons */} <Table.Cell> <EditTaskForm onClick={() => this.props.setSelectedTask(task)} /> @@ -278,6 +284,8 @@ class Homework extends Component { <Icon circular name='calendar' /> BeadĂĄsi hatĂĄridĹ </Table.HeaderCell> + <Table.HeaderCell width={2}> + </Table.HeaderCell> <Table.HeaderCell> <Icon circular name='edit' /> MĂłdosĂtĂĄs / TĂśrlĂŠs -- GitLab