Ero sivun ”Widget:Levätaulukko” versioiden välillä

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

Rivi 1:

<includeonly><div id="_container">Ladataan tietoja, odota..</div>

<div id="_container"><p class="ingressi">Ladataan tietoja, odota...</p></div>

Rivi 14:

Rivi 15:

var vuosi = "";

var ~~ely~~ = ~~decodeURI(~~"");

var alue = "";

ely = ely.replace('ELY', 'elinkeino-, liikenne- ja ympäristökeskus');

var ely, meri;

~~var~~ meri = ~~""~~;

~~if (meri == "Sisävedet") { meri = "0";~~ }

if ( alue == 'Sisävedet' ) {

~~else if (meri == "Merialueet") { meri = "1"; }~~

ely = 'ei';

meri = 0;

} else if ( alue == 'Merialue' ) {

ely = 'ei';

meri = 1;

} else {

ely = alue.replace( 'ELY', 'elinkeino-, liikenne- ja ympäristökeskus' );

meri = 2;

}

var kunta = "";

Rivi 43:

Rivi 52:

else if (meri == "1") { searchStr += encodeURI("[[Vesistö::Meri]]"); }

searchStr += '&format=json';

Rivi 53:

Rivi 62:

dataType: 'jsonp'

});

~~console.log( queryApi + '?' + searchStr );~~

function progressIndicator(d) {

jQuery('#_container').html('Ladataan tietoja (' + (maxRows-d) + '/' + maxRows + ')');

Rivi 59:

Rivi 68:

function success(request) {

console.log(request);

reqSuccess = true;

if (request.query.~~results != undefined~~) {

if ( request.query.meta.count > 0 ) {

var output = "";

Rivi 68:

Rivi 77:

var lastWeek = 0;

output += '<div class="mw-content-ltr">'

output += '<table width="100%" class="tablesorter sortable jquery-tablesorter wikitable smwtable ~~smalltable2~~" id="" >';

output += '<table width="100%" class="tablesorter sortable jquery-tablesorter wikitable smwtable Xsmalltable2 tablecompact" id="" >';

output += '<thead><tr>';

output += '<th class="headerSort" style="text-align: left;"></th>';

output += '<th class="headerSort " style="text-align: left;"></th>';

output += '<th class="headerSort" style="text-align: left;">Vesistö</th>';

output += '<th class="headerSort" style="text-align: left;">Nimi</th>';

output += '<th class="headerSort" style="text-align: left;">Kunta</th>';

output += '<th class="headerSort headerSortSmall" style="text-align: center;">23</th>';

output += '<th class="headerSort ~~headerSortSmall~~" style="text-align: center;">24</th>';

output += '<th class="headerSort headerSort-compact" style="text-align: center;">24</th>';

output += '<th class="headerSort ~~headerSortSmall~~" style="text-align: center;">25</th>';

output += '<th class="headerSort headerSort-compact" style="text-align: center;">25</th>';

output += '<th class="headerSort ~~headerSortSmall~~" style="text-align: center;">26</th>';

output += '<th class="headerSort headerSort-compact" style="text-align: center;">26</th>';

output += '<th class="headerSort ~~headerSortSmall~~" style="text-align: center;">27</th>';

output += '<th class="headerSort headerSort-compact" style="text-align: center;">27</th>';

output += '<th class="headerSort ~~headerSortSmall~~" style="text-align: center;">28</th>';

output += '<th class="headerSort headerSort-compact" style="text-align: center;">28</th>';

output += '<th class="headerSort ~~headerSortSmall~~" style="text-align: center;">29</th>';

output += '<th class="headerSort headerSort-compact" style="text-align: center;">29</th>';

output += '<th class="headerSort ~~headerSortSmall~~" style="text-align: center;">30</th>';

output += '<th class="headerSort headerSort-compact" style="text-align: center;">30</th>';

output += '<th class="headerSort ~~headerSortSmall~~" style="text-align: center;">31</th>';

output += '<th class="headerSort headerSort-compact" style="text-align: center;">31</th>';

output += '<th class="headerSort ~~headerSortSmall~~" style="text-align: center;">32</th>';

output += '<th class="headerSort headerSort-compact" style="text-align: center;">32</th>';

output += '<th class="headerSort ~~headerSortSmall~~" style="text-align: center;">33</th>';

output += '<th class="headerSort headerSort-compact" style="text-align: center;">33</th>';

output += '<th class="headerSort ~~headerSortSmall~~" style="text-align: center;">34</th>';

output += '<th class="headerSort headerSort-compact" style="text-align: center;">34</th>';

output += '<th class="headerSort ~~headerSortSmall~~" style="text-align: center;">35</th>';

output += '<th class="headerSort headerSort-compact" style="text-align: center;">35</th>';

output += '<th class="headerSort ~~headerSortSmall~~" style="text-align: center;">36</th>';

output += '<th class="headerSort headerSort-compact" style="text-align: center;">36</th>';

output += '<th class="headerSort ~~headerSortSmall~~" style="text-align: center;">37</th>';

output += '<th class="headerSort headerSort-compact" style="text-align: center;">37</th>';

output += '<th class="headerSort ~~headerSortSmall~~" style="text-align: center;">38</th>';

output += '<th class="headerSort headerSort-compact" style="text-align: center;">38</th>';

output += '<th class="headerSort ~~headerSortSmall~~" style="text-align: center;">39</th>';

output += '<th class="headerSort headerSort-compact" style="text-align: center;">39</th>';

output += '</tr></thead><tbody>';

Rivi 104:

Rivi 113:

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

resultPage = resultItem.SiteID[0];

~~siteIDs[resultPage] = resultPage;~~

if (dataArr[resultPage] == undefined) {

Rivi 111:

Rivi 118:

dataArr[resultPage] = new Object();

dataArr[resultPage].url = "//www.jarviwiki.fi/wiki/index.php?curid=" + resultPage;

dataArr[resultPage].SiteName = resultItem.SiteName[0].fulltext;

if (resultItem.Vesistö[0] == 'Meri') {

dataArr[resultPage].sea = true;

Rivi 135:

Rivi 143:

resultWeek = resultItem.Viikko[0];

dataArr[resultPage].weeks[resultWeek] = resultItem.Levätilanne[0];

}

Rivi 150:

Rivi 159:

output += '<td data-sort-value="1" valign="middle" class="smwtype_qty">';

output += '<a href="' + site.url + '" title="' + site.title + '">';

output += '<img alt="Merialue" src="//www.jarviwiki.fi/w/images/a/ac/Pm_hp_asiantuntija_1_27x27.png" width="27" height="27" style="vertical-align: middle" />';

output += '<img alt="Merialue" src="//www.jarviwiki.fi/images/a/ac/Pm_hp_asiantuntija_1_27x27.png" width="27" height="27" style="vertical-align: middle" />';

output += '</a></td>';

} else {

output += '<td data-sort-value="0" valign="middle" class="smwtype_qty">';

output += '<a href="' + site.url + '" title="' + site.title + '">';

output += '<img alt="Sisävesi" src="//www.jarviwiki.fi/w/images/f/f3/Pm_hp_asiantuntija_2_27x27.png" width="27" height="27" style="vertical-align: middle" />';

output += '<img alt="Sisävesi" src="//www.jarviwiki.fi/images/f/f3/Pm_hp_asiantuntija_2_27x27.png" width="27" height="27" style="vertical-align: middle" />';

output += '</a></td>';

}

output += '<td class="smwtype_wpg"><a href="' + site.wBodyUrl + '">' + site.wBody + '</a></td>';

nimi = site.title.substr(site.title.lastIndexOf('/'));

nimi = site.SiteName.substr(site.SiteName.lastIndexOf('/')); //site.title.substr(site.title.lastIndexOf('/'));

if (nimi.indexOf('(') != -1) {

nimi = nimi.substr(nimi.indexOf('('));

Rivi 197:

Rivi 208:

output += '</tbody><tfoot></tfoot></table></div>';

if (meripaikkoja) {

output += '<div style="border: 0; float: left; margin-left: 13px;"><p class="kuvateksti"><a href="/w/images/a/ac/Pm_hp_asiantuntija_1_27x27.png"><img alt="Merialue" src="/w/images/thumb/a/ac/Pm_hp_asiantuntija_1_27x27.png/21px-Pm_hp_asiantuntija_1_27x27.png" width="21" height="21" /></a> = Merialueen havaintopaikka</p></div>';

//output += '<div style="border: 0; float: left; margin-left: 13px;"><p class="kuvateksti"><a href="/images/a/ac/Pm_hp_asiantuntija_1_27x27.png"><img alt="Merialue" src="/images/thumb/a/ac/Pm_hp_asiantuntija_1_27x27.png/21px-Pm_hp_asiantuntija_1_27x27.png" width="21" height="21" /></a> = Merialueen havaintopaikka</p></div>';

}

output += '<div style="border: 0; float: right;"><p class="kuvateksti"> 0 = Ei levää | 1 = Hieman levää | 2 = Runsaasti levää | 3 = Erittäin runsaasti levää | - = Ei havaintoa</p></div>';

~~output += '<div style="clear: both;"></div>';~~

output += '</div>';

Rivi 207:

Rivi 216:

}

~~function gotSiteIDs(IDsReq) {~~

doRows();

~~if (!!IDsReq.query.pages) {~~

~~for (var id in IDsReq.query.pages) {~~

} else {

~~if ( typeof IDsReq.query.pages[id].title === "undefined" ) {~~

~~dataArr[id].title = "-";~~

jQuery("#_container").html( '<p class="ingressi">Hakuehtojen mukaisia tietoja ei löytynyt.</p>' );

~~} else {~~

~~dataArr[id].title = IDsReq.query.pages[id].title;~~

}

~~IDblocks--;~~

~~if (IDblocks == 0) {~~

doRows();

}

~~var siteIDsArr = new Array();~~

~~for (var id in siteIDs) {~~

~~siteIDsArr.push(siteIDs[id]);~~

}

~~var IDblocks = 0;~~

~~if (siteIDsArr.length > 0) {~~

~~for (b=0; b < siteIDsArr.length; b+=50) {~~

~~IDblocks++;~~

~~searchSiteID = 'action=query&pageids=' + siteIDsArr.slice(b, b+50).join(encodeURI('|')) + '&format=json';~~

~~jQuery.ajax({~~

~~type: 'POST',~~

~~cache: false,~~

~~url: queryApi,~~

~~data: searchSiteID,~~

~~dataType: 'jsonp',~~

~~success: gotSiteIDs~~

~~});~~

}

} else {

~~doRows();~~

}

~~} else {~~

jQuery('#').html('Hakuehtojen mukaisia tietoja ei löytynyt');

}

//alert(exportCsv);

Rivi 262:

Rivi 235:

//window.open('data:text/csv;charset=utf-8,' + escape(exportCsv));

}

</script></includeonly>

</script>

</includeonly>

@@ Rivi 1: / Rivi 1: @@
-<includeonly><div id="<!--{$id|default:JwAlgalTable|escape:'html'}-->_container">Ladataan tietoja, odota..</div>
+<includeonly>
+<div id="<!--{$id|default:JwAlgalTable|escape:'html'}-->_container"><p class="ingressi">Ladataan tietoja, odota...</p></div>
 <script type="text/javascript">
@@ Rivi 14: / Rivi 15: @@
 		var vuosi = "<!--{$vuosi|default:1998|escape:'html'}-->";
-		var ely = decodeURI("<!--{$ely|default:ei|escape:'html'}-->");
+		var alue = "<!--{$alue|escape:'html'}-->";
-		ely = ely.replace('ELY', 'elinkeino-, liikenne- ja ympäristökeskus');
+		var ely, meri;
-		var meri = "<!--{$meri|default:2|escape:'html'}-->";
-		if (meri == "Sisävedet") { meri = "0"; }
+		if ( alue == 'Sisävedet' ) {
-		else  if (meri == "Merialueet") { meri = "1"; }
+			ely = 'ei';
+			meri = 0;
+		} else if ( alue == 'Merialue' ) {
+			ely = 'ei';
+			meri = 1;
+		} else {
+			ely = alue.replace( 'ELY', 'elinkeino-, liikenne- ja ympäristökeskus' );
+			meri = 2;
+		}
 		var kunta = "<!--{$kunta|default:ei|escape:'html'}-->";
@@ Rivi 43: / Rivi 52: @@
 		else if (meri == "1") { searchStr += encodeURI("[[Vesistö::Meri]]"); }
-		searchStr += encodeURI("|?Havainto|?SiteID|?Vesistö|?Alue|?Järvi|?Vesistöalue|?Kunta|?Viikko|?Päivämäärä|?Levätilanne|sort=Päivämäärä|limit=10000");
+		searchStr += encodeURI("|?SiteID|?SiteName|?Vesistö|?Alue|?Järvi|?Vesistöalue|?Kunta|?Viikko|?Levätilanne|limit=20000");
 		searchStr += '&format=json';
@@ Rivi 53: / Rivi 62: @@
 				dataType: 'jsonp'
 		});
-console.log( queryApi + '?' + searchStr );
 		function progressIndicator(d) {
 			jQuery('#<!--{$id|default:JwAlgalTable|escape:'html'}-->_container').html('Ladataan tietoja (' + (maxRows-d) + '/' + maxRows + ')');
@@ Rivi 59: / Rivi 68: @@
 		function success(request) {
-console.log(request);
+			console.log(request);
 			reqSuccess = true;
-			if (request.query.results != undefined) {
+			if ( request.query.meta.count > 0 ) {
 				var output = "";
@@ Rivi 68: / Rivi 77: @@
 				var lastWeek = 0;
 				output += '<div class="mw-content-ltr">'
-				output += '<table width="100%" class="tablesorter sortable jquery-tablesorter wikitable smwtable smalltable2" id="<!--{$id|default:JwAlgalTable|escape:'html'}-->" >';
+				output += '<table width="100%" class="tablesorter sortable jquery-tablesorter wikitable smwtable Xsmalltable2 tablecompact" id="<!--{$id|default:JwAlgalTable|escape:'html'}-->" >';
 				output += '<thead><tr>';
-				output += '<th class="headerSort" style="text-align: left;"></th>';
+				output += '<th class="headerSort " style="text-align: left;"></th>';
 				output += '<th class="headerSort" style="text-align: left;">Vesistö</th>';
 				output += '<th class="headerSort" style="text-align: left;">Nimi</th>';
 				output += '<th class="headerSort" style="text-align: left;">Kunta</th>';
 				output += '<th class="headerSort headerSortSmall" style="text-align: center;">23</th>';
-				output += '<th class="headerSort headerSortSmall" style="text-align: center;">24</th>';
+				output += '<th class="headerSort headerSort-compact" style="text-align: center;">24</th>';
-				output += '<th class="headerSort headerSortSmall" style="text-align: center;">25</th>';
+				output += '<th class="headerSort headerSort-compact" style="text-align: center;">25</th>';
-				output += '<th class="headerSort headerSortSmall" style="text-align: center;">26</th>';
+				output += '<th class="headerSort headerSort-compact" style="text-align: center;">26</th>';
-				output += '<th class="headerSort headerSortSmall" style="text-align: center;">27</th>';
+				output += '<th class="headerSort headerSort-compact" style="text-align: center;">27</th>';
-				output += '<th class="headerSort headerSortSmall" style="text-align: center;">28</th>';
+				output += '<th class="headerSort headerSort-compact" style="text-align: center;">28</th>';
-				output += '<th class="headerSort headerSortSmall" style="text-align: center;">29</th>';
+				output += '<th class="headerSort headerSort-compact" style="text-align: center;">29</th>';
-				output += '<th class="headerSort headerSortSmall" style="text-align: center;">30</th>';
+				output += '<th class="headerSort headerSort-compact" style="text-align: center;">30</th>';
-				output += '<th class="headerSort headerSortSmall" style="text-align: center;">31</th>';
+				output += '<th class="headerSort headerSort-compact" style="text-align: center;">31</th>';
-				output += '<th class="headerSort headerSortSmall" style="text-align: center;">32</th>';
+				output += '<th class="headerSort headerSort-compact" style="text-align: center;">32</th>';
-				output += '<th class="headerSort headerSortSmall" style="text-align: center;">33</th>';
+				output += '<th class="headerSort headerSort-compact" style="text-align: center;">33</th>';
-				output += '<th class="headerSort headerSortSmall" style="text-align: center;">34</th>';
+				output += '<th class="headerSort headerSort-compact" style="text-align: center;">34</th>';
-				output += '<th class="headerSort headerSortSmall" style="text-align: center;">35</th>';
+				output += '<th class="headerSort headerSort-compact" style="text-align: center;">35</th>';
-				output += '<th class="headerSort headerSortSmall" style="text-align: center;">36</th>';
+				output += '<th class="headerSort headerSort-compact" style="text-align: center;">36</th>';
-				output += '<th class="headerSort headerSortSmall" style="text-align: center;">37</th>';
+				output += '<th class="headerSort headerSort-compact" style="text-align: center;">37</th>';
-				output += '<th class="headerSort headerSortSmall" style="text-align: center;">38</th>';
+				output += '<th class="headerSort headerSort-compact" style="text-align: center;">38</th>';
-				output += '<th class="headerSort headerSortSmall" style="text-align: center;">39</th>';
+				output += '<th class="headerSort headerSort-compact" style="text-align: center;">39</th>';
 				output += '</tr></thead><tbody>';
@@ Rivi 104: / Rivi 113: @@
 					resultItem = request.query.results[i].printouts;
 					resultPage = resultItem.SiteID[0];
-					siteIDs[resultPage] = resultPage;
 					if (dataArr[resultPage] == undefined) {
@@ Rivi 111: / Rivi 118: @@
 						dataArr[resultPage] = new Object();
 						dataArr[resultPage].url = "//www.jarviwiki.fi/wiki/index.php?curid=" + resultPage;
+						dataArr[resultPage].SiteName = resultItem.SiteName[0].fulltext;
 						if (resultItem.Vesistö[0] == 'Meri') {
 							dataArr[resultPage].sea = true;
@@ Rivi 135: / Rivi 143: @@
 					resultWeek = resultItem.Viikko[0];
 					dataArr[resultPage].weeks[resultWeek] = resultItem.Levätilanne[0];
 				}
@@ Rivi 150: / Rivi 159: @@
 							output += '<td data-sort-value="1" valign="middle" class="smwtype_qty">';
 							output += '<a href="' + site.url + '" title="' + site.title + '">';
-							output += '<img alt="Merialue" src="//www.jarviwiki.fi/w/images/a/ac/Pm_hp_asiantuntija_1_27x27.png" width="27" height="27" style="vertical-align: middle" />';
+							output += '<img alt="Merialue" src="//www.jarviwiki.fi/images/a/ac/Pm_hp_asiantuntija_1_27x27.png" width="27" height="27" style="vertical-align: middle" />';
 							output += '</a></td>';
 						} else {
 							output += '<td data-sort-value="0" valign="middle" class="smwtype_qty">';
 							output += '<a href="' + site.url + '" title="' + site.title + '">';
-							output += '<img alt="Sisävesi" src="//www.jarviwiki.fi/w/images/f/f3/Pm_hp_asiantuntija_2_27x27.png" width="27" height="27" style="vertical-align: middle" />';
+							output += '<img alt="Sisävesi" src="//www.jarviwiki.fi/images/f/f3/Pm_hp_asiantuntija_2_27x27.png" width="27" height="27" style="vertical-align: middle" />';
 							output += '</a></td>';
 						}
 						output += '<td class="smwtype_wpg"><a href="' +  site.wBodyUrl + '">' + site.wBody + '</a></td>';
-						nimi = site.title.substr(site.title.lastIndexOf('/'));
+						nimi = site.SiteName.substr(site.SiteName.lastIndexOf('/')); //site.title.substr(site.title.lastIndexOf('/'));
 						if (nimi.indexOf('(') != -1) {
 							nimi = nimi.substr(nimi.indexOf('('));
@@ Rivi 197: / Rivi 208: @@
 					output += '</tbody><tfoot></tfoot></table></div>';
 					if (meripaikkoja) {
-						output += '<div style="border: 0; float: left; margin-left: 13px;"><p class="kuvateksti"><a  href="/w/images/a/ac/Pm_hp_asiantuntija_1_27x27.png"><img alt="Merialue" src="/w/images/thumb/a/ac/Pm_hp_asiantuntija_1_27x27.png/21px-Pm_hp_asiantuntija_1_27x27.png" width="21" height="21" /></a> = Merialueen havaintopaikka</p></div>';
+						//output += '<div style="border: 0; float: left; margin-left: 13px;"><p class="kuvateksti"><a  href="/images/a/ac/Pm_hp_asiantuntija_1_27x27.png"><img alt="Merialue" src="/images/thumb/a/ac/Pm_hp_asiantuntija_1_27x27.png/21px-Pm_hp_asiantuntija_1_27x27.png" width="21" height="21" /></a> = Merialueen havaintopaikka</p></div>';
 					}
-					output += '<div style="border: 0; float: right;"><p class="kuvateksti"> 0 = Ei levää &#124; 1 = Hieman levää &#124; 2 = Runsaasti levää &#124; 3 = Erittäin runsaasti levää &#124; - = Ei havaintoa</p></div>';
-					output += '<div style="clear: both;"></div>';
 					output += '</div>';
@@ Rivi 207: / Rivi 216: @@
 				}
-				function gotSiteIDs(IDsReq) {
+				doRows();
-					if (!!IDsReq.query.pages) {
-						for (var id in IDsReq.query.pages) {
+			} else {
-							if ( typeof IDsReq.query.pages[id].title === "undefined" ) {
-								dataArr[id].title = "-";
+				jQuery("#<!--{$id|default:JwAlgalTable|escape:'html'}-->_container").html( '<p class="ingressi">Hakuehtojen mukaisia tietoja ei löytynyt.</p>' );
-							} else {
-								dataArr[id].title = IDsReq.query.pages[id].title;
-							}
-						}
-					}
-					IDblocks--;
-					if (IDblocks == 0) {
-						doRows();
-					}
-				}
-				var siteIDsArr = new Array();
-				for (var id in siteIDs) {
-					siteIDsArr.push(siteIDs[id]);
-				}
-				var IDblocks = 0;
-				if (siteIDsArr.length > 0) {
-					for (b=0; b < siteIDsArr.length; b+=50) {
-						IDblocks++;
-						searchSiteID = 'action=query&pageids=' + siteIDsArr.slice(b, b+50).join(encodeURI('|')) + '&format=json';
-						jQuery.ajax({
-							type: 'POST',
-							cache: false,
-							url: queryApi,
-							data: searchSiteID,
-							dataType: 'jsonp',
-							success: gotSiteIDs
-						});
-					}
-				} else {
-					doRows();
-				}
-			} else {
-				jQuery('#<!--{$id|default:JwAlgalTable|escape:'html'}-->').html('Hakuehtojen mukaisia tietoja ei löytynyt');
 			}
 		   //alert(exportCsv);
@@ Rivi 262: / Rivi 235: @@
 			//window.open('data:text/csv;charset=utf-8,' + escape(exportCsv));
 		}
 	}
-</script></includeonly>
+</script>
+</includeonly>

Widget:Levätaulukko

Nykyinen versio 5. toukokuuta 2025 kello 12.06