diff --git a/app/View/Jobs/index.ctp b/app/View/Jobs/index.ctp index d609cec43..d37ffac26 100644 --- a/app/View/Jobs/index.ctp +++ b/app/View/Jobs/index.ctp @@ -58,8 +58,32 @@ Paginator->sort('status');?> Paginator->sort('retries');?> Paginator->sort('progress');?> - $item): ?> + + $item): + $progress = '100'; + $startRefreshing = false; + if ($item['Job']['failed']) { + $progress_message = 'Failed'; + $progress_bar_type = 'progress progress-danger active'; + } else if (!$item['Job']['worker_status']) { + $progress_message = 'No worker active'; + $progress_bar_type = 'progress progress-striped progress-warning active'; + } else if ($item['Job']['progress'] == 0) { + $progress_bar_type = 'progress progress-striped progress-queued active'; + $progress_message = 'Queued'; + } else { + $progress = h($item['Job']['progress']); + if ($item['Job']['progress'] == 100) { + $progress_bar_type = 'progress'; + $progress_message = 'Completed'; + } else { + $progress_bar_type = 'progress progress-striped'; + $progress_message = $item['Job']['progress'] . '%'; + $startRefreshing = true; + } + } +?>     @@ -70,22 +94,34 @@       -   + + + + +   -
-
+
+
0 && $item['Job']['progress'] < 100) echo h($item['Job']['progress']) . '%'; - if ($item['Job']['progress'] == 100) echo 'Completed.'; + echo h($progress_message); ?>
- - - + + +