diff --git a/app/assets/javascripts/events.js b/app/assets/javascripts/events.js index b24d7946f..fbe50362b 100644 --- a/app/assets/javascripts/events.js +++ b/app/assets/javascripts/events.js @@ -5,15 +5,20 @@ function eventCalendar() { today: 'Today' }, eventRender: function (event, element, view) { - var description = event.description ? event.description : ''; - var location = event.location ? event.location : ''; - element.find('.fc-event-dot').css('display','none'); - element.find('.fc-list-item-title').append('
' + description + ''); - element.find('.fc-list-item-title').append('' + location + ''); + element.find('.fc-event-dot').css('display', 'none'); + if(event.description) { + element.find('.fc-list-item-title').append('' + event.description + ''); + } + if (event.location) { + element.find('.fc-list-item-title').append('Location: ' + event.location + ''); + } + if (event.category) { + element.find('.fc-list-item-title').append('Category: ' + event.category + ''); + } }, events: { url: '/manage/events.json', - success: function(response) { + success: function (response) { // due to "end" being a keyword in ruby and what fullcalender uses it is stored as finish and than it is // converted to "end" when sending it to fullcalendar response = JSON.parse(JSON.stringify(response).split('"finish":').join('"end":')); diff --git a/app/controllers/manage/events_controller.rb b/app/controllers/manage/events_controller.rb index 1fef9a636..cb89fc3e5 100644 --- a/app/controllers/manage/events_controller.rb +++ b/app/controllers/manage/events_controller.rb @@ -48,7 +48,7 @@ def destroy def event_params params.require(:event).permit( - :title, :description, :location, :public, :start, :finish, owner: [] + :title, :description, :location, :category, :start, :finish ) end end diff --git a/app/views/manage/events/_form.html.haml b/app/views/manage/events/_form.html.haml index a46cbe00c..10c8dd6bb 100644 --- a/app/views/manage/events/_form.html.haml +++ b/app/views/manage/events/_form.html.haml @@ -4,6 +4,7 @@ = f.input :title = f.input :description = f.input :location + = f.input :category = f.input :start = f.input :finish, include_blank: true .center diff --git a/db/migrate/20210128025749_add_category_to_events.rb b/db/migrate/20210128025749_add_category_to_events.rb new file mode 100644 index 000000000..46d18805b --- /dev/null +++ b/db/migrate/20210128025749_add_category_to_events.rb @@ -0,0 +1,5 @@ +class AddCategoryToEvents < ActiveRecord::Migration[5.2] + def change + add_column :events, :category, :string + end +end diff --git a/db/schema.rb b/db/schema.rb index a7eb1e2fb..7da91af73 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2020_12_18_010133) do +ActiveRecord::Schema.define(version: 2021_01_28_025749) do create_table "active_storage_attachments", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t| t.string "name", null: false @@ -148,6 +148,7 @@ t.datetime "finish" t.datetime "created_at", null: false t.datetime "updated_at", null: false + t.string "category" end create_table "fips", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|