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 %}

BUDGET -

- -

Ajouter

+ +
+ + + +
+
Budget @@ -26,7 +51,7 @@ BUDGET
- +
@@ -35,10 +60,10 @@ BUDGET - + - + @@ -117,7 +142,7 @@ BUDGET - + @@ -192,7 +217,7 @@ BUDGET {% block localjavascript %} $(document).ready(function() { - var groupColumn = 1; + var groupColumn = 0; var table = $('#dataTables').DataTable({ "columnDefs": [ { "visible": false, "targets": groupColumn } @@ -207,7 +232,7 @@ BUDGET api.column(groupColumn, {page:'current'} ).data().each( function ( group, i ) { if ( last !== group ) { $(rows).eq( i ).before( - '' + '' ); last = group; @@ -226,6 +251,13 @@ BUDGET table.order( [ groupColumn, 'asc' ] ).draw(); } } ); + + $('#exercice').change(function() { + id=$(this).val(); + url="{{ path('app_budget',{id:'xxx'}) }}"; + url=url.replace("xxx",id); + document.location=url; + }); }); function myprint() { diff --git a/src/schedule-2.0/templates/base.html.twig b/src/schedule-2.0/templates/base.html.twig index 4e56820..f57b386 100644 --- a/src/schedule-2.0/templates/base.html.twig +++ b/src/schedule-2.0/templates/base.html.twig @@ -227,7 +227,7 @@ {% set routeignore = ["app_home","app_event","app_customer_submit","app_project_submit","app_offer_submit","app_task_submit","app_service_submit","app_user_submit","app_nature_submit","app_nature_update","app_job_submit","app_breakday_submit","app_breakday_update"] %} {% if app.request.attributes.get('_route') not in routeignore %}
  • - +
  • {%endif%}
    Domaine{{n2.start|date("m/Y")}}
    Réel Budget Réel Budget
    Hors Projet - + {{(domaine.nbdayrealn1-nbdayrealn1)}} jours
    @@ -133,7 +158,7 @@ BUDGET
    - + {{(domaine.nbdayrealn2-nbdayrealn2)}} jours
    @@ -150,7 +175,7 @@ BUDGET
    {{domaine.name}} TOTAL
    '+group+'
    '+group+'