From b05edf1915e045e21ba43256ca664eaf55f9f33e Mon Sep 17 00:00:00 2001
From: Mantas <mantas@idev.lt>
Date: Fri, 19 Feb 2021 14:19:42 +0200
Subject: [PATCH] Follow up - 5ee6418c18ad723819d03431ae8de118624bad73 - UI
 Refactoring: Dashbboard item texts get rendered below actual item.

---
 .../stats/ticket_channel_distribution.jst.eco | 20 +++++++++----------
 .../dashboard/stats/ticket_escalation.jst.eco |  2 --
 .../dashboard/stats/ticket_in_process.jst.eco |  2 --
 .../stats/ticket_load_measure.jst.eco         |  6 +++---
 .../dashboard/stats/ticket_reopen.jst.eco     |  2 --
 .../stats/ticket_waiting_time.jst.eco         |  4 ++--
 6 files changed, 15 insertions(+), 21 deletions(-)

diff --git a/app/assets/javascripts/app/views/dashboard/stats/ticket_channel_distribution.jst.eco b/app/assets/javascripts/app/views/dashboard/stats/ticket_channel_distribution.jst.eco
index c96e6d220..4b713a384 100644
--- a/app/assets/javascripts/app/views/dashboard/stats/ticket_channel_distribution.jst.eco
+++ b/app/assets/javascripts/app/views/dashboard/stats/ticket_channel_distribution.jst.eco
@@ -8,17 +8,17 @@
     </div>
     <div class="stat-graphic" data-columns="<%- _.size(@StatsTicketChannelDistribution.channels) %>">
       <% for id, channel of @StatsTicketChannelDistribution.channels: %>
-      <div class="stats-row">
-        <div title="<%- channel.sender %>">
-          <%- @Icon(channel.icon, 'stat-channel-icon') %>
+        <div class="stats-row">
+          <div title="<%- channel.sender %>">
+            <%- @Icon(channel.icon, 'stat-channel-icon') %>
+          </div>
+          <div class="stat-bars">
+            <div class="stat-bar stat-bar--inbound" style="height: <%- channel.inbound_in_percent %>%" title="<%- @Ti('Inbound') %>: <%- channel.inbound_in_percent %>% (<%- channel.inbound %>)"></div>
+            <div class="stat-bar stat-bar--outbound" style="height: <%- channel.outbound_in_percent %>%" title="<%- @Ti('Outbound') %>: <%- channel.outbound_in_percent %>% (<%- channel.outbound %>)"></div>
+          </div>
+          <div class="stat-detail"><%- channel.overal_percentage %>%</div>
         </div>
-        <div class="stat-bars">
-          <div class="stat-bar stat-bar--inbound" style="height: <%- channel.inbound_in_percent %>%" title="<%- @Ti('Inbound') %>: <%- channel.inbound_in_percent %>% (<%- channel.inbound %>)"></div>
-          <div class="stat-bar stat-bar--outbound" style="height: <%- channel.outbound_in_percent %>%" title="<%- @Ti('Outbound') %>: <%- channel.outbound_in_percent %>% (<%- channel.outbound %>)"></div>
-        </div>
-        <div class="stat-detail"><%- channel.overal_percentage %>%</div>
-      </div>
-      <div class="stat-label"></div>
+        <div class="stat-label"></div>
       <% end %>
     </div>
   </div>
diff --git a/app/assets/javascripts/app/views/dashboard/stats/ticket_escalation.jst.eco b/app/assets/javascripts/app/views/dashboard/stats/ticket_escalation.jst.eco
index 900dae4ed..ae42aca64 100644
--- a/app/assets/javascripts/app/views/dashboard/stats/ticket_escalation.jst.eco
+++ b/app/assets/javascripts/app/views/dashboard/stats/ticket_escalation.jst.eco
@@ -12,6 +12,4 @@
     <div class="stat-label"><%- @T('%s of my tickets escalated.', @StatsTicketEscalation.own) %></div>
     <div class="stat-detail"><%- @T('Total: %s', @StatsTicketEscalation.total) %></div>
   </div>
-  <div class="stat-label"><%- @T('%s of my tickets escalated.', @StatsTicketEscalation.own) %></div>
-  <div class="stat-detail"><%- @T('Total: %s', @StatsTicketEscalation.total) %></div>
 </div>
diff --git a/app/assets/javascripts/app/views/dashboard/stats/ticket_in_process.jst.eco b/app/assets/javascripts/app/views/dashboard/stats/ticket_in_process.jst.eco
index ddd126490..f1c82a833 100644
--- a/app/assets/javascripts/app/views/dashboard/stats/ticket_in_process.jst.eco
+++ b/app/assets/javascripts/app/views/dashboard/stats/ticket_in_process.jst.eco
@@ -12,6 +12,4 @@
     <div class="stat-label" title="<%- @T('%s of your tickets are currently in process.', @StatsTicketInProcess.in_process) %>"><%- @T('%s% are currently in process', @StatsTicketInProcess.percent) %></div>
     <div class="stat-detail"><%- @T('Average: %s%', @StatsTicketInProcess.average_per_agent) %></div>
   </div>
-  <div class="stat-label" title="<%- @Ti('%s of your tickets are currently in process.', @StatsTicketInProcess.in_process) %>"><%- @T('%s% are currently in process', @StatsTicketInProcess.percent) %></div>
-  <div class="stat-detail"><%- @T('Average: %s%', @StatsTicketInProcess.average_per_agent) %></div>
 </div>
diff --git a/app/assets/javascripts/app/views/dashboard/stats/ticket_load_measure.jst.eco b/app/assets/javascripts/app/views/dashboard/stats/ticket_load_measure.jst.eco
index 2eb0566fd..592efae29 100644
--- a/app/assets/javascripts/app/views/dashboard/stats/ticket_load_measure.jst.eco
+++ b/app/assets/javascripts/app/views/dashboard/stats/ticket_load_measure.jst.eco
@@ -15,8 +15,8 @@
       </div>
       <%- @Icon('total-tickets', 'total-tickets') %>
     </div>
-    <%- @Icon('total-tickets', 'total-tickets') %>
+
+    <div class="stat-label"><%- @T('Tickets assigned to me: %s of %s', @StatsTicketLoadMeasure.own, @StatsTicketLoadMeasure.total) %></div>
+    <div class="stat-detail"><%- @T('Average: %s', @StatsTicketLoadMeasure.average_per_agent) %></div>
   </div>
-  <div class="stat-label"><%- @T('Tickets assigned to me: %s of %s', @StatsTicketLoadMeasure.own, @StatsTicketLoadMeasure.total) %></div>
-  <div class="stat-detail"><%- @T('Average: %s', @StatsTicketLoadMeasure.average_per_agent) %></div>
 </div>
diff --git a/app/assets/javascripts/app/views/dashboard/stats/ticket_reopen.jst.eco b/app/assets/javascripts/app/views/dashboard/stats/ticket_reopen.jst.eco
index a4fc73598..4e13354e0 100644
--- a/app/assets/javascripts/app/views/dashboard/stats/ticket_reopen.jst.eco
+++ b/app/assets/javascripts/app/views/dashboard/stats/ticket_reopen.jst.eco
@@ -12,6 +12,4 @@
     <div class="stat-label"><%- @T('%s% have been reopened', @StatsTicketReopen.percent) %></div>
     <div class="stat-detail"><%- @T('Average: %s%', @StatsTicketReopen.average_per_agent) %></div>
   </div>
-  <div class="stat-label"><%- @T('%s% have been reopened', @StatsTicketReopen.percent) %></div>
-  <div class="stat-detail"><%- @T('Average: %s%', @StatsTicketReopen.average_per_agent) %></div>
 </div>
diff --git a/app/assets/javascripts/app/views/dashboard/stats/ticket_waiting_time.jst.eco b/app/assets/javascripts/app/views/dashboard/stats/ticket_waiting_time.jst.eco
index 452224c3b..7ef19c345 100644
--- a/app/assets/javascripts/app/views/dashboard/stats/ticket_waiting_time.jst.eco
+++ b/app/assets/javascripts/app/views/dashboard/stats/ticket_waiting_time.jst.eco
@@ -13,7 +13,7 @@
         <div class="stat-amount"></div>
       </div>
     </div>
+    <div class="stat-label"><%- @T('My handling time: %s minutes', @StatsTicketWaitingTime.handling_time) %></div>
+    <div class="stat-detail"><%- @T('Average: %s minutes', @StatsTicketWaitingTime.average_per_agent) %></div>
   </div>
-  <div class="stat-label"><%- @T('My handling time: %s minutes', @StatsTicketWaitingTime.handling_time) %></div>
-  <div class="stat-detail"><%- @T('Average: %s minutes', @StatsTicketWaitingTime.average_per_agent) %></div>
 </div>