tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-30 01:05:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

#12207 Fix status discovery task

Browse Source
This commit is contained in:
miguel angel rasteu 2023-10-16 15:47:48 +02:00
parent f0a3b3af63
commit 35cd554257
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pandora_console/godmode/wizards/DiscoveryTaskList.class.php
View File

@ -769,6 +769,7 @@ class DiscoveryTaskList extends HTML
$_rs = $this->getStatusMessage($task); $_rs = $this->getStatusMessage($task);
$can_be_reviewed = $_rs['can_be_reviewed']; $can_be_reviewed = $_rs['can_be_reviewed'];
$data[5] = $_rs['message']; $data[5] = $_rs['message'];
;
switch ($task['type']) { switch ($task['type']) {
case DISCOVERY_CLOUD_AZURE_COMPUTE: case DISCOVERY_CLOUD_AZURE_COMPUTE:
@ -1268,7 +1269,7 @@ class DiscoveryTaskList extends HTML
$status = db_get_value('status', 'trecon_task', 'id_rt', $id_task); $status = db_get_value('status', 'trecon_task', 'id_rt', $id_task);
if ($status < 0) { if ($status < 0) {
$status = 100; $status = '100';
} }
echo json_encode($status); echo json_encode($status);
@ -1287,7 +1288,6 @@ class DiscoveryTaskList extends HTML
$result = '<div class="flex">'; $result = '<div class="flex">';
$result .= '<div class="subtitle">'; $result .= '<div class="subtitle">';
$result .= '<span>'._('Overall Progress').'</span>'; $result .= '<span>'._('Overall Progress').'</span>';
$result .= '<div class="mrgn_top_25px">'; $result .= '<div class="mrgn_top_25px">';
$result .= progress_circular_bar( $result .= progress_circular_bar(
$task['id_rt'], $task['id_rt'],
@ -1988,7 +1988,7 @@ class DiscoveryTaskList extends HTML
if ($task['status'] == -2) { if ($task['status'] == -2) {
$status = __('Failed'); $status = __('Failed');
} else { } else {
$status = __('Done'); $status = __('Pending');
} }
} else if ($task['utimestamp'] == 0 } else if ($task['utimestamp'] == 0
&& empty($task['summary']) && empty($task['summary'])

12
pandora_console/include/functions_ui.php
View File

@ -3612,10 +3612,20 @@ function ui_progress(
page: "'.$ajax['page'].'" page: "'.$ajax['page'].'"
}, },
success: function(data) { success: function(data) {
let data_text = data;
if (data.includes("script")) {
const data_array = data_text.split("/script>");
data = data_array[1];
}
try { try {
val = JSON.parse(data); val = JSON.parse(data);
$("#'.$id.'").attr("data-label", val + " %"); $("#'.$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'])) { if (isset($ajax['oncomplete'])) {
$output .= ' $output .= '
if (val == 100) { if (val == 100) {