Description:
fix compiler message
Commit status:
[Not Reviewed]
References:
Diff options:
Comments:
0 Commit comments
0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
Author
-
r742:4c1b44c35caf - - 2 files changed: 15 inserted, 1 deleted
| @@ -1,28 +1,30 | |||
|
|
1 | 1 | - if submission.nil? |
|
|
2 | 2 | = "-" |
|
|
3 | 3 | - else |
|
|
4 | 4 | %strong= "Submission ID:" |
|
|
5 | 5 | = submission.id |
|
|
6 | 6 | %br |
|
|
7 | 7 | - unless submission.graded_at |
|
|
8 | 8 | %strong= t 'main.submitted_at:' |
|
|
9 | 9 | = format_full_time_ago(submission.submitted_at.localtime) |
|
|
10 | 10 | - else |
|
|
11 | 11 | %strong= t 'main.graded_at:' |
|
|
12 | 12 | = format_full_time_ago(submission.graded_at.localtime) |
|
|
13 | 13 | %br |
|
|
14 | 14 | - if GraderConfiguration['ui.show_score'] |
|
|
15 | 15 | %strong=t 'main.score' |
|
|
16 | 16 | = "#{(submission.points*100/submission.problem.full_score).to_i} " |
|
|
17 | 17 | = " [" |
|
|
18 | 18 | %tt |
|
|
19 | 19 | = submission.grader_comment |
|
|
20 | 20 | = "]" |
|
|
21 | 21 | %br |
|
|
22 | 22 | %strong View: |
|
|
23 | 23 | - if GraderConfiguration.show_grading_result |
|
|
24 | 24 | = link_to '[detailed result]', :action => 'result', :id => submission.id |
|
|
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 | |
|
|
25 | + - if submission.graded_at | |
|
|
26 | + %button.btn.btn-info.btn-xs{type: 'button', data: {toggle: 'modal', target: '#compiler'}} | |
|
|
27 | + =t 'main.cmp_msg' | |
|
|
26 | 28 | = link_to "#{t 'main.src_link'}", download_submission_path(submission.id), class: 'btn btn-xs btn-info' |
|
|
27 | 29 | = link_to "#{t 'main.submissions_link'}", problem_submissions_path(problem_id), class: 'btn btn-xs btn-info' |
|
|
28 | 30 | |
| @@ -6,96 +6,108 | |||
|
|
6 | 6 | .row |
|
|
7 | 7 | .col-md-12 |
|
|
8 | 8 | .alert.alert-info |
|
|
9 | 9 | Write your code in the following box, choose language, and click submit button when finished |
|
|
10 | 10 | .row |
|
|
11 | 11 | .col-md-8 |
|
|
12 | 12 | %div#editor{style: 'height: 500px; border-radius: 7px; font-size: 14px;'} |
|
|
13 | 13 | .col-md-4 |
|
|
14 | 14 | - # submission form |
|
|
15 | 15 | = form_tag({controller: :main, :action => 'submit'}, :multipart => true, class: 'form') do |
|
|
16 | 16 | |
|
|
17 | 17 | = hidden_field_tag 'editor_text', @source |
|
|
18 | 18 | = hidden_field_tag 'submission[problem_id]', @problem.id |
|
|
19 | 19 | .form-group |
|
|
20 | 20 | = label_tag "Task:" |
|
|
21 | 21 | = text_field_tag 'asdf', "#{@problem.long_name}", class: 'form-control', disabled: true |
|
|
22 | 22 | .form-group |
|
|
23 | 23 | = label_tag "Description:" |
|
|
24 | 24 | = link_to_description_if_any "[download] <span class='glyphicon glyphicon-file'></span>".html_safe, @problem |
|
|
25 | 25 | |
|
|
26 | 26 | .form-group |
|
|
27 | 27 | = label_tag 'Language:' |
|
|
28 | 28 | = 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" |
|
|
29 | 29 | .form-group |
|
|
30 | 30 | .input-group |
|
|
31 | 31 | %span.input-group-btn |
|
|
32 | 32 | %span.btn.btn-default.btn-file |
|
|
33 | 33 | Browse |
|
|
34 | 34 | = file_field_tag 'load_file' |
|
|
35 | 35 | = text_field_tag '' , nil, {readonly: true, class: 'form-control'} |
|
|
36 | 36 | .form-group |
|
|
37 | 37 | = submit_tag 'Submit', class: 'btn btn-success', id: 'live_submit', |
|
|
38 | 38 | data: {confirm: "Submitting this source code for task #{@problem.long_name}?"} |
|
|
39 | 39 | - # latest submission status |
|
|
40 | 40 | .panel{class: (@submission && @submission.graded_at) ? "panel-info" : "panel-warning"} |
|
|
41 | 41 | .panel-heading |
|
|
42 | 42 | Latest Submission Status |
|
|
43 | 43 | = link_to "Refresh",get_latest_submission_status_submissions_path(@submission.user,@problem), class: "btn btn-default btn-sm", remote: true if @submission |
|
|
44 | 44 | .panel-body |
|
|
45 | 45 | %div#latest_status |
|
|
46 | 46 | - if @submission |
|
|
47 | 47 | = render :partial => 'submission_short', |
|
|
48 | 48 | :locals => {submission: @submission, problem_name: @problem.name, problem_id: @problem.id } |
|
|
49 | 49 | .row |
|
|
50 | 50 | .col-md-12 |
|
|
51 | 51 | %h2 Console |
|
|
52 | 52 | %textarea#console{style: 'height: 100%; width: 100%;background-color:#000;color:#fff;font-family: consolas, monaco, "Droid Sans Mono";',rows: 20} |
|
|
53 | 53 | |
|
|
54 | + .modal.fade#compiler{tabindex: -1,role: 'dialog'} | |
|
|
55 | + .modal-dialog.modal-lg{role:'document'} | |
|
|
56 | + .modal-content | |
|
|
57 | + .modal-header | |
|
|
58 | + %button.close{type: 'button', data: {dismissed: :modal}, aria: {label: 'close'}} | |
|
|
59 | + %span{aria: {hidden: 'true'}, data: {dismiss: 'modal'}} × | |
|
|
60 | + %h4 Compiler message | |
|
|
61 | + .modal-body | |
|
|
62 | + %pre#compiler_msg= @submission.compiler_message | |
|
|
63 | + .modal-footer | |
|
|
64 | + %button.btn.btn-default{type: 'button', data: {dismiss: 'modal'}} Close | |
|
|
65 | + | |
|
|
54 | 66 | :javascript |
|
|
55 | 67 | $(document).ready(function() { |
|
|
56 | 68 | e = ace.edit("editor") |
|
|
57 | 69 | e.setValue($("#text_sourcecode").val()); |
|
|
58 | 70 | e.gotoLine(1); |
|
|
59 | 71 | $("#language_id").trigger('change'); |
|
|
60 | 72 | |
|
|
61 | 73 | $("#load_file").on('change',function(evt) { |
|
|
62 | 74 | var file = evt.target.files[0]; |
|
|
63 | 75 | var reader = new FileReader(); |
|
|
64 | 76 | reader.onload = function(theFile) { |
|
|
65 | 77 | var e = ace.edit("editor") |
|
|
66 | 78 | e.setValue(theFile.target.result); |
|
|
67 | 79 | e.gotoLine(1); |
|
|
68 | 80 | }; |
|
|
69 | 81 | reader.readAsText(file) |
|
|
70 | 82 | }); |
|
|
71 | 83 | |
|
|
72 | 84 | //brython(); |
|
|
73 | 85 | }); |
|
|
74 | 86 | |
|
|
75 | 87 | |
|
|
76 | 88 | |
|
|
77 | 89 | |
|
|
78 | 90 | |
|
|
79 | 91 | %script#__main__{type:'text/python3'} |
|
|
80 | 92 | :plain |
|
|
81 | 93 | import sys |
|
|
82 | 94 | import traceback |
|
|
83 | 95 | |
|
|
84 | 96 | from browser import document as doc |
|
|
85 | 97 | from browser import window, alert, console |
|
|
86 | 98 | |
|
|
87 | 99 | _credits = """ Thanks to CWI, CNRI, BeOpen.com, Zope Corporation and a cast of thousands |
|
|
88 | 100 | for supporting Python development. See www.python.org for more information.""" |
|
|
89 | 101 | |
|
|
90 | 102 | _copyright = """Copyright (c) 2012, Pierre Quentel pierre.quentel@gmail.com |
|
|
91 | 103 | All Rights Reserved. |
|
|
92 | 104 | |
|
|
93 | 105 | Copyright (c) 2001-2013 Python Software Foundation. |
|
|
94 | 106 | All Rights Reserved. |
|
|
95 | 107 | |
|
|
96 | 108 | Copyright (c) 2000 BeOpen.com. |
|
|
97 | 109 | All Rights Reserved. |
|
|
98 | 110 | |
|
|
99 | 111 | Copyright (c) 1995-2001 Corporation for National Research Initiatives. |
|
|
100 | 112 | All Rights Reserved. |
|
|
101 | 113 | |
You need to be logged in to leave comments.
Login now