cafe-grader-web Commit - r680:4ce0b8696d06

cafe-grader-web

Commit `r680:4ce0b8696d06` public

parent | child

Description:

add remove_all in groups consolidate submissions viewing from grader/task

Commit status:

[Not Reviewed]

References:

java

Diff options:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r680:4ce0b8696d06 - Thu, 14 Sep 2017 14:45:10 - 9 files changed: 35 inserted, 138 deleted

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

@@ -1,25 +1,9
1	class GradersController < ApplicationController	1	class GradersController < ApplicationController
2		2
3	- before_filter :admin_authorization, ~~except~~: [ ~~:submission~~ ]	3	+ before_filter :admin_authorization
4	- before_filter(only: [:submission]) {
5	- #check if authenticated
6	- return false unless authenticate
7	-
8	- #admin always has privileged
9	- if @current_user.admin?
10	- return true
11	- end
12	-
13	- if GraderConfiguration["right.user_view_submission"] and Submission.find(params[:id]).problem.available?
14	- return true
15	- else
16	- unauthorized_redirect
17	- return false
18	- end
19	- }
20		4
21	verify :method => :post, :only => ['clear_all',	5	verify :method => :post, :only => ['clear_all',
22	'start_exam',	6	'start_exam',
23	'start_grading',	7	'start_grading',
24	'stop_all',	8	'stop_all',
25	'clear_terminated'],	9	'clear_terminated'],
@@ -74,31 +58,12
74	end	58	end
75		59
76	def task	60	def task
77	@task = Task.find(params[:id])	61	@task = Task.find(params[:id])
78	end	62	end
79		63
80	- def submission
81	- @submission = Submission.find(params[:id])
82	- formatter = Rouge::Formatters::HTML.new(css_class: 'highlight', line_numbers: true )
83	- lexer = case @submission.language.name
84	- when "c" then Rouge::Lexers::C.new
85	- when "cpp" then Rouge::Lexers::Cpp.new
86	- when "pas" then Rouge::Lexers::Pas.new
87	- when "ruby" then Rouge::Lexers::Ruby.new
88	- when "python" then Rouge::Lexers::Python.new
89	- when "java" then Rouge::Lexers::Java.new
90	- when "php" then Rouge::Lexers::PHP.new
91	- end
92	- @formatted_code = formatter.format(lexer.lex(@submission.source))
93	- @css_style = Rouge::Themes::ThankfulEyes.render(scope: '.highlight')
94	-
95	- user = User.find(session[:user_id])
96	- SubmissionViewLog.create(user_id: session[:user_id],submission_id: @submission.id) unless user.admin?
97	-
98	- end
99		64
100	# various grader controls	65	# various grader controls
101		66
102	def stop	67	def stop
103	grader_proc = GraderProcess.find(params[:id])	68	grader_proc = GraderProcess.find(params[:id])
104	GraderScript.stop_grader(grader_proc.pid)	69	GraderScript.stop_grader(grader_proc.pid)

app/controllers/groups_controller.rb ¶ +12 -2

               class GroupsController < ApplicationController
                 before_action :set_group, only: [:show, :edit, :update, :destroy,
-            -                                    :add_user, :remove_user,
+            +                                    :add_user, :remove_user,:remove_all_user,
-            -                                    :add_problem, :remove_problem,
+            +                                    :add_problem, :remove_problem,:remove_all_problem,
                                                 ]
                 before_action :authenticate, :admin_authorization
                 # GET /groups
                 def index
                   @groups = Group.all
                 def remove_user
                   user = User.find(params[:user_id])
                   @group.users.delete(user)
                   redirect_to group_path(@group), flash: {success: "User #{user.login} was removed from the group #{@group.name}"}
                 end
+            +   def remove_all_user
+            +     @group.users.clear
+            +     redirect_to group_path(@group), alert: 'All users removed'
+            +   end
+            +
+            +   def remove_all_problem
+            +     @group.problems.clear
+            +     redirect_to group_path(@group), alert: 'All problems removed'
+            +   end
+            +
                 def add_user
                   user = User.find(params[:user_id])
                   begin
                     @group.users << user
                     redirect_to group_path(@group), flash: { success: "User #{user.login} was add to the group #{@group.name}"}
                   rescue => e

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

                   send_file_to_user(filename, base_filename)
                 end
                 # this has problem-level access control
                 def download
                   problem = Problem.find(params[:id])
-            -     if !problem or !problem.available or !@user.can_view_problem? problem
+            +     unless @current_user.can_view_problem? problem
                     redirect_to :action => 'index' and return
                   end
                   base_name = params[:file]
                   base_filename = File.basename("#{base_name}.#{params[:ext]}")
                   filename = "#{Problem.download_file_basedir}/#{params[:id]}/#{base_filename}"

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

                   else
                     return []
                   end
                 end
                 def can_view_problem?(problem)
-            -     if not GraderConfiguration.multicontests?
+            +     return true if admin?
-            -       return problem.available
+            +     return available_problems.include? problem
-            -     else
-            -       return problem_in_user_contests? problem
-            -     end
                 end
                 def self.clear_last_login
                   User.update_all(:last_ip => nil)
                 end

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

                 %br/
                 Status:
                 = "#{@task.status_str} (at #{format_short_time(@task.updated_at)})"
                 %br/
                 = "Submission: #{@task.submission_id}"
                 - if @task.submission !=nil
-            -     = link_to '[view submission]', :action => 'submission', :id => @task.submission.id
+            +     = link_to '[view submission]', submission_path( @task.submission.id )
                 %br/
                 = "Submitted at: #{format_short_time(@task.created_at)}"
                 %br/

app/views/groups/show.html.haml ¶ +6 -5

               %br
               = link_to 'Edit', edit_group_path(@group)
               \|
               = link_to 'Back', groups_path
               .row
-            -   %h1 Group details
+            +   .col-md-12
+            +     %h1 Group details
               .row
                 .col-md-6
                   .panel.panel-default
                     .panel-heading
                       .panel-title Users in this group
                     .panel-body
                       %table.table.table-hover
                         %thead
                           %tr
                             %th Login
                             %th Full name
                             %th Remark
-            -               %th
+            +               %th= link_to 'Remove All', remove_all_user_group_path(@group), method: :delete, :data => { :confirm => "Remove ALL USERS from group?" }, class: 'btn btn-danger btn-sm'
                         %tbody
                           - @group.users.each do |user|
                             %tr
                               %td= user.login
                               %td= user.full_name
                               %td= user.remark
-            -                 %td= link_to 'Remove', remove_user_group_path(@group,user), :method => :delete, :data => { :confirm => "Remove #{user.full_name}?" }, class: 'btn btn-danger'
+            +                 %td= link_to 'Remove', remove_user_group_path(@group,user), :method => :delete, :data => { :confirm => "Remove #{user.full_name}?" }, class: 'btn btn-danger btn-sm'
                 .col-md-6
                   .panel.panel-default
                     .panel-heading
                       .panel-title Problems
                     .panel-body
                       %table.table.table-hover
                         %thead
                           %tr
                             %th name
                             %th Full name
                             %th Full score
-            -               %th
+            +               %th= link_to 'Remove All', remove_all_problem_group_path(@group), method: :delete, :data => { :confirm => "Remove ALL PROBLEMS from group?" }, class: 'btn btn-danger btn-sm'
                         %tbody
                           - @group.problems.each do |problem|
                             %tr
                               %td= problem.name
                               %td= problem.full_name
                               %td= problem.full_score
-            -                 %td= link_to 'Remove', remove_problem_group_path(@group,problem), :method => :delete, :data => { :confirm => "Remove #{problem.full_name}?" }, class: 'btn btn-danger'
+            +                 %td= link_to 'Remove', remove_problem_group_path(@group,problem), :method => :delete, :data => { :confirm => "Remove #{problem.full_name}?" }, class: 'btn btn-danger btn-sm'

app/views/problems/index.html.haml ¶ +7 -1

                   = submit_tag "Create"
               %table.table.table-condense.table-hover
                 %thead
                   %th Name
                   %th Full name
                   %th.text-right Full score
+            +     %th
+            +       Submit
+            +       %sup{class: 'text-primary',data: {toggle: 'tooltip'}, title: 'Admin can always submit to any problem' } [?]
                   %th Date added
                   %th.text-center
                     Avail?
                     %sup{class: 'text-primary',data: {toggle: 'tooltip'}, title: 'Let user submits to this problem?' } [?]
                   %th.text-center
                     View Data?
                   - if GraderConfiguration.multicontests?
                     %th Contests
                 - for problem in @problems
                   %tr{:class => "#{(problem.available) ? "success" : "danger"}", :id => "prob-#{problem.id}", :name => "prob-#{problem.id}"}
                     - @problem=problem
                     %td= problem.name #in_place_editor_field :problem, :name, {}, :rows=>1
-            -       %td= problem.full_name #in_place_editor_field :problem, :full_name, {}, :rows=>1
+            +       %td
+            +         = 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
                     %td.text-right= problem.full_score #in_place_editor_field :problem, :full_score, {}, :rows=>1
+            +       %td= link_to "Submit", direct_edit_problem_submissions_path(problem), class: 'btn btn-xs btn-primary'
                     %td= problem.date_added
                     %td= toggle_button(@problem.available?, toggle_problem_path(@problem), "problem-avail-#{@problem.id}")
                     %td= toggle_button(@problem.view_testcase?, toggle_view_testcase_problem_path(@problem), "problem-view-testcase-#{@problem.id}")
                     %td= toggle_button(@problem.test_allowed?, toggle_test_problem_path(@problem), "problem-test-#{@problem.id}")
                     - if GraderConfiguration.multicontests?
                       %td

config/routes.rb ¶ +5

                 end
                 resources :groups do
                   member do
                     post 'add_user', to: 'groups#add_user', as: 'add_user'
                     delete 'remove_user/:user_id', to: 'groups#remove_user', as: 'remove_user'
+            +       delete 'remove_all_user', to: 'groups#remove_all_user', as: 'remove_all_user'
                     post 'add_problem', to: 'groups#add_problem', as: 'add_problem'
                     delete 'remove_problem/:problem_id', to: 'groups#remove_problem', as: 'remove_problem'
+            +       delete 'remove_all_problem', to: 'groups#remove_all_problem', as: 'remove_all_problem'
+            +     end
+            +     collection do
+            +
                   end
                 end
                 resources :testcases, only: [] do
                   member do
                     get 'download_input'

app/views/graders/submission.html.haml removed ¶ -87

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

r680:4ce0b8696d06 - Thu, 14 Sep 2017 14:45:10 - 9 files changed: 35 inserted, 138 deleted

Sign in to your account

Commit r680:4ce0b8696d06 public

Author

r680:4ce0b8696d06 - Thu, 14 Sep 2017 14:45:10 - 9 files changed: 35 inserted, 138 deleted

Commit `r680:4ce0b8696d06` public