diff --git a/module/testtask/js/results.js b/module/testtask/js/results.js index 693f7741e2..b338774be6 100644 --- a/module/testtask/js/results.js +++ b/module/testtask/js/results.js @@ -32,9 +32,17 @@ $(function() } else { + var times = 0; + var id = $('tr:first').data('id') + var link = createLink('testtask', 'ajaxGetResult', 'resultID=' + id); + var resultInterval = setInterval(() => { - var id = $('tr:first').data('id') - var link = createLink('testtask', 'ajaxGetResult', 'resultID=' + id); + times++; + if(times > 600) + { + clearInterval(resultInterval); + } + $.get(link, function(task) { task = JSON.parse(task); @@ -46,7 +54,6 @@ $(function() } }); }, 1000); - } $('#casesResults').click(function(event) diff --git a/module/testtask/view/runcase.html.php b/module/testtask/view/runcase.html.php index c62b577e36..68e1d3ebd4 100644 --- a/module/testtask/view/runcase.html.php +++ b/module/testtask/view/runcase.html.php @@ -137,6 +137,32 @@ $(function() }); $('#casesResults table caption .result-tip').html($('#resultTip').html()); + + if($('.result-item:first').data('status') == 'running') + { + var times = 0; + var id = $('.result-item:first').data('id') + var link = createLink('testtask', 'ajaxGetResult', 'resultID=' + id); + + var resultInterval = setInterval(() => { + times++; + if(times > 600) + { + clearInterval(resultInterval); + } + + $.get(link, function(task) + { + task = JSON.parse(task); + task = task.data; + if(task.ZTFResult != '') + { + clearInterval(resultInterval); + window.location.reload(); + } + }); + }, 1000); + } }); }); var sessionString = '';