cafe-grader-web Commit - r511:d90a3f1b39d0

cafe-grader-web

Commit `r511:d90a3f1b39d0` public

parent | child

Description:

merge

Commit status:

[Not Reviewed]

References:

merge java

Diff options:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r511:d90a3f1b39d0 - Sat, 20 Sep 2014 10:37:44 - 8 files changed: 106 inserted, 39 deleted

app/views/problems/stat.html.haml created 644 ¶ +34

			@@ -0,0 +1,34
		1	+ :css
		2	+ .fix-width {
		3	+ font-family: "Consolas, Monaco, Droid Sans Mono,Mono, Monospace,Courier"
		4	+ }
		5	+
		6	+ %h1 Problem stat: #{@problem.name}
		7	+ %h2 Overview
		8	+
		9	+ %h2 Submissions
		10	+ - if @submissions and @submissions.count > 0
		11	+ %table.info#main_table
		12	+ %thead
		13	+ %tr.info-head
		14	+ %th ID
		15	+ %th Login
		16	+ %th Name
		17	+ %th Submitted_at
		18	+ %th Points
		19	+ %th comment
		20	+ %tbody
		21	+ - row_odd,curr = true,''
		22	+ - @submissions.each do \|sub\|
		23	+ - next unless sub.user
		24	+ - row_odd,curr = !row_odd, sub.user if curr != sub.user
		25	+ %tr{class: row_odd ? "info-odd" : "info-even"}
		26	+ %td= link_to sub.id, controller: 'graders', action: 'submission', id: sub.id
		27	+ %td= link_to sub.user.login, controller: :users, action: :profile, id: sub.user.id
		28	+ %td= sub.user.full_name
		29	+ %td= time_ago_in_words(sub.submitted_at) + " ago"
		30	+ %td= sub.points
		31	+ %td.fix-width= sub.grader_comment
		32	+ - else
		33	+ No submission
		34	+

app/controllers/problems_controller.rb ¶ +1 -1

                                :conditions => "available = 0").each do |problem|
                     problem.available = true
                     problem.save
                   end
                   redirect_to :action => 'list'
                 end
                 def stat
                   @problem = Problem.find(params[:id])
                   if !@problem.available
                     redirect_to :controller => 'main', :action => 'list'
                   else
-            -       @submissions = Submission.find_all_last_by_problem(params[:id])
+            +       @submissions = Submission.includes(:user).where(problem_id: params[:id]).order(:user_id,:id)
                   end
                 end
                 def manage
                   @problems = Problem.find(:all, :order => 'date_added DESC')
                 end
                 def do_manage
                   if params.has_key? 'change_date_added'
                     change_date_added
                   else params.has_key? 'add_to_contest'
                     add_to_contest

app/controllers/user_admin_controller.rb ¶ +57 -3

+            + require 'csv'
+            +
               class UserAdminController < ApplicationController
+            +
                 include MailHelperMethods
                 before_filter :admin_authorization
                 # GETs should be safe (see http://www.w3.org/2001/tag/doc/whenToUseGet.html)
                 verify :method => :post, :only => [ :destroy,
                                                     :create, :create_from_list,
                                                     :update,
                                                     :manage_contest,
                                                     :bulk_mail
                                                   ],
                        :redirect_to => { :action => :list }
                     redirect_to :action => 'show', :id => @user
                   else
                     render :action => 'edit'
                   end
                 end
                 def destroy
                   User.find(params[:id]).destroy
                   redirect_to :action => 'list'
                 end
                 def user_stat
-            -     @problems = Problem.find_available_problems
+            +     if params[:commit] == 'download csv'
+            +       @problems = Problem.all
+            +     else
+            +       @problems = Problem.find_available_problems
+            +     end
                   @users = User.find(:all, :include => [:contests, :contest_stat])
                   @scorearray = Array.new
                   @users.each do |u|
                     ustat = Array.new
                     ustat[0] = u
                     @problems.each do |p|
                       sub = Submission.find_last_by_user_and_problem(u.id,p.id)
                       if (sub!=nil) and (sub.points!=nil)
                         ustat << [(sub.points.to_f*100/p.full_score).round, (sub.points>=p.full_score)]
                       else
                         ustat << [0,false]
                       end
                     end
                     @scorearray << ustat
                   end
+            +
+            +     if params[:commit] == 'download csv' then
+            +       csv = gen_csv_from_scorearray(@scorearray,@problems)
+            +       send_data csv, filename: 'last_score.csv'
+            +     else
+            +       render template: 'user_admin/user_stat'
+            +     end
                 end
                 def user_stat_max
-            -     @problems = Problem.find_available_problems
+            +     if params[:commit] == 'download csv'
+            +       @problems = Problem.all
+            +     else
+            +       @problems = Problem.find_available_problems
+            +     end
                   @users = User.find(:all, :include => [:contests, :contest_stat])
                   @scorearray = Array.new
                   #set up range from param
                   since_id = params.fetch(:since_id, 0).to_i
                   until_id = params.fetch(:until_id, 0).to_i
                   @users.each do |u|
                     ustat = Array.new
                     ustat[0] = u
                     @problems.each do |p|
                       max_points = 0
                       Submission.find_in_range_by_user_and_problem(u.id,p.id,since_id,until_id).each do |sub|
                         max_points = sub.points if sub and sub.points and (sub.points > max_points)
                       end
                       ustat << [(max_points.to_f*100/p.full_score).round, (max_points>=p.full_score)]
                     end
                     @scorearray << ustat
                   end
-            -     render template: 'user_admin/user_stat'
+            +     if params[:commit] == 'download csv' then
+            +       csv = gen_csv_from_scorearray(@scorearray,@problems)
+            +       send_data csv, filename: 'max_score.csv'
+            +     else
+            +       render template: 'user_admin/user_stat'
+            +     end
                 end
                 def import
                   if params[:file]==''
                     flash[:notice] = 'Error importing no file'
                     redirect_to :action => 'list' and return
                   end
                   import_from_file(params[:file])
                 end
                 def random_all_passwords
                   users = User.find(:all)
                   if id!='none'
                     @contest = Contest.find(id)
                   else
                     @contest = nil
                   end
                   if @contest
                     @users = @contest.users
                   else
                     @users = User.find_users_with_no_contest
                   end
                   return [@contest, @users]
                 end
+            +
+            +   def gen_csv_from_scorearray(scorearray,problem)
+            +     CSV.generate do |csv|
+            +       #add header
+            +       header = ['User','Name', 'Activated?', 'Logged in', 'Contest']
+            +       problem.each { |p| header << p.name }
+            +       header += ['Total','Passed']
+            +       csv << header
+            +       #add data
+            +       scorearray.each do |sc|
+            +         total = num_passed = 0
+            +         row = Array.new
+            +         sc.each_index do |i|
+            +           if i == 0
+            +             row << sc[i].login
+            +             row << sc[i].full_name
+            +             row << sc[i].activated
+            +             row << (sc[i].try(:contest_stat).try(:started_at)!=nil ? 'yes' : 'no')
+            +             row << sc[i].contests.collect {|c| c.name}.join(', ')
+            +           else
+            +             row << sc[i][0]
+            +             total += sc[i][0]
+            +             num_passed += 1 if sc[i][1]
+            +           end
+            +         end
+            +         row << total
+            +         row << num_passed
+            +         csv << row
+            +       end
+            +     end
+            +   end
               end

app/models/submission.rb ¶ +1 -1

                 before_save :assign_latest_number_if_new_recond
                 def self.find_last_by_user_and_problem(user_id, problem_id)
                   last_sub = find(:first,
                                   :conditions => {:user_id => user_id,
                                     :problem_id => problem_id},
                                   :order => 'number DESC')
                   return last_sub
                 end
                 def self.find_all_last_by_problem(problem_id)
                   # need to put in SQL command, maybe there's a better way
-            -     Submission.find_by_sql("SELECT * FROM submissions " +
+            +     Submission.includes(:user).find_by_sql("SELECT * FROM submissions " +
               			   "WHERE id = " +
               			   "(SELECT MAX(id) FROM submissions AS subs " +
               			   "WHERE subs.user_id = submissions.user_id AND " +
                                          "problem_id = " + problem_id.to_s + " " +
               			   "GROUP BY user_id) " +
                                          "ORDER BY user_id")
                 end
                 def self.find_in_range_by_user_and_problem(user_id, problem_id,since_id,until_id)
                   records = Submission.where(problem_id: problem_id,user_id: user_id)
                   records = records.where('id >= ?',since_id) if since_id > 0
                   records = records.where('id <= ?',until_id) if until_id > 0

app/views/main/_problem.html.erb ¶ +4 -1

               <tr class="info-<%= (problem_counter%2==0) ? "even" : "odd" %>">
                 <td>
                   <%= "#{problem_counter+1}" %>
                 </td>
                 <td>
-            -     <%= "(#{problem.name}) #{problem.full_name}" %>
+            +     <%= "#{problem.name}"%>
+            +   </td>
+            +   <td>
+            +     <%= "#{problem.full_name}" %>
                   <%= link_to_description_if_any "[#{t 'main.problem_desc'}]", problem %>
                 </td>
                 <td align="center">
                   <%= @prob_submissions[problem.id][:count] %>
                 </td>
                 <td>
                   <%= render :partial => 'submission_short',
                              :locals => {
                                :submission => @prob_submissions[problem.id][:submission],
                                :problem_name => problem.name }%>
                 </td>
               </tr>

app/views/main/list.html.haml ¶ +4 -2

               %hr/
               - if (GraderConfiguration.contest_mode?) and (@user.site!=nil) and (@user.site.started!=true)
                 %p=t 'main.start_soon'
               - if GraderConfiguration.show_tasks_to?(@user)
                 - if not GraderConfiguration.multicontests?
                   %table.info
                     %tr.info-head
                       %th
-            -         %th Tasks
+            +         %th Tasks name
+            +         %th Full name
                       %th # of sub(s)
                       %th Results
                     = render :partial => 'problem', :collection => @problems
                 - else
                   - @contest_problems.each do |cp|
                     - if cp[:problems].length > 0
                       %h2{:class =>'contest-title'}
                         = "#{cp[:contest] ? cp[:contest].title : 'Public problems'}"
                       %table.info
                         %tr.info-head
                           %th
-            -             %th Tasks
+            +             %th Tasks name
+            +             %th Full name
                           %th # of sub(s)
                           %th Results
                         = render :partial => 'problem', :collection => cp[:problems]
               %hr/
               %script{:type => 'text/javascript'}
                 = "Announcement.refreshUrl = '#{url_for :controller => 'main', :action => 'announcements'}';"
                 Announcement.registerRefreshEventTimer();

app/views/user_admin/user_stat.html.haml ¶ +5 -2

                 $('#my_table').tablesorter({widgets: ['zebra']});
                 });
               %h1 User grading results
               %h2= params[:action] == 'user_stat' ? "Show scores from latest submission" : "Show max scores in submission range"
               - if @problem and @problem.errors
                 =error_messages_for 'problem'
               = render partial: 'submission_range'
-            - - if params[:action] == 'user_stat'
-            -   = "latest score"
+            + - if params[:action] == 'user_stat'
+            +   %h3 Latest score
+            +   = link_to '[download csv with all problems]', controller: :user_admin, action: :user_stat, commit: 'download csv'
               - else
+            +   %h3 Max score
                 = link_to '[Show only latest submissions]', controller: :user_admin, action: :user_stat
+            +   = link_to '[download csv with all problems]', controller: :user_admin, action: :user_stat_max, commit: 'download csv'
               %table.tablesorter-cafe#my_table
                 %thead
                   %tr
                     %th User
                     %th Name
                     %th Activated?
                     %th Logged in
                     %th Contest(s)
                     %th Section
                     - @problems.each do |p|
                       %th= p.name

app/views/problems/stat.html.erb removed ¶ -29

deleted file

Write
Preview

You need to be logged in to leave comments. Login now

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository permissions settings

Sign in to your account

Author

r511:d90a3f1b39d0 - Sat, 20 Sep 2014 10:37:44 - 8 files changed: 106 inserted, 39 deleted

Sign in to your account

Commit r511:d90a3f1b39d0 public

Author

r511:d90a3f1b39d0 - Sat, 20 Sep 2014 10:37:44 - 8 files changed: 106 inserted, 39 deleted

Commit `r511:d90a3f1b39d0` public