tramway-event 1.9.28.2 → 1.9.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 73a405b2fac690efce6bd5c9c37db9ac2d959cc8f2da7d18bf1c1dbdb7ae8832
-  data.tar.gz: 5ead2f3910c1aad07658d7a7ee54fced56c03be44f5da02d1bfcf48b228d9efd
+  metadata.gz: 5934677a7693e129263e003d40fb0c32a5b192ca2473ce970ab8204cf4c11222
+  data.tar.gz: 5fb809b1cf2495b2a6cb6230cbcebf975c0f87f1535cc7c66ed958eb5d0d5b3f
 SHA512:
-  metadata.gz: aa439dd85f1188389a9cb9416a82770d97f51cba9eca16c3fdb4142adea5c48680dd9d95034de7043a5146e900eac4441fe82c937c2719758e321ba264a0f6f7
-  data.tar.gz: c2ce2baf15af424151620426861d293be00d61cdd36912e583e7d49f2521e8437b05601faa931567523d9922cb4c557028babe2f16e140e3dddff002a4765994
+  metadata.gz: 82a328caebddab43227e1f8908b091312f41914676ecb859ec5b6ecaa6010ced39f8f1afc38f869894a16cecaa36cc10e38edf326fd65efb9ff74781215b7aa5
+  data.tar.gz: 9185026a5b04a10c4efd9aed97b09d18210205e7199ae388105300e1a524547b49d09b9eeb2bec6fce242b71224d24fc8175fe483abab94fa555d45cee1a4df9

data/README.md

@@ -12,6 +12,7 @@ How to use my plugin.
 gem 'tramway-event'
 gem 'carrierwave'
 gem 'more_html_tags'
+gem 'configus'
 ```
 
 #### 2. And then execute:
@@ -48,6 +49,21 @@ Tramway::Admin.set_available_models ::Tramway::Event::Event, ::Tramway::Event::P
 mount Tramway::Event::Engine, at: '/'
 ```
 
+#### 7. Add hosts in your environments via gem `configus`. [What is configus?](https://github.com/kaize/configus)
+
+*config/configus.rb*
+```ruby
+Configus.build Rails.env do
+  env :production do
+    host 'https://your-site-domain.com'
+  end
+  env :development do
+    host 'http://localhost:3000'
+  end
+  env :test, parent: :development
+end
+```
+
 ## How-to
 
 ### Create event

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

@@ -75,7 +75,7 @@ class Tramway::Event::EventDecorator < ::Tramway::Core::ApplicationDecorator
 
   def events_link
     event_link = Tramway::Event::Engine.routes.url_helpers.event_path object
-    event_url = ['http://molodoy.online', event_link].join
+    event_url = [configus.host, event_link].join
     content_tag(:pre) do
       id = "event#{object.id}"
       concat link_to event_url, event_url, id: id

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

@@ -47,4 +47,11 @@ class Tramway::Event::Events::Show::EventDecorator < ::Tramway::Core::Applicatio
   end
 
   alias tagline duration
+
+  def responsible_person
+    {
+      phone: (object.creator.phone if object.creator&.phone&.present?),
+      email: (object.creator.email if object.creator&.email&.present?)
+    }
+  end
 end

data/app/decorators/tramway/event/{participant_xlsx_decorator.rb → participant_xls_decorator.rb}

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class Tramway::Event::ParticipantXlsxDecorator < Tramway::Export::Xlsx::ApplicationDecorator
+class Tramway::Event::ParticipantXlsDecorator < Tramway::Export::Xls::ApplicationDecorator
   class << self
     def columns
       %i[full_name email phone organization event].map do |attribute|
@@ -9,7 +9,7 @@ class Tramway::Event::ParticipantXlsxDecorator < Tramway::Export::Xlsx::Applicat
     end
 
     def filename
-      'participants.xlsx'
+      'participants.xls'
     end
   end
 

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class Admin::Tramway::Event::ParticipantFormFieldForm < ::Tramway::Core::ExtendedApplicationForm
-  properties :title, :description, :field_type, :options, :position, :list_field
+  properties :title, :description, :field_type, :options, :position, :list_field, :presence_field
   association :event
 
   def initialize(object)
@@ -12,6 +12,7 @@ class Admin::Tramway::Event::ParticipantFormFieldForm < ::Tramway::Core::Extende
                       field_type: :default,
                       options: :text,
                       list_field: :boolean,
+                      presence_field: :boolean,
                       position: :numeric
     end
   end
@@ -20,6 +21,7 @@ class Admin::Tramway::Event::ParticipantFormFieldForm < ::Tramway::Core::Extende
     super(params).tap do
       model.options = {} if model.options == ''
       model.options&.merge! list_field: (params[:list_field] == '1').to_s
+      model.options&.deep_merge! validations: { presence: (params[:presence_field] == '1').to_s }
       model.save
     end
   end
@@ -28,6 +30,10 @@ class Admin::Tramway::Event::ParticipantFormFieldForm < ::Tramway::Core::Extende
     model.options&.dig('list_field') == 'true'
   end
 
+  def presence_field
+    model.options&.dig('validations', 'presence') == 'true'
+  end
+
   def options
     model.options&.to_json
   end

data/app/views/tramway/event/events/_show_page.html.haml

@@ -7,9 +7,9 @@
     %hr/
     %p.mb-0
       По всем вопросам обращайтесь по телефону
-      = tel_tag @application.phone
+      = tel_tag @event.responsible_person[:phone] || @application.phone
       или пишите на email
-      = mail_to @application.email
+      = mail_to @event.responsible_person[:email] || @application.email
 - if params[:flash] == 'error'
   .alert.alert-danger{ role: "alert" }
     %button.close{"aria-label" => "Close", "data-dismiss" => "alert", type: "button"}
@@ -19,9 +19,9 @@
     %hr/
     %p.mb-0
       Если ошибка повторяется или не отображается, обращайтесь по телефону
-      = tel_tag @application.phone
+      = tel_tag @event.responsible_person[:phone] || @application.phone
       или пишите на email
-      = mail_to @application.email
+      = mail_to @event.responsible_person[:email] || @application.email
 - if request.path == ::Tramway::Event::Engine.routes.url_helpers.event_path(event.id)
   = render 'tramway/landing/blocks/templates/full_page', block: event, buttons: [OpenStruct.new(title: t('.registration'), anchor: '#registration')]
   - content_for :main_image do

data/config/locales/models.yml

@@ -69,10 +69,17 @@ ru:
         options: Параметры (не редактировать без надобности)
         title: Название (в Tramway название Поля анкеты - это ключ для выборки пользователей. Если вы измените ключ к выборке пользователей, то все пользователи, получившие данные по предыдущему ключу по этой выборке показываться не будут)
         list_field: Показывать это поле в общем списке участников?
+        presence_field: Обязательное поле
       tramway/event/partaking:
         part_name: Мероприятие
         event_duration: Дата мероприятия
         part_description: Описание
+    errors:
+      models:
+        tramway/event/participant:
+          attributes:
+            default:
+              presence: не может быть пустым
   cases:
     tramway/event/event:
       plural: мероприятия

data/lib/tramway/event/version.rb

@@ -2,6 +2,6 @@
 
 module Tramway
   module Event
-    VERSION = '1.9.28.2'
+    VERSION = '1.9.31'
   end
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: tramway-event
 version: !ruby/object:Gem::Version
-  version: 1.9.28.2
+  version: 1.9.31
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-11 00:00:00.000000000 Z
-dependencies: []
+date: 2020-02-24 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: configus
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Rails engine for events
 email:
 - kalashnikovisme@gmail.com
@@ -35,7 +49,7 @@ files:
 - app/decorators/tramway/event/partaking_feature_decorator.rb
 - app/decorators/tramway/event/participant_decorator.rb
 - app/decorators/tramway/event/participant_form_field_decorator.rb
-- app/decorators/tramway/event/participant_xlsx_decorator.rb
+- app/decorators/tramway/event/participant_xls_decorator.rb
 - app/decorators/tramway/event/person_decorator.rb
 - app/decorators/tramway/event/place_decorator.rb
 - app/decorators/tramway/event/section_decorator.rb