From 10c28dc272e5dd5b71772aee36ce005c7a91e995 Mon Sep 17 00:00:00 2001
From: "Eduardo L. Buratti" <elb09@c3sl.ufpr.br>
Date: Tue, 8 Oct 2013 13:28:33 -0300
Subject: [PATCH] web: Fix charts style (position, width and legend text)

Signed-off-by: Eduardo L. Buratti <elb09@c3sl.ufpr.br>
---
 web/app/js/controllers.js                     |  6 +++---
 web/app/js/default-charts.js                  | 16 ++++++++--------
 web/app/partials/attendance.availability.html | 10 +++++++---
 web/assets/less/attendance.less               |  1 +
 4 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/web/app/js/controllers.js b/web/app/js/controllers.js
index a0a67c7..428f530 100644
--- a/web/app/js/controllers.js
+++ b/web/app/js/controllers.js
@@ -126,9 +126,9 @@ angular.module('datasid.controllers', []).
 
                 AvailFactory.get(options, function (data) {
                     $scope.pieChart.chart.series[0].setData([
-                        ['Menos de 10 dias', data.green[0]],
-                        ['Entre 11 e 30 dias', data.yellow[0]],
-                        ['Mais de 30 dias', data.red[0]]
+                        ['Menos de\n10 dias', data.green[0]],
+                        ['Entre 11\ne 30 dias', data.yellow[0]],
+                        ['Mais de\n30 dias', data.red[0]]
                     ]);
                 });
             }
diff --git a/web/app/js/default-charts.js b/web/app/js/default-charts.js
index 2e05e64..5d96a38 100644
--- a/web/app/js/default-charts.js
+++ b/web/app/js/default-charts.js
@@ -101,7 +101,7 @@ var DefaultCharts = {
         },
         tooltip: {
             formatter: function() {
-                return '<b>' + this.key.replace('\\', ' ') + '</b><br/>' + formatNumber(this.y) + ' máquinas'
+                return '<b>' + this.key.replace('\n', ' ') + '</b><br/>' + formatNumber(this.y) + ' máquinas'
             }
         },
         plotOptions: {
@@ -111,7 +111,7 @@ var DefaultCharts = {
                     distance: 5,
                     connectorWidth: 0,
                     formatter: function() {
-                        return '<b>'+ this.point.name.split('\\').join('</b><br/><b>') +
+                        return '<b>'+ this.point.name.split('\n').join('</b><br/><b>') +
                                '</b><br/>' + Math.round(this.percentage) + '%';
                     }
                 }
@@ -119,9 +119,9 @@ var DefaultCharts = {
         },
         series: [
             {data: [
-                ['Menos de 10 dias', 0],
-                ['Entre 11 e 30 dias', 0],
-                ['Mais de 30 dias', 0]
+                ['Menos de\n10 dias', 0],
+                ['Entre 11\ne 30 dias', 0],
+                ['Mais de\n30 dias', 0]
             ]}
         ]
     },
@@ -195,9 +195,9 @@ var DefaultCharts = {
             itemMarginBottom: 3
         },
         series: [
-            {name: 'Menos de 10 dias'},
-            {name: 'Entre 11 e 30 dias'},
-            {name: 'Mais de 30 dias'}
+            {name: 'Último contato há menos de 10 dias'},
+            {name: 'Último contato entre 11 e 30 dias'},
+            {name: 'Último contato há mais de 30 dias'}
         ]
     }
 };
\ No newline at end of file
diff --git a/web/app/partials/attendance.availability.html b/web/app/partials/attendance.availability.html
index b71d36e..44c964a 100644
--- a/web/app/partials/attendance.availability.html
+++ b/web/app/partials/attendance.availability.html
@@ -2,6 +2,10 @@
 <p>Análise das máquinas com o agente de coleta instalado.</p>
 <p>Clique no gráfico de barras para visualizar a situação das máquinas no próximo nível.</p>
 
-<div mc-chart="barChart"></div>
-<div mc-chart="pieChart"></div>
-<div mc-chart="histChart"></div>
\ No newline at end of file
+<div class="row">
+    <div class="col-lg-6" style="height: 300px" mc-chart="barChart"></div>
+    <div class="col-lg-6" style="height: 300px" mc-chart="pieChart"></div>
+</div>
+<div class="row">
+    <div class="col-lg-10 col-lg-offset-1" style="height: 300px" mc-chart="histChart"></div>
+</div>
\ No newline at end of file
diff --git a/web/assets/less/attendance.less b/web/assets/less/attendance.less
index 1c4e62a..dcea2c5 100644
--- a/web/assets/less/attendance.less
+++ b/web/assets/less/attendance.less
@@ -104,5 +104,6 @@
 }
 
 .attendance-content {
+    width: 700px;
     float: left;
 }
\ No newline at end of file
-- 
GitLab