Merge branch 'task-119-fix/tbl_zero_tasks' into 'development'

Task 119 fix/tbl zero tasks

See merge request !99
parents 99ebd86c ecf3aeb3
...@@ -27,7 +27,6 @@ router.get('/', async(req:Request, res:Response):Promise<Response> => { ...@@ -27,7 +27,6 @@ router.get('/', async(req:Request, res:Response):Promise<Response> => {
/**create new task for table MyTask*/ /**create new task for table MyTask*/
router.post('/', auth, async(req:Request, res:Response):Promise<Response>=>{ router.post('/', auth, async(req:Request, res:Response):Promise<Response>=>{
const {user,title,description,project,executor,dateTimeStart,dateTimeDue, dateTimeDeadLine,priority} = req.body; const {user,title,description,project,executor,dateTimeStart,dateTimeDue, dateTimeDeadLine,priority} = req.body;
//** if dateTimeDue is null , then dateTimeDeadLine copied to dateTimeDue and dateTimeStart = dateTimeDue - 1 hour*/
let dateTimeDueFinal = dateTimeDue let dateTimeDueFinal = dateTimeDue
let dateTimeStartFinal = dateTimeStart let dateTimeStartFinal = dateTimeStart
let dateTimeDeadlineFinal= dateTimeDeadLine let dateTimeDeadlineFinal= dateTimeDeadLine
......
...@@ -19,6 +19,7 @@ export default function BasicSelect({value,label,name,onChange,task,items}) { ...@@ -19,6 +19,7 @@ export default function BasicSelect({value,label,name,onChange,task,items}) {
labelId="demo-simple-select-label" labelId="demo-simple-select-label"
id="demo-simple-select" id="demo-simple-select"
value={value} value={value}
defaultValue=''
label={label} label={label}
name={name} name={name}
onChange={(e) => onChange(e, task)} onChange={(e) => onChange(e, task)}
...@@ -27,7 +28,8 @@ export default function BasicSelect({value,label,name,onChange,task,items}) { ...@@ -27,7 +28,8 @@ export default function BasicSelect({value,label,name,onChange,task,items}) {
<MenuItem key={index} value={item.value}> <MenuItem key={index} value={item.value}>
{item.title} {item.title}
</MenuItem> </MenuItem>
)):null} )
):""}
</Select> </Select>
</FormControl> </FormControl>
</Box> </Box>
......
...@@ -192,7 +192,7 @@ const TableRowTask= ({ ...@@ -192,7 +192,7 @@ const TableRowTask= ({
onChange={onDateChange} onChange={onDateChange}
user={user} user={user}
/> */} /> */}
<TableCell> {/* <TableCell> */}
<Tooltip title="Перейти в календарь"> <Tooltip title="Перейти в календарь">
<IconButton <IconButton
onClick={(id) => { deleteHandle(task.id);}} onClick={(id) => { deleteHandle(task.id);}}
...@@ -200,7 +200,7 @@ const TableRowTask= ({ ...@@ -200,7 +200,7 @@ const TableRowTask= ({
<CalendarMonthIcon /> <CalendarMonthIcon />
</IconButton> </IconButton>
</Tooltip> </Tooltip>
</TableCell> {/* </TableCell> */}
</TableCell> </TableCell>
) : ( ) : (
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment