From 6dcfd8fdb3bf0631e64409660d0403d9f022daec Mon Sep 17 00:00:00 2001 From: almeidapaulopt Date: Mon, 29 May 2017 06:29:49 +0100 Subject: [PATCH] Gantt milestones (#3370) --- frappe/public/build.json | 3 ++- frappe/public/css/gantt.css | 6 ++++++ frappe/public/js/frappe/views/gantt/gantt_view.js | 8 +++++++- frappe/public/less/gantt.less | 13 +++++++++++++ 4 files changed, 28 insertions(+), 2 deletions(-) create mode 100644 frappe/public/css/gantt.css create mode 100644 frappe/public/less/gantt.less diff --git a/frappe/public/build.json b/frappe/public/build.json index 598b964574..bb2216727d 100755 --- a/frappe/public/build.json +++ b/frappe/public/build.json @@ -214,7 +214,8 @@ "public/css/list.css", "public/css/calendar.css", "public/css/role_editor.css", - "public/css/filter_dashboard.css" + "public/css/filter_dashboard.css", + "public/css/gantt.css" ], "js/list.min.js": [ "public/js/frappe/ui/listing.html", diff --git a/frappe/public/css/gantt.css b/frappe/public/css/gantt.css new file mode 100644 index 0000000000..98791140a0 --- /dev/null +++ b/frappe/public/css/gantt.css @@ -0,0 +1,6 @@ +.gantt .bar-milestone .bar { + fill: #FD8B8B; +} +.gantt .bar-milestone .bar-progress { + fill: #FC4F51; +} diff --git a/frappe/public/js/frappe/views/gantt/gantt_view.js b/frappe/public/js/frappe/views/gantt/gantt_view.js index f7b7f54ed3..704a5a26a2 100644 --- a/frappe/public/js/frappe/views/gantt/gantt_view.js +++ b/frappe/public/js/frappe/views/gantt/gantt_view.js @@ -137,7 +137,7 @@ frappe.views.GanttView = frappe.views.ListRenderer.extend({ var label = item[field_map.title]; } - return { + var r = { start: item[field_map.start], end: item[field_map.end], name: label, @@ -146,6 +146,12 @@ frappe.views.GanttView = frappe.views.ListRenderer.extend({ progress: progress, dependencies: item.depends_on_tasks || "" }; + + if(item.is_milestone) { + r['custom_class'] = 'bar-milestone'; + }; + + return r }); }, get_item: function(name) { diff --git a/frappe/public/less/gantt.less b/frappe/public/less/gantt.less new file mode 100644 index 0000000000..1b1676b305 --- /dev/null +++ b/frappe/public/less/gantt.less @@ -0,0 +1,13 @@ +@import "variables.less"; + +// gantt +.gantt { + .bar-milestone { + .bar { + fill: @red-light; + } + .bar-progress { + fill: @red; + } + } +} \ No newline at end of file