test/TestSuite/Export-Reports/refs/Limits-1.tjp in taskjuggler-0.0.11 vs test/TestSuite/Export-Reports/refs/Limits-1.tjp in taskjuggler-0.1.0

- old
+ new

@@ -1,8 +1,9 @@ project limits "Limits" "1.0" 2007-03-01-00:00-+0000 - 2008-02-29-00:00-+0000 { timezone "Europe/Amsterdam" scenario plan "Plan Scenario" { + active yes } } projectids limits @@ -14,24 +15,24 @@ end 2007-05-07-09:00-+0000 scheduling asap scheduled } task t2 "Task 2" { - start 2007-03-30-11:00-+0000 - end 2007-05-01-13:00-+0000 + start 2007-03-30-10:00-+0000 + end 2007-05-01-12:00-+0000 scheduling asap scheduled } task t3 "Task 3" { - start 2007-05-01-13:00-+0000 - end 2007-06-04-14:00-+0000 + start 2007-05-01-12:00-+0000 + end 2007-06-04-13:00-+0000 scheduling asap scheduled } task t4 "Task 4" { start 2007-05-09-09:00-+0000 - end 2007-06-07-14:00-+0000 + end 2007-06-07-13:00-+0000 scheduling asap scheduled } task t5 "Task 5" { start 2007-03-01-00:00-+0000 @@ -81,81 +82,62 @@ 2007-05-07-07:00-+0000 + 2.0h { overtime 2 } priority 500 projectid limits } supplement task t2 { - booking r2 2007-03-30-11:00-+0000 + 5.0h, - 2007-04-02-11:00-+0000 + 5.0h, - 2007-04-03-11:00-+0000 + 5.0h, - 2007-04-04-11:00-+0000 + 5.0h, - 2007-04-05-11:00-+0000 + 2.0h, - 2007-04-09-11:00-+0000 + 5.0h, - 2007-04-10-11:00-+0000 + 5.0h, - 2007-04-11-11:00-+0000 + 5.0h, - 2007-04-12-11:00-+0000 + 2.0h, - 2007-04-16-11:00-+0000 + 5.0h, - 2007-04-17-11:00-+0000 + 5.0h, - 2007-04-18-11:00-+0000 + 5.0h, - 2007-04-19-11:00-+0000 + 2.0h, - 2007-04-23-11:00-+0000 + 5.0h, - 2007-04-24-11:00-+0000 + 5.0h, - 2007-04-25-11:00-+0000 + 5.0h, - 2007-04-26-11:00-+0000 + 2.0h, - 2007-04-30-11:00-+0000 + 5.0h, - 2007-05-01-11:00-+0000 + 2.0h { overtime 2 } + booking r2 2007-03-30-10:00-+0000 + 5.0h, + 2007-04-02-10:00-+0000 + 5.0h, + 2007-04-03-10:00-+0000 + 5.0h, + 2007-04-04-10:00-+0000 + 5.0h, + 2007-04-05-10:00-+0000 + 2.0h, + 2007-04-09-10:00-+0000 + 5.0h, + 2007-04-10-10:00-+0000 + 5.0h, + 2007-04-11-10:00-+0000 + 5.0h, + 2007-04-12-10:00-+0000 + 2.0h, + 2007-04-16-10:00-+0000 + 5.0h, + 2007-04-17-10:00-+0000 + 5.0h, + 2007-04-18-10:00-+0000 + 5.0h, + 2007-04-19-10:00-+0000 + 2.0h, + 2007-04-23-10:00-+0000 + 5.0h, + 2007-04-24-10:00-+0000 + 5.0h, + 2007-04-25-10:00-+0000 + 5.0h, + 2007-04-26-10:00-+0000 + 2.0h, + 2007-04-30-10:00-+0000 + 5.0h, + 2007-05-01-10:00-+0000 + 2.0h { overtime 2 } priority 500 projectid limits } supplement task t3 { - booking r2 2007-05-01-13:00-+0000 + 3.0h, - 2007-05-02-11:00-+0000 + 5.0h, - 2007-05-03-11:00-+0000 + 2.0h, - 2007-05-07-09:00-+0000 + 1.0h, - 2007-05-07-11:00-+0000 + 5.0h, - 2007-05-08-07:00-+0000 + 3.0h, - 2007-05-08-11:00-+0000 + 5.0h, + booking r2 2007-05-01-12:00-+0000 + 3.0h, + 2007-05-02-10:00-+0000 + 5.0h, + 2007-05-03-10:00-+0000 + 2.0h, + 2007-05-07-09:00-+0000 + 6.0h, + 2007-05-08-07:00-+0000 + 8.0h, 2007-05-09-07:00-+0000 + 2.0h, - 2007-05-14-07:00-+0000 + 3.0h, - 2007-05-14-11:00-+0000 + 5.0h, - 2007-05-15-07:00-+0000 + 3.0h, - 2007-05-15-11:00-+0000 + 5.0h, - 2007-05-21-07:00-+0000 + 3.0h, - 2007-05-21-11:00-+0000 + 5.0h, - 2007-05-22-07:00-+0000 + 3.0h, - 2007-05-22-11:00-+0000 + 5.0h, - 2007-05-28-07:00-+0000 + 3.0h, - 2007-05-28-11:00-+0000 + 5.0h, - 2007-05-29-07:00-+0000 + 3.0h, - 2007-05-29-11:00-+0000 + 5.0h, - 2007-06-04-07:00-+0000 + 3.0h, - 2007-06-04-11:00-+0000 + 3.0h { overtime 2 } + 2007-05-14-07:00-+0000 + 8.0h, + 2007-05-15-07:00-+0000 + 8.0h, + 2007-05-21-07:00-+0000 + 8.0h, + 2007-05-22-07:00-+0000 + 8.0h, + 2007-05-28-07:00-+0000 + 8.0h, + 2007-05-29-07:00-+0000 + 8.0h, + 2007-06-04-07:00-+0000 + 6.0h { overtime 2 } priority 500 projectid limits } supplement task t4 { - booking r2 2007-05-09-09:00-+0000 + 1.0h, - 2007-05-09-11:00-+0000 + 5.0h, - 2007-05-10-07:00-+0000 + 3.0h, - 2007-05-10-11:00-+0000 + 5.0h, - 2007-05-16-07:00-+0000 + 3.0h, - 2007-05-16-11:00-+0000 + 5.0h, - 2007-05-17-07:00-+0000 + 3.0h, - 2007-05-17-11:00-+0000 + 5.0h, - 2007-05-23-07:00-+0000 + 3.0h, - 2007-05-23-11:00-+0000 + 5.0h, + booking r2 2007-05-09-09:00-+0000 + 6.0h, + 2007-05-10-07:00-+0000 + 8.0h, + 2007-05-16-07:00-+0000 + 8.0h, + 2007-05-17-07:00-+0000 + 8.0h, + 2007-05-23-07:00-+0000 + 8.0h, 2007-05-24-07:00-+0000 + 2.0h, - 2007-05-30-07:00-+0000 + 3.0h, - 2007-05-30-11:00-+0000 + 5.0h, - 2007-05-31-07:00-+0000 + 3.0h, - 2007-05-31-11:00-+0000 + 5.0h, - 2007-06-04-14:00-+0000 + 2.0h, - 2007-06-05-07:00-+0000 + 3.0h, - 2007-06-05-11:00-+0000 + 5.0h, - 2007-06-06-07:00-+0000 + 3.0h, - 2007-06-06-11:00-+0000 + 5.0h, - 2007-06-07-07:00-+0000 + 3.0h, - 2007-06-07-11:00-+0000 + 3.0h { overtime 2 } + 2007-05-30-07:00-+0000 + 8.0h, + 2007-05-31-07:00-+0000 + 8.0h, + 2007-06-04-13:00-+0000 + 2.0h, + 2007-06-05-07:00-+0000 + 8.0h, + 2007-06-06-07:00-+0000 + 8.0h, + 2007-06-07-07:00-+0000 + 6.0h { overtime 2 } priority 500 projectid limits } supplement task t5 { booking r1 2007-03-01-08:00-+0000 + 2.0h, @@ -180,50 +162,30 @@ 2007-04-23-07:00-+0000 + 2.0h { overtime 2 } priority 500 projectid limits } supplement task t6 { - booking r2 2007-03-01-08:00-+0000 + 3.0h, - 2007-03-01-12:00-+0000 + 1.0h, - 2007-03-02-08:00-+0000 + 3.0h, - 2007-03-02-12:00-+0000 + 1.0h, - 2007-03-05-08:00-+0000 + 3.0h, - 2007-03-05-12:00-+0000 + 1.0h, - 2007-03-06-08:00-+0000 + 3.0h, - 2007-03-06-12:00-+0000 + 1.0h, - 2007-03-07-08:00-+0000 + 3.0h, - 2007-03-07-12:00-+0000 + 1.0h, - 2007-03-08-08:00-+0000 + 3.0h, - 2007-03-08-12:00-+0000 + 1.0h, - 2007-03-09-08:00-+0000 + 3.0h, - 2007-03-09-12:00-+0000 + 1.0h, - 2007-03-12-08:00-+0000 + 3.0h, - 2007-03-12-12:00-+0000 + 1.0h, - 2007-03-13-08:00-+0000 + 3.0h, - 2007-03-13-12:00-+0000 + 1.0h, - 2007-03-14-08:00-+0000 + 3.0h, - 2007-03-14-12:00-+0000 + 1.0h, - 2007-03-15-08:00-+0000 + 3.0h, - 2007-03-15-12:00-+0000 + 1.0h, - 2007-03-16-08:00-+0000 + 3.0h, - 2007-03-16-12:00-+0000 + 1.0h, - 2007-03-19-08:00-+0000 + 3.0h, - 2007-03-19-12:00-+0000 + 1.0h, - 2007-03-20-08:00-+0000 + 3.0h, - 2007-03-20-12:00-+0000 + 1.0h, - 2007-03-21-08:00-+0000 + 3.0h, - 2007-03-21-12:00-+0000 + 1.0h, - 2007-03-22-08:00-+0000 + 3.0h, - 2007-03-22-12:00-+0000 + 1.0h, - 2007-03-23-08:00-+0000 + 3.0h, - 2007-03-23-12:00-+0000 + 1.0h, - 2007-03-26-07:00-+0000 + 3.0h, - 2007-03-26-11:00-+0000 + 1.0h, - 2007-03-27-07:00-+0000 + 3.0h, - 2007-03-27-11:00-+0000 + 1.0h, - 2007-03-28-07:00-+0000 + 3.0h, - 2007-03-28-11:00-+0000 + 1.0h { overtime 2 } + booking r2 2007-03-01-08:00-+0000 + 4.0h, + 2007-03-02-08:00-+0000 + 4.0h, + 2007-03-05-08:00-+0000 + 4.0h, + 2007-03-06-08:00-+0000 + 4.0h, + 2007-03-07-08:00-+0000 + 4.0h, + 2007-03-08-08:00-+0000 + 4.0h, + 2007-03-09-08:00-+0000 + 4.0h, + 2007-03-12-08:00-+0000 + 4.0h, + 2007-03-13-08:00-+0000 + 4.0h, + 2007-03-14-08:00-+0000 + 4.0h, + 2007-03-15-08:00-+0000 + 4.0h, + 2007-03-16-08:00-+0000 + 4.0h, + 2007-03-19-08:00-+0000 + 4.0h, + 2007-03-20-08:00-+0000 + 4.0h, + 2007-03-21-08:00-+0000 + 4.0h, + 2007-03-22-08:00-+0000 + 4.0h, + 2007-03-23-08:00-+0000 + 4.0h, + 2007-03-26-07:00-+0000 + 4.0h, + 2007-03-27-07:00-+0000 + 4.0h, + 2007-03-28-07:00-+0000 + 4.0h { overtime 2 } priority 500 projectid limits } supplement task t7 { booking r1 2007-06-20-07:00-+0000 + 2.0h, @@ -234,50 +196,40 @@ 2007-06-27-07:00-+0000 + 2.0h, 2007-07-02-07:00-+0000 + 2.0h, 2007-07-03-07:00-+0000 + 2.0h, 2007-07-04-07:00-+0000 + 2.0h, 2007-07-09-07:00-+0000 + 2.0h { overtime 2 } - booking r2 2007-06-20-07:00-+0000 + 3.0h, - 2007-06-20-11:00-+0000 + 5.0h, - 2007-06-21-07:00-+0000 + 3.0h, - 2007-06-21-11:00-+0000 + 5.0h, - 2007-06-22-07:00-+0000 + 3.0h, - 2007-06-22-11:00-+0000 + 5.0h, - 2007-06-25-07:00-+0000 + 3.0h, - 2007-06-25-11:00-+0000 + 5.0h, - 2007-06-26-07:00-+0000 + 3.0h, - 2007-06-26-11:00-+0000 + 5.0h, - 2007-06-27-07:00-+0000 + 3.0h, - 2007-06-27-11:00-+0000 + 5.0h, - 2007-06-28-07:00-+0000 + 3.0h, - 2007-06-28-11:00-+0000 + 5.0h, - 2007-07-02-07:00-+0000 + 3.0h, - 2007-07-02-11:00-+0000 + 5.0h, - 2007-07-03-07:00-+0000 + 3.0h, - 2007-07-03-11:00-+0000 + 5.0h, - 2007-07-04-07:00-+0000 + 3.0h, - 2007-07-04-11:00-+0000 + 5.0h, - 2007-07-05-07:00-+0000 + 3.0h, - 2007-07-05-11:00-+0000 + 5.0h, - 2007-07-09-07:00-+0000 + 3.0h, - 2007-07-09-11:00-+0000 + 5.0h { overtime 2 } + booking r2 2007-06-20-07:00-+0000 + 6.0h, + 2007-06-21-07:00-+0000 + 6.0h, + 2007-06-22-07:00-+0000 + 6.0h, + 2007-06-25-07:00-+0000 + 6.0h, + 2007-06-26-07:00-+0000 + 6.0h, + 2007-06-27-07:00-+0000 + 6.0h, + 2007-06-28-07:00-+0000 + 6.0h, + 2007-06-29-07:00-+0000 + 6.0h, + 2007-07-02-07:00-+0000 + 6.0h, + 2007-07-03-07:00-+0000 + 6.0h, + 2007-07-04-07:00-+0000 + 6.0h, + 2007-07-05-07:00-+0000 + 6.0h, + 2007-07-06-07:00-+0000 + 6.0h, + 2007-07-09-07:00-+0000 + 6.0h { overtime 2 } priority 500 projectid limits } 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 }