AS1024/Kanboard-Prod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Minor Gantt chart improvements

Browse Source 
* Task do not open anymore in a new window on the Gantt chart
* Do not display task progress for tasks with no start/end date
This commit is contained in:
Frederic Guillot
2016-05-18 20:34:36 -04:00
parent 0378b5fcf9
commit 0830fe22b7
4 changed files with 22 additions and 2698 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@@ -10,6 +10,8 @@ New features:
Improvements: Improvements:
* Task do not open anymore in a new window on the Gantt chart
* Do not display task progress for tasks with no start/end date
* Use Gulp and Bower to manage assets * Use Gulp and Bower to manage assets
* Controller and Middleware refactoring * Controller and Middleware refactoring

2683
assets/js/app.min.js vendored
View File

File diff suppressed because one or more lines are too long

34
assets/js/src/Gantt.js
View File

@@ -81,11 +81,11 @@ Kanboard.Gantt.prototype.renderVerticalHeader = function() {
} }
else { else {
content content
.append(jQuery("<a>", {"href": this.data[i].board_link, "target": "_blank", "title": $(this.options.container).data("label-board-link")}).append('<i class="fa fa-th"></i>')) .append(jQuery("<a>", {"href": this.data[i].board_link, "title": $(this.options.container).data("label-board-link")}).append('<i class="fa fa-th"></i>'))
.append("&nbsp;") .append("&nbsp;")
.append(jQuery("<a>", {"href": this.data[i].gantt_link, "target": "_blank", "title": $(this.options.container).data("label-gantt-link")}).append('<i class="fa fa-sliders"></i>')) .append(jQuery("<a>", {"href": this.data[i].gantt_link, "title": $(this.options.container).data("label-gantt-link")}).append('<i class="fa fa-sliders"></i>'))
.append("&nbsp;") .append("&nbsp;")
.append(jQuery("<a>", {"href": this.data[i].link, "target": "_blank"}).append(this.data[i].title)); .append(jQuery("<a>", {"href": this.data[i].link}).append(this.data[i].title));
} }
seriesDiv.append(jQuery("<div>", {"class": "ganttview-vtheader-series-name"}).append(content)); seriesDiv.append(jQuery("<div>", {"class": "ganttview-vtheader-series-name"}).append(content));
@@ -205,20 +205,6 @@ Kanboard.Gantt.prototype.addBlocks = function(slider, start) {
block.data("record", series); block.data("record", series);
this.setBarColor(block, series); this.setBarColor(block, series);
if (series.progress != "0%") {
block.append(jQuery("<div>", {
"css": {
"z-index": 0,
"position": "absolute",
"top": 0,
"bottom": 0,
"background-color": series.color.border,
"width": series.progress,
"opacity": 0.4
}
}));
}
jQuery(rows[rowIdx]).append(block); jQuery(rows[rowIdx]).append(block);
rowIdx = rowIdx + 1; rowIdx = rowIdx + 1;
} }
@@ -281,6 +267,20 @@ Kanboard.Gantt.prototype.setBarColor = function(block, record) {
else { else {
block.css("background-color", record.color.background); block.css("background-color", record.color.background);
block.css("border-color", record.color.border); block.css("border-color", record.color.border);
if (record.progress != "0%") {
block.append(jQuery("<div>", {
"css": {
"z-index": 0,
"position": "absolute",
"top": 0,
"bottom": 0,
"background-color": record.color.border,
"width": record.progress,
"opacity": 0.4
}
}));
}
} }
}; };

1
gulpfile.js
View File

@@ -129,6 +129,7 @@ gulp.task('vendor', function() {
gulp.task('js', function() { gulp.task('js', function() {
gulp.src(src.js) gulp.src(src.js)
.pipe(concat('app.min.js')) .pipe(concat('app.min.js'))
.pipe(uglify())
.pipe(gulp.dest(dist.js)) .pipe(gulp.dest(dist.js))
; ;
}); });