kasper/seisobs-webapp
1
0
Fork 0
Code Issues 7 Pull Requests Releases 1 Wiki Activity

Use cachec events list.

Browse Source
This commit is contained in:
Kasper D. Fischer 2014-06-25 15:35:39 +00:00
parent ad920ee0fc
commit 81204d76c7
Notes: subgit 2018-03-07 17:59:03 +01:00 
r703 www/trunk
1 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
www/events.js
View File

@ -66,7 +66,7 @@ function getGeolocation(id, lat, lng) {
}; };
/* Load events using ajax */ /* Load events using ajax */
function ajaxLoadEvents(stime, etime, id, url, target) { function ajaxLoadEvents(stime, etime, eventid, url, target) {
var mapBounds = map.getBounds(); var mapBounds = map.getBounds();
var request_data = {}; var request_data = {};
var rtime; var rtime;
@ -75,7 +75,7 @@ function ajaxLoadEvents(stime, etime, id, url, target) {
stime = new Date(); stime = new Date();
stime.setDate(stime.getDate()-config['map']['timespan']); stime.setDate(stime.getDate()-config['map']['timespan']);
rtime = new Date(); rtime = new Date();
rtime.setDate(rtime.getDate()-config['ajax']['timespan']); rtime.setDate(rtime.getDate()-Math.min(config['ajax']['timespan'], config['map']['timespan']));
} else { } else {
rtime = stime; rtime = stime;
}; };
@ -83,8 +83,8 @@ function ajaxLoadEvents(stime, etime, id, url, target) {
var ajax_url = url; var ajax_url = url;
request_data = {}; request_data = {};
} else { } else {
if ( id ) { if ( eventid ) {
request_data = { eventid: id }; request_data = { eventid: eventid };
} else { } else {
request_data = { request_data = {
starttime: sprintf("%d-%02d-%02d", rtime.getFullYear(), rtime.getMonth()+1, rtime.getDate()), starttime: sprintf("%d-%02d-%02d", rtime.getFullYear(), rtime.getMonth()+1, rtime.getDate()),
@ -100,6 +100,7 @@ function ajaxLoadEvents(stime, etime, id, url, target) {
}; };
}; };
}; };
//console.log(ajax_url+'?'+$.param(request_data));
if ( etime == '' || !etime ) { etime = new Date(); }; if ( etime == '' || !etime ) { etime = new Date(); };
$.ajax({ $.ajax({
type: "GET", type: "GET",
@ -152,6 +153,7 @@ function ajaxLoadEvents(stime, etime, id, url, target) {
addTableRow(row, target); addTableRow(row, target);
} }
// create marker // create marker
if ((stime <= oTime && etime >= oTime ) || ( id == eventid )) {
var marker = addEventMarker(id, Number(lat), Number(lng), Number(mag), type); var marker = addEventMarker(id, Number(lat), Number(lng), Number(mag), type);
var text = sprintf('<h3 eventid="%s">%s</h3>', id, location) var text = sprintf('<h3 eventid="%s">%s</h3>', id, location)
+ sprintf('<p>Ereignis: %s</br>', id) + sprintf('<p>Ereignis: %s</br>', id)
@ -162,10 +164,10 @@ function ajaxLoadEvents(stime, etime, id, url, target) {
+ sprintf('Zeit: <span class="utctime">%sZ</span></p>', otime.split('.')[0], otime.split('.')[0]); + sprintf('Zeit: <span class="utctime">%sZ</span></p>', otime.split('.')[0], otime.split('.')[0]);
marker.bindPopup(text); marker.bindPopup(text);
}; };
};
}); });
}, },
complete: function () { complete: function () {
initStationTable();
var sort = [[0,1],[1,1],[2,1]]; var sort = [[0,1],[1,1],[2,1]];
$("#eventstable").trigger("update", [true]); $("#eventstable").trigger("update", [true]);
$("#eventstable").trigger("updateCache"); $("#eventstable").trigger("updateCache");
@ -181,7 +183,7 @@ function ajaxLoadEvents(stime, etime, id, url, target) {
}); });
// create events csv download link // create events csv download link
request_data['format'] = 'text'; request_data['format'] = 'text';
if ( id == '' || !id ) { $('#events-csv-link').attr('href', config['ajax']['eventURL']+'?'+$.param(request_data)) }; if ( eventid == '' || !eventid ) { $('#events-csv-link').attr('href', config['ajax']['eventURL']+'?'+$.param(request_data)) };
}; };
/* ajaxLoadEventInfo */ /* ajaxLoadEventInfo */