tramway-event 1.9.24 → 1.9.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b5958b4032cf120b5f9d0f7cf4ebe18f17ec2ebb44cc2ec71dc6b1d51b7454d6
-  data.tar.gz: 2c5a343cb390eaee3c3cee050d1fa2d89b028facb49c1e512a312d90ff4f79b9
+  metadata.gz: 254c506135da94272d3b29c64e8433408899887d076f9ddf90c500575fce39bc
+  data.tar.gz: ccf6e8f67d7305b19d57c262a7375d7f6cee0c7a22e8f38a2f9040ff67dceff5
 SHA512:
-  metadata.gz: c5c7549fe496068b3a0952e97ff938894e35378af15e8968495b925a11e65d586a8784235a38170a72fb11f8ad09864678a8574643ba8d4ea87715617992e67a
-  data.tar.gz: 9c8578d4c7b5eecaf097e08a3653a85eb38688346f569209c8280e28de389ad5048936963b12a34ff5d397fdb7677d6a120f0d4051299ec07126dab3ca1b9eaa
+  metadata.gz: 5511a2b01b04e1fcc82970f02eb620f94f3cdade6679841846400597b2647c6a61dde2fd5a3299b7da5e640d1c74bed105085dd48789efd87caee00c50a77d36
+  data.tar.gz: a5d4093e097bbf6c56a37e6151f7723ae4bf83d907f35313df0794208c2452038fa462ecb436ba5b7e3859546c0ba1e9d6137fc37d40a4949ca5f6a18285ceef

data/app/assets/javascripts/application.js

@@ -0,0 +1,8 @@
+//= require tramway/core/application
+//= require_tree .
+//= require clipboard
+
+$(document).ready(function(){  
+  
+  var clipboard = new Clipboard('.clipboard-btn');	
+});

data/app/assets/javascripts/tramway/event/application.js

@@ -1,4 +1,2 @@
 //= require tramway/core/application
-//= require_tree .
-
-window.current_locale = window.i18n_locale('ru');
+//= require_tree .

data/app/decorators/tramway/event/event_decorator.rb

@@ -10,6 +10,7 @@ class Tramway::Event::EventDecorator < ::Tramway::Core::ApplicationDecorator
       %i[
         title
         duration
+        events_link
         state
         created_at
         photo
@@ -19,15 +20,19 @@ class Tramway::Event::EventDecorator < ::Tramway::Core::ApplicationDecorator
       ]
     end
 
+    def show_associations
+      %i[participant_form_fields]
+    end
+
     def list_attributes
-      %i[requested_participants approved_participants]
+      %i[requested_participants approved_participants events_link]
     end
   end
 
   delegate :title, to: :object
   delegate :status, to: :object
   decorate_association :participants
-  decorate_association :participant_form_fields
+  decorate_association :participant_form_fields, as: :event
   decorate_association :sections
   decorate_association :partakings
   decorate_association :partnerships
@@ -56,6 +61,8 @@ class Tramway::Event::EventDecorator < ::Tramway::Core::ApplicationDecorator
   end
 
   def duration(begin_date: object.begin_date, end_date: object.end_date)
+    return unless begin_date.present? || end_date.present?
+
     if begin_date.to_date == end_date.to_date
       I18n.l(begin_date, format: '%d %B %Y').to_s
     elsif begin_date.month == end_date.month
@@ -65,6 +72,16 @@ class Tramway::Event::EventDecorator < ::Tramway::Core::ApplicationDecorator
     end
   end
 
+  def events_link
+    event_link = Tramway::Event::Engine.routes.url_helpers.event_path object
+    event_url = ['molodoy.online', event_link].join
+    content_tag(:div) do
+      id = "event#{object.id}"
+      concat link_to event_url, event_url, id: id
+      concat copy_to_clipboard id
+    end
+  end
+
   def request_collecting_duration
     return if object.request_collecting_begin_date.nil? || object.request_collecting_end_date.nil?
 

data/app/decorators/tramway/event/events/show/event_decorator.rb

@@ -25,6 +25,8 @@ class Tramway::Event::Events::Show::EventDecorator < ::Tramway::Core::Applicatio
   end
 
   def duration
+    return unless object.begin_date.present? || object.end_date.present?
+
     if object.begin_date.to_date == object.end_date.to_date
       I18n.l(object.begin_date, format: '%d %B %Y').to_s
     elsif object.begin_date.month == object.end_date.month

data/app/forms/tramway/event/participant_form.rb

@@ -3,7 +3,7 @@
 require 'securerandom'
 
 class Tramway::Event::ParticipantForm < ::Tramway::Core::ApplicationForm
-  properties :participation_state, :comment
+  properties :participation_state_event, :comment
   association :event
 
   def self.new(object)
@@ -12,7 +12,7 @@ class Tramway::Event::ParticipantForm < ::Tramway::Core::ApplicationForm
         SecureRandom.hex,
         object.event,
         comment: :string,
-        participation_state: :string
+        participation_state_event: :string
       ).new object
     else
       super(object).tap do |obj|

data/app/forms/tramway/event/participant_form_field_form.rb

@@ -1,20 +1,32 @@
 # frozen_string_literal: true
 
-class Tramway::Event::ParticipantFormFieldForm < ::Tramway::Core::ApplicationForm
-  properties :title, :description, :field_type, :options, :position
+class Tramway::Event::ParticipantFormFieldForm < ::Tramway::Core::ExtendedApplicationForm
+  properties :title, :description, :field_type, :options, :position, :list_field
   association :event
 
   def initialize(object)
     super(object).tap do
       form_properties event: :association,
-        title: :string,
-        description: :string,
-        field_type: :default,
-        options: :text,
-        position: :numeric
+                      title: :string,
+                      description: :string,
+                      field_type: :default,
+                      options: :text,
+                      list_field: :boolean,
+                      position: :numeric
     end
   end
 
+  def submit(params)
+    super(params).tap do
+      model.options&.merge! list_field: (params[:list_field] == '1').to_s
+      model.save
+    end
+  end
+
+  def list_field
+    model.options&.dig('list_field') == 'true'
+  end
+
   def options
     model.options&.to_json
   end

data/app/models/tramway/event/event.rb

@@ -20,8 +20,9 @@ class Tramway::Event::Event < ::Tramway::Event::ApplicationRecord
   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 < 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 :are_being_right_now if request_collecting_begin_date < DateTime.now && !request_collecting_end_date.present?
   end
 
   include ::Tramway::Partner::Scopes if defined? ::Tramway::Partner

data/config/initializers/tramway.rb

@@ -8,6 +8,6 @@
   ::Tramway::Event::Partaking,
   ::Tramway::Event::Place,
   project: :event)
-::Tramway::Admin.set_notificable_queries new_participants: -> (current_user) do
+::Tramway::Admin.set_notificable_queries new_participants: lambda { |current_user|
   ::Tramway::Event::Participant.active.where(participation_state: :requested).send "#{current_user.role}_scope", current_user.id
-end
+}

data/config/locales/models.yml

@@ -20,6 +20,7 @@ ru:
       tramway/event/place: Место
     attributes:
       tramway/event/event:
+        events_link: Ссылка на мероприятие
         title: Название
         name: Название
         description: Описание
@@ -36,6 +37,7 @@ ru:
         not_yet_held: мероприятие ещё не проведено
         participants_list: Список участников
         does_not_have_end_date: мероприятие не имеет даты окончания
+        participant_form_fields: Поле анкеты
       tramway/event/participant:
         name: Имя
         list_fields: Данные
@@ -48,6 +50,7 @@ ru:
         participation_state: Статус участника
         event: Мероприятие
         values: Данные
+        participation_state_event: Статус участия в мероприятии
       tramway/event/section:
         title: Название
         description: Описание
@@ -62,8 +65,9 @@ ru:
         description: Описание
         field_type: Тип поля
         position: Позиция в анкете
-        options: Параметры
+        options: Параметры (не редактировать без надобности)
         title: Название (в Tramway название Поля анкеты - это ключ для выборки пользователей. Если вы измените ключ к выборке пользователей, то все пользователи, получившие данные по предыдущему ключу по этой выборке показываться не будут)
+        list_field: Показывать это поле в общем списке участников?
       tramway/event/partaking:
         part_name: Мероприятие
         event_duration: Дата мероприятия

data/lib/tramway/event/version.rb

@@ -2,6 +2,6 @@
 
 module Tramway
   module Event
-    VERSION = '1.9.24'
+    VERSION = '1.9.27'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tramway-event
 version: !ruby/object:Gem::Version
-  version: 1.9.24
+  version: 1.9.27
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-23 00:00:00.000000000 Z
+date: 2020-01-28 00:00:00.000000000 Z
 dependencies: []
 description: Rails engine for events
 email:
@@ -21,6 +21,7 @@ files:
 - README.md
 - Rakefile
 - app/assets/config/tramway_event_manifest.js
+- app/assets/javascripts/application.js
 - app/assets/javascripts/tramway/event/application.js
 - app/assets/stylesheets/tramway/event/application.css.sass
 - app/assets/stylesheets/tramway/event/events/show.css.sass