Skip to content

enhancement: added node tickets panel - showing history of node by ti… #2484

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
interduo wants to merge 2 commits into
base: master
Choose a base branch
from
Open

enhancement: added node tickets panel - showing history of node by ti… #2484

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cb50a70
enhancement: added node tickets panel - showing history of node by ti…
interduo Feb 1, 2025
96b009e
fix button link after testing
interduo Feb 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion lib/LMSManagers/LMSHelpdeskManager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ public function GetQueueContents(array $params)
{
$userid = Auth::GetCurrentUser();
extract($params);
foreach (array('ids', 'state', 'priority', 'source', 'owner', 'catids', 'removed', 'netdevids', 'netnodeids', 'deadline',
foreach (array('ids', 'state', 'priority', 'source', 'owner', 'catids', 'removed', 'nodeids', 'netdevids', 'netnodeids', 'deadline',
'serviceids', 'typeids', 'unread', 'parentids', 'verifierids', 'rights', 'projectids', 'cid', 'subject', 'fromdate', 'todate', 'short', 'watching') as $var) {
if (!isset(${$var})) {
${$var} = null;
Expand Down Expand Up @@ -229,6 +229,14 @@ public function GetQueueContents(array $params)
$sourcefilter = ' AND t.source = ' . $source;
}

if (empty($nodeids)) {
$nodeidsfilter = '';
} elseif (is_array($nodeids)) {
$nodeidsfilter = ' AND t.nodeid IN (' . implode(',', $nodeids) . ')';
} else {
$nodeidsfilter = ' AND t.nodeid = ' . $nodeids;
}

if (empty($netdevids)) {
$netdevidsfilter = '';
} elseif (is_array($netdevids)) {
Expand Down Expand Up @@ -488,6 +496,7 @@ public function GetQueueContents(array $params)
. $sourcefilter
. $ownerfilter
. $removedfilter
. $nodeidsfilter
. $netdevidsfilter
. $netnodeidsfilter
. $deadlinefilter
Expand Down Expand Up @@ -597,6 +606,7 @@ public function GetQueueContents(array $params)
. $sourcefilter
. $ownerfilter
. $removedfilter
. $nodeidsfilter
. $netdevidsfilter
. $netnodeidsfilter
. $deadlinefilter
Expand Down
1 change: 1 addition & 0 deletions lib/locale/pl_PL/strings.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5125,6 +5125,7 @@
$_LANG['Today\'s events assigned to You'] = 'Dzisiejsze zdarzenia przypisane do Ciebie';
$_LANG['Critical tickets'] = 'Zgłoszenia krytyczne';
$_LANG['Customer tickets'] = 'Zgłoszenia klienta';
$_LANG['Node tickets'] = 'Zgłoszenia komputera';
$_LANG['Urgent tickets'] = 'Zgłoszenia pilne';
$_LANG['Unread tickets'] = 'Nieprzeczytane zgłoszenia';

Expand Down
20 changes: 20 additions & 0 deletions modules/nodeinfo.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,22 @@

$nodeinfo = $LMS->GetNode($nodeid);

$params = [
'nodeids' => $nodeid,
'short' => true,
];

$alltickets = !empty($_GET['alltickets']) ?: ConfigHelper::checkConfig(
'rt.default_show_closed_tickets',
ConfigHelper::checkConfig('phpui.default_show_closed_tickets')
);

if (!$alltickets) {
$params['state'] = -1;
}

$nodeticketlist = $LMS->GetQueueContents($params);

$node_empty_mac = ConfigHelper::getConfig('nodes.empty_mac', ConfigHelper::getConfig('phpui.node_empty_mac', '', true));
if (strlen($node_empty_mac)) {
$node_empty_mac = Utils::normalizeMac($node_empty_mac);
Expand Down Expand Up @@ -181,6 +197,10 @@
$SMARTY->assign('nodeid', $nodeinfo['id']);
}

if (!isset($resource_tabs['nodetickets']) || $resource_tabs['nodetickets']) {
$SMARTY->assign(['nodeticketlist' => $nodeticketlist, 'alltickets' => $alltickets]);
}

$SMARTY->assign('nodeinfo', $nodeinfo);
$SMARTY->assign('objectid', $nodeinfo['id']);
$SMARTY->assign('nodeinfo_sortable_order', $SESSION->get_persistent_setting('nodeinfo-sortable-order'));
Expand Down
3 changes: 3 additions & 0 deletions templates/default/node/nodeinfo.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@ <H1>{$layout.pagetitle}</H1>
{block name="nodelocks"}
{include file="node/nodelocks.html"}
{/block}
{block name="nodetickets"}
{include file="node/nodetickets.html"}
{/block}
{block name="customerinfobox"}
{include file="customer/customerinfobox.html" customerpanel=1}
{/block}
Expand Down
134 changes: 134 additions & 0 deletions templates/default/node/nodetickets.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,134 @@
<!--// $Id$ //-->

{css}
{js}

{tab_container id="nodetickets" label="Node tickets"}

{tab_header content_id="nodeticketspanel"}
{tab_header_cell icon="lms-ui-icon-helpdesk"}
<strong>{trans("Node tickets")}</strong>
{/tab_header_cell}
{tab_header_cell}
{button type="link" label="{if $alltickets}Hide resolved{else}Show resolved{/if}" icon="close" href="?m={$layout.module}&id={$nodeinfo.id}{if !$alltickets}&alltickets=1{/if}"}
{/tab_header_cell}
{/tab_header}

{tab_contents id="nodeticketspanel"}
{tab_table}
<div class="lms-ui-tab-table-row header">
<div class="lms-ui-tab-table-wrapper col-12">
<div class="lms-ui-tab-table-wrapper col-4">
<div class="lms-ui-tab-table-wrapper col-2">
<div class="lms-ui-tab-table-column cdate">{trans("Create time")}</div>
<div class="lms-ui-tab-table-column queue">{trans("Queue")}</div>
</div>
<div class="lms-ui-tab-table-wrapper col-2">
<div class="lms-ui-tab-table-column state">{trans("Status")}</div>
<div class="lms-ui-tab-table-column priority">{trans("Priority")}</div>
</div>
</div>
<div class="lms-ui-tab-table-wrapper col-4">
<div class="lms-ui-tab-table-wrapper col-2">
<div class="lms-ui-tab-table-column title">{trans("Title")}</div>
{if ConfigHelper::checkConfig('rt.show_ticket_categories')}
<div class="lms-ui-tab-table-column categories">{trans("Categories")}</div>
{else}
<div class="lms-ui-tab-table-column empty">&nbsp;</div>
{/if}
</div>
</div>
<div class="lms-ui-tab-table-wrapper col-4">
<div class="lms-ui-tab-table-wrapper col-2">
<div class="lms-ui-tab-table-column service">{trans("Service type")}</div>
<div class="lms-ui-tab-table-column type">{trans("Ticket type")}</div>
</div>
<div class="lms-ui-tab-table-wrapper col-2">
<div class="lms-ui-tab-table-column deadline">{trans("<!rt>Deadline")}</div>
<div class="lms-ui-tab-table-column owner">{trans("Owner")}</div>
</div>
</div>
</div>
</div>
{foreach $nodeticketlist as $ticket}
<div class="lms-ui-tab-table-row" style="color:{$_RT_STATES[$ticket.state].color};" data-target-url="?m=rtticketview&id={$ticket.id}">
<div class="lms-ui-tab-table-wrapper col-12">
<div class="lms-ui-tab-table-wrapper col-4">
<div class="lms-ui-tab-table-wrapper col-2" {tip text=$ticket.id}>
<div class="lms-ui-tab-table-column cdate">
{$ticket.createtime|date_format:"Y-m-d H:i"}
</div>
<div class="lms-ui-tab-table-column queue">
{$ticket.name}
</div>
</div>
<div class="lms-ui-tab-table-wrapper col-2">
<div class="lms-ui-tab-table-column state">
{$_RT_STATES[{$ticket.state}].label}
</div>
<div class="lms-ui-tab-table-column priority">
{$_RT_PRIORITIES[$ticket.priority]}
</div>
</div>
</div>
<div class="lms-ui-tab-table-wrapper col-2">
<div class="lms-ui-tab-table-column title" {tip text="{$ticket.subject}"}>
{$ticket.subject|escape}
</div>
{if ConfigHelper::checkConfig('rt.show_ticket_categories')}
<div class="lms-ui-tab-table-column categories">
{foreach $ticket.categories as $tc}
<a href="?m=rtqueueview&persistent-filter=-1&catid={$tc.categoryid}&o=lastmodified,desc">
<span class="lms-ui-category-label" style="{$tc.style}">{$tc.name}</span>
</a>
{/foreach}
</div>
{else}
<div class="lms-ui-tab-table-column empty">&nbsp;</div>
{/if}
</div>
<div class="lms-ui-tab-table-wrapper col-4">
<div class="lms-ui-tab-table-wrapper col-2">
<div class="lms-ui-tab-table-column service">
{$_SERVICETYPES[$ticket.service]}
</div>
<div class="lms-ui-tab-table-column type">
{trans("{$_RT_TYPES[$ticket.type].label}")}
</div>
</div>
<div class="lms-ui-tab-table-wrapper col-2">
<div class="lms-ui-tab-table-column deadline">
{if $ticket.deadline}
{if $ticket.deadline_diff < 0 && $ticket.state != $smarty.const.RT_RESOLVED}
<div class="lms-ui-alert">
{icon
name="expired"
label="<!rt>Expired"
tip="{$ticket.deadline_days} {trans("days")} {$ticket.deadline_hours} {trans("<!rt>hours")}"
}
</div>
{else}
{$ticket.deadline_days} {trans("days")} {$ticket.deadline_hours} {trans("<!rt>hours")}
{/if}
{else}
-
{/if}
</div>
<div class="lms-ui-tab-table-column owner">
{if $ticket.ownername}
{$ticket.ownername|escape}
{else}-
{/if}
</div>
</div>
</div>
</div>
</div>
{foreachelse}
<div class="lms-ui-tab-empty-table">
{trans("No tickets.")}
</div>
{/foreach}
{/tab_table}
{/tab_contents}
{/tab_container}