diff --git a/src/schedule-2.0/src/Controller/BudgetController.php b/src/schedule-2.0/src/Controller/BudgetController.php index 5ffb958..0c0506f 100755 --- a/src/schedule-2.0/src/Controller/BudgetController.php +++ b/src/schedule-2.0/src/Controller/BudgetController.php @@ -117,9 +117,11 @@ class BudgetController extends AbstractController ->andWhere('event.task=task') ->andWhere('event.start >=:start') ->andWhere('event.end <=:end') + ->andWhere('event.validate=:validate') ->setParameter('domaine',$domaine) ->setParameter('start',$startn1) ->setParameter('end',$endn1) + ->setParameter('validate',true) ->getQuery()->getResult(); $tbdomaines[$domaine->getId()]["nbdayrealn1"]=($events[0]["somme"]?$events[0]["somme"]:0); $tbdomaines[$domaine->getId()]["nbetprealn1"]=$tbdomaines[$domaine->getId()]["nbdayrealn1"]/$n1->getNbday(); @@ -148,9 +150,11 @@ class BudgetController extends AbstractController ->andWhere('event.task=task') ->andWhere('event.start >=:start') ->andWhere('event.end <=:end') + ->andWhere('event.validate=:validate') ->setParameter('domaine',$domaine) ->setParameter('start',$startn2) ->setParameter('end',$endn2) + ->setParameter('validate',true) ->getQuery()->getResult(); $tbdomaines[$domaine->getId()]["nbdayrealn2"]=($events[0]["somme"]?$events[0]["somme"]:0); $tbdomaines[$domaine->getId()]["nbetprealn2"]=$tbdomaines[$domaine->getId()]["nbdayrealn2"]/$n2->getNbday(); @@ -198,9 +202,11 @@ class BudgetController extends AbstractController ->andWhere('event.task=task') ->andWhere('event.start >=:start') ->andWhere('event.end <=:end') + ->andWhere('event.validate=:validate') ->setParameter('project',$project) ->setParameter('start',$startn1) ->setParameter('end',$endn1) + ->setParameter('validate',true) ->getQuery()->getResult(); $nbdayrealn1=($events[0]["somme"]?$events[0]["somme"]:0); $tbdomaines[$domaine->getId()]["projects"][$project->getId()]["nbdayrealn1"]=$nbdayrealn1; @@ -230,9 +236,11 @@ class BudgetController extends AbstractController ->andWhere('event.task=task') ->andWhere('event.start >=:start') ->andWhere('event.end <=:end') + ->andWhere('event.validate=:validate') ->setParameter('project',$project) ->setParameter('start',$startn2) ->setParameter('end',$endn2) + ->setParameter('validate',true) ->getQuery()->getResult(); $nbdayrealn2=($events[0]["somme"]?$events[0]["somme"]:0); $tbdomaines[$domaine->getId()]["projects"][$project->getId()]["nbdayrealn2"]=$nbdayrealn2; diff --git a/src/schedule-2.0/src/Form/DomaineType.php b/src/schedule-2.0/src/Form/DomaineType.php index 0f4cc97..7d0b3bf 100644 --- a/src/schedule-2.0/src/Form/DomaineType.php +++ b/src/schedule-2.0/src/Form/DomaineType.php @@ -35,7 +35,7 @@ class DomaineType extends AbstractType $builder->add('category', ChoiceType::class, [ 'label' => "Catégorie", - 'choices' => array("Administratif" => "Administratif","Opérationnel" => "Opérationnel","Interne" => "Interne") + 'choices' => array("Frais"=>"Frais","Administratif" => "Administratif","Opérationnel" => "Opérationnel","Interne" => "Interne") ] ); diff --git a/src/schedule-2.0/templates/Budget/list.html.twig b/src/schedule-2.0/templates/Budget/list.html.twig index 8501cae..0a51b34 100644 --- a/src/schedule-2.0/templates/Budget/list.html.twig +++ b/src/schedule-2.0/templates/Budget/list.html.twig @@ -10,7 +10,7 @@ } tr { page-break-inside: avoid; } {%endif%} - .group td{ + .group td, .tbsynthese .tdtotalgene { font-size:120%; text-transform: uppercase; background-color:#212529; @@ -23,6 +23,10 @@ font-weight: bold; } + .tbsynthese .tbhide {display:none} + + + {% endblock %} {% block body %} @@ -44,26 +48,70 @@ BUDGET +
Domaine | +Projet | +{{n1.start|date("m/Y")}} | +{{n2.start|date("m/Y")}} | +||
---|---|---|---|---|---|
+ | Réel | +Budget | ++ | Réel | +Budget | +