tramway-event 1.12.3.5 → 1.12.3.10

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: '072972cdb9e96ea40f272e8cdba1f0fcd8c90f74b8a2c6322c7013454c7abaf8'
4
- data.tar.gz: eed9b89ebaf9a79a937159830d9000fedfaa527ffd59746c65ac5ab3046939d5
3
+ metadata.gz: dd47553c4b2de03f9bcb119c33f4ff67f5acdfd066b1b37149544da08c34d4c7
4
+ data.tar.gz: 546acb6986c03adf7c3ece913f2c85608c67b87d06626af355cf5358cff8d50c
5
5
  SHA512:
6
- metadata.gz: f6f6094ee1da88a967d89904a2c7aa8b5d20cdff337dbe01d1ee86ecfd8db54d091c85f467bc778610e94a287f29e64b0866187689378a0d068836a7aa23c7e0
7
- data.tar.gz: 6992e10900c76bbc6ae5dddbace85232ffeac7684c76dac9762f85d2d1f3c03266c5d7a4233db8eb3f80141b13222d4bd65cc7773838801f7254577b00b531d7
6
+ metadata.gz: 852ce423513c15988c7147f0ec3bf7434ca04df514c9b7415f960eda1b8ffd683f83777ea172e7e2357baf580c6e02f840f2ec76d414630df8246c6f17dee4c4
7
+ data.tar.gz: 83ff03e655e5631f05490a29a9bd84689cde5dc98b3f816bffb9a1301bc84809cceb87d234e8273ad0eb30c581c4a325791428b1a698f0505fe0fda6ed798067
@@ -8,6 +8,7 @@ module Tramway
8
8
  include ::FontAwesome5::Rails::IconHelper
9
9
  include ::Tramway::Collections::Helper
10
10
  include ::Tramway::Profiles::LinksHelper
11
+ include ::Tramway::Landing::ApplicationHelper
11
12
  end
12
13
  end
13
14
  end
@@ -7,12 +7,14 @@ class Tramway::Event::Event < ::Tramway::Event::ApplicationRecord
7
7
 
8
8
  def check_dimensions
9
9
  if photo.present?
10
- errors.add :photo, :too_small_image if photo.width < 1920 || photo.height < 1080
10
+ errors.add :photo, :too_small_image if photo.width.present? && (photo.width < 1920 || photo.height < 1080)
11
+ else
12
+ errors.add :photo, :is_not_present
11
13
  end
12
14
  end
13
15
 
14
16
  has_many :participants, class_name: 'Tramway::Event::Participant'
15
- has_many :participant_form_fields, class_name: 'Tramway::Event::ParticipantFormField'
17
+ has_many :participant_form_fields, -> { order(position: :asc) }, class_name: 'Tramway::Event::ParticipantFormField'
16
18
  has_many :sections, class_name: 'Tramway::Event::Section'
17
19
  has_many :partakings, as: :part, class_name: 'Tramway::Event::Partaking'
18
20
  has_many :partnerships, class_name: 'Tramway::Partner::Partnership', as: :partner
@@ -22,7 +24,9 @@ class Tramway::Event::Event < ::Tramway::Event::ApplicationRecord
22
24
 
23
25
  enumerize :reach, default: :open, in: %i[open closed]
24
26
 
25
- scope :actual, -> { order(:begin_date).where('end_date > ?', DateTime.now) }
27
+ scope :actual, -> do
28
+ where('begin_date > ?', DateTime.now).or(where('begin_date < ? AND end_date > ?', DateTime.now, DateTime.now)).order(begin_date: :asc)
29
+ end
26
30
  scope :past, -> { where 'end_date < ?', DateTime.now }
27
31
  scope :open, -> { where reach: :open }
28
32
  scope :closed, -> { where reach: :closed }
@@ -1,11 +1,12 @@
1
- .row.form
2
- .col-lg-12
3
- %h1.text-center
4
- = t(".request_collecting_state.#{event.request_collecting_state}")
5
- - if event.request_collecting_state == :are_being_right_now && event.participant_form_fields.any?
6
- - class_name = 'tramway_event_participant'
7
- = simple_form_for @participant_form, url: ::Tramway::Event::Engine.routes.url_helpers.participants_path, method: :post, html: { class: class_name, id: class_name } do |f|
8
- = f.input :event_id, as: :hidden, input_html: { value: event.id, class: class_name, id: "#{class_name}_event_id", name: "#{class_name}[event_id]" }
9
- - event.participant_form_fields.inputs_list.each do |field|
10
- = render 'tramway/core/shared/input_extended', field: field, class_name: class_name, f: f, value: (params[:participant].present? ? params[:participant][field.title] : '')
11
- = f.button :submit, t('.submit_form')
1
+ - unless event.request_collecting_state == :not_initialized
2
+ .row.form
3
+ .col-lg-12
4
+ %h1.text-center
5
+ = t(".request_collecting_state.#{event.request_collecting_state}")
6
+ - if event.request_collecting_state == :are_being_right_now && event.participant_form_fields.any?
7
+ - class_name = 'tramway_event_participant'
8
+ = simple_form_for @participant_form, url: ::Tramway::Event::Engine.routes.url_helpers.participants_path, method: :post, html: { class: class_name, id: class_name } do |f|
9
+ = f.input :event_id, as: :hidden, input_html: { value: event.id, class: class_name, id: "#{class_name}_event_id", name: "#{class_name}[event_id]" }
10
+ - event.participant_form_fields.inputs_list.each do |field|
11
+ = render 'tramway/core/shared/input_extended', field: field, class_name: class_name, f: f, value: (params[:participant].present? ? params[:participant][field.title] : '')
12
+ = f.button :submit, t('.submit_form')
@@ -2,6 +2,6 @@
2
2
 
3
3
  module Tramway
4
4
  module Event
5
- VERSION = '1.12.3.5'
5
+ VERSION = '1.12.3.10'
6
6
  end
7
7
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: tramway-event
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.12.3.5
4
+ version: 1.12.3.10
5
5
  platform: ruby
6
6
  authors:
7
7
  - Pavel Kalashnikov
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2020-05-07 00:00:00.000000000 Z
11
+ date: 2020-10-27 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: configus