Merge pull request #21 from ulmic/feature/request_end_date

 #event fix request collecting state

tramway-admin/app/controllers/tramway/admin/application_controller.rb

@@ -84,7 +84,7 @@ def model_given?
       end
 
       def form_given?
-        Tramway::Admin.forms.include? params[:form].underscore.sub(/^admin\//, '').sub(/_form$/, '')
+        Tramway::Admin.forms.include? params[:form].underscore.sub(%r{^admin/}, '').sub(/_form$/, '')
       end
 
       def available_scope_given?

tramway-admin/app/controllers/tramway/admin/has_and_belongs_to_many_records_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Tramway::Admin::HasAndBelongsToManyRecordsController < ::Tramway::Admin::ApplicationController
   def create
     base_object = params[:model_class].constantize.find params[:object_id]

tramway-admin/app/helpers/tramway/admin/actions_helper.rb

@@ -1,12 +1,14 @@
+# frozen_string_literal: true
+
 module Tramway::Admin::ActionsHelper
-  def destroy_is_available?(association_object, main_object)
+  def destroy_is_available?(association_object, _main_object)
     ::Tramway::Admin.action_is_available?(
       association_object,
       project: (@application_engine || @application.name),
       model_name: association_object.model.class.name,
       role: current_user.role,
       action: :destroy
-    ) 
+    )
   end
 
   def habtm_destroy_is_available?(association_object, main_object)

tramway-admin/config/routes.rb

@@ -8,5 +8,5 @@
 
   resources :records
   resource :singleton, only: %i[new create show edit update]
-  resources :has_and_belongs_to_many_records, only: [ :create, :destroy]
+  resources :has_and_belongs_to_many_records, only: %i[create destroy]
 end

tramway-admin/lib/tramway/admin/forms.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Tramway::Admin::Forms
   attr_accessor :forms
 end

tramway-conference/app/controllers/tramway/conference/web/welcome_controller.rb

@@ -12,7 +12,7 @@ def index
     actual_events = ::Tramway::Event::EventLinkDecorator.decorate ::Tramway::Event::Event.active.actual.open.order :begin_date
     @links = actual_events + past_events_links
     @close_events = ::Tramway::Event::Event.actual.open.map do |event|
-      ::Tramway::Event::EventAsPageWithButtonDecorator.decorate event 
+      ::Tramway::Event::EventAsPageWithButtonDecorator.decorate event
     end
     @partners = ::Tramway::Partner::Partnership.partnership_type.values.reduce({}) do |hash, partnership_type|
       hash.merge! partnership_type => (@unity.send(partnership_type.to_s.pluralize).active.map do |partner|

tramway-core/app/decorators/tramway/core/associations/class_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Tramway::Core::Associations::ClassHelper
   def decorate_association(association_name, decorator: nil, as: nil, state_machines: [])
     @@decorated_associations ||= []
@@ -23,8 +25,6 @@ def decorate_associations(*association_names)
       decorate_association association_name
     end
   end
-
-
   def define_main_association_method(association_name, decorator)
     define_method association_name do
       association = object.class.reflect_on_association(association_name)
@@ -33,7 +33,7 @@ def define_main_association_method(association_name, decorator)
         raise error.message
       end
       decorator_class_name = decorator || "#{class_name(association).to_s.singularize}Decorator".constantize
-      if association.class.in? [ ActiveRecord::Reflection::HasManyReflection, ActiveRecord::Reflection::HasAndBelongsToManyReflection ]
+      if association.class.in? [ActiveRecord::Reflection::HasManyReflection, ActiveRecord::Reflection::HasAndBelongsToManyReflection]
         return object.send(association_name).active.map do |association_object|
           decorator_class_name.decorate association_object
         end

tramway-core/app/decorators/tramway/core/associations/object_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Tramway::Core::Associations::ObjectHelper
   def class_name(association)
     if association.polymorphic?

tramway-event/app/forms/tramway/event/participant_extended_form_creator.rb

@@ -19,7 +19,7 @@ def self.create_form_class(uuid, event, **simple_properties)
   def self.build_validations(field)
     case field.field_type
     when 'checkbox'
-      field.validations.except('presence').deep_merge! inclusion: { in: [ 'true' ] }
+      field.validations.except('presence').deep_merge! inclusion: { in: ['true'] }
     else
       field.validations
     end

tramway-event/app/models/tramway/event/event.rb

@@ -30,8 +30,8 @@ def check_dimensions
   def request_collecting_state
     return :not_initialized unless request_collecting_begin_date.present? || request_collecting_end_date.present?
     return :will_begin_soon if request_collecting_begin_date > DateTime.now
-    return :is_over if request_collecting_end_date.present? && request_collecting_end_date < DateTime.now
-    return :are_being_right_now if request_collecting_begin_date&.past? && request_collecting_end_date&.future?
+    return :is_over if request_collecting_end_date.present? && request_collecting_end_date.to_date < Date.today
+    return :are_being_right_now if request_collecting_begin_date&.past? && (request_collecting_end_date&.future? || request_collecting_end_date&.today?)
     return :are_being_right_now if request_collecting_begin_date < DateTime.now && !request_collecting_end_date.present?
   end