diff --git a/app/assets/stylesheets/kluk.css b/app/assets/stylesheets/kluk.css index 9dc978f..3f991a5 100644 --- a/app/assets/stylesheets/kluk.css +++ b/app/assets/stylesheets/kluk.css @@ -61,6 +61,14 @@ main { height: 15px; } +.empty-day { + border: 1px dashed #aaa; + margin: 4px; + width: 15px; + height: 15px; + background: transparent; +} + .info { margin: 30px; } diff --git a/app/helpers/moods_helper.rb b/app/helpers/moods_helper.rb index 0ff7816..c073945 100644 --- a/app/helpers/moods_helper.rb +++ b/app/helpers/moods_helper.rb @@ -1,4 +1,11 @@ module MoodsHelper + def day_status(mood, user) + return :filled if mood[:mode].present? + return :guessed if mood[:guess].present? && user.guess? + return :unknown if mood[:guess].present? && !user.guess? + :empty + end + def mode_for(mood, user) if user.guess? mood[:mode] || mood[:guess] || { label: "unknown", color: "white", image_url: "unknown.jpg" } @@ -7,9 +14,15 @@ module MoodsHelper end end - def style_for_mode(mode) - style = "background-color: #{mode[:color]};" - style += " border: 2px double grey;" if mode[:label] == "unknown" - style + def style_for_mode(mode, status) + case status + when :empty then "" + when :unknown then "background-color: #{mode[:color]}; border: 2px double grey;" + else "background-color: #{mode[:color]};" + end + end + + def css_class_for_day(status) + status == :empty ? "day empty-day" : "day" end end diff --git a/app/views/moods/index.html.erb b/app/views/moods/index.html.erb index 0db93ff..724441c 100644 --- a/app/views/moods/index.html.erb +++ b/app/views/moods/index.html.erb @@ -14,7 +14,7 @@ <% @user.modes.each do |mode| %>