Use new chart js version (70926eeb) · Commits · kgroup / lggr

inc/config_class.php

+5 −4

Original line number	Diff line number	Diff line
		@@ -3,9 +3,10 @@
		class Config extends AbstractConfig {

		function __construct() {
		$this->setDbUser('lggr');
		$this->setDbPwd('lggr');
		$this->setDbName('lggr');
		$this->setDbUser('logviewer');
		$this->setDbPwd('rl');
		$this->setDbName('logger');


		// Set your preferred language en_US, de_DE, or pt_BR
		$this->setLocale('en_US');
		@@ -16,7 +17,7 @@ class Config extends AbstractConfig {
		$this->setUrlJqueryui('//code.jquery.com/ui/1.11.4/');
		$this->setUrlJAtimepicker(
		'//cdnjs.cloudflare.com/ajax/libs/jquery-ui-timepicker-addon/1.4.5/');
		$this->setUrlChartjs('//cdnjs.cloudflare.com/ajax/libs/Chart.js/1.0.2/');
		$this->setUrlChartjs('//cdnjs.cloudflare.com/ajax/libs/Chart.js/2.7.2/');
		$this->setUrlJQCloud('//cdnjs.cloudflare.com/ajax/libs/jqcloud/1.0.4/');

		/* local storage */

+110 −106

Original line number	Diff line number	Diff line
		@@ -81,41 +81,45 @@ var dataServers = {
		} ]
		};

		var dataLevels = [
		var dataLevels = {
		datasets: [{
		data: [
		<?php
		foreach ($aLevels as $level) {
		$newVal = round(log($level->c));
		$newCol = $aColors[$level->level];
		echo <<<EOL
		{
		value: $newVal,
		color: "$newCol",
		label: "{$level->level}",
		},

		EOL;
		// $newCol = $aColors[$level->level];
		echo "{$newVal}, ";
		} // foreach
		?>
		];
		]
		}],
		labels: [
		<?php
		foreach ($aLevels as $level) {
		echo "'{$level->level}', ";
		} // foreach
		?>
		]
		};

		var dataServersPie = [
		var dataServersPie = {
		datasets: [{
		data: [
		<?php
		foreach ($aServers as $server) {
		$sHash = md5($server->host);
		$cHash = $sHash[0] . '0' . $sHash[1] . '0' . $sHash[2] . '0';
		$cHashHigh = $sHash[0] . 'f' . $sHash[1] . 'f' . $sHash[2] . 'f';
		echo <<<EOL
		{
		value: {$server->c},
		color: "#$cHash",
		highlight: "#$cHashHigh",
		label: "{$server->host}"
		},

		EOL;
		echo $server->c . ",";
		} // foreach
		?>
		];
		]
		}],
		labels: [
		<?php
		foreach ($aServers as $server) {
		echo "'{$server->host}',";
		}
		?>
		]
		};


		var dataCloudWords = [

+20 −4

Original line number	Diff line number	Diff line
		@@ -9,16 +9,32 @@ var options = {


		var ctx = $("#chartMsgsPerHour").get(0).getContext("2d");
		new Chart(ctx).Bar(dataMsgsPerHour, options);
		new Chart(ctx, {
		type: 'bar',
		data: dataMsgsPerHour,
		options: options
		});

		ctx = $("#chartServers").get(0).getContext("2d");
		new Chart(ctx).Bar(dataServers, options);
		new Chart(ctx, {
		type: 'bar',
		data: dataServers,
		options: options
		});

		ctx = $("#chartLevels").get(0).getContext("2d");
		new Chart(ctx).PolarArea(dataLevels, {animateRotate: true, showScale: false});
		new Chart(ctx, {
		type: 'polarArea',
		data: dataLevels
		});

		ctx = $("#chartServersPie").get(0).getContext("2d");
		new Chart(ctx).Doughnut(dataServersPie, options);
		new Chart(ctx, {
		type: 'doughnut',
		data: dataServersPie,
		options: options
		});


		$('#cloudcontainer').jQCloud(dataCloudWords, {
		autoResize: true