From bf4758a54a4bc2408f83294bfcf5d0c8fc758bc7 Mon Sep 17 00:00:00 2001
From: Chrisbr <cbruckmayer@gmx.net>
Date: Thu, 12 Jun 2014 16:24:24 +0200
Subject: [PATCH] Adds color to event types

---
 app/assets/javascripts/osem.js                         | 7 +++++++
 app/models/event_type.rb                               | 2 +-
 app/views/admin/eventtypes/_event_type_fields.html.erb | 1 +
 db/migrate/20140612141123_add_color_to_event_type.rb   | 5 +++++
 db/schema.rb                                           | 1 +
 5 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 db/migrate/20140612141123_add_color_to_event_type.rb

diff --git a/app/assets/javascripts/osem.js b/app/assets/javascripts/osem.js
index c543d914..3cbb66e5 100644
--- a/app/assets/javascripts/osem.js
+++ b/app/assets/javascripts/osem.js
@@ -109,6 +109,13 @@ $(function() {
             },
             5)
     });
+
+    $('a:contains("Add event_type")').click(function () {
+        setTimeout(function () {
+                $("div.nested-fields:last div:nth-of-type(5) input").val(get_color());
+            },
+            5)
+    });
 });
 
 function get_color() {
diff --git a/app/models/event_type.rb b/app/models/event_type.rb
index 5d375084..26236b11 100644
--- a/app/models/event_type.rb
+++ b/app/models/event_type.rb
@@ -1,5 +1,5 @@
 class EventType < ActiveRecord::Base
-  attr_accessible :title, :length, :minimum_abstract_length, :maximum_abstract_length
+  attr_accessible :title, :length, :minimum_abstract_length, :maximum_abstract_length, :color
 
   belongs_to :conference
 
diff --git a/app/views/admin/eventtypes/_event_type_fields.html.erb b/app/views/admin/eventtypes/_event_type_fields.html.erb
index 5aa96f82..d4a0c546 100644
--- a/app/views/admin/eventtypes/_event_type_fields.html.erb
+++ b/app/views/admin/eventtypes/_event_type_fields.html.erb
@@ -4,6 +4,7 @@
         <%= f.input :length, :input_html => {:size => 3} %>
         <%= f.input :minimum_abstract_length, :input_html => {:size => 3} %>
         <%= f.input :maximum_abstract_length, :input_html => {:size => 3} %>
+        <%= f.input :color, :input_html => { :size => 6, :type => 'color' } %>
         <%= remove_association_link :event_type, f %>
     <% end %>
 </div>
diff --git a/db/migrate/20140612141123_add_color_to_event_type.rb b/db/migrate/20140612141123_add_color_to_event_type.rb
new file mode 100644
index 00000000..210256ea
--- /dev/null
+++ b/db/migrate/20140612141123_add_color_to_event_type.rb
@@ -0,0 +1,5 @@
+class AddColorToEventType < ActiveRecord::Migration
+  def change
+    add_column :event_types, :color, :string
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index fd64f124..2d6eeb12 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -155,6 +155,7 @@ ActiveRecord::Schema.define(version: 20140612181230) do
     t.integer "length",                  default: 30
     t.integer "minimum_abstract_length", default: 0
     t.integer "maximum_abstract_length", default: 500
+    t.string  "color"
   end
 
   create_table "events", force: true do |t|