wip #6934 @0.5

diff --git a/app/Fluidbook/Stats.php b/app/Fluidbook/Stats.php
index 011f8cb43d0b165eb17542ced1a135ee641bc936..68841ba0c233cd66825f3ae501ada9522db29149 100644 (file)
--- a/app/Fluidbook/Stats.php
+++ b/app/Fluidbook/Stats.php
@@ -228,7 +228,7 @@ class Stats extends Reporting
         $this->viewData->countries = $this->_processCountries();
         $this->viewData->multimedia = $this->_processMultimedia();
         $this->viewData->shareDetails = $this->_processShareDetails();
-        $this->viewData->users = $this->_processUsers();
+        $this->viewData->setRaw('users', $this->_processUsers());
 
         //=== MAIN PERIOD STATISTICS
         // These are the main statistics used to build the chart and the table below it.

diff --git a/resources/views/fluidbook_stats/stats.blade.php b/resources/views/fluidbook_stats/stats.blade.php
index 0fcaa1ef35653ae99cd61215a3d0f8818c83ac11..bf645f916612e7df760c795dc4c9d437acd2f119 100644 (file)
--- a/resources/views/fluidbook_stats/stats.blade.php
+++ b/resources/views/fluidbook_stats/stats.blade.php
@@ -328,8 +328,6 @@
                         </table>
                     </div>
                 @endif
-
-
             </div>
 
             @if($users)
@@ -347,8 +345,8 @@
                         <tbody>
                         @foreach($users as $userId => $user)
                             <tr>
-                                <td class="whitespace-nowrap" data-sort-value="{{ $user['userid'] }}">
-                                    {{ $user['userid'] }}
+                                <td class="whitespace-nowrap" data-sort-value="{{ $userId }}">
+                                    {{ $userId }}
                                 </td>
                                 <td>{{ $formatter->format($user['nb_visits']) }}</td>
                                 <td class="user-pages" data-excel-content="{{implode(', ',$user['pages'])}}">
@@ -362,7 +360,6 @@
                         </tbody>
                     </table>
                 </div>
-
             @endif
             {{-- It's possible for there to be no statistics returned by the API --}}
         @else