Merge pull request #358 from afup/correction-retour-rapport

Correction retour rapport
afup · Mar 25, 2021 · 35c35a9 · 35c35a9
2 parents 542f632 + bf7835a
commit 35c35a9
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 6 deletions.
diff --git 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
@@ -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
@@ -9,6 +9,7 @@
     <meta property="og:url" content="{{ absolute_url('/report/'~campaignName) }}" />
     <meta property="og:description" content="Les résultats du baromètre des salaires en PHP {{ campaignName }} sont disponibles. Consultez les résultats de l’enquête de référence pour le milieu PHP menée par l’AFUP et le JDN" />
     <meta property="og:site_name" content="Baromètre des salaires - AFUP / JDN" />
+    <meta property="og:image" content="{{ grunt_asset('logos/logo-barometre-blanc.png') }}" />
 {% 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
@@ -11,7 +11,7 @@
     <tbody>
     {% for row in results %}
         <tr>
-            <td>{{ row.containerEnvironmentUsage }}</td>
+            <td>{{ row.containerEnvironmentUsage|default("Non répondu") }}</td>
             <td class="text-right">{{ row.nbResponse }}</td>
         </tr>
     {% 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
@@ -1,11 +1,11 @@
-<table class="highchart" data-graph-container-before="1" data-graph-type="line" style="display:none">
+<table class="highchart evolution-line" data-graph-container-before="1" data-graph-type="line" style="display:none">
     <thead>
     <tr>
         <th>Salaire</th>
         <th>Moyenne</th>
-        <th>10ème percentile</th>
-        <th>Médiane</th>
-        <th>90ème percentile</th>
+        <th data-graph-dash-style="shortdashdot">10ème percentile</th>
+        <th data-graph-dash-style="longdash">Médiane</th>
+        <th data-graph-dash-style="dot">90ème percentile</th>
     </tr>
     </thead>
     <tbody>

diff --git a/web/report/2020/evolution_des_salaires.png b/web/report/2020/evolution_des_salaires.png
diff --git a/web/report/2020/evolution_des_salaires_plus_experimentes.png b/web/report/2020/evolution_des_salaires_plus_experimentes.png