tramway-event 1.9.28 → 1.9.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6722dde4b829b38429a1403e26b967326d932d3ae37a1f4c2e8858f6fe0784cc
-  data.tar.gz: 0e6c0d0cf2989d4ac14daa4c5236160f72af1d10de0f78048021a8f157ddc16d
+  metadata.gz: cf3d72e709059acfcae7a33f0f01f792f211d8a951b7a772c8df3b7c7190fc0c
+  data.tar.gz: b40bd14865ecbf88c689580ca69586a0e990f353198ab98066464c16f012d919
 SHA512:
-  metadata.gz: a4366960890115f07f118f7da6ea51ddc9bb4acb58c8ee5df5ded6f6d4e000437771d4a8d317a5b935a376ef1384734cbf370310ae73f1618a4045624f7fc79b
-  data.tar.gz: 8593dd349e943ccfd494e1195e8cf43391149cadaa71e11730b8b35bce56f7fa8df0d8973f597d68d5068b8d0fd12af11c827633ab4ceada98bd6fd108b280fe
+  metadata.gz: e7c806800292b230ed68e1381a3e60c5a2deadf0143d57c07a98bd7dcc926301ed52ed703ae54d8e29e541d089d6fc3cef19fc6e2f2b8ea6716eb5449df56b6a
+  data.tar.gz: 012bf2e429ac2a7b0637906c589b973e69aeb172fb191e91289cefc6f3fae63875f2fc6f64ad9a3e52d5ea6581c70e7fa944cc81bcbf7e54d3e97f9be7d6c434

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/{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,23 +9,31 @@ class Tramway::Event::ParticipantXlsxDecorator < Tramway::Export::Xlsx::Applicat
     end
 
     def filename
-      'participants.xlsx'
+      'participants.xls'
     end
   end
 
   def full_name
+    return unless object.values
+
     "#{object.values['Фамилия'] || object.values['Фамилия ']} #{object.values['Имя'] || object.values['Имя ']}"
   end
 
   def email
+    return unless object.values
+
     object.values['Email']
   end
 
   def phone
+    return unless object.values
+
     object.values['Телефон']
   end
 
   def organization
+    return unless object.values
+
     object.values['Место работы/ Учебное заведение']
   end
 

data/app/forms/{tramway → admin/tramway}/event/event_form.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class Tramway::Event::EventForm < ::Tramway::Core::ApplicationForm
+class Admin::Tramway::Event::EventForm < ::Tramway::Core::ApplicationForm
   properties :title, :description, :begin_date, :end_date, :photo, :status,
     :request_collecting_begin_date, :request_collecting_end_date, :short_description
 

data/app/forms/{tramway → admin/tramway}/event/partaking_form.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class Tramway::Event::PartakingForm < ::Tramway::Core::ApplicationForm
+class Admin::Tramway::Event::PartakingForm < ::Tramway::Core::ApplicationForm
   properties :part_id, :part_type, :person_id, :position
   associations :person, :part
 

data/app/forms/{tramway → admin/tramway}/event/participant_form.rb

@@ -2,7 +2,7 @@
 
 require 'securerandom'
 
-class Tramway::Event::ParticipantForm < ::Tramway::Core::ApplicationForm
+class Admin::Tramway::Event::ParticipantForm < ::Tramway::Core::ApplicationForm
   properties :participation_state_event, :comment
   association :event
 

data/app/forms/{tramway → admin/tramway}/event/participant_form_field_form.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class Tramway::Event::ParticipantFormFieldForm < ::Tramway::Core::ExtendedApplicationForm
+class Admin::Tramway::Event::ParticipantFormFieldForm < ::Tramway::Core::ExtendedApplicationForm
   properties :title, :description, :field_type, :options, :position, :list_field
   association :event
 

data/app/forms/{tramway → admin/tramway}/event/person_form.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class Tramway::Event::PersonForm < ::Tramway::Core::ApplicationForm
+class Admin::Tramway::Event::PersonForm < ::Tramway::Core::ApplicationForm
   properties :first_name, :last_name, :photo, :description
 
   def initialize(object)

data/app/forms/{tramway → admin/tramway}/event/place_form.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class Tramway::Event::PlaceForm < Tramway::Core::ApplicationForm
+class Admin::Tramway::Event::PlaceForm < Tramway::Core::ApplicationForm
   properties :title, :description, :coordinates, :photo, :city
 
   def initialize(object)

data/app/forms/{tramway → admin/tramway}/event/section_form.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class Tramway::Event::SectionForm < ::Tramway::Core::ApplicationForm
+class Admin::Tramway::Event::SectionForm < ::Tramway::Core::ApplicationForm
   properties :event, :title, :description, :photo, :icon, :position
   association :event
 

data/lib/tramway/event/version.rb

@@ -2,6 +2,6 @@
 
 module Tramway
   module Event
-    VERSION = '1.9.28'
+    VERSION = '1.9.29'
   end
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: tramway-event
 version: !ruby/object:Gem::Version
-  version: 1.9.28
+  version: 1.9.29
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-06 00:00:00.000000000 Z
-dependencies: []
+date: 2020-02-17 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,19 +49,19 @@ 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
 - app/decorators/tramway/event/section_feature_decorator.rb
-- app/forms/tramway/event/event_form.rb
-- app/forms/tramway/event/partaking_form.rb
+- app/forms/admin/tramway/event/event_form.rb
+- app/forms/admin/tramway/event/partaking_form.rb
+- app/forms/admin/tramway/event/participant_form.rb
+- app/forms/admin/tramway/event/participant_form_field_form.rb
+- app/forms/admin/tramway/event/person_form.rb
+- app/forms/admin/tramway/event/place_form.rb
+- app/forms/admin/tramway/event/section_form.rb
 - app/forms/tramway/event/participant_extended_form_creator.rb
-- 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
 - app/mailers/tramway/event/application_mailer.rb