wip #6100 @1

diff --git a/app/Fluidbook/Stats.php b/app/Fluidbook/Stats.php
index ec4081fea6af20697e2aff25f3956cf4e9c77ebf..f1e2dec577723c41fae79f58bfd1a1a32fcfadb4 100644 (file)
--- a/app/Fluidbook/Stats.php
+++ b/app/Fluidbook/Stats.php
@@ -509,7 +509,7 @@ class Stats extends Reporting
     {
         $this->setCacheDuration(1);
 
-        $types = ['slideshow' => ['show'], 'video' => ['play'], 'youtube' => ['play'], 'dailymotion' => ['play'], 'vimeo' => ['show']];
+        $types = ['slideshow' => ['show'], 'video' => ['play'], 'youtube' => ['play'], 'dailymotion' => ['play'], 'vimeo' => ['show'], 'popup_image' => ['show'], 'popup_multimedia' => ['show']];
         $undefined = ['Nom d\'évènement indéfini'];
 
         $res = [];
@@ -518,7 +518,7 @@ class Stats extends Reporting
         $data = $this->apiCall('Events.getCategory', ['flat' => 1, 'expanded' => 1, 'secondaryDimension' => 'eventName']);
         foreach ($data as $day => $events) {
             foreach ($events as $event) {
-                if(!isset($event['Events_EventName'])){
+                if (!isset($event['Events_EventName'])) {
                     continue;
                 }
                 if (!isset($types[$event['Events_EventCategory']])) {

diff --git a/resources/views/fluidbook_stats/stats.blade.php b/resources/views/fluidbook_stats/stats.blade.php
index 8b724b46c5174f77254d1ad6e093e6edc789477b..671ada0534d6517f6e94370ddb267ae368069605 100644 (file)
--- a/resources/views/fluidbook_stats/stats.blade.php
+++ b/resources/views/fluidbook_stats/stats.blade.php
@@ -148,7 +148,7 @@
                     <tr>
                         @foreach (array_keys($table_map['summary']) as $summary_key)
                             <td data-name="{{ $summary_key }}"
-                                @if($summary_key === 'formatted_date')sorttable_customkey="{{ $period_data['raw_date'] }}"@endif>
+                                @if($summary_key === 'formatted_date') sorttable_customkey="{{ $period_data['raw_date'] }}" @endif>
                                 @if(isset($period_data[$summary_key]))
                                     {!! is_int($period_data[$summary_key]) ? $formatter->format($period_data[$summary_key]) : $period_data[$summary_key] !!}
                                 @else
@@ -195,18 +195,23 @@
             @if($multimedia->isNotEmpty())
                 @php
                     $icons=[
-                        'slideshow'=>'las la-image',
+                        'slideshow'=>'las la-images',
                         'video'=>'las la-video',
                         'youtube'=>'lab la-youtube',
                         'dailymotion'=>'las la-film',
                         'vimeo'=>'lab la-vimeo',
+                        'popup_image'=>'las la-image',
+                        'popup_multimedia'=>'las la-photo-video',
                     ];
 
-                    $tooltips=[ 'slideshow'=>__('Diaporama'),
+                    $tooltips=[
+                        'slideshow'=>__('Diaporama'),
                         'video'=>__('Vidéo locale'),
                         'youtube'=>__('Youtube'),
                         'dailymotion'=>__('Dailymotion'),
                         'vimeo'=>__('Vimeo'),
+                        'popup_image'=>__('Popup image'),
+                        'popup_multimedia'=>__('Popup multimedia'),
                         ];
                 @endphp