+ <% dept_id = current_user.department.nil? ? -1 : current_user.department.id %>
+ <%= f.label(:department_id, _('Department or school'), class: 'control-label') %>
+ <%= select_tag("user[department_id]",
+ options_from_collection_for_select(departments, "id", "name", dept_id),
+ include_blank: true,
+ disabled: departments.count === 0,
+ class: "form-control") %>
+
<% if Language.many? %>
| <%= _('Name') %> <%= paginable_sort_link('users.firstname') %> |
<%= _('Email') %> <%= paginable_sort_link('users.email') %> |
+ <%= _('School or Department') %> <%= paginable_sort_link('departments.name') %> |
<%= _('Organisation') %> <%= paginable_sort_link('orgs.name') %> |
<%= _('Created date') %> <%= paginable_sort_link('users.created_at') %> |
<%= _('Last activity') %> <%= paginable_sort_link('users.last_sign_in_at') %> |
@@ -28,6 +29,8 @@
<% end %>
<%= user.email %> |
+ <%= user.department.nil? ? '' : user.department.name %> |
+
<%= user.org.name if user.org.present? %> |
<% if !user.created_at.nil? %>
diff --git a/config/routes.rb b/config/routes.rb
index a178546..51211d1 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -196,6 +196,10 @@
resources :guidance_groups, only: [] do
get 'index/:page', action: :index, on: :collection, as: :index
end
+ # Paginable actions for departments
+ resources :departments, only: [] do
+ get 'index/:page', action: :index, on: :collection, as: :index
+ end
end
resources :template_options, only: [:index], constraints: { format: /json/ }
@@ -247,6 +251,8 @@
end
end
+ resources :departments
+
get 'download_plans' => 'plans#download_plans'
end
diff --git a/db/migrate/20190507091025_create_departments.rb b/db/migrate/20190507091025_create_departments.rb
new file mode 100644
index 0000000..103d53f
--- /dev/null
+++ b/db/migrate/20190507091025_create_departments.rb
@@ -0,0 +1,15 @@
+class CreateDepartments < ActiveRecord::Migration
+ def change
+ create_table :departments do |t|
+ t.string :name
+ t.string :code
+ t.belongs_to :org, index: true
+
+ t.timestamps null: false
+ end
+
+ add_column :users, :department_id, :integer, index: true
+ add_foreign_key :users, :departments
+
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 0b0529e..54e92bc 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
#
# It's strongly recommended that you check this file into your version control system.
-ActiveRecord::Schema.define(version: 20181025220743) do
+ActiveRecord::Schema.define(version: 20190507091025) do
# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"
@@ -49,6 +49,16 @@
add_index "answers_question_options", ["answer_id"], name: "index_answers_question_options_on_answer_id", using: :btree
+ create_table "departments", force: :cascade do |t|
+ t.string "name"
+ t.string "code"
+ t.integer "org_id"
+ t.datetime "created_at", null: false
+ t.datetime "updated_at", null: false
+ end
+
+ add_index "departments", ["org_id"], name: "index_departments_on_org_id", using: :btree
+
create_table "exported_plans", force: :cascade do |t|
t.integer "plan_id"
t.integer "user_id"
@@ -415,6 +425,7 @@
t.integer "language_id"
t.string "recovery_email"
t.boolean "active", default: true
+ t.integer "department_id"
end
add_index "users", ["email"], name: "index_users_on_email", unique: true, using: :btree
@@ -463,6 +474,7 @@
add_foreign_key "themes_in_guidance", "themes"
add_foreign_key "user_identifiers", "identifier_schemes"
add_foreign_key "user_identifiers", "users"
+ add_foreign_key "users", "departments"
add_foreign_key "users", "languages"
add_foreign_key "users", "orgs"
add_foreign_key "users_perms", "perms"
diff --git a/spec/factories/departments.rb b/spec/factories/departments.rb
new file mode 100644
index 0000000..b480804
--- /dev/null
+++ b/spec/factories/departments.rb
@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+# == Schema Information
+#
+# Table name: departments
+#
+# id :integer not null, primary key
+# code :string
+# name :string
+# created_at :datetime not null
+# updated_at :datetime not null
+# org_id :integer
+#
+# Indexes
+#
+# index_departments_on_org_id (org_id)
+#
+
+FactoryBot.define do
+ factory :department do
+ name { Faker::Commerce.department }
+ code { SecureRandom.hex(5) }
+ org_id { Faker::Number.number(5) }
+ end
+end
diff --git a/spec/factories/users.rb b/spec/factories/users.rb
index e139eb4..9233293 100644
--- a/spec/factories/users.rb
+++ b/spec/factories/users.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
# == Schema Information
#
# Table name: users
@@ -30,6 +32,7 @@
# surname :string
# created_at :datetime not null
# updated_at :datetime not null
+# department_id :integer
# invited_by_id :integer
# language_id :integer
# org_id :integer
@@ -41,6 +44,7 @@
#
# Foreign Keys
#
+# fk_rails_... (department_id => departments.id)
# fk_rails_... (language_id => languages.id)
# fk_rails_... (org_id => orgs.id)
#
@@ -56,7 +60,9 @@
trait :org_admin do
after(:create) do |user, evaluator|
- %w[modify_templates modify_guidance change_org_details grant_permissions].each do |perm_name|
+ %w[modify_templates modify_guidance
+ change_org_details
+ grant_permissions].each do |perm_name|
user.perms << Perm.find_or_create_by(name: perm_name)
end
end
diff --git a/spec/models/department_spec.rb b/spec/models/department_spec.rb
new file mode 100644
index 0000000..014859d
--- /dev/null
+++ b/spec/models/department_spec.rb
@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+require "rails_helper"
+
+RSpec.describe Department, type: :model do
+
+ context "validations" do
+
+ it { is_expected.to validate_presence_of(:org) }
+
+ it { is_expected.to validate_presence_of(:name) }
+
+ it { is_expected.to allow_value(nil).for(:code) }
+
+ it "validates uniqueness of name" do
+ org = create(:org)
+ subject = create(:department, org_id: org.id)
+ expect(subject).to validate_uniqueness_of(:name)
+ .scoped_to(:org_id)
+ .with_message("must be unique")
+ end
+
+ end
+
+ context "associations" do
+
+ it { is_expected.to belong_to :org }
+
+ it { is_expected.to have_many :users }
+
+ end
+end
|