Skip to content

fix: change table for customer view #4454

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
elkhawajah merged 2 commits into from
Aug 14, 2021
Merged

fix: change table for customer view #4454

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4bfbbfa
fix: change table for customer view
yoution Aug 11, 2021
8ea95c7
fix: issue #4450, #4451, #4452, #4454
yoution Aug 13, 2021
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
17 changes: 3 additions & 14 deletions src/projects/detail/components/SimplePlan/ManageMilestones/ManageMilestones.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ class ManageMilestones extends React.Component {
const {
isUpdatable
} = this.props
if (!this.isExpandChallengeList(milestone)) {
if (!isUpdatable ||!this.isExpandChallengeList(milestone)) {
return <tr />
}

Expand Down Expand Up @@ -258,8 +258,8 @@ class ManageMilestones extends React.Component {
<IconGnattView />
</button>
<div styleName="separator" /> */}
{canEdit ? <div styleName="unselect-bottom" onClick={this.onUnselectAll}>
<IconUnselect /> {this.getSelectCount()} PROJECTS SELECTED
{this.getSelectCount() > 0 ? <div styleName="unselect-bottom" onClick={this.onUnselectAll}>
<IconUnselect /> {this.getSelectCount()} PROJECT(S) SELECTED
</div>: null }
{canEdit ? <div styleName="line"/>: null}
{ canEdit ? <div styleName="delete-button">
Expand All @@ -284,17 +284,6 @@ class ManageMilestones extends React.Component {
<div styleName="table-container">
<Formsy.Form>
<table styleName="milestones-table">
<colgroup>
<col style={{ width: '20px' }} />
<col style={{ width: '20px' }} />{/* CHECKBOX */}
<col style={{ width: '8%' }} />{/* MILESTONE */}
<col />{/* DESCRIPTION */}
<col style={{ width: '12%' }} />{/* START DATE */}
<col style={{ width: '11%' }} />{/* END DATE */}
<col style={{ width: '10%' }} />{/* STATUS */}
<col style={{ width: '13%' }} />{/* COPILOTS */}
{isUpdatable && (<col style={{ width: '64px' }} />)}{/* ACTION */}
</colgroup>
<thead>
<MilestoneHeaderRow
milestones={milestones}
Expand Down
1 change: 1 addition & 0 deletions ...l/components/SimplePlan/components/ConfirmMoveMilestoneDate/ConfirmMoveMilestoneDate.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
margin-bottom: 10px;
>input {
height: 26px;
line-height: 26px;
width: 80px;
margin: 0 10px 0 0;
}
Expand Down
2 changes: 1 addition & 1 deletion ...rojects/detail/components/SimplePlan/components/MilestoneHeaderRow/MilestoneHeaderRow.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ function MilestoneHeaderRow ({ milestones, onChangeMilestones, isUpdatable }) {

return (
<tr styleName="milestone-row">
<th />
{isUpdatable ? <th />: null}
<th>
<TCFormFields.Checkbox
name="select-all"
Expand Down
1 change: 1 addition & 0 deletions ...ail/components/SimplePlan/components/MilestoneMoveDateButton/MilestoneMoveDateButton.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
height: 14px;
padding: 0;
border: 0;
margin: 0 8px;
cursor: pointer;

svg {
Expand Down
4 changes: 2 additions & 2 deletions src/projects/detail/components/SimplePlan/components/MilestoneRow/MilestoneRow.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ function MilestoneRow({

return edit ? (
<tr styleName="milestone-row" className="edit-milestone-row">
<td />
{isUpdatable ? <td /> : null}
<td styleName="checkbox">
<TCFormFields.Checkbox
name={`select-${rowId}`}
Expand Down Expand Up @@ -251,7 +251,7 @@ function MilestoneRow({
</tr>
) : (
<tr styleName="milestone-row">
<td styleName="expand" onClick={() => onExpand(!isExpand, milestone)}>{isExpand ? <IconClose />: <IconExpand />}</td>
{isUpdatable ? <td styleName="expand" onClick={() => onExpand(!isExpand, milestone)}>{isExpand ? <IconClose />: <IconExpand />}</td>: null}
<td styleName="checkbox">
<TCFormFields.Checkbox
name={`select-${rowId}`}
Expand Down
4 changes: 4 additions & 0 deletions src/projects/detail/components/SimplePlan/components/MilestoneRow/MilestoneRow.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,5 +153,9 @@
> *:not(:last-child) {
margin-right: 10px;
}
svg {
width: 14px;
height: 14px;
}
}
}