cafe-grader-web Commit - r696:0b7243db68e6

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

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

                     prepare_list_information
                     render :action => 'list' and return
                   end
-            -     redirect_to :action => 'list'
+            +     redirect_to edit_submission_path(@submission)
                 end
                 def source

app/controllers/report_controller.rb ¶ +2

                   #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)

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

                 end
                 def format_short_time(time)
-            -     now = Time.now.gmtime
+            +     now = Time.zone.now
                   st = ''
-            -     if (time.yday != now.yday) or
+            +     if (time.yday != now.yday) or (time.year != now.year)
-            - 	(time.year != now.year)
+            +       st = time.strftime("%d/%m/%y ")
-            -       st = time.strftime("%x ")
                   end
                   st + time.strftime("%X")
                 end
                   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)

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

                 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 >= ?',since_id) if since_id and since_id > 0
-            -     records = records.where('id <= ?',until_id) if until_id > 0
+            +     records = records.where('id <= ?',until_id) if until_id and until_id > 0
                   records.all
                 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'
+            +     %strong= t 'main.submitted_at:'
-            -     = format_short_time(submission.submitted_at.localtime)
+            +     = format_full_time_ago(submission.submitted_at.localtime)
                 - else
-            -     %strong= t 'main.graded_at'
+            +     %strong= t 'main.graded_at:'
-            -     = "#{format_short_time(submission.graded_at.localtime)} "
+            +     = format_full_time_ago(submission.graded_at.localtime)
                   %br
                   - if GraderConfiguration['ui.show_score']
                     %strong=t 'main.score'
                 %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

                     .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

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

                         = 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

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

                   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

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

               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

                   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,

lib/testdata_importer.rb ¶ +2

                   @problem = problem
                 end
+            +   #Create or update problem according to the parameter
                 def import_from_file(tempfile,
                                      time_limit,
                                      memory_limit,
                   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)

	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