From f5fd6e5bc3c53ba3f20f952a69b6c6531f612fb0 Mon Sep 17 00:00:00 2001
From: aydreeihn <adriane@enhancesoft.com>
Date: Fri, 16 Jun 2017 08:59:43 -0500
Subject: [PATCH] Edit tool tips, add Date Range above Statistics

---
 include/class.report.php                      |  2 -
 .../en_US/help/tips/dashboard.dashboard.yaml  | 32 +++++--------
 include/staff/dashboard.inc.php               | 45 +++++++++++++++----
 3 files changed, 49 insertions(+), 30 deletions(-)

diff --git a/include/class.report.php b/include/class.report.php
index c9bc7c64e..fb284fc62 100644
--- a/include/class.report.php
+++ b/include/class.report.php
@@ -200,8 +200,6 @@ class OverviewReport {
             $headers = array(__('Department'));
             $header = function($row) { return Dept::getLocalNameById($row['dept_id'], $row['dept__name']); };
             $pk = 'dept__id';
-            //adriane
-            // $pk = 'dept_id';
             $stats = $stats
                 ->filter(array('dept_id__in' => $thisstaff->getDepts()))
                 ->values('dept__id', 'dept__name');
diff --git a/include/i18n/en_US/help/tips/dashboard.dashboard.yaml b/include/i18n/en_US/help/tips/dashboard.dashboard.yaml
index 72d947b4b..1c82c88a2 100644
--- a/include/i18n/en_US/help/tips/dashboard.dashboard.yaml
+++ b/include/i18n/en_US/help/tips/dashboard.dashboard.yaml
@@ -51,49 +51,41 @@ opened:
 assigned:
     title: Assigned
     content: >
-        Tickets that have been assigned to either an Agent or a Team while having the
-        Department, Help Topic, or Agent on the ticket. The number reflects tickets that
-        are manually assigned to agents or teams, claimed tickets, and tickets assigned
-        from ticket filters/other auto-assignment rules.
+        Tickets that have been assigned to either an Agent or a Team. The number
+        reflects tickets that are manually assigned to agents or teams, claimed
+        tickets, and tickets assigned from ticket filters/other auto-assignment rules.
 
 overdue:
     title: Overdue
     content: >
-        Tickets that have been marked ‘Overdue’ by the system while having the Department,
-        Help Topic, or Agent listed on the ticket. Tickets are marked Overdue when they
-        have violated the SLA Plan to which they belonged, causing them to have a status of
-        ‘Open’ past their Due Date.
+        Tickets that have been marked ‘Overdue’ by the system. Tickets are marked
+        Overdue when they have violated the SLA Plan to which they belonged, causing
+        them to have a status of ‘Open’ past their Due Date.
 
 closed:
     title: Closed
     content: >
-        The number of Tickets that are currently in the Closed status
-        while also having the Department, Help Topic, or Agent on the ticket.
+        The number of Tickets that are currently in the Closed status.
 
 reopened:
     title: Reopened
     content: >
-        The total number of times a ticket was Reopened while also having the Department,
-        Help Topic, or Agent listed on the ticket within the timeframe chosen. Tickets
+        The total number of times a ticket was Reopened. Tickets
         are reopened whenever their status is changed from Closed to Open.
 
 deleted:
     title: Deleted
     content: >
-        The amount of tickets that have been deleted while having the
-        Department, Help Topic, or Agent listed on the ticket within the timeframe
-        chosen.
+        The amount of tickets that have been deleted.
 
 service_time:
     title: Service Time
     content: >
         Refers to the duration of time that begins at the opening of a ticket and ends
-        when the ticket is closed without being reopened again. The Service Time column
-        measures the average Service Time per ticket, in hours, within the specified date
-        span.
+        when the ticket is closed. The Service Time column measures the average Service
+        Time per ticket, in hours.
 
 response_time:
     title: Response Time
     content: >
-        Shows an average of the number of hours between when a user posted a message on a
-        ticket and when an agent responded/replied to the customer.
+        Shows an average response time by an Agent, in hours, to ticket correspondence.
diff --git a/include/staff/dashboard.inc.php b/include/staff/dashboard.inc.php
index 40311ac1d..3409726e5 100644
--- a/include/staff/dashboard.inc.php
+++ b/include/staff/dashboard.inc.php
@@ -67,6 +67,19 @@ $plots = $report->getPlotData();
 <hr/>
 <h2><?php echo __('Statistics'); ?>&nbsp;<i class="help-tip icon-question-sign" href="#statistics"></i></h2>
 <p><?php echo __('Statistics of tickets organized by department, help topic, and agent.');?></p>
+<p><b><?php echo __('Range: '); ?></b>
+  <?php
+  $range = array();
+  foreach ($report->getDateRange() as $date)
+  {
+    $date = str_ireplace('FROM_UNIXTIME(', '',$date);
+    $date = str_ireplace(')', '',$date);
+    $date = new DateTime('@'.$date);
+    $date->setTimeZone(new DateTimeZone($thisstaff->getTimezone()));
+    $range[] = $date->format('F j, Y');
+  }
+  echo __($range[0] . ' - ' . $range[1]);
+?>
 
 <ul class="clean tabs">
 <?php
@@ -92,28 +105,44 @@ foreach ($groups as $g=>$desc) {
         <th <?php if ($j === 0) echo 'width="30%" class="flush-left"'; ?>><?php echo Format::htmlchars($c);
         switch ($c) {
           case 'Opened':
-            ?><i class="help-tip icon-question-sign" href="#opened"></i><?php
+            ?>
+              <i class="help-tip icon-question-sign" href="#opened"></i>
+            <?php
             break;
           case 'Assigned':
-            ?><i class="help-tip icon-question-sign" href="#assigned"></i><?php
+            ?>
+              <i class="help-tip icon-question-sign" href="#assigned"></i>
+            <?php
             break;
             case 'Overdue':
-              ?><i class="help-tip icon-question-sign" href="#overdue"></i><?php
+              ?>
+                <i class="help-tip icon-question-sign" href="#overdue"></i>
+              <?php
               break;
             case 'Closed':
-              ?><i class="help-tip icon-question-sign" href="#closed"></i><?php
+              ?>
+                <i class="help-tip icon-question-sign" href="#closed"></i>
+              <?php
               break;
             case 'Reopened':
-              ?><i class="help-tip icon-question-sign" href="#reopened"></i><?php
+              ?>
+                <i class="help-tip icon-question-sign" href="#reopened"></i>
+              <?php
               break;
             case 'Deleted':
-              ?><i class="help-tip icon-question-sign" href="#deleted"></i><?php
+              ?>
+                <i class="help-tip icon-question-sign" href="#deleted"></i>
+              <?php
               break;
             case 'Service Time':
-              ?><i class="help-tip icon-question-sign" href="#service_time"></i><?php
+              ?>
+                <i class="help-tip icon-question-sign" href="#service_time"></i>
+              <?php
               break;
             case 'Response Time':
-              ?><i class="help-tip icon-question-sign" href="#response_time"></i><?php
+              ?>
+                <i class="help-tip icon-question-sign" href="#response_time"></i>
+              <?php
               break;
         }
         ?></th>
-- 
GitLab