tramway-event 1.9.25.1 → 1.9.27.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 937ff3b06d9ea3497845040968ef84d1087ac7edef7564bdc6c6a7bbef421cd6
-  data.tar.gz: e9c50108c1ce22dc8096e4d381a95765636e3d0de584ac2e2fcda6f811a9aacf
+  metadata.gz: 76552ff5dda59b163764bf4698e0c4c75b2693e3e60f2dbd7e533868e79585a3
+  data.tar.gz: fd33dcefca151bea4c14bab7b4e20190f9040dee74cefcb5a3da228cc3ebedab
 SHA512:
-  metadata.gz: c0626430f816e7e5a4c43556b7f41645edbdab4c5492729ddda40531d3de2c4b30617bb4c496c504250da68177447c2605bed7045278e8667f31ed6beeaa2b90
-  data.tar.gz: 48d9d68033b0306522cdeff49ef103d9dd8615ad8022f02413a283673cf56930d297c0278cc6c16d5307362f4b383168879857d9c7b292cd429bb2499af3e4b4
+  metadata.gz: a9cf10218564e0aa1c49fece8f4af25b7c08aa519fe8038bb724ace879ff133387a0376c039ece9500e395ddd0a0673786848615ca6fec6ffd38eafbd4ac023a
+  data.tar.gz: 6c29d51644ff6664e0eb276324e84b4ca890e7fcacf05917ecb16c2fd60ab81e0f37cd7b04896b682a83a8da54f42ee28c181770bc1bc5fff1e58464e25e2ee9

data/README.md

@@ -27,6 +27,13 @@ rails db:migrate
 
 #### 4. Then make `tramway-landing` installation. [How-to](https://github.com/ulmic/tramway-dev/blob/develop/tramway-landing/README.md#installation)
 
+Versions table
+
+| tramway-event | tramway-landing |
+| ------------- | --------------- |
+| < 1.9.27.1 | 1.x |
+| >= 1.9.27.2 | 2.x | 
+
 #### 5. Add events to admin panel
 
 *config/initializers/tramway.rb*
@@ -41,6 +48,13 @@ Tramway::Admin.set_available_models ::Tramway::Event::Event, ::Tramway::Event::P
 mount Tramway::Event::Engine, at: '/'
 ```
 
+## How-to
+
+### Create event
+
+English docs coming soon...
+[На русском](https://github.com/ulmic/tramway-dev/tree/develop/tramway-event/docs/russian)
+
 ## Contributing
 Contribution directions go here.
 

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
@@ -24,7 +25,7 @@ class Tramway::Event::EventDecorator < ::Tramway::Core::ApplicationDecorator
     end
 
     def list_attributes
-      %i[requested_participants approved_participants]
+      %i[requested_participants approved_participants events_link]
     end
   end
 
@@ -71,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 = ['http://molodoy.online', event_link].join
+    content_tag(:pre) 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/participant_decorator.rb

@@ -44,7 +44,7 @@ class Tramway::Event::ParticipantDecorator < ::Tramway::Core::ApplicationDecorat
           object.event.title
         end)
       end)
-      object.event.participant_form_fields.map do |field|
+      object.event.participant_form_fields.active.map do |field|
         hash = if field.options.is_a?(Hash)
                  field.options
                else

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

@@ -1,20 +1,33 @@
 # 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 = {} if model.options == ''
+      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/views/tramway/event/events/show.html.haml

@@ -1,7 +1,5 @@
 - content_for :title do
   = @event.title
-- content_for :head_content do
-  = javascript_include_tag 'tramway/event/application'
 - content_for :footer_links do
   %ul
     - @events.each do |event|

data/config/initializers/tramway.rb

@@ -8,6 +8,10 @@
   ::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
+}
+
+::Tramway::Landing.head_content = lambda do
+  javascript_include_tag 'tramway/event/application'
 end

data/config/locales/models.yml

@@ -20,6 +20,7 @@ ru:
       tramway/event/place: Место
     attributes:
       tramway/event/event:
+        events_link: Ссылка на мероприятие
         title: Название
         name: Название
         description: Описание
@@ -49,6 +50,7 @@ ru:
         participation_state: Статус участника
         event: Мероприятие
         values: Данные
+        participation_state_event: Статус участия в мероприятии
       tramway/event/section:
         title: Название
         description: Описание
@@ -63,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.25.1'
+    VERSION = '1.9.27.3'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tramway-event
 version: !ruby/object:Gem::Version
-  version: 1.9.25.1
+  version: 1.9.27.3
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-26 00:00:00.000000000 Z
+date: 2020-01-29 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