taskjuggler 0.0.2 → 0.0.3

data/test/TestSuite/Scheduler/Correct/Limits.tjp

@@ -1,9 +1,6 @@
 project test "Test" "1.0" 2007-08-29 +6m
 
-macro Fixend [
-  minend ${1}
-  maxend ${1}
-]
+include "checks.tji"
 
 resource a "A"
 resource b "B"
@@ -20,25 +17,25 @@ task tasks "Tasks" {
     effort 40h
     allocate a
     limits { dailymax 4h }
-    ${Fixend "2007-09-11-14:00"}
+    ${FixEnd "2007-09-11-14:00"}
   }
   task t2 "30d with 3d weekly limit" {
     effort 30d
     allocate b
     limits { weeklymax 3d }
-    ${Fixend "2007-10-31-18:00"}
+    ${FixEnd "2007-10-31-18:00"}
   }
   task t3 "45d with 15d monthly limit" {
     effort 45d
     allocate c
     limits { monthlymax 15d }
-    ${Fixend "2007-11-15-18:00"}
+    ${FixEnd "2007-11-15-18:00"}
   }
   task t4 "7h/day 4d/week 15d/months" {
     effort 50d
     allocate d
     limits { dailymax 7h weeklymax 4d monthlymax 15d }
-    ${Fixend "2007-12-04-15:00"}
+    ${FixEnd "2007-12-04-15:00"}
   }
 }
 
@@ -48,14 +45,14 @@ task nested "Nested Tasks (20h/week limit)" {
   task a "Task A" {
     allocate e
     effort 30d
-    ${Fixend "2008-02-06-14:00"}
+    ${FixEnd "2008-02-06-14:00"}
   }
   task b "Task B (7h/day limit)" {
     effort 30d
     allocate f
     priority 600
     limits { dailymax 7h }
-    ${Fixend "2007-11-14-16:00"}
+    ${FixEnd "2007-11-14-16:00"}
   }
 }
 
@@ -64,7 +61,7 @@ task interval "Interval Limit" {
   effort 20d
   allocate g
   limits { weeklymax 8h { period 2007-09-05 +8d }}
-  ${Fixend "2007-10-01-18:00"}
+  ${FixEnd "2007-10-01-18:00"}
 }
 
 task resource "Resource Limit" {
@@ -72,10 +69,11 @@ task resource "Resource Limit" {
   effort 10d
   allocate h
   limits { weeklymax 16h { resources h }}
-  ${Fixend "2007-09-25-18:00"}
+  ${FixEnd "2007-09-25-18:00"}
 }
 
-htmltaskreport "Limits.html" {
+taskreport limits "Limits" {
+  formats html
   columns no, name, start, end, effort, daily
 }
 

data/test/TestSuite/Scheduler/Correct/Optimize-1.tjp

@@ -1,27 +1,28 @@
 project test "Test" "1.0" 2000-01-01-0:00 +1m {
-	timezone "GMT"
+	timezone "UTC"
 }
 
-macro Fixend [ minend ${1} maxend ${1} ]
+include "checks.tji"
 
 resource tux1 "Tux1"
 resource tux2 "Tux2"
 
 task t1 "Task1" {
   start 2000-01-01
-	${Fixend "2000-01-04-18:00"}
+	${FixEnd "2000-01-04-18:00"}
 	effort 2d
 	allocate tux1 { alternative tux2 persistent }
 }
 
 task t2 "Task2" {
 	start 2000-01-01
-	${Fixend "2000-01-06-18:00"}
+	${FixEnd "2000-01-06-18:00"}
 	effort 4d
 	allocate tux1
 }
 
-htmltaskreport "Optimize-1.html" {
+taskreport optimize1 "Optimize-1" {
+  formats html
 	columns name, start, end, criticalness, pathcriticalness, daily
 	hideresource 0
 }

data/test/TestSuite/Scheduler/Correct/Optimize-2.tjp

@@ -1,32 +1,36 @@
-project test "Test" "1.0" 2000-01-01-0:00 +1m
+project test "Test" "1.0" 2000-01-01-0:00 +1m {
+	timezone "UTC"
+}
 
-macro Fixend [ minend ${1} maxend ${1} ]
+include "checks.tji"
 
 resource tux1 "Tux1"
 resource tux2 "Tux2"
 
 task t1 "Task1" {
   start 2000-01-01
-	${Fixend "2000-01-14-18:00"}
+	${FixEnd "2000-01-14-18:00"}
 	effort 10d
 	allocate tux2 { alternative tux1 persistent }
 }
 
 task t2 "Task2" {
 	start 2000-01-01
-	${Fixend "2000-01-06-18:00"}
+	${FixEnd "2000-01-06-18:00"}
 	effort 4d
 	allocate tux2 { persistent }
 }
 
 task t3 "Task3" {
 	depends !t2
-	${Fixend "2000-01-20-18:00"}
+	${FixEnd "2000-01-20-18:00"}
 	effort 10d
 	allocate tux2 { persistent }
 }
 
-htmltaskreport "Optimize-2.html" {
+taskreport optimize2 "Optimize-2" {
+  formats html
+  timeformat "%Y-%m-%d %H:%M"
 	columns name, start, end, daily
 	hideresource 0
 }

data/test/TestSuite/Scheduler/Correct/Optimize-3.tjp

@@ -1,32 +1,35 @@
-project test "Test" "1.0" 2000-01-01-0:00 +1m
+project test "Test" "1.0" 2000-01-01-0:00 +1m {
+	timezone "UTC"
+}
 
-macro Fixend [ minend ${1} maxend ${1} ]
+include "checks.tji"
 
 resource tux1 "Tux1"
 resource tux2 "Tux2"
 
 task t1 "Task1" {
   start 2000-01-04
-	${Fixend "2000-01-10-18:00"}
+	${FixEnd "2000-01-10-18:00"}
 	effort 5d
 	allocate tux1
 }
 
 task t2 "Task2" {
 	start 2000-01-10
-	${Fixend "2000-01-17-18:00"}
+	${FixEnd "2000-01-17-18:00"}
 	effort 5d
 	allocate tux1
 }
 
 task t3 "Task3" {
 	start 2000-01-02
-	${Fixend "2000-01-06-18:00"}
+	${FixEnd "2000-01-06-18:00"}
 	effort 4d
 	allocate tux1 { alternative tux2 persistent }
 }
 
-htmltaskreport "Optimize-3.html" {
+taskreport optimize3 "Optimize-3" {
+  formats html
 	columns name, start, end, daily
 	hideresource 0
 }

data/test/TestSuite/Scheduler/Correct/Optimize-4.tjp

@@ -1,6 +1,8 @@
-project test "Test" "Test" 2000-01-01-0:00 +1m
+project test "Test" "Test" 2000-01-01-0:00 +1m {
+	timezone "UTC"
+}
 
-macro Fixend [ minend ${1} maxend ${1} ]
+include "checks.tji"
 
 # This example does not get optimized properly yet. 
 resource tux1 "Tux1"
@@ -8,26 +10,27 @@ resource tux2 "Tux2"
 
 task t1 "Task1" {
   start 2000-01-01
-	${Fixend "2000-01-07-18:00"}
+	${FixEnd "2000-01-07-18:00"}
 	effort 5d
 	allocate tux1
 }
 
 task t2 "Task2" {
 	start 2000-01-01
-	${Fixend "2000-01-24-18:00"}
+	${FixEnd "2000-01-24-18:00"}
 	effort 6d
 	allocate tux1
 }
 
 task t3 "Task3" {
 	depends !t1
-	${Fixend "2000-01-14-18:00"}
+	${FixEnd "2000-01-14-18:00"}
 	effort 10d
 	allocate tux1, tux2
 }
 
-htmltaskreport "Optimize-4.html" {
+taskreport optimize4 "Optimize-4" {
+  formats html
 	columns name, start, end, criticalness, pathcriticalness, daily
 	hideresource 0
 }

data/test/TestSuite/Scheduler/Correct/Optimize-5.tjp

@@ -1,6 +1,8 @@
-project test "Test" "1.0" 2000-01-01-0:00 +2m
+project test "Test" "1.0" 2000-01-01-0:00 +2m {
+	timezone "UTC"
+}
 
-macro Fixend [ minend ${1} maxend ${1} ]
+include "checks.tji"
 
 resource tux1 "Tux1"
 resource tux2 "Tux2"
@@ -8,42 +10,42 @@ resource tux3 "Tux3"
 
 task t0 "Task0" {
 	start 2000-01-01
-	${Fixend "2000-01-07-18:00"}
+	${FixEnd "2000-01-07-18:00"}
 	effort 5d
 	allocate tux1 { alternative tux3 }
 }
 
 task t1 "Task1" {
   start 2000-01-01
-	${Fixend "2000-01-07-18:00"}
+	${FixEnd "2000-01-07-18:00"}
 	effort 5d
 	allocate tux1
 }
 
 task t2 "Task2" {
 	start 2000-01-01
-	${Fixend "2000-01-07-18:00"}
+	${FixEnd "2000-01-07-18:00"}
 	effort 5d
 	allocate tux2
 }
 
 task t3 "Task3" {
 	depends !t1, !t2
-	${Fixend "2000-01-11-18:00"}
+	${FixEnd "2000-01-11-18:00"}
 	effort 4d
 	allocate tux1, tux2
 }
 
 task t4 "Task4" {
 	depends !t3
-	${Fixend "2000-01-18-18:00"}
+	${FixEnd "2000-01-18-18:00"}
 	effort 5d
 	allocate tux1
 }
 
 task t5 "Task5" {
 	depends !t3
-	${Fixend "2000-01-25-18:00"}
+	${FixEnd "2000-01-25-18:00"}
 	effort 10d
 	allocate tux2
 }
@@ -52,10 +54,11 @@ task t6 "Task6" {
 	start 2000-01-01
 	effort 5d
 	allocate tux1
-	${Fixend "2000-01-25-18:00"}
+	${FixEnd "2000-01-25-18:00"}
 }
 
-htmltaskreport "Optimize-5.html" {
+taskreport optimize5 "Optimize-5" {
+  formats html
 	columns name, start, end, criticalness, pathcriticalness, daily
 	hideresource 0
 }

data/test/TestSuite/Scheduler/Correct/Precedes.tjp

@@ -1,50 +1,45 @@
 project test "Test" "1.0" 2007-04-02 - 2007-07-01
 
-macro Fixstart [ minstart ${1} maxstart ${1} ]
-macro Fixend [ minend ${1} maxend ${1} ]
+include "checks.tji"
 
 task t1 "T1" {
 	end ${projectend}
 	duration 1w
-	${Fixstart "2007-06-24"}
+	${FixStart "2007-06-24"}
 }
 
 task t2 "T2" {
 	precedes t1
 	duration 1w
-	${Fixstart "2007-06-17"}
-	${Fixend "2007-06-24"}
+	${FixTask "2007-06-17" "2007-06-24"}
 }
 
 task t3 "T3" {
 	precedes t2 { gapduration 1w }
 	duration 1w
-	${Fixstart "2007-06-03"}
-	${Fixend "2007-06-10"}
+	${FixTask "2007-06-03" "2007-06-10"}
 }
 
 task t4 "T4" {
 	precedes t3 { onstart gaplength 1w }
 	duration 1w
-	${Fixstart "2007-05-21-9:00"}
-  ${Fixend "2007-05-28-9:00"}
+	${FixTask "2007-05-21-9:00" "2007-05-28-9:00"}
 }
 
 task t5 "T5" {
 	precedes t4 { onend }
 	duration 1w
-	${Fixstart "2007-05-21-9:00"}
-  ${Fixend "2007-05-28-9:00"}
+	${FixTask "2007-05-21-9:00" "2007-05-28-9:00"}
 }
 
 task t6 "T6" {
 	precedes t4 { onend gaplength 1w }
 	duration 1w
-	${Fixstart "2007-05-14-9:00"}
-  ${Fixend "2007-05-21-9:00"}
+	${FixTask "2007-05-14-9:00" "2007-05-21-9:00"}
 }
 
-htmltaskreport "Precedes.html" {
+taskreport preceds "Precedes" {
+  formats html
 	columns name, start, end, daily
 }
 

data/test/TestSuite/Scheduler/Correct/Shift.tjp

@@ -1,6 +1,6 @@
 project test "Test" "1.0" 2007-08-22 +2m
 
-macro Fixend [ minend ${1} maxend ${1} ]
+include "checks.tji"
 
 shift odd_days "Odd Days" {
   workinghours mon, wed, fri 10:00 - 16:00
@@ -58,32 +58,32 @@ task prj "Project" {
   task mdf "MDF Task" {
     effort 4w
     allocate mdf
-    ${Fixend "2007-10-01-16:00"}
+    ${FixEnd "2007-10-01-16:00"}
   }
   
   task ttss "TTSS Task" {
     effort 5w
     allocate ttss
-    ${Fixend "2007-10-05-11:00"}
+    ${FixEnd "2007-10-05-11:00"}
   }
 
   task tt "TT Task" {
     effort 4w
     allocate tt
-    ${Fixend "2007-10-03-11:00"}
+    ${FixEnd "2007-10-03-11:00"}
   }
 
   task default "Default Task" {
     effort 7w
     allocate default
-    ${Fixend "2007-10-09-18:00"}
+    ${FixEnd "2007-10-09-18:00"}
   }
 
   task vac_test "Vacation on Thursday" {
     start 2007-09-01
     effort 4d
     allocate wed_vac
-    ${Fixend "2007-09-07-18:00"}
+    ${FixEnd "2007-09-07-18:00"}
   }
 
   task work1 "Task with shift morning" {
@@ -91,12 +91,13 @@ task prj "Project" {
     allocate work1
     effort 3w
     shifts morning 2007-09-01 +4w
-    ${Fixend "2007-10-02-18:00"}
+    ${FixEnd "2007-10-02-18:00"}
   }
     
 }
   
-htmltaskreport "Shift.html" {
+taskreport shift "Shift" {
+  formats html
   columns name, start, end, daily
 }
   

data/test/TestSuite/Scheduler/Correct/checks.tji

@@ -0,0 +1,4 @@
+macro FixStart [ minstart ${1} maxstart ${1} ]
+macro FixEnd [ minend ${1} maxend ${1} ]
+macro FixMS [ ${FixStart "${1}"} ${FixEnd "${1}"}]
+macro FixTask [ ${FixStart "${1}"} ${FixEnd "${2}"}]

data/test/TestSuite/Scheduler/Errors/weak_end_dep.tjp

@@ -0,0 +1,16 @@
+project prj "Project" "1.0" 2009-10-04 +6m
+
+task T1 "T1" {
+  end 2009-12-31
+  duration 2w
+}
+# MARK: error 8 weak_end_dep
+task T2 "T2" {
+  precedes !T1
+  start 2009-12-01
+}
+task T3 "T3" {
+  precedes !T2
+  duration 1w
+}
+

data/test/TestSuite/Scheduler/Errors/weak_start_dep.tjp

@@ -0,0 +1,16 @@
+project prj "Project" "1.0" 2009-08-16 +6m
+
+task T1 "T1" {
+  start 2009-10-01
+  duration 2w
+}
+# MARK: error 8 weak_start_dep
+task T2 "T2" {
+  depends !T1
+  end 2009-09-30
+}
+task T3 "T3" {
+  depends !T2
+  duration 1w
+}
+

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

@@ -46,7 +46,7 @@ task items "Room decoration" {
 }
 # *** EXAMPLE: 1 -
 
-# htmlaccountreport "PAndL.html" {
+# accountreport pandl "PAndL.html" {
 #   timeformat "%d-%M-%y"
 #   accumulate
 #   columns index, name, weekly

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

@@ -0,0 +1,21 @@
+project "Simple Project" 2009-10-04 +1m
+
+account "Foo" {
+  account "Bar"
+}
+
+shift "Foo" {
+  shift "bar"
+}
+
+resource "Foo" {
+  resource "Bar"
+}
+
+task "Foo" {
+  task "Bar"
+}
+
+taskreport "Foo" {
+  taskreport "Bar"
+}

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

@@ -7,7 +7,8 @@ task items "Project breakdown" {
   start ${projectstart} 
 }
 
-taskreport "My Tasks" {
+taskreport tasks "My Tasks" {
+  formats html
 	start ${now}
 	end ${projectend}
 }	

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

@@ -24,10 +24,11 @@ task plant "How to plant a tree" {
  }
 }
 
-htmltaskreport "PlantTree.html" {
- caption "This project shows how to plant a tree easily"
- headline "How to plant a tree"
- columns name, start, end, daily
- # Don't hide any resource, thus show them all.
- hideresource 0
+taskreport planttree "PlantTree.html" {
+  formats html
+  caption "This project shows how to plant a tree easily"
+  headline "How to plant a tree"
+  columns name, start, end, daily
+  # Don't hide any resource, thus show them all.
+  hideresource 0
 }

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

@@ -12,17 +12,20 @@ task t "Task" {
 }
 # *** EXAMPLE: 1 -
 # Just a very basic report with some standard columns
-htmltaskreport "SimpleReport.html" {
+taskreport simple "SimpleReport" {
+  formats html
   columns hierarchindex, name, start, end, weekly
 }
 
 # Report with custom colum title
-htmltaskreport "CustomTitle.html" {
+taskreport custom "CustomTitle" {
+  formats html
   columns hierarchindex, name { title "Work Item" }, effort
 }
 
 # *** EXAMPLE: 1 +
 # Report with index and task name combined in one single column
-htmltaskreport "CombinedColumn.html" {
+taskreport combined "CombinedColumn" {
+  formats html
   columns name { celltext "$${hierarchno} $${0}"}, start, end, weekly
-}
+}

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

@@ -25,5 +25,5 @@ task items "Project breakdown" {
   }
 }
 
-taskreport "My Tasks"
+taskreport tasks "My Tasks"
 # End of project

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

@@ -1,20 +1,12 @@
-/*
- * This file has been generated by TaskJuggler 2.2.0-svn
- * at 2006-08-30 19:41:03 CEST.
- */
-/*
- * For details about TaskJuggler see http://www.taskjuggler.org
- */
-supplement resource r {
-  plan:booking t
-    2000-01-03-09:00:00-+0100 +3h,
-    2000-01-03-13:00:00-+0100 +5h,
-    2000-01-04-09:00:00-+0100 +3h,
-    2000-01-04-13:00:00-+0100 +5h,
-    2000-01-05-09:00:00-+0100 +3h,
-    2000-01-05-13:00:00-+0100 +5h,
-    2000-01-06-09:00:00-+0100 +3h,
-    2000-01-06-13:00:00-+0100 +5h,
-    2000-01-07-09:00:00-+0100 +3h,
-    2000-01-07-13:00:00-+0100 +5h
+supplement task t {
+  plan:booking r 2000-01-03-09:00-+0100 + 3.0h,
+               2000-01-03-13:00-+0100 + 5.0h,
+               2000-01-04-09:00-+0100 + 3.0h,
+               2000-01-04-13:00-+0100 + 5.0h,
+               2000-01-05-09:00-+0100 + 3.0h,
+               2000-01-05-13:00-+0100 + 5.0h,
+               2000-01-06-09:00-+0100 + 3.0h,
+               2000-01-06-13:00-+0100 + 5.0h,
+               2000-01-07-09:00-+0100 + 3.0h,
+               2000-01-07-13:00-+0100 + 5.0h
 }

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

@@ -21,11 +21,12 @@ task t3 "Task 3" {
   duration 4d
 }
 
-taskreport "Tasks" {
+taskreport tasks "Tasks" {
+  formats html
   columns no, name, chart
 }
 
-htmltaskreport "CriticalTasks.html" {
+taskreport critical "CriticalTasks" {
   # Generate a list of all tasks that are on a critical path.
-  hidetask ~isoncriticalpath(plan)
+  #hidetask ~isoncriticalpath(plan)
 }

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

@@ -27,12 +27,14 @@ task t2 "Task 2" {
 # *** EXAMPLE: 2 +
 # Export the project as fully scheduled project.
 export "FullProject.tjp" {
-  taskattributes all
+  definitions *
+  taskattributes *
   hideresource 0
 }
 
 # Export only bookings for 1st week as resource supplements
 export "Week1Bookings.tji" {
+  definitions -
   start 2007-01-01
   end 2007-01-08
   taskattributes booking

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

@@ -23,7 +23,8 @@ task items "Project breakdown" {
   }
 }
 
-taskreport "My Tasks" {
+taskreport tasks "My Tasks" {
+  formats html
   # Show only the important tasks
   hidetask ~important
   # Turn treemode off so parent tasks are not automatically included.

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

@@ -23,7 +23,8 @@ task items "Project breakdown" {
   }
 }
 
-htmltaskreport "ProjectBreakdown.html" {
+taskreport breakdown "ProjectBreakdown.html" {
+  formats html
   caption "This is the project breakdown"
   headline "Project Breakdown"
   columns name, start, end, daily