Skip to content
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

#4185 [Ticket] add: stats on date for ticket #4278

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

#4185 [Ticket] add: stats on date for ticket #4278

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
112 changes: 89 additions & 23 deletions class/ticketstatsdashboard.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,14 +53,29 @@ public function __construct(DoliDB $db)
*/
public function load_dashboard(array $moreParams = []): array
{
$tickets = $this->getAllTickets();
global $langs;

$dashboardConfig = json_decode(getDolUserString('DIGIRISKDOLIBARR_DASHBOARD_CONFIG'));
$filter = !empty($dashboardConfig->filters->ticketDate) ? $dashboardConfig->filters->ticketDate : 'datec';

$runningTickets = $this->getRunningTickets($tickets);
$ticketStats = $this->getTicketStats($tickets);
$tickets = $this->getAllTickets($filter);

$getTicketRepartitionPerUserAndMeanAnswerTime = $this->getTicketRepartitionPerUserAndMeanAnswerTime($tickets);
$runningTickets = $this->getRunningTickets($tickets, $filter);
$ticketStats = $this->getTicketStats($tickets, $filter);

$getTicketRepartitionPerUserAndMeanAnswerTime = $this->getTicketRepartitionPerUserAndMeanAnswerTime($tickets, $filter);
$getTopSocietyWithMostTickets = $this->getTopSocietyWithMostTickets($tickets);

$array['graphsFilters'] = [
'date' => [
'title' => $langs->transnoentities('ShowSelectedDateTypes'),
'type' => 'selectarray',
'filter' => 'ticketDate',
'values' => ['datec' => $langs->transnoentities('DateCreation'), 'declaration_date' => $langs->transnoentities('DeclarationDate')],
'currentValue' => $filter
]
];

$array['widgets'] = array_merge($runningTickets, $ticketStats);
$array['graphs'] = [$getTicketRepartitionPerUserAndMeanAnswerTime, $getTopSocietyWithMostTickets];

Expand All @@ -72,14 +87,20 @@ public function load_dashboard(array $moreParams = []): array
* fetch all comments for each ticket if exists
* add them to ticket object as comms property (array of comments)
*
* @return array $tickets All tickets with comments if exists or empty array
* @throws Exception If an error occurs while fetching tickets
* @param string $filter Filter to apply on tickets (datec or declaration_date)
* @return array $tickets All tickets with comments if exists or empty array
* @throws Exception If an error occurs while fetching tickets
*/
public function getAllTickets(): array
public function getAllTickets(string $filter = 'datec'): array
{
try {
$actionComm = new ActionComm($this->db);
$tickets = saturne_fetch_all_object_type('Ticket', 'DESC', 't.datec');
if ($filter == 'declaration_date') {
$filter = 'eft.digiriskdolibarr_ticket_date';
} else {
$filter = 't.datec';
}
$tickets = saturne_fetch_all_object_type('Ticket', 'DESC', $filter, 0, 0, ['customsql' => $filter . ' IS NOT NULL'], 'AND', true);
if (!empty($tickets) && is_array($tickets)) {
foreach ($tickets as $ticketID => $ticket) {
$ticket->comms = [];
Expand All @@ -90,6 +111,8 @@ public function getAllTickets(): array
dol_syslog(__METHOD__ . 'Error while fetching comments for ticket ID {$ticketID}: ' . $actionComms, LOG_ERR);
}
}
} else {
$tickets = [];
}
} catch (Exception $e) {
dol_syslog(__METHOD__ . 'Error while fetching tickets: ' . $e->getMessage(), LOG_ERR);
Expand All @@ -102,10 +125,11 @@ public function getAllTickets(): array
/**
* Get running tickets
*
* @param array $tickets All tickets from database for current entity order by datec DESC with comments if exists or empty array
* @return array Widget of running tickets with the oldest ticket and oldest message ticket
* @param array $tickets All tickets from database for current entity order by datec DESC with comments if exists or empty array
* @param string $filter Filter to apply on tickets (datec or declaration_date)
* @return array Widget of running tickets with the oldest ticket and oldest message ticket
*/
public function getRunningTickets(array $tickets): array
public function getRunningTickets(array $tickets, string $filter = 'datec'): array
{
global $form, $langs;

Expand All @@ -127,14 +151,30 @@ public function getRunningTickets(array $tickets): array
$oldestTicket = null;
$oldestMessageTicket = null;
$now = dol_now();
$oldestTicketDate = 0;
if ($filter == 'declaration_date') {
$filterDate = 'options_digiriskdolibarr_ticket_date';
} else {
$filterDate = 'datec';
}

// Get number of open tickets, oldest ticket and oldest message ticket
if (!empty($tickets)) {
foreach ($tickets as $ticket) {
if (!in_array($ticket->fk_statut, [Ticket::STATUS_CANCELED, Ticket::STATUS_CLOSED])) {
$openTickets++;

if (empty($oldestTicket) || $ticket->datec < $oldestTicket->datec) {
if ($filter == 'declaration_date') {
if (!empty($ticket->array_options[$filterDate])) {
$ticketDate = strtotime($ticket->array_options[$filterDate]);
}
if (!empty($oldestTicket->array_options[$filterDate])) {
$oldestTicketDate = strtotime($oldestTicket->array_options[$filterDate]);
}
} else {
$ticketDate = $ticket->{$filterDate};
$oldestTicketDate = $oldestTicket->{$filterDate};
}
if (empty($oldestTicket) || $ticketDate < $oldestTicketDate) {
$oldestTicket = $ticket;
}

Expand All @@ -149,13 +189,13 @@ public function getRunningTickets(array $tickets): array
// Widget content parameters
$array['content'] = [
$openTickets,
!empty($oldestTicket) ? dol_print_date($oldestTicket->datec, 'day') : $langs->transnoentities('NoData'),
!empty($oldestTicket) ? dol_print_date($oldestTicketDate, 'day') : $langs->transnoentities('NoData'),
!empty($oldestMessageTicket) ? dol_print_date($oldestMessageTicket->datec, 'day') : $langs->transnoentities('NoData')
];

$array['moreContent'] = [
'',
!empty($oldestTicket) ? ' (' . convertSecondToTime(roundUpToNextMultiple($now - $oldestTicket->datec, 60)) . ')' . $oldestTicket->getNomUrl(2, '', 0, 'paddingleft') : '',
!empty($oldestTicket) ? ' (' . convertSecondToTime(roundUpToNextMultiple($now - $oldestTicketDate, 60)) . ')' . $oldestTicket->getNomUrl(2, '', 0, 'paddingleft') : '',
!empty($oldestMessageTicket) ? ' (' . convertSecondToTime(roundUpToNextMultiple($now - $oldestMessageTicket->datec, 60)) . ')' . $tickets[$oldestMessageTicket->fk_element]->getNomUrl(2, '', 0, 'paddingleft') : ''
];

Expand All @@ -165,10 +205,11 @@ public function getRunningTickets(array $tickets): array
/**
* Get ticket stats
*
* @param array $tickets All tickets from database for current entity order by datec DESC with comments if exists or empty array
* @return array Widget of ticket stats with number of ticket per user, mean answer time and number of exchange per ticket
* @param array $tickets All tickets from database for current entity order by datec DESC with comments if exists or empty array
* @param string $filter Filter to apply on tickets (datec or declaration_date)
* @return array Widget of ticket stats with number of ticket per user, mean answer time and number of exchange per ticket
*/
function getTicketStats(array $tickets): array
function getTicketStats(array $tickets, string $filter = 'datec'): array
{
global $langs;

Expand All @@ -190,11 +231,23 @@ function getTicketStats(array $tickets): array
$users = [];
$nbTicketAssigned = 0;
$nbExchanges = 0;
if ($filter == 'declaration_date') {
$filterDate = 'options_digiriskdolibarr_ticket_date';
} else {
$filterDate = 'datec';
}

if (!empty($tickets)) {
foreach ($tickets as $ticket) {
if (!empty($ticket->date_close)) {
$timePerTicket[] = $ticket->date_close - $ticket->datec;
if ($filter == 'declaration_date') {
if (!empty($ticket->array_options[$filterDate])) {
$ticketDate = strtotime($ticket->array_options[$filterDate]);
}
} else {
$ticketDate = $ticket->{$filterDate};
}
$timePerTicket[] = $ticket->date_close - $ticketDate;
}
if (!empty($ticket->fk_user_assign)) {
$nbTicketAssigned++;
Expand All @@ -219,10 +272,11 @@ function getTicketStats(array $tickets): array
/**
* Get ticket repartition per user with number of ticket and mean answer time
*
* @param array $tickets All tickets from database for current entity order by datec DESC with comments if exists or empty array
* @return array Graph of ticket repartition per user with number of ticket and mean answer time
* @param array $tickets All tickets from database for current entity order by datec DESC with comments if exists or empty array
* @param string $filter Filter to apply on tickets (datec or declaration_date)
* @return array Graph of ticket repartition per user with number of ticket and mean answer time
*/
function getTicketRepartitionPerUserAndMeanAnswerTime(array $tickets): array
function getTicketRepartitionPerUserAndMeanAnswerTime(array $tickets, string $filter = 'datec'): array
{
global $langs;

Expand All @@ -248,6 +302,11 @@ function getTicketRepartitionPerUserAndMeanAnswerTime(array $tickets): array

// Initialize variables
$nbTicketPerUser = [];
if ($filter == 'declaration_date') {
$filterDate = 'options_digiriskdolibarr_ticket_date';
} else {
$filterDate = 'datec';
}

if (!empty($tickets)) {
foreach ($tickets as $ticket) {
Expand All @@ -262,7 +321,14 @@ function getTicketRepartitionPerUserAndMeanAnswerTime(array $tickets): array
}
$nbTicketPerUser[$userFullName]['nbTicket']++;
if (!empty($ticket->date_close)) {
$nbTicketPerUser[$userFullName]['meanAnswerTime'][$ticket->id] = $ticket->date_close - $ticket->datec;
if ($filter == 'declaration_date') {
if (!empty($ticket->array_options[$filterDate])) {
$ticketDate = strtotime($ticket->array_options[$filterDate]);
}
} else {
$ticketDate = $ticket->{$filterDate};
}
$nbTicketPerUser[$userFullName]['meanAnswerTime'][$ticket->id] = $ticket->date_close - $ticketDate;
}
}

Expand Down
1 change: 1 addition & 0 deletions langs/fr_FR/digiriskdolibarr.lang
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1400,6 +1400,7 @@ NbTicketPerUser = Nombre de tickets assignés par pers
NbExchangePerTicket = Nombre d'échanges par ticket
TicketRepartitionPerUserAndMeanAnswerTime = Répartition des tickets par utilisateur et temps moyen de réponse
TopSocietyWithMostTickets = Top %s des sociétés avec le plus de tickets
ShowSelectedDateTypes = Sélectionnez le type de date à afficher

# Email - Email
The = Le
Expand Down