taskjuggler 3.6.0 → 3.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 4626796ad19e4552b12b7a08991a6e1382a035bf
-  data.tar.gz: 331d901aba229c875bba6b22af9f7f390d390fe9
+SHA256:
+  metadata.gz: e5a0de8b9d1e062a746ba217051e7351d2481644f649f585528c7caabd6b69a9
+  data.tar.gz: 6223c62cafa2db90ae8d4cc8759f5b5cff458b884833a4b6355284df450459c5
 SHA512:
-  metadata.gz: 51807219195d0c5fc94a5499d86223f2bb85ace75974b0aec3a7abda5d90d55a0c7234acfdf9e27ea00589e9343754bd54fa7d32d2cf566c9e061a9f7b10f692
-  data.tar.gz: ce602aa3883b46e5903c2456a473f0881df1c3ee2c65eddebe0c531836973a1983ae11f9d25b4ebe4fce1e818979e3ea66d16dc3966bfd227e4c04cfc30081c0
+  metadata.gz: 70a76a0185eba07950375e0b44bcb32f74bada5b652d96f131fe4bf62cba6dabbd3d90b6f3216159e3d826836a74e228e1ef278b43f4bfbc6743c10aee41a48c
+  data.tar.gz: 76324478980524c4c7a6be0039388d6116db7891037d179e094723c7ca74d7b19325c9668a0dc626e78e7b2346614a32b24a48aa53d1430c70773aa18a35c462

data/CHANGELOG

@@ -1,3 +1,54 @@
+= Release 3.7.1 (2020-03-14)
+
+  * Bumping version to 3.7.1
+  * Storing the version in version.rb
+  * add novevents keyword to icalreport context
+  * Revert "Revert "Revert "    
+    This reverts commit d3c9d87a4fd58c9af15a44eb6c2b6c131f939912.
+  * Revert "Revert "    
+    This reverts commit 3ca91860374adefb5821ab70d1a3030883459231.
+  * Revert "    
+    This reverts commit 163fabe4f21b92a9828f65ccd186526af6c3b401.
+  * Revert "Revert "    
+    This reverts commit 3ca91860374adefb5821ab70d1a3030883459231.
+  * Revert "    
+    This reverts commit 163fabe4f21b92a9828f65ccd186526af6c3b401.
+  * Corrected some words.
+  * fix: In Windows and Cygwin generate file path for the booking file is
+    wrong
+    Reported-by: Yury Rumega
+    
+    When running the freeze command in Windows and Cygwin file path for the booking file is
+    generated wrongly.
+
+= Release 3.7.0 (2020-03-14)
+
+== New Features
+
+  * Adding a column that lists all annual leave days.
+  * Include man pages in gem
+  * man pages: Code modifications
+  * h2m files to enhance the generated man page
+  * rake task to build man pages using help2man
+  * Add reference line via 'markdate' parameter
+
+== Bug Fixes
+
+  * Don't use 'milestone' keyword in export reports.
+  * Fix a few warnings in the Gemfile
+  * Eliminate warnings seen with Ruby 2.5
+  * Fix endless loop when using sorting criteria in some reports.
+  * Don't crash in account definition.
+  * Correcting Typos undo: plural for pixel in German (pixel) different from English (pixels)
+  * Correcting Typos in manual pages and source file comments
+  * Correct spelling mistake in lib/taskjuggler/apps/Tj3Man.rb
+  * Clean the source tree using rake
+  * Fix crash when taskjuggler.rc is not valid YAML.
+  * syntax of xml comments to not have -- in the body
+  * Spec tests failed on some Ubuntu/Debian versions.
+  * Prioritize resource leave time over free time in resource reports
+
+
 = Release 3.6.0 (2016-03-12)
 
 == New Features

data/data/css/tjreport.css

@@ -433,6 +433,10 @@ p.tj_journal {
   background-color:#EE0000;
   position:absolute;
 }
+.markdateline {
+  background-color:#000000;
+  position:absolute;
+}
 .white {
   background-color:#FFFFFF;
   position:absolute;

data/data/tjp.vim

@@ -1,7 +1,7 @@
 " Vim syntax file
 " Language:     TaskJuggler
 " Maintainer:   TaskJuggler Developers <taskjuggler-devel@googlegroups.com>
-" Last Change:  2016-03-12 21:14:02 +0100
+" Last Change:  2020-03-14 17:32:05 +0100
 " This file was automatically generated by VimSyntax.rb
 
 if exists("b:current_syntax")
@@ -21,10 +21,6 @@ syn keyword tjp_macro macro contained
 syn keyword tjp_project project contained
 syn keyword tjp_supplement supplement contained
 
-syn keyword tjp_account account contained
-hi def link tjp_account Function
-syn keyword tjp_accountreport accountreport contained
-hi def link tjp_accountreport Function
 syn keyword tjp_export export contained
 hi def link tjp_export Function
 syn keyword tjp_nikureport nikureport contained
@@ -51,13 +47,11 @@ syn keyword tjp_timesheetreport timesheetreport contained
 hi def link tjp_timesheetreport Function
 syn keyword tjp_tracereport tracereport contained
 hi def link tjp_tracereport Function
+syn keyword tjp_account account contained
+hi def link tjp_account Function
+syn keyword tjp_accountreport accountreport contained
+hi def link tjp_accountreport Function
 
-syn keyword tjp_aggregate aggregate contained
-hi def link tjp_aggregate Type
-syn keyword tjp_credits credits contained
-hi def link tjp_credits Type
-syn keyword tjp_flags_account flags contained
-hi def link tjp_flags_account Type
 syn keyword tjp_allocate allocate contained
 hi def link tjp_allocate Type
 syn keyword tjp_alternative alternative contained
@@ -86,6 +80,8 @@ syn keyword tjp_columnid_annualleave annualleave
 hi def link tjp_columnid_annualleave Type
 syn keyword tjp_columnid_annualleavebalance annualleavebalance
 hi def link tjp_columnid_annualleavebalance Type
+syn keyword tjp_columnid_annualleavelist annualleavelist
+hi def link tjp_columnid_annualleavelist Type
 syn keyword tjp_columnid_alert alert
 hi def link tjp_columnid_alert Type
 syn keyword tjp_columnid_alertmessages alertmessages
@@ -346,6 +342,8 @@ syn keyword tjp_hidetask hidetask contained
 hi def link tjp_hidetask Type
 syn keyword tjp_icalreport icalreport contained
 hi def link tjp_icalreport Type
+syn keyword tjp_novevents novevents contained
+hi def link tjp_novevents Type
 syn keyword tjp_scenario_ical scenario contained
 hi def link tjp_scenario_ical Type
 syn keyword tjp_accountprefix accountprefix contained
@@ -414,6 +412,8 @@ syn keyword tjp_extend extend contained
 hi def link tjp_extend Type
 syn keyword tjp_now now contained
 hi def link tjp_now Type
+syn keyword tjp_markdate markdate contained
+hi def link tjp_markdate Type
 syn keyword tjp_outputdir outputdir contained
 hi def link tjp_outputdir Type
 syn keyword tjp_shorttimeformat shorttimeformat contained
@@ -646,6 +646,12 @@ syn keyword tjp_workinghours_resource workinghours contained
 hi def link tjp_workinghours_resource Type
 syn keyword tjp_workinghours_shift workinghours contained
 hi def link tjp_workinghours_shift Type
+syn keyword tjp_aggregate aggregate contained
+hi def link tjp_aggregate Type
+syn keyword tjp_credits credits contained
+hi def link tjp_credits Type
+syn keyword tjp_flags_account flags contained
+hi def link tjp_flags_account Type
 
 syn match tjparg contained /\${.*}/
 syn match tjpcomment /#.*$/
@@ -656,8 +662,6 @@ syn match tjpdate /\s\d\{4}-\d\{1,2}-\d\{1,2}\(-\d\{1,2}:\d\{1,2}\(:\d\{1,2}\)\?
 syn match tjptime /\s\d\{1,2}:\d\d\(:\d\d\)\?/
 
 syn cluster tjpcommon contains=tjpcomment,tjpdate,tjptime,tjpstring,tjpnumber
-syn region tjpblk_account start=/^\s*account\s.*{\s*$/ end=/^\s*}\s*$/ transparent fold contains=@tjpcommon,tjp_account,tjp_account,tjpblk_account,tjp_aggregate,tjp_credits,tjp_flags_account
-syn region tjpblk_accountreport start=/^\s*accountreport\s.*{\s*$/ end=/^\s*}\s*$/ transparent fold contains=@tjpcommon,tjp_accountreport,tjp_accountroot,tjp_auxdir_report,tjp_balance,tjp_caption,tjp_center,tjp_columns,tjpblk_columns,tjp_currencyformat,tjp_end_report,tjp_epilog,tjp_flags_report,tjp_footer,tjp_formats,tjp_header,tjp_headline,tjp_hidejournalentry,tjp_hideaccount,tjp_hideresource,tjp_hidetask,tjp_height,tjp_journalattributes,tjp_journalmode,tjp_left,tjp_loadunit,tjp_numberformat,tjp_opennodes,tjp_period_report,tjp_prolog,tjp_purge,tjp_rawhtmlhead,tjp_accountreport,tjpblk_accountreport,tjp_export,tjpblk_export,tjp_resourcereport,tjpblk_resourcereport,tjp_taskreport,tjpblk_taskreport,tjp_textreport,tjpblk_textreport,tjp_tracereport,tjpblk_tracereport,tjp_right,tjp_rollupaccount,tjp_rollupresource,tjp_rolluptask,tjp_scenarios,tjp_selfcontained,tjp_sortaccounts,tjp_sortjournalentries,tjp_sortresources,tjp_sorttasks,tjp_start_report,tjp_resourceroot,tjp_taskroot,tjp_timeformat,tjp_timezone_report,tjp_title,tjp_width
 syn region tjpblk_allocate start=/^\s*allocate\s.*{\s*$/ end=/^\s*}\s*$/ transparent contains=@tjpcommon,tjp_allocate,tjp_alternative,tjp_select,tjp_persistent,tjp_mandatory,tjp_shifts_allocate contained
 syn region tjpblk_export start=/^\s*export\s.*{\s*$/ end=/^\s*}\s*$/ transparent fold contains=@tjpcommon,tjp_export,tjp_definitions,tjp_formats_export,tjp_hideresource,tjp_hidetask,tjp_loadunit,tjp_purge,tjp_end_report,tjp_period_report,tjp_accountreport,tjpblk_accountreport,tjp_export,tjpblk_export,tjp_resourcereport,tjpblk_resourcereport,tjp_taskreport,tjpblk_taskreport,tjp_textreport,tjpblk_textreport,tjp_tracereport,tjpblk_tracereport,tjp_start_report,tjp_resourceattributes,tjp_rollupresource,tjp_rolluptask,tjp_scenarios_export,tjp_taskattributes,tjp_taskroot_export,tjp_timezone_export
 syn region tjpblk_date_extend start=/^\s*date\s.*{\s*$/ end=/^\s*}\s*$/ transparent contains=@tjpcommon,tjp_date_extend,tjp_inherit_extend,tjp_scenariospecific_extend contained
@@ -665,7 +669,7 @@ syn region tjpblk_number_extend start=/^\s*number\s.*{\s*$/ end=/^\s*}\s*$/ tran
 syn region tjpblk_reference_extend start=/^\s*reference\s.*{\s*$/ end=/^\s*}\s*$/ transparent contains=@tjpcommon,tjp_reference_extend,tjp_inherit_extend,tjp_scenariospecific_extend contained
 syn region tjpblk_richtext_extend start=/^\s*richtext\s.*{\s*$/ end=/^\s*}\s*$/ transparent contains=@tjpcommon,tjp_richtext_extend,tjp_inherit_extend,tjp_scenariospecific_extend contained
 syn region tjpblk_text_extend start=/^\s*text\s.*{\s*$/ end=/^\s*}\s*$/ transparent contains=@tjpcommon,tjp_text_extend,tjp_inherit_extend,tjp_scenariospecific_extend contained
-syn region tjpblk_icalreport start=/^\s*icalreport\s.*{\s*$/ end=/^\s*}\s*$/ transparent contains=@tjpcommon,tjp_icalreport,tjp_hideresource,tjp_hidejournalentry,tjp_hidetask,tjp_end_report,tjp_period_report,tjp_start_report,tjp_rollupresource,tjp_rolluptask,tjp_scenario_ical
+syn region tjpblk_icalreport start=/^\s*icalreport\s.*{\s*$/ end=/^\s*}\s*$/ transparent contains=@tjpcommon,tjp_icalreport,tjp_hideresource,tjp_hidejournalentry,tjp_hidetask,tjp_end_report,tjp_period_report,tjp_start_report,tjp_rollupresource,tjp_rolluptask,tjp_novevents,tjp_scenario_ical
 syn region tjpblk_journalentry start=/^\s*journalentry\s.*{\s*$/ end=/^\s*}\s*$/ transparent contains=@tjpcommon,tjp_journalentry,tjp_alert,tjp_author,tjp_flags_journalentry,tjp_summary,tjp_details contained
 syn region tjpblk_dailymax start=/^\s*dailymax\s.*{\s*$/ end=/^\s*}\s*$/ transparent contains=@tjpcommon,tjp_dailymax,tjp_end_limit,tjp_period_limit,tjp_resources_limit,tjp_start_limit contained
 syn region tjpblk_dailymin start=/^\s*dailymin\s.*{\s*$/ end=/^\s*}\s*$/ transparent contains=@tjpcommon,tjp_dailymin,tjp_end_limit,tjp_period_limit,tjp_resources_limit,tjp_start_limit contained
@@ -678,7 +682,7 @@ syn region tjpblk_weeklymin start=/^\s*weeklymin\s.*{\s*$/ end=/^\s*}\s*$/ trans
 syn region tjpblk_navigator start=/^\s*navigator\s.*{\s*$/ end=/^\s*}\s*$/ transparent contains=@tjpcommon,tjp_navigator,tjp_hidereport
 syn region tjpblk_nikureport start=/^\s*nikureport\s.*{\s*$/ end=/^\s*}\s*$/ transparent fold contains=@tjpcommon,tjp_nikureport,tjp_formats,tjp_headline,tjp_hideresource,tjp_hidetask,tjp_numberformat,tjp_end_report,tjp_period_report,tjp_start_report,tjp_title,tjp_timeoff_nikureport
 syn region tjpblk_extend start=/^\s*extend\s.*{\s*$/ end=/^\s*}\s*$/ transparent contains=@tjpcommon,tjp_extend,tjp_date_extend,tjpblk_date_extend,tjp_number_extend,tjpblk_number_extend,tjp_reference_extend,tjpblk_reference_extend,tjp_richtext_extend,tjpblk_richtext_extend,tjp_text_extend,tjpblk_text_extend contained
-syn region tjpblk_project start=/^\s*project\s.*{\s*$/ end=/^\s*}\s*$/ transparent fold contains=@tjpcommon,tjp_project,tjp_alertlevels,tjp_currencyformat,tjp_currency,tjp_dailyworkinghours,tjp_extend,tjpblk_extend,tjp_include_project,tjp_journalentry,tjpblk_journalentry,tjp_now,tjp_numberformat,tjp_outputdir,tjp_scenario,tjpblk_scenario,tjp_shorttimeformat,tjp_timeformat,tjp_timezone,tjp_timingresolution,tjp_trackingscenario,tjp_weekstartsmonday,tjp_weekstartssunday,tjp_workinghours_project,tjp_yearlyworkingdays
+syn region tjpblk_project start=/^\s*project\s.*{\s*$/ end=/^\s*}\s*$/ transparent fold contains=@tjpcommon,tjp_project,tjp_alertlevels,tjp_currencyformat,tjp_currency,tjp_dailyworkinghours,tjp_extend,tjpblk_extend,tjp_include_project,tjp_journalentry,tjpblk_journalentry,tjp_now,tjp_markdate,tjp_numberformat,tjp_outputdir,tjp_scenario,tjpblk_scenario,tjp_shorttimeformat,tjp_timeformat,tjp_timezone,tjp_timingresolution,tjp_trackingscenario,tjp_weekstartsmonday,tjp_weekstartssunday,tjp_workinghours_project,tjp_yearlyworkingdays
 syn region tjpblk_limits start=/^\s*limits\s.*{\s*$/ end=/^\s*}\s*$/ transparent contains=@tjpcommon,tjp_limits,tjp_dailymax,tjpblk_dailymax,tjp_dailymin,tjpblk_dailymin,tjp_maximum,tjpblk_maximum,tjp_minimum,tjpblk_minimum,tjp_monthlymax,tjpblk_monthlymax,tjp_monthlymin,tjpblk_monthlymin,tjp_weeklymax,tjpblk_weeklymax,tjp_weeklymin,tjpblk_weeklymin
 syn region tjpblk_include_properties start=/^\s*include\s.*{\s*$/ end=/^\s*}\s*$/ transparent contains=@tjpcommon,tjp_include_properties,tjp_accountprefix,tjp_reportprefix,tjp_resourceprefix,tjp_taskprefix
 syn region tjpblk_columns start=/^\s*columns\s.*{\s*$/ end=/^\s*}\s*$/ transparent contains=@tjpcommon,tjp_columns,tjp_celltext_column,tjp_cellcolor_column,tjp_end_column,tjp_fontcolor_column,tjp_halign_column,tjp_listitem_column,tjp_listtype_column,tjp_period_column,tjp_scale_column,tjp_start_column,tjp_timeformat1,tjp_timeformat2,tjp_title_column,tjp_tooltip_column,tjp_width_column contained
@@ -708,6 +712,8 @@ syn region tjpblk_task_timesheet start=/^\s*task\s.*{\s*$/ end=/^\s*}\s*$/ trans
 syn region tjpblk_timesheetreport start=/^\s*timesheetreport\s.*{\s*$/ end=/^\s*}\s*$/ transparent fold contains=@tjpcommon,tjp_timesheetreport,tjp_hideresource,tjp_hidetask,tjp_end_report,tjp_period_report,tjp_start_report,tjp_sortresources,tjp_sorttasks
 syn region tjpblk_tracereport start=/^\s*tracereport\s.*{\s*$/ end=/^\s*}\s*$/ transparent fold contains=@tjpcommon,tjp_tracereport,tjp_accountroot,tjp_auxdir_report,tjp_balance,tjp_caption,tjp_center,tjp_columns,tjpblk_columns,tjp_currencyformat,tjp_end_report,tjp_epilog,tjp_flags_report,tjp_footer,tjp_formats,tjp_header,tjp_headline,tjp_hidejournalentry,tjp_hideaccount,tjp_hideresource,tjp_hidetask,tjp_height,tjp_journalattributes,tjp_journalmode,tjp_left,tjp_loadunit,tjp_numberformat,tjp_opennodes,tjp_period_report,tjp_prolog,tjp_purge,tjp_rawhtmlhead,tjp_accountreport,tjpblk_accountreport,tjp_export,tjpblk_export,tjp_resourcereport,tjpblk_resourcereport,tjp_taskreport,tjpblk_taskreport,tjp_textreport,tjpblk_textreport,tjp_tracereport,tjpblk_tracereport,tjp_right,tjp_rollupaccount,tjp_rollupresource,tjp_rolluptask,tjp_scenarios,tjp_selfcontained,tjp_sortaccounts,tjp_sortjournalentries,tjp_sortresources,tjp_sorttasks,tjp_start_report,tjp_resourceroot,tjp_taskroot,tjp_timeformat,tjp_timezone_report,tjp_title,tjp_width
 syn region tjpblk_status_timesheet start=/^\s*status\s.*{\s*$/ end=/^\s*}\s*$/ transparent contains=@tjpcommon,tjp_status_timesheet,tjp_details,tjp_flags_timesheet,tjp_summary contained
+syn region tjpblk_account start=/^\s*account\s.*{\s*$/ end=/^\s*}\s*$/ transparent fold contains=@tjpcommon,tjp_account,tjp_account,tjpblk_account,tjp_aggregate,tjp_credits,tjp_flags_account
+syn region tjpblk_accountreport start=/^\s*accountreport\s.*{\s*$/ end=/^\s*}\s*$/ transparent fold contains=@tjpcommon,tjp_accountreport,tjp_accountroot,tjp_auxdir_report,tjp_balance,tjp_caption,tjp_center,tjp_columns,tjpblk_columns,tjp_currencyformat,tjp_end_report,tjp_epilog,tjp_flags_report,tjp_footer,tjp_formats,tjp_header,tjp_headline,tjp_hidejournalentry,tjp_hideaccount,tjp_hideresource,tjp_hidetask,tjp_height,tjp_journalattributes,tjp_journalmode,tjp_left,tjp_loadunit,tjp_numberformat,tjp_opennodes,tjp_period_report,tjp_prolog,tjp_purge,tjp_rawhtmlhead,tjp_accountreport,tjpblk_accountreport,tjp_export,tjpblk_export,tjp_resourcereport,tjpblk_resourcereport,tjp_taskreport,tjpblk_taskreport,tjp_textreport,tjpblk_textreport,tjp_tracereport,tjpblk_tracereport,tjp_right,tjp_rollupaccount,tjp_rollupresource,tjp_rolluptask,tjp_scenarios,tjp_selfcontained,tjp_sortaccounts,tjp_sortjournalentries,tjp_sortresources,tjp_sorttasks,tjp_start_report,tjp_resourceroot,tjp_taskroot,tjp_timeformat,tjp_timezone_report,tjp_title,tjp_width
 syn region tjpblk_macro start=/macro\s\+\h\w*\s*\[/ end=/\]$/ transparent fold contains=ALL
 syn region tjpstring start=/"/ skip=/\\"/ end=/"/
 syn region tjpstring start=/'/ skip=/\\'/ end=/'/

data/examples/ProjectTemplate/template.tjp

@@ -1,7 +1,7 @@
 /*
  * This file contains a project skeleton. It is part of the
  * TaskJuggler project management tool. You can use this as a basis to
- * start you own project file.
+ * start your own project file.
  */
 project your_project_id "Your Project Title"  2011-11-11-0:00--0500 +4m {
   # Set the default time zone for the project. If not specified, UTC
@@ -28,7 +28,7 @@ project your_project_id "Your Project Title"  2011-11-11-0:00--0500 +4m {
 
   # You can define your own attributes for tasks and resources. This
   # is handy to capture additional information about the project that
-  # is not directly impacting the project schedule but you like to
+  # is not directly impacting the project schedule, but which you like to
   # keep in one place.
   #extend task {
   #  reference spec "Link to Wiki page"
@@ -59,7 +59,7 @@ copyright "Claim your rights here"
 # used to filter out subsets of them during reporting.
 flags important, hidden
 
-# If you want to do budget planning for you project, you need to
+# If you want to do budget planning for your project, you need to
 # define some accounts.
 account cost "Project Cost" {
   account dev "Development"
@@ -67,10 +67,10 @@ account cost "Project Cost" {
 }
 account rev "Customer Payments"
 
-# The Profit&Loss analysis should be rev - cost accounts.
+# The Profit & Loss analysis should be rev - cost accounts.
 balance cost rev
 
-# Define you public holidays here.
+# Define your public holidays here.
 vacation "New Year's Day" 2012-01-02
 vacation "Birthday of Martin Luther King, Jr." 2012-01-16
 vacation "Washington's Birthday" 2012-02-20
@@ -83,7 +83,7 @@ vacation "Thanksgiving Day" 2012-11-22
 vacation "Christmas Day" 2012-12-25
 
 # The daily default rate of all resources. This can be overridden for each
-# resource. We specify this, so that we can do a good calculation of
+# resource. We specify this so we can do a good calculation of
 # the costs of the project.
 rate 400.0
 
@@ -123,7 +123,7 @@ task project "Project" {
 
 # Now the project has been specified completely. Stopping here would
 # result in a valid TaskJuggler file that could be processed and
-# scheduled. But no reports would be generated to visualize the
+# scheduled. Here reports will be generated to visualize the
 # results.
 
 navigator navbar {

data/examples/Tutorial/tutorial.tjp

@@ -20,7 +20,7 @@ project acso "Accounting Software"  2002-01-16 +4m {
   # used, but this will likely be outside of the project range, so it
   # can't be seen in the reports.
   now 2002-03-05-13:00
-  # The currency for all money values is the Euro.
+  # The currency for all money values is the US Dollar.
   currency "USD"
 
   # We want to compare the baseline scenario to one with a slightly

data/lib/taskjuggler/Allocation.rb

@@ -50,7 +50,7 @@ class TaskJuggler
     end
 
     # Set the selection mode identified by name specified in _str_. For
-    # efficiency reasons, we turn the name into a Fixnum value.
+    # efficiency reasons, we turn the name into an Integer value.
     def setSelectionMode(str)
       modes = %w( order minallocated minloaded maxloaded random )
       @selectionMode = modes.index(str)

data/lib/taskjuggler/AttributeBase.rb

@@ -3,7 +3,7 @@
 #
 # = AttributeBase.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2019
 #               by Chris Schlaeger <cs@taskjuggler.org>
 #
 # This program is free software; you can redistribute it and/or modify
@@ -136,7 +136,7 @@ class TaskJuggler
 
     def to_num
       v = get
-      if v.is_a?(Fixnum) || v.is_a?(Bignum) || v.is_a?(Float)
+      if v.is_a?(Integer) || v.is_a?(Float)
         v
       else
         nil
@@ -145,10 +145,16 @@ class TaskJuggler
 
     def to_sort
       v = get
-      if v.is_a?(Fixnum) || v.is_a?(Bignum) || v.is_a?(Float)
+      if v.is_a?(Integer) || v.is_a?(Float)
         v
       elsif v.respond_to?('to_s')
-        v.to_s
+        if v.respond_to?('join')
+          # If the attribute is an Array we convert it to a comma separated
+          # list.
+          v.join(', ')
+        else
+          v.to_s
+        end
       else
         nil
       end

data/lib/taskjuggler/Attributes.rb

@@ -264,12 +264,12 @@ class TaskJuggler
 
   end
 
-  class FixnumAttribute < AttributeBase
+  class IntegerAttribute < AttributeBase
     def initialize(property, type, container)
       super
     end
 
-    def FixnumAttribute::tjpId
+    def IntegerAttribute::tjpId
       'integer'
     end
   end

data/lib/taskjuggler/BatchProcessor.rb

@@ -16,7 +16,7 @@ require 'monitor'
 
 class TaskJuggler
 
-  # The JobInfo class is just a storage container for some batch job realted
+  # The JobInfo class is just a storage container for some batch job related
   # pieces of information. It contains things like a job id, the process id,
   # the stdout data and the like.
   class JobInfo

data/lib/taskjuggler/Interval.rb

@@ -166,7 +166,7 @@ class TaskJuggler
     #
     # sbStart must be a TjTime of the scoreboard start
     # slotDuration must be the duration of the scoreboard slots in seconds
-    # a and b should be TjTime or Fixnum objects that describe the start and
+    # a and b should be TjTime or Integer objects that describe the start and
     # end time or index of the interval.
     #
     # TimeInterval.new(iv)
@@ -191,7 +191,7 @@ class TaskJuggler
         # If the third argument is a date we convert it to a scoreboard index.
         args[2] = dateToIndex(args[2]) if args[2].is_a?(TjTime)
 
-        if args[2].is_a?(Fixnum) || args[2].is_a?(Bignum)
+        if args[2].is_a?(Integer)
           super(args[2], args[2])
         else
           raise ArgumentError, "Illegal argument 3: #{args[0].class}"
@@ -204,11 +204,11 @@ class TaskJuggler
         args[2] = dateToIndex(args[2]) if args[2].is_a?(TjTime)
         args[3] = dateToIndex(args[3]) if args[3].is_a?(TjTime)
 
-        if !(args[2].is_a?(Fixnum) || args[2].is_a?(Bignum))
+        if !(args[2].is_a?(Integer))
           raise ArgumentError, "Interval start must be an index or TjTime, " +
                 "not a #{args[2].class}"
         end
-        if !(args[3].is_a?(Fixnum) || args[3].is_a?(Bignum))
+        if !(args[3].is_a?(Integer))
           raise ArgumentError, "Interval end must be an index or TjTime, " +
                 "not a #{args[3].class}"
         end
@@ -221,19 +221,18 @@ class TaskJuggler
         raise ArgumentError, "sbStart must be a TjTime object, not a" +
               "#{@sbStart.class}"
       end
-      unless @slotDuration.is_a?(Fixnum)
-        raise ArgumentError, "slotDuration must be a Fixnum, not a " +
+      unless @slotDuration.is_a?(Integer)
+        raise ArgumentError, "slotDuration must be an Integer, not a " +
               "#{@slotDuration.class}"
       end
 
     end
 
-    # Assign the start of the interval. +arg+ can be a Fixnum, Bignum or
+    # Assign the start of the interval. +arg+ can be an Integer or
     # TjTime object.
     def start=(arg)
       case arg
-      when Fixnum
-      when Bignum
+      when Integer
         @start = arg
       when TjTime
         @start = dateToIndex(arg)
@@ -242,12 +241,11 @@ class TaskJuggler
       end
     end
 
-    # Assign the start of the interval. +arg+ can be a Fixnum, Bignum or
+    # Assign the start of the interval. +arg+ can be an Integer or
     # TjTime object.
     def end=(arg)
       case arg
-      when Fixnum
-      when Bignum
+      when Integer
         @end = arg
       when TjTime
         @end = dateToIndex(arg)

data/lib/taskjuggler/Journal.rb

@@ -613,7 +613,7 @@ class TaskJuggler
     # This function returns a list of entries that have all the exact same
     # date and are the last entries before the deadline _date_. Only messages
     # with at least the required alert level _minLevel_ are returned. Messages
-    # with alert level _minLevel_ must be newer than _minDate_.
+    # with alert level _minLevel_ or higher must be newer than _minDate_.
     def currentEntries(date, property, minLevel, minDate, logExp)
       pEntries = getEntries(property) ?  getEntries(property).last(date) :
                  JournalEntryList.new
@@ -621,7 +621,7 @@ class TaskJuggler
       # date.
       pEntries.delete_if do |e|
         e.headline.empty? || e.alertLevel < minLevel ||
-        (e.alertLevel == minLevel && minDate && e.date < minDate)
+        (e.alertLevel >= minLevel && minDate && e.date < minDate)
       end
 
       unless pEntries.empty?

data/lib/taskjuggler/LogicalFunction.rb

@@ -139,7 +139,7 @@ class TaskJuggler
       # 2nd arg must be a scenario index.
       return false if (scenarioIdx = project.scenarioIdx(args[1])).nil?
       # 3rd arg must be an integer number.
-      return false unless args[2].is_a?(Fixnum)
+      return false unless args[2].is_a?(Integer)
 
       property.isDependencyOf(scenarioIdx, task, args[2])
     end

data/lib/taskjuggler/LogicalOperation.rb

@@ -3,7 +3,7 @@
 #
 # = LogicalOperation.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2019
 #               by Chris Schlaeger <cs@taskjuggler.org>
 #
 # This program is free software; you can redistribute it and/or modify
@@ -64,7 +64,7 @@ class TaskJuggler
             coerceTime(o, expr)
           end
           return res
-        elsif opnd1.is_a?(Fixnum) || opnd1.is_a?(Float) || opnd1.is_a?(Bignum)
+        elsif opnd1.is_a?(Integer) || opnd1.is_a?(Float)
           return evalBinaryOperation(opnd1, operator, opnd2) do |o|
             coerceNumber(o, expr)
           end
@@ -145,14 +145,14 @@ class TaskJuggler
       # An empty String means false, else true.
       return !val.empty? if val.is_a?(String)
       # In TJP logic 'non 0' means false.
-      return val != 0 if val.is_a?(Fixnum) || val.is_a?(Bignum)
+      return val != 0 if val.is_a?(Integer)
 
       expr.error("Operand #{val} can't be evaluated to true or false.")
     end
 
     # Force the _val_ into a number. In case this fails, an exception is raised.
     def coerceNumber(val, expr)
-      unless val.is_a?(Fixnum) || val.is_a?(Float) || val.is_a?(Bignum)
+      unless val.is_a?(Integer) || val.is_a?(Float)
         expr.error("Operand #{val} of type #{val.class} must be a number.")
       end
       val
@@ -216,6 +216,9 @@ class TaskJuggler
         query.scenarioIdx = @scenario.sequenceNo - 1
         query.attributeId = @operand1
         query.process
+        unless query.ok
+          return "Error in conversion to String: #{query.errorMessage}"
+        end
         query.to_s
       else
         "#{@scenario.fullId}.#{@operand1}"