kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-31 10:47:00 +00:00
Code Issues Projects Releases Wiki Activity

Lots of new code for new importer routine.

Browse Source
This commit is contained in:
James Cole
2017-06-10 15:09:41 +02:00
parent 0b4efe4ae1
commit 091596e80e
25 changed files with 1415 additions and 423 deletions
Download Patch File Download Diff File Expand all files Collapse all files

103
public/js/ff/import/status.js
View File

@@ -10,6 +10,10 @@
/** global: jobImportUrl, langImportSingleError, langImportMultiError, jobStartUrl, langImportTimeOutError, langImportFinished, langImportFatalError */
var displayStatus = 'initial';
var timeOutId;
var startedImport = false;
var startInterval = 2000;
var interval = 500;
@@ -19,20 +23,85 @@ var stepCount = 0;
$(function () {
"use strict";
$('#import-status-intro').hide();
$('#import-status-more-info').hide();
//$('#import-status-intro').hide();
//$('#import-status-more-info').hide();
// check status, every 500 ms.
setTimeout(checkImportStatus, startInterval);
timeOutId = setTimeout(checkImportStatus, startInterval);
// button to start import routine:
$('.start-job').click(startJob);
});
function startJob() {
console.log('Job started.');
$.post(jobStartUrl);
return false;
}
function checkImportStatus() {
"use strict";
$.getJSON(jobImportUrl).done(reportOnJobImport).fail(failedJobImport);
}
function reportOnJobImport(data) {
"use strict";
displayCorrectBox(data.status);
//updateBar(data);
//reportErrors(data);
//reportStatus(data);
//updateTimeout(data);
//if (importJobFinished(data)) {
// finishedJob(data);
// return;
//}
// same number of steps as last time?
//if (currentLimit > timeoutLimit) {
// timeoutError();
// return;
//}
// if the job has not actually started, do so now:
//if (!data.started && !startedImport) {
// kickStartJob();
// return;
//}
// trigger another check.
//timeOutId = setTimeout(checkImportStatus, interval);
}
function displayCorrectBox(status) {
console.log('Current job state is ' + status);
if(status === 'configured' && displayStatus === 'initial') {
// hide some boxes:
$('.status_initial').hide();
return;
}
console.error('CANNOT HANDLE CURRENT STATE');
}
function importComplete() {
"use strict";
var bar = $('#import-status-bar');
@@ -131,35 +200,7 @@ function finishedJob(data) {
}
function reportOnJobImport(data) {
"use strict";
updateBar(data);
reportErrors(data);
reportStatus(data);
updateTimeout(data);
if (importJobFinished(data)) {
finishedJob(data);
return;
}
// same number of steps as last time?
if (currentLimit > timeoutLimit) {
timeoutError();
return;
}
// if the job has not actually started, do so now:
if (!data.started && !startedImport) {
kickStartJob();
return;
}
// trigger another check.
setTimeout(checkImportStatus, interval);
}
function startedTheImport() {
"use strict";