cafe-grader-web Commit - r836:36fbb20457ec

cafe-grader-web

Commit `r836:36fbb20457ec` public

parent | child

Description:

merge

Commit status:

[Not Reviewed]

References:

merge algo

Diff options:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r836:36fbb20457ec - Mon, 21 Sep 2020 14:03:35 - 8 files changed: 94 inserted, 60 deleted

app/controllers/submissions_controller.rb ¶ +2 -3

                 def get_latest_submission_status
                   @problem = Problem.find(params[:pid])
                   @submission = Submission.find_last_by_user_and_problem(params[:uid],params[:pid])
                   respond_to do |format|
                     format.js
                   end
                 end
                 # GET /submissions/:id/rejudge
                 def rejudge
                   @submission = Submission.find(params[:id])
                   @task = @submission.task
                   @task.status_inqueue! if @task
                   respond_to do |format|
                     format.js
                   end
                 end
               protected
                 def submission_authorization
                   #admin always has privileged
-            -     if @current_user.admin?
+            +     return true if @current_user.admin?
-            -       return true
+            +     return true if @current_user.has_role?('TA') && (['show','download'].include? action_name)
-            -     end
                   sub = Submission.find(params[:id])
                   if @current_user.available_problems.include? sub.problem
                     return true if GraderConfiguration["right.user_view_submission"] or sub.user == @current_user
                   end
                   #default to NO
                   unauthorized_redirect
                   return false
                 end
               end

app/controllers/user_admin_controller.rb ¶ +23 -26

                         user.contest_stat.reset_timer_and_save
                       end
                       if params[:notification_emails]
                         send_contest_update_notification_email(user, contest)
                       end
                       note << user.login
                       users << user
                     end
                   end
                   if params[:reset_timer]
                     logout_users(users)
                   end
                   flash[:notice] = 'User(s) ' + note.join(', ') +
                     ' were successfully modified.  '
                   redirect_to :action => 'contest_management'
                 end
                 # admin management
                 def admin
-            -     @admins = User.all.find_all {|user| user.admin? }
+            +     @admins = Role.where(name: 'admin').take.users
+            +     @tas = Role.where(name: 'ta').take.users
                 end
-            -   def grant_admin
+            +   def modify_role
-            -     login = params[:login]
+            +     user = User.find_by_login(params[:login])
-            -     user = User.find_by_login(login)
+            +     role = Role.find_by_name(params[:role])
-            -     if user!=nil
+            +     unless user && role
-            -       admin_role = Role.find_by_name('admin')
+            +       flash[:error] = 'Unknown user or role'
-            -       user.roles << admin_role
+            +       redirect_to admin_user_admin_index_path
-            -     else
+            +       return
-            -       flash[:notice] = 'Unknown user'
-            -     end
-            -     flash[:notice] = 'User added as admins'
-            -     redirect_to :action => 'admin'
                   end
+            +     if params[:commit] == 'Grant'
-            -   def revoke_admin
+            +       #grant role
-            -     user = User.find(params[:id])
+            +       user.roles << role
-            -     if user==nil
+            +       flash[:notice] = "User '#{user.login}' has been granted the role '#{role.name}'"
-            -       flash[:notice] = 'Unknown user'
+            +     else
-            -       redirect_to :action => 'admin' and return
+            +       #revoke role
-            -     elsif user.login == 'root'
+            +       if user.login == 'root' && role.name == 'admin'
-            -       flash[:notice] = 'You cannot revoke admisnistrator permission from root.'
+            +         flash[:error] = 'You cannot revoke admisnistrator permission from root.'
-            -       redirect_to :action => 'admin' and return
+            +         redirect_to admin_user_admin_index_path
+            +         return
                     end
+            +       user.roles.delete(role)
-            -     admin_role = Role.find_by_name('admin')
+            +       flash[:notice] = "The role '#{role.name}' has been revoked from User '#{user.login}'"
-            -     user.roles.delete(admin_role)
+            +     end
-            -     flash[:notice] = 'User permission revoked'
+            +     redirect_to admin_user_admin_index_path
-            -     redirect_to :action => 'admin'
                 end
                 # mass mailing
                 def mass_mailing
                 end
                 def bulk_mail
                   lines = params[:login_list]
                   if !lines or lines.blank?
                     flash[:notice] = 'You entered an empty list.'
                     redirect_to :action => 'mass_mailing' and return
                   end
                   mail_subject = params[:subject]
                   if !mail_subject or mail_subject.blank?
                     flash[:notice] = 'You entered an empty mail subject.'
                     redirect_to :action => 'mass_mailing' and return
                   end
                   mail_body = params[:email_body]
                   if !mail_body or mail_body.blank?
                     flash[:notice] = 'You entered an empty mail body.'
                     redirect_to :action => 'mass_mailing' and return

app/models/user.rb ¶ +5 -1

                   begin
                     http = Net::HTTP.new('www.cas.chula.ac.th', 443)
                     http.use_ssl = true
                     http.verify_mode = OpenSSL::SSL::VERIFY_NONE
                     result = [ ]
                     http.start do |http|
                       req = Net::HTTP::Post.new('/cas/api/?q=studentAuthenticate')
                       #req = Net::HTTP::Post.new('/appX/prod/?q=studentAuthenticate')
                       #req = Net::HTTP::Post.new('/app2/prod/api/?q=studentAuthenticate')
                       param = "appid=#{appid}&appsecret=#{appsecret}&username=#{login}&password=#{password}"
                       resp = http.request(req,param)
                       result = JSON.parse resp.body
                       puts result
                     end
                     return true if result["type"] == "beanStudent"
                   rescue => e
                     puts e
                     puts e.message
                     return false
                   end
                   return false
                 end
                 def admin?
-            -     self.roles.where(name: 'admin').count > 0
+            +     has_role?('admin')
+            +   end
+            +
+            +   def has_role?(role)
+            +     self.roles.where(name: role).count > 0
                 end
                 def email_for_editing
                   if self.email==nil
                     "(unknown)"
                   elsif self.email==''
                     "(blank)"
                   else
                     self.email
                   end
                 end
                 def email_for_editing=(e)
                   self.email=e
                 end
                 def alias_for_editing
                   if self.alias==nil
                     "(unknown)"
                   elsif self.alias==''
                     "(blank)"
                   else
                     self.alias
                   end

app/views/layouts/_header.html.haml ¶ +1 -1

                               = add_menu( 'Announcements', 'announcements', 'index')
                               = add_menu( 'Problems', 'problems', 'index')
                               = add_menu( 'Tags', 'tags', 'index')
                               = add_menu( 'Users', 'user_admin', 'index')
                               = add_menu( 'User Groups', 'groups', 'index')
                               = add_menu( 'Graders', 'graders', 'list')
                               = add_menu( 'Message ', 'messages', 'console')
                               %li.divider{role: 'separator'}
                               = add_menu( 'System config', 'configurations', 'index')
                               %li.divider{role: 'separator'}
                               = add_menu( 'Sites', 'sites', 'index')
                               = add_menu( 'Contests', 'contest_management', 'index')
                           / report
                           %li.dropdown
                             %a.dropdown-toggle{href: '#', data: {toggle:'dropdown'},  aria: {haspopup:"true", expanded:"false"}, role: "button"}
                               Report
                               %span.caret
                             %ul.dropdown-menu
                               = add_menu( 'Current Score', 'report', 'current_score')
                               = add_menu( 'Score Report', 'report', 'max_score')
                               = add_menu( 'Submission Report', 'report', 'submission')
                               = add_menu( 'Login Report', 'report', 'login')
                           - if (ungraded = Submission.where('graded_at is null').where('submitted_at < ?', 1.minutes.ago).count) > 0
                             =link_to "#{ungraded} backlogs!",
-            -                 grader_list_path,
+            +                 graders_list_path,
                               class: 'navbar-btn btn btn-default btn-warning', data: {toggle: 'tooltip'},title: 'Number of ungraded submission'
                       %ul.nav.navbar-nav.navbar-right
                         = add_menu("#{content_tag(:span,'',class: 'glyphicon glyphicon-question-sign')}".html_safe, 'main', 'help')
                         = add_menu("#{content_tag(:span,'',class: 'glyphicon glyphicon-comment')}".html_safe, 'messages', 'index', {title: I18n.t('menu.messages'), data: {toggle: 'tooltip'}})
                         - if GraderConfiguration['system.user_setting_enabled']
                           = add_menu("#{content_tag(:span,'',class: 'glyphicon glyphicon-cog', id: 'user_profile')}".html_safe, 'users', 'profile', {title: I18n.t('menu.settings'), data: {toggle: 'tooltip'}})
                         = add_menu("#{content_tag(:span,'',class: 'glyphicon glyphicon-log-out')} #{@current_user.full_name}".html_safe, 'main', 'login', {title: I18n.t('menu.log_out'), data: {toggle: 'tooltip'}})
               /
                 - if (@current_user!=nil) and (session[:admin])
                   %nav.navbar.navbar-fixed-top.navbar-inverse.secondnavbar
                     .container-fluid
                       .collapse.navbar-collapse
                         %ul.nav.navbar-nav
                           = add_menu( '[Announcements]', 'announcements', 'index')
                           = add_menu( '[Msg console]', 'messages', 'console')
                           = add_menu( '[Problems]', 'problems', 'index')
                           = add_menu( '[Users]', 'user_admin', 'index')
                           = add_menu( '[Results]', 'user_admin', 'user_stat')
                           = add_menu( '[Report]', 'report', 'multiple_login')
                           = add_menu( '[Graders]', 'graders', 'list')
                           = add_menu( '[Contests]', 'contest_management', 'index')
                           = add_menu( '[Sites]', 'sites', 'index')

app/views/problems/stat.html.haml ¶ +16 -12

               :css
                 .fix-width {
                   font-family: "Consolas, Monaco, Droid Sans Mono,Mono, Monospace,Courier"
                 }
               %h1 Problem stat: #{@problem.name}
               %h2 Overview
+            + .row
+            +   .col-md-2
+            +     %strong Name:
+            +   .col-md-10
+            +     = @problem.full_name #in_place_editor_field :problem, :full_name, {}, :rows=>1
+            +     = link_to_description_if_any "[#{t 'main.problem_desc'}] <span class='glyphicon glyphicon-file'></span>".html_safe, @problem
+            + .row
+            +   .col-md-2.strong
+            +     %strong Submissions:
+            +   .col-md-10
+            +     = @submissions.count
+            + .row
+            +   .col-md-2.strong
+            +     %strong Solved/Attemped User
+            +   .col-md-10
+            +     #{@summary[:solve]}/#{@summary[:attempt]} (#{(@summary[:solve]*100.0/@summary[:attempt]).round(1)}%)
-            - %table.info
-            -   %thead
-            -     %tr.info-head
-            -       %th Stat
-            -       %th Value
-            -   %tbody
-            -     %tr{class: cycle('info-even','info-odd')}
-            -       %td Submissions
-            -       %td= @submissions.count
-            -     %tr{class: cycle('info-even','info-odd')}
-            -       %td Solved/Attempted User
-            -       %td #{@summary[:solve]}/#{@summary[:attempt]} (#{(@summary[:solve]*100.0/@summary[:attempt]).round(1)}%)
               %h2 Submissions Count
               = render partial: 'application/bar_graph', locals: { histogram: @histogram }
               %h2 Submissions
               - if @submissions and @submissions.count > 0
                 %table#main_table.table.table-condensed.table-striped
                   %thead
                     %tr
                       %th ID
                       %th Login
                       %th Name
                       %th Submitted_at
                       %th language
                       %th Points
                       %th comment
                       %th IP
                   %tbody
                     - row_odd,curr = true,''
                     - @submissions.each do |sub|
                       - next unless sub.user
                       - row_odd,curr = !row_odd, sub.user if curr != sub.user
                       %tr
                         %td= link_to sub.id, submission_path(sub)

app/views/user_admin/admin.html.haml ¶ +39 -10

@@ -1,25 +1,54
1	- %h1 Administrators	1	+ %h1 Modify Role
2	-	2	+ .row
3	- %table{:class => 'info'}	3	+ .col-md-6
4	- %tr{:class => 'info-head'}	4	+ %h4 Administrators
		5	+ = form_tag modify_role_user_admin_index_path, method: 'post', class: 'form-inline' do
		6	+ = hidden_field_tag :role, 'admin'
		7	+ .form-group
		8	+ = label_tag :login, 'Grant admin role to:'
		9	+ = text_field_tag 'login',nil, class: 'form-control'
		10	+ .form-group
		11	+ = submit_tag 'Grant', class: 'btn btn-primary'
		12	+ %br
		13	+ %table.table.table-condense.table-hover.table-striped.table-bordered
		14	+ %thead{:class => 'info-head'}
5	%th #	15	%th #
6	%th Login	16	%th Login
7	%th Full name	17	%th Full name
8	%th	18	%th
9	- @admins.each_with_index do \|user, i\|	19	- @admins.each_with_index do \|user, i\|
10	%tr	20	%tr
11	%td= i+1	21	%td= i+1
12	%td= user.login	22	%td= user.login
13	%td= user.full_name	23	%td= user.full_name
14	%td	24	%td
15	- if user.login!='root'	25	- if user.login!='root'
16	- = link_to '[revoke]', :action => 'revoke_admin', :id => user.id	26	+ = link_to '[revoke]', modify_role_user_admin_index_path( login: user.login, role: 'admin', commit: 'revoke')
17	- %hr	27	+ .col-md-6
		28	+ %h4 Teacher Assistants (TA)
		29	+ = form_tag modify_role_user_admin_index_path, method: 'post', class: 'form-inline' do
		30	+ = hidden_field_tag :role, 'TA'
		31	+ .form-group
		32	+ = label_tag :login, 'Grant TA role to:'
		33	+ = text_field_tag 'login',nil, class: 'form-control'
		34	+ .form-group
		35	+ = submit_tag 'Grant', class: 'btn btn-primary'
		36	+ %br
		37	+ %table.table.table-condense.table-hover.table-striped.table-bordered
		38	+ %thead{:class => 'info-head'}
		39	+ %th #
		40	+ %th Login
		41	+ %th Full name
		42	+ %th
		43	+ - @tas.each_with_index do \|user, i\|
		44	+ %tr
		45	+ %td= i+1
		46	+ %td= user.login
		47	+ %td= user.full_name
		48	+ %td
		49	+ - if user.login!='root'
		50	+ = link_to '[revoke]', modify_role_user_admin_index_path( login: user.login, role: 'TA', commit: 'revoke')
18		51
19	- = form_tag :action => 'grant_admin' do
20	- = label_tag :login, 'Grant admin permission to:'
21	- = text_field_tag 'login',nil, class: 'input-field'
22	- = submit_tag 'Grant', class: 'btn btn-primary'
23		52
24	%hr/	53	%hr/
25	= link_to '[go back to index]', :action => 'index'	54	= link_to '[go back to index]', :action => 'index'

config/routes.rb ¶ +7 -7

                   member do
                     get 'download'
                     get 'compiler_msg'
                     get 'rejudge'
                   end
                   collection do
                     get 'prob/:problem_id', to: 'submissions#index', as: 'problem'
                     get 'direct_edit_problem/:problem_id(/:user_id)', to: 'submissions#direct_edit_problem', as: 'direct_edit_problem'
                     get 'get_latest_submission_status/:uid/:pid', to: 'submissions#get_latest_submission_status', as: 'get_latest_submission_status'
                   end
                 end
                 #user admin
                 resources :user_admin  do
                   collection do
                     match 'bulk_manage', via: [:get, :post]
                     get 'bulk_mail'
                     get 'user_stat'
                     get 'import'
                     get 'new_list'
                     get 'admin'
                     get 'active'
                     get 'mass_mailing'
-            -       get 'revoke_admin'
+            +       match 'modify_role', via: [:get, :post]
-            -       post 'grant_admin'
                     match 'create_from_list', via: [:get, :post]
                     match 'random_all_passwords', via: [:get, :post]
                   end
                   member do
                     get 'clear_last_ip'
                   end
                 end
                 resources :contest_management, only: [:index] do
                   collection do
                     get 'user_stat'
                     get 'clear_stat'
                     get 'clear_all_stat'
                     get 'change_contest_mode'
                   end
                 end
                 #get 'user_admin', to: 'user_admin#index'
                 #get 'user_admin/bulk_manage', to: 'user_admin#bulk_manage', as: 'bulk_manage_user_admin'
                 #post 'user_admin', to: 'user_admin#create'
                 #delete 'user_admin/:id', to: 'user_admin#destroy', as: 'user_admin_destroy'
                 #singular resource
                 #---- BEWARE ---- singular resource maps to plural controller by default, we can override by provide controller name directly
                 #post 'report/show_max_score', to: 'report#show_max_score', as: 'report_show_max_score'
                 resource :main, only: [], controller: 'main' do
                   get 'login'
                   get 'logout'
                   get 'list'
                   get 'submission(/:id)', action: 'submission', as: 'main_submission'
                   get 'announcements'
                   get 'help'
                   post 'submit'
                 end
                 #main
                 #get "main/list"
                 #get 'main/submission(/:id)', to: 'main#submission', as: 'main_submission'
                 #post 'main/submit', to: 'main#submit'
                 #get 'main/announcements', to: 'main#announcements'
                 #
                 get 'tasks/view/:file.:ext' => 'tasks#view'
                 get 'tasks/download/:id/:file.:ext' => 'tasks#download', as: 'download_task'
                 get 'heartbeat/:id/edit' => 'heartbeat#edit'
                 #grader
-            -   get 'graders/list', to: 'graders#list', as: 'grader_list'
+            +   #get 'graders/list', to: 'graders#list', as: 'grader_list'
                 namespace :graders do
                   get 'task/:id/:type', action: 'task', as: 'task'
                   get 'view/:id/:type', action: 'view', as: 'view'
                   get 'clear/:id', action: 'clear', as: 'clear'
-            -     get 'stop'
-            -     get 'stop_all'
-            -     get 'clear_all'
-            -     get 'clear_terminated'
                   get 'start_grading'
                   get 'start_exam'
+            +     get 'clear_all'
+            +     get 'stop_all'
+            +     get 'stop'
+            +     get 'clear_terminated'
+            +     get 'list'
                 end
                 # See how all your routes lay out with "rake routes"
                 # This is a legacy wild controller route that's not recommended for RESTful applications.
                 # Note: This route will make all actions in every controller accessible via GET requests.
                 # match ':controller(/:action(/:id))(.:format)', via:  [:get, :post]
               end

db/seeds.rb ¶ +1

                                            description='')
                 conf = (GraderConfiguration.find_by_key(key) ||
                         GraderConfiguration.new(:key => key,
                                           :value_type => value_type,
                                           :value => default_value))
                 conf.description = description
                 conf.save
               end
               def seed_config
                 CONFIGURATIONS.each do |conf|
                   if conf.has_key? :description
                     desc = conf[:description]
                   else
                     desc = ''
                   end
                   create_configuration_key(conf[:key],
                                            conf[:value_type],
                                            conf[:default_value],
                                            desc)
                 end
               end
               def seed_roles
+            +   Role.find_or_create_by(name: 'TA')
                 return if Role.find_by_name('admin')
                 role = Role.create(:name => 'admin')
                 user_admin_right = Right.create(:name => 'user_admin',
                                                 :controller => 'user_admin',
                                                 :action => 'all')
                 problem_admin_right = Right.create(:name=> 'problem_admin',
                                                    :controller => 'problems',
                                                    :action => 'all')
                 graders_right = Right.create(:name => 'graders_admin',
                                              :controller => 'graders',
                                              :action => 'all')
                 role.rights << user_admin_right;
                 role.rights << problem_admin_right;
                 role.rights << graders_right;
                 role.save
               end
               def seed_root
                 return if User.find_by_login('root')
                 root = User.new(:login => '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

r836:36fbb20457ec - Mon, 21 Sep 2020 14:03:35 - 8 files changed: 94 inserted, 60 deleted

Sign in to your account

Commit r836:36fbb20457ec public

Author

r836:36fbb20457ec - Mon, 21 Sep 2020 14:03:35 - 8 files changed: 94 inserted, 60 deleted

Commit `r836:36fbb20457ec` public