Add translation strings for the dropdown list items

.github/workflows/build-container.yaml

@@ -12,7 +12,7 @@ jobs:
   build:
     name: Build Containers
     if: github.repository == 'xibosignage/xibo-cms'
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-22.04
     steps:
       - name: Checkout
         uses: actions/checkout@v1

.github/workflows/build-cypress.yaml

@@ -9,7 +9,7 @@ on:
 jobs:
   build:
     name: Build
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-22.04
     steps:
       - name: Checkout
         uses: actions/checkout@v1

.github/workflows/build-tag.yaml

@@ -9,7 +9,7 @@ jobs:
   build:
     name: Build Containers
     if: github.repository == 'xibosignage/xibo-cms'
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-22.04
     steps:
       - name: Checkout
         uses: actions/checkout@v1

.github/workflows/test-suite.yaml

@@ -8,7 +8,7 @@ on:
 jobs:
   test-suite:
     name: Build Containers and Run Tests
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-22.04
     steps:
       - name: Checkout
         uses: actions/checkout@v1

lib/Controller/Stats.php

@@ -24,6 +24,7 @@
 use Carbon\Carbon;
 use Slim\Http\Response as Response;
 use Slim\Http\ServerRequest as Request;
+use Xibo\Event\ConnectorReportEvent;
 use Xibo\Factory\DisplayFactory;
 use Xibo\Factory\DisplayGroupFactory;
 use Xibo\Factory\LayoutFactory;
@@ -90,13 +91,19 @@ public function __construct($store, $timeSeriesStore, $reportService, $displayFa
      */
     function displayReportPage(Request $request, Response $response)
     {
+        // ------------
+        // Dispatch an event to get connector reports
+        $event = new ConnectorReportEvent();
+        $this->getDispatcher()->dispatch($event, ConnectorReportEvent::$NAME);
+
         $data = [
             // List of Displays this user has permission for
             'defaults' => [
                 'fromDate' => Carbon::now()->subSeconds(86400 * 35)->format(DateFormatHelper::getSystemFormat()),
                 'fromDateOneDay' => Carbon::now()->subSeconds(86400)->format(DateFormatHelper::getSystemFormat()),
                 'toDate' => Carbon::now()->format(DateFormatHelper::getSystemFormat()),
-                'availableReports' => $this->reportService->listReports()
+                'availableReports' => $this->reportService->listReports(),
+                'connectorReports' => $event->getReports()
             ]
         ];
 

lib/Entity/ReportResult.php

@@ -41,6 +41,12 @@ class ReportResult implements \JsonSerializable
      */
     public $chart;
 
+    /**
+     * Error message
+     * @var null|string
+     */
+    public $error;
+
     /**
      * Metadata that is used in the report preview or in the email template
      * @var array
@@ -59,17 +65,20 @@ class ReportResult implements \JsonSerializable
      * @param array $table
      * @param int $recordsTotal
      * @param array $chart
+     * @param null|string $error
      */
     public function __construct(
         array $metadata = [],
         array $table = [],
         int   $recordsTotal = 0,
-        array $chart = []
+        array $chart = [],
+        string $error = null
     ) {
         $this->metadata = $metadata;
         $this->table = $table;
         $this->recordsTotal = $recordsTotal;
         $this->chart = $chart;
+        $this->error = $error;
 
         return $this;
     }
@@ -95,7 +104,8 @@ public function jsonSerialize()
             'metadata' => $this->metadata,
             'table' => $this->table,
             'recordsTotal' => $this->recordsTotal,
-            'chart' => $this->chart
+            'chart' => $this->chart,
+            'error' => $this->error
         ];
     }
 }

lib/Event/ConnectorReportEvent.php

@@ -0,0 +1,45 @@
+<?php
+/**
+ * Copyright (C) 2022 Xibo Signage Ltd
+ *
+ * Xibo - Digital Signage - http://www.xibo.org.uk
+ *
+ * This file is part of Xibo.
+ *
+ * Xibo is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * any later version.
+ *
+ * Xibo is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Xibo.  If not, see <http://www.gnu.org/licenses/>.
+ */
+namespace Xibo\Event;
+
+/**
+ * Event used to get list of connector reports
+ */
+class ConnectorReportEvent extends Event
+{
+    public static $NAME = 'connector.report.event';
+
+    /** @var array */
+    private $reports = [];
+
+    public function getReports()
+    {
+        return $this->reports;
+    }
+
+    public function addReports($reports)
+    {
+        $this->reports = array_merge_recursive($this->reports, $reports);
+
+        return $this;
+    }
+}

lib/Event/ReportDataEvent.php

@@ -21,6 +21,9 @@
  */
 namespace Xibo\Event;
 
+/**
+ * Event used to get report results
+ */
 class ReportDataEvent extends Event
 {
     public static $NAME = 'audience.report.data.event';

lib/Middleware/State.php

@@ -150,7 +150,7 @@ public static function setState(App $app, Request $request): Request
 
         // Register the report service
         $container->set('reportService', function (ContainerInterface $container) {
-            return new ReportService(
+            $reportService = new ReportService(
                 $container,
                 $container->get('store'),
                 $container->get('timeSeriesStore'),
@@ -159,6 +159,8 @@ public static function setState(App $app, Request $request): Request
                 $container->get('sanitizerService'),
                 $container->get('savedReportFactory')
             );
+            $reportService->setDispatcher($container->get('dispatcher'));
+            return $reportService;
         });
 
         // Set some public routes

lib/Report/CampaignProofOfPlay.php

@@ -61,11 +61,6 @@ class CampaignProofOfPlay implements ReportInterface
      */
     private $displayFactory;
 
-    /**
-     * @var MediaFactory
-     */
-    private $mediaFactory;
-
     /**
      * @var LayoutFactory
      */
@@ -91,21 +86,11 @@ class CampaignProofOfPlay implements ReportInterface
      */
     private $state;
 
-    private $table = 'stat';
-
-    private $tagsType = [
-        'dg' => 'Display group',
-        'media' => 'Media',
-        'layout' => 'Layout'
-    ];
-
     /** @inheritdoc */
     public function setFactories(ContainerInterface $container)
     {
         $this->campaignFactory = $container->get('campaignFactory');
         $this->displayFactory = $container->get('displayFactory');
-        $this->mediaFactory = $container->get('mediaFactory');
-        $this->layoutFactory = $container->get('layoutFactory');
         $this->reportScheduleFactory = $container->get('reportScheduleFactory');
         $this->sanitizer = $container->get('sanitizerService');
         $this->dispatcher = $container->get('dispatcher');
@@ -130,7 +115,7 @@ public function getReportForm()
         return new ReportForm(
             'campaign-proofofplay-report-form',
             'campaignProofOfPlay',
-            'Campaign Proof of Play',
+            'Connector Reports',
             [
                 'fromDateOneDay' => Carbon::now()->subSeconds(86400)->format(DateFormatHelper::getSystemFormat()),
                 'toDate' => Carbon::now()->format(DateFormatHelper::getSystemFormat())
@@ -220,6 +205,10 @@ public function restructureSavedReportOldJson($result)
     /** @inheritdoc */
     public function getSavedReportResults($json, $savedReport)
     {
+        // Get filter criteria
+        $rs = $this->reportScheduleFactory->getById($savedReport->reportScheduleId, 1)->filterCriteria;
+        $filterCriteria = json_decode($rs, true);
+
         // Show filter criteria
         $metadata = [];
 
@@ -345,23 +334,21 @@ public function getResults(SanitizerInterface $sanitizedParams)
 
         // --------
         // ReportDataEvent
-        $event = new ReportDataEvent('proofofplay');
+        $event = new ReportDataEvent('campaignProofofplay');
 
         // Set query params for audience proof of play report
         $event->setParams($params);
 
         // Dispatch the event - listened by Audience Report Connector
         $this->dispatcher->dispatch($event, ReportDataEvent::$NAME);
-
-        // Get results from the event
-        $result['result'] = $event->getResults();
+        $results = $event->getResults();
 
         $result['periodStart'] = $params['fromDt'];
         $result['periodEnd'] = $params['toDt'];
 
         // Sanitize results??
         $rows = [];
-        foreach ($result['result'] as $row) {
+        foreach ($results['json'] as $row) {
             $entry = [];
 
             $entry['labelDate'] = $row['labelDate'];
@@ -387,7 +374,9 @@ public function getResults(SanitizerInterface $sanitizedParams)
         return new ReportResult(
             $metadata,
             $rows,
-            $recordsTotal
+            $recordsTotal,
+            [],
+            $results['error'] ?? null
         );
     }
 }