From fe07597197f48ec45e3101a03b3a0a34a19cec81 Mon Sep 17 00:00:00 2001
From: Matthias Meusburger <matthias.meusburger@biblibre.com>
Date: Mon, 30 Sep 2019 15:31:41 +0200
Subject: [PATCH] Issue 604: Show all subjects in dashboards

---
 resources/admin/classes/common/Dashboard.php        |  8 ++++----
 resources/ajax_htmldata/getDashboard.php            | 11 +++++------
 resources/ajax_htmldata/getDashboardYearlyCosts.php | 11 +++++------
 3 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/resources/admin/classes/common/Dashboard.php b/resources/admin/classes/common/Dashboard.php
index 6cca5195a..2c3f9116c 100644
--- a/resources/admin/classes/common/Dashboard.php
+++ b/resources/admin/classes/common/Dashboard.php
@@ -9,8 +9,8 @@ public function getQuery($resourceTypeID, $year, $acquisitionTypeID, $orderTypeI
                         AT.shortName AS acquisitionType,
                         OT.shortName AS orderType,
                         CD.shortName AS costDetails,
-                        GS.shortName AS generalSubject,
-                        DS.shortName AS detailedSubject,
+                        GROUP_CONCAT(DISTINCT GS.shortName) AS generalSubjects,
+                        GROUP_CONCAT(DISTINCT DS.shortName) AS detailedSubjects,
                         RA.libraryNumber AS libraryNumber,
                         SUM(ROUND(COALESCE(RP.paymentAmount, 0) / 100, 2)) as paymentAmount
                         ";
@@ -55,8 +55,8 @@ public function getQueryYearlyCosts($resourceTypeID, $startYear, $endYear, $acqu
                         RT.shortName AS resourceType,
                         AT.shortName AS acquisitionType,
                         CD.shortName AS costDetails,
-                        GS.shortName AS generalSubject,
-                        DS.shortName AS detailedSubject,
+                        GROUP_CONCAT(DISTINCT GS.shortName) AS generalSubjects,
+                        GROUP_CONCAT(DISTINCT DS.shortName) AS detailedSubjects,
                         RA.libraryNumber AS libraryNumber
                         ";
 
diff --git a/resources/ajax_htmldata/getDashboard.php b/resources/ajax_htmldata/getDashboard.php
index 5279eab9a..5ae76513d 100644
--- a/resources/ajax_htmldata/getDashboard.php
+++ b/resources/ajax_htmldata/getDashboard.php
@@ -20,7 +20,8 @@
     echo "<thead><tr>";
     echo "<th>" . _("Name") . "</th>";
     echo "<th>" . _("Resource Type") . "</th>";
-    echo "<th>" . _("Subject") . "</th>";
+    echo "<th>" . _("General Subjects") . "</th>";
+    echo "<th>" . _("Detailed Subjects") . "</th>";
     echo "<th>" . _("Acquisition Type") . "</th>";
     echo "<th>" . _("Library number") . "</th>";
     echo "<th>" . _("Payment amount") . "</th>";
@@ -33,16 +34,14 @@
             echo "<tr>";
             echo '<td><a href="resource.php?resourceID=' . $result['resourceID'] . '">' . $result['titleText'] . "</a></td>";
             echo "<td>" . $result['resourceType'] . "</td>";
-            $subject = $result['generalSubject'] && $result['detailedSubject'] ? 
-                $result['generalSubject'] . " / " . $result['detailedSubject'] : 
-                $result['generalSubject'] . $result['detailedSubject'];
-            echo "<td>" . $subject . "</td>";
+            echo "<td>" . $result['generalSubjects'] . "</td>";
+            echo "<td>" . $result['detailedSubjects'] . "</td>";
             echo "<td>" . $result['acquisitionType'] . "</td>";
             echo "<td>" . $result['libraryNumber'] . "</td>";
             echo "<td>" . $result['paymentAmount'] . "</td>";
             echo "</tr>";
         } else {
-            echo "<tr><td colspan='5'><b>";
+            echo "<tr><td colspan='6'><b>";
             if ($i == $count) { echo  _("Total"); } else { echo _("Sub-Total:") . " " . $result[$groupBy]; }
             echo "</b></td>";
             echo "<td><b>" . $result['paymentAmount']  . "</b></td>";
diff --git a/resources/ajax_htmldata/getDashboardYearlyCosts.php b/resources/ajax_htmldata/getDashboardYearlyCosts.php
index 0383e9a90..dcaab5c5c 100644
--- a/resources/ajax_htmldata/getDashboardYearlyCosts.php
+++ b/resources/ajax_htmldata/getDashboardYearlyCosts.php
@@ -27,7 +27,8 @@
     echo "<thead><tr>";
     echo "<th>" . _("Name") . "</th>";
     echo "<th>" . _("Resource Type") . "</th>";
-    echo "<th>" . _("Subject") . "</th>";
+    echo "<th>" . _("General Subjects") . "</th>";
+    echo "<th>" . _("Detailed Subjects") . "</th>";
     echo "<th>" . _("Acquisition Type") . "</th>";
     echo "<th>" . _("Library Number") . "</th>";
     for ($i = $startYear; $i <= $endYear; $i++) {
@@ -45,10 +46,8 @@
             echo "<tr>";
             echo '<td><a href="resource.php?resourceID=' . $result['resourceID'] . '">' . $result['titleText'] . "</a></td>";
             echo "<td>" . $result['resourceType'] . "</td>";
-            $subject = $result['generalSubject'] && $result['detailedSubject'] ? 
-                $result['generalSubject'] . " / " . $result['detailedSubject'] : 
-                $result['generalSubject'] . $result['detailedSubject'];
-            echo "<td>" . $subject . "</td>";
+            echo "<td>" . $result['generalSubjects'] . "</td>";
+            echo "<td>" . $result['detailedSubjects'] . "</td>";
             echo "<td>" . $result['acquisitionType'] . "</td>";
             echo "<td>" . $result['libraryNumber'] . "</td>";
             for ($i = $startYear; $i <= $endYear; $i++) {
@@ -59,7 +58,7 @@
             }
             echo "</tr>";
         } else {
-            echo "<tr><td colspan='5'><b>";
+            echo "<tr><td colspan='6'><b>";
             if ($currentCount == $count) { echo  _("Total"); } else { echo _("Sub-Total:") . " " . $result[$groupBy]; }
             echo "</b></td>";
             for ($i = $startYear; $i <= $endYear; $i++) {