implement suggestions from static code analysis tools

This commit is contained in:
rebuilt 2022-07-12 19:15:54 -07:00
parent bb5f668497
commit e89358dacc
21 changed files with 252 additions and 121 deletions

View file

@ -62,7 +62,8 @@ module AnalyzeHelper
end
def analyze_category_link(district:, school:, academic_year:, category:)
"/districts/#{district.slug}/schools/#{school.slug}/analyze?year=#{academic_year.range}&academic_years=#{academic_year.range}&category=#{category.category_id}"
year = academic_year.range
"/districts/#{district.slug}/schools/#{school.slug}/analyze?year=#{year}&academic_years=#{year}&category=#{category.category_id}"
end
def analyze_subcategory_link(district:, school:, academic_year:, category:, subcategory:)

View file

@ -1,3 +1,5 @@
# frozen_string_literal: true
Point = Struct.new(:x, :y)
Rect = Struct.new(:x, :y, :width, :height)
@ -14,15 +16,29 @@ module GaugeHelper
1
end
def effective_radius
outer_radius + stroke_width
end
def diameter
2 * effective_radius
end
def width
diameter
end
def height
outer_radius + 2 * stroke_width + key_benchmark_indicator_gutter
end
def key_benchmark_indicator_gutter
10
end
def viewbox
x = arc_center.x - (outer_radius + stroke_width)
y = arc_center.y - (outer_radius + stroke_width) - key_benchmark_indicator_gutter
width = 2 * (outer_radius + stroke_width)
height = outer_radius + 2 * stroke_width + key_benchmark_indicator_gutter
x = arc_center.x - effective_radius
y = arc_center.y - effective_radius - key_benchmark_indicator_gutter
Rect.new(x, y, width, height)
end
@ -47,8 +63,9 @@ module GaugeHelper
end
def arc_end_line_destination(radius:, percentage:)
x = arc_center.x + radius * Math.cos(angle_for(percentage:))
y = arc_center.y + radius * Math.sin(angle_for(percentage:))
angle = angle_for(percentage:)
x = arc_center.x + radius * Math.cos(angle)
y = arc_center.y + radius * Math.sin(angle)
Point.new(x, y)
end

View file

@ -1,3 +1,5 @@
# frozen_string_literal: true
module HeaderHelper
def link_to_overview(district:, school:, academic_year:)
"/districts/#{district.slug}/schools/#{school.slug}/overview?year=#{academic_year.range}"
@ -8,7 +10,8 @@ module HeaderHelper
end
def link_to_analyze(district:, school:, academic_year:)
"/districts/#{district.slug}/schools/#{school.slug}/analyze?year=#{academic_year.range}&category=1&academic_years=#{academic_year.range}"
year = academic_year.range
"/districts/#{district.slug}/schools/#{school.slug}/analyze?year=#{year}&category=1&academic_years=#{year}"
end
def district_url_for(district:, academic_year:)
@ -42,8 +45,10 @@ module HeaderHelper
end
def latest_year(school)
latest_response_rate = ResponseRate.where(school:).where('meets_student_threshold = ? or meets_teacher_threshold = ?', true,
true).joins('inner join academic_years a on response_rates.academic_year_id=a.id').order('a.range DESC').first
latest_response_rate = ResponseRate.where(school:)
.where('meets_student_threshold = ? or meets_teacher_threshold = ?', true, true)
.joins('inner join academic_years a on response_rates.academic_year_id=a.id')
.order('a.range DESC').first
academic_year = latest_response_rate.academic_year if latest_response_rate.present?
academic_year || AcademicYear.order('range DESC').first

View file

@ -1,3 +1,5 @@
# frozen_string_literal: true
module SchedulesHelper
def options_for_frequency_hours
[