cafe-grader-web Commit - r742:4c1b44c35caf

cafe-grader-web

Commit `r742:4c1b44c35caf` public

parent | child

Description:

fix compiler message

Commit status:

[Not Reviewed]

References:

algo

Diff options:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r742:4c1b44c35caf - Thu, 23 May 2019 09:05:06 - 2 files changed: 15 inserted, 1 deleted

app/views/application/_submission_short.html.haml ¶ +3 -1

               - if submission.nil?
                 = "-"
               - else
                 %strong= "Submission ID:"
                 = submission.id
                 %br
                 - unless submission.graded_at
                   %strong= t 'main.submitted_at:'
                   = format_full_time_ago(submission.submitted_at.localtime)
                 - else
                   %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'} if submission.graded_at
+            +   - if submission.graded_at
+            +     %button.btn.btn-info.btn-xs{type: 'button', data: {toggle: 'modal', target: '#compiler'}}
+            +       =t 'main.cmp_msg'
                 = 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/submissions/edit.html.haml ¶ +12

                 .row
                   .col-md-12
                     .alert.alert-info
                       Write your code in the following box, choose language, and click submit button when finished
                 .row
                   .col-md-8
                     %div#editor{style: 'height: 500px; border-radius: 7px; font-size: 14px;'}
                   .col-md-4
                     - # submission form
                     = form_tag({controller: :main, :action => 'submit'}, :multipart => true, class: 'form') do
                       = hidden_field_tag 'editor_text', @source
                       = 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 "Description:"
                         = link_to_description_if_any "[download] <span class='glyphicon glyphicon-file'></span>".html_safe, @problem
                       .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
                         .input-group
                           %span.input-group-btn
                             %span.btn.btn-default.btn-file
                               Browse
                               = file_field_tag 'load_file'
                           = text_field_tag '' , nil, {readonly: true, class: 'form-control'}
                       .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{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
                         %div#latest_status
                           - 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}
+            + .modal.fade#compiler{tabindex: -1,role: 'dialog'}
+            +   .modal-dialog.modal-lg{role:'document'}
+            +     .modal-content
+            +       .modal-header
+            +         %button.close{type: 'button', data: {dismissed: :modal}, aria: {label: 'close'}}
+            +           %span{aria: {hidden: 'true'}, data: {dismiss: 'modal'}} &times;
+            +         %h4 Compiler message
+            +       .modal-body
+            +         %pre#compiler_msg= @submission.compiler_message
+            +       .modal-footer
+            +         %button.btn.btn-default{type: 'button', data: {dismiss: 'modal'}} Close
+            +
               :javascript
                 $(document).ready(function() {
                   e = ace.edit("editor")
                   e.setValue($("#text_sourcecode").val());
                   e.gotoLine(1);
                   $("#language_id").trigger('change');
                   $("#load_file").on('change',function(evt) {
                     var file = evt.target.files[0];
                     var reader = new FileReader();
                     reader.onload =  function(theFile) {
                       var e = ace.edit("editor")
                       e.setValue(theFile.target.result);
                       e.gotoLine(1);
                     };
                     reader.readAsText(file)
                   });
                   //brython();
                 });
               %script#__main__{type:'text/python3'}
                 :plain
                   import sys
                   import traceback
                   from browser import document as doc
                   from browser import window, alert, console
                   _credits = """    Thanks to CWI, CNRI, BeOpen.com, Zope Corporation and a cast of thousands
                       for supporting Python development.  See www.python.org for more information."""
                   _copyright = """Copyright (c) 2012, Pierre Quentel pierre.quentel@gmail.com
                   All Rights Reserved.
                   Copyright (c) 2001-2013 Python Software Foundation.
                   All Rights Reserved.
                   Copyright (c) 2000 BeOpen.com.
                   All Rights Reserved.
                   Copyright (c) 1995-2001 Corporation for National Research Initiatives.
                   All Rights Reserved.

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

r742:4c1b44c35caf - Thu, 23 May 2019 09:05:06 - 2 files changed: 15 inserted, 1 deleted

Sign in to your account

Commit r742:4c1b44c35caf public

Author

r742:4c1b44c35caf - Thu, 23 May 2019 09:05:06 - 2 files changed: 15 inserted, 1 deleted

Commit `r742:4c1b44c35caf` public