cafe-grader-web Commit - r588:8bdb0ec71018

cafe-grader-web

Commit `r588:8bdb0ec71018` public

parent | child

Description:

- change user_admin default action from list to index - remove duplicate button in grader control

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

r588:8bdb0ec71018 - Fri, 02 Sep 2016 10:59:35 - 4 files changed: 21 inserted, 23 deleted

app/controllers/graders_controller.rb ¶ +1

               class GradersController < ApplicationController
                 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
                 def list
                   @grader_processes = GraderProcess.find_running_graders
                   @stalled_processes = GraderProcess.find_stalled_process
                   @terminated_processes = GraderProcess.find_terminated_graders
                   @last_task = Task.find(:first,
                                          :order => 'created_at DESC')
                   @last_test_request = TestRequest.find(:first,
                                                         :order => 'created_at DESC')
                   @submission = Submission.order("id desc").limit(20)
+            +     @backlog_submission = Submission.where('graded_at is null')
                 end
                 def clear
                   grader_proc = GraderProcess.find(params[:id])
                   grader_proc.destroy if grader_proc!=nil
                   redirect_to :action => 'list'
                 end
                 def clear_terminated
                   GraderProcess.find_terminated_graders.each do |p|
                     p.destroy
                   end
                   redirect_to :action => 'list'
                 end
                 def clear_all
                   GraderProcess.find(:all).each do |p|
                     p.destroy
                   end
                   redirect_to :action => 'list'
                 end
                 def view
                   if params[:type]=='Task'
                     redirect_to :action => 'task', :id => params[:id]
                   else
                     redirect_to :action => 'test_request', :id => params[:id]
                   end
                 end
                 def test_request
                   @test_request = TestRequest.find(params[:id])
                 end
                 def task
                   @task = Task.find(params[:id])
                 end
                 def submission
                   @submission = Submission.find(params[:id])
                   formatter = Rouge::Formatters::HTML.new(css_class: 'highlight', line_numbers: true )
                   lexer = case @submission.language.name
                     when "c"      then Rouge::Lexers::C.new
                     when "cpp"    then Rouge::Lexers::Cpp.new
                     when "pas"    then Rouge::Lexers::Pas.new
                     when "ruby"   then Rouge::Lexers::Ruby.new
                     when "python" then Rouge::Lexers::Python.new
                     when "java"   then Rouge::Lexers::Java.new

app/controllers/user_admin_controller.rb ¶ -5

               require 'csv'
               class UserAdminController < ApplicationController
                 include MailHelperMethods
                 before_filter :admin_authorization
                 # GETs should be safe (see http://www.w3.org/2001/tag/doc/whenToUseGet.html)
                 verify :method => :post, :only => [ :destroy,
                                                     :create, :create_from_list,
                                                     :update,
                                                     :manage_contest,
                                                     :bulk_mail
                                                   ],
                        :redirect_to => { :action => :list }
                 def index
-            -     list
-            -     render :action => 'list'
-            -   end
-            -   def list
                   @user_count = User.count
                   if params[:page] == 'all'
                     @users = User.all
                     @paginated = false
                   else
                     @users = User.paginate :page => params[:page]
                     @paginated = true
                   end
                   @hidden_columns = ['hashed_password', 'salt', 'created_at', 'updated_at']
                   @contests = Contest.enabled
                 end
                 def active
                   sessions = ActiveRecord::SessionStore::Session.find(:all, :conditions => ["updated_at >= ?", 60.minutes.ago])
                   @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 => 'index'
                   else
                     render :action => 'new'
                   end
                 end
                 def clear_last_ip
                   @user = User.find(params[:id])
                   @user.last_ip = nil
                   @user.save
                   redirect_to action: 'index', page: params[:page]
                 end

app/helpers/application_helper.rb ¶ +1

               # Methods added to this helper will be available to all templates in the application.
               module ApplicationHelper
+            +   #new bootstrap header
                 def navbar_user_header
                   left_menu = ''
                   right_menu = ''
                   user = User.find(session[:user_id])
                   if (user!=nil) and (GraderConfiguration.show_tasks_to?(user))
                     left_menu << add_menu("#{I18n.t 'menu.tasks'}", 'tasks', 'list')
                     left_menu << add_menu("#{I18n.t 'menu.submissions'}", 'main', 'submission')
                     left_menu << add_menu("#{I18n.t 'menu.test'}", 'test', 'index')
                   end
                   if GraderConfiguration['right.user_hall_of_fame']
                     left_menu << add_menu("#{I18n.t 'menu.hall_of_fame'}", 'report', 'problem_hof')
                   end
                   right_menu << add_menu("#{content_tag(:span,'',class: 'glyphicon glyphicon-question-sign')}".html_safe, 'main', 'help')
                   right_menu << add_menu("#{content_tag(:span,'',class: 'glyphicon glyphicon-comment')}".html_safe, 'messages', 'list', {title: I18n.t('menu.messages'), data: {toggle: 'tooltip'}})
                   if GraderConfiguration['system.user_setting_enabled']
                     right_menu << add_menu("#{content_tag(:span,'',class: 'glyphicon glyphicon-cog')}".html_safe, 'users', 'index', {title: I18n.t('menu.settings'), data: {toggle: 'tooltip'}})
                   end
                   right_menu << add_menu("#{content_tag(:span,'',class: 'glyphicon glyphicon-log-out')} #{user.full_name}".html_safe, 'main', 'login', {title: I18n.t('menu.log_out'), data: {toggle: 'tooltip'}})
                   result = content_tag(:ul,left_menu.html_safe,class: 'nav navbar-nav') + content_tag(:ul,right_menu.html_safe,class: 'nav navbar-nav navbar-right')
                 end
                 def add_menu(title, controller, action,html_option = {})
                   link_option = {controller: controller, action: action}
                   html_option[:class] = (html_option[:class] || '') + " active" if current_page?(link_option)
                   content_tag(:li, link_to(title,link_option),html_option)
                 end
                 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', 'multiple_login'
                     append_to menu_items, '[Graders]', 'graders', 'list'
                     append_to menu_items, '[Contests]', 'contest_management', 'index'
                     append_to menu_items, '[Sites]', 'sites', 'index'

app/views/graders/list.html.haml ¶ +19 -18

               - content_for :head do
                 <meta http-equiv ="refresh" content="60"/>
               %h1 Grader information
               %p
                 = link_to 'Refresh', { :action => 'list' }, class: 'btn btn-info'
               .panel.panel-primary
                 .panel-heading
                   Grader control:
                 .panel-body
                   =link_to 'Start Graders in grading env', { action: 'start_grading'}, class: 'btn btn-default', method: 'post'
                   =link_to 'Start Graders in exam env', { action: 'start_exam'}, class: 'btn btn-default', method: 'post'
                   =link_to 'Stop all running Graders', { action: 'stop_all'}, class: 'btn btn-default', method: 'post'
                   =link_to 'Clear all data', { action: 'clear_all'}, class: 'btn btn-default', method: 'post'
-            - .submitbox
-            -   .item
-            -     Grader control:
-            -   .item
-            -     = form_for :clear, :url => {:action => 'start_grading'} do |f|
-            -       = submit_tag 'Start graders in grading env'
-            -   .item
-            -     = form_for :clear, :url => {:action => 'start_exam'} do |f|
-            -       = submit_tag 'Start graders in exam env'
-            -   .item
-            -     = form_for :clear, :url => {:action => 'stop_all'} do |f|
-            -       = submit_tag 'Stop all running graders'
-            -   .item
-            -     = form_for :clear, :url => {:action => 'clear_all'} do |f|
-            -       = submit_tag 'Clear all data'
-            -   %br{:style => 'clear:both'}/
               .row
                 .col-md-6
                   - if @last_task
                     Last task:
                     = link_to "#{@last_task.id}", :action => 'view', :id => @last_task.id, :type => 'Task'
                     %br/
                   - if @last_test_request
                     Last test_request:
                     = link_to "#{@last_test_request.id}", :action => 'view', :id => @last_test_request.id, :type => 'TestRequest'
                   %h2 Current graders
                   = render :partial => 'grader_list', :locals => {:grader_list => @grader_processes}
                   %h2 Stalled graders
                   = render :partial => 'grader_list', :locals => {:grader_list => @stalled_processes}
                   %h2 Terminated graders
                   %p= link_to 'Clear data for terminated graders', { action: 'clear_terminated'}, class: 'btn btn-default', method: 'post'
                   = render :partial => 'grader_list', :locals => {:grader_list => @terminated_processes}
                 .col-md-6
                   %h2 Last 20 submissions
                   %table.table.table-striped.table-condensed
                     %thead
                       %th ID
                       %th User
                       %th Problem
                       %th Submitted
                       %th Graded
                       %th Result
-            -         %th
                     %tbody
                       - @submission.each do |sub|
                         %tr.inactive
                           %td= link_to sub.id, controller: 'graders' ,action: 'submission', id: sub.id
                           %td= sub.try(:user).try(:full_name)
                           %td= sub.try(:problem).try(:full_name)
                           %td= "#{time_ago_in_words(sub.submitted_at)} ago"
                           %td= sub.graded_at ? "#{time_ago_in_words(sub.graded_at)} ago" : " "
                           %td= sub.grader_comment
+            +     %h2 Ungraded submission
+            +     %table.table.table-striped.table-condensed
+            +       %thead
+            +         %th ID
+            +         %th User
+            +         %th Problem
+            +         %th Submitted
+            +         %th Graded
+            +         %th Result
+            +       %tbody
+            +         - @backlog_submission.each do |sub|
+            +           %tr.inactive
+            +             %td= link_to sub.id, controller: 'graders' ,action: 'submission', id: sub.id
+            +             %td= sub.try(:user).try(:full_name)
+            +             %td= sub.try(:problem).try(:full_name)
+            +             %td= "#{time_ago_in_words(sub.submitted_at)} ago"
+            +             %td= sub.graded_at ? "#{time_ago_in_words(sub.graded_at)} ago" : " "
+            +             %td= sub.grader_comment
+            +

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

r588:8bdb0ec71018 - Fri, 02 Sep 2016 10:59:35 - 4 files changed: 21 inserted, 23 deleted

Sign in to your account

Commit r588:8bdb0ec71018 public

Author

r588:8bdb0ec71018 - Fri, 02 Sep 2016 10:59:35 - 4 files changed: 21 inserted, 23 deleted

Commit `r588:8bdb0ec71018` public