Description:
- after submission, redirecto to edit_submission_path
- add more info to submission status
- fix bug #20 and #21
Commit status:
[Not Reviewed]
References:
Diff options:
Comments:
0 Commit comments
0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
Author
-
r696:0b7243db68e6 - - 11 files changed: 28 inserted, 18 deleted
| @@ -94,13 +94,13 | |||
|
|
94 | 94 | flash[:notice] = 'Error adding your submission to task queue' |
|
|
95 | 95 | end |
|
|
96 | 96 | else |
|
|
97 | 97 | prepare_list_information |
|
|
98 | 98 | render :action => 'list' and return |
|
|
99 | 99 | end |
|
|
100 | - redirect_to :action => 'list' | |
|
|
100 | + redirect_to edit_submission_path(@submission) | |
|
|
101 | 101 | end |
|
|
102 | 102 | |
|
|
103 | 103 | def source |
|
|
104 | 104 | submission = Submission.find(params[:id]) |
|
|
105 | 105 | if ((submission.user_id == session[:user_id]) and |
|
|
106 | 106 | (submission.problem != nil) and |
| @@ -49,12 +49,14 | |||
|
|
49 | 49 | User.includes(:contests).includes(:contest_stat).where(enabled: true) |
|
|
50 | 50 | end |
|
|
51 | 51 | |
|
|
52 | 52 | #set up range from param |
|
|
53 | 53 | @since_id = params.fetch(:from_id, 0).to_i |
|
|
54 | 54 | @until_id = params.fetch(:to_id, 0).to_i |
|
|
55 | + @since_id = nil if @since_id == 0 | |
|
|
56 | + @until_id = nil if @until_id == 0 | |
|
|
55 | 57 | |
|
|
56 | 58 | #calculate the routine |
|
|
57 | 59 | @scorearray = calculate_max_score(@problems, @users, @since_id, @until_id) |
|
|
58 | 60 | |
|
|
59 | 61 | #rencer accordingly |
|
|
60 | 62 | if params[:button] == 'download' then |
| @@ -82,27 +82,30 | |||
|
|
82 | 82 | option << link_to_unless_current(label, |
|
|
83 | 83 | :controller => controller, |
|
|
84 | 84 | :action => action) |
|
|
85 | 85 | end |
|
|
86 | 86 | |
|
|
87 | 87 | def format_short_time(time) |
|
|
88 |
- now = Time.now |
|
|
|
88 | + now = Time.zone.now | |
|
|
89 | 89 | st = '' |
|
|
90 | - if (time.yday != now.yday) or | |
|
|
91 | - (time.year != now.year) | |
|
|
92 | - st = time.strftime("%x ") | |
|
|
90 | + if (time.yday != now.yday) or (time.year != now.year) | |
|
|
91 | + st = time.strftime("%d/%m/%y ") | |
|
|
93 | 92 | end |
|
|
94 | 93 | st + time.strftime("%X") |
|
|
95 | 94 | end |
|
|
96 | 95 | |
|
|
97 | 96 | def format_short_duration(duration) |
|
|
98 | 97 | return '' if duration==nil |
|
|
99 | 98 | d = duration.to_f |
|
|
100 | 99 | return Time.at(d).gmtime.strftime("%X") |
|
|
101 | 100 | end |
|
|
102 | 101 | |
|
|
102 | + def format_full_time_ago(time) | |
|
|
103 | + st = time_ago_in_words(time) + ' ago (' + format_short_time(time) + ')' | |
|
|
104 | + end | |
|
|
105 | + | |
|
|
103 | 106 | def read_textfile(fname,max_size=2048) |
|
|
104 | 107 | begin |
|
|
105 | 108 | File.open(fname).read(max_size) |
|
|
106 | 109 | rescue |
|
|
107 | 110 | nil |
|
|
108 | 111 | end |
| @@ -31,14 +31,14 | |||
|
|
31 | 31 | "GROUP BY user_id) " + |
|
|
32 | 32 | "ORDER BY user_id") |
|
|
33 | 33 | end |
|
|
34 | 34 | |
|
|
35 | 35 | def self.find_in_range_by_user_and_problem(user_id, problem_id,since_id,until_id) |
|
|
36 | 36 | records = Submission.where(problem_id: problem_id,user_id: user_id) |
|
|
37 | - records = records.where('id >= ?',since_id) if since_id > 0 | |
|
|
38 | - records = records.where('id <= ?',until_id) if until_id > 0 | |
|
|
37 | + records = records.where('id >= ?',since_id) if since_id and since_id > 0 | |
|
|
38 | + records = records.where('id <= ?',until_id) if until_id and until_id > 0 | |
|
|
39 | 39 | records.all |
|
|
40 | 40 | end |
|
|
41 | 41 | |
|
|
42 | 42 | def self.find_last_for_all_available_problems(user_id) |
|
|
43 | 43 | submissions = Array.new |
|
|
44 | 44 | problems = Problem.available_problems |
| @@ -1,26 +1,28 | |||
|
|
1 | - | |
|
|
2 | 1 |
|
|
|
3 | 2 | = "-" |
|
|
4 | 3 | - else |
|
|
4 | + %strong= "Submission ID:" | |
|
|
5 | + = submission.id | |
|
|
6 | + %br | |
|
|
5 | 7 | - unless submission.graded_at |
|
|
6 | - = t 'main.submitted_at' | |
|
|
7 |
- = format_ |
|
|
|
8 | + %strong= t 'main.submitted_at:' | |
|
|
9 | + = format_full_time_ago(submission.submitted_at.localtime) | |
|
|
8 | 10 | - else |
|
|
9 | - %strong= t 'main.graded_at' | |
|
|
10 |
- = |
|
|
|
11 | + %strong= t 'main.graded_at:' | |
|
|
12 | + = format_full_time_ago(submission.graded_at.localtime) | |
|
|
11 | 13 | %br |
|
|
12 | 14 | - if GraderConfiguration['ui.show_score'] |
|
|
13 | 15 | %strong=t 'main.score' |
|
|
14 | 16 | = "#{(submission.points*100/submission.problem.full_score).to_i} " |
|
|
15 | 17 | = " [" |
|
|
16 | 18 | %tt |
|
|
17 | 19 | = submission.grader_comment |
|
|
18 | 20 | = "]" |
|
|
19 | 21 | %br |
|
|
20 | 22 |
|
|
|
21 | 23 |
|
|
|
22 | 24 |
|
|
|
23 |
- |
|
|
|
25 | + = link_to "#{t 'main.cmp_msg'}", {:action => 'compiler_msg', :id => submission.id}, {popup: true,class: 'btn btn-xs btn-info'} if submission.graded_at | |
|
|
24 | 26 | = link_to "#{t 'main.src_link'}", download_submission_path(submission.id), class: 'btn btn-xs btn-info' |
|
|
25 | 27 | = link_to "#{t 'main.submissions_link'}", problem_submissions_path(problem_id), class: 'btn btn-xs btn-info' |
|
|
26 | 28 | |
| @@ -30,17 +30,17 | |||
|
|
30 | 30 | .panel.panel-primary |
|
|
31 | 31 | .panel-heading |
|
|
32 | 32 | Users |
|
|
33 | 33 | .panel-body |
|
|
34 | 34 | .radio |
|
|
35 | 35 | %label |
|
|
36 |
- = radio_button_tag 'users', 'all', |
|
|
|
36 | + = radio_button_tag 'users', 'all', (params[:users] == "all") | |
|
|
37 | 37 | All users |
|
|
38 | 38 | .radio |
|
|
39 | 39 | %label |
|
|
40 | - = radio_button_tag 'users', 'enabled' | |
|
|
40 | + = radio_button_tag 'users', 'enabled', (params[:users] == "enabled") | |
|
|
41 | 41 | Only enabled users |
|
|
42 | 42 | .row |
|
|
43 | 43 | .col-md-12 |
|
|
44 | 44 | = button_tag 'Show', class: "btn btn-primary btn-large", value: "show" |
|
|
45 | 45 | = button_tag 'Download CSV', class: "btn btn-primary btn-large", value: "download" |
|
|
46 | 46 | |
| @@ -24,13 +24,13 | |||
|
|
24 | 24 | = label_tag 'Language' |
|
|
25 | 25 | = 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" |
|
|
26 | 26 | .form-group |
|
|
27 | 27 | = submit_tag 'Submit', class: 'btn btn-success', id: 'live_submit', |
|
|
28 | 28 | data: {confirm: "Submitting this source code for task #{@problem.long_name}?"} |
|
|
29 | 29 | - # latest submission status |
|
|
30 | - .panel.panel-info | |
|
|
30 | + .panel{class: (@submission && @submission.graded_at) ? "panel-info" : "panel-warning"} | |
|
|
31 | 31 | .panel-heading |
|
|
32 | 32 | Latest Submission Status |
|
|
33 | 33 | = link_to "Refresh",get_latest_submission_status_submissions_path(@submission.user,@problem), class: "btn btn-default btn-sm", remote: true if @submission |
|
|
34 | 34 | .panel-body |
|
|
35 | 35 | - if @submission |
|
|
36 | 36 | = render :partial => 'submission_short', |
| @@ -62,11 +62,11 | |||
|
|
62 | 62 | config.assets.paths << "#{Rails}/vendor/assets/fonts" |
|
|
63 | 63 | |
|
|
64 | 64 | config.assets.precompile += ['announcement_refresh.js','effects.js','site_update.js'] |
|
|
65 | 65 | config.assets.precompile += ['local_jquery.js','tablesorter-theme.cafe.css'] |
|
|
66 | 66 | %w( announcements submissions configurations contests contest_management graders heartbeat |
|
|
67 | 67 | login main messages problems report site sites sources tasks |
|
|
68 | - test user_admin users ).each do |controller| | |
|
|
68 | + test user_admin users testcases).each do |controller| | |
|
|
69 | 69 | config.assets.precompile += ["#{controller}.js", "#{controller}.css"] |
|
|
70 | 70 | end |
|
|
71 | 71 | end |
|
|
72 | 72 | end |
| @@ -15,9 +15,9 | |||
|
|
15 | 15 | # Rails.application.config.assets.precompile += %w( admin.js admin.css ) |
|
|
16 | 16 | |
|
|
17 | 17 | Rails.application.config.assets.precompile += ['announcement_refresh.js','effects.js','site_update.js'] |
|
|
18 | 18 | Rails.application.config.assets.precompile += ['local_jquery.js','tablesorter-theme.cafe.css'] |
|
|
19 | 19 | %w( announcements submissions configurations contests contest_management graders heartbeat |
|
|
20 | 20 | login main messages problems report site sites sources tasks groups |
|
|
21 | - test user_admin users tags).each do |controller| | |
|
|
21 | + test user_admin users tags testcases).each do |controller| | |
|
|
22 | 22 | Rails.application.config.assets.precompile += ["#{controller}.js", "#{controller}.css"] |
|
|
23 | 23 | end |
| @@ -30,12 +30,13 | |||
|
|
30 | 30 | |
|
|
31 | 31 | def self.start_grader(env) |
|
|
32 | 32 | GraderScript.call_grader "#{env} queue --err-log &" |
|
|
33 | 33 | GraderScript.call_grader "#{env} test_request -err-log &" |
|
|
34 | 34 | end |
|
|
35 | 35 | |
|
|
36 | + #call the import problem script | |
|
|
36 | 37 | def self.call_import_problem(problem_name, |
|
|
37 | 38 | problem_dir, |
|
|
38 | 39 | time_limit=1, |
|
|
39 | 40 | memory_limit=32, |
|
|
40 | 41 | checker_name='text') |
|
|
41 | 42 | if GraderScript.grader_control_enabled? |
| @@ -5,12 +5,13 | |||
|
|
5 | 5 | attr :log_msg |
|
|
6 | 6 | |
|
|
7 | 7 | def initialize(problem) |
|
|
8 | 8 | @problem = problem |
|
|
9 | 9 | end |
|
|
10 | 10 | |
|
|
11 | + #Create or update problem according to the parameter | |
|
|
11 | 12 |
def import_from_file(tempfile, |
|
|
12 | 13 |
time_limit, |
|
|
13 | 14 | memory_limit, |
|
|
14 | 15 | checker_name='text', |
|
|
15 | 16 | import_to_db=false) |
|
|
16 | 17 | |
| @@ -49,12 +50,13 | |||
|
|
49 | 50 | def self.long_ext(filename) |
|
|
50 | 51 | i = filename.index('.') |
|
|
51 | 52 | len = filename.length |
|
|
52 | 53 | return filename.slice(i..len) |
|
|
53 | 54 | end |
|
|
54 | 55 | |
|
|
56 | + # extract an archive file located at +tempfile+ to the +raw_dir+ | |
|
|
55 | 57 | def extract(tempfile) |
|
|
56 | 58 | testdata_filename = save_testdata_file(tempfile) |
|
|
57 | 59 | ext = TestdataImporter.long_ext(tempfile.original_filename) |
|
|
58 | 60 | |
|
|
59 | 61 | extract_dir = File.join(GraderScript.raw_dir, @problem.name) |
|
|
60 | 62 | if File.exists? extract_dir |
You need to be logged in to leave comments.
Login now