diff --git a/src/www/qserv/js/IngestContributions.js b/src/www/qserv/js/IngestContributions.js index cdd0194eb..2887c85ee 100644 --- a/src/www/qserv/js/IngestContributions.js +++ b/src/www/qserv/js/IngestContributions.js @@ -123,27 +123,28 @@ function(CSSLoader, -
+
- +
@@ -330,8 +331,8 @@ function(CSSLoader, this._form_control('input', 'contrib-chunk').val(''); this._form_control('select', 'contrib-overlap').val(''); this._form_control('select', 'contrib-async').val(''); - this._form_control('select', 'contrib-status').val(''); - this._form_control('select', 'contrib-stage').val(''); + this._form_control('select', 'contrib-status').val('IN_PROGRESS'); + this._form_control('select', 'contrib-stage').val('!QUEUED'); } _disable_controls(disable) { this.fwk_app_container.find(".form-control").prop('disabled', disable); @@ -455,9 +456,9 @@ function(CSSLoader, // Compute the 'stage' attribute of the IN_PROGRESS contribution requests // based on the timestamps. if (file.status === 'IN_PROGRESS') { - if (!file.start_time) file.stage = '1:QUEUED'; - else if (!file.read_time) file.stage = '2:READING_DATA'; - else if (!file.load_time) file.stage = '3:LOADING_MYSQL'; + if (!file.start_time) file.stage = 'QUEUED'; + else if (!file.read_time) file.stage = 'READING_DATA'; + else if (!file.load_time) file.stage = 'LOADING_MYSQL'; } else { file.stage = ''; } @@ -552,7 +553,11 @@ function(CSSLoader, if (file.status === 'FINISHED') continue; } else if (file.status !== status) continue; } - if (stageIsSet && (file.status === 'IN_PROGRESS') && (file.stage !== stage)) continue; + if (stageIsSet && (file.status === 'IN_PROGRESS')) { + if (stage === '!QUEUED') { + if ((file.stage !== 'READING_DATA') && (file.stage !== 'LOADING_MYSQL')) continue; + } else if (file.stage !== stage) continue; + } numSelect++; const overlapStr = file.overlap ? 1 : 0; const asyncStr = file.async ? 'ASYNC' : 'SYNC';