Skip to content

Feature/project listing updates#1268 #1325

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vikasrohit merged 2 commits into from
Nov 15, 2017
Merged

Feature/project listing updates#1268 #1325

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
df42b39
#1303 - correction in project progress logic.
Nov 15, 2017
f97d482
Merge branch 'feature/project-listing-updates' into feature/project-l…
Nov 15, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions src/projects/list/components/Projects/ProjectCardBody.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ function ProjectCardBody({ project, duration, currentMemberRole, descLinesCount
const canEdit = isManager || (currentMemberRole
&& (_.indexOf([PROJECT_ROLE_COPILOT], currentMemberRole) > -1))

const progress = _.get(process, 'percent', 0)

return (
<div className="project-card-body">
<TextTruncate
Expand All @@ -27,7 +29,7 @@ function ProjectCardBody({ project, duration, currentMemberRole, descLinesCount
textTruncateChild={<span><Link className="read-more-link" to={`/projects/${project.id}/specification`}> read more </Link></span>}
/>
<div className="project-status">
{(duration && duration.percent === 0) &&
{(project.status !== PROJECT_STATUS_ACTIVE || progress === 0) &&
<EnhancedProjectStatus
status={project.status}
showText
Expand All @@ -38,9 +40,9 @@ function ProjectCardBody({ project, duration, currentMemberRole, descLinesCount
onChangeStatus={onChangeStatus}
/>
}
{(project.status === PROJECT_STATUS_ACTIVE && duration && duration.percent !== 0) &&
<ProjectProgress {...duration} viewType={ProjectProgress.ViewTypes.CIRCLE} percent={46}>
<span className="progress-text">{duration.percent}% completed</span>
{(project.status === PROJECT_STATUS_ACTIVE && progress !== 0) &&
<ProjectProgress {...duration} viewType={ProjectProgress.ViewTypes.CIRCLE} percent={progress}>
<span className="progress-text">{progress}% completed</span>
</ProjectProgress>
}
</div>
Expand Down