From 3a744db975d27fa552dfdf99eea0ea96f7128901 Mon Sep 17 00:00:00 2001
From: rebuilt <memoryman51@hotmail.com>
Date: Tue, 17 Jan 2023 15:27:15 -0800
Subject: [PATCH] Start adding kindergarten

---
 .../analyze/graph/column/grade/zero.rb        | 32 +++++++++++++++++++
 .../analyze/graph/students_by_grade.rb        |  3 +-
 app/services/survey_item_values.rb            |  5 +--
 lib/tasks/data.rake                           |  1 +
 4 files changed, 36 insertions(+), 5 deletions(-)
 create mode 100644 app/presenters/analyze/graph/column/grade/zero.rb

diff --git a/app/presenters/analyze/graph/column/grade/zero.rb b/app/presenters/analyze/graph/column/grade/zero.rb
new file mode 100644
index 00000000..684d4f38
--- /dev/null
+++ b/app/presenters/analyze/graph/column/grade/zero.rb
@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+module Analyze
+  module Graph
+    module Column
+      module Grade
+        class Zero < GroupedBarColumnPresenter
+          include Analyze::Graph::Column::Grade::ScoreForGrade
+          def label
+            'Kindergarten'
+          end
+
+          def basis
+            'student'
+          end
+
+          def show_irrelevancy_message?
+            false
+          end
+
+          def show_insufficient_data_message?
+            false
+          end
+
+          def grade
+            1
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/app/presenters/analyze/graph/students_by_grade.rb b/app/presenters/analyze/graph/students_by_grade.rb
index 4330e012..267a9037 100644
--- a/app/presenters/analyze/graph/students_by_grade.rb
+++ b/app/presenters/analyze/graph/students_by_grade.rb
@@ -32,6 +32,7 @@ module Analyze
       end
 
       CFR = {
+        0 => Zero,
         1 => One,
         2 => Two,
         3 => Three,
@@ -43,7 +44,7 @@ module Analyze
         9 => Nine,
         10 => Ten,
         11 => Eleven,
-        12 => Twelve,
+        12 => Twelve
       }.freeze
     end
   end
diff --git a/app/services/survey_item_values.rb b/app/services/survey_item_values.rb
index 8a7bcdda..1e668554 100644
--- a/app/services/survey_item_values.rb
+++ b/app/services/survey_item_values.rb
@@ -61,10 +61,7 @@ class SurveyItemValues
   end
 
   def grade
-    @grade ||= begin
-      raw_grade = (row['grade'] || row['Grade'] || row['What grade are you in?']).to_i
-      raw_grade == 0 ? nil : raw_grade
-    end
+    @grade ||= raw_grade = (row['grade'] || row['Grade'] || row['What grade are you in?']).to_i
   end
 
   def gender
diff --git a/lib/tasks/data.rake b/lib/tasks/data.rake
index 912be163..9f874255 100644
--- a/lib/tasks/data.rake
+++ b/lib/tasks/data.rake
@@ -59,6 +59,7 @@ namespace :data do
 
   desc 'load students for lowell'
   task load_students_for_lowell: :environment do
+    student_count = Student.count
     SurveyItemResponse.update_all(student_id: nil)
     StudentRace.delete_all
     Student.delete_all