cafe-grader-web Commit - r644:6431e2ef4265

cafe-grader-web

Commit `r644:6431e2ef4265` public

parent | child

Description:

reorder submission and remove duplicate code for submission

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

r644:6431e2ef4265 - Fri, 10 Mar 2017 01:43:21 - 7 files changed: 8 inserted, 55 deleted

app/controllers/main_controller.rb ¶ -17

                 def source
                   submission = Submission.find(params[:id])
                   if ((submission.user_id == session[:user_id]) and
                       (submission.problem != nil) and
                       (submission.problem.available))
                     send_data(submission.source,
               		{:filename => submission.download_filename,
                                 :type => 'text/plain'})
                   else
                     flash[:notice] = 'Error viewing source'
                     redirect_to :action => 'list'
                   end
                 end
                 def compiler_msg
                   @submission = Submission.find(params[:id])
                   if @submission.user_id == session[:user_id]
                     render :action => 'compiler_msg', :layout => 'empty'
                   else
                     flash[:notice] = 'Error viewing source'
                     redirect_to :action => 'list'
                   end
                 end
-            -   def submission
-            -     @user = User.find(session[:user_id])
-            -     @problems = @user.available_problems
-            -     if params[:id]==nil
-            -       @problem = nil
-            -       @submissions = nil
-            -     else
-            -       @problem = Problem.find_by_id(params[:id])
-            -       if (@problem == nil) or (not @problem.available)
-            -         redirect_to :action => 'list'
-            -         flash[:notice] = 'Error: submissions for that problem are not viewable.'
-            -         return
-            -       end
-            -       @submissions = Submission.find_all_by_user_problem(@user.id, @problem.id)
-            -     end
-            -   end
                 def result
                   if !GraderConfiguration.show_grading_result
                     redirect_to :action => 'list' and return
                   end
                   @user = User.find(session[:user_id])
                   @submission = Submission.find(params[:id])
                   if @submission.user!=@user
                     flash[:notice] = 'You are not allowed to view result of other users.'
                     redirect_to :action => 'list' and return
                   end
                   prepare_grading_result(@submission)
                 end
                 def load_output
                   if !GraderConfiguration.show_grading_result or params[:num]==nil
                     redirect_to :action => 'list' and return
                   end
                   @user = User.find(session[:user_id])
                   @submission = Submission.find(params[:id])
                   if @submission.user!=@user
                     flash[:notice] = 'You are not allowed to view result of other users.'
                     redirect_to :action => 'list' and return
                   end
                   case_num = params[:num].to_i

app/controllers/submissions_controller.rb ¶ +1 -1

               class SubmissionsController < ApplicationController
                 before_filter :authenticate
                 before_filter :submission_authorization, only: [:show, :direct_edit_submission, :download, :edit]
                 # GET /submissions
                 # GET /submissions.json
                 # Show problem selection and user's submission of that problem
                 def index
                   @user = @current_user
                   @problems = @user.available_problems
                   if params[:problem_id]==nil
                     @problem = nil
                     @submissions = nil
                   else
                     @problem = Problem.find_by_id(params[:problem_id])
                     if (@problem == nil) or (not @problem.available)
                       redirect_to main_list_path
                       flash[:notice] = 'Error: submissions for that problem are not viewable.'
                       return
                     end
-            -       @submissions = Submission.find_all_by_user_problem(@user.id, @problem.id)
+            +       @submissions = Submission.find_all_by_user_problem(@user.id, @problem.id).order(id: :desc)
                   end
                 end
                 # GET /submissions/1
                 # GET /submissions/1.json
                 def show
                   @submission = Submission.find(params[:id])
                   #log the viewing
                   user = User.find(session[:user_id])
                   SubmissionViewLog.create(user_id: session[:user_id],submission_id: @submission.id) unless user.admin?
                 end
                 def download
                   @submission = Submission.find(params[:id])
                   send_data(@submission.source, {:filename => @submission.download_filename, :type => 'text/plain'})
                 end
                 def compiler_msg
                   @submission = Submission.find(params[:id])
                   respond_to do |format|
                     format.js
                   end
                 end

app/helpers/application_helper.rb ¶ +1 -1

                   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 = {})
+            +   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'
                     append_to menu_items, '[System config]', 'configurations', 'index'
                     menu_items << "<br/>"
                   end

app/views/application/_submission.html.haml ¶ +2 -2

               %tr
                 %td{:align => "center"}
-            -     = submission_counter+1
+            +     = submission.number
-            -   %td{:align => "center"}
+            +   %td.text-right
                   = link_to "##{submission.id}", submission_path(submission.id)
                 %td
                   = l submission.submitted_at, format: :long
                   = "( #{time_ago_in_words(submission.submitted_at)} ago)"
                 %td
                   = submission.source_filename
                   = " (#{submission.language.pretty_name}) "
                   = link_to('[load]',{:action => 'source', :id => submission.id})
                 %td
                   - if submission.graded_at
                     = "Graded at #{format_short_time(submission.graded_at)}."
                     %br/
                     = "Score: #{(submission.points*100/submission.problem.full_score).to_i} " if GraderConfiguration['ui.show_score']
                     = " ["
                     %tt
                       = submission.grader_comment
                     = "]"
                 %td
                   = render :partial => 'compiler_message', :locals => {:compiler_message => submission.compiler_message }
                 %td
                   = link_to 'Edit', edit_submission_path(submission.id), class: 'btn btn-success'

app/views/layouts/_header.html.haml ¶ +3 -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}
                         %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))
-            -             //= 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("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')
                           - else
                             %div.navbar-btn.btn.btn-primary#countdown asdf
                             :javascript
                               $("#countdown").countdown({until: "+#{@current_user.contest_time_left.to_i}s", layout: 'Time left: {hnn}:{mnn}:{snn}'});
                         / admin section
                         - if (@current_user!=nil) and (session[:admin])
                           / management
                           %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')

app/views/submissions/index.html.haml ¶ +1 -1

               .panel.panel-info
                 .panel-heading
                   Select Problems
                 .panel-body
                   .form-inline
                     = select 'submission',
                       'problem_id',
                       @problems.collect {|p| ["[#{p.name}] #{p.full_name}", problem_submissions_url(p.id)]},
                       { selected: (@problem ? problem_submissions_url(@problem) : -1) },
                       { class: 'select2 form-control'}
                     %button.btn.btn-primary.btn-sm.go-button#problem_go{data: {source: '#submission_problem_id'}} Go
               - if @problem!=nil
                 %h2= "Task: #{@problem.full_name} (#{@problem.name})"
               - if @submissions!=nil
                 - if @submissions.length>0
                   %table.table
                     %thead
                       %th No.
-            -         %th #
+            +         %th.text-right #
                       %th At
                       %th Source
                       %th Result
                       %th{:width => "300px"} Compiler message
                       %th
                     = render :partial => 'submission', :collection => @submissions
                 - else
                   No submission

app/views/main/submission.html.haml removed ¶ -31

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

r644:6431e2ef4265 - Fri, 10 Mar 2017 01:43:21 - 7 files changed: 8 inserted, 55 deleted

Sign in to your account

Commit r644:6431e2ef4265 public

Author

r644:6431e2ef4265 - Fri, 10 Mar 2017 01:43:21 - 7 files changed: 8 inserted, 55 deleted

Commit `r644:6431e2ef4265` public