feat(schedule): add category field to schedule (#546)

* feat(schedule): add category field to schedule

* moved event catorgory addition to a seprate migration

* add category and location label for schedule display

* made label more semantically nice

* more code cleanup for events

* Update app/assets/javascripts/events.js

Co-authored-by: Peter Kos <[email protected]>

Co-authored-by: Chris Baudouin, Jr <[email protected]>
Co-authored-by: Peter Kos <[email protected]>

Author: 3 people

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('<div></div><span style="font-size: 12px">' + description + '</span>');
-      element.find('.fc-list-item-title').append('<div></div><span style="font-size: 12px">' + location + '</span>');
+      element.find('.fc-event-dot').css('display', 'none');
+      if(event.description) {
+        element.find('.fc-list-item-title').append('<div></div><span style="font-size: 12px">' + event.description + '</span>');
+      }
+      if (event.location) {
+        element.find('.fc-list-item-title').append('<div></div><span style="font-size: 12px"><b>Location: </b>' + event.location + '</span>');
+      }
+      if (event.category) {
+        element.find('.fc-list-item-title').append('<div></div><span style="font-size: 12px"><b>Category: </b>' + event.category + '</span>');
+      }
     },
     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":'));

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

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

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

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|