tramway-event 1.9.31.2 → 1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 389fa955d28b590eee11a279a178a13666b3a86d76f5eb21359901666e524f59
-  data.tar.gz: ac723fb0e351f2888753963b76febe034745128fa3bad07c1fa1af4035372f43
+  metadata.gz: ee8a6cc38a6f646e4149e9eaceb77b7f4f62021267c6d5d3299a7d116645bd7b
+  data.tar.gz: 3789f8bf034c384c6afde58e97b3594433c583e1bf1d740367473f7e33d2fd9b
 SHA512:
-  metadata.gz: 8163d819f33edeff900a9eeba0ea89dc5f18ce9256124f0b6e42fadf169eff2417ccefeae6cd8ddb770a28321aa7bcb8cd0e9e324b8cca6afc5c6bb6f6829ef6
-  data.tar.gz: 033466f38c2f791c3480f45233e187d39ccc2db6b030466adfb8b882b5cba0e8d72d74f089dde6215a1430d2058df2917900f6ba154eeb3e0ab958af6f91c11a
+  metadata.gz: 74b444d6e9a2990c37369bd3a1d69f0d578f5353a99de63bea017aa750c187bb084638d7c5dba22e87bc9777dffdcc9180e849fcb02a82a114b93c44edf0e79d
+  data.tar.gz: a37a05dddae8a310b1e8c722e68f4eab54ba4b14b5471c4764066ce6fdc7ddc489871d07c7d22c2c32ea57b2b831da93b5376731095855c354849dd0b541b4f8

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

@@ -7,7 +7,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, errors: @participant_form.errors.messages
+      redirect_to event_path event, flash: :error, errors: @participant_form.errors.messages # , participant: @participant_form.attributes
     end
   end
 end

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

@@ -0,0 +1,21 @@
+class Tramway::Event::ActionDecorator < Tramway::Core::ApplicationDecorator
+  class << self
+    delegate :human_action_state_event_name, to: :model_class
+    delegate :human_attribute_name, to: :model_class
+  end
+
+  def name
+    "#{object.title} - #{date_view(object.deadline)} - #{state_machine_view(object, :action_state)}"
+  end
+  
+  def action_state_button_color(event)
+    case event
+    when :do
+      :success
+    when :decline
+      :danger
+    when :return
+      :warning
+    end
+  end
+end

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

@@ -22,7 +22,7 @@ class Tramway::Event::EventDecorator < ::Tramway::Core::ApplicationDecorator
     end
 
     def show_associations
-      %i[participant_form_fields]
+      %i[participant_form_fields actions]
     end
 
     def list_attributes
@@ -38,6 +38,7 @@ class Tramway::Event::EventDecorator < ::Tramway::Core::ApplicationDecorator
   decorate_association :partakings
   decorate_association :partnerships
   decorate_association :organizations
+  decorate_association :actions, as: :event, state_machines: [ :action_state ]
 
   def background
     object.photo

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

@@ -0,0 +1,13 @@
+class Admin::Tramway::Event::ActionForm < Tramway::Core::ApplicationForm
+  properties :title, :action_state_event, :deadline
+
+  association :event
+
+  def initialize(object)
+    super(object).tap do
+      form_properties event: :association,
+        title: :string,
+        deadline: :date_picker
+    end
+  end
+end

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

@@ -0,0 +1,21 @@
+class Tramway::Event::Action < Tramway::Core::ApplicationRecord
+  belongs_to :event, class_name: 'Tramway::Event::Event'
+
+  state_machine :action_state, initial: :must_be_done do
+    state :must_be_done
+    state :done
+    state :declined
+
+    event :do do
+      transition must_be_done: :done
+    end
+
+    event :decline do
+      transition must_be_done: :declined
+    end
+
+    event :return do
+      transition [ :declined, :done ] => :must_be_done
+    end
+  end
+end

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

@@ -9,6 +9,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_many :actions, class_name: 'Tramway::Event::Action'
   has_and_belongs_to_many :places
 
   enumerize :status, default: :common, in: %i[common main]

data/config/initializers/tramway.rb

@@ -7,6 +7,7 @@
   ::Tramway::Event::Person,
   ::Tramway::Event::Partaking,
   ::Tramway::Event::Place,
+  ::Tramway::Event::Action,
   project: :event)
 ::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

data/config/locales/models.yml

@@ -39,6 +39,7 @@ ru:
         does_not_have_end_date: мероприятие не имеет даты окончания
         participant_form_fields: Поле анкеты
         short_description: Краткое описание
+        actions: Действие
       tramway/event/participant:
         name: Имя
         list_fields: Данные
@@ -74,6 +75,10 @@ ru:
         part_name: Мероприятие
         event_duration: Дата мероприятия
         part_description: Описание
+      tramway/event/action:
+        event: Мероприятие
+        title: Название
+        deadline: Дедлайн
     errors:
       models:
         tramway/event/participant:
@@ -102,6 +107,9 @@ ru:
     tramway/event/place:
       genitive: место
       plural: места
+    tramway/event/action:
+      genitive: действие
+      plural: действия
   collections:
     tramway/event/participant:
       requested: Необработанные

data/config/locales/state_machines.yml

@@ -23,3 +23,13 @@ ru:
             not_got_answer: Связаться не удалось
             reserve: Отправить в резерв
             return_to_requested: Вернуть в необработанные
+      tramway/event/action:
+        action_state:
+          states:
+            done: Сделано
+            must_be_done: Запланировано
+            declined: Отклонено
+          events:
+            do: Выполнено
+            decline: Отклонить
+            return: Вернуть статус

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

@@ -47,7 +47,8 @@ module Tramway::Event::Generators
 
         :create_tramway_event_places,
         :create_tramway_event_events_places,
-        :add_short_description_to_tramway_event_events
+        :add_short_description_to_tramway_event_events,
+        :create_tramway_event_actions
       ]
       migrations.each do |migration|
         migration_template "#{migration}.rb", "db/migrate/#{migration}.rb"

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

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+class CreateTramwayEventActions < ActiveRecord::Migration[5.1]
+  def change
+    create_table :tramway_event_actions do |t|
+      t.integer :event_id
+      t.text :title
+      t.datetime :deadline
+      t.text :action_state, default: :must_be_done
+      t.text :state, default: :active
+
+      t.timestamps
+    end
+  end
+end

data/lib/tramway/event/version.rb

@@ -2,6 +2,6 @@
 
 module Tramway
   module Event
-    VERSION = '1.9.31.2'
+    VERSION = '1.10'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tramway-event
 version: !ruby/object:Gem::Version
-  version: 1.9.31.2
+  version: '1.10'
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-25 00:00:00.000000000 Z
+date: 2020-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: configus
@@ -42,6 +42,7 @@ files:
 - app/controllers/tramway/event/application_controller.rb
 - app/controllers/tramway/event/events_controller.rb
 - app/controllers/tramway/event/participants_controller.rb
+- app/decorators/tramway/event/action_decorator.rb
 - app/decorators/tramway/event/event_decorator.rb
 - app/decorators/tramway/event/event_link_decorator.rb
 - app/decorators/tramway/event/events/show/event_decorator.rb
@@ -54,6 +55,7 @@ files:
 - app/decorators/tramway/event/place_decorator.rb
 - app/decorators/tramway/event/section_decorator.rb
 - app/decorators/tramway/event/section_feature_decorator.rb
+- app/forms/admin/tramway/event/action_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
@@ -65,6 +67,7 @@ files:
 - app/helpers/tramway/event/application_helper.rb
 - app/jobs/tramway/event/application_job.rb
 - app/mailers/tramway/event/application_mailer.rb
+- app/models/tramway/event/action.rb
 - app/models/tramway/event/application_record.rb
 - app/models/tramway/event/event.rb
 - app/models/tramway/event/partaking.rb
@@ -99,6 +102,7 @@ files:
 - lib/tramway/event/generators/templates/add_short_description_to_tramway_event_events.rb
 - 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_actions.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