Merge branch 'master' into dist/eole/2.8.1/master
This commit is contained in:
commit
7a6aea2238
|
@ -146,7 +146,10 @@ class BreakdayCommand extends Command
|
||||||
$data->setIsbreakday(true);
|
$data->setIsbreakday(true);
|
||||||
$data->setName($event->taskname);
|
$data->setName($event->taskname);
|
||||||
$data->setDatestart(clone $manip);
|
$data->setDatestart(clone $manip);
|
||||||
|
$data->setIstelework(false);
|
||||||
|
$data->setIspenaltypassive(false);
|
||||||
|
$data->setIspenaltyactive(false);
|
||||||
|
|
||||||
$manip->add(new \DateInterval("PT7H"));
|
$manip->add(new \DateInterval("PT7H"));
|
||||||
$data->setDateend(clone $manip);
|
$data->setDateend(clone $manip);
|
||||||
$this->em->persist($data);
|
$this->em->persist($data);
|
||||||
|
@ -194,6 +197,9 @@ class BreakdayCommand extends Command
|
||||||
$data->setIsbreakday(true);
|
$data->setIsbreakday(true);
|
||||||
$data->setName("AM = ".$event->taskname);
|
$data->setName("AM = ".$event->taskname);
|
||||||
$data->setDatestart(clone $manip);
|
$data->setDatestart(clone $manip);
|
||||||
|
$data->setIstelework(false);
|
||||||
|
$data->setIspenaltypassive(false);
|
||||||
|
$data->setIspenaltyactive(false);
|
||||||
|
|
||||||
$manip->add(new \DateInterval("PT3H"));
|
$manip->add(new \DateInterval("PT3H"));
|
||||||
$manip->add(new \DateInterval("PT30M"));
|
$manip->add(new \DateInterval("PT30M"));
|
||||||
|
@ -241,8 +247,11 @@ class BreakdayCommand extends Command
|
||||||
$data->setValidatemaster(false);
|
$data->setValidatemaster(false);
|
||||||
$data->setIsbreakday(true);
|
$data->setIsbreakday(true);
|
||||||
$data->setName("PM = ".$event->taskname);
|
$data->setName("PM = ".$event->taskname);
|
||||||
$data->setDatestart(clone $manip);
|
$data->setDatestart(clone $manip);
|
||||||
|
$data->setIstelework(false);
|
||||||
|
$data->setIspenaltypassive(false);
|
||||||
|
$data->setIspenaltyactive(false);
|
||||||
|
|
||||||
$manip->add(new \DateInterval("PT3H"));
|
$manip->add(new \DateInterval("PT3H"));
|
||||||
$manip->add(new \DateInterval("PT30M"));
|
$manip->add(new \DateInterval("PT30M"));
|
||||||
$data->setDateend(clone $manip);
|
$data->setDateend(clone $manip);
|
||||||
|
|
Loading…
Reference in New Issue