From 2cd7b5d0784d4943bf3b41690a0d815ead9ea674 Mon Sep 17 00:00:00 2001
From: "mattias.vannergard" <mattias.vannergard@afconsult.com>
Date: Thu, 22 Oct 2015 08:29:43 +0200
Subject: [PATCH] #37 Added estimated_hours to show as Estimated Time in Tool
 Tip-window.

---
 app/controllers/planning_controller.rb | 1 +
 assets/javascripts/planning.js         | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/app/controllers/planning_controller.rb b/app/controllers/planning_controller.rb
index c49582a..6b7c384 100644
--- a/app/controllers/planning_controller.rb
+++ b/app/controllers/planning_controller.rb
@@ -85,6 +85,7 @@ def add_issue(issue)
         :project_name => prj[:name],
         :tracker => tracker,
         :name => issue[:subject],
+	:estimated_time => issue[:estimated_hours],
         :description => issue[:description],
         :leaf => issue.leaf?,
         :parent => issue.parent_issue_id,
diff --git a/assets/javascripts/planning.js b/assets/javascripts/planning.js
index c377e39..f3b62d4 100644
--- a/assets/javascripts/planning.js
+++ b/assets/javascripts/planning.js
@@ -250,6 +250,7 @@ PlanningIssue.prototype._showTooltip = function ()
         '<tr><th>' + this.t('parent_task') + ': </th><td>' + parent_issue + '</td></tr>' +
         '<tr><th>' + this.t('start_date') + ': </th><td>' + this.chart.formatDate(this.start_date) + '</td></tr>' + 
         '<tr><th>' + this.t('due_date') + ': </th><td>' + this.chart.formatDate(this.due_date) + '</td></tr>' + 
+	'<tr><th>' + this.t('est_time') + ': </th><td>' + this.estimated_time + '</th></tr>' +
         '<tr><th>' + this.t('leaf_task') + ': </th><td>' + (this.leaf ? this.t('yes') : this.t('no')) + '</td></tr>' +
         '<tr><th>' + this.t('is_closed') + ': </th><td>' + (this.closed ? this.t('yes') : this.t('no')) + '</td></tr>' +
         '<tr><th>' + this.t('field_done_ratio') + ': </th><td>' + (this.progress) + '%</td></tr>' +
@@ -421,6 +422,7 @@ function PlanningChart(options)
         parent_task: 'Parent task',
         start_date: 'Start date',
         due_date: 'Due date',
+        est_time: 'Estimated time',
         description: 'Description',
         leaf_task: 'Leaf task',
         milestone: 'Milestone',
@@ -1826,6 +1828,7 @@ function PlanningIssue(data)
         this.due_date = null;
 
     this.name = data.name;
+    this.estimated_time = data.estimated_time;
     this.description = data.description;
     this.project = data.project_name;
     this.project_identifier = data.project_identifier;