tramway-event 1.9.16 → 1.9.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5dab6c3db302b134d3dc26dd749b480ab37f88ecd6800bff5bc9aa60ad87875a
-  data.tar.gz: d7a6f58603817dd856cb8d484bc14df7b1b6481e656229cc12058281403a80bf
+  metadata.gz: 04612e4d92c227210e6f6ef30048df7ab0589c44acec5b622a4fd2443e3781d2
+  data.tar.gz: c8c976aa58509702a2c1981362043783b20d6601388d5bd959eb852cb20cc679
 SHA512:
-  metadata.gz: b843434871db0cac8924ef7e5bf116843f91b7338a848bfda6e0c211f343466b45b37d972b5476cebf103bcfd2b71fab9f0ff6d0b18893fbbe49c480ee388d0f
-  data.tar.gz: 1d8e920a9c5a43181e06d138c4790d8562b4385c0c138c007d87175a12797f83de2c2ef8280cc0161736f39286f8de7f90a47bb6a5b433b631257fc096592983
+  metadata.gz: 8ff4bb5e94787ecc29145c5b52c91607092d0f1b5e8d695685fcbea4f4d78a6a06bd854ffc92be29ee4c242973f87a01ed209aff0b05a2651396cdd28bc77fb1
+  data.tar.gz: 95abf3e86d185b6a0a53c641ed8ac56082f94e234b9e815764dd351f27e28feb55faff67618510882ddcec4d5ae7871bcc69b316fe1d36788330505cc8c56fae

data/app/controllers/tramway/event/participants_controller.rb

@@ -5,7 +5,7 @@ class Tramway::Event::ParticipantsController < Tramway::Event::ApplicationContro
     if @participant_form.submit params[:tramway_event_participant].except :event_id
       redirect_to event_path event, flash: :success
     else
-      redirect_to event_path event, flash: :error
+      redirect_to event_path event, flash: :error, errors: @participant_form.errors.messages
     end
   end
 end

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

@@ -0,0 +1,33 @@
+class Tramway::Event::ParticipantXlsxDecorator < Tramway::Export::Xlsx::ApplicationDecorator
+  class << self
+    def columns
+      [ :full_name, :email, :phone, :organization, :event ].map do |attribute|
+        { Tramway::Event::Participant.human_attribute_name(attribute).to_sym => attribute }
+      end
+    end
+
+    def filename
+      'participants.xlsx'
+    end
+  end
+
+  def full_name
+    "#{object.values['Фамилия'] || object.values['Фамилия ']} #{object.values['Имя'] || object.values['Имя ']}"
+  end
+
+  def email
+    object.values['Email']
+  end
+
+  def phone
+    object.values['Телефон']
+  end
+
+  def organization
+    object.values['Место работы/ Учебное заведение']
+  end
+
+  def event
+    object.event.title
+  end
+end

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

@@ -0,0 +1,3 @@
+class Tramway::Event::PlaceDecorator < Tramway::Core::ApplicationDecorator
+  delegate :title, to: :object
+end

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

@@ -2,7 +2,7 @@ class Tramway::Event::ParticipantExtendedFormCreator < Tramway::Core::FormCreato
   def self.create_form_class(uuid, event, **simple_properties)
     class_name = "ParticipantExtendedForm#{uuid.gsub('-', '')}"
     properties = event.participant_form_fields.inputs_list.reduce({}) do |hash, field|
-      hash.merge! field.title.to_sym => field
+      hash.merge! field.title.to_sym => { object: field, validates: field.options['validations'] }
     end
     if simple_properties.keys.any?
       ::Tramway::Core::ExtendableForm.new(class_name, simple_properties: simple_properties, **properties)

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

@@ -0,0 +1,13 @@
+class Tramway::Event::PlaceForm < Tramway::Core::ApplicationForm
+  properties :title, :description, :coordinates, :photo, :city
+
+  def initialize(object)
+    super(object).tap do
+      form_properties title: :string,
+        description: :ckeditor,
+        coordinates: :string,
+        photo: :file,
+        city: :string
+    end
+  end
+end

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

@@ -7,6 +7,7 @@ class Tramway::Event::Event < ::Tramway::Event::ApplicationRecord
   has_many :partakings, as: :part, class_name: 'Tramway::Event::Partaking'
   has_many :partnerships, class_name: 'Tramway::Partner::Partnership', as: :partner
   has_many :organizations, as: :partners, through: :partnerships, class_name: 'Tramway::Partner::Organization'
+  has_and_belongs_to_many :places
 
   enumerize :status, default: :common, in: [ :common, :main ]
 

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

@@ -35,7 +35,7 @@ class Tramway::Event::Participant < ::Tramway::Event::ApplicationRecord
     end
 
     event :return_to_requested do
-      transition rejected: :requested
+      transition [ :prev_approved, :rejected ] => :requested
     end
   end
 

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

@@ -0,0 +1,3 @@
+class Tramway::Event::Place < Tramway::Core::ApplicationRecord
+  has_and_belongs_to_many :events
+end

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

@@ -4,7 +4,6 @@
     %button.close{"aria-label" => "Close", "data-dismiss" => "alert", type: "button"}
       %span{"aria-hidden" => "true"} ×
     %h4.alert-heading Заявка успешно отправлена!
-    %p Ваша заявка на мероприятие подтверждена!
     %hr/
     %p.mb-0
       По всем вопросам обращайтесь по телефону

data/config/initializers/tramway.rb

@@ -4,4 +4,5 @@
                                       ::Tramway::Event::Section,
                                       ::Tramway::Event::Person,
                                       ::Tramway::Event::Partaking,
+                                      ::Tramway::Event::Place,
                                       project: :event)

data/config/locales/models.yml

@@ -7,6 +7,7 @@ ru:
       tramway/event/section: Секция
       tramway/event/person: Член команды
       tramway/event/partaking: Должность
+      tramway/event/place: Место
     attributes:
       tramway/event/event:
         title: Название
@@ -27,6 +28,10 @@ ru:
       tramway/event/participant:
         comment: Примечание
         event: Мероприятие
+        full_name: Полное имя
+        email: Email
+        phone: Телефон
+        organization: Организация
       tramway/event/section:
         title: Название
         description: Описание
@@ -59,13 +64,16 @@ ru:
     tramway/event/partaking:
       genitive: должность
       plural: должности
+    tramway/event/place:
+      genitive: место
+      plural: места
   collections:
     tramway/event/participant:
       requested: Необработанные
       prev_approved: Предварительно подтверждены
       waiting: Ожидаем ответа
       rejected: Отклонены
-      approved: Окончательно подтверждены
+      approved: Пришли
       without_answer: Не ответили
       reserved: В резерве
   enumerize:

data/config/locales/state_machines.yml

@@ -12,14 +12,14 @@ ru:
             prev_approved: Получено предварительное подтверждение
             waiting: Ожидание решения
             rejected: Заявка отклонена
-            approved: Окончательное подтверждение
+            approved: Прибывшие
             without_answer: Без ответа
             reserved: В резерве
           events:
             previous_approve: Предварительно подтвердить
             wait_for_decision: Ожидать ответа
             reject: Отклонить
-            approve: Окончательно подтвердить
+            approve: Прибыл(а)
             not_got_answer: Связаться не удалось
             reserve: Отправить в резерв
             return_to_requested: Вернуть в необработанные

data/lib/tramway/event/generators/install_generator.rb

@@ -41,7 +41,10 @@ module Tramway::Event::Generators
         :rebuild_association_between_participant_and_partakings_to_polymorphic,
 
         :add_request_period_to_tramway_event_events,
-        :add_description_to_tramway_event_people
+        :add_description_to_tramway_event_people,
+
+        :create_tramway_event_places,
+        :create_tramway_event_events_places
       ]
       migrations.each do |migration|
         migration_template "#{migration}.rb", "db/migrate/#{migration}.rb"

data/lib/tramway/event/generators/templates/create_tramway_event_events_places.rb

@@ -0,0 +1,10 @@
+class CreateTramwayEventEventsPlaces < ActiveRecord::Migration[5.1]
+  def change
+    create_table :tramway_event_events_places do |t|
+      t.integer :event_id
+      t.integer :place_id
+
+      t.timestamps
+    end
+  end
+end

data/lib/tramway/event/generators/templates/create_tramway_event_places.rb

@@ -0,0 +1,14 @@
+class CreateTramwayEventPlaces < ActiveRecord::Migration[5.1]
+  def change
+    create_table :tramway_event_places do |t|
+      t.text :title
+      t.text :description
+      t.point :coordinates
+      t.text :photo
+      t.text :city
+      t.text :state, default: :active
+
+      t.timestamps
+    end
+  end
+end

data/lib/tramway/event/version.rb

@@ -1,5 +1,5 @@
 module Tramway
   module Event
-    VERSION = '1.9.16'
+    VERSION = '1.9.19'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tramway-event
 version: !ruby/object:Gem::Version
-  version: 1.9.16
+  version: 1.9.19
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-19 00:00:00.000000000 Z
+date: 2019-10-06 00:00:00.000000000 Z
 dependencies: []
 description: Rails engine for events
 email:
@@ -34,7 +34,9 @@ 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/person_decorator.rb
+- app/decorators/tramway/event/place_decorator.rb
 - app/decorators/tramway/event/section_decorator.rb
 - app/decorators/tramway/event/section_feature_decorator.rb
 - app/forms/tramway/event/event_form.rb
@@ -43,6 +45,7 @@ files:
 - app/forms/tramway/event/participant_form.rb
 - app/forms/tramway/event/participant_form_field_form.rb
 - app/forms/tramway/event/person_form.rb
+- app/forms/tramway/event/place_form.rb
 - app/forms/tramway/event/section_form.rb
 - app/helpers/tramway/event/application_helper.rb
 - app/jobs/tramway/event/application_job.rb
@@ -53,6 +56,7 @@ files:
 - app/models/tramway/event/participant.rb
 - app/models/tramway/event/participant_form_field.rb
 - app/models/tramway/event/person.rb
+- app/models/tramway/event/place.rb
 - app/models/tramway/event/section.rb
 - app/views/tramway/event/events/_show_page.html.haml
 - app/views/tramway/event/events/show.html.haml
@@ -80,10 +84,12 @@ files:
 - lib/tramway/event/generators/templates/add_state_to_tramway_event_partakings.rb
 - lib/tramway/event/generators/templates/add_status_to_tramway_event_events.rb
 - lib/tramway/event/generators/templates/create_tramway_event_events.rb
+- lib/tramway/event/generators/templates/create_tramway_event_events_places.rb
 - lib/tramway/event/generators/templates/create_tramway_event_participant_form_fields.rb
 - lib/tramway/event/generators/templates/create_tramway_event_participants.rb
 - lib/tramway/event/generators/templates/create_tramway_event_people.rb
 - lib/tramway/event/generators/templates/create_tramway_event_people_sections.rb
+- lib/tramway/event/generators/templates/create_tramway_event_places.rb
 - lib/tramway/event/generators/templates/create_tramway_event_sections.rb
 - lib/tramway/event/generators/templates/rebuild_association_between_participant_and_partakings_to_polymorphic.rb
 - lib/tramway/event/generators/templates/rename_tramway_event_people_sections_to_tramway_event_partakings.rb
@@ -107,8 +113,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Rails engine for events