From 9037c8463977f752afd317d568d9559e3640c4bc Mon Sep 17 00:00:00 2001 From: Maximilian Grundke Date: Fri, 20 Jul 2018 13:16:32 +0200 Subject: [PATCH] Link to filtered exercise list --- app/assets/javascripts/external_users.js | 12 +++++++----- app/controllers/external_users_controller.rb | 4 ++-- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/app/assets/javascripts/external_users.js b/app/assets/javascripts/external_users.js index 8e4ec52e..e262e5e5 100644 --- a/app/assets/javascripts/external_users.js +++ b/app/assets/javascripts/external_users.js @@ -7,12 +7,14 @@ $(function() { var buildTagContainer = function(tag) { return '\ -
\ -
' + tag.key + '
\ - '; + '; }; var jqxhr = $.ajax(window.location.href + '/tag_statistics', { diff --git a/app/controllers/external_users_controller.rb b/app/controllers/external_users_controller.rb index cd46a72e..441edd67 100644 --- a/app/controllers/external_users_controller.rb +++ b/app/controllers/external_users_controller.rb @@ -72,8 +72,8 @@ class ExternalUsersController < ApplicationController statistics = [] tags = ProxyExercise.new().get_user_knowledge_and_max_knowledge(@user, @user.participations.uniq.compact) - tags[:user_topic_knowledge].each_pair do |key, value| - statistics.append({:key => key.name.to_s, :value => (100.0 / tags[:max_topic_knowledge][key] * value).round}) + tags[:user_topic_knowledge].each_pair do |tag, value| + statistics.append({key: tag.name.to_s, value: (100.0 / tags[:max_topic_knowledge][tag] * value).round, id: tag.id}) end statistics.sort_by! {|item| -item[:value]}