From e9b6ec168eeb2a79130826f2ac9f54b42f217155 Mon Sep 17 00:00:00 2001 From: Jon Jagger Date: Fri, 29 May 2015 22:38:34 +0100 Subject: [PATCH] added th headers to dashboard minute columns --- app/assets/stylesheets/dashboard.css.scss | 4 ++-- app/controllers/dashboard_worker.rb | 2 +- app/views/dashboard/_traffic_lights.html.erb | 16 ++++++++++++++++ 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/app/assets/stylesheets/dashboard.css.scss b/app/assets/stylesheets/dashboard.css.scss index 7d2f7125b..d09892873 100644 --- a/app/assets/stylesheets/dashboard.css.scss +++ b/app/assets/stylesheets/dashboard.css.scss @@ -36,11 +36,11 @@ .row td { padding: 0px; } .row.odd td { background: lighten($darker-color, 3%); } .row.even td { background: lighten($darker-color, 6%); } - td.time-period-marker { border-left: dotted lighten(black,60%) 1px; } + td.time-period-marker { border-left: dotted lighten(black,70%) 1px; } .collapsed-multi-gap { display: inline-block; font-size: 0.1em; - color: lighten(black, 30%); + color: lighten(black, 70%); &:after { content: '...'; } margin-left: 1px; margin-right: 1px; diff --git a/app/controllers/dashboard_worker.rb b/app/controllers/dashboard_worker.rb index 35ccbfefb..56a278139 100644 --- a/app/controllers/dashboard_worker.rb +++ b/app/controllers/dashboard_worker.rb @@ -21,7 +21,7 @@ def gather all_lights = Hash[ @kata.avatars.active.each.collect{|avatar| [avatar.name, avatar.lights]} ] - max_seconds_uncollapsed = seconds_per_column * 2 + max_seconds_uncollapsed = seconds_per_column * 5 gapper = TdGapper.new(@kata.created, seconds_per_column, max_seconds_uncollapsed) @gapped = gapper.fully_gapped(all_lights, time_now) @progress = @kata.language.progress_regexs != [ ] diff --git a/app/views/dashboard/_traffic_lights.html.erb b/app/views/dashboard/_traffic_lights.html.erb index 3320b8447..3bef97537 100644 --- a/app/views/dashboard/_traffic_lights.html.erb +++ b/app/views/dashboard/_traffic_lights.html.erb @@ -24,6 +24,22 @@ $(function() { //--> + <% if @avatar_names.length != 0 %> + + <% td_map = @gapped[@avatar_names[0]] %> + <% td_map.keys.sort.each do |td_no| %> + <% td = td_map[td_no] %> + + + <% end %> + + <% end %> + <% @avatar_names.each_with_index do |name,index| %> <% td_map = @gapped[name] %>
+ + <% if td.class == Hash %> + + <% end %> +