lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add private support and title buttons

Browse Source
This commit is contained in:
ATM john 2019-09-12 21:17:48 +02:00
parent 7dcb871048
commit 859904587f
5 changed files with 37 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
htdocs/core/lib/ticket.lib.php
View File

@ -515,9 +515,9 @@ function show_ticket_messaging($conf, $langs, $db, $filterobj, $objcon = '', $no
}
require_once DOL_DOCUMENT_ROOT.'/comm/action/class/cactioncomm.class.php';
$caction=new CActionComm($db);
$arraylist=$caction->liste_array(1, 'code', '', (empty($conf->global->AGENDA_USE_EVENT_TYPE)?1:0), '', 1);
//require_once DOL_DOCUMENT_ROOT.'/comm/action/class/cactioncomm.class.php';
//$caction=new CActionComm($db);
//$arraylist=$caction->liste_array(1, 'code', '', (empty($conf->global->AGENDA_USE_EVENT_TYPE)?1:0), '', 1);
$actualCycleDate = false;
@ -580,6 +580,9 @@ function show_ticket_messaging($conf, $langs, $db, $filterobj, $objcon = '', $no
elseif($actionstatic->code == 'TICKET_MSG'){
$iconClass = 'fa fa-comments';
}
elseif($actionstatic->code == 'TICKET_MSG_PRIVATE'){
$iconClass = 'fa fa-mask';
}
elseif (!empty($conf->global->AGENDA_USE_EVENT_TYPE))
{
if ($actionstatic->type_picto) $img_picto = img_picto('', $actionstatic->type_picto);

2
htdocs/langs/en_US/ticket.lang
View File

@ -137,6 +137,8 @@ NoUnreadTicketsFound=No unread ticket found
TicketViewAllTickets=View all tickets
TicketViewNonClosedOnly=View only open tickets
TicketStatByStatus=Tickets by status
OrderByDateAsc=Sort by ascending date
OrderByDateDesc=Sort by descending date
#
# Ticket card

4
htdocs/theme/eldy/btn.inc.php
View File

@ -208,7 +208,9 @@ TITLE BUTTON
display: block;
}
div.pagination li:first-child a.btnTitle{
margin-left: 10px;
}

6
htdocs/theme/eldy/timeline.inc.php
View File

@ -62,8 +62,10 @@ if (! defined('ISLOADEDBYSTEELSHEET')) die('Must be call by steelsheet'); ?>
.timeline > li.timeline-code-ticket_msg_private > .timeline-item {
background: #fffbe5;
border-color: #d0cfc0;
}
.timeline > li > .timeline-item > .time{
color: #6f6f6f;
float: right;
@ -123,6 +125,10 @@ a.timeline-btn:hover
font-weight: normal;
line-height: 1.1;
}
.timeline > li.timeline-code-ticket_msg_private > .timeline-item > .timeline-header {
border-color: #ecebda;
}
.timeline > li > .timeline-item > .timeline-header > a {
font-weight: 600;
}

22
htdocs/ticket/messaging.php
View File

@ -47,7 +47,7 @@ $page = GETPOST("page");
$page = is_numeric($page) ? $page : 0;
$page = $page == -1 ? 0 : $page;
if (! $sortfield) $sortfield="a.datep,a.id";
if (! $sortorder) $sortorder="DESC";
if (! $sortorder) $sortorder="desc";
$offset = $limit * $page ;
$pageprev = $page - 1;
$pagenext = $page + 1;
@ -225,7 +225,25 @@ if (!empty($object->id))
if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
print_barre_liste($langs->trans("ActionsOnTicket"), 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, '', 0, -1, '', 0, $morehtmlcenter, '', 0, 1, 1);
$morehtmlright = '';
if($sortorder === 'desc') {
$sortUrl = $_SERVER["PHP_SELF"] . '?sortfield=a.datep&sortorder=asc' . $param;
$morehtmlright .= dolGetButtonTitle($langs->trans('Date'), $langs->trans('OrderByDateAsc'), 'fa fa-sort-numeric-down', $sortUrl, $id = '', $status = 1);
}
else{
$sortUrl = $_SERVER["PHP_SELF"] . '?sortfield=a.datep&sortorder=desc' . $param;
$morehtmlright .= dolGetButtonTitle($langs->trans('Date'), $langs->trans('OrderByDateDesc'), 'fa fa-sort-numeric-down-alt', $sortUrl, $id = '', $status = 1);
}
// Show link to add a message (if read and not closed)
$btnstatus = $object->fk_statut < Ticket::STATUS_CLOSED && $action != "presend" && $action != "presend_addmessage";
$url = 'card.php?track_id=' . $object->track_id . '&action=presend_addmessage&mode=init';
$morehtmlright .= dolGetButtonTitle($langs->trans('TicketAddMessage') , '', 'fa fa-comment', $url, 'add-new-ticket-title-button', $btnstatus);
print_barre_liste($langs->trans("ActionsOnTicket"), 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, '', 0, -1, '', 0, $morehtmlright, '', 0, 1, 1);
// List of all actions
$filters=array();