From f21ccc8f020859896f9863338bf6105446449c07 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sun, 27 Apr 2014 21:27:39 -0400 Subject: remove dead code from MatchesController --- app/controllers/matches_controller.rb | 142 ---------------------------------- 1 file changed, 142 deletions(-) diff --git a/app/controllers/matches_controller.rb b/app/controllers/matches_controller.rb index 8b8e86d..4c92e67 100644 --- a/app/controllers/matches_controller.rb +++ b/app/controllers/matches_controller.rb @@ -10,148 +10,6 @@ class MatchesController < ApplicationController def index end - # For compatability with the router assumptions made by ApplicationController#check_permission - def matches_url - set_tournament - tournament_matches_path(@tournament) - end - - def get_riot - - players_id = Array.new - players = Array.new - - @match.teams.each do |team| - team.users.each do |user| - players_id.push(user.remote_usernames[0].value["id"]) - players.push(user.remote_usernames[0].value["name"]) - end - end - - recent = HTTParty.get("https://prod.api.pvp.net/api/lol/na/v1.3/game/by-summoner/#{players_id[0]}/recent?api_key=ad539f86-22fd-474d-9279-79a7a296ac38") - - blue = Hash.new - purple = Hash.new - - for i in 0..8 - current_player = players_id[i] - place = players[i] - info = HTTParty.get("https://prod.api.pvp.net/api/lol/na/v1.3/game/by-summoner/#{current_player}/recent?api_key=ad539f86-22fd-474d-9279-79a7a296ac38") - - if 100 == info["games"][0]["stats"]["team"] - blue.merge!("#{place}" => info["games"][0]["stats"]) - else - purple.merge!("#{place}" => info["games"][0]["stats"]) - end - sleep(1) - end - - #look into this glitch - if 100 == recent["games"][0]["stats"]["team"] - blue.merge!("#{players[9]}" => recent["games"][0]["stats"]) - else - purple.merge!("#{players[9]}" => recent["games"][0]["stats"]) - end - - @purp = purple - @blue = blue - end - - def get_riot_info_fake - pull = "Kaceytron" - #current user information - response = HTTParty.get("https://prod.api.pvp.net/api/lol/na/v1.3/summoner/by-name/#{pull.downcase}?api_key=ad539f86-22fd-474d-9279-79a7a296ac38") - - id = response["#{pull.downcase}"]['id'] - - #recent game information - recent = HTTParty.get("https://prod.api.pvp.net/api/lol/na/v1.3/game/by-summoner/#{response["#{pull.downcase}"]['id']}/recent?api_key=ad539f86-22fd-474d-9279-79a7a296ac38") - - game_id = recent["games"][0]["gameId"] - - #members of most recent game id's - player1 = recent["games"][0]["fellowPlayers"][0]["summonerId"] - player2 = recent["games"][0]["fellowPlayers"][1]["summonerId"] - player3 = recent["games"][0]["fellowPlayers"][2]["summonerId"] - player4 = recent["games"][0]["fellowPlayers"][3]["summonerId"] - player5 = recent["games"][0]["fellowPlayers"][4]["summonerId"] - player6 = recent["games"][0]["fellowPlayers"][5]["summonerId"] - player7 = recent["games"][0]["fellowPlayers"][6]["summonerId"] - player8 = recent["games"][0]["fellowPlayers"][7]["summonerId"] - player9 = recent["games"][0]["fellowPlayers"][8]["summonerId"] - - players_by_id = [player1, player2, player3, player4, player5, player6, player7, player8, player9] - - #collect summoner names - memb1 = HTTParty.get("https://prod.api.pvp.net/api/lol/na/v1.3/summoner/#{player1}/name?api_key=ad539f86-22fd-474d-9279-79a7a296ac38") - memb1 = memb1["#{player1}"] - sleep(1); - - memb2 = HTTParty.get("https://prod.api.pvp.net/api/lol/na/v1.3/summoner/#{player2}/name?api_key=ad539f86-22fd-474d-9279-79a7a296ac38") - memb2 = memb2["#{player2}"] - sleep(1); - - memb3 = HTTParty.get("https://prod.api.pvp.net/api/lol/na/v1.3/summoner/#{player3}/name?api_key=ad539f86-22fd-474d-9279-79a7a296ac38") - memb3 = memb3["#{player3}"] - sleep(1); - - memb4 = HTTParty.get("https://prod.api.pvp.net/api/lol/na/v1.3/summoner/#{player4}/name?api_key=ad539f86-22fd-474d-9279-79a7a296ac38") - memb4 = memb4["#{player4}"] - sleep(1); - - memb5 = HTTParty.get("https://prod.api.pvp.net/api/lol/na/v1.3/summoner/#{player5}/name?api_key=ad539f86-22fd-474d-9279-79a7a296ac38") - memb5 = memb5["#{player5}"] - sleep(1); - - memb6 = HTTParty.get("https://prod.api.pvp.net/api/lol/na/v1.3/summoner/#{player6}/name?api_key=ad539f86-22fd-474d-9279-79a7a296ac38") - memb6 = memb6["#{player6}"] - sleep(1); - - memb7 = HTTParty.get("https://prod.api.pvp.net/api/lol/na/v1.3/summoner/#{player7}/name?api_key=ad539f86-22fd-474d-9279-79a7a296ac38") - memb7 = memb7["#{player7}"] - sleep(1); - - memb8 = HTTParty.get("https://prod.api.pvp.net/api/lol/na/v1.3/summoner/#{player8}/name?api_key=ad539f86-22fd-474d-9279-79a7a296ac38") - memb8 = memb8["#{player8}"] - sleep(1); - - memb9 = HTTParty.get("https://prod.api.pvp.net/api/lol/na/v1.3/summoner/#{player9}/name?api_key=ad539f86-22fd-474d-9279-79a7a296ac38") - memb9 = memb9["#{player9}"] - sleep(1); - - memb10 = HTTParty.get("https://prod.api.pvp.net/api/lol/na/v1.3/summoner/#{id}/name?api_key=ad539f86-22fd-474d-9279-79a7a296ac38") - memb10 = memb10["#{id}"] - - players = ["#{memb1}", "#{memb2}", "#{memb3}", "#{memb4}", "#{memb5}", "#{memb6}", "#{memb7}", "#{memb8}", "#{memb9}", "#{memb10}"] - - sleep(5); - - blue = Hash.new - purple = Hash.new - - for i in 0..8 - current_player = players_by_id[i] - place = players[i] - info = HTTParty.get("https://prod.api.pvp.net/api/lol/na/v1.3/game/by-summoner/#{current_player}/recent?api_key=ad539f86-22fd-474d-9279-79a7a296ac38") - - if 100 == info["games"][0]["stats"]["team"] - blue.merge!("#{place}" => info["games"][0]["stats"]) - else - purple.merge!("#{place}" => info["games"][0]["stats"]) - end - sleep(1) - end - - if 100 == recent["games"][0]["stats"]["team"] - blue.merge!("#{players[9]}" => recent["games"][0]["stats"]) - else - purple.merge!("#{players[9]}" => recent["games"][0]["stats"]) - end - - @purp = purple - @blue = blue - end - # GET /tournaments/1/matches/1 # GET /tournaments/1/matches/1.json def show -- cgit v1.2.3-54-g00ecf From 69aef895674c8de650501a9effb0046ba41f9529 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sun, 27 Apr 2014 21:27:52 -0400 Subject: touch up comments --- app/views/matches/show.html.erb | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/app/views/matches/show.html.erb b/app/views/matches/show.html.erb index 8344a7a..1c11eb7 100644 --- a/app/views/matches/show.html.erb +++ b/app/views/matches/show.html.erb @@ -21,7 +21,7 @@ function score_peers() { <%= @match.tournament_stage %>

- + Note: The change of status from 2 to 3 for League of Legends is coming from League Data Pull (RIOT API) +%>

Teams/users

-- cgit v1.2.3-54-g00ecf From 83aa6970f730005d8322402ee316e2731fd42506 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sun, 27 Apr 2014 21:28:10 -0400 Subject: add lib/sampling/peer_review.* --- lib/sampling/peer_review.html.erb | 28 +++++++++++++ lib/sampling/peer_review.rb | 85 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 113 insertions(+) create mode 100644 lib/sampling/peer_review.html.erb create mode 100644 lib/sampling/peer_review.rb diff --git a/lib/sampling/peer_review.html.erb b/lib/sampling/peer_review.html.erb new file mode 100644 index 0000000..8ff350e --- /dev/null +++ b/lib/sampling/peer_review.html.erb @@ -0,0 +1,28 @@ +<% if @feedbacks_missing.include? @user %> + + +
    + <% @team.users.reject{|u|u==@user}.each do |user| %>
  1. + <%= user.user_name %> +
    + <%# TODO: display more statistics %> +
    2. <% end %> +
+ <%= submit_tag("Submit peer evaluation", :onsubmit => "score_peers()") %> +<% else %> +

Still waiting for peer feedback from the following users: +

    <% @feedbacks_missing.each do |user| %> +
  • <%= link_to user %>
    • + <% end %>
+

+<% end %> diff --git a/lib/sampling/peer_review.rb b/lib/sampling/peer_review.rb new file mode 100644 index 0000000..9f1833d --- /dev/null +++ b/lib/sampling/peer_review.rb @@ -0,0 +1,85 @@ +module Sampling + module PeerReview + def self.works_with?(game) + return true + end + + def self.uses_remote? + return false + end + + def self.set_remote_name(user, game, value) + raise "This sampling method doesn't use remote usernames." + end + + def self.get_remote_name(value) + raise "This sampling method doesn't use remote usernames." + end + + def self.sampling_start(match) + # do nothing + end + + def self.sampling_done?(match) + return get_feedbacks_missing(match).empty? + end + + def self.render_user_interaction(match, user) + @user = user + @team = get_team(match) + @feedbacks_missing = get_feedbacks_missing(match) + + require 'erb' + erb_filename = File.join(__FILE__.sub(/\.rb$/, '.svg.erb')) + erb = ERB.new(File.read(erb_filename)) + erb.filename = erb_filename + return erb.result.html_safe + end + + def self.handle_user_interaction(match, reviewing_user, params) + i = 0 + params[:peer_review].to_s.split(',').each do |user_name| + reviewed_user = User.find_by_user_name(user_name) + user.statistics.create(match: match, value: i) + i += 1 + end + end + + private + + def self.get_users(match) + users = [] + match.teams.each{|t| users.concat(t.users)} + return users + end + + def self.get_team(match) + match.teams.find{|t|t.users.include?(@user)} + end + + def self.get_feedbacks(match) + ret = {} + match.statistiscs.where("'name' LIKE 'feedback_from_%'").each do |statistic| + ret[statistic.user] ||= {} + ret[statistic.user][User.find_by_user_name(statistic.name.sub(/^feedback_from_/,''))] = statistic.value + end + return ret + end + + def self.get_feedbacks_missing(match) + require 'set' + ret = Set.new() + + feedback = get_feedbacks(match) + users = get_users(match) + + feedback.each do |feedback| + (users - feedback.keys).each do |user| + ret.push(user) + end + end + + return ret + endx + end +end -- cgit v1.2.3-54-g00ecf