Update traffic-light hover-tip to show revert r/a/g image

cyber-dojo · Aug 6, 2020 · 86bd3b6 · 86bd3b6
1 parent 0b58082
commit 86bd3b6
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 4 deletions.
diff --git a/app/helpers/traffic_light_tip_helper.rb b/app/helpers/traffic_light_tip_helper.rb
@@ -41,12 +41,22 @@ def traffic_light_img(light)
     if colour.to_s === ''
       ''
     else
-      predicted = rag?(colour) ? "_predicted_#{light.predicted}" : ''
-      "<img src='/traffic-light/image/#{light.colour}#{predicted}.png'" +
+      "<img src='/traffic-light/image/#{light.colour}#{imgSuffix(light)}.png'" +
         " class='traffic-light-diff-tip-traffic-light-image'>"
     end
   end
 
+  def imgSuffix(light)
+    if !rag?(light.colour)
+      ''
+    elsif light.revert
+      '_revert'
+    else
+      predicted = light.predicted || 'none'
+      "_predicted_#{predicted}"
+    end
+  end
+
   def rag?(colour)
     %w( red amber green ).include?(colour.to_s)
   end

diff --git a/app/models/event.rb b/app/models/event.rb
@@ -29,6 +29,10 @@ def status
     event['status']
   end
 
+  def revert
+    event['revert']
+  end
+
   def time
     Time.mktime(*@hash['time'])
   end

diff --git a/app/views/kata/_traffic_lights.html.erb b/app/views/kata/_traffic_lights.html.erb
@@ -78,9 +78,8 @@ $(() => {
   };
 
   const imgSuffix = (event) => {
-    const colour = event.colour;
     const predicted = event.predicted || 'none';
-    if (!isRag(colour)) {
+    if (!isRag(event.colour)) {
       return '';
     } else if (event.revert) {
       return '_revert';