From 5c9a999b3c52cf6bb22a8485106dab1b6c6fb128 Mon Sep 17 00:00:00 2001
From: Nelson Jovel <memoryman51@hotmail.com>
Date: Fri, 17 May 2024 08:52:13 -0700
Subject: [PATCH] fix: When multiple years were selected on the Analyze page,
 results were getting incorrectly filtered out when the first academic year
 did not have sufficient responses.   Now all selected years with data are
 correctly displayed

---
 .../analyze/_grouped_bar_column.html.erb      | 52 ++++++++++++-------
 1 file changed, 34 insertions(+), 18 deletions(-)

diff --git a/app/views/analyze/_grouped_bar_column.html.erb b/app/views/analyze/_grouped_bar_column.html.erb
index 65f1fc21..f56894de 100644
--- a/app/views/analyze/_grouped_bar_column.html.erb
+++ b/app/views/analyze/_grouped_bar_column.html.erb
@@ -1,13 +1,13 @@
 <g class="grouped-bar-column" data-for-measure-id="<%= column.measure.measure_id %>">
-<% score_label_y = [5, 10, 15, 5, 10, 15 ] %>
+  <% score_label_y = [5, 10, 15, 5, 10, 15 ] %>
   <% column.bars.each_with_index do |bar, index| %>
-    <% if column.sufficient_data?(index)   %>
-      <rect
+    <rect
       <% if column.show_popover? %>
-      data-bs-toggle="popover"
-      data-bs-placement="right"
-      data-bs-content="<%= column.popover_content(index) %>"
+        data-bs-toggle="popover"
+        data-bs-placement="right"
+        data-bs-content="<%= column.popover_content(index) %>"
       <% end %>
+
       data-for-academic-year="<%= bar.academic_year.range %>"
       x="<%= bar.x_position %>%"
       y="<%= bar.y_offset %>%"
@@ -17,6 +17,7 @@
 
       <% if ENV["SCORES"].present?  && ENV["SCORES"].upcase == "SHOW" %>
         <text x="<%= bar.x_position + (column.bar_width * 0.5) %>%" y="<%= score_label_y[index] %>%" text-anchor="middle" dominant-baseline="middle">
+<<<<<<< Updated upstream
           <%= bar.average %>
         </text>
       <% end %>
@@ -25,22 +26,37 @@
   <% end %>
 
   <line x1="<%= column.column_start_x %>%" y1="0" x2="<%= column.column_start_x %>%" y2="85%" stroke="grey" stroke-width="1" stroke-dasharray="5,2" />
-      <% words = column.label %>
-      <% words.each_with_index do | line, index | %>
-        <text class="graph-footer" x="<%= column.column_midpoint %>%" y="<%= column.bar_label_height + (index * 5) %>%" text-anchor="middle" dominant-baseline="middle" data-grouped-bar-label="<%= column.label %>">
-          <%= line %>
+||||||| constructed merge base
+          <%= bar.average %>
         </text>
       <% end %>
 
-  <% if column.show_irrelevancy_message? %>
+    <% end %>
+  <% end %>
+
+  <line x1="<%= column.column_start_x %>%" y1="0" x2="<%= column.column_start_x %>%" y2="85%" stroke="grey" stroke-width="1" stroke-dasharray="5,2" />
+=======
+      <%= bar.average %>
+    </text>
+  <% end %>
+<% end %>
+<line x1="<%= column.column_start_x %>%" y1="0" x2="<%= column.column_start_x %>%" y2="85%" stroke="grey" stroke-width="1" stroke-dasharray="5,2" />
+>>>>>>> Stashed changes
+      <% words = column.label %>
+      <% words.each_with_index do | line, index | %>
+        <text class="graph-footer" x="<%= column.column_midpoint %>%" y="<%= column.bar_label_height + (index * 5) %>%" text-anchor="middle" dominant-baseline="middle" data-grouped-bar-label="<%= column.label %>">
+  <%= line %>
+</text>
+<% end %>
+<% if column.show_irrelevancy_message? %>
   <rect x="<%= column.message_x %>%" y="<%= column.message_y %>%" rx="15" ry="15" width="<%= column.message_width %>%" height="<%= column.message_height %>%" fill="white" stroke="gray" />
 
     <text x="<%= column.column_midpoint %>%" y="<%= 20 %>%" text-anchor="middle">
-      <tspan x="<%= column.column_midpoint %>%" y="29%">measure not</tspan>
-      <tspan x="<%= column.column_midpoint %>%" y="34%">based on</tspan>
-      <tspan x="<%= column.column_midpoint %>%" y="39%"><%= column.basis %></tspan>
-    </text>
-  <% elsif column.show_insufficient_data_message? %>
+    <tspan x="<%= column.column_midpoint %>%" y="29%">measure not</tspan>
+    <tspan x="<%= column.column_midpoint %>%" y="34%">based on</tspan>
+    <tspan x="<%= column.column_midpoint %>%" y="39%"><%= column.basis %></tspan>
+  </text>
+<% elsif column.show_insufficient_data_message? %>
   <rect x="<%= column.message_x %>%" y="<%= column.message_y %>%" rx="15" ry="15" width="<%= column.message_width %>%" height="<%= column.message_height %>%" fill="white" stroke="gray" />
 
     <text x="<%= column.column_midpoint %>%" y="<%= 20 %>%" text-anchor="middle">
@@ -48,6 +64,6 @@
       <% offset = 29 + index * 5 %>
       <tspan x='<%= column.column_midpoint  %>%' y='<%=  offset %>%'><%= line %></tspan>
     <% end  %>
-    </text>
-  <% end %>
+  </text>
+<% end %>
 </g>