cafe-grader-web Commit - r800:e3df93478b03

cafe-grader-web

Commit `r800:e3df93478b03` public

parent | child

Description:

fix link in grader

Commit status:

[Not Reviewed]

References:

algo

Diff options:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r800:e3df93478b03 - Mon, 21 Sep 2020 13:43:04 - 4 files changed: 27 inserted, 22 deleted

app/views/graders/list.html.haml ¶ +4 -4

               - 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 grading env', { action: 'start_grading'}, class: 'btn btn-default'
-            -     =link_to 'Start Graders in exam env', { action: 'start_exam'}, class: 'btn btn-default', method: 'post'
+            +     =link_to 'Start Graders in exam env', { action: 'start_exam'}, class: 'btn btn-default'
-            -     =link_to 'Stop all running Graders', { action: 'stop_all'}, class: 'btn btn-default', method: 'post'
+            +     =link_to 'Stop all running Graders', { action: 'stop_all'}, class: 'btn btn-default'
-            -     =link_to 'Clear all data', { action: 'clear_all'}, class: 'btn btn-default', method: 'post'
+            +     =link_to 'Clear all data', { action: 'clear_all'}, class: 'btn btn-default'
               .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'

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

                               = 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( 'Report', 'report', 'multiple_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

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

config/routes.rb ¶ +6 -5

                 #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

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

r800:e3df93478b03 - Mon, 21 Sep 2020 13:43:04 - 4 files changed: 27 inserted, 22 deleted

Sign in to your account

Commit r800:e3df93478b03 public

Author

r800:e3df93478b03 - Mon, 21 Sep 2020 13:43:04 - 4 files changed: 27 inserted, 22 deleted

Commit `r800:e3df93478b03` public