Fix consolidation

app/models/admissions/admission_application.rb

@@ -201,7 +201,9 @@ def consolidate_phase(phase)
     if phase.consolidation_form.present?
       field_objects = self.fields_hash
       committees = self.evaluations.where(admission_phase_id: phase.id).map do |ev|
-        ev.filled_form.to_fields_hash.map(&:simple_value)
+        ev.filled_form.to_fields_hash.map do |k, v|
+          [k, v.simple_value]
+        end.to_h
       end
       vars = {
         process: self.admission_process,

app/models/admissions/form_condition.rb

@@ -18,7 +18,8 @@ class Admissions::FormCondition < ActiveRecord::Base
   AND = record_i18n_attr("modes.and")
   OR = record_i18n_attr("modes.or")
   CONDITION = record_i18n_attr("modes.condition")
-  MODES = [AND, OR, CONDITION]
+  NONE = record_i18n_attr("modes.none")
+  MODES = [AND, OR, CONDITION, NONE]
 
   CONTAINS = record_i18n_attr("conditions.contains")
   STARTS_WITH = record_i18n_attr("conditions.starts_with")
@@ -116,6 +117,7 @@ def compare(first, second, field)
 
   def self.check_truth(condition, should_raise: nil, default: true, &block)
     return default if condition.nil?
+    return default if condition.mode == NONE
     case condition.mode
     when AND
        condition.form_conditions.all? do |child|

config/locales/admissions/form_condition.pt-BR.yml

@@ -11,6 +11,7 @@ pt-BR:
           and: E
           or: Ou
           condition: Condição
+          none: Nenhuma
         condition: "Condição"
         conditions:
           contains: "Contém"