taskjuggler 0.0.11 → 0.1.0

data/test/TestSuite/Export-Reports/refs/Niku.tjp

@@ -8,6 +8,7 @@ project prj "Niku Test" "1.0" 2010-02-01-00:00-+0000 - 2010-05-03-06:00-+0000 {
     text ClarityPName "Clarity Project Name"
   }
   scenario plan "Plan Scenario" {
+    active yes
   }
 }
 
@@ -19,200 +20,140 @@ resource r3 "r3"
 
 task _Task_1 "T1" {
   start 2010-02-01-16:00-+0000
-  end 2010-03-06-01:00-+0000
+  end 2010-03-06-00:00-+0000
   scheduling asap
   scheduled
 }
 task t2 "T2" {
   start 2010-02-01-16:00-+0000
-  end 2010-02-13-01:00-+0000
+  end 2010-02-13-00:00-+0000
   scheduling asap
   scheduled
 }
 task _Task_3 "T3" {
   depends t2
   start 2010-02-22-16:00-+0000
-  end 2010-03-06-01:00-+0000
+  end 2010-03-06-00:00-+0000
   scheduling asap
   scheduled
 }
 task _Task_4 "T4" {
   start 2010-02-01-16:00-+0000
-  end 2010-02-20-01:00-+0000
+  end 2010-02-20-00:00-+0000
   scheduling asap
   scheduled
 }
 supplement task _Task_1 {
   ClarityPID "p1"
   ClarityPName "Project 1"
-  booking r1 2010-02-01-16:00-+0000 + 3.0h,
-          2010-02-01-20:00-+0000 + 5.0h,
-          2010-02-02-16:00-+0000 + 3.0h,
-          2010-02-02-20:00-+0000 + 5.0h,
-          2010-02-03-16:00-+0000 + 3.0h,
-          2010-02-03-20:00-+0000 + 5.0h,
-          2010-02-04-16:00-+0000 + 3.0h,
-          2010-02-04-20:00-+0000 + 5.0h,
-          2010-02-05-16:00-+0000 + 3.0h,
-          2010-02-05-20:00-+0000 + 5.0h,
-          2010-02-08-16:00-+0000 + 3.0h,
-          2010-02-08-20:00-+0000 + 5.0h,
-          2010-02-09-16:00-+0000 + 3.0h,
-          2010-02-09-20:00-+0000 + 5.0h,
-          2010-02-10-16:00-+0000 + 3.0h,
-          2010-02-10-20:00-+0000 + 5.0h,
-          2010-02-11-16:00-+0000 + 3.0h,
-          2010-02-11-20:00-+0000 + 5.0h,
-          2010-02-12-16:00-+0000 + 3.0h,
-          2010-02-12-20:00-+0000 + 5.0h,
-          2010-02-15-16:00-+0000 + 3.0h,
-          2010-02-15-20:00-+0000 + 5.0h,
-          2010-02-16-16:00-+0000 + 3.0h,
-          2010-02-16-20:00-+0000 + 5.0h,
-          2010-02-17-16:00-+0000 + 3.0h,
-          2010-02-17-20:00-+0000 + 5.0h,
-          2010-02-18-16:00-+0000 + 3.0h,
-          2010-02-18-20:00-+0000 + 5.0h,
-          2010-02-19-16:00-+0000 + 3.0h,
-          2010-02-19-20:00-+0000 + 5.0h,
-          2010-02-22-16:00-+0000 + 3.0h,
-          2010-02-22-20:00-+0000 + 5.0h,
-          2010-02-23-16:00-+0000 + 3.0h,
-          2010-02-23-20:00-+0000 + 5.0h,
-          2010-02-24-16:00-+0000 + 3.0h,
-          2010-02-24-20:00-+0000 + 5.0h,
-          2010-02-25-16:00-+0000 + 3.0h,
-          2010-02-25-20:00-+0000 + 5.0h,
-          2010-02-26-16:00-+0000 + 3.0h,
-          2010-02-26-20:00-+0000 + 5.0h,
-          2010-03-01-16:00-+0000 + 3.0h,
-          2010-03-01-20:00-+0000 + 5.0h,
-          2010-03-02-16:00-+0000 + 3.0h,
-          2010-03-02-20:00-+0000 + 5.0h,
-          2010-03-03-16:00-+0000 + 3.0h,
-          2010-03-03-20:00-+0000 + 5.0h,
-          2010-03-04-16:00-+0000 + 3.0h,
-          2010-03-04-20:00-+0000 + 5.0h,
-          2010-03-05-16:00-+0000 + 3.0h,
-          2010-03-05-20:00-+0000 + 5.0h { overtime 2 }
+  booking r1 2010-02-01-16:00-+0000 + 8.0h,
+          2010-02-02-16:00-+0000 + 8.0h,
+          2010-02-03-16:00-+0000 + 8.0h,
+          2010-02-04-16:00-+0000 + 8.0h,
+          2010-02-05-16:00-+0000 + 8.0h,
+          2010-02-08-16:00-+0000 + 8.0h,
+          2010-02-09-16:00-+0000 + 8.0h,
+          2010-02-10-16:00-+0000 + 8.0h,
+          2010-02-11-16:00-+0000 + 8.0h,
+          2010-02-12-16:00-+0000 + 8.0h,
+          2010-02-15-16:00-+0000 + 8.0h,
+          2010-02-16-16:00-+0000 + 8.0h,
+          2010-02-17-16:00-+0000 + 8.0h,
+          2010-02-18-16:00-+0000 + 8.0h,
+          2010-02-19-16:00-+0000 + 8.0h,
+          2010-02-22-16:00-+0000 + 8.0h,
+          2010-02-23-16:00-+0000 + 8.0h,
+          2010-02-24-16:00-+0000 + 8.0h,
+          2010-02-25-16:00-+0000 + 8.0h,
+          2010-02-26-16:00-+0000 + 8.0h,
+          2010-03-01-16:00-+0000 + 8.0h,
+          2010-03-02-16:00-+0000 + 8.0h,
+          2010-03-03-16:00-+0000 + 8.0h,
+          2010-03-04-16:00-+0000 + 8.0h,
+          2010-03-05-16:00-+0000 + 8.0h { overtime 2 }
   priority 500
   projectid prj
 }
 supplement task t2 {
   ClarityPID "p1"
   ClarityPName "Project 1"
-  booking r2 2010-02-01-16:00-+0000 + 3.0h,
-          2010-02-01-20:00-+0000 + 5.0h,
-          2010-02-02-16:00-+0000 + 3.0h,
-          2010-02-02-20:00-+0000 + 5.0h,
-          2010-02-03-16:00-+0000 + 3.0h,
-          2010-02-03-20:00-+0000 + 5.0h,
-          2010-02-04-16:00-+0000 + 3.0h,
-          2010-02-04-20:00-+0000 + 5.0h,
-          2010-02-05-16:00-+0000 + 3.0h,
-          2010-02-05-20:00-+0000 + 5.0h,
-          2010-02-08-16:00-+0000 + 3.0h,
-          2010-02-08-20:00-+0000 + 5.0h,
-          2010-02-09-16:00-+0000 + 3.0h,
-          2010-02-09-20:00-+0000 + 5.0h,
-          2010-02-10-16:00-+0000 + 3.0h,
-          2010-02-10-20:00-+0000 + 5.0h,
-          2010-02-11-16:00-+0000 + 3.0h,
-          2010-02-11-20:00-+0000 + 5.0h,
-          2010-02-12-16:00-+0000 + 3.0h,
-          2010-02-12-20:00-+0000 + 5.0h { overtime 2 }
+  booking r2 2010-02-01-16:00-+0000 + 8.0h,
+          2010-02-02-16:00-+0000 + 8.0h,
+          2010-02-03-16:00-+0000 + 8.0h,
+          2010-02-04-16:00-+0000 + 8.0h,
+          2010-02-05-16:00-+0000 + 8.0h,
+          2010-02-08-16:00-+0000 + 8.0h,
+          2010-02-09-16:00-+0000 + 8.0h,
+          2010-02-10-16:00-+0000 + 8.0h,
+          2010-02-11-16:00-+0000 + 8.0h,
+          2010-02-12-16:00-+0000 + 8.0h { overtime 2 }
   priority 500
   projectid prj
 }
 supplement task _Task_3 {
   ClarityPID "p2"
   ClarityPName "Project 2"
-  booking r2 2010-02-22-16:00-+0000 + 3.0h,
-          2010-02-22-20:00-+0000 + 5.0h,
-          2010-02-23-16:00-+0000 + 3.0h,
-          2010-02-23-20:00-+0000 + 5.0h,
-          2010-02-24-16:00-+0000 + 3.0h,
-          2010-02-24-20:00-+0000 + 5.0h,
-          2010-02-25-16:00-+0000 + 3.0h,
-          2010-02-25-20:00-+0000 + 5.0h,
-          2010-02-26-16:00-+0000 + 3.0h,
-          2010-02-26-20:00-+0000 + 5.0h,
-          2010-03-01-16:00-+0000 + 3.0h,
-          2010-03-01-20:00-+0000 + 5.0h,
-          2010-03-02-16:00-+0000 + 3.0h,
-          2010-03-02-20:00-+0000 + 5.0h,
-          2010-03-03-16:00-+0000 + 3.0h,
-          2010-03-03-20:00-+0000 + 5.0h,
-          2010-03-04-16:00-+0000 + 3.0h,
-          2010-03-04-20:00-+0000 + 5.0h,
-          2010-03-05-16:00-+0000 + 3.0h,
-          2010-03-05-20:00-+0000 + 5.0h { overtime 2 }
+  booking r2 2010-02-22-16:00-+0000 + 8.0h,
+          2010-02-23-16:00-+0000 + 8.0h,
+          2010-02-24-16:00-+0000 + 8.0h,
+          2010-02-25-16:00-+0000 + 8.0h,
+          2010-02-26-16:00-+0000 + 8.0h,
+          2010-03-01-16:00-+0000 + 8.0h,
+          2010-03-02-16:00-+0000 + 8.0h,
+          2010-03-03-16:00-+0000 + 8.0h,
+          2010-03-04-16:00-+0000 + 8.0h,
+          2010-03-05-16:00-+0000 + 8.0h { overtime 2 }
   priority 500
   projectid prj
 }
 supplement task _Task_4 {
   ClarityPID "p2"
   ClarityPName "Project 2"
-  booking r3 2010-02-01-16:00-+0000 + 3.0h,
-          2010-02-01-20:00-+0000 + 5.0h,
-          2010-02-02-16:00-+0000 + 3.0h,
-          2010-02-02-20:00-+0000 + 5.0h,
-          2010-02-03-16:00-+0000 + 3.0h,
-          2010-02-03-20:00-+0000 + 5.0h,
-          2010-02-04-16:00-+0000 + 3.0h,
-          2010-02-04-20:00-+0000 + 5.0h,
-          2010-02-05-16:00-+0000 + 3.0h,
-          2010-02-05-20:00-+0000 + 5.0h,
-          2010-02-08-16:00-+0000 + 3.0h,
-          2010-02-08-20:00-+0000 + 5.0h,
-          2010-02-09-16:00-+0000 + 3.0h,
-          2010-02-09-20:00-+0000 + 5.0h,
-          2010-02-10-16:00-+0000 + 3.0h,
-          2010-02-10-20:00-+0000 + 5.0h,
-          2010-02-11-16:00-+0000 + 3.0h,
-          2010-02-11-20:00-+0000 + 5.0h,
-          2010-02-12-16:00-+0000 + 3.0h,
-          2010-02-12-20:00-+0000 + 5.0h,
-          2010-02-15-16:00-+0000 + 3.0h,
-          2010-02-15-20:00-+0000 + 5.0h,
-          2010-02-16-16:00-+0000 + 3.0h,
-          2010-02-16-20:00-+0000 + 5.0h,
-          2010-02-17-16:00-+0000 + 3.0h,
-          2010-02-17-20:00-+0000 + 5.0h,
-          2010-02-18-16:00-+0000 + 3.0h,
-          2010-02-18-20:00-+0000 + 5.0h,
-          2010-02-19-16:00-+0000 + 3.0h,
-          2010-02-19-20:00-+0000 + 5.0h { overtime 2 }
+  booking r3 2010-02-01-16:00-+0000 + 8.0h,
+          2010-02-02-16:00-+0000 + 8.0h,
+          2010-02-03-16:00-+0000 + 8.0h,
+          2010-02-04-16:00-+0000 + 8.0h,
+          2010-02-05-16:00-+0000 + 8.0h,
+          2010-02-08-16:00-+0000 + 8.0h,
+          2010-02-09-16:00-+0000 + 8.0h,
+          2010-02-10-16:00-+0000 + 8.0h,
+          2010-02-11-16:00-+0000 + 8.0h,
+          2010-02-12-16:00-+0000 + 8.0h,
+          2010-02-15-16:00-+0000 + 8.0h,
+          2010-02-16-16:00-+0000 + 8.0h,
+          2010-02-17-16:00-+0000 + 8.0h,
+          2010-02-18-16:00-+0000 + 8.0h,
+          2010-02-19-16:00-+0000 + 8.0h { overtime 2 }
   priority 500
   projectid prj
 }
 supplement resource r1 {
   ClarityRID "r1"
   workinghours sun off
-               workinghours mon 9:00 - 12:00, 13:00 - 18:00
-               workinghours tue 9:00 - 12:00, 13:00 - 18:00
-               workinghours wed 9:00 - 12:00, 13:00 - 18:00
-               workinghours thu 9:00 - 12:00, 13:00 - 18:00
-               workinghours fri 9:00 - 12:00, 13:00 - 18:00
+               workinghours mon 9:00 - 17:00
+               workinghours tue 9:00 - 17:00
+               workinghours wed 9:00 - 17:00
+               workinghours thu 9:00 - 17:00
+               workinghours fri 9:00 - 17:00
                workinghours sat off
 }
 supplement resource r2 {
   ClarityRID "r2"
   workinghours sun off
-               workinghours mon 9:00 - 12:00, 13:00 - 18:00
-               workinghours tue 9:00 - 12:00, 13:00 - 18:00
-               workinghours wed 9:00 - 12:00, 13:00 - 18:00
-               workinghours thu 9:00 - 12:00, 13:00 - 18:00
-               workinghours fri 9:00 - 12:00, 13:00 - 18:00
+               workinghours mon 9:00 - 17:00
+               workinghours tue 9:00 - 17:00
+               workinghours wed 9:00 - 17:00
+               workinghours thu 9:00 - 17:00
+               workinghours fri 9:00 - 17:00
                workinghours sat off
 }
 supplement resource r3 {
   ClarityRID "r3"
   workinghours sun off
-               workinghours mon 9:00 - 12:00, 13:00 - 18:00
-               workinghours tue 9:00 - 12:00, 13:00 - 18:00
-               workinghours wed 9:00 - 12:00, 13:00 - 18:00
-               workinghours thu 9:00 - 12:00, 13:00 - 18:00
-               workinghours fri 9:00 - 12:00, 13:00 - 18:00
+               workinghours mon 9:00 - 17:00
+               workinghours tue 9:00 - 17:00
+               workinghours wed 9:00 - 17:00
+               workinghours thu 9:00 - 17:00
+               workinghours fri 9:00 - 17:00
                workinghours sat off
 }

data/test/TestSuite/Export-Reports/refs/Numberformat.tjp

@@ -1,6 +1,7 @@
 project prj "Project" "1.0" 2000-01-01-00:00-+0000 - 2000-03-01-00:00-+0000 {
   timezone "Europe/Berlin"
   scenario plan "Plan Scenario" {
+    active yes
   }
 }
 

data/test/TestSuite/Export-Reports/refs/Period.tjp

@@ -1,6 +1,7 @@
 project prj "Period Project" "1.0" 2006-09-24-00:00-+0000 - 2006-12-24-06:00-+0000 {
   timezone "America/Denver"
   scenario plan "Plan Scenario" {
+    active yes
   }
 }
 

data/test/TestSuite/Export-Reports/refs/Persistent.tjp

@@ -1,6 +1,7 @@
 project prj "Project" "1.0" 2003-06-05-00:00-+0000 - 2003-07-05-00:00-+0000 {
   timezone "America/Denver"
   scenario plan "Plan Scenario" {
+    active yes
   }
 }
 
@@ -11,39 +12,34 @@ resource r2 "Resource 2"
 
 task t1 "Task 1" {
   start 2003-06-05-15:00-+0000
-  end 2003-06-12-00:00-+0000
+  end 2003-06-11-23:00-+0000
   scheduling asap
   scheduled
 }
 supplement task t1 {
-  booking r1 2003-06-05-15:00-+0000 + 3.0h,
-          2003-06-05-19:00-+0000 + 5.0h,
-          2003-06-06-15:00-+0000 + 3.0h,
-          2003-06-06-19:00-+0000 + 5.0h,
-          2003-06-09-15:00-+0000 + 3.0h,
-          2003-06-09-19:00-+0000 + 5.0h,
-          2003-06-10-15:00-+0000 + 3.0h,
-          2003-06-10-19:00-+0000 + 5.0h,
-          2003-06-11-15:00-+0000 + 3.0h,
-          2003-06-11-19:00-+0000 + 5.0h { overtime 2 }
+  booking r1 2003-06-05-15:00-+0000 + 8.0h,
+          2003-06-06-15:00-+0000 + 8.0h,
+          2003-06-09-15:00-+0000 + 8.0h,
+          2003-06-10-15:00-+0000 + 8.0h,
+          2003-06-11-15:00-+0000 + 8.0h { overtime 2 }
   priority 500
   projectid prj
 }
 supplement resource r1 {
   workinghours sun off
-               workinghours mon 9:00 - 12:00, 13:00 - 18:00
-               workinghours tue 9:00 - 12:00, 13:00 - 18:00
-               workinghours wed 9:00 - 12:00, 13:00 - 18:00
-               workinghours thu 9:00 - 12:00, 13:00 - 18:00
-               workinghours fri 9:00 - 12:00, 13:00 - 18:00
+               workinghours mon 9:00 - 17:00
+               workinghours tue 9:00 - 17:00
+               workinghours wed 9:00 - 17:00
+               workinghours thu 9:00 - 17:00
+               workinghours fri 9:00 - 17:00
                workinghours sat off
 }
 supplement resource r2 {
   workinghours sun off
-               workinghours mon 9:00 - 12:00, 13:00 - 18:00
-               workinghours tue 9:00 - 12:00, 13:00 - 18:00
-               workinghours wed 9:00 - 12:00, 13:00 - 18:00
-               workinghours thu 9:00 - 12:00, 13:00 - 18:00
-               workinghours fri 9:00 - 12:00, 13:00 - 18:00
+               workinghours mon 9:00 - 17:00
+               workinghours tue 9:00 - 17:00
+               workinghours wed 9:00 - 17:00
+               workinghours thu 9:00 - 17:00
+               workinghours fri 9:00 - 17:00
                workinghours sat off
 }

data/test/TestSuite/Export-Reports/refs/Precedes1.tjp

@@ -1,6 +1,7 @@
 project prj "P" "1.0" 2003-11-09-00:00-+0000 - 2003-12-24-00:00-+0000 {
   timezone "America/Denver"
   scenario plan "Plan Scenario" {
+    active yes
   }
 }
 

data/test/TestSuite/Export-Reports/refs/Priority.tjp

@@ -1,6 +1,7 @@
-project prj "Priority Demo" "1.0" 2005-07-15-00:00-+0000 - 2005-10-01-00:00-+0000 {
+project prj "Priority Demo" "1.0" 2011-04-17-07:00-+0000 - 2011-06-17-03:00-+0000 {
   timezone "America/Denver"
   scenario plan "Plan Scenario" {
+    active yes
   }
 }
 
@@ -8,134 +9,147 @@ projectids prj
 
 resource tux "Tux"
 
-task items "Project breakdown" {
-  task coolStuff "Do some cool stuff" {
-    start 2005-08-01-15:00-+0000
-    end 2005-08-13-00:00-+0000
+task jobs "Project breakdown" {
+  task work "The regular work" {
+    start 2011-04-18-15:00-+0000
+    end 2011-06-01-20:00-+0000
     scheduling asap
     scheduled
   }
-  task otherStuff "Other not so important stuff" {
-    start 2005-08-15-15:00-+0000
-    end 2005-09-10-00:00-+0000
+  task support "Customer Support" {
+    start 2011-04-17-07:00-+0000
+    end 2011-06-17-03:00-+0000
+    scheduling alap
+    scheduled
+  }
+  task conference "Attend Conference" {
+    start 2011-04-25-06:00-+0000
+    end 2011-04-27-06:00-+0000
     scheduling asap
     scheduled
   }
   task maintenance "Maintenance work" {
-    start 2005-07-15-06:00-+0000
-    end 2005-09-14-02:00-+0000
-    scheduling asap
+    start 2011-04-17-07:00-+0000
+    end 2011-06-17-03:00-+0000
+    scheduling alap
     scheduled
   }
 }
-supplement task items {
+supplement task jobs {
   priority 500
   projectid prj
 }
-supplement task items.coolStuff {
-  booking tux 2005-08-01-15:00-+0000 + 3.0h,
-          2005-08-01-19:00-+0000 + 5.0h,
-          2005-08-02-15:00-+0000 + 3.0h,
-          2005-08-02-19:00-+0000 + 5.0h,
-          2005-08-03-15:00-+0000 + 3.0h,
-          2005-08-03-19:00-+0000 + 5.0h,
-          2005-08-04-15:00-+0000 + 3.0h,
-          2005-08-04-19:00-+0000 + 5.0h,
-          2005-08-05-15:00-+0000 + 3.0h,
-          2005-08-05-19:00-+0000 + 5.0h,
-          2005-08-08-15:00-+0000 + 3.0h,
-          2005-08-08-19:00-+0000 + 5.0h,
-          2005-08-09-15:00-+0000 + 3.0h,
-          2005-08-09-19:00-+0000 + 5.0h,
-          2005-08-10-15:00-+0000 + 3.0h,
-          2005-08-10-19:00-+0000 + 5.0h,
-          2005-08-11-15:00-+0000 + 3.0h,
-          2005-08-11-19:00-+0000 + 5.0h,
-          2005-08-12-15:00-+0000 + 3.0h,
-          2005-08-12-19:00-+0000 + 5.0h { overtime 2 }
+supplement task jobs.work {
+  booking tux 2011-04-18-15:00-+0000 + 6.0h,
+          2011-04-19-15:00-+0000 + 6.0h,
+          2011-04-20-15:00-+0000 + 6.0h,
+          2011-04-21-15:00-+0000 + 6.0h,
+          2011-04-22-15:00-+0000 + 1.0h,
+          2011-04-27-15:00-+0000 + 6.0h,
+          2011-04-28-15:00-+0000 + 6.0h,
+          2011-04-29-15:00-+0000 + 6.0h,
+          2011-05-02-15:00-+0000 + 6.0h,
+          2011-05-03-15:00-+0000 + 6.0h,
+          2011-05-04-15:00-+0000 + 6.0h,
+          2011-05-05-15:00-+0000 + 6.0h,
+          2011-05-06-15:00-+0000 + 1.0h,
+          2011-05-09-15:00-+0000 + 6.0h,
+          2011-05-10-15:00-+0000 + 6.0h,
+          2011-05-11-15:00-+0000 + 6.0h,
+          2011-05-12-15:00-+0000 + 6.0h,
+          2011-05-13-15:00-+0000 + 1.0h,
+          2011-05-16-15:00-+0000 + 6.0h,
+          2011-05-17-15:00-+0000 + 6.0h,
+          2011-05-18-15:00-+0000 + 6.0h,
+          2011-05-19-15:00-+0000 + 6.0h,
+          2011-05-20-15:00-+0000 + 1.0h,
+          2011-05-23-15:00-+0000 + 6.0h,
+          2011-05-24-15:00-+0000 + 6.0h,
+          2011-05-25-15:00-+0000 + 6.0h,
+          2011-05-26-15:00-+0000 + 6.0h,
+          2011-05-27-15:00-+0000 + 1.0h,
+          2011-05-30-15:00-+0000 + 6.0h,
+          2011-05-31-15:00-+0000 + 6.0h,
+          2011-06-01-15:00-+0000 + 5.0h { overtime 2 }
+  priority 500
+  projectid prj
+}
+supplement task jobs.support {
+  booking tux 2011-04-18-21:00-+0000 + 2.0h,
+          2011-04-19-21:00-+0000 + 2.0h,
+          2011-04-20-21:00-+0000 + 2.0h,
+          2011-04-21-21:00-+0000 + 2.0h,
+          2011-04-22-21:00-+0000 + 2.0h,
+          2011-04-27-21:00-+0000 + 2.0h,
+          2011-04-28-21:00-+0000 + 2.0h,
+          2011-04-29-21:00-+0000 + 2.0h,
+          2011-05-02-21:00-+0000 + 2.0h,
+          2011-05-03-21:00-+0000 + 2.0h,
+          2011-05-04-21:00-+0000 + 2.0h,
+          2011-05-05-21:00-+0000 + 2.0h,
+          2011-05-06-21:00-+0000 + 2.0h,
+          2011-05-09-21:00-+0000 + 2.0h,
+          2011-05-10-21:00-+0000 + 2.0h,
+          2011-05-11-21:00-+0000 + 2.0h,
+          2011-05-12-21:00-+0000 + 2.0h,
+          2011-05-13-21:00-+0000 + 2.0h,
+          2011-05-16-21:00-+0000 + 2.0h,
+          2011-05-17-21:00-+0000 + 2.0h,
+          2011-05-18-21:00-+0000 + 2.0h,
+          2011-05-19-21:00-+0000 + 2.0h,
+          2011-05-20-21:00-+0000 + 2.0h,
+          2011-05-23-21:00-+0000 + 2.0h,
+          2011-05-24-21:00-+0000 + 2.0h,
+          2011-05-25-21:00-+0000 + 2.0h,
+          2011-05-26-21:00-+0000 + 2.0h,
+          2011-05-27-21:00-+0000 + 2.0h,
+          2011-05-30-21:00-+0000 + 2.0h,
+          2011-05-31-21:00-+0000 + 2.0h,
+          2011-06-01-21:00-+0000 + 2.0h,
+          2011-06-02-21:00-+0000 + 2.0h,
+          2011-06-03-21:00-+0000 + 2.0h,
+          2011-06-06-21:00-+0000 + 2.0h,
+          2011-06-07-21:00-+0000 + 2.0h,
+          2011-06-08-21:00-+0000 + 2.0h,
+          2011-06-09-21:00-+0000 + 2.0h,
+          2011-06-10-21:00-+0000 + 2.0h,
+          2011-06-13-21:00-+0000 + 2.0h,
+          2011-06-14-21:00-+0000 + 2.0h,
+          2011-06-15-21:00-+0000 + 2.0h,
+          2011-06-16-15:00-+0000 + 8.0h { overtime 2 }
   priority 800
   projectid prj
 }
-supplement task items.otherStuff {
-  booking tux 2005-08-15-15:00-+0000 + 3.0h,
-          2005-08-15-19:00-+0000 + 5.0h,
-          2005-08-16-15:00-+0000 + 3.0h,
-          2005-08-16-19:00-+0000 + 5.0h,
-          2005-08-17-15:00-+0000 + 3.0h,
-          2005-08-17-19:00-+0000 + 5.0h,
-          2005-08-18-15:00-+0000 + 3.0h,
-          2005-08-18-19:00-+0000 + 5.0h,
-          2005-08-19-15:00-+0000 + 3.0h,
-          2005-08-19-19:00-+0000 + 5.0h,
-          2005-08-22-15:00-+0000 + 3.0h,
-          2005-08-22-19:00-+0000 + 5.0h,
-          2005-08-23-15:00-+0000 + 3.0h,
-          2005-08-23-19:00-+0000 + 5.0h,
-          2005-08-24-15:00-+0000 + 3.0h,
-          2005-08-24-19:00-+0000 + 5.0h,
-          2005-08-25-15:00-+0000 + 3.0h,
-          2005-08-25-19:00-+0000 + 5.0h,
-          2005-08-26-15:00-+0000 + 3.0h,
-          2005-08-26-19:00-+0000 + 5.0h,
-          2005-08-29-15:00-+0000 + 3.0h,
-          2005-08-29-19:00-+0000 + 5.0h,
-          2005-08-30-15:00-+0000 + 3.0h,
-          2005-08-30-19:00-+0000 + 5.0h,
-          2005-08-31-15:00-+0000 + 3.0h,
-          2005-08-31-19:00-+0000 + 5.0h,
-          2005-09-01-15:00-+0000 + 3.0h,
-          2005-09-01-19:00-+0000 + 5.0h,
-          2005-09-02-15:00-+0000 + 3.0h,
-          2005-09-02-19:00-+0000 + 5.0h,
-          2005-09-05-15:00-+0000 + 3.0h,
-          2005-09-05-19:00-+0000 + 5.0h,
-          2005-09-06-15:00-+0000 + 3.0h,
-          2005-09-06-19:00-+0000 + 5.0h,
-          2005-09-07-15:00-+0000 + 3.0h,
-          2005-09-07-19:00-+0000 + 5.0h,
-          2005-09-08-15:00-+0000 + 3.0h,
-          2005-09-08-19:00-+0000 + 5.0h,
-          2005-09-09-15:00-+0000 + 3.0h,
-          2005-09-09-19:00-+0000 + 5.0h { overtime 2 }
-  priority 500
+supplement task jobs.conference {
+  booking tux 2011-04-25-15:00-+0000 + 8.0h,
+          2011-04-26-15:00-+0000 + 8.0h { overtime 2 }
+  priority 1000
   projectid prj
 }
-supplement task items.maintenance {
-  booking tux 2005-07-15-15:00-+0000 + 3.0h,
-          2005-07-15-19:00-+0000 + 5.0h,
-          2005-07-18-15:00-+0000 + 3.0h,
-          2005-07-18-19:00-+0000 + 5.0h,
-          2005-07-19-15:00-+0000 + 3.0h,
-          2005-07-19-19:00-+0000 + 5.0h,
-          2005-07-20-15:00-+0000 + 3.0h,
-          2005-07-20-19:00-+0000 + 5.0h,
-          2005-07-21-15:00-+0000 + 3.0h,
-          2005-07-21-19:00-+0000 + 5.0h,
-          2005-07-22-15:00-+0000 + 3.0h,
-          2005-07-22-19:00-+0000 + 5.0h,
-          2005-07-25-15:00-+0000 + 3.0h,
-          2005-07-25-19:00-+0000 + 5.0h,
-          2005-07-26-15:00-+0000 + 3.0h,
-          2005-07-26-19:00-+0000 + 5.0h,
-          2005-07-27-15:00-+0000 + 3.0h,
-          2005-07-27-19:00-+0000 + 5.0h,
-          2005-07-28-15:00-+0000 + 3.0h,
-          2005-07-28-19:00-+0000 + 5.0h,
-          2005-07-29-15:00-+0000 + 3.0h,
-          2005-07-29-19:00-+0000 + 5.0h,
-          2005-09-12-15:00-+0000 + 3.0h,
-          2005-09-12-19:00-+0000 + 5.0h,
-          2005-09-13-15:00-+0000 + 3.0h,
-          2005-09-13-19:00-+0000 + 5.0h { overtime 2 }
+supplement task jobs.maintenance {
+  booking tux 2011-04-22-16:00-+0000 + 5.0h,
+          2011-05-06-16:00-+0000 + 5.0h,
+          2011-05-13-16:00-+0000 + 5.0h,
+          2011-05-20-16:00-+0000 + 5.0h,
+          2011-05-27-16:00-+0000 + 5.0h,
+          2011-06-01-20:00-+0000 + 1.0h,
+          2011-06-02-15:00-+0000 + 6.0h,
+          2011-06-03-15:00-+0000 + 6.0h,
+          2011-06-08-17:00-+0000 + 4.0h,
+          2011-06-09-15:00-+0000 + 6.0h,
+          2011-06-10-15:00-+0000 + 6.0h,
+          2011-06-13-15:00-+0000 + 6.0h,
+          2011-06-14-15:00-+0000 + 6.0h,
+          2011-06-15-15:00-+0000 + 6.0h { overtime 2 }
   priority 300
   projectid prj
 }
 supplement resource tux {
   workinghours sun off
-               workinghours mon 9:00 - 12:00, 13:00 - 18:00
-               workinghours tue 9:00 - 12:00, 13:00 - 18:00
-               workinghours wed 9:00 - 12:00, 13:00 - 18:00
-               workinghours thu 9:00 - 12:00, 13:00 - 18:00
-               workinghours fri 9:00 - 12:00, 13:00 - 18:00
+               workinghours mon 9:00 - 17:00
+               workinghours tue 9:00 - 17:00
+               workinghours wed 9:00 - 17:00
+               workinghours thu 9:00 - 17:00
+               workinghours fri 9:00 - 17:00
                workinghours sat off
 }