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

                   @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

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

                             %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'}})

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

                   = 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'

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'
                 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'
                 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