cafe-grader-web Commit - r425:b86f327e0d75

cafe-grader-web

Commit `r425:b86f327e0d75` public

parent | child

Description:

prepare for better hall of fame

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

r425:b86f327e0d75 - Thu, 11 Sep 2014 17:55:26 - 8 files changed: 45 inserted, 69 deleted

app/controllers/application_controller.rb ¶ +5

               class ApplicationController < ActionController::Base
                 protect_from_forgery
                 SINGLE_USER_MODE_CONF_KEY = 'system.single_user_mode'
                 def admin_authorization
                   return false unless authenticate
                   user = User.find(session[:user_id], :include => ['roles'])
+            +     unless user.admin?
+            +       flash[:notice] = 'You are not authorized to view the page you requested'
                     redirect_to :controller => 'main', :action => 'login' unless user.admin?
+            +       return false
+            +     end
+            +     return true
                 end
                 def authorization_by_roles(allowed_roles)
                   return false unless authenticate
                   user = User.find(session[:user_id])
                   unless user.roles.detect { |role| allowed_roles.member?(role.name) }
                     flash[:notice] = 'You are not authorized to view the page you requested'
                     redirect_to :controller => 'main', :action => 'login'
                     return false
                   end
                 end

app/controllers/graders_controller.rb ¶ +10 -1

               class GradersController < ApplicationController
-            -   before_filter :admin_authorization
+            +   before_filter :admin_authorization, except: [ :submission ]
+            +   before_filter(only: [:submission]) {
+            +     return false unless authenticate
+            +
+            +     if GraderConfiguration["right.user_view_submission"]
+            +       return true;
+            +     end
+            +
+            +     admin_authorization
+            +   }
                 verify :method => :post, :only => ['clear_all',
                                                    'start_exam',
                                                    'start_grading',
                                                    'stop_all',
                                                    'clear_terminated'],
                        :redirect_to => {:action => 'index'}
                 def index
                   redirect_to :action => 'list'
                 end

app/controllers/report_controller.rb ¶ +7 -7

               class ReportController < ApplicationController
                 before_filter :admin_authorization, only: [:login_stat,:submission_stat]
-            -   before_filter { |c|
+            +   before_filter(only: [:problem_hof]) { |c|
                   return false unless authenticate
-            -     if GraderConfiguration["system.hall_of_fame_available"]
+            +     if GraderConfiguration["right.user_view_submission"]
                     return true;
                   end
                   admin_authorization
                 }
                 def login_stat
                   @logins = Array.new
                   date_and_time = '%Y-%m-%d %H:%M'
                   begin
                     @since_time = DateTime.strptime(params[:since_datetime],date_and_time)
                         @by_lang[lang.pretty_name][:length] = {
                           avail: true,
                           user_id: sub.user_id,
                           value: sub.effective_code_length,
                           sub_id: sub.id
                         }
                       end
                     end
                     #process user_id
                     @by_lang.each do |lang,prop|
                       prop.each do |k,v|
-            -           v[:user] = User.exists?(v[:user_id]) ? User.find(v[:user_id]).login : "(NULL)"
+            +           v[:user] = User.exists?(v[:user_id]) ? User.find(v[:user_id]).full_name : "(NULL)"
                       end
                     end
                     #sum into best
                     if @by_lang and @by_lang.first
                       @best = @by_lang.first[1]
                       @by_lang.each do |lang,prop|
-            -           if @best[:runtime][:value] > prop[:runtime][:value]
+            +           if @best[:runtime][:value] >= prop[:runtime][:value]
                           @best[:runtime] = prop[:runtime]
                           @best[:runtime][:lang] = lang
                         end
-            -           if @best[:memory][:value] > prop[:memory][:value]
+            +           if @best[:memory][:value] >= prop[:memory][:value]
                           @best[:memory] = prop[:memory]
                           @best[:memory][:lang] = lang
                         end
-            -           if @best[:length][:value] > prop[:length][:value]
+            +           if @best[:length][:value] >= prop[:length][:value]
                           @best[:length] = prop[:length]
                           @best[:length][:lang] = lang
                         end
-            -           if @best[:first][:value] > prop[:first][:value]
+            +           if @best[:first][:value] >= prop[:first][:value]
                           @best[:first] = prop[:first]
                           @best[:first][:lang] = lang
                         end
                       end
                     end
                   end
                 end
               end

app/helpers/application_helper.rb ¶ +1 -1

                   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
-            -     if GraderConfiguration['system.hall_of_fame_available']
+            +     if GraderConfiguration['right.user_hall_of_fame']
                     append_to menu_items, "[#{I18n.t 'menu.hall_of_fame'}]", 'report', 'problem_hof'
                   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

app/views/graders/submission.html.haml ¶ +1 -1

               %style{type: "text/css"}
                 = @css_style
               %h1= "Submission: #{@submission.id}"
               %p
                 User:
-            -   = "#{@submission.user.login}"
+            +   = "(#{@submission.user.login}) #{@submission.user.full_name}"
                 %br/
                 Problem:
                 - if @submission.problem!=nil
                   = "#{@submission.problem.full_name}"
                 - else
                   = "(n/a)"
                 %br/
                 = "Number: #{@submission.number}"
                 %br/
                 = "Submitted at: #{format_short_time(@submission.submitted_at)}"
                 %br/
                 = "Points : #{@submission.points}/#{@submission.problem.full_score}"

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

               - content_for :header do
                 = javascript_include_tag 'new'
               %script{:type=>"text/javascript"}
                 $(function () {
                 $('#since_datetime').datetimepicker({ showButtonPanel: true, dateFormat: "yy-mm-dd", controlType: "slider"} );
                 $('#until_datetime').datetimepicker({ showButtonPanel: true, dateFormat: "yy-mm-dd", controlType: "slider"} );
                 });
               %h1 Login status
               =render partial: 'report_menu'
               =render partial: 'date_range', locals: {param_text: 'Login date range:', title: 'Query login stat in the range'  }
               %table.info
                 %thead
                   %tr.info-head
                     %th login
                     %th full name
                     %th login count
                     %th earliest
                     %th latest
                 %tbody

app/views/report/problem_hof.html.haml ¶ +13 -56

@@ -1,65 +1,22
		1	+
		2	+ /- if params[:id]
		3	+ / %h1 Tasks Hall of Fame
		4	+ / = link_to('[back to All-Time Hall of Fame]', action: 'problem_hof', id: nil )
		5	+ /- else
		6	+ / %h1 All-Time Hall of Fame
		7	+
		8	+
1	%h1 Tasks Hall of Fame	9	%h1 Tasks Hall of Fame
2	-
3	.task-menu	10	.task-menu
4	Tasks	11	Tasks
5	%br/	12	%br/
6	- @problems.each do \|prob\|	13	- @problems.each do \|prob\|
7	= link_to( "[#{prob.name}]", {id: prob.id})	14	= link_to( "[#{prob.name}]", {id: prob.id})
8		15
9	-	16	+ - unless params[:id]
10	-	17	+ /=render partial: 'all_time_hof'
11	-	18	+ Please select a problem.
12	- %h2 Overall	19	+ - else
13	-	20	+ =render partial: 'task_hof'
14	- - if @best
15	- %b Best Runtime:
16	- = " by #{@best[:runtime][:user]} with #{@best[:runtime][:value] * 1000} milliseconds at submission " \
17	- = link_to("#" + @best[:runtime][:sub_id].to_s, controller: 'graders', action: 'submission', id:@best[:runtime][:sub_id])
18	- %br/
19	- %b Best Memory Usage:
20	- = " by #{@best[:memory][:user]} with #{@best[:memory][:value]} kbytes at submission "
21	- = link_to("#" + @best[:memory][:sub_id].to_s, controller: 'graders' , action: 'submission', id:@best[:memory][:sub_id])
22	- %br/
23	- %b Shortest Code:
24	- = " by #{@best[:length][:user]} with #{@best[:length][:value]} at submission "
25	- = link_to("#" + @best[:length][:sub_id].to_s, controller: 'graders' , action: 'submission', id: @best[:length][:sub_id])
26	- %br/
27	- %b First solver:
28	- = " by #{@best[:first][:user]} is the first solver on #{@best[:first][:value]} at submission "
29	- = link_to("#" + @best[:first][:sub_id].to_s, controller: 'graders' , action: 'submission', id: @best[:first][:sub_id])
30	- %br/
31		21
32		22
33	- %p
34	- This counts only for submission with 100% score <br/>
35	- Right now, java is excluded from memory usage competition. (Because it always uses 2GB memory...)
36	-
37	- %h2 By language
38	-
39	- %table.info
40	- %thead
41	- %tr.info-head
42	- %th Language
43	- %th Best runtime (ms)
44	- %th Best memory (kbytes)
45	- %th Shortest Code (bytes)
46	- %th First solver
47	- %tbody
48	- - @by_lang.each do \|lang,value\|
49	- %tr{class: cycle('info-even','info-odd')}
50	- %td= lang
51	- %td
52	- = "#{value[:runtime][:user]} (#{(value[:runtime][:value] * 1000).to_i} @"
53	- = "#{link_to("#" + value[:runtime][:sub_id].to_s, controller: 'graders' , action: 'submission', id: value[:runtime][:sub_id])} )".html_safe
54	- %td
55	- = "#{value[:memory][:user]} (#{value[:memory][:value]} @"
56	- = "#{link_to("#" + value[:memory][:sub_id].to_s, controller: 'graders' , action: 'submission', id: value[:memory][:sub_id])} )".html_safe
57	- %td
58	- = "#{value[:length][:user]} (#{value[:length][:value]} @"
59	- = "#{link_to("#" + value[:length][:sub_id].to_s, controller: 'graders' , action: 'submission', id: value[:length][:sub_id])} )".html_safe
60	- %td
61	- = "#{value[:first][:user]} (#{value[:first][:value]} @"
62	- = "#{link_to("#" + value[:first][:sub_id].to_s, controller: 'graders' , action: 'submission', id: value[:first][:sub_id])} )".html_safe
63	-
64	- - else
65	- %h3 No submissions

db/seeds.rb ¶ +8 -1

                    :default_value => 'Grader',
                    :description => 'This name will be shown on the user header bar.'
                  },
                  {
                    :key => 'contest.multisites',
                    :value_type => 'boolean',
                    :default_value => 'false',
                    :description => 'If the server is in contest mode and this option is true, on the log in of the admin a menu for site selections is shown.'
                  },
                  {
-            -      :key => 'system.hall_of_fame_available',
+            +      :key => 'right.user_hall_of_fame',
                    :value_type => 'boolean',
                    :default_value => 'false',
                    :description => 'If true, any user can access hall of fame page.'
                  },
+            +    {
+            +      :key => 'right.user_view_submission',
+            +      :value_type => 'boolean',
+            +      :default_value => 'false',
+            +      :description => 'If true, any user can view submissions of every one.'
+            +    },
+            +
                  # If Configuration['system.online_registration'] is true, the
                  # system allows online registration, and will use these
                  # information for sending confirmation emails.
                  {
                    :key => 'system.online_registration.smtp',
                    :value_type => 'string',
                    :default_value => 'smtp.somehost.com'
                  },
                  {
                    :key => 'system.online_registration.from',
                    :value_type => 'string',

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

r425:b86f327e0d75 - Thu, 11 Sep 2014 17:55:26 - 8 files changed: 45 inserted, 69 deleted

Sign in to your account

Commit r425:b86f327e0d75 public

Author

r425:b86f327e0d75 - Thu, 11 Sep 2014 17:55:26 - 8 files changed: 45 inserted, 69 deleted

Commit `r425:b86f327e0d75` public