Fixed drawing correct data into table by selected time range

Author: BaranekD

CHANGELOG.md

@@ -8,6 +8,11 @@ All notable changes to this project will be documented in this file.
 [Changed]
 - DB commands work with apostrophes in IdP/SP names
 - New visual form of the site
+- Draw tables without month
+
+[Fixed]
+- Draws tables data by selected time range
+
 
 ## [v1.3.0]
 [Added]

lib/Auth/Process/DatabaseCommand.php

@@ -160,9 +160,9 @@ public static function getAccessCountPerService($days)
 		$serviceProvidersTableName = $databaseConnector->getServiceProvidersTableName();
 		$serviceProvidersMapTableName = $databaseConnector->getServiceProvidersMapTableName();
 		if($days == 0) {	// 0 = all time
-			$stmt = $conn->prepare("SELECT IFNULL(name,service) AS spName, SUM(count) AS count FROM " . $serviceProvidersTableName . " LEFT OUTER JOIN " . $serviceProvidersMapTableName . " ON service = identifier GROUP BY service HAVING service != ''");
+			$stmt = $conn->prepare("SELECT IFNULL(name,service) AS spName, SUM(count) AS count FROM " . $serviceProvidersTableName . " LEFT OUTER JOIN " . $serviceProvidersMapTableName . " ON service = identifier GROUP BY service HAVING service != ''  ORDER BY count DESC");
 		} else {
-			$stmt = $conn->prepare("SELECT year, month, day, IFNULL(name,service) AS spName, SUM(count) AS count FROM " . $serviceProvidersTableName . " LEFT OUTER JOIN " . $serviceProvidersMapTableName . "  ON service = identifier WHERE CONCAT(year,'-',LPAD(month,2,'00'),'-',LPAD(day,2,'00')) BETWEEN CURDATE() - INTERVAL ".$days." DAY AND CURDATE() GROUP BY service HAVING service != ''");
+			$stmt = $conn->prepare("SELECT year, month, day, IFNULL(name,service) AS spName, SUM(count) AS count FROM " . $serviceProvidersTableName . " LEFT OUTER JOIN " . $serviceProvidersMapTableName . "  ON service = identifier WHERE CONCAT(year,'-',LPAD(month,2,'00'),'-',LPAD(day,2,'00')) BETWEEN CURDATE() - INTERVAL ".$days." DAY AND CURDATE() GROUP BY service HAVING service != ''  ORDER BY count DESC");
 		}
 		$stmt->execute();
 		$result = $stmt->get_result();
@@ -180,9 +180,9 @@ public static function getLoginCountPerIdp($days)
 		$identityProvidersTableName = $databaseConnector->getIdentityProvidersTableName();
 		$identityProvidersMapTableName = $databaseConnector->getIdentityProvidersMapTableName();
 		if($days == 0) {	// 0 = all time
-			$stmt = $conn->prepare("SELECT IFNULL(name,sourceIdp) AS idPName, SUM(count) AS count FROM ".$identityProvidersTableName. " LEFT OUTER JOIN " . $identityProvidersMapTableName . " ON sourceIdp = entityId GROUP BY sourceIdp HAVING sourceIdp != ''");
+			$stmt = $conn->prepare("SELECT IFNULL(name,sourceIdp) AS idPName, SUM(count) AS count FROM ".$identityProvidersTableName. " LEFT OUTER JOIN " . $identityProvidersMapTableName . " ON sourceIdp = entityId GROUP BY sourceIdp HAVING sourceIdp != '' ORDER BY count DESC");
 		} else {
-			$stmt = $conn->prepare("SELECT year, month, day, IFNULL(name,sourceIdp) AS idPName, SUM(count) AS count FROM ".$identityProvidersTableName. " LEFT OUTER JOIN " . $identityProvidersMapTableName . " ON sourceIdp = entityId WHERE CONCAT(year,'-',LPAD(month,2,'00'),'-',LPAD(day,2,'00')) BETWEEN CURDATE() - INTERVAL ".$days." DAY AND CURDATE() GROUP BY sourceIdp HAVING sourceIdp != ''");
+			$stmt = $conn->prepare("SELECT year, month, day, IFNULL(name,sourceIdp) AS idPName, SUM(count) AS count FROM ".$identityProvidersTableName. " LEFT OUTER JOIN " . $identityProvidersMapTableName . " ON sourceIdp = entityId WHERE CONCAT(year,'-',LPAD(month,2,'00'),'-',LPAD(day,2,'00')) BETWEEN CURDATE() - INTERVAL ".$days." DAY AND CURDATE() GROUP BY sourceIdp HAVING sourceIdp != '' ORDER BY count DESC");
 		}
 		$stmt->execute();
 		$result = $stmt->get_result();

templates/identityProviders-tpl.php

@@ -32,10 +32,10 @@ function drawIdpsChart() {
 
     function drawIdpsTable() {
         var data = new google.visualization.DataTable();
-        data.addColumn('date', '<?php echo $this->t('{proxystatistics:Proxystatistics:templates/tables_month}'); ?>');
+
         data.addColumn('string', '<?php echo $this->t('{proxystatistics:Proxystatistics:templates/tables_identity_provider}'); ?>');
         data.addColumn('number', '<?php echo $this->t('{proxystatistics:Proxystatistics:templates/count}'); ?>');
-        data.addRows([<?php DatabaseCommand::getLoginCountPerDeyPerService()?>]);
+        data.addRows([<?php DatabaseCommand::getLoginCountPerIdp($lastDays)?>]);
 
         var table = new google.visualization.Table(document.getElementById('idpsTable'));
 

templates/serviceProviders-tpl.php

@@ -33,10 +33,10 @@ function drawSpsChart() {
 
     function drawSpsTable() {
         var data = new google.visualization.DataTable();
-        data.addColumn('date', '<?php echo $this->t('{proxystatistics:Proxystatistics:templates/tables_month}'); ?>');
+        
         data.addColumn('string', '<?php echo $this->t('{proxystatistics:Proxystatistics:templates/tables_service_provider}'); ?>');
         data.addColumn('number', '<?php echo $this->t('{proxystatistics:Proxystatistics:templates/count}'); ?>');
-        data.addRows([<?php DatabaseCommand::getAccessToServicesPerMonth()?>]);
+        data.addRows([<?php DatabaseCommand::getAccessCountPerService($lastDays)?>]);
 
         var table = new google.visualization.Table(document.getElementById('spsTable'));