From 3d99661d027c4445e8df4f66429e408618a8337d Mon Sep 17 00:00:00 2001 From: Michael Ball Date: Sat, 6 Mar 2021 11:30:57 -0800 Subject: [PATCH] Add a submission instructions columns --- app/models/cfp.rb | 1 - app/models/event.rb | 1 + app/models/event_type.rb | 1 + app/models/program.rb | 1 - app/serializers/event_serializer.rb | 1 + ...0306185903_add_submission_instructions_to_event_types.rb | 5 +++++ db/schema.rb | 6 +++++- spec/factories/event_types.rb | 1 + spec/factories/events.rb | 1 + spec/features/event_types_spec.rb | 1 + spec/models/event_spec.rb | 1 + spec/models/event_type_spec.rb | 1 + spec/serializers/event_serializer_spec.rb | 1 + 13 files changed, 19 insertions(+), 3 deletions(-) create mode 100644 db/migrate/20210306185903_add_submission_instructions_to_event_types.rb diff --git a/app/models/cfp.rb b/app/models/cfp.rb index 55e542f7..f5161aac 100644 --- a/app/models/cfp.rb +++ b/app/models/cfp.rb @@ -14,7 +14,6 @@ # updated_at :datetime # program_id :integer # -# cannot delete program if there are events submitted class Cfp < ApplicationRecord TYPES = %w(events booths tracks).freeze diff --git a/app/models/event.rb b/app/models/event.rb index ba04ba20..d10ae1a1 100644 --- a/app/models/event.rb +++ b/app/models/event.rb @@ -7,6 +7,7 @@ # id :bigint not null, primary key # abstract :text # comments_count :integer default(0), not null +# committee_review :text # description :text # guid :string not null # is_highlight :boolean default(FALSE) diff --git a/app/models/event_type.rb b/app/models/event_type.rb index 67d7fb20..2ef440bc 100644 --- a/app/models/event_type.rb +++ b/app/models/event_type.rb @@ -10,6 +10,7 @@ # length :integer default(30) # maximum_abstract_length :integer default(500) # minimum_abstract_length :integer default(0) +# submission_instructions :text # title :string not null # created_at :datetime # updated_at :datetime diff --git a/app/models/program.rb b/app/models/program.rb index 45b8f65c..19000746 100644 --- a/app/models/program.rb +++ b/app/models/program.rb @@ -22,7 +22,6 @@ # # index_programs_on_selected_schedule_id (selected_schedule_id) # -# cannot delete program if there are events submitted class Program < ApplicationRecord has_paper_trail on: [:update], ignore: [:updated_at], meta: { conference_id: :conference_id } diff --git a/app/serializers/event_serializer.rb b/app/serializers/event_serializer.rb index 8c30b1a1..9bf196f2 100644 --- a/app/serializers/event_serializer.rb +++ b/app/serializers/event_serializer.rb @@ -7,6 +7,7 @@ # id :bigint not null, primary key # abstract :text # comments_count :integer default(0), not null +# committee_review :text # description :text # guid :string not null # is_highlight :boolean default(FALSE) diff --git a/db/migrate/20210306185903_add_submission_instructions_to_event_types.rb b/db/migrate/20210306185903_add_submission_instructions_to_event_types.rb new file mode 100644 index 00000000..f38243d1 --- /dev/null +++ b/db/migrate/20210306185903_add_submission_instructions_to_event_types.rb @@ -0,0 +1,5 @@ +class AddSubmissionInstructionsToEventTypes < ActiveRecord::Migration[5.2] + def change + add_column :event_types, :submission_instructions, :text + end +end diff --git a/db/schema.rb b/db/schema.rb index dee892f6..633160d4 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,10 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2021_02_15_213515) do +ActiveRecord::Schema.define(version: 2021_03_06_185903) do + + # These are extensions that must be enabled in order to support this database + enable_extension "plpgsql" create_table "answers", force: :cascade do |t| t.string "title" @@ -219,6 +222,7 @@ ActiveRecord::Schema.define(version: 2021_02_15_213515) do t.integer "program_id" t.datetime "created_at" t.datetime "updated_at" + t.text "submission_instructions" end create_table "event_users", force: :cascade do |t| diff --git a/spec/factories/event_types.rb b/spec/factories/event_types.rb index c68d3fae..2d56afed 100644 --- a/spec/factories/event_types.rb +++ b/spec/factories/event_types.rb @@ -10,6 +10,7 @@ # length :integer default(30) # maximum_abstract_length :integer default(500) # minimum_abstract_length :integer default(0) +# submission_instructions :text # title :string not null # created_at :datetime # updated_at :datetime diff --git a/spec/factories/events.rb b/spec/factories/events.rb index c8360449..2f68c311 100644 --- a/spec/factories/events.rb +++ b/spec/factories/events.rb @@ -7,6 +7,7 @@ # id :bigint not null, primary key # abstract :text # comments_count :integer default(0), not null +# committee_review :text # description :text # guid :string not null # is_highlight :boolean default(FALSE) diff --git a/spec/features/event_types_spec.rb b/spec/features/event_types_spec.rb index 8e05784a..b2dad18e 100644 --- a/spec/features/event_types_spec.rb +++ b/spec/features/event_types_spec.rb @@ -22,6 +22,7 @@ feature EventType do fill_in 'event_type_title', with: 'Party' fill_in 'event_type_length', with: '240' + fill_in 'event_type_description', with: '### This is a description' fill_in 'event_type_minimum_abstract_length', with: '0' fill_in 'event_type_maximum_abstract_length', with: '13042' page.find('#event_type_color').set('#e4e4e4') diff --git a/spec/models/event_spec.rb b/spec/models/event_spec.rb index 14e0b044..e2c6f584 100644 --- a/spec/models/event_spec.rb +++ b/spec/models/event_spec.rb @@ -7,6 +7,7 @@ # id :bigint not null, primary key # abstract :text # comments_count :integer default(0), not null +# committee_review :text # description :text # guid :string not null # is_highlight :boolean default(FALSE) diff --git a/spec/models/event_type_spec.rb b/spec/models/event_type_spec.rb index 2cfc57be..a9d064c8 100644 --- a/spec/models/event_type_spec.rb +++ b/spec/models/event_type_spec.rb @@ -10,6 +10,7 @@ # length :integer default(30) # maximum_abstract_length :integer default(500) # minimum_abstract_length :integer default(0) +# submission_instructions :text # title :string not null # created_at :datetime # updated_at :datetime diff --git a/spec/serializers/event_serializer_spec.rb b/spec/serializers/event_serializer_spec.rb index 506134cf..3ad68cad 100644 --- a/spec/serializers/event_serializer_spec.rb +++ b/spec/serializers/event_serializer_spec.rb @@ -7,6 +7,7 @@ # id :bigint not null, primary key # abstract :text # comments_count :integer default(0), not null +# committee_review :text # description :text # guid :string not null # is_highlight :boolean default(FALSE)