cafe-grader-web Commit - r569:47e6e54a036a

cafe-grader-web

Commit `r569:47e6e54a036a` public

parent | child

Description:

- add problem manage toggle test interface - remove old erb file

Commit status:

[Not Reviewed]

References:

bootstrap

Diff options:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r569:47e6e54a036a - Mon, 11 Jul 2016 02:39:00 - 6 files changed: 28 inserted, 171 deleted

app/controllers/problems_controller.rb ¶ +8

               class ProblemsController < ApplicationController
                 before_filter :authenticate, :authorization
                 in_place_edit_for :problem, :name
                 in_place_edit_for :problem, :full_name
                 in_place_edit_for :problem, :full_score
                 def index
                   @problems = Problem.find(:all, :order => 'date_added DESC')
                 end
                 # GETs should be safe (see http://www.w3.org/2001/tag/doc/whenToUseGet.html)
                 verify :method => :post, :only => [ :destroy,
                                                     :create, :quick_create,
                                                     :do_manage,
                                                     :do_import,
                                                     :update ],
                        :redirect_to => { :action => :index }
                 def show
                   @problem = Problem.find(params[:id])
                 end
                 def new
                   @problem = Problem.new
                   @description = nil
                 end
                 def create
                   @problem = Problem.new(params[:problem])
                   @description = Description.new(params[:description])
                   if @description.body!=''
                     if !@description.save
                       render :action => new and return
                     end
                   else
                     @description = nil
                   end
                   @problem.description = @description
                   if @problem.save
                     flash[:notice] = 'Problem was successfully created.'
                     redirect_to action: :index
                   else
                     render :action => 'new'
                   end
                 end
                 def quick_create
                   @problem = Problem.new(params[:problem])
                   @problem.full_name = @problem.name if @problem.full_name == ''
                   @problem.full_score = 100
                   @problem.available = false
                   @problem.test_allowed = true
                   @problem.output_only = false
                   @problem.date_added = Time.new
                   if @problem.save
                     flash[:notice] = 'Problem was successfully created.'
                     redirect_to action: :index
                   else
                     flash[:notice] = 'Error saving problem'
                   redirect_to action: :index
                   end
                 end
                 def edit
                   @problem = Problem.find(params[:id])
                   @description = @problem.description
                 end
                 def update
                   @problem = Problem.find(params[:id])
                   @description = @problem.description
                   if @description == nil and params[:description][:body]!=''
                     @description = Description.new(params[:description])
                     if !@description.save
                       flash[:notice] = 'Error saving description'
                       render :action => 'edit' and return
                     end
                     @problem.description = @description
                   elsif @description!=nil
                     if !@description.update_attributes(params[:description])
                       flash[:notice] = 'Error saving description'
                       render :action => 'edit' and return
                     end
                   end
                   if params[:file] and params[:file].content_type != 'application/pdf'
                       flash[:notice] = 'Error: Uploaded file is not PDF'
                       render :action => 'edit' and return
                   end
                   if @problem.update_attributes(params[:problem])
                     flash[:notice] = 'Problem was successfully updated.'
                     unless params[:file] == nil or params[:file] == ''
                       flash[:notice] = 'Problem was successfully updated and a new PDF file is uploaded.'
                       out_dirname = "#{Problem.download_file_basedir}/#{@problem.id}"
                       if not FileTest.exists? out_dirname
                         Dir.mkdir out_dirname
                       end
                       out_filename = "#{out_dirname}/#{@problem.name}.pdf"
                       if FileTest.exists? out_filename
                         File.delete out_filename
                       end
                       File.open(out_filename,"wb") do |file|
                         file.write(params[:file].read)
                       end
                       @problem.description_filename = "#{@problem.name}.pdf"
                       @problem.save
                     end
                     redirect_to :action => 'show', :id => @problem
                   else
                     render :action => 'edit'
                   end
                 end
                 def destroy
                   Problem.find(params[:id]).destroy
                     redirect_to action: :index
                 end
                 def toggle
                   @problem = Problem.find(params[:id])
                   @problem.update_attributes(available: !(@problem.available) )
                   respond_to do |format|
                     format.js { }
                   end
                 end
+            +   def toggle_test
+            +     @problem = Problem.find(params[:id])
+            +     @problem.update_attributes(test_allowed: !(@problem.test_allowed?) )
+            +     respond_to do |format|
+            +       format.js { }
+            +     end
+            +   end
+            +
                 def turn_all_off
                   Problem.find(:all,
                                :conditions => "available = 1").each do |problem|
                     problem.available = false
                     problem.save
                   end
                   redirect_to action: :index
                 end
                 def turn_all_on
                   Problem.find(:all,
                                :conditions => "available = 0").each do |problem|
                     problem.available = true
                     problem.save
                   end
                   redirect_to action: :index
                 end
                 def stat
                   @problem = Problem.find(params[:id])
                   unless @problem.available or session[:admin]
                     redirect_to :controller => 'main', :action => 'list'
                     return
                   end
                   @submissions = Submission.includes(:user).where(problem_id: params[:id]).order(:user_id,:id)
                   #stat summary
                   range =65
                   @histogram = { data: Array.new(range,0), summary: {} }
                   user = Hash.new(0)
                   @submissions.find_each do |sub|
                     d = (DateTime.now.in_time_zone - sub.submitted_at) / 24 / 60 / 60
                     @histogram[:data][d.to_i] += 1 if d < range
                     user[sub.user_id] = [user[sub.user_id], ((sub.try(:points) || 0) >= @problem.full_score) ? 1 : 0].max
                   end
                   @histogram[:summary][:max] = [@histogram[:data].max,1].max
                   @summary = { attempt: user.count, solve: 0 }
                   user.each_value { |v| @summary[:solve] += 1 if v == 1 }
                 end
                 def manage
                   @problems = Problem.find(:all, :order => 'date_added DESC')
                 end
                 def do_manage
                   if params.has_key? 'change_date_added'
                     change_date_added
                   elsif params.has_key? 'add_to_contest'
                     add_to_contest
                   elsif params.has_key? 'enable_problem'
                     set_available(true)
                   elsif params.has_key? 'disable_problem'
                     set_available(false)
                   end
                   redirect_to :action => 'manage'
                 end
                 def import
                   @allow_test_pair_import = allow_test_pair_import?
                 end
                 def do_import
                   old_problem = Problem.find_by_name(params[:name])
                   if !allow_test_pair_import? and params.has_key? :import_to_db
                     params.delete :import_to_db
                   end
                   @problem, import_log = Problem.create_from_import_form_params(params,
                                                                                 old_problem)
                   if !@problem.errors.empty?
                     render :action => 'import' and return
                   end
                   if old_problem!=nil
                     flash[:notice] = "The test data has been replaced for problem #{@problem.name}"
                   end
                   @log = import_log
                 end
                 def remove_contest
                   problem = Problem.find(params[:id])
                   contest = Contest.find(params[:contest_id])
                   if problem!=nil and contest!=nil
                     problem.contests.delete(contest)
                   end
                   redirect_to :action => 'manage'
                 end
                 ##################################
                 protected
                 def allow_test_pair_import?
                   if defined? ALLOW_TEST_PAIR_IMPORT
                     return ALLOW_TEST_PAIR_IMPORT
                   else
                     return false
                   end
                 end
                 def change_date_added
                   problems = get_problems_from_params
                   year = params[:date_added][:year].to_i
                   month = params[:date_added][:month].to_i
                   day = params[:date_added][:day].to_i
                   date = Date.new(year,month,day)
                   problems.each do |p|
                     p.date_added = date
                     p.save
                   end
                 end
                 def add_to_contest
                   problems = get_problems_from_params
                   contest = Contest.find(params[:contest][:id])
                   if contest!=nil and contest.enabled
                     problems.each do |p|
                       p.contests << contest
                     end
                   end
                 end
                 def set_available(avail)
                   problems = get_problems_from_params
                   problems.each do |p|
                     p.available = avail
                     p.save
                   end
                 end
                 def get_problems_from_params
                   problems = []
                   params.keys.each do |k|
                     if k.index('prob-')==0
                       name, id, order = k.split('-')
                       problems << Problem.find(id)
                     end
                   end
                   problems
                 end
                 def get_problems_stat
                 end
               end

app/views/layouts/_header.html.haml ¶ +6 -3

               %header.navbar.navbar-default.navbar-fixed-top
                 %nav
                   .container-fluid
                     .navbar-header
                       %a.navbar-brand{href: main_list_path}
                         %span.glyphicon.glyphicon-home
                         MAIN
                     .collapse.navbar-collapse
                       %ul.nav.navbar-nav
                         - if (@current_user!=nil) and (GraderConfiguration.show_tasks_to?(@current_user))
                           //= add_menu("#{I18n.t 'menu.tasks'}", 'tasks', 'list')
                           %li.dropdown
                             %a.dropdown-toggle{href: '#', data: {toggle:'dropdown'},  aria: {haspopup:"true", expanded:"false"}, role: "button"}
                               = "#{I18n.t 'menu.submissions'}"
                               %span.caret
                             %ul.dropdown-menu
                               = add_menu("View", 'main', 'submission')
                               = add_menu("Self Test", 'test', 'index')
                         - if GraderConfiguration['right.user_hall_of_fame']
                           = add_menu("#{I18n.t 'menu.hall_of_fame'}", 'report', 'problem_hof')
                         - if (@current_user!=nil) and (session[:admin])
                           %li.dropdown
                             %a.dropdown-toggle{href: '#', data: {toggle:'dropdown'},  aria: {haspopup:"true", expanded:"false"}, role: "button"}
                               Manage
                               %span.caret
                             %ul.dropdown-menu
                               = add_menu( 'Announcements', 'announcements', 'index')
                               = add_menu( 'Problems', 'problems', 'index')
                               = add_menu( 'Users', 'user_admin', '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')
                           %li.dropdown
                             %a.dropdown-toggle{href: '#', data: {toggle:'dropdown'},  aria: {haspopup:"true", expanded:"false"}, role: "button"}
                               Report
                               %span.caret
                             %ul.dropdown-menu
                               = add_menu( 'Results', 'user_admin', 'user_stat')
                               = add_menu( 'Report', 'report', 'multiple_login')
-            -             %button.navbar-btn.btn.btn-default.btn-warning
+            +             - if (ungraded = Submission.where('graded_at is null').where('submitted_at < ?', 1.minutes.ago).count) > 0
-            -               hahaha
+            +               =link_to "#{ungraded} backlogs!",
+            +                 grader_list_path,
+            +                 class: 'navbar-btn btn btn-default btn-warning', data: {toggle: 'tooltip'},title: 'Number of ungraded submission'
+            +             =link_to 'Contest Mode, time remain: 00:20:33',grader_list_path,
+            +               class: 'navbar-btn btn btn-primary'
                       %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', 'list', {title: I18n.t('menu.messages'), data: {toggle: 'tooltip'}})
                         - if GraderConfiguration['system.user_setting_enabled']
                           = add_menu("#{content_tag(:span,'',class: 'glyphicon glyphicon-cog')}".html_safe, 'users', 'index', {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')
                           = add_menu( '[System config]', 'configurations', 'index')

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

               - content_for :head do
                 = stylesheet_link_tag 'problems'
               %h1 Listing problems
               %p
                 = link_to 'New problem', new_problem_path, class: 'btn btn-default btn-sm'
                 = link_to 'Manage problems', { action: 'manage'}, class: 'btn btn-default btn-sm'
                 = link_to 'Import problems', {:action => 'import'}, class: 'btn btn-default btn-sm'
                 = link_to 'Turn off all problems', {:action => 'turn_all_off'}, class: 'btn btn-default btn-sm'
                 = link_to 'Turn on all problems', {:action => 'turn_all_on'}, class: 'btn btn-default btn-sm'
               .submitbox
                 = form_tag :action => 'quick_create' do
                   %b Quick New:
                   %label{:for => "problem_name"} Name
                   = text_field 'problem', 'name'
                   |
                   %label{:for => "problem_full_name"} Full name
                   = text_field 'problem', 'full_name'
                   = submit_tag "Create"
               %table.table.table-condense.table-hover
                 %thead
                   %th Name
                   %th Full name
-            -     %th Full score
+            +     %th.text-right Full score
                   %th Date added
-            -     %th Avail?
+            +     %th.text-center
-            -     %th Test?
+            +       Avail?
+            +       %sup{class: 'text-primary',data: {toggle: 'tooltip'}, title: 'Let user submits to this problem?' } [?]
+            +     %th.text-center
+            +       Test?
+            +       %sup{class: 'text-primary',data: {toggle: 'tooltip'}, title: 'Let user uses test interface on this problem?' } [?]
                   - 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= in_place_editor_field :problem, :name, {}, :rows=>1
                     %td= in_place_editor_field :problem, :full_name, {}, :rows=>1
-            -       %td= in_place_editor_field :problem, :full_score, {}, :rows=>1
+            +       %td.text-right= in_place_editor_field :problem, :full_score, {}, :rows=>1
                     %td= problem.date_added
-            -       %td= toggle_button(@problem.available?, url_for(controller: :problems, action: :toggle, id: @problem), "problem-avail-#{@problem.id}")
+            +       %td= toggle_button(@problem.available?, toggle_problem_url(@problem), "problem-avail-#{@problem.id}")
-            -       //%td{}= link_to (@problem.available? ? "Yes" : "No"), url_for(controller: :problems, action: :toggle, id: @problem), { class: "btn btn-block btn-sm btn-#{(@problem.available? ? 'success' : 'default')} ajax-toggle", id: "problem-avail-#{@problem.id}", data: {remote: true, method: 'post' } }
+            +       %td= toggle_button(@problem.test_allowed?, toggle_test_problem_url(@problem), "problem-test-#{@problem.id}")
-            -       %td= problem.test_allowed
                     - if GraderConfiguration.multicontests?
                       %td
                         = problem.contests.collect { |c| c.name }.join(', ')
                     %td= link_to 'Stat', {:action => 'stat', :id => problem.id}, class: 'btn btn-info btn-xs btn-block'
                     %td= link_to 'Show', {:action => 'show', :id => problem}, class: 'btn btn-info btn-xs btn-block'
                     %td= link_to 'Edit', {:action => 'edit', :id => problem}, class: 'btn btn-info btn-xs btn-block'
                     %td= link_to 'Destroy', { :action => 'destroy', :id => problem }, :confirm => 'Are you sure?', :method => :post, class: 'btn btn-danger btn-xs btn-block'
               %br/
               = link_to '[New problem]', :action => 'new'

config/routes.rb ¶ +4 -6

               CafeGrader::Application.routes.draw do
                 get "sources/direct_edit"
                 root :to => 'main#login'
                 resources :contests
                 resources :sites
                 resources :announcements do
                   member do
                     get 'toggle','toggle_front'
                   end
                 end
                 resources :problems do
                   member do
                     get 'toggle'
+            +       get 'toggle_test'
                   end
                   collection do
                     get 'turn_all_off'
                     get 'turn_all_on'
                     get 'import'
                     get 'manage'
                   end
                 end
                 resources :grader_configuration, controller: 'configurations'
                 resources :users do
                   member do
                     get 'toggle_activate', 'toggle_enable'
                   end
                 end
-            -   #resources :sources do
-            -   #  collection do
-            -   #  end
-            -   #end
                 get 'sources/direct_edit/:pid', to: 'sources#direct_edit', as: 'direct_edit'
                 get 'sources/direct_edit_submission/:sid', to: 'sources#direct_edit_submission', as: 'direct_edit_submission'
                 match 'tasks/view/:file.:ext' => 'tasks#view'
                 match 'tasks/download/:id/:file.:ext' => 'tasks#download'
                 match 'heartbeat/:id/edit' => 'heartbeat#edit'
                 #main
                 get "main/list"
                 get 'main/submission(/:id)', to: 'main#submission', as: 'main_submission'
                 #report
                 get 'report/problem_hof(/:id)', to: 'report#problem_hof', as: 'report_problem_hof'
                 get "report/login"
+            +   #grader
+            +   get 'graders/list', to: 'graders#list', as: 'grader_list'
+            +
                 # 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)'
               end

app/views/problems/list.html.erb removed ¶ -66

deleted file

app/views/user_admin/list.html.erb removed ¶ -89

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

r569:47e6e54a036a - Mon, 11 Jul 2016 02:39:00 - 6 files changed: 28 inserted, 171 deleted

Sign in to your account

Commit r569:47e6e54a036a public

Author

r569:47e6e54a036a - Mon, 11 Jul 2016 02:39:00 - 6 files changed: 28 inserted, 171 deleted

Commit `r569:47e6e54a036a` public