From 17210bf031aace6c34623171c99ae797d4bf189a Mon Sep 17 00:00:00 2001 From: Alain THOMAS Date: Thu, 2 May 2024 19:04:10 +0200 Subject: [PATCH 1/2] Gantt viewWidth 450 -> 1200 --- lib/taskjuggler/reports/TableReport.rb | 2 +- taskjuggler.gemspec | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/taskjuggler/reports/TableReport.rb b/lib/taskjuggler/reports/TableReport.rb index 196bec3b..36b55046 100644 --- a/lib/taskjuggler/reports/TableReport.rb +++ b/lib/taskjuggler/reports/TableReport.rb @@ -349,7 +349,7 @@ def generateHeaderCell(columnDef) # The maximum width of the chart. In case it needs more space, a # scrollbar is shown or the chart gets truncated depending on the output # format. - gantt.viewWidth = columnDef.width ? columnDef.width : 450 + gantt.viewWidth = columnDef.width ? columnDef.width : 1200 column = ReportTableColumn.new(@table, columnDef, '') column.cell1.special = gantt column.cell2.hidden = true diff --git a/taskjuggler.gemspec b/taskjuggler.gemspec index 7571fd3e..714c8708 100644 --- a/taskjuggler.gemspec +++ b/taskjuggler.gemspec @@ -52,14 +52,14 @@ EOT (`git ls-files -- tasks`).split("\n") + %w( .gemtest taskjuggler.gemspec Rakefile ) + # Generated files, not contained in Git repository. - %w( data/tjp.vim ) + Dir.glob('manual/html/**/*') + Dir.glob('man/*.1') + Dir.glob('manual/html/**/*') + Dir.glob('man/*.1') s.bindir = 'bin' s.executables = (`git ls-files -- bin`).split("\n"). map { |fn| File.basename(fn) } s.test_files = (`git ls-files -- test`).split("\n") + (`git ls-files -- spec`).split("\n") - s.extra_rdoc_files = %w( README.rdoc COPYING CHANGELOG ) + s.extra_rdoc_files = %w(README.rdoc COPYING) s.add_dependency('mail', '~> 2.7', '>= 2.7.1') s.add_runtime_dependency('term-ansicolor', '~> 1.7', '>= 1.7.1') From 8b10a468d5c3a3f89869d48f1a6f1315c8ef0434 Mon Sep 17 00:00:00 2001 From: Alain THOMAS Date: Thu, 2 May 2024 20:09:23 +0200 Subject: [PATCH 2/2] TableReport @@scale follow viewWidth upgrade --- lib/taskjuggler/reports/GanttChart.rb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/taskjuggler/reports/GanttChart.rb b/lib/taskjuggler/reports/GanttChart.rb index 839fa5b5..8b97272f 100644 --- a/lib/taskjuggler/reports/GanttChart.rb +++ b/lib/taskjuggler/reports/GanttChart.rb @@ -63,15 +63,15 @@ def initialize(now, weekStartsMonday, columnDef, table = nil, markdate = nil) @@scales = [ { 'name' => 'hour', 'stepSize' => 20, 'stepsToFunc' => :hoursTo, 'minTimeOff' => 5 * 60 }, - { 'name' => 'day', 'stepSize' => 20, 'stepsToFunc' => :daysTo, + { 'name' => 'day', 'stepSize' => 40, 'stepsToFunc' => :daysTo, 'minTimeOff' => 6 * 60 * 60 }, - { 'name' => 'week', 'stepSize' => 20, 'stepsToFunc' => :weeksTo, + { 'name' => 'week', 'stepSize' => 40, 'stepsToFunc' => :weeksTo, 'minTimeOff' => 24 * 60 * 60 }, - { 'name' => 'month', 'stepSize' => 35, 'stepsToFunc' => :monthsTo, + { 'name' => 'month', 'stepSize' => 80, 'stepsToFunc' => :monthsTo, 'minTimeOff' => 5 * 24 * 60 * 60 }, - { 'name' => 'quarter', 'stepSize' => 28, 'stepsToFunc' => :quartersTo, + { 'name' => 'quarter', 'stepSize' => 36, 'stepsToFunc' => :quartersTo, 'minTimeOff' => -1 }, - { 'name' => 'year', 'stepSize' => 20, 'stepsToFunc' => :yearsTo, + { 'name' => 'year', 'stepSize' => 40, 'stepsToFunc' => :yearsTo, 'minTimeOff' => -1 } ] # This points to one of the scales above and marks the current scale.