Skip to content

Commit

Permalink
EgbertW#37 Added estimated_hours to show as Estimated Time in Tool Ti…
Browse files Browse the repository at this point in the history
…p-window.
  • Loading branch information
xJom committed Oct 22, 2015
1 parent c7ffc31 commit 2cd7b5d
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 0 deletions.
1 change: 1 addition & 0 deletions app/controllers/planning_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
3 changes: 3 additions & 0 deletions assets/javascripts/planning.js
Original file line number Diff line number Diff line change
Expand Up @@ -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>' +
Expand Down Expand Up @@ -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',
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit 2cd7b5d

Please sign in to comment.