test/TestSuite/Scheduler/Correct/Allocate.tjp in taskjuggler-0.0.6 vs test/TestSuite/Scheduler/Correct/Allocate.tjp in taskjuggler-0.0.7

- old
+ new

@@ -3,15 +3,25 @@ macro Fixend [ minend ${1} maxend ${1} ] +shift mowefr "Mo, We, Fr shift" { + workinghours mon, wed, fri 9:00 - 12:00, 13:00 - 18:00 + workinghours tue, thu, sat off +} +shift tuthsa "Tu, Th, Sa shift" { + workinghours tue, thu, sat 9:00 - 12:00, 13:00 - 18:00 + workinghours mon, wed, fri off +} + resource tue_off "Tuesday off" { workinghours mon, wed - fri 10:00 - 18:00 workinghours tue, sat, sun off } resource all_days "All days" +resource all_days2 "All days2" resource only_wed "Only Wednesday" { workinghours sun - sat off resource ow1 "Monday off" { workinghours sun, mon, sat off @@ -51,10 +61,12 @@ } } resource r1 "Resource 1" resource r2 "Resource 2" +resource r3 "Resource 3" +resource r4 "Resource 4" task inheritedAllocs "Inherited Allocations" { allocate r1 task t1 "Task 1" { effort 3d @@ -75,9 +87,16 @@ task t3 "Task 3" { effort 2d depends !t2 ${Fixend "2007-09-10-18:00"} } +} + +task allocShift "Allocation Shift" { + effort 10d + allocate r3 { shift mowefr 2007-09-01 +1w } + allocate r4 { shift tuthsa 2007-09-01 +1w } + ${Fixend "2007-09-11-14:00"} } taskreport allocate "Allocate" { formats html columns no, name, end, daily