#8248 consider when latest date is not bigger than earliest date and …

…COUNTER R5 stats are not available yet
pkp · Jan 24, 2024 · c1267f7 · c1267f7
1 parent e76135c
commit c1267f7
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 7 deletions.
diff --git a/classes/components/forms/counter/PKPCounterReportForm.php b/classes/components/forms/counter/PKPCounterReportForm.php
@@ -16,7 +16,6 @@
 namespace PKP\components\forms\counter;
 
 use PKP\components\forms\FormComponent;
-use PKP\sushi\CounterR5Report;
 
 define('FORM_COUNTER', 'counter');
 
@@ -54,12 +53,6 @@ public function __construct(string $action, array $locales)
     public function getConfig()
     {
         $config = parent::getConfig();
-
-        $earliestDate = CounterR5Report::getEarliestDate();
-        $lastDate = CounterR5Report::getLastDate();
-
-        $config['earliestDate'] = $earliestDate;
-        $config['lastDate'] = $lastDate;
         $config['reportFields'] = array_map(function ($reportFields) {
             return array_map(function ($reportField) {
                 $field = $this->getFieldConfig($reportField);

diff --git a/classes/components/listPanels/PKPCounterReportsListPanel.php b/classes/components/listPanels/PKPCounterReportsListPanel.php
@@ -16,6 +16,7 @@
 namespace PKP\components\listPanels;
 
 use APP\components\forms\counter\CounterReportForm;
+use PKP\sushi\CounterR5Report;
 
 class PKPCounterReportsListPanel extends ListPanel
 {
@@ -34,12 +35,17 @@ class PKPCounterReportsListPanel extends ListPanel
     public function getConfig(): array
     {
         $config = parent::getConfig();
+
+        $earliestDate = CounterR5Report::getEarliestDate();
+        $lastDate = CounterR5Report::getLastDate();
+
         $config = array_merge(
             $config,
             [
                 'apiUrl' => $this->apiUrl,
                 'editCounterReportLabel' => __('manager.statistics.counterR5Report.settings'),
                 'form' => $this->form->getConfig(),
+                'usagePossible' => $lastDate > $earliestDate,
             ]
         );
         return $config;

diff --git a/locale/en/manager.po b/locale/en/manager.po
@@ -840,6 +840,9 @@ msgstr "Counter R5 Reports"
 msgid "manager.statistics.counterR5Reports.description"
 msgstr "See <a href=\"https://cop5.projectcounter.org/en/5.0.3/04-reports/index.html\" target=\"_new\">COUNTER 5.0.3 documentation</a> for more information about each report."
 
+msgid "manager.statistics.counterR5Reports.usageNotPossible"
+msgstr "There are no COUNTER R5 usage statistics available yet."
+
 msgid "manager.statistics.counterR5Report.settings"
 msgstr "Report Settings"
 

diff --git a/pages/stats/PKPStatsHandler.php b/pages/stats/PKPStatsHandler.php
@@ -28,6 +28,7 @@
 use PKP\security\authorization\ContextAccessPolicy;
 use PKP\security\Role;
 use PKP\statistics\PKPStatisticsHelper;
+use PKP\sushi\CounterR5Report;
 
 class PKPStatsHandler extends Handler
 {
@@ -458,13 +459,17 @@ public function counterR5(array $args, Request $request): void
             ]
         );
 
+        $earliestDate = CounterR5Report::getEarliestDate();
+        $lastDate = CounterR5Report::getLastDate();
+
         $templateMgr->setState([
             'components' => [
                 $counterReportsListPanel->id => $counterReportsListPanel->getConfig(),
             ],
         ]);
         $templateMgr->assign([
             'pageComponent' => 'CounterReportsPage',
+            'usagePossible' => $lastDate > $earliestDate,
         ]);
         $templateMgr->display('stats/counterReports.tpl');
     }

diff --git a/templates/stats/counterReports.tpl b/templates/stats/counterReports.tpl
@@ -14,6 +14,9 @@
 		{translate key="manager.statistics.counterR5Reports"}
 	</h1>
 	<p>{translate key="manager.statistics.counterR5Reports.description"}</p>
+	{if !$usagePossible}
+		<notification class="pkpNotification--backendPage__header" type="warning">{translate key="manager.statistics.counterR5Reports.usageNotPossible"}</notification>
+	{/if}
 	<panel>
 		<panel-section>
 			<counter-reports-list-panel