Commit 3e6ca12d authored by Kushal Pandya's avatar Kushal Pandya

Merge branch...

Merge branch '220191-roadmap-does-not-reflect-the-correct-dates-in-milestones-and-in-epics-after-editing' into 'master'

Roadmap - Fix bar width for week layout

See merge request gitlab-org/gitlab!79814
parents 7ed4e80b dabd416a
...@@ -115,7 +115,7 @@ export default { ...@@ -115,7 +115,7 @@ export default {
timelineBarWidth += this.getBarWidthForSingleWeek(cellWidth, date); timelineBarWidth += this.getBarWidthForSingleWeek(cellWidth, date);
} }
} else if (this.isTimeframeUnderEndDateForWeek(this.timeframe[i])) { } else if (this.isTimeframeUnderEndDateForWeek(this.timeframe[i])) {
timelineBarWidth += this.getBarWidthForSingleWeek(cellWidth, itemEndDate.day + 1); timelineBarWidth += this.getBarWidthForSingleWeek(cellWidth, itemEndDate.day);
break; break;
} else { } else {
timelineBarWidth += this.getBarWidthForSingleWeek(cellWidth, 7); timelineBarWidth += this.getBarWidthForSingleWeek(cellWidth, 7);
......
...@@ -213,7 +213,7 @@ describe('WeeksPresetMixin', () => { ...@@ -213,7 +213,7 @@ describe('WeeksPresetMixin', () => {
approximately 154px ^ approximately 154px ^
~ approximately 154px ~ approximately 154px
*/ */
const expectedTimelineBarWidth = 488; // in px; const expectedTimelineBarWidth = 462; // in px;
expect(Math.floor(wrapper.vm.getTimelineBarWidthForWeeks())).toBe(expectedTimelineBarWidth); expect(Math.floor(wrapper.vm.getTimelineBarWidthForWeeks())).toBe(expectedTimelineBarWidth);
}); });
......
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