From 5aa284770a8479d19f1b6ec5e95e7ca0ac620117 Mon Sep 17 00:00:00 2001 From: projectsodoo Date: Mon, 1 Mar 2021 20:00:26 +0530 Subject: [PATCH] compare project condition js updated --- project_report/static/src/js/graph_renderer.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/project_report/static/src/js/graph_renderer.js b/project_report/static/src/js/graph_renderer.js index db19740..84d7d8c 100755 --- a/project_report/static/src/js/graph_renderer.js +++ b/project_report/static/src/js/graph_renderer.js @@ -587,7 +587,7 @@ var MAX_LEGEND_LENGTH = 25 * (1 + config.device.size_class); // this.title = 'Time Line'; if (self.resModel == 'project.budget.hrs.report') { - var groupedData = _.groupBy(data.datasets, x => x.label.replace('Actual Hours', '').replace('Budgeted Hours', '')); + var groupedData = _.groupBy(data.datasets, x => x.label.replace('Actual Hours', '').replace('Budgeted Hours', '').split("/")[0]); _.map(groupedData, (y) => { if (y.length > 1) { var zipped_1 = _.zip.apply(null, [y[0].data, y[1].data]); @@ -753,7 +753,7 @@ var MAX_LEGEND_LENGTH = 25 * (1 + config.device.size_class); //console.log("datappppppppppp", dataPoints); if (self.resModel == 'project.budget.hrs.report') { - var groupedData = _.groupBy(data.datasets, x => x.label.replace('Actual Hours', '').replace('Budgeted Hours', '')); + var groupedData = _.groupBy(data.datasets, x => x.label.replace('Actual Hours', '').replace('Budgeted Hours', '').split("/")[0]); //var groupedData = _.groupBy(data.datasets, x => x.label.replace('Actual', '').replace('Budgeted', '').split("/")[0]); _.map(groupedData, (y) => { if (y.length > 1) { @@ -778,6 +778,7 @@ var MAX_LEGEND_LENGTH = 25 * (1 + config.device.size_class); if (self.resModel == 'project.timeline.report') { //var groupedData = _.groupBy(data.datasets, x => x.label.replace('Actual Hours', '').replace('Budgeted Hours', '').split("/")[0]); var groupedData = _.groupBy(data.datasets, x => x.label.replace('Actual', '').replace('Budgeted', '').split("/")[0]); + console.log("groupedData ", groupedData); _.map(groupedData, (y) => { if (y.length > 1) { var zipped_1 = _.zip.apply(null, [y[0].data, y[1].data]);