From 11015787bffb19643dd84caf5c82a560e4e4ef13 Mon Sep 17 00:00:00 2001 From: gregoirenovel Date: Mon, 3 Apr 2017 17:04:31 +0200 Subject: [PATCH] Add new total numbers to the Stats page --- app/assets/javascripts/toggle_chart.js | 2 +- app/assets/stylesheets/stats.scss | 22 ++++++++++++++++++++++ app/controllers/stats_controller.rb | 3 +++ app/views/stats/index.html.haml | 10 ++++++++++ 4 files changed, 36 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/toggle_chart.js b/app/assets/javascripts/toggle_chart.js index b415619c7..e2ed52b3c 100644 --- a/app/assets/javascripts/toggle_chart.js +++ b/app/assets/javascripts/toggle_chart.js @@ -3,7 +3,7 @@ var TPS = TPS || {}; TPS.toggleChart = function(event, chartClass) { var nextSelectorItem = $(event.target), nextChart = $(chartClass), - nextChartId = nextChart.children().first().attr('id'), + nextChartId = nextChart.children().first().attr("id"), currentSelectorItem = nextSelectorItem.parent().find(".segmented-control-item-active"), currentChart = nextSelectorItem.parent().parent().find(".chart:not(.hidden)"); diff --git a/app/assets/stylesheets/stats.scss b/app/assets/stylesheets/stats.scss index f7a33df32..48d602275 100644 --- a/app/assets/stylesheets/stats.scss +++ b/app/assets/stylesheets/stats.scss @@ -1,6 +1,7 @@ @import "card"; $dark-grey: #333333; +$light-grey: #999999; $blue: rgba(61, 149, 236, 1); $blue-hover: rgba(61, 149, 236, 0.8); @@ -100,3 +101,24 @@ $segmented-control-item-border-radius: 2 * $default-space; .chart { width: 100%; } + +$big-number-card-padding: 2 * $segmented-control-item-border-radius; +.big-number-card { + padding: $big-number-card-padding; +} + +.big-number-card-title { + display: block; + text-align: center; + margin: 0 auto; + color: $light-grey; +} + +.big-number-card-number { + display: block; + text-align: center; + font-size: 90px; + line-height: 90px; + font-weight: bold; + color: $blue; +} diff --git a/app/controllers/stats_controller.rb b/app/controllers/stats_controller.rb index b099b2a17..bbaf9ccca 100644 --- a/app/controllers/stats_controller.rb +++ b/app/controllers/stats_controller.rb @@ -9,6 +9,9 @@ class StatsController < ApplicationController @procedures_cumulative = cumulative_hash(procedures) @dossiers_cumulative = cumulative_hash(dossiers) + + @procedures_count = procedures.count + @dossiers_count = dossiers.count end private diff --git a/app/views/stats/index.html.haml b/app/views/stats/index.html.haml index 88d5b4d1b..42d6ea90c 100644 --- a/app/views/stats/index.html.haml +++ b/app/views/stats/index.html.haml @@ -40,4 +40,14 @@ = line_chart @dossiers_30_days_flow, :colors => ["rgba(61, 149, 236, 1)"] + .stat-card.stat-card-half.big-number-card.pull-left + %span.big-number-card-title TOTAL DÉMARCHES DÉMATÉRIALISÉES + %span.big-number-card-number + = @procedures_count + + .stat-card.stat-card-half.big-number-card.pull-left + %span.big-number-card-title TOTAL DOSSIERS DÉPOSÉS + %span.big-number-card-number + = @dossiers_count + .clearfix