forked from science-ation/science-ation
Add an ETA calculation to the status
This commit is contained in:
parent
35e4e3cf22
commit
669ef1349c
@ -62,6 +62,13 @@ function getHTTPObject()
|
||||
var http=getHTTPObject();
|
||||
|
||||
|
||||
var starttime=0;
|
||||
var startpercent=0;
|
||||
var deltatime=0;
|
||||
var deltapercent=0;
|
||||
var avgtimeperpercent=0;
|
||||
var remainingpercent=0;
|
||||
var remainingtime=0;
|
||||
|
||||
function updateStatus()
|
||||
{
|
||||
@ -90,6 +97,7 @@ function handleResponse()
|
||||
{
|
||||
document.getElementById('schedulerpercent').innerHTML="100%";
|
||||
document.getElementById('updatestatus').innerHTML="Scheduling Complete";
|
||||
document.getElementById('schedulereta').innerHTML="Complete";
|
||||
}
|
||||
else
|
||||
{
|
||||
@ -97,6 +105,23 @@ function handleResponse()
|
||||
setTimeout('updateStatus()',5000);
|
||||
document.getElementById('updatestatus').innerHTML="Updating... Done!";
|
||||
setTimeout('clearUpdatingMessage()',500);
|
||||
|
||||
var currentTime=new Date();
|
||||
if(starttime==0)
|
||||
{
|
||||
starttime=currentTime.getTime();
|
||||
startpercent=obj[0];
|
||||
}
|
||||
deltatime=currentTime.getTime()-starttime;
|
||||
deltapercent=obj[0]-startpercent;
|
||||
|
||||
avgtimeperpercent=deltatime/deltapercent;
|
||||
remainingpercent=100-obj[0];
|
||||
remainingtime=remainingpercent*avgtimeperpercent;
|
||||
if(remainingtime && obj[0]>0)
|
||||
document.getElementById('schedulereta').innerHTML=Math.round(remainingtime/1000)+" seconds";
|
||||
else
|
||||
document.getElementById('schedulereta').innerHTML="Calculating...";
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -123,6 +148,7 @@ else
|
||||
echo "<table>";
|
||||
echo "<tr><td>".i18n("Scheduler status").":</td><td><div id=\"schedulerstatus\" style=\"font-weight: bold;\"></div></td></tr>";
|
||||
echo "<tr><td>".i18n("Scheduler percent").":</td><td><div id=\"schedulerpercent\" style=\"font-weight: bold;\"></div></td></tr>";
|
||||
echo "<tr><td>".i18n("Scheduler ETA").":</td><td><div id=\"schedulereta\" style=\"font-weight: bold;\"></div></td></tr>";
|
||||
echo "<tr><td align=\"center\" colspan=\"2\"><div id=\"updatestatus\" style=\"font-weight: bold; text-align: center;\"></div></td></tr>";
|
||||
echo "</table>";
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user