#105 added UsersTasks folder

planner-front/src/components/MyTasksCompoments/TableRowTask/TableRowTask.js

@@ -31,11 +31,12 @@ const TableRowTask= ({
   deleteHandle,
   handleEditTask, 
   deleteDateTimeTask,
-  // handleEditDateTimeTask,
   onChange,
   onModalOpen,
   onProjectChange,
+  onExecutorChange,
   uniqueProjects,
+  executors,
   onAuthorChange,
   onDateChange,
   onToggleEditMode,
@@ -144,6 +145,36 @@ const TableRowTask= ({
                           />
                         )}
 
+                              {/* executor cell display */}
+                              {/* executor cell display */}
+                              {/* executor cell display */}
+                              {/* executor cell display */}
+                        {task.isEditMode && task.author.id===user.id  ? (
+                          <TableCell>
+                            <BasicSelect
+                              items={executors.map((e) => ({
+                                value: e?.id,
+                                title: e?.displayName,
+                              }))}
+                              task={task}
+                              onChange={onExecutorChange}
+                              name="executor"
+                              value={task.executor?.id}
+                            />
+                          </TableCell>
+                        ) : (
+                          <CustomTableCell
+                            {...{
+                              task,
+                              name: "executor",
+                              value: task.executor?.displayName,
+                              user:user
+                            }}
+                          />
+                        )}
+
+
+
                         <CustomTableCell
                           {...{
                             task,

planner-front/src/containers/UsersTasks/UsersTasksHeader/UsersTasksHeader.js

+import * as React from "react";
+import PropTypes from "prop-types";
+import Box from "@mui/material/Box";
+import TableCell from "@mui/material/TableCell";
+import TableHead from "@mui/material/TableHead";
+import TableRow from "@mui/material/TableRow";
+import TableSortLabel from "@mui/material/TableSortLabel";
+import { visuallyHidden } from "@mui/utils";
+
+const headCells = [
+  {
+    id: "id",
+    numeric: true,
+    disablePadding: true,
+    label: "",
+  },
+  {
+    id: "priority",
+    numeric: false,
+    disablePadding: true,
+    label: "Приоритет",
+  },
+  {
+    id: "createdAt",
+    numeric: true,
+    disablePadding: false,
+    label: "Дата создания",
+  },
+  {
+    id: "title",
+    numeric: true,
+    disablePadding: false,
+    label: "Заголовок",
+  },
+  {
+    id: "projectName",
+    numeric: true,
+    disablePadding: false,
+    label: "Проект",
+  },
+  {
+    id: "executorDisplayName",
+    numeric: true,
+    disablePadding: false,
+    label: "Исполнитель",
+  },
+  {
+    id: "authorDisplayName",
+    numeric: true,
+    disablePadding: false,
+    label: "Автор",
+  },
+
+  {
+    id: "dateTimeStart",
+    numeric: true,
+    disablePadding: false,
+    label: "Дата и время выполнения",
+  },
+  {
+    id: "dateTimeDue",
+    numeric: true,
+    disablePadding: false,
+    label: "Дедлайн",
+  },
+  {
+    id: "accomplish",
+    numeric: true,
+    disablePadding: false,
+    label: "Статус",
+  },
+  {
+    id: "change",
+    numeric: false,
+    disablePadding: false,
+    label: "",
+  },
+  {
+    id: "delete",
+    numeric: false,
+    disablePadding: false,
+    label: "",
+  },
+];
+
+export default function UsersTasksHeader({ order, orderBy, rowCount, onRequestSort }) {
+  
+  const createSortHandler = (property) => (event) => {
+    onRequestSort(event, property);
+  };
+
+  return (
+    <TableHead>
+      <TableRow>
+        {headCells.map((headCell) => (
+          <TableCell
+            key={headCell.id}
+            align={"center"}
+            padding={headCell.disablePadding ? "none" : "normal"}
+            sortDirection={orderBy === headCell.id ? order : false}
+          >
+            <TableSortLabel
+              active={orderBy === headCell.id}
+              direction={orderBy === headCell.id ? order : "asc"}
+              onClick={createSortHandler(headCell.id)}
+            >
+              {headCell.label}
+              {orderBy === headCell.id ? (
+                <Box component="span" sx={visuallyHidden}>
+                  {order === "desc" ? "sorted descending" : "sorted ascending"}
+                </Box>
+              ) : null}
+            </TableSortLabel>
+          </TableCell>
+        ))}
+      </TableRow>
+    </TableHead>
+  );
+}
+
+EnhancedTableHead.propTypes = {
+  onRequestSort: PropTypes.func.isRequired,
+  order: PropTypes.oneOf(["asc", "desc"]).isRequired,
+  orderBy: PropTypes.string.isRequired,
+  rowCount: PropTypes.number.isRequired,
+};