Fix migrations, locales, view and exclude calendar timetable in concern Refs #5301

2 files changed, 11 insertions, 7 deletions

diff --git a/db/migrate/20171214131755_create_business_calendars.rb b/db/migrate/20171214131755_create_business_calendars.rb
index 5bb3db9d3..aa7c1ab12 100644
--- a/db/migrate/20171214131755_create_business_calendars.rb
+++ b/db/migrate/20171214131755_create_business_calendars.rb
@@ -4,8 +4,9 @@ class CreateBusinessCalendars < ActiveRecord::Migration
       t.string :name
       t.string :short_name
       t.string :color
-      t.date :dates
-      t.daterange :date_ranges
+      t.daterange :date_ranges, array: true
+      t.date :dates, array: true
+      t.belongs_to :organisation, index: true
 
       t.timestamps null: false
     end
diff --git a/db/schema.rb b/db/schema.rb
index a51a3bb42..36128807a 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -85,12 +85,15 @@ ActiveRecord::Schema.define(version: 20171214130636) do
     t.string    "name"
     t.string    "short_name"
     t.string    "color"
-    t.date      "dates"
-    t.daterange "date_ranges"
-    t.datetime  "created_at",  null: false
-    t.datetime  "updated_at",  null: false
+    t.daterange "date_ranges",                  array: true
+    t.date      "dates",                        array: true
+    t.integer   "organisation_id"
+    t.datetime  "created_at",      null: false
+    t.datetime  "updated_at",      null: false
   end
 
+  add_index "business_calendars", ["organisation_id"], name: "index_business_calendars_on_organisation_id", using: :btree
+
   create_table "calendars", id: :bigserial, force: :cascade do |t|
     t.string    "name"
     t.string    "short_name"
@@ -413,9 +416,9 @@ ActiveRecord::Schema.define(version: 20171214130636) 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