Merge pull request coral-erm#632 from biblibre/Fix_dashboards_export

Fix dashboards exports
wc-library · Feb 21, 2020 · 8947e5b · 8947e5b
2 parents 7679021 + 9781069
commit 8947e5b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/resources/dashboard_export.php b/resources/dashboard_export.php
@@ -10,10 +10,13 @@
     $costDetailsID = $_POST['costDetailsID'];
     $subjectID = $_POST['subjectID'];
     $groupBy = $_POST['groupBy'];
+    $fundID = $_POST['fundID'];
+    $organizationID = $_POST['organizationID'];
+    $roleID = $_POST['roleID'];
     $csv = $_POST['csv'];
 
     $dashboard = new Dashboard();
-    $query = $dashboard->getQuery($resourceTypeID, $year, $acquisitionTypeID, $orderTypeID, $subjectID, $costDetailsID, $groupBy);
+    $query = $dashboard->getQuery($resourceTypeID, $year, $acquisitionTypeID, $orderTypeID, $subjectID, $costDetailsID, $fundID, $organizationID, $roleID, $groupBy);
     $results = $dashboard->getResults($query);
     if ($groupBy == "GS.shortName") $groupBy = "generalSubject";
 

diff --git a/resources/dashboard_yearly_costs_exports.php b/resources/dashboard_yearly_costs_exports.php
@@ -13,11 +13,14 @@
     $orderTypeID = $_POST['orderTypeID'];
     $subjectID = $_POST['subjectID'];
     $costDetailsID = $_POST['costDetailsID'];
+    $fundID = $_POST['fundID'];
+    $organizationID = $_POST['organizationID'];
+    $roleID = $_POST['roleID'];
     $groupBy = $_POST['groupBy'];
     $csv = $_POST['csv'];
 
     $dashboard = new Dashboard();
-    $query = $dashboard->getQueryYearlyCosts($resourceTypeID, $startYear, $endYear, $acquisitionTypeID, $orderTypeID, $subjectID, $costDetailsID, $groupBy);
+    $query = $dashboard->getQueryYearlyCosts($resourceTypeID, $startYear, $endYear, $acquisitionTypeID, $orderTypeID, $subjectID, $costDetailsID, $fundID, $organizationID, $roleID, $groupBy);
     $results = $dashboard->getResults($query);
     if ($groupBy == "GS.shortName") $groupBy = "generalSubject";