taskjuggler 0.0.2 → 0.0.3

data/test/TestSuite/Syntax/Correct/Journal.tjp

@@ -0,0 +1,18 @@
+project journal "Project with Journal" "1.0" 2009-05-04 +1m {
+  journalentry 2009-05-05 "The project started."
+  journalentry 2009-05-10 "We made some progress." {
+    intro "All jobs have been assigned. The crew is working away."
+    more "Let's hope, we can keep the good spirit."
+  }
+}
+
+resource tux "Tux" {
+  journalentry 2009-05-07 "This guy is a bummer."
+}
+
+task t1 "Task1" {
+  journalentry 2009-05-08 "Probably will be done sooner."
+  journalentry 2009-05-12 "Maybe not."
+  start 2009-05-05
+}
+

data/test/TestSuite/Syntax/Correct/LoadUnits.tjp

@@ -24,7 +24,8 @@ task t3 "Task3" {
   allocate tux3
 }
 
-htmltaskreport "LoadUnits.html" {
+taskreport loadunits "LoadUnits" {
+  formats html
   columns no, name, effort, monthly
   loadunit months
 }

data/test/TestSuite/Syntax/Correct/LogicalExpression.tjp

@@ -0,0 +1,16 @@
+project "LogExp" 2009-10-19 +2m
+
+task "T"
+
+macro rep [
+taskreport  "LogExp${1}" {
+  hidetask 1 ${2} 0
+}
+]
+
+${rep "1" ">"}
+${rep "2" "<"}
+${rep "3" "<="}
+${rep "4" ">="}
+${rep "5" "="}
+

data/test/TestSuite/Syntax/Correct/Period.tjp

@@ -10,7 +10,8 @@ task items "Project breakdown" {
   }
 }
 
-taskreport "My Tasks" {
+taskreport tasks "My Tasks" {
+  formats html
 	period ${now} +1w
 }
 

data/test/TestSuite/Syntax/Correct/RawHTML.tjp

@@ -18,12 +18,14 @@ task t3 "Task3" {
   allocate tux
 }
 
-htmltaskreport "RawTask.html" {
+taskreport rawtasks "RawTask" {
+  formats html
   rawhead '<h1>This is a line of text</h1>'
   rawtail '<h2>This is another line of text with "double qoutes"</h2>'
 }
 
-htmlresourcereport "RawResource.html" {
+resourcereport rawresource "RawResource" {
+  formats html
   rawhead '<h1>This is a line of text</h1>'
   rawtail '<h2>This is another line of text with "double qoutes"</h2>'
 }

data/test/TestSuite/Syntax/Correct/Reports.tjp

@@ -43,12 +43,14 @@ task t3 "FooTask3" {
   start 2000-01-01
 }
 
-htmltaskreport "Report_task.html" {
+taskreport task "Report_task" {
+  formats html
   balance a1 a2
   columns hierarchindex, name { title "Task Name" }, daily, effort
   sorttasks tree, plan.start.up, name.up
 }
 
-htmlresourcereport "Report_resource.html" {
+resourcereport resource "Report_resource.html" {
+  formats html
 }
 

data/test/TestSuite/Syntax/Correct/ResourcePrefix.tji

@@ -0,0 +1,2 @@
+resource bar "Bar"
+

data/test/TestSuite/Syntax/Correct/ResourcePrefix.tjp

@@ -0,0 +1,23 @@
+project resourceprefix "Resource Prefix Example" "1.0" 2009-09-13 +1m
+
+resource team "Team" {
+  resource foo "Foo"
+}
+
+include "ResourcePrefix.tji" {
+  resourceprefix team
+}
+
+supplement resource bar {
+  workinghours mon-fri 8:00-15:00
+  workinghours sat, sun off
+}
+  
+task t "Task" {
+  effort 10d
+  allocate foo, bar
+}
+
+resourcereport rp "ResourcePrefix" {
+  formats html
+}

data/test/TestSuite/Syntax/Correct/Responsible.tjp

@@ -10,7 +10,7 @@ task someJob "Some Job" {
   responsible ubertux
 }
 
-taskreport "Job List" {
+taskreport joblist "Job List" {
   columns effort, responsible
 }
 

data/test/TestSuite/Syntax/Correct/Simple.tjp

@@ -21,5 +21,5 @@ task items "Project breakdown" {
   }
 }
 
-taskreport "My Tasks"
+taskreport tasks "My Tasks"
 

data/test/TestSuite/Syntax/Correct/String.tjp

@@ -8,5 +8,5 @@ task items "Project Plan\\\\Breakdown" {
   allocate tux
 }
 
-taskreport "My Tasks"
+taskreport tasks "My Tasks"
 

data/test/TestSuite/Syntax/Correct/TaskRoot.tjp

@@ -28,7 +28,8 @@ task items "Project breakdown" {
   }
 }
 
-taskreport "My Tasks" {
+taskreport tasks "My Tasks" {
+  formats html
   taskroot items.implementation
 }
 

data/test/TestSuite/Syntax/Correct/tutorial.tjp

@@ -7,7 +7,7 @@
  */
 # *** EXAMPLE: header1 +
 # *** EXAMPLE: header2 +
-project acso "Accounting Software" "1.0" 2002-01-16 - 2002-04-28 {
+project "Accounting Software"  2002-01-16 +4m {
 # *** EXAMPLE: header1 -
   # Hide the clock time. Only show the date.
 # *** EXAMPLE: formats +
@@ -17,7 +17,7 @@ project acso "Accounting Software" "1.0" 2002-01-16 - 2002-04-28 {
 # *** EXAMPLE: formats +
   numberformat "-" "" "," "." 1
 # *** EXAMPLE: formats -
-  # Use US financial format for currency values. Don't show pence.
+  # Use US financial format for currency values. Don't show cents.
 # *** EXAMPLE: formats +
   currencyformat "(" ")" "," "." 0
 # *** EXAMPLE: formats -
@@ -67,7 +67,6 @@ rate 390.0
 # *** EXAMPLE: vacation +
 vacation "Good Friday" 2002-03-29
 # *** EXAMPLE: vacation -
-
 # *** EXAMPLE: flags +
 flags team
 # *** EXAMPLE: flags -
@@ -340,11 +339,13 @@ task AcSo "Accounting Software" {
     task prev "Technology Preview" {
       depends !!software.backend
       startcredit 31000.0
+      note "All '''major''' features should be usable."
     }
 
     task beta "Beta version" {
       depends !!test.alpha
       charge 13000.0 onstart
+      note "Fully functional, may contain bugs."
     }
 
     task done "Ship Product to Customer" {
@@ -358,6 +359,7 @@ task AcSo "Accounting Software" {
       # maxend 2002-04-17
       depends !!test.beta, !!manual
       charge 33000.0 onstart
+      note "All priority 1 and 2 bugs must be fixed."
     }
 # *** EXAMPLE: task1 +
   }
@@ -370,75 +372,122 @@ task AcSo "Accounting Software" {
 # scheduled. But no reports would be generated to visualize the
 # results.
 
-# A traditional Gantt chart with a project overview.
-# *** EXAMPLE: planoverview +
-htmltaskreport "ProjectPlanOverview.html" {
-  prolog '
-== Accounting Software Project ==
-----
-=== Project Overview ===
-
-The project is structured into 3 phases.
+# *** EXAMPLE: navigator +
+navigator navbar {
+  hidereport 0
+}
+# *** EXAMPLE: navigator -
+
+# *** EXAMPLE: overview_report1 +
+# *** EXAMPLE: overview_report2 +
+textreport "Overview" {
+  formats html
+# *** EXAMPLE: overview_report1 -
+  header -8<-
+    == Accounting Software Project ==
+    ----
+    <[navigator id="navbar"]>
+    ----
+  ->8-
+# *** EXAMPLE: overview_report1 +
+  center '<[report id="overview"]>'
+# *** EXAMPLE: overview_report1 -
+# *** EXAMPLE: overview_report2 -
+
+  textreport "Development" {
+    center '<[report id="development"]>'
+  }
 
-# Specification
-# [[Development]]
-# Testing
+  textreport "Deliveries" {
+    center '<[report id="deliveries"]>'
+  }
 
-=== Project Plan ===
-'
+  textreport "ContactList" {
+    center '<[report id="contactList"]>'
+  }
+  textreport "Resource Graph" {
+    center '<[report id="resourceGraph"]>'
+  }
+# *** EXAMPLE: overview_report1 +
+# *** EXAMPLE: overview_report2 +
+}
+# *** EXAMPLE: overview_report1 -
+# *** EXAMPLE: overview_report2 -
 
-  headline "Project Plan Overview"
+# A traditional Gantt chart with a project overview.
+# *** EXAMPLE: overview +
+# *** EXAMPLE: overview1 +
+taskreport overview "" {
+# *** EXAMPLE: overview1 -
+# *** EXAMPLE: overview4 +
+  header -8<-
+    === Project Overview ===
+    
+    The project is structured into 3 phases.
+    
+    # Specification
+    # [[Development]]
+    # Testing
+    
+    === Project Plan ===
+  ->8-
+# *** EXAMPLE: overview4 -
+# *** EXAMPLE: overview1 +
   columns hierarchindex, name, start, end, effort, duration, cost,
           revenue, chart
+# *** EXAMPLE: overview1 -
   # For this report we like to have the abbreviated weekday in front
   # of the date. %a is the tag for this.
+# *** EXAMPLE: overview3 +
   timeformat "%a %Y-%m-%d"
   loadunit days
+# *** EXAMPLE: overview3 -
   hideresource 1
+# *** EXAMPLE: overview2 +
   balance cost rev
-  caption '
-All effort values are in man days.
-'
-
-  epilog '
-=== Staffing ===
-
-All project phases are properly staffed. See [[ResourceGraph]] for
-detailed resource allocations.
-
-=== Current Status ===
-
-The project started off with a delay of 4 days. This slightly affected
-the original schedule. See [[Deliveries]] for the impact on the
-delivery dates.
-'
+# *** EXAMPLE: overview2 -
+# *** EXAMPLE: overview3 +
+  caption 'All effort values are in man days.'
+# *** EXAMPLE: overview3 -
+
+  footer -8<-
+    === Staffing ===
+    
+    All project phases are properly staffed. See [[ResourceGraph]] for
+    detailed resource allocations.
+    
+    === Current Status ===
+    
+    The project started off with a delay of 4 days. This slightly affected
+    the original schedule. See [[Deliveries]] for the impact on the
+    delivery dates.
+  ->8-
+# *** EXAMPLE: overview1 +
 }
-# *** EXAMPLE: planoverview -
+# *** EXAMPLE: overview1 -
+# *** EXAMPLE: overview -
 
 # A list of tasks showing the resources assigned to each task.
-htmltaskreport "Development.html" {
+taskreport development "" {
   headline "Development - Resource Allocation Report"
   columns hierarchindex, name, start, end, effort { title "Work" },
           duration, chart { scale day }
   timeformat "%Y-%m-%d"
-  loadunit days
   hideresource ~isleaf()
   sortresources name.up
 }
 
 # A list of all tasks with the percentage completed for each task
-htmltaskreport "Deliveries.html" {
+taskreport deliveries "" {
   headline "Project Deliveries"
-  columns hierarchindex, name, start, end, complete, chart
-  timeformat "%a %Y-%m-%d"
+  columns hierarchindex, name, start, end, note, complete, chart
   taskroot AcSo.deliveries
   loadunit days
   hideresource 1
   scenarios plan, delayed
 }
-
 # A list of all employees with their contact details.
-htmlresourcereport "ContactList.html" {
+resourcereport contactList "" {
   headline "Contact list and duty plan"
   columns name, Email { cellurl "mailto:$${Email}" }, Phone,
           chart { scale day }
@@ -449,37 +498,10 @@ htmlresourcereport "ContactList.html" {
 
 # A graph showing resource allocation. It identifies whether each
 # resource is under- or over-allocated for.
-htmlresourcereport "ResourceGraph.html" {
+resourcereport resourceGraph "" {
   headline "Resource Allocation Graph"
   columns no, name, effort, rate, weekly #, utilization, freeload, chart
   loadunit shortauto
   hidetask ~isleaf()
   sorttasks plan.start.up
 }
-
-# A list of all project resources, both human and material resources,
-# together with the associated costs.
-htmlresourcereport "ResourceSheet.html" {
-  headline "Resource Sheet"
-  columns no, name, id, effort, weekly, rate, cost
-  loadunit days
-  hidetask ~isleaf()
-  sorttasks plan.start.up
-  balance cost rev
-}
-
-# A list of resources and each task associated with each resource.
-htmlresourcereport "ResourceUsage.html" {
-  headline "Resource Usage Report"
-  columns no, name, chart { scale day } #, utilization, freeload, cost, chart
-  loadunit days
-  sorttasks plan.start.up
-  hidetask ~isleaf()
-  end 2002-02-10
-}
-
-csvtaskreport "csvtest.csv" {
-  columns no, name, id, effort, revenue, cost
-  loadunit days
-}
-

data/test/TestSuite/Syntax/Errors/bad_comment.tjp

@@ -0,0 +1,7 @@
+project test "Test" "1.0" 2009-08-24 +2m 
+
+# MARK: error 4 bad_comment
+/foo
+
+task foo "Foo" {
+}

data/test/TestSuite/Syntax/Errors/bad_include.tjp

@@ -2,7 +2,7 @@ project test "Test" "1.0" 2007-08-19 +2m
 
 # Unfortunately, include file errors are reported at the first token
 # after the include statement.
-# MARK: error 8 bad_include
+# MARK: error 6 bad_include
 include "foo.tji"
 
 task bar "Bar" {

data/test/TestSuite/Syntax/Errors/bad_time_zone.tjp

@@ -0,0 +1,6 @@
+project test "Test" "1.0" 2007-08-26 +1w {
+# MARK: error 3 bad_time_zone
+  timezone "foo/bar"
+}
+
+task foo "Foo"

data/test/TestSuite/Syntax/Errors/bad_timing_res.tjp

@@ -0,0 +1,5 @@
+project test "Test" "1.0" 2007-08-26 +1w {
+# MARK: error 3 bad_timing_res
+  timingresolution 21 min
+}
+

data/test/TestSuite/Syntax/Errors/chargeset_master.tjp

@@ -8,8 +8,8 @@ account group1 "Group1" {
 
 task t "T" {
   start ${projectstart}
-# MARK: error 14 chargeset_master
 	chargeset g1, g2
+# MARK: error 13 chargeset_master
   chargeset g3
 }
 

data/test/TestSuite/Syntax/Errors/container_attribute.tjp

@@ -7,7 +7,7 @@ task m "M" {
 task t "T" {
   start ${projectstart}
   task s "S"
-# MARK: error 12 container_attribute 
+# MARK: error 11 container_attribute 
   depends !m
 }
 

data/test/TestSuite/Syntax/Errors/cost_acct_no_top.tjp

@@ -17,8 +17,9 @@ task t "T" {
 	chargeset g1, g2
 }
 
-htmltaskreport "Tasks.html" {
-# MARK: error 22 cost_acct_no_top
+taskreport tasks "Tasks.html" {
+  formats html
+# MARK: error 23 cost_acct_no_top
   balance g1 group2
 }
 

data/test/TestSuite/Syntax/Errors/cost_rev_same.tjp

@@ -17,7 +17,7 @@ task t "T" {
 	chargeset g1, g2
 }
 
-htmltaskreport "Tasks.html" {
+taskreport tasks "Tasks.html" {
 # MARK: error 22 cost_rev_same
   balance group1 group1
 }

data/test/TestSuite/Syntax/Errors/eof_in_istring1.tjp

@@ -0,0 +1,5 @@
+project test "Test" "1.0" 2009-08-25 +2m 
+
+# MARK: error 5 eof_in_istring1
+task t -8<-
+   

data/test/TestSuite/Syntax/Errors/eof_in_istring2.tjp

@@ -0,0 +1,5 @@
+project test "Test" "1.0" 2009-08-25 +2m 
+
+# MARK: error 5 eof_in_istring2
+task t -8<-
+   foo

data/test/TestSuite/Syntax/Errors/eof_in_istring3.tjp

@@ -0,0 +1,6 @@
+project test "Test" "1.0" 2009-08-25 +2m 
+
+# MARK: error 6 eof_in_istring3
+task t -8<-
+  foo
+  -

data/test/TestSuite/Syntax/Errors/eof_in_istring4.tjp

@@ -0,0 +1,6 @@
+project test "Test" "1.0" 2009-08-25 +2m 
+
+# MARK: error 6 eof_in_istring4
+task t -8<-
+  foo
+  ->

data/test/TestSuite/Syntax/Errors/eof_in_istring5.tjp

@@ -0,0 +1,6 @@
+project test "Test" "1.0" 2009-08-25 +2m 
+
+# MARK: error 6 eof_in_istring5
+task t -8<-
+  foo
+  ->8

data/test/TestSuite/Syntax/Errors/include_recursion.tji

@@ -0,0 +1 @@
+include "include_recursion.tji"

data/test/TestSuite/Syntax/Errors/include_recursion.tjp

@@ -0,0 +1,7 @@
+project "Test" 2009-10-06 +2m 
+
+# The following error really happens in the included file, but the
+# testing scripts look for the MARK in this file.
+# MARK: error 1 include_recursion 
+include "include_recursion.tji"
+

data/test/TestSuite/Syntax/Errors/junk_after_cut.tjp

@@ -0,0 +1,6 @@
+project test "Test" "1.0" 2007-08-19 +2m 
+
+# MARK: error 4 junk_after_cut
+task t -8<- ->8- {
+  start 2007-08-19
+}

data/test/TestSuite/Syntax/Errors/navigator_exists.tjp

@@ -0,0 +1,10 @@
+project test "Test" "1.0" 2007-11-16 +2m 
+
+task t "T" {
+  start ${projectstart}
+}
+
+navigator foo
+navigator bar
+# MARK: error 10 navigator_exists 
+navigator foo

data/test/TestSuite/Syntax/Errors/operand_unkn_flag.tjp

@@ -5,7 +5,7 @@ task t "T" {
 }
 
 export "report.tji" {
-# MARK: error 10 operand_unkn_flag
+# MARK: error 9 operand_unkn_flag
 	hidetask foo
 }
 

data/test/TestSuite/Syntax/Errors/report_end.tjp

@@ -4,7 +4,7 @@ task t "T" {
   start ${projectstart}
 }
 
-htmltaskreport "report.html" {
+taskreport report "report.html" {
 # MARK: error 9 report_end
   end 2007-10-01
 }

data/test/TestSuite/Syntax/Errors/report_exists.tjp

@@ -0,0 +1,10 @@
+project test "Test" "1.0" 2007-11-16 +2m 
+
+task t "T" {
+  start ${projectstart}
+}
+
+taskreport report "report1" 
+# MARK: error 9 report_exists
+taskreport report "report2"
+

data/test/TestSuite/Syntax/Errors/report_start.tjp

@@ -4,7 +4,7 @@ task t "T" {
   start ${projectstart}
 }
 
-htmltaskreport "report.html" {
+taskreport report "report.html" {
 # MARK: error 9 report_start
   start 2008-02-01
 }

data/test/TestSuite/Syntax/Errors/rev_acct_no_top.tjp

@@ -17,7 +17,7 @@ task t "T" {
 	chargeset g1, g2
 }
 
-htmltaskreport "Tasks.html" {
+taskreport tasks "Tasks.html" {
 # MARK: error 22 rev_acct_no_top
   balance group1 g5
 }

data/test/TestSuite/Syntax/Errors/sort_direction.tjp

@@ -4,7 +4,7 @@ task t "T" {
   start 2007-08-19
 }
 
-htmltaskreport "report.html" {
+taskreport report "report.html" {
 # MARK: error 9 sort_direction
 	sorttasks plan.start.foo
 }

data/test/TestSuite/Syntax/Errors/sort_unknown_scen.tjp

@@ -4,7 +4,7 @@ task t "T" {
   start 2007-08-19
 }
 
-htmltaskreport "report.html" {
+taskreport report "report.html" {
 # MARK: error 9 sort_unknown_scen
 	sorttasks foo.start.up
 }

data/test/TestSuite/Syntax/Errors/sorting_crit_exptd1.tjp

@@ -4,7 +4,7 @@ task t "T" {
   start 2007-08-19
 }
 
-htmltaskreport "report.html" {
+taskreport report "report.html" {
 # MARK: error 9 sorting_crit_exptd1
 	sorttasks plan.start.foo.bar
 }

data/test/TestSuite/Syntax/Errors/sorting_crit_exptd2.tjp

@@ -4,7 +4,7 @@ task t "T" {
   start 2007-08-19
 }
 
-htmltaskreport "report.html" {
+taskreport report "report.html" {
 # MARK: error 9 sorting_crit_exptd2
 	sorttasks foo
 }

data/test/TestSuite/Syntax/Errors/sorting_wbs.tjp

@@ -4,7 +4,7 @@ task t "T" {
   start ${projectstart}
 }
 
-htmltaskreport "report.html" {
+taskreport report "report.html" {
 # MARK: error 9 sorting_wbs
 	sorttasks plan.wbs.up
 }