diff --git a/pandora_console/godmode/wizards/DiscoveryTaskList.class.php b/pandora_console/godmode/wizards/DiscoveryTaskList.class.php index 995116ac19..7faacca204 100644 --- a/pandora_console/godmode/wizards/DiscoveryTaskList.class.php +++ b/pandora_console/godmode/wizards/DiscoveryTaskList.class.php @@ -769,6 +769,7 @@ class DiscoveryTaskList extends HTML $_rs = $this->getStatusMessage($task); $can_be_reviewed = $_rs['can_be_reviewed']; $data[5] = $_rs['message']; + ; switch ($task['type']) { case DISCOVERY_CLOUD_AZURE_COMPUTE: @@ -1268,7 +1269,7 @@ class DiscoveryTaskList extends HTML $status = db_get_value('status', 'trecon_task', 'id_rt', $id_task); if ($status < 0) { - $status = 100; + $status = '100'; } echo json_encode($status); @@ -1287,7 +1288,6 @@ class DiscoveryTaskList extends HTML $result = '
'; $result .= '
'; $result .= ''._('Overall Progress').''; - $result .= '
'; $result .= progress_circular_bar( $task['id_rt'], @@ -1988,7 +1988,7 @@ class DiscoveryTaskList extends HTML if ($task['status'] == -2) { $status = __('Failed'); } else { - $status = __('Done'); + $status = __('Pending'); } } else if ($task['utimestamp'] == 0 && empty($task['summary']) diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php index 171f6c6b42..28b82739f3 100755 --- a/pandora_console/include/functions_ui.php +++ b/pandora_console/include/functions_ui.php @@ -3612,10 +3612,20 @@ function ui_progress( page: "'.$ajax['page'].'" }, success: function(data) { + let data_text = data; + if (data.includes("script")) { + const data_array = data_text.split("/script>"); + data = data_array[1]; + } try { val = JSON.parse(data); + $("#'.$id.'").attr("data-label", val + " %"); - $("#'.$id.'_progress").width(val+"%");'; + $("#'.$id.'_progress").width(val+"%"); + let parent_id = $("#'.$id.'").parent().parent().attr("id"); + if (val == 100) { + $("#"+parent_id+"-5").html("'.__('Finish').'"); + }'; if (isset($ajax['oncomplete'])) { $output .= ' if (val == 100) {