Merge pull request #253 from af83/5683-add_workgroup_id_to_calendars

First draft for including calendars into workgroup

2 files changed, 9 insertions, 1 deletions

diff --git a/db/migrate/20180123174450_add_workgroup_id_to_calendars.rb b/db/migrate/20180123174450_add_workgroup_id_to_calendars.rb
new file mode 100644
index 000000000..64ad1a752
--- /dev/null
+++ b/db/migrate/20180123174450_add_workgroup_id_to_calendars.rb
@@ -0,0 +1,6 @@
+class AddWorkgroupIdToCalendars < ActiveRecord::Migration
+   def change
+    add_column :calendars, :workgroup_id, :integer, limit: 8
+    add_index :calendars, :workgroup_id
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index cd4d42005..596682ce8 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -90,12 +90,14 @@ ActiveRecord::Schema.define(version: 20180202170009) do
     t.integer   "organisation_id", limit: 8
     t.datetime  "created_at"
     t.datetime  "updated_at"
+    t.integer   "workgroup_id",    limit: 8
     t.integer   "int_day_types"
     t.date      "excluded_dates",                            array: true
   end
 
   add_index "calendars", ["organisation_id"], name: "index_calendars_on_organisation_id", using: :btree
   add_index "calendars", ["short_name"], name: "index_calendars_on_short_name", unique: true, using: :btree
+  add_index "calendars", ["workgroup_id"], name: "index_calendars_on_workgroup_id", using: :btree
 
   create_table "clean_up_results", id: :bigserial, force: :cascade do |t|
     t.string   "message_key"
@@ -418,9 +420,9 @@ ActiveRecord::Schema.define(version: 20180202170009) do
     t.string   "type"
     t.integer  "parent_id",             limit: 8
     t.string   "parent_type"
-    t.datetime "notified_parent_at"
     t.integer  "current_step",                    default: 0
     t.integer  "total_steps",                     default: 0
+    t.datetime "notified_parent_at"
     t.string   "creator"
   end