diff --git a/.php_cs.dist b/.php_cs.dist index bbd1a73f..f55868bd 100644 --- a/.php_cs.dist +++ b/.php_cs.dist @@ -23,6 +23,10 @@ return PhpCsFixer\Config::create() 'psr0' => false, 'single_line_throw' => false, 'simplified_null_return' => false, - 'yoda_style' => null, + 'yoda_style' => [ + 'equal' => null, + 'identical' => null, + 'less_and_greater' => null, + ], ]) ; diff --git a/src/Afup/BarometreBundle/Resources/assets/js/charts.js b/src/Afup/BarometreBundle/Resources/assets/js/charts.js index eff8ec1c..c23ba0ca 100644 --- a/src/Afup/BarometreBundle/Resources/assets/js/charts.js +++ b/src/Afup/BarometreBundle/Resources/assets/js/charts.js @@ -62,6 +62,14 @@ $(document).ready(function () { }; } + if ($(this).hasClass('evolution-line')) { + highChartConfig.series.forEach(function(item) { + item.marker = { + enabled: true + }; + }); + } + if ($(this).data('graph-datalabels-format')) { highChartConfig.plotOptions.series.dataLabels = { useHTML: true, diff --git a/src/Afup/BarometreBundle/Resources/views/Campaign/report2020.html.twig b/src/Afup/BarometreBundle/Resources/views/Campaign/report2020.html.twig index 4e1f0c30..40860264 100644 --- a/src/Afup/BarometreBundle/Resources/views/Campaign/report2020.html.twig +++ b/src/Afup/BarometreBundle/Resources/views/Campaign/report2020.html.twig @@ -9,6 +9,7 @@ + {% endblock %} diff --git a/src/Afup/BarometreBundle/Resources/views/Report/container_environment_report.html.twig b/src/Afup/BarometreBundle/Resources/views/Report/container_environment_report.html.twig index d848c5dc..b3c54b73 100644 --- a/src/Afup/BarometreBundle/Resources/views/Report/container_environment_report.html.twig +++ b/src/Afup/BarometreBundle/Resources/views/Report/container_environment_report.html.twig @@ -11,7 +11,7 @@ {% for row in results %} - {{ row.containerEnvironmentUsage }} + {{ row.containerEnvironmentUsage|default("Non répondu") }} {{ row.nbResponse }} {% endfor %} diff --git a/src/Afup/BarometreBundle/Resources/views/Report/salary_evolution.html.twig b/src/Afup/BarometreBundle/Resources/views/Report/salary_evolution.html.twig index 4a83badd..3d877dcd 100644 --- a/src/Afup/BarometreBundle/Resources/views/Report/salary_evolution.html.twig +++ b/src/Afup/BarometreBundle/Resources/views/Report/salary_evolution.html.twig @@ -1,11 +1,11 @@ - + - - - + + + diff --git a/web/report/2020/evolution_des_salaires.png b/web/report/2020/evolution_des_salaires.png index 0c396d7f..29b126b7 100644 Binary files a/web/report/2020/evolution_des_salaires.png and b/web/report/2020/evolution_des_salaires.png differ diff --git a/web/report/2020/evolution_des_salaires_plus_experimentes.png b/web/report/2020/evolution_des_salaires_plus_experimentes.png index 4bfb1d1c..baa1bf34 100644 Binary files a/web/report/2020/evolution_des_salaires_plus_experimentes.png and b/web/report/2020/evolution_des_salaires_plus_experimentes.png differ