diff --git a/app/assets/stylesheets/kluk.css b/app/assets/stylesheets/kluk.css index 6227c24..0b2c7f7 100644 --- a/app/assets/stylesheets/kluk.css +++ b/app/assets/stylesheets/kluk.css @@ -84,6 +84,11 @@ main { background-color: red; } +.unknown { + border: 2px double grey; + background-color: white; +} + .en-charge { background-color: orange; } diff --git a/app/helpers/moods_helper.rb b/app/helpers/moods_helper.rb index 3896eca..f676d1d 100644 --- a/app/helpers/moods_helper.rb +++ b/app/helpers/moods_helper.rb @@ -1,2 +1,9 @@ module MoodsHelper + def mode_for(mood) + if params[:guess] == "active" + mood[:mode] || mood[:guess] || "unknown" + else + mood[:mode] || "unknown" + end + end end diff --git a/app/views/moods/index.html.erb b/app/views/moods/index.html.erb index 4a803ed..c2b5552 100644 --- a/app/views/moods/index.html.erb +++ b/app/views/moods/index.html.erb @@ -46,7 +46,7 @@ <% month[:weeks].each do |week| %>
<% week.each do |mood| %> - <% mode = mood[:mode] || mood[:guess] || "unknown" %> + <% mode = mode_for(mood) %>
" data-mode="<%= mode %>" data-day="<%= l mood[:recorded_at] %>" data-action="click->mood#updateDayInfo mouseover->mood#updateDayInfo mouseleave->mood#removeFeedback" title="<%= mood[:recorded_at] %> : <%= mode %>" class="day <%= mode %>">
<% end %>