Skip to content

Commit d4d190c

Browse files
Eric-GuoEric-Guo
committed
Support calibration templates linked to multiple evaluation templates
1 parent 9bbaeec commit d4d190c

38 files changed

Lines changed: 173 additions & 56 deletions

‎app/controllers/admin/calibration_session_users_controller.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ def expender
1111

1212
def undo_confirm
1313
@undo_company_evaluation_template = @calibration_session_user
14-
.calibration_session.calibration_template.company_evaluation_template
14+
.evaluation_user_capability.company_evaluation_template
1515
render layout: false
1616
end
1717

‎app/controllers/admin/calibration_sessions_controller.rb‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ def index
1414
@session_status = params[:session_status]
1515
add_to_breadcrumbs t(".title"), admin_calibration_sessions_path(company_evaluation_id: params[:company_evaluation_id])
1616
calibration_sessions = policy_scope(CalibrationSession)
17-
.includes(calibration_template: :company_evaluation_template,
17+
.includes(calibration_template: :company_evaluation_templates,
1818
calibration_session_judges: :judge,
1919
calibration_session_users: [:evaluation_user_capability, :user])
2020
.where(calibration_template_id: CalibrationTemplate.open_for_user_calibration_template_ids)
@@ -49,7 +49,7 @@ def square
4949
add_to_breadcrumbs t("admin.calibration_sessions.show.title"), admin_calibration_session_path(id: @calibration_session.id)
5050
add_to_breadcrumbs t(".title")
5151

52-
company_evaluation_template = @calibration_session.calibration_template.company_evaluation_template
52+
company_evaluation_template = @calibration_session.company_evaluation_template
5353
evaluation_user_capabilities = @calibration_session.calibration_session_users.collect(&:evaluation_user_capability)
5454
@total_people_num = evaluation_user_capabilities.length
5555
@evaluation_user_capabilities_group = company_evaluation_template.group_evaluation_user_capabilities(evaluation_user_capabilities)

‎app/controllers/admin/calibration_templates_controller.rb‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ class CalibrationTemplatesController < BaseController
66
before_action :set_calibration_template, only: %i[edit update destroy confirm_destroy]
77

88
def new
9-
@calibration_template = authorize CalibrationTemplate.new(company_evaluation_template_id: @company_evaluation_template.id)
9+
@calibration_template = authorize CalibrationTemplate.new(company_evaluation_templates: [@company_evaluation_template])
1010
render layout: false
1111
end
1212

1313
def create
14-
authorize CalibrationTemplate.create(calibration_template_params.merge(company_evaluation_template_id: @company_evaluation_template.id))
14+
authorize CalibrationTemplate.create(calibration_template_params.merge(company_evaluation_templates: [@company_evaluation_template]))
1515
end
1616

1717
def edit

‎app/controllers/admin/user_calibrations_controller.rb‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,9 @@ def index
1313
add_to_breadcrumbs title
1414
set_meta_tags(title: title)
1515
calibration_session_users = policy_scope(CalibrationSessionUser)
16-
.includes(:user, {calibration_session: {calibration_template: :company_evaluation_template}})
16+
.includes(:user, {calibration_session: {calibration_template: :company_evaluation_templates}})
1717
.where(calibration_session: {calibration_template: {company_evaluation_templates: {company_evaluation_id: @company_evaluation.id}}})
18+
.distinct
1819
@user_id = params[:user_id].presence
1920
calibration_session_users = if @user_id.present?
2021
calibration_session_users.where(user_id: @user_id)

‎app/controllers/cp/calibration_sessions_controller.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ def index
1414
@session_name = params[:session_name]
1515
@session_status = params[:session_status]
1616
calibration_sessions = policy_scope(CalibrationSession)
17-
.includes(calibration_template: :company_evaluation_template,
17+
.includes(calibration_template: :company_evaluation_templates,
1818
calibration_session_judges: :judge,
1919
calibration_session_users: [:evaluation_user_capability, :user])
2020
.where(calibration_template_id: CalibrationTemplate.open_for_user_calibration_template_ids)

‎app/controllers/hr/calibration_session_users_controller.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ class CalibrationSessionUsersController < BaseController
77

88
def undo_confirm
99
@undo_company_evaluation_template = @calibration_session_user
10-
.calibration_session.calibration_template.company_evaluation_template
10+
.evaluation_user_capability.company_evaluation_template
1111
render layout: false
1212
end
1313

‎app/controllers/hr/calibration_sessions_controller.rb‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ def index
1414
@session_name = params[:session_name]
1515
@session_status = params[:session_status]
1616
calibration_sessions = policy_scope(CalibrationSession)
17-
.includes(calibration_template: :company_evaluation_template,
17+
.includes(calibration_template: :company_evaluation_templates,
1818
calibration_session_judges: :judge,
1919
calibration_session_users: [:evaluation_user_capability, :user])
2020
.where(calibration_template_id: CalibrationTemplate.open_for_user_calibration_template_ids)
@@ -48,7 +48,7 @@ def square
4848
add_to_breadcrumbs t("hr.calibration_sessions.show.title"), hr_calibration_session_path(id: @calibration_session.id)
4949
add_to_breadcrumbs t(".title")
5050

51-
company_evaluation_template = @calibration_session.calibration_template.company_evaluation_template
51+
company_evaluation_template = @calibration_session.company_evaluation_template
5252
evaluation_user_capabilities = @calibration_session.calibration_session_users.collect(&:evaluation_user_capability)
5353
@total_people_num = evaluation_user_capabilities.length
5454
@evaluation_user_capabilities_group = company_evaluation_template.group_evaluation_user_capabilities(evaluation_user_capabilities)

‎app/controllers/staff/calibration_session_users_controller.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ class CalibrationSessionUsersController < BaseController
77

88
def undo_confirm
99
@undo_company_evaluation_template = @calibration_session_user
10-
.calibration_session.calibration_template.company_evaluation_template
10+
.evaluation_user_capability.company_evaluation_template
1111
render layout: false
1212
end
1313

‎app/controllers/staff/calibration_sessions_controller.rb‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ class CalibrationSessionsController < BaseController
1313
def index
1414
add_to_breadcrumbs t(".title")
1515
calibration_sessions = policy_scope(CalibrationSession)
16-
.includes(calibration_template: :company_evaluation_template,
16+
.includes(calibration_template: :company_evaluation_templates,
1717
calibration_session_judges: :judge,
1818
calibration_session_users: [:evaluation_user_capability, :user])
1919
.where(calibration_template_id: CalibrationTemplate.open_for_user_calibration_template_ids)
@@ -32,7 +32,7 @@ def show
3232
return redirect_to staff_root_path, alert: I18n.t("staff.calibration_sessions.show.finalized") unless @calibration_session.session_status == "calibrating"
3333
return redirect_to staff_root_path, alert: I18n.t("staff.calibration_sessions.show.can_not_start") unless @calibration_session.can_start_calibration?
3434

35-
@group_level = @calibration_session.calibration_template.company_evaluation_template.group_level
35+
@group_level = @calibration_session.company_evaluation_template.group_level
3636
respond_to do |format|
3737
format.html do
3838
@calibration_labels = {
@@ -80,7 +80,7 @@ def show
8080
end
8181

8282
def update
83-
company_evaluation_template = @calibration_session.calibration_template.company_evaluation_template
83+
company_evaluation_template = @calibration_session.company_evaluation_template
8484
@group_level = company_evaluation_template.group_level
8585

8686
update_calibration_group(params[:calibration], company_evaluation_template)
@@ -126,7 +126,7 @@ def square
126126

127127
evaluation_user_capabilities = @calibration_session.calibration_session_users.collect(&:evaluation_user_capability)
128128
@total_people_num = evaluation_user_capabilities.length
129-
company_evaluation_template = @calibration_session.calibration_template.company_evaluation_template
129+
company_evaluation_template = @calibration_session.company_evaluation_template
130130
@evaluation_user_capabilities_group = company_evaluation_template.group_evaluation_user_capabilities(evaluation_user_capabilities)
131131
render company_evaluation_template.square_template
132132
end

‎app/controllers/staff/calibration_table_sessions_controller.rb‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ def show
88
return redirect_to staff_root_path, alert: I18n.t("staff.calibration_sessions.show.finalized") unless @calibration_session.session_status == "calibrating"
99
return redirect_to staff_root_path, alert: I18n.t("staff.calibration_sessions.show.can_not_start") unless @calibration_session.can_start_calibration?
1010

11-
@group_level = @calibration_session.calibration_template.company_evaluation_template.group_level
11+
@group_level = @calibration_session.company_evaluation_template.group_level
1212
need_calibration_eucs = @calibration_session
1313
.calibration_session_users.collect(&:evaluation_user_capability)
1414
.reject(&:blank?) # user must having evaluation_user_capability, even it's only having performance.
@@ -70,7 +70,7 @@ def update
7070

7171
log_calibration_session_save(
7272
source: "table",
73-
group_level: @calibration_session.calibration_template.company_evaluation_template.group_level,
73+
group_level: @calibration_session.company_evaluation_template.group_level,
7474
eucs: @need_calibration_eucs
7575
)
7676

0 commit comments

Comments
 (0)