cafe-grader-web Commit - r696:0b7243db68e6

cafe-grader-web

Commit `r696:0b7243db68e6` public

parent | child

Description:

- after submission, redirecto to edit_submission_path - add more info to submission status - fix bug #20 and #21

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

r696:0b7243db68e6 - Wed, 08 Nov 2017 09:13:45 - 11 files changed: 28 inserted, 18 deleted

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

                   if @submission.valid?(@current_user)
                     if @submission.save == false
                       flash[:notice] = 'Error saving your submission'
                     elsif Task.create(:submission_id => @submission.id,
                                       :status => Task::STATUS_INQUEUE) == false
                       flash[:notice] = 'Error adding your submission to task queue'
                     end
                   else
                     prepare_list_information
                     render :action => 'list' and return
                   end
-            -     redirect_to :action => 'list'
+            +     redirect_to edit_submission_path(@submission)
                 end
                 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'

app/controllers/report_controller.rb ¶ +2

                   end
                   #users
                   @users = if params[:user] == "all" then
                              User.includes(:contests).includes(:contest_stat)
                            else
                              User.includes(:contests).includes(:contest_stat).where(enabled: true)
                            end
                   #set up range from param
                   @since_id = params.fetch(:from_id, 0).to_i
                   @until_id = params.fetch(:to_id, 0).to_i
+            +     @since_id = nil if @since_id == 0
+            +     @until_id = nil if @until_id == 0
                   #calculate the routine
                   @scorearray = calculate_max_score(@problems, @users, @since_id, @until_id)
                   #rencer accordingly
                   if params[:button] == 'download' then
                     csv = gen_csv_from_scorearray(@scorearray,@problems)
                     send_data csv, filename: 'max_score.csv'
                   else
                     #render template: 'user_admin/user_stat'
                     render 'max_score'
                   end

app/helpers/application_helper.rb ¶ +7 -4

                   menu_items.html_safe
                 end
                 def append_to(option,label, controller, action)
                   option << ' ' if option!=''
                   option << link_to_unless_current(label,
                                                    :controller => controller,
                                                    :action => action)
                 end
                 def format_short_time(time)
-            -     now = Time.now.gmtime
+            +     now = Time.zone.now
                   st = ''
-            -     if (time.yday != now.yday) or
-            - 	(time.year != now.year)
-            -       st = time.strftime("%x ")
+            +     if (time.yday != now.yday) or (time.year != now.year)
+            +       st = time.strftime("%d/%m/%y ")
                   end
                   st + time.strftime("%X")
                 end
                 def format_short_duration(duration)
                   return '' if duration==nil
                   d = duration.to_f
                   return Time.at(d).gmtime.strftime("%X")
                 end
+            +   def format_full_time_ago(time)
+            +     st = time_ago_in_words(time) + ' ago (' + format_short_time(time) + ')'
+            +   end
+            +
                 def read_textfile(fname,max_size=2048)
                   begin
                     File.open(fname).read(max_size)
                   rescue
                     nil
                   end
                 end
                 def toggle_button(on,toggle_url,id, option={})
                   btn_size = option[:size] || 'btn-xs'
                   link_to (on ? "Yes" : "No"), toggle_url,
                     {class: "btn btn-block #{btn_size} btn-#{on ? 'success' : 'default'} ajax-toggle",

app/models/submission.rb ¶ +2 -2

                   # need to put in SQL command, maybe there's a better way
                   Submission.includes(:user).find_by_sql("SELECT * FROM submissions " +
               			   "WHERE id = " +
               			   "(SELECT MAX(id) FROM submissions AS subs " +
               			   "WHERE subs.user_id = submissions.user_id AND " +
                                          "problem_id = " + problem_id.to_s + " " +
               			   "GROUP BY user_id) " +
                                          "ORDER BY user_id")
                 end
                 def self.find_in_range_by_user_and_problem(user_id, problem_id,since_id,until_id)
                   records = Submission.where(problem_id: problem_id,user_id: user_id)
-            -     records = records.where('id >= ?',since_id) if since_id > 0
-            -     records = records.where('id <= ?',until_id) if until_id > 0
+            +     records = records.where('id >= ?',since_id) if since_id and since_id > 0
+            +     records = records.where('id <= ?',until_id) if until_id and until_id > 0
                   records.all
                 end
                 def self.find_last_for_all_available_problems(user_id)
                   submissions = Array.new
                   problems = Problem.available_problems
                   problems.each do |problem|
                     sub = Submission.find_last_by_user_and_problem(user_id, problem.id)
                     submissions << sub if sub!=nil
                   end
                   submissions
                 end

app/views/application/_submission_short.html.haml ¶ +8 -6

+            -
-              - if submission.nil?
                 = "-"
               - else
+            +   %strong= "Submission ID:"
+            +   = submission.id
+            +   %br
                 - unless submission.graded_at
-            -     = t 'main.submitted_at'
-            -     = format_short_time(submission.submitted_at.localtime)
+            +     %strong= t 'main.submitted_at:'
+            +     = format_full_time_ago(submission.submitted_at.localtime)
                 - else
-            -     %strong= t 'main.graded_at'
-            -     = "#{format_short_time(submission.graded_at.localtime)} "
+            +     %strong= t 'main.graded_at:'
+            +     = format_full_time_ago(submission.graded_at.localtime)
                   %br
                   - if GraderConfiguration['ui.show_score']
                     %strong=t 'main.score'
                     = "#{(submission.points*100/submission.problem.full_score).to_i} "
                   = " ["
                   %tt
                     = submission.grader_comment
                   = "]"
                   %br
-                  %strong View:
-                  - if GraderConfiguration.show_grading_result
-                    = link_to '[detailed result]', :action => 'result', :id => submission.id
-            -     = link_to "#{t 'main.cmp_msg'}", {:action => 'compiler_msg', :id => submission.id}, {popup: true,class: 'btn btn-xs btn-info'}
+            +   = link_to "#{t 'main.cmp_msg'}", {:action => 'compiler_msg', :id => submission.id}, {popup: true,class: 'btn btn-xs btn-info'} if submission.graded_at
                 = link_to "#{t 'main.src_link'}", download_submission_path(submission.id), class: 'btn btn-xs btn-info'
                 = link_to "#{t 'main.submissions_link'}", problem_submissions_path(problem_id), class: 'btn btn-xs btn-info'

app/views/report/max_score.html.haml ¶ +2 -2

                         = label_tag :from, "Min"
                         = text_field_tag 'from_id', @since_id, class: "form-control"
                       .form-group
                         = label_tag :from, "Max"
                         = text_field_tag 'to_id', @until_id, class: "form-control"
                 .col-md-4
                   .panel.panel-primary
                     .panel-heading
                       Users
                     .panel-body
                       .radio
                         %label
-            -             = radio_button_tag 'users', 'all', true
+            +             = radio_button_tag 'users', 'all', (params[:users] == "all")
                           All users
                       .radio
                         %label
-            -             = radio_button_tag 'users', 'enabled'
+            +             = radio_button_tag 'users', 'enabled', (params[:users] == "enabled")
                           Only enabled users
               .row
                 .col-md-12
                   = button_tag 'Show', class: "btn btn-primary btn-large", value: "show"
                   = button_tag 'Download CSV', class: "btn btn-primary btn-large", value: "download"
               - if @scorearray
                 %h2 Result
                 =render "score_table"

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

                       = hidden_field_tag 'submission[problem_id]', @problem.id
                       .form-group
                         = label_tag "Task:"
                         = text_field_tag 'asdf', "#{@problem.long_name}", class: 'form-control', disabled: true
                       .form-group
                         = label_tag 'Language'
                         = select_tag 'language_id', options_from_collection_for_select(Language.all, 'id', 'pretty_name', @lang_id || Language.find_by_pretty_name("Python").id || Language.first.id), class: 'form-control select', style: "width: 100px"
                       .form-group
                         = submit_tag 'Submit', class: 'btn btn-success', id: 'live_submit',
                           data: {confirm: "Submitting this source code for task #{@problem.long_name}?"}
                     - # latest submission status
-            -       .panel.panel-info
+            +       .panel{class: (@submission && @submission.graded_at) ? "panel-info" : "panel-warning"}
                       .panel-heading
                         Latest Submission Status
                         = link_to "Refresh",get_latest_submission_status_submissions_path(@submission.user,@problem), class: "btn btn-default btn-sm", remote: true if @submission
                       .panel-body
                         - if @submission
                           = render :partial => 'submission_short',
                             :locals => {submission: @submission, problem_name: @problem.name, problem_id: @problem.id }
                 .row
                   .col-md-12
                     %h2 Console
                     %textarea#console{style: 'height: 100%; width: 100%;background-color:#000;color:#fff;font-family: consolas, monaco, "Droid Sans Mono";',rows: 20}

config/application.rb.SAMPLE ¶ +1 -1

                   # ---------------- IMPORTANT ----------------------
                   # If we deploy the app into a subdir name "grader", be sure to do "rake assets:precompile RAILS_RELATIVE_URL_ROOT=/grader"
                   # moreover, using the following line instead also known to works
                   #config.action_controller.relative_url_root = '/grader'
                   #font path
                   config.assets.paths << "#{Rails}/vendor/assets/fonts"
                   config.assets.precompile += ['announcement_refresh.js','effects.js','site_update.js']
                   config.assets.precompile += ['local_jquery.js','tablesorter-theme.cafe.css']
                   %w( announcements submissions configurations contests contest_management graders heartbeat
                       login main messages problems report site sites sources tasks
-            -         test user_admin users ).each do |controller|
+            +         test user_admin users testcases).each do |controller|
                     config.assets.precompile += ["#{controller}.js", "#{controller}.css"]
                   end
                 end
               end

config/initializers/assets.rb ¶ +1 -1

               Rails.application.config.assets.paths << Rails.root.join('node_modules')
               Rails.application.config.assets.paths << Rails.root.join('vendor/assets/fonts')
               # Precompile additional assets.
               # application.js, application.css, and all non-JS/CSS in the app/assets
               # folder are already added.
               # Rails.application.config.assets.precompile += %w( admin.js admin.css )
               Rails.application.config.assets.precompile += ['announcement_refresh.js','effects.js','site_update.js']
               Rails.application.config.assets.precompile += ['local_jquery.js','tablesorter-theme.cafe.css']
               %w( announcements submissions configurations contests contest_management graders heartbeat
                   login main messages problems report site sites sources tasks groups
-            -     test user_admin users tags).each do |controller|
+            +     test user_admin users tags testcases).each do |controller|
                 Rails.application.config.assets.precompile += ["#{controller}.js", "#{controller}.css"]
               end

lib/grader_script.rb ¶ +1

                 end
                 def self.stop_graders(pids)
                   pid_str = (pids.map { |process| process.pid.to_s }).join ' '
                   GraderScript.call_grader "stop #{pid_str}"
                 end
                 def self.start_grader(env)
                   GraderScript.call_grader "#{env} queue --err-log &"
                   GraderScript.call_grader "#{env} test_request -err-log &"
                 end
+            +   #call the import problem script
                 def self.call_import_problem(problem_name,
                                              problem_dir,
                                              time_limit=1,
                                              memory_limit=32,
                                              checker_name='text')
                   if GraderScript.grader_control_enabled?
                     cur_dir = `pwd`.chomp
                     Dir.chdir(GRADER_ROOT_DIR)
                     script_name = File.join(GRADER_ROOT_DIR, "scripts/import_problem")
                     cmd = "#{script_name} #{problem_name} #{problem_dir} #{checker_name}" +
                       " -t #{time_limit} -m #{memory_limit}"

lib/testdata_importer.rb ¶ +2

               require 'tmpdir'
               class TestdataImporter
                 attr :log_msg
                 def initialize(problem)
                   @problem = problem
                 end
+            +   #Create or update problem according to the parameter
-                def import_from_file(tempfile,
-                                     time_limit,
                                      memory_limit,
                                      checker_name='text',
                                      import_to_db=false)
                   dirname = extract(tempfile)
                   return false if not dirname
                   if not import_to_db
                     @log_msg = GraderScript.call_import_problem(@problem.name,
                                                                 dirname,
                                                                 time_limit,
                   return true
                 end
                 protected
                 def self.long_ext(filename)
                   i = filename.index('.')
                   len = filename.length
                   return filename.slice(i..len)
                 end
+            +   # extract an archive file located at +tempfile+ to the +raw_dir+
                 def extract(tempfile)
                   testdata_filename = save_testdata_file(tempfile)
                   ext = TestdataImporter.long_ext(tempfile.original_filename)
                   extract_dir = File.join(GraderScript.raw_dir, @problem.name)
                   if File.exists? extract_dir
                     backup_count = 0
                     begin
                       backup_count += 1
                       backup_dirname = "#{extract_dir}.backup.#{backup_count}"
                     end while File.exists? backup_dirname
                     File.rename(extract_dir, backup_dirname)

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

r696:0b7243db68e6 - Wed, 08 Nov 2017 09:13:45 - 11 files changed: 28 inserted, 18 deleted

Sign in to your account

Commit r696:0b7243db68e6 public

Author

r696:0b7243db68e6 - Wed, 08 Nov 2017 09:13:45 - 11 files changed: 28 inserted, 18 deleted

Commit `r696:0b7243db68e6` public