tramway-event 1.12.3.8 → 1.12.6
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/decorators/tramway/event/event_decorator.rb +4 -2
- data/app/decorators/tramway/event/section_decorator.rb +5 -1
- data/app/models/tramway/event/event.rb +5 -1
- data/app/views/tramway/event/participants/_form.html.haml +12 -11
- data/config/locales/models.yml +1 -0
- data/lib/tramway/event/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 0c5cea79e8830c3db57b2657e8df6e27d0c09f6136fc96336760c2b84f05d225
|
4
|
+
data.tar.gz: 807718fa455cc0f29643e23a532b0bddec678cb2decdcd123e30ac6ffa7165f5
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 3ef4fb14eef67149617974d2c2da311be4bb6de80944be5b92d6ee95745b3a6aa0b8e4d8c573fd77152d911f6b73c800409f39eafb42f75abf5a7bcb9311db44
|
7
|
+
data.tar.gz: 59660760d05f0667a9e759dad0ec9b9ea44f7e40d75477312eb466138244fce01ff292d6a0cca984d330269aff990b21ddf0c4ddf7d9fe6a9c6a25ca52cdc061
|
@@ -11,7 +11,7 @@ class Tramway::Event::EventDecorator < ::Tramway::Core::ApplicationDecorator
|
|
11
11
|
end
|
12
12
|
|
13
13
|
def show_associations
|
14
|
-
%i[participant_form_fields actions]
|
14
|
+
%i[participant_form_fields actions sections partakings]
|
15
15
|
end
|
16
16
|
|
17
17
|
def list_attributes
|
@@ -20,8 +20,10 @@ class Tramway::Event::EventDecorator < ::Tramway::Core::ApplicationDecorator
|
|
20
20
|
end
|
21
21
|
|
22
22
|
delegate :title, to: :object
|
23
|
-
decorate_associations :participants, :
|
23
|
+
decorate_associations :participants, :partnerships, :organizations
|
24
24
|
decorate_association :participant_form_fields, as: :event
|
25
|
+
decorate_association :sections, as: :event
|
26
|
+
decorate_association :partakings, as: :part
|
25
27
|
decorate_association :actions, as: :event, state_machines: [:action_state]
|
26
28
|
|
27
29
|
def background
|
@@ -5,11 +5,15 @@ class Tramway::Event::SectionDecorator < ::Tramway::Landing::BlockTypes::Feature
|
|
5
5
|
def collections
|
6
6
|
[:all]
|
7
7
|
end
|
8
|
+
|
9
|
+
def show_associations
|
10
|
+
[ :partakings ]
|
11
|
+
end
|
8
12
|
end
|
9
13
|
|
10
14
|
delegate :description, to: :object
|
11
15
|
decorate_association :event
|
12
|
-
decorate_association :partakings, decorator: Tramway::Event::PartakingFeatureDecorator
|
16
|
+
decorate_association :partakings, as: :part, decorator: Tramway::Event::PartakingFeatureDecorator
|
13
17
|
|
14
18
|
def name
|
15
19
|
"#{object.title} | #{object.event.title}"
|
@@ -8,6 +8,8 @@ class Tramway::Event::Event < ::Tramway::Event::ApplicationRecord
|
|
8
8
|
def check_dimensions
|
9
9
|
if photo.present?
|
10
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
|
|
@@ -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, ->
|
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
|
-
.
|
2
|
-
.
|
3
|
-
|
4
|
-
|
5
|
-
|
6
|
-
-
|
7
|
-
|
8
|
-
=
|
9
|
-
|
10
|
-
|
11
|
-
|
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')
|
data/config/locales/models.yml
CHANGED
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.
|
4
|
+
version: 1.12.6
|
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-
|
11
|
+
date: 2020-10-28 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: configus
|