cafe-grader-web Commit - r747:c37b8f654c0b

cafe-grader-web

Commit `r747:c37b8f654c0b` public

parent | child

Description:

front page OK

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

r747:c37b8f654c0b - Wed, 03 Jul 2019 11:23:09 - 2 files changed: 58 inserted, 15 deleted

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

               %header.navbar.navbar-default.navbar-fixed-top
                 %nav
                   .container-fluid
                     .navbar-header
                       %button.navbar-toggle.collapsed{ data: {toggle: 'collapse', target: '#navbar-collapse'} }
                         %span.sr-only Togggle Navigation
                         %span.icon-bar
                         %span.icon-bar
                         %span.icon-bar
-            -         %a.navbar-brand{href: main_list_path}
+            +         %a.navbar-brand{href: list_main_path}
                         %span.glyphicon.glyphicon-home
                         MAIN
                     .collapse.navbar-collapse#navbar-collapse
                       %ul.nav.navbar-nav
                         / submission
                         - if (@current_user!=nil) and (GraderConfiguration.show_tasks_to?(@current_user))
                           %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", 'submissions', 'index')
                               = add_menu("Self Test", 'test', 'index')
                         / hall of fame
                         - if GraderConfiguration['right.user_hall_of_fame']
                           = add_menu("#{I18n.t 'menu.hall_of_fame'}", 'report', 'problem_hof')
                         / display MODE button (with countdown in contest mode)
                         - if GraderConfiguration.analysis_mode?
                           %div.navbar-btn.btn.btn-success#countdown= "ANALYSIS MODE"
                         - elsif GraderConfiguration.time_limit_mode?
                           - if @current_user.contest_finished?
                             %div.navbar-btn.btn.btn-danger#countdown= "Contest is over"
                           - elsif !@current_user.contest_started?
                             %div.navbar-btn.btn.btn-primary#countdown= (t 'title_bar.contest_not_started')
                               = add_menu( 'User Groups', 'groups', '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')
                           / 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,
                               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', 'list', {title: I18n.t('menu.messages'), data: {toggle: 'tooltip'}})
+            +           = 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')}".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')

config/routes.rb ¶ +56 -13

               CafeGrader::Application.routes.draw do
                 resources :tags
                 get "sources/direct_edit"
                 root :to => 'main#login'
                 #logins
                 match 'login/login',  to: 'login#login', via: [:get,:post]
                 resources :contests
                 resources :sites
+            +   resources :test
+            +
+            +   resources :messages do
+            +     collection do
+            +       get 'console'
+            +     end
+            +   end
+            +
                 resources :announcements do
                   member do
                     get 'toggle','toggle_front'
                   end
                 end
                 resources :problems do
                   member do
                     get 'toggle'
                     get 'toggle_test'
                     get 'toggle_view_testcase'
                     get 'stat'
                   end
                   collection do
                     get 'turn_all_off'
                     get 'turn_all_on'
                     get 'import'
                     get 'manage'
                   end
                 end
                 resources :groups do
                   member do
                     post 'add_user', to: 'groups#add_user', as: 'add_user'
                 resources :grader_configuration, controller: 'configurations'
                 resources :users do
                   member do
                     get 'toggle_activate', 'toggle_enable'
                     get 'stat'
                   end
                 end
                 resources :submissions do
                   member do
                     get 'download'
                     get 'compiler_msg'
                     get 'rejudge'
                   end
                   collection do
                     get 'prob/:problem_id', to: 'submissions#index', as: 'problem'
                     get 'direct_edit_problem/:problem_id(/:user_id)', to: 'submissions#direct_edit_problem', as: 'direct_edit_problem'
                     get 'get_latest_submission_status/:uid/:pid', to: 'submissions#get_latest_submission_status', as: 'get_latest_submission_status'
                   end
                 end
+            +   #user admin
+            +   resources :user_admin do
+            +     collection do
+            +       get 'bulk_manage', as: 'bulk_manage_user_admin'
+            +       delete ':id', to: 'user_admin#destroy', as: 'user_admin_destroy'
+            +       get 'user_stat'
+            +     end
+            +   end
-            -   #main
+            +   resources :contest_management, only: [:index] do
-            -   get "main/list"
+            +     collection do
-            -   get 'main/submission(/:id)', to: 'main#submission', as: 'main_submission'
+            +       get 'user_stat'
+            +       get 'clear_stat'
+            +       get 'clear_all_stat'
+            +     end
+            +   end
+            +
+            +   #get 'user_admin', to: 'user_admin#index'
+            +   #get 'user_admin/bulk_manage', to: 'user_admin#bulk_manage', as: 'bulk_manage_user_admin'
+            +   #post 'user_admin', to: 'user_admin#create'
+            +   #delete 'user_admin/:id', to: 'user_admin#destroy', as: 'user_admin_destroy'
-            -   #user admin
+            +   #singular resource
-            -   get 'user_admin/bulk_manage', to: 'user_admin#bulk_manage', as: 'bulk_manage_user_admin'
+            +   #---- BEWARE ---- singular resource maps to plural controller by default, we can override by provide controller name directly
-            -   post 'user_admin', to: 'user_admin#create'
-            -   delete 'user_admin/:id', to: 'user_admin#destroy', as: 'user_admin_destroy'
                 #report
-            -   get 'report/current_score', to: 'report#current_score', as: 'report_current_score'
+            +   resource :report, only: [], controller: 'report' do
-            -   get 'report/problem_hof(/:id)', to: 'report#problem_hof', as: 'report_problem_hof'
+            +     get 'login'
-            -   get "report/login"
+            +     get 'multiple_login'
-            -   get 'report/max_score', to: 'report#max_score', as: 'report_max_score'
+            +     get 'problem_hof/:id', action: 'problem_hof'
-            -   post 'report/show_max_score', to: 'report#show_max_score', as: 'report_show_max_score'
+            +     get 'current_score'
+            +     get 'max_score'
+            +     post 'show_max_score'
+            +   end
+            +   #get 'report/current_score', to: 'report#current_score', as: 'report_current_score'
+            +   #get 'report/problem_hof(/:id)', to: 'report#problem_hof', as: 'report_problem_hof'
+            +   #get "report/login"
+            +   #get 'report/max_score', to: 'report#max_score', as: 'report_max_score'
+            +   #post 'report/show_max_score', to: 'report#show_max_score', as: 'report_show_max_score'
+            +
+            +   resource :main, only: [], controller: 'main' do
+            +     get 'list'
+            +     get 'submission(/:id)', action: 'submission', as: 'main_submission'
+            +     post 'submit'
+            +     get 'announcements'
+            +     get 'help'
+            +   end
+            +   #main
+            +   #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'
                 get 'heartbeat/:id/edit' => 'heartbeat#edit'
                 #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)', 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

r747:c37b8f654c0b - Wed, 03 Jul 2019 11:23:09 - 2 files changed: 58 inserted, 15 deleted

Sign in to your account

Commit r747:c37b8f654c0b public

Author

r747:c37b8f654c0b - Wed, 03 Jul 2019 11:23:09 - 2 files changed: 58 inserted, 15 deleted

Commit `r747:c37b8f654c0b` public