diff --git a/src/schedule-2.0/src/Controller/BudgetController.php b/src/schedule-2.0/src/Controller/BudgetController.php index a92b271..5ffb958 100755 --- a/src/schedule-2.0/src/Controller/BudgetController.php +++ b/src/schedule-2.0/src/Controller/BudgetController.php @@ -22,6 +22,15 @@ class BudgetController extends AbstractController { $em = $this->getDoctrine()->getManager(); + // Rechercher de l'ensemble des exercices sauf du premier + $years = $em + ->createQueryBuilder('year') + ->select('year') + ->from('App:Year','year') + ->orderBy('year.start') + ->setFirstResult(1) + ->getQuery()->getResult(); + // Rechercher l'exercice demandé sinon le dernier if($id) $n2=$em->getRepository("App:Year")->find($id); @@ -253,7 +262,9 @@ class BudgetController extends AbstractController "domaines" => $tbdomaines, "n1" => $n1, "n2" => $n2, + "years" => $years, "fgprint" => true, + ]); return new PdfResponse( @@ -267,7 +278,8 @@ class BudgetController extends AbstractController "usesidebar" => true, "domaines" => $tbdomaines, "n1" => $n1, - "n2" => $n2, + "n2" => $n2, + "years" => $years, ]); } } @@ -304,7 +316,7 @@ class BudgetController extends AbstractController if(!$data) { $data=new Yeardomaine; $data->setYear($year); - $data->setProject($domaine); + $data->setDomaine($domaine); $em->persist($data); $em->flush(); } diff --git a/src/schedule-2.0/src/Entity/Yeardomaine.php b/src/schedule-2.0/src/Entity/Yeardomaine.php index 3b28db6..34c5b32 100644 --- a/src/schedule-2.0/src/Entity/Yeardomaine.php +++ b/src/schedule-2.0/src/Entity/Yeardomaine.php @@ -33,17 +33,17 @@ class Yeardomaine /** * @ORM\Column(type="integer") */ - private $nbdaybudget; + private $nbdaybudget=0; /** * @ORM\Column(type="integer") */ - private $cabudget; + private $cabudget=0; /** * @ORM\Column(type="integer") */ - private $careal; + private $careal=0; public function getId(): ?int { diff --git a/src/schedule-2.0/src/Form/YeardomaineType.php b/src/schedule-2.0/src/Form/YeardomaineType.php new file mode 100644 index 0000000..4a88398 --- /dev/null +++ b/src/schedule-2.0/src/Form/YeardomaineType.php @@ -0,0 +1,63 @@ +add('submit', + SubmitType::class, [ + "label" => "Valider", + "attr" => ["class" => "btn btn-success no-print"], + ] + ); + + $builder->add('nbdaybudget', + IntegerType::class, [ + "label" =>"Nombre de jours prévus pour l'exercice" + ] + ); + + $builder->add('cabudget', + IntegerType::class, [ + "label" =>"Budget prévu pour l'exercice" + ] + ); + + $builder->add('careal', + IntegerType::class, [ + "label" =>"Budget réel pour l'exercice" + ] + ); + } + + public function configureOptions(OptionsResolver $resolver) + { + $resolver->setDefaults(array( + 'data_class' => 'App\Entity\Yeardomaine', + 'mode' => 'string', + )); + } +} diff --git a/src/schedule-2.0/templates/Budget/list.html.twig b/src/schedule-2.0/templates/Budget/list.html.twig index 6901340..8501cae 100644 --- a/src/schedule-2.0/templates/Budget/list.html.twig +++ b/src/schedule-2.0/templates/Budget/list.html.twig @@ -10,15 +10,40 @@ } tr { page-break-inside: avoid; } {%endif%} + .group td{ + font-size:120%; + text-transform: uppercase; + background-color:#212529; + color:#ffffff; + } + + .total td{ + font-size:120%; + background-color:#cdcdcd; + font-weight: bold; + } + {% endblock %} {% block body %}