[Mapbender-commits] r9436 - trunk/mapbender/http/geoportal

[svn_mapbender at osgeo.org]

Author: armin11
Date: 2016-04-07 08:26:31 -0700 (Thu, 07 Apr 2016)
New Revision: 9436

Modified:
   trunk/mapbender/http/geoportal/mod_showCatalogueStatistics.php
   trunk/mapbender/http/geoportal/mod_showCatalogueStatistics_server.php
Log:
small fixes

Modified: trunk/mapbender/http/geoportal/mod_showCatalogueStatistics.php
===================================================================
--- trunk/mapbender/http/geoportal/mod_showCatalogueStatistics.php	2016-04-07 15:01:15 UTC (rev 9435)
+++ trunk/mapbender/http/geoportal/mod_showCatalogueStatistics.php	2016-04-07 15:26:31 UTC (rev 9436)
@@ -62,8 +62,8 @@
 $html .= '<script type="text/javascript" src="../extensions/jquery-ui-1.8.1.custom/js/jquery-ui-1.8.1.custom.min.js"></script>';
 //external javascript part
 $html .= '<script type="text/javascript" src="http://d3js.org/d3.v3.min.js"></script>';
-$html .= '<script type="text/javascript" src="https://raw.githubusercontent.com/benkeen/d3pie/0.1.8/d3pie/d3pie.min.j"></script>';
-$html .= '<script type="text/javascript" src="https://raw.githubusercontent.com/benkeen/d3pie/0.1.8/d3pie/d3pie.js"></script>';
+$html .= '<script type="text/javascript" src="http://raw.githubusercontent.com/benkeen/d3pie/0.1.8/d3pie/d3pie.min.j"></script>';
+$html .= '<script type="text/javascript" src="http://raw.githubusercontent.com/benkeen/d3pie/0.1.8/d3pie/d3pie.js"></script>';
 
 //internal javascript part
 $javascript = <<< JAVASCRIPT
@@ -83,8 +83,8 @@
 				var pie = new d3pie("pie", {
 					size: {
 						pieOuterRadius: "50%",
-						canvasHeight: 600,
-						canvasWidth: 600
+						canvasHeight: 700,
+						canvasWidth: 700
 					},
 					data: {
 						sortOrder: "value-asc",
@@ -129,9 +129,9 @@
 			if (data !== false) {
 				var pie2 = new d3pie("pie2", {
 					size: {
-						pieOuterRadius: "50%",
-						canvasHeight: 380,
-						canvasWidth: 380
+						pieOuterRadius: "45%",
+						canvasHeight: 430,
+						canvasWidth: 430
 					},
 					data: {
 						sortOrder: "value-asc",

Modified: trunk/mapbender/http/geoportal/mod_showCatalogueStatistics_server.php
===================================================================
--- trunk/mapbender/http/geoportal/mod_showCatalogueStatistics_server.php	2016-04-07 15:01:15 UTC (rev 9435)
+++ trunk/mapbender/http/geoportal/mod_showCatalogueStatistics_server.php	2016-04-07 15:26:31 UTC (rev 9436)
@@ -57,7 +57,7 @@
 
 	//pull statistics from database
 $sql = <<<SQL
-		select count, mb_group_name, mb_group_title, mb_group_logo_path, mb_group_id, mb_group_admin_code from ( select count(layer_id), fkey_mb_group_id from (select wms_id, fkey_mb_group_id from wms where fkey_mb_group_id <> 0 AND fkey_mb_group_id is not null group by fkey_mb_group_id, wms_id union select wms_id, fkey_mb_group_id from (select wms_owner, wms_id from wms where fkey_mb_group_id = 0 OR fkey_mb_group_id is null group by  wms_owner, wms_id) as owner_wms inner join mb_user_mb_group on owner_wms.wms_owner = mb_user_mb_group.fkey_mb_user_id where mb_user_mb_group_type = 2) as test  inner join layer on test.wms_id = layer.fkey_wms_id group by fkey_mb_group_id ) as layer_count inner join mb_group on mb_group.mb_group_id = layer_count.fkey_mb_group_id WHERE mb_group_admin_code = $1
+		select count, mb_group_name, mb_group_title, mb_group_logo_path, mb_group_id, mb_group_admin_code from ( select count(layer_id), fkey_mb_group_id from (select wms_id, fkey_mb_group_id from wms where fkey_mb_group_id <> 0 AND fkey_mb_group_id is not null group by fkey_mb_group_id, wms_id union select wms_id, fkey_mb_group_id from (select wms_owner, wms_id from wms where fkey_mb_group_id = 0 OR fkey_mb_group_id is null group by  wms_owner, wms_id) as owner_wms inner join mb_user_mb_group on owner_wms.wms_owner = mb_user_mb_group.fkey_mb_user_id where mb_user_mb_group_type = 2) as test inner join (select layer_id, fkey_wms_id from layer where layer_searchable=1) as layer on test.wms_id = layer.fkey_wms_id group by fkey_mb_group_id ) as layer_count inner join mb_group on mb_group.mb_group_id = layer_count.fkey_mb_group_id WHERE mb_group_admin_code = $1
 SQL;
 /*$sql = <<<SQL
 	select count, mb_group_name, mb_group_logo_path, mb_group_admin_code from ( select count(layer_id), fkey_mb_group_id from (select wms_id, fkey_mb_group_id from wms where fkey_mb_group_id <> 0 AND fkey_mb_group_id is not null group by fkey_mb_group_id, wms_id union select wms_id, fkey_mb_group_id from (select wms_owner, wms_id from wms where fkey_mb_group_id = 0 OR fkey_mb_group_id is null group by  wms_owner, wms_id) as owner_wms inner join mb_user_mb_group on owner_wms.wms_owner = mb_user_mb_group.fkey_mb_user_id where mb_user_mb_group_type = 2) as test  inner join layer on test.wms_id = layer.fkey_wms_id group by fkey_mb_group_id ) as layer_count inner join mb_group on mb_group.mb_group_id = layer_count.fkey_mb_group_id