apuc/guild_front
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' of https://github.com/apuc/outstaffing-react into fix-tracker-and-statistics

Browse Source
This commit is contained in:
MaxOvs19
2023-10-11 12:22:00 +03:00
parent be411ffef2 386dcd023f
commit b226ee88bd
9 changed files with 149 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/pages/ProjectTracker/ProjectTracker.js
View File

@ -368,9 +368,6 @@ export const ProjectTracker = () => {
: "tasks__head__persons noProjectUsers"
}
>
{projectBoard.projectUsers?.length > 3 && (
<span className="countPersons">+1...</span>
)}
{Boolean(projectBoard.projectUsers?.length) && (
<div className="projectPersons">
{projectBoard.projectUsers.slice(0, 3).map((person) => {
@ -388,6 +385,9 @@ export const ProjectTracker = () => {
})}
</div>
)}
{projectBoard.projectUsers?.length > 3 && (
<span className="countPersons">+1</span>
)}
<span
className="addPerson"
onClick={() => {

18
src/pages/Tracker/Tracker.js
View File

@ -71,8 +71,8 @@ export const Tracker = () => {
apiRequest(
`/task/get-user-tasks?user_id=${localStorage.getItem("id")}`
).then((el) => {
const allTasks = el.filter((item) => item.status !== 0);
const completedTasks = el.filter((item) => item.status === 0);
const allTasks = el ? el.filter((item) => item.status !== 0) : [];
const completedTasks = el ? el.filter((item) => item.status === 0) : [];
setAllTasks(allTasks);
setFilteredAllTasks(allTasks);
setAllCompletedTasks(completedTasks);
@ -179,7 +179,8 @@ export const Tracker = () => {
{loader && <Loader style="green" />}
{Boolean(projects.length) &&
{projects &&
Boolean(projects.length) &&
!loader &&
projects.map((project, index) => {
return project.status !== 10 ? (
@ -188,10 +189,11 @@ export const Tracker = () => {
""
);
})}
{(!Boolean(projects.length) ||
!Boolean(
projects.filter((project) => project.status !== 10).length
)) &&
{typeof projects === "object" &&
(!Boolean(projects.length) ||
!Boolean(
projects.filter((project) => project.status !== 10).length
)) &&
!loader && (
<div className="no-projects">
<div className="no-projects__createNew">
@ -216,7 +218,7 @@ export const Tracker = () => {
</div>
</div>
)}
{Boolean(projects.length) && !loader && (
{projects && Boolean(projects.length) && !loader && (
<>
<BaseButton
styles="createProjectBtn"

4
src/pages/Tracker/tracker.scss
View File

@ -321,7 +321,7 @@
.projectPersons {
display: flex;
position: relative;
left: -10px;
left: 5px;
img {
position: relative;
display: flex;
@ -358,7 +358,7 @@
color: #252c32;
border: 1px solid #dde2e4;
background: white;
left: -6px;
left: -20px;
}
.addPerson {