Ero sivun ”Widget:Water level graph” versioiden välillä

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

Rivi 7:

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 23:

searchStr += encodeURI("[[Tyyppi::Vedenkorkeus]]");

searchStr += '&format=json';

jQuery.ajax({

Rivi 58:

zi = -1;

for (var i in request.query.results) {

zi++;

resultItem = request.query.results[i].printouts;

obsDate = new Date(toDateFromSecsSince1970(resultItem.Päivämäärä[0].timestamp));

~~console.log~~(resultItem);

levelNum = resultItem.Vedenkorkeus[0].value;

if ( typeof resultItem.Vedenkorkeus[0].value != 'undefined' ) {

if (resultItem.Lisätiedot[0] != undefined) { freeTxt = resultItem.Lisätiedot[0]; }

else { freeText = ''; }

levelNum = resultItem.Vedenkorkeus[0].value;

if (obsDate.getFullYear() < firstYear) { firstYear = obsDate.getFullYear(); }

if (resultItem.Lisätiedot[0] != undefined) { freeTxt = resultItem.Lisätiedot[0]; }

if (obsDate.getFullYear() > lastYear) { lastYear = obsDate.getFullYear(); }

else { freeText = ''; }

if (obsDate.getMonth() < firstMonth) { firstMonth = obsDate.getMonth(); }

if (obsDate.getFullYear() < firstYear) { firstYear = obsDate.getFullYear(); }

if (obsDate.getMonth() > lastMonth) { lastMonth = obsDate.getMonth(); }

if (obsDate.getFullYear() > lastYear) { lastYear = obsDate.getFullYear(); }

if (levelNum < minLevel) { minLevel = levelNum; }

if (obsDate.getMonth() < firstMonth) { firstMonth = obsDate.getMonth(); }

if (levelNum > maxLevel) { maxLevel = levelNum; }

if (obsDate.getMonth() > lastMonth) { lastMonth = obsDate.getMonth(); }

if (levelNum < minLevel) { minLevel = levelNum; }

if (levelNum > maxLevel) { maxLevel = levelNum; }

// If image, get filename

if (resultItem.Tiedosto[0] != undefined) {

images++;

searchStr2 = "action=query&prop=imageinfo&iiprop=url&format=json&titles=";

searchStr2 += encodeURIComponent(resultItem.Tiedosto[0]);

jQuery.ajax({

type: 'GET',

url: queryApi,

data: searchStr2,

dataType: 'jsonp',

index: zi,

success: function(request2) {

for (var x in request2.query.pages) {

imagesArr[this.index] = request2.query.pages[x].imageinfo[0].url;

break;

}

images--;

},

error: function() { images--; }

});

}

if (obsDate.getFullYear() < curYear) {

meanValuesArr.push(new Object( { days: obsDate.getDayOfYear(), level: levelNum, weight: 1 }));

}

function imagesLoaded() {

@@ Rivi 7: / Rivi 7: @@
    		  		setTimeout( function(){ <!--{$id|default:drawWaterLevelChart|escape:'html'}-->_jQueryTest() }, 300);
    		  	} else {
-   		  		google.load('visualization', '1.0', {'packages':['corechart']});
+   		  		google.charts.load( 'current', { 'packages':[ 'corechart' ], 'language': 'fi' } );
-				google.setOnLoadCallback(<!--{$id|default:drawWaterLevelChart|escape:'html'}-->_func);
+				google.charts.setOnLoadCallback(<!--{$id|default:drawWaterLevelChart|escape:'html'}-->_func);
    		  	}
    		}
@@ Rivi 23: / Rivi 23: @@
 	    			searchStr += encodeURI("[[Tyyppi::Vedenkorkeus]]");
-				searchStr += encodeURI("|?Päivämäärä|?Vedenkorkeus|?Tiedosto|?Lisätiedot|sort=Päivämäärä|limit=10000");
+				searchStr += encodeURI("|?Päivämäärä|?Vedenkorkeus|?Tiedosto|?Lisätiedot|sort=Päivämäärä|limit=20000");
 				searchStr += '&format=json';
 				jQuery.ajax({
@@ Rivi 58: / Rivi 58: @@
 						zi = -1;
 						for (var i in request.query.results) {
 							zi++;
 							resultItem = request.query.results[i].printouts;
 							obsDate = new Date(toDateFromSecsSince1970(resultItem.Päivämäärä[0].timestamp));
-							console.log(resultItem);
-							levelNum = resultItem.Vedenkorkeus[0].value;
+							if ( typeof resultItem.Vedenkorkeus[0].value != 'undefined' ) {
-							if (resultItem.Lisätiedot[0] != undefined) { freeTxt = resultItem.Lisätiedot[0]; }
-							else { freeText = ''; }
+								levelNum = resultItem.Vedenkorkeus[0].value;
-	    						if (obsDate.getFullYear() < firstYear) { firstYear = obsDate.getFullYear(); }
+								if (resultItem.Lisätiedot[0] != undefined) { freeTxt = resultItem.Lisätiedot[0]; }
-	    						if (obsDate.getFullYear() > lastYear) { lastYear = obsDate.getFullYear(); }
+								else { freeText = ''; }
-	    						if (obsDate.getMonth() < firstMonth) { firstMonth = obsDate.getMonth(); }
+								if (obsDate.getFullYear() < firstYear) { firstYear = obsDate.getFullYear(); }
-	    						if (obsDate.getMonth() > lastMonth) { lastMonth = obsDate.getMonth(); }
+								if (obsDate.getFullYear() > lastYear) { lastYear = obsDate.getFullYear(); }
-	                      				if (levelNum < minLevel) { minLevel = levelNum; }
+								if (obsDate.getMonth() < firstMonth) { firstMonth = obsDate.getMonth(); }
-	                        			if (levelNum > maxLevel) { maxLevel = levelNum; }
+								if (obsDate.getMonth() > lastMonth) { lastMonth = obsDate.getMonth(); }
+								if (levelNum < minLevel) { minLevel = levelNum; }
+								if (levelNum > maxLevel) { maxLevel = levelNum; }
-	                        			// If image, get filename
+								// If image, get filename
-	                        			if (resultItem.Tiedosto[0] != undefined) {
+								if (resultItem.Tiedosto[0] != undefined) {
-	                        				images++;
+									images++;
-								searchStr2 = "action=query&prop=imageinfo&iiprop=url&format=json&titles=";
+									searchStr2 = "action=query&prop=imageinfo&iiprop=url&format=json&titles=";
-								searchStr2 += encodeURIComponent(resultItem.Tiedosto[0]);
+									searchStr2 += encodeURIComponent(resultItem.Tiedosto[0]);
-								jQuery.ajax({
+									jQuery.ajax({
-									type: 'GET',
+										type: 'GET',
-									url: queryApi,
+										url: queryApi,
-									data: searchStr2,
+										data: searchStr2,
-									dataType: 'jsonp',
+										dataType: 'jsonp',
-									index: zi,
+										index: zi,
-									success: function(request2) {
+										success: function(request2) {
-										for (var x in request2.query.pages) {
+											for (var x in request2.query.pages) {
-											imagesArr[this.index] = request2.query.pages[x].imageinfo[0].url;
+												imagesArr[this.index] = request2.query.pages[x].imageinfo[0].url;
-											break;
+												break;
-  										}
+											}
-										images--;
+											images--;
-									},
+										},
-									error: function() { images--; }
+										error: function() { images--; }
-								});
+									});
-							}
+								}
-							if (obsDate.getFullYear() < curYear) {
+								if (obsDate.getFullYear() < curYear) {
-								meanValuesArr.push(new Object( { days: obsDate.getDayOfYear(), level: levelNum, weight: 1 }));
+									meanValuesArr.push(new Object( { days: obsDate.getDayOfYear(), level: levelNum, weight: 1 }));
+								}
 							}
-	                    }
+	                    			}
 						function imagesLoaded() {

Widget:Water level graph

Nykyinen versio 14. elokuuta 2023 kello 11.16