tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ent-6894-uniway-estado-pending-en-server-task-aws' into 'develop' 

Task list status

See merge request artica/pandorafms!3759
This commit is contained in:
Daniel Rodriguez 2021-03-17 15:41:14 +00:00
parent 3eb6a8b3c4 61cb8a43c6
commit 0c99745c37
1 changed files with 64 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -667,57 +667,9 @@ class DiscoveryTaskList extends HTML
$data[4] = '-'; $data[4] = '-';
} }
$can_be_reviewed = false; $_rs = $this->getStatusMessage($task);
if (empty($task['summary']) === false $can_be_reviewed = $_rs['can_be_reviewed'];
&& $task['summary'] == 'cancelled' $data[5] = $_rs['message'];
) {
$data[5] = __('Cancelled').ui_print_help_tip(
__('Server has been restarted while executing this task, please retry.'),
true
);
} else if ($task['review_mode'] == DISCOVERY_STANDARD) {
if ($task['type'] == DISCOVERY_APP_VMWARE) {
if ($task['status'] <= 0 && $task['utimestamp'] != 0) {
$data[5] = __('Done');
} else if ($task['status'] > 0) {
$data[5] = __('Pending');
} else {
$data[5] = __('Not started');
}
} else {
if ($task['status'] <= 0
&& empty($task['summary']) === false
) {
$data[5] = __('Done');
} else if ($task['utimestamp'] == 0
&& empty($task['summary'])
) {
$data[5] = __('Not started');
} else {
$data[5] = __('Pending');
}
}
} else {
if ($task['status'] <= 0
&& empty($task['summary']) === false
&& (int) $task['type'] === DISCOVERY_HOSTDEVICES
) {
$can_be_reviewed = true;
$data[5] = '<span class="link review" onclick="show_review('.$task['id_rt'].',\''.$task['name'].'\')">';
$data[5] .= __('Review');
$data[5] .= '</span>';
} else if ($task['utimestamp'] == 0
&& empty($task['summary'])
) {
$data[5] = __('Not started');
} else {
if ($task['review_mode'] == DISCOVERY_RESULTS) {
$data[5] = __('Processing');
} else {
$data[5] = __('Searching');
}
}
}
switch ($task['type']) { switch ($task['type']) {
case DISCOVERY_CLOUD_AZURE_COMPUTE: case DISCOVERY_CLOUD_AZURE_COMPUTE:
@ -1763,4 +1715,65 @@ class DiscoveryTaskList extends HTML
} }
/**
* Generates task status string for given task.
*
* @param array $task Discovery task (retrieved from DB).
*
* @return array Message to be displayed and review status.
*/
public function getStatusMessage(array $task)
{
$status = '';
$can_be_reviewed = false;
if (empty($task['summary']) === false
&& $task['summary'] == 'cancelled'
) {
$status = __('Cancelled').ui_print_help_tip(
__('Server has been restarted while executing this task, please retry.'),
true
);
} else if ($task['review_mode'] == DISCOVERY_STANDARD) {
if ($task['status'] <= 0
&& empty($task['summary']) === false
) {
$status = __('Done');
} else if ($task['utimestamp'] == 0
&& empty($task['summary'])
) {
$status = __('Not started');
} else if ($task['utimestamp'] > 0) {
$status = __('Done');
} else {
$status = __('Pending');
}
} else {
if ($task['status'] <= 0
&& empty($task['summary']) === false
) {
$can_be_reviewed = true;
$status = '<span class="link review" onclick="show_review('.$task['id_rt'].',\''.$task['name'].'\')">';
$status .= __('Review');
$status .= '</span>';
} else if ($task['utimestamp'] == 0
&& empty($task['summary'])
) {
$status = __('Not started');
} else {
if ($task['review_mode'] == DISCOVERY_RESULTS) {
$status = __('Processing');
} else {
$status = __('Searching');
}
}
}
return [
'message' => $status,
'can_be_reviewed' => $can_be_reviewed,
];
}
} }