Allow assignment of study groups for internal users

This commit is contained in:
Sebastian Serth
2022-09-20 15:52:55 +02:00
committed by Sebastian Serth
parent 998a12e6bc
commit 4d2fe22daf
6 changed files with 79 additions and 2 deletions

View File

@ -6,6 +6,7 @@ class InternalUsersController < ApplicationController
before_action :require_activation_token, only: :activate before_action :require_activation_token, only: :activate
before_action :require_reset_password_token, only: :reset_password before_action :require_reset_password_token, only: :reset_password
before_action :set_user, only: MEMBER_ACTIONS before_action :set_user, only: MEMBER_ACTIONS
before_action :collect_set_and_unset_study_group_memberships, only: MEMBER_ACTIONS + %i[create]
after_action :verify_authorized, except: %i[activate forgot_password reset_password] after_action :verify_authorized, except: %i[activate forgot_password reset_password]
def activate def activate
@ -73,7 +74,19 @@ class InternalUsersController < ApplicationController
end end
def internal_user_params def internal_user_params
params.require(:internal_user).permit(:consumer_id, :email, :name) permitted_params = params.require(:internal_user).permit(:consumer_id, :email, :name, study_group_ids: []).presence || {}
checked_study_group_memberships = @study_group_memberships.select {|sgm| permitted_params[:study_group_ids]&.include? sgm.study_group.id.to_s }
removed_study_group_memberships = @study_group_memberships.reject {|sgm| permitted_params[:study_group_ids]&.include? sgm.study_group.id.to_s }
checked_study_group_memberships.each do |sgm|
sgm.role = params[:study_group_membership_roles][sgm.study_group.id.to_s][:role]
sgm.user = @user
end
permitted_params[:study_group_memberships] = checked_study_group_memberships
permitted_params.delete :study_group_ids
removed_study_group_memberships.map(&:destroy)
permitted_params
end end
private :internal_user_params private :internal_user_params
@ -85,6 +98,7 @@ class InternalUsersController < ApplicationController
def new def new
@user = InternalUser.new @user = InternalUser.new
authorize! authorize!
collect_set_and_unset_study_group_memberships
end end
def render_forgot_password_form def render_forgot_password_form
@ -132,6 +146,19 @@ class InternalUsersController < ApplicationController
end end
private :set_user private :set_user
def collect_set_and_unset_study_group_memberships
@study_groups = policy_scope(StudyGroup)
@user ||= InternalUser.new # Only needed for the `create` action
checked_study_group_memberships = @user.study_group_memberships
checked_study_groups = checked_study_group_memberships.collect(&:study_group).sort.to_set
unchecked_study_groups = StudyGroup.all.order(name: :asc).to_set.subtract checked_study_groups
@study_group_memberships = checked_study_group_memberships + unchecked_study_groups.collect do |study_group|
StudyGroupMembership.new(user: @user, study_group: study_group)
end
end
private :collect_set_and_unset_study_group_memberships
def show; end def show; end
def update def update

View File

@ -11,6 +11,8 @@ class InternalUser < User
validates :password, confirmation: true, if: -> { password_void? && validate_password? }, on: :update, presence: true validates :password, confirmation: true, if: -> { password_void? && validate_password? }, on: :update, presence: true
validate :password_strength, if: -> { password_void? && validate_password? }, on: :update validate :password_strength, if: -> { password_void? && validate_password? }, on: :update
accepts_nested_attributes_for :study_group_memberships
def activated? def activated?
activation_state == 'active' activation_state == 'active'
end end

View File

@ -1,9 +1,17 @@
# frozen_string_literal: true # frozen_string_literal: true
class StudyGroupMembership < ApplicationRecord class StudyGroupMembership < ApplicationRecord
ROLES = %w[learner teacher].freeze
belongs_to :user, polymorphic: true belongs_to :user, polymorphic: true
belongs_to :study_group belongs_to :study_group
before_save :destroy_if_empty_study_group_or_user
def destroy_if_empty_study_group_or_user
destroy if study_group.blank? || user.blank?
end
enum role: { enum role: {
learner: 0, learner: 0,
teacher: 1, teacher: 1,

View File

@ -12,5 +12,27 @@
.form-check .form-check
label.form-check-label label.form-check-label
= f.check_box(:platform_admin, class: 'form-check-input') = f.check_box(:platform_admin, class: 'form-check-input')
= f.label(:platform_admin, t('activerecord.attributes.external_user.platform_admin'), class: 'form-label') = f.label(:platform_admin, t('activerecord.attributes.internal_user.platform_admin'), class: 'form-label')
h2.mt-4 = t('internal_users.form.study_groups')
ul.list-unstyled.card-group
li.card
.card-header role="tab" id="heading"
a.file-heading data-bs-toggle="collapse" href="#study-group-collapse"
div.clearfix role="button"
span = t('internal_users.form.click_to_collapse')
.card-collapse.collapse id="study-group-collapse" role="tabpanel"
.table-responsive
table.table.overflow-hidden#study-groups-table
thead
tr
th = t('activerecord.attributes.study_group.selection')
th = t('activerecord.attributes.study_group.name')
th = t('activerecord.attributes.study_group_membership.role')
= collection_check_boxes :user, :study_group_ids, @study_group_memberships, :study_group_id, :id, {namespace: :internal_user} do |b|
tr
td = b.check_box class: 'form-check-input', name: "internal_user[study_group_ids][]"
td = b.object.study_group.name
td = select "study_group_membership_roles[#{b.object.study_group.id}]", :role, StudyGroupMembership::ROLES.map { |role| [t("activerecord.attributes.study_group_membership.role_type.#{role}"), role] }, {selected: b.object.persisted? ? b.object.role : nil, include_blank: true}, class: 'form-control form-control-sm'
.actions = render('shared/submit_button', f: f, object: @user) .actions = render('shared/submit_button', f: f, object: @user)

View File

@ -119,6 +119,12 @@ de:
consumer: Konsument consumer: Konsument
members: Mitglieder members: Mitglieder
member_count: Anzahl der Mitglieder member_count: Anzahl der Mitglieder
selection: Ausgewählt
study_group_membership:
role: Rolle
role_type:
learner: Lernender
teacher: Lehrender
tag: tag:
name: Name name: Name
usage: Verwendet usage: Verwendet
@ -583,6 +589,9 @@ de:
success: Sie haben Ihr Passwort erfolgreich geändert. success: Sie haben Ihr Passwort erfolgreich geändert.
show: show:
link: Profil link: Profil
form:
study_groups: Lerngruppen
click_to_collapse: Zum Aus-/Einklappen hier klicken...
search: search:
search_in_forum: "Probleme? Suche hier im Forum" search_in_forum: "Probleme? Suche hier im Forum"
locales: locales:

View File

@ -119,6 +119,12 @@ en:
consumer: Consumer consumer: Consumer
members: Members members: Members
member_count: Member Count member_count: Member Count
selection: Selected
study_group_membership:
role: Role
role_type:
learner: Learner
teacher: Teacher
tag: tag:
name: Name name: Name
usage: Used usage: Used
@ -573,6 +579,9 @@ en:
headline: Complete Registration headline: Complete Registration
submit: Set Password submit: Set Password
success: You successfully completed your registration. success: You successfully completed your registration.
form:
study_groups: Study Groups
click_to_collapse: Click to expand/collapse...
forgot_password: forgot_password:
headline: Reset Password headline: Reset Password
submit: Send Password Reset Instructions submit: Send Password Reset Instructions