Ero sivun ”Widget:Ice situation graph” versioiden välillä

(3 välissä olevaa versiota samalta käyttäjältä ei näytetä)

Rivi 8:

setTimeout( function(){ _jQueryTest() }, 300);

} else {

google.load('~~visualization', '1.0~~', {'packages':['corechart']});

google.charts.load( 'current', { 'packages':[ 'corechart' ], 'language': 'fi' } );

google.setOnLoadCallback(_func);

google.charts.setOnLoadCallback(_func);

}

Rivi 16:

function _func() {

var id = "";

var siteName = '';

var lang = '';

Rivi 27:

searchStr += encodeURI("[[Jäätilanne::2||3||5]]");

searchStr += encodeURI("[[Jään paksuus::>0]]");

searchStr += '&format=json';

jQuery.ajax({

Rivi 340:

backgroundColor: { fill:'transparent' },

crosshair: { trigger: 'both' },

chartArea: { top: 10, left: 80, width: (jQuery('#~~ice_chart_div~~').width() - 80 - 20), height: (jQuery('#~~ice_chart_div~~').height() - 50 - 10), backgroundColor: { stroke: '#ccc', strokeWidth: 1, fill: '#daf0fa' } },

chartArea: { top: 10, left: 80, width: (jQuery('#' + id + '_ice_chart_div').width() - 80 - 20), height: (jQuery('#' + id + '_ice_chart_div').height() - 50 - 10), backgroundColor: { stroke: '#ccc', strokeWidth: 1, fill: '#daf0fa' } },

tooltip: { isHtml: true }

};

var chart = new google.visualization.ComboChart(document.getElementById('~~ice_chart_div~~'));

var chart = new google.visualization.ComboChart(document.getElementById(id + '_ice_chart_div'));

chart.draw(dataTable, options);

jQuery( window ).resize(function() {

~~//console.log((jQuery('#ice_chart_div').width() - 80 - 10));~~

options.chartArea.width = (jQuery('#' + id + '_ice_chart_div').width() - 80 - 20);

options.chartArea.width = (jQuery('#~~ice_chart_div~~').width() - 80 - 20);

options.chartArea.height = (jQuery('#' + id + '_ice_chart_div').height() - 50 - 10);

options.chartArea.height = (jQuery('#~~ice_chart_div~~').height() - 50 - 10);

chart.draw(dataTable, options);

});

Rivi 419:

Rivi 418:

<div style="Xbackground-color: #c1e7f7; height: 300px;" id="_ice_chart_div"></div>

</includeonly>

@@ Rivi 8: / Rivi 8: @@
    		  		setTimeout( function(){ <!--{$id|default:drawIceSitChart|escape:'html'}-->_jQueryTest() }, 300);
    		  	} else {
-   		  		google.load('visualization', '1.0', {'packages':['corechart']});
+   		  		google.charts.load( 'current', { 'packages':[ 'corechart' ], 'language': 'fi' } );
-				google.setOnLoadCallback(<!--{$id|default:drawIceSitChart|escape:'html'}-->_func);
+				google.charts.setOnLoadCallback(<!--{$id|default:drawIceSitChart|escape:'html'}-->_func);
    		  	}
    		}
@@ Rivi 16: / Rivi 16: @@
 		function <!--{$id|default:drawIceSitChart|escape:'html'}-->_func() {
+				var id = "<!--{$id|default:drawIceSitChart|escape:'html'}-->";
      	    	var siteName = '<!--{$page|escape:'urlpathinfo'}-->';
 				var lang = '<!--{$lang|default:fi|escape:'urlpathinfo'}-->';
@@ Rivi 27: / Rivi 27: @@
 	    			searchStr += encodeURI("[[Jäätilanne::2||3||5]]");
 	    			searchStr += encodeURI("[[Jään paksuus::>0]]");
-				searchStr += encodeURI("|?Päivämäärä|?Jäätilanne|?Jään paksuus|?Tiedosto|?Lisätiedot|sort=Päivämäärä|limit=1000");
+				searchStr += encodeURI("|?Päivämäärä|?Jäätilanne|?Jään paksuus|?Tiedosto|?Lisätiedot|sort=Päivämäärä|limit=2000");
 				searchStr += '&format=json';
 				jQuery.ajax({
@@ Rivi 340: / Rivi 340: @@
 				  				    backgroundColor: { fill:'transparent' },
    				    				crosshair: { trigger: 'both' },
-				  				    chartArea: { top: 10, left: 80, width: (jQuery('#ice_chart_div').width() - 80 - 20), height: (jQuery('#ice_chart_div').height() - 50 - 10), backgroundColor: { stroke: '#ccc', strokeWidth: 1, fill: '#daf0fa' } },
+				  				    chartArea: { top: 10, left: 80, width: (jQuery('#' + id + '_ice_chart_div').width() - 80 - 20), height: (jQuery('#' + id + '_ice_chart_div').height() - 50 - 10), backgroundColor: { stroke: '#ccc', strokeWidth: 1, fill: '#daf0fa' } },
    				  					tooltip: { isHtml: true }
 				  				};
-   								var chart = new google.visualization.ComboChart(document.getElementById('ice_chart_div'));
+   								var chart = new google.visualization.ComboChart(document.getElementById(id + '_ice_chart_div'));
 				  				chart.draw(dataTable, options);
 				  				jQuery( window ).resize(function() {
-				  					//console.log((jQuery('#ice_chart_div').width() - 80 - 10));
+				  					options.chartArea.width = (jQuery('#' + id + '_ice_chart_div').width() - 80 - 20);
-				  					options.chartArea.width = (jQuery('#ice_chart_div').width() - 80 - 20);
+				  					options.chartArea.height = (jQuery('#' + id + '_ice_chart_div').height() - 50 - 10);
-				  					options.chartArea.height = (jQuery('#ice_chart_div').height() - 50 - 10);
 									chart.draw(dataTable, options);
 								});
@@ Rivi 419: / Rivi 418: @@
      <!--Div that will hold the pie chart-->
-     <div style="Xbackground-color: #c1e7f7; height: 300px;" id="ice_chart_div"></div>
+     <div style="Xbackground-color: #c1e7f7; height: 300px;" id="<!--{$id|default:drawIceSitChart|escape:'html'}-->_ice_chart_div"></div>
 </includeonly>

Widget:Ice situation graph

Nykyinen versio 14. elokuuta 2023 kello 11.17