diff --git a/web/app/js/controllers.js b/web/app/js/controllers.js index a0a67c7be6c169b6970d9131a0dd7e044b42a921..428f530fe62b9c7e8b7caf4c4b094eb39a7211e7 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 2e05e648a3a448a6b1943d831b104b9ae4ee3ce7..5d96a38f003aa1aaf8bd82fc39ed349596340c3b 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 b71d36ef938a764750d5ff5ce18c4a19971a81d0..44c964a66eac7a7879d30fa6ebd1ae14d5509c1e 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 1c4e62a4e74405c327061b72f5c74ec9b0179363..dcea2c523cb1c049a3a4f3fc138b9e0fde9516e0 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