cafe-grader-web Commit - r397:94216ffe57fe

cafe-grader-web

Commit `r397:94216ffe57fe` public

parent | child

Description:

add feature check maximum score in submission ranges available in the [result] admin menu. A user can enter a range of submissions id and the maximum score per each user,problem among the submission ranges will be reported

Commit status:

[Not Reviewed]

References:

algo

Diff options:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r397:94216ffe57fe - Thu, 21 Aug 2014 18:33:19 - 3 files changed: 39 inserted, 6 deleted

app/controllers/user_admin_controller.rb ¶ +27 -6

                   @users = []
                   sessions.each do |session|
                     if session.data[:user_id]
                       @users << User.find(session.data[:user_id])
                     end
                   end
                 end
                 def show
                   @user = User.find(params[:id])
                 end
                 def new
                   @user = User.new
                 end
                 def create
                   @user = User.new(params[:user])
                   @user.activated = true
                   if @user.save
                     flash[:notice] = 'User was successfully created.'
                     redirect_to :action => 'list'
                   else
                     render :action => 'new'
                   end
                 end
                 def create_from_list
                   lines = params[:user_list]
                   note = []
                   lines.split("\n").each do |line|
                     items = line.chomp.split(',')
                     if items.length>=2
                       login = items[0]
                       full_name = items[1]
                       added_random_password = false
                       if items.length>=3
                         password = items[2].chomp(" ")
                         user_alias = (items.length>=4) ? items[3] : login
                       else
                         password = random_password
                         user_alias = (items.length>=4) ? items[3] : login
                         added_random_password = true
                       end
                       user = User.new({:login => login,
                                         :full_name => full_name,
                                         :password => password,
                                         :password_confirmation => password,
                                         :alias => user_alias})
                       user.activated = true
                       user.save
                       if added_random_password
                         note << "'#{login}' (+)"
                       else
                         note << login
                       end
                     end
                   end
                   flash[:notice] = 'User(s) ' + note.join(', ') +
                     ' were successfully created.  ' +
                     '( (+) - created with random passwords.)'
                   redirect_to :action => 'list'
                 end
                 def edit
                   @user = User.find(params[:id])
                 end
                 def update
                   @user = User.find(params[:id])
                   if @user.update_attributes(params[:user])
                     flash[:notice] = 'User was successfully updated.'
                     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
                   @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)
+            +         sub = Submission.find_last_by_user_and_problem(u.id,p.id)
-            - 	if (sub!=nil) and (sub.points!=nil)
+            +         if (sub!=nil) and (sub.points!=nil)
-            - 	  ustat << [(sub.points.to_f*100/p.full_score).round, (sub.points>=p.full_score)]
+            +           ustat << [(sub.points.to_f*100/p.full_score).round, (sub.points>=p.full_score)]
-            - 	else
+            +         else
-            - 	  ustat << [0,false]
+            +           ustat << [0,false]
-            - 	end
+            +         end
+            +       end
+            +       @scorearray << ustat
+            +     end
+            +   end
+            +
+            +   def user_stat_max
+            +     @problems = Problem.find_available_problems
+            +     @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
                 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)
                   @prefix = params[:prefix] || ''
                   @non_admin_users = User.find_non_admin_with_prefix(@prefix)
                   @changed = false
                   if request.request_method == 'POST'
                     @non_admin_users.each do |user|
                       password = random_password
                       user.password = password
                       user.password_confirmation = password
                       user.save
                     end
                     @changed = true
                   end
                 end
                 # contest management
                 def contests
                   @contest, @users = find_contest_and_user_from_contest_id(params[:id])
                   @contests = Contest.enabled
                 end
                 def assign_from_list
                   contest_id = params[:users_contest_id]
                   org_contest, users = find_contest_and_user_from_contest_id(contest_id)
                   contest = Contest.find(params[:new_contest][:id])
                   if !contest
                     flash[:notice] = 'Error: no contest'
                     redirect_to :action => 'contests', :id =>contest_id
                   end
                   note = []
                   users.each do |u|
                     u.contests = [contest]
                     note << u.login
                   end
                   flash[:notice] = 'User(s) ' + note.join(', ') +
                     " were successfully reassigned to #{contest.title}."
                   redirect_to :action => 'contests', :id =>contest.id
                 end
                 def add_to_contest
                   user = User.find(params[:id])
                   contest = Contest.find(params[:contest_id])
                   if user and contest
                     user.contests << contest
                   end
                   redirect_to :action => 'list'
                 end
                 def remove_from_contest
                   user = User.find(params[:id])
                   contest = Contest.find(params[:contest_id])
                   if user and contest
                     user.contests.delete(contest)
                   end
                   redirect_to :action => 'list'
                 end
                 def contest_management
                 end
                 def manage_contest
                   contest = Contest.find(params[:contest][:id])
                   if !contest
                     flash[:notice] = 'You did not choose the contest.'
                     redirect_to :action => 'contest_management' and return
                   end
                   operation = params[:operation]
                   if not ['add','remove','assign'].include? operation
                     flash[:notice] = 'You did not choose the operation to perform.'
                     redirect_to :action => 'contest_management' and return
                   end
                   lines = params[:login_list]
                   if !lines or lines.blank?
                     flash[:notice] = 'You entered an empty list.'
                     redirect_to :action => 'contest_management' and return
                   end

app/models/submission.rb ¶ +7

               class Submission < ActiveRecord::Base
                 belongs_to :language
                 belongs_to :problem
                 belongs_to :user
                 before_validation :assign_problem
                 before_validation :assign_language
                 validates_presence_of :source
                 validates_length_of :source, :maximum => 100_000, :allow_blank => true, :message => 'too long'
                 validates_length_of :source, :minimum => 1, :allow_blank => true, :message => 'too short'
                 validate :must_have_valid_problem
                 validate :must_specify_language
                 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 " +
               			   "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
+            +     records.all
+            +   end
+            +
                 def self.find_last_for_all_available_problems(user_id)
                   submissions = Array.new
                   problems = Problem.find_available_problems
                   problems.each do |problem|
                     sub = Submission.find_last_by_user_and_problem(user_id, problem.id)
                     submissions << sub if sub!=nil
                   end
                   submissions
                 end
                 def self.find_by_user_problem_number(user_id, problem_id, number)
                   Submission.find(:first,
                                   :conditions => {
                                     :user_id => user_id,
                                     :problem_id => problem_id,
                                     :number => number
                                   })
                 end
                 def self.find_all_by_user_problem(user_id, problem_id)
                   Submission.find(:all,
                                   :conditions => {
                                     :user_id => user_id,
                                     :problem_id => problem_id,
                                   })
                 end
                 def download_filename
                   if self.problem.output_only
                     return self.source_filename
                   else
                     timestamp = self.submitted_at.localtime.strftime("%H%M%S")
                     return "#{self.problem.name}-#{timestamp}.#{self.language.ext}"
                   end
                 end
                 protected
                 def self.find_option_in_source(option, source)
                   if source==nil
                     return nil
                   end
                   i = 0
                   source.each_line do |s|
                     if s =~ option
               	words = s.split
               	return words[1]
                     end
                     i = i + 1
                     if i==10
               	return nil
                     end
                   end
                   return nil
                 end
                 def self.find_language_in_source(source, source_filename="")
                   langopt = find_option_in_source(/^LANG:/,source)
                   if langopt
                     return (Language.find_by_name(langopt) ||
                             Language.find_by_pretty_name(langopt))
                   else
                     if source_filename
                       return Language.find_by_extension(source_filename.split('.').last)
                     else
                       return nil
                     end
                   end
                 end
                 def self.find_problem_in_source(source, source_filename="")
                   prob_opt = find_option_in_source(/^TASK:/,source)
                   if problem = Problem.find_by_name(prob_opt)
                     return problem
                   else
                     if source_filename
                       return Problem.find_by_name(source_filename.split('.').first)
                     else
                       return nil
                     end
                   end
                 end
                 def assign_problem
                   if self.problem_id!=-1
                     begin
                       self.problem = Problem.find(self.problem_id)
                     rescue ActiveRecord::RecordNotFound
                       self.problem = nil
                     end
                   else
                     self.problem = Submission.find_problem_in_source(self.source,
                                                                      self.source_filename)
                   end
                 end

app/views/user_admin/user_stat.html.erb ¶ +5

               <h1>User grading results</h1>
+            + <h2>Show scores from latest submission</h2>
+            +
+            + <%= render 'submission_range' %>
+            +
+            + <p>Latest scores</p>
               <table class="info">
               <tr class="info-head">
                 <th>User</th>
                 <th>Name</th>
                 <th>Activated?</th>
                 <th>Logged in</th>
                 <th>Contest(s)</th>
               <% @problems.each do |p| %>
                 <th><%= p.name %></th>
               <% end %>
               <th>Total</th>
               <th>Passed</th>
               </tr>
               <% counter = 0 %>
               <% @scorearray.each do |sc| %>
                 <tr class="<%= (counter %2 ==0) ? "info-even" : "info-odd" %>">
                   <% total = 0 %>
                   <% num_passed = 0 %>
                   <% sc.each_index do |i| %>
                     <% if i==0 %>
                       <td><%= sc[i].login %></td>
                       <td><%= sc[i].full_name %></td>
                       <td><%= sc[i].activated %></td>
                       <td>
                         <%= sc[i].try(:contest_stat).try(:started_at)!=nil ? 'yes' : 'no' %>
               	</td>
                       <td>
                         <%= sc[i].contests.collect {|c| c.name}.join(', ') %>
                       </td>
                     <% else %>
                       <td><%= sc[i][0] %></td>
                       <% total += sc[i][0] %>
                       <% num_passed += 1 if sc[i][1] %>
                     <% end %>
                   <% end %>
                   <td><%= total %></td>
                   <td><%= num_passed %></td>
                 </tr>
                 <% counter += 1 %>
               <% end %>
               </table>

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

r397:94216ffe57fe - Thu, 21 Aug 2014 18:33:19 - 3 files changed: 39 inserted, 6 deleted

Sign in to your account

Commit r397:94216ffe57fe public

Author

r397:94216ffe57fe - Thu, 21 Aug 2014 18:33:19 - 3 files changed: 39 inserted, 6 deleted

Commit `r397:94216ffe57fe` public