cafe-grader-web Commit - r411:05396b121058

cafe-grader-web

Commit `r411:05396b121058` public

parent | child

Description:

merge max score from branch algo

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

r411:05396b121058 - Thu, 28 Aug 2014 10:42:54 - 9 files changed: 124 inserted, 8 deleted

app/views/report/_date_range.html.haml created 644 ¶ +18

@@ -0,0 +1,18
	1	+
	2	+ = form_tag({action: :user_stat_max }) do
	3	+ .submitbox
	4	+ %table
	5	+ %tr
	6	+ %td{colspan: 6, style: 'font-weight: bold'} Query maximum score in submission range
	7	+ %tr
	8	+ %td{style: 'width: 120px; font-weight: bold'} Submission ID:
	9	+ %td{align: 'right'} From date:
	10	+ %td= text_field_tag 'start_date', params[:start_date]
	11	+ %td Time:
	12	+ %td= text_field_tag 'start_time', params[:start_time], style: 'width:40px'
	13	+ %td= submit_tag 'query'
	14	+ %tr
	15	+ %td
	16	+ %td{colspan: 5} Leave blank date and/or time for no condition
	17	+ %br/
	18	+

app/views/user_admin/_submission_range.html.haml created 644 ¶ +18

@@ -0,0 +1,18
	1	+
	2	+
	3	+ = form_tag({action: :user_stat_max }) do
	4	+ .submitbox
	5	+ %table
	6	+ %tr
	7	+ %td{colspan: 6, style: 'font-weight: bold'} Query maximum score in submission range
	8	+ %tr
	9	+ %td{style: 'width: 120px; font-weight: bold'} Submission ID:
	10	+ %td{align: 'right'} From:
	11	+ %td= text_field_tag 'since_id', params[:since_id], style: 'width:40px'
	12	+ %td To:
	13	+ %td= text_field_tag 'until_id', params[:until_id], style: 'width:40px'
	14	+ %td= submit_tag 'query'
	15	+ %tr
	16	+ %td
	17	+ %td{colspan: 5} Leave blank for uncondition
	18	+

app/views/user_admin/user_stat_max.html.haml created 644 ¶ +44

@@ -0,0 +1,44
	1	+ %h1 User grading results
	2	+ %h2 Show max scores in submission range
	3	+
	4	+ - if @problem and @problem.errors
	5	+ =error_messages_for 'problem'
	6	+
	7	+ = render partial: 'submission_range'
	8	+
	9	+ - if @log
	10	+ %h3 Import log
	11	+ %pre.import-log
	12	+ = @log
	13	+
	14	+ %p= link_to '[Show only latest submissions]', controller: :user_admin, action: :user_stat
	15	+
	16	+ %table.info
	17	+ %thead
	18	+ %tr.info-head
	19	+ %th User
	20	+ %th Name
	21	+ %th Activated?
	22	+ %th Logged in
	23	+ %th Contest(s)
	24	+ - @problems.each do \|p\|
	25	+ %th= p.name
	26	+ %th Total
	27	+ %th Passed
	28	+ %tbody
	29	+ - @scorearray.each do \|sc\|
	30	+ %tr{class: cycle('info-even','info-odd')}
	31	+ - total,num_passed = 0,0
	32	+ - sc.each_index do \|i\|
	33	+ - if i == 0
	34	+ %td= sc[i].login
	35	+ %td= sc[i].full_name
	36	+ %td= sc[i].activated
	37	+ %td= sc[i].try(:contest_stat).try(:started_at)!=nil ? 'yes' : 'no'
	38	+ %td= sc[i].contests.collect {\|c\| c.name}.join(', ')
	39	+ - else
	40	+ %td= sc[i][0]
	41	+ - total += sc[i][0]
	42	+ - num_passed += 1 if sc[i][1]
	43	+ %td= total
	44	+ %td= num_passed

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

                       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]

app/helpers/application_helper.rb ¶ +1

               # Methods added to this helper will be available to all templates in the application.
               module ApplicationHelper
                 def user_header
                   menu_items = ''
                   user = User.find(session[:user_id])
                   if (user!=nil) and (session[:admin])
                     # admin menu
                     menu_items << "<b>Administrative task:</b> "
                     append_to menu_items, '[Announcements]', 'announcements', 'index'
                     append_to menu_items, '[Msg console]', 'messages', 'console'
                     append_to menu_items, '[Problems]', 'problems', 'index'
                     append_to menu_items, '[Users]', 'user_admin', 'index'
                     append_to menu_items, '[Results]', 'user_admin', 'user_stat'
+            +       append_to menu_items, '[Report]', 'report', 'login_stat'
                     append_to menu_items, '[Graders]', 'graders', 'list'
                     append_to menu_items, '[Contests]', 'contest_management', 'index'
                     append_to menu_items, '[Sites]', 'sites', 'index'
                     append_to menu_items, '[System config]', 'configurations', 'index'
                     menu_items << "<br/>"
                   end
                   # main page
                   append_to menu_items, "[#{I18n.t 'menu.main'}]", 'main', 'list'
                   append_to menu_items, "[#{I18n.t 'menu.messages'}]", 'messages', 'list'
                   if (user!=nil) and (GraderConfiguration.show_tasks_to?(user))
                     append_to menu_items, "[#{I18n.t 'menu.tasks'}]", 'tasks', 'list'
                     append_to menu_items, "[#{I18n.t 'menu.submissions'}]", 'main', 'submission'
                     append_to menu_items, "[#{I18n.t 'menu.test'}]", 'test', 'index'
                   end
                   append_to menu_items, "[#{I18n.t 'menu.help'}]", 'main', 'help'
                   if GraderConfiguration['system.user_setting_enabled']
                     append_to menu_items, "[#{I18n.t 'menu.settings'}]", 'users', 'index'
                   end
                   append_to menu_items, "[#{I18n.t 'menu.log_out'}]", 'main', 'login'
                   menu_items.html_safe
                 end
                 def append_to(option,label, controller, action)
                   option << ' ' if option!=''
                   option << link_to_unless_current(label,
                                                    :controller => controller,
                                                    :action => action)
                 end
                 def format_short_time(time)
                   now = Time.now.gmtime
                   st = ''
                   if (time.yday != now.yday) or
               	(time.year != now.year)
                     st = time.strftime("%x ")
                   end
                   st + time.strftime("%X")
                 end
                 def format_short_duration(duration)
                   return '' if duration==nil
                   d = duration.to_f
                   return Time.at(d).gmtime.strftime("%X")
                 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

app/views/report/login_stat.html.haml ¶ +2

               %h1 Login status
               .task-menu
                 Reports
                 %br/
                 = link_to '[Submission]', :action => 'submit_stat'
                 = link_to '[Login]', :action => 'login_stat'
+            + =render partial: 'date_range'
+            +
               %table.info
                 %thead
                   %tr.info-head
                     %th login
                     %th full name
                     %th login count
                     %th earliest
                     %th latest
                 %tbody
                   - @logins.each do |l|
                     %tr{class: cycle('info-even','info-odd')}
                       %td= l[:login]
                       %td= l[:full_name]
                       %td= l[:count]
                       %td= l[:min]
                       %td= l[:max]

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>

config/routes.rb ¶ +2 -2

               CafeGrader::Application.routes.draw do
                 get "report/login"
-            -   get "logins/list"
                 resources :contests
                 resources :announcements
                 resources :sites
+            +   resources :problems, only: [:show]
+            +
                 # The priority is based upon order of creation:
                 # first created -> highest priority.
                 # Sample of regular route:
                 #   match 'products/:id' => 'catalog#view'
                 # Keep in mind you can assign values other than :controller and :action
                 # Sample of named route:
                 #   match 'products/:id/purchase' => 'catalog#purchase', :as => :purchase
                 # This route can be invoked with purchase_url(:id => product.id)
                 # Sample resource route (maps HTTP verbs to controller actions automatically):
                 #   resources :products
                 # Sample resource route with options:
                 #   resources :products do
                 #     member do
                 #       get 'short'
                 #       post 'toggle'
                 #     end
                 #
                 #     collection do
                 #       get 'sold'
                 #     end
                 #   end
                 # Sample resource route with sub-resources:
                 #   resources :products do
                 #     resources :comments, :sales
                 #     resource :seller
                 #   end
                 # Sample resource route with more complex sub-resources
                 #   resources :products do
                 #     resources :comments
                 #     resources :sales do
                 #       get 'recent', :on => :collection
                 #     end
                 #   end
                 # Sample resource route within a namespace:
                 #   namespace :admin do
                 #     # Directs /admin/products/* to Admin::ProductsController
                 #     # (app/controllers/admin/products_controller.rb)
                 #     resources :products
                 #   end
                 # You can have the root of your site routed with "root"

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

r411:05396b121058 - Thu, 28 Aug 2014 10:42:54 - 9 files changed: 124 inserted, 8 deleted

Sign in to your account

Commit r411:05396b121058 public

Author

r411:05396b121058 - Thu, 28 Aug 2014 10:42:54 - 9 files changed: 124 inserted, 8 deleted

Commit `r411:05396b121058` public