From fe2d27f40ce94fa771e76a1d868cc9f4bab2f628 Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Thu, 29 Dec 2016 10:53:07 +0530 Subject: [PATCH] included frappe-gantt as external library (#2527) --- frappe/public/build.json | 3 +- frappe/public/css/gantt.css | 112 -- frappe/public/js/frappe/list/doclistview.js | 35 +- frappe/public/js/frappe/views/gantt.js | 1075 ----------------- .../js/lib/frappe-gantt/frappe-gantt.min.js | 2 + frappe/public/less/gantt.less | 137 --- 6 files changed, 18 insertions(+), 1346 deletions(-) delete mode 100644 frappe/public/css/gantt.css delete mode 100755 frappe/public/js/frappe/views/gantt.js create mode 100755 frappe/public/js/lib/frappe-gantt/frappe-gantt.min.js delete mode 100644 frappe/public/less/gantt.less diff --git a/frappe/public/build.json b/frappe/public/build.json index fb9f6b1d7c..9f40bf2d1a 100755 --- a/frappe/public/build.json +++ b/frappe/public/build.json @@ -230,8 +230,7 @@ "public/js/frappe/list/image_view_item_main_head.html", "public/js/frappe/list/header_select_all_like_filter.html", "public/js/frappe/list/item_assigned_to_comment_count.html", - "public/js/frappe/views/treeview.js", - "public/js/frappe/views/gantt.js" + "public/js/frappe/views/treeview.js" ], "css/report.min.css": [ "public/css/report.css", diff --git a/frappe/public/css/gantt.css b/frappe/public/css/gantt.css deleted file mode 100644 index bb4394bbaf..0000000000 --- a/frappe/public/css/gantt.css +++ /dev/null @@ -1,112 +0,0 @@ -.gantt #grid .grid-background { - fill: none; -} -.gantt #grid .grid-header { - fill: #ffffff; - stroke: #d1d8dd; - stroke-width: 1.4; -} -.gantt #grid .grid-row { - fill: #ffffff; -} -.gantt #grid .grid-row:nth-child(even) { - fill: #fafbfc; -} -.gantt #grid .row-line { - stroke: #EBEFF2; -} -.gantt #grid .tick { - stroke: #d1d8dd; - stroke-width: 0.2; -} -.gantt #grid .tick.thick { - stroke-width: 0.4; -} -.gantt #grid .today-highlight { - fill: #fffce7; - opacity: 0.5; -} -.gantt #arrow { - fill: none; - stroke: #8D99A6; - stroke-width: 1.4; -} -.gantt .bar { - fill: #cbd1d8; - stroke: #aeb0b1; - stroke-width: 0; - transition: stroke-width 0.3s ease; -} -.gantt .bar-progress { - fill: #a8a8ff; -} -.gantt .bar-invalid { - fill: transparent; - stroke: #aeb0b1; - stroke-width: 1; - stroke-dasharray: 5; -} -.gantt .bar-invalid ~ .bar-label { - fill: #6c7680; -} -.gantt .bar-label { - fill: #fff; - dominant-baseline: central; - text-anchor: middle; - font-size: 12px; - font-weight: lighter; - letter-spacing: 0.8px; -} -.gantt .bar-label.big { - fill: #6c7680; - text-anchor: start; -} -.gantt .handle { - fill: #F0F4F7; - cursor: ew-resize; - opacity: 0; - visibility: hidden; - transition: opacity .3s ease; -} -.gantt .bar-wrapper { - cursor: pointer; -} -.gantt .bar-wrapper:hover .bar { - stroke-width: 2; -} -.gantt .bar-wrapper:hover .handle { - visibility: visible; - opacity: 1; -} -.gantt .bar-wrapper.active .bar { - stroke-width: 2; -} -.gantt .primary-text, -.gantt .secondary-text { - font-size: 12px; - text-anchor: middle; -} -.gantt .primary-text { - fill: #6c7680; -} -.gantt .secondary-text { - fill: #36414C; -} -.gantt #details { - font-size: 14; -} -.gantt #details .details-container { - stroke: #d1d8dd; - stroke-width: 1.1; - fill: #fff; -} -.gantt #details .details-heading { - fill: #36414C; - font-weight: 500; -} -.gantt #details .details-body { - fill: #6c7680; -} -.gantt .hide { - display: none; -} diff --git a/frappe/public/js/frappe/list/doclistview.js b/frappe/public/js/frappe/list/doclistview.js index dc33612e00..10bc219813 100644 --- a/frappe/public/js/frappe/list/doclistview.js +++ b/frappe/public/js/frappe/list/doclistview.js @@ -446,7 +446,7 @@ frappe.views.DocListView = frappe.ui.Listing.extend({ }, render_rows_Gantt: function(values) { - var gantt_area = $('') + var gantt_area = $('') .appendTo(this.wrapper.find('.result-list').css("overflow", "scroll")); var id = frappe.dom.set_unique_id(gantt_area); @@ -460,41 +460,36 @@ frappe.views.DocListView = frappe.ui.Listing.extend({ id: item[field_map.id], doctype: me.doctype, progress: item.progress, - dependent: item.depends_on_tasks || "" + dependencies: item.depends_on_tasks || "" }; }); - frappe.require(["assets/frappe/js/lib/snap.svg-min.js", "assets/frappe/css/gantt.css"], function() { - me.gantt = new Gantt({ - parent_selector: '#' + id, - tasks: tasks, - date_format: "YYYY-MM-DD", - bar: { - height: 20 - }, - events: { - bar_on_click: function (task) { + frappe.require([ + "assets/frappe/js/lib/snap.svg-min.js", + "assets/frappe/js/lib/frappe-gantt/frappe-gantt.min.js" + ], function() { + me.gantt = new Gantt("#"+id, tasks, { + date_format: "YYYY-MM-DD", + on_click: function (task) { frappe.set_route('Form', task.doctype, task.id); }, - bar_on_date_change: function(task, start, end) { + on_date_change: function(task, start, end) { update_field(task.id, field_map.start, start.format("YYYY-MM-DD"), function() { update_field(task.id, field_map.end, end.format("YYYY-MM-DD"), function() { show_alert({message:__("Saved"), indicator:'green'}, 1); }); }); }, - bar_on_progress_change: function(task, progress) { + on_progress_change: function(task, progress) { update_field(task.id, 'progress', progress, function() { show_alert({message:__("Saved"), indicator:'green'}, 1); }); }, - on_viewmode_change: function(mode) { + on_view_change: function(mode) { me.list_settings.view_mode = mode; } - } - }); - me.gantt.render(); + }); - var view_modes = me.gantt.get_view_modes() || []; + var view_modes = me.gantt.config.view_modes || []; var dropdown = "