Refactor and style code

portabilis · edersoares · May 4, 2022 · Dec 11, 2021 · Dec 16, 2021 · Dec 20, 2021
commit 5450eee7cc5f363301778e817ca48138eaaf9f38
diff --git a/app/forms/avaliation_multiple_creator_form.rb b/app/forms/avaliation_multiple_creator_form.rb
@@ -36,21  36,25 @@ def save
 
   def test_setting
     return if test_setting_id.blank?
 
     @test_setting ||= TestSetting.find(test_setting_id)
   end
 
   def unity
     return if unity_id.blank?
 
     @unity ||= Unity.find(unity_id)
   end
 
   def discipline
     return if discipline_id.blank?
 
     @discipline ||= Discipline.find(discipline_id)
   end
 
   def test_setting_test
     return if test_setting_test_id.blank?
 
     @test_setting_test ||= TestSettingTest.find(test_setting_test_id)
   end
 
@@ -66,7  70,7 @@ def avaliations_attributes=(value)
       classroom_id = avaliation_attributes.last['classroom_id'].to_i
       avaliation = Avaliation.new.localized
       avaliation.assign_attributes(
-        include: avaliation_attributes.last['include'] == "1",
         include: avaliation_attributes.last['include'] == '1',
         classroom_id: classroom_id,
         test_date: avaliation_attributes.last['test_date'],
         classes: avaliation_attributes.last['classes'],
@@ -86,17  90,16 @@ def avaliations_attributes=(value)
 
   def load_avaliations!(teacher_id, school_calendar_year)
     return unless discipline_id.present? && teacher_id.present?
-    classrooms = Classroom
-      .by_unity_and_teacher(unity_id, teacher_id)
-      .by_teacher_discipline(discipline_id)
-      .by_year(school_calendar_year)
-      .ordered
 
     classrooms = Classroom.by_unity_and_teacher(unity_id, teacher_id)
                           .by_teacher_discipline(discipline_id)
                           .by_year(school_calendar_year)
                           .ordered
 
     @avaliations = []
 
     classrooms.each do |classroom|
-      @avaliations << Avaliation.new(
-        classroom_id: classroom.id
-      )
       @avaliations << Avaliation.new(classroom_id: classroom.id)
     end
   end
 
@@ -107,20  110,21 @@ def at_least_one_assigned_avaliation
   end
 
   def allow_break_up?
-    test_setting_test && test_setting_test.allow_break_up
     test_setting_test&.allow_break_up
   end
 
   def average_calculation_type
-    return "" if test_setting.nil?
     return '' if test_setting.nil?
 
     test_setting.average_calculation_type
   end
 
   def sum_calculation_type?
-    average_calculation_type == "sum"
     average_calculation_type == 'sum'
   end
 
   def arithmetic_and_sum_calculation_type?
-    average_calculation_type == "arithmetic_and_sum"
     average_calculation_type == 'arithmetic_and_sum'
   end
 
   def should_validate_weight?
@@ -129,14  133,29 @@ def should_validate_weight?
 
   def add_avaliations_errors_to_classrooms
     valid = true
 
     avaliations.select(&:include).each do |avaliation|
-      if !avaliation.valid?
-        msg = avaliation.errors.full_messages.reject{|msg| msg.include?("Data da avaliação") || msg.include?("Aulas") || msg.include?(I18n.t('errors.messages.not_allowed_to_post_in_date'))}.first
-        errors.add(:base, msg) if msg
-        avaliation.errors.add(:classroom, msg)
-        valid = false
       next if avaliation.valid?
 
       error_message = avaliation_error(avaliation)
 
       if error_message
         errors.add(:base, error_message)
         avaliation.errors.add(:classroom, error_message)
       end
 
       valid = false
     end
 
     valid
   end
 
   private
 
   def avaliation_error(avaliation)
     avaliation.errors.full_messages.reject { |msg|
       msg.include?('Data da avaliação') || msg.include?('Aulas') ||
         msg.include?(I18n.t('errors.messages.not_allowed_to_post_in_date'))
     }.first
   end
 end