cafe-grader-web Commit - r848:057622a7b534

cafe-grader-web

Commit `r848:057622a7b534` public

parent | child

Description:

redact user name on view submission

Commit status:

[Not Reviewed]

References:

merge algo

Diff options:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r848:057622a7b534 - Thu, 03 Feb 2022 08:20:51 - 3 files changed: 8 inserted, 2 deleted

app/views/application/_submission_short.html.haml ¶ +2

               - 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
                 - if submission.graded_at
+            +     = link_to "#{t 'main.cmp_msg'}", compiler_msg_submission_path(submission), {popup: true,remote: true,class: 'btn btn-xs btn-info'}
+            +     -#
                     %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 ¶ +3 -2

                 .row
                   .col-md-12
                     %h2 Live submit
                 .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 || @current_user.default_language || 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 }
-            - - if @submission
               .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
+            +         %pre#compiler_msg
+            +           - if @submission
+            +             = @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();
                 });

app/views/submissions/show.html.haml ¶ +3

               %h1= "Submission: #{@submission.id}"
               %textarea#data{style: "display:none;"}
                 :preserve
                   #{@submission.source}
               //%div.highlight{:style => "border: 1px solid black;"}
               //=@formatted_code.html_safe
               .containter
                 .row
                   .col-md-7
                     %h2 Source Code
                   .col-md-5
                     %h2 Stat
                 .row
                   .col-md-7
                     %div#editor{ style: "font-size: 14px; height: 400px; border-radius:5px;" }
                     :javascript
                       e = ace.edit("editor")
                       e.setOptions({ maxLines: Infinity })
                       e.setValue($("#data").text())
                       e.gotoLine(1)
                       e.getSession().setMode("#{get_ace_mode(@submission.language)}")
                       e.setReadOnly(true)
                   .col-md-5
                     %table.table.table-striped
                       %tr
                         %td.text-right
                           %strong User
                         %td
+            +             - if @current_user.admin? ||@current_user == @submission.user
                             - if @submission.user
                               = link_to "#{@submission.user.login}", stat_user_path(@submission.user)
                               = @submission.user.full_name
                             - else
                               = "(n/a)"
+            +             - else
+            +               = '-- REDACTED --'
                       %tr
                         %td.text-right
                           %strong Task
                         %td
                           - if @submission.problem!=nil
                             = link_to "[#{@submission.problem.name}]", stat_problem_path(@submission.problem)
                             = @submission.problem.full_name
                             = link_to_description_if_any "[download] <span class='glyphicon glyphicon-file'></span>".html_safe, @submission.problem
                           - else
                             = "(n/a)"
                       %tr
                         %td.text-right
                           %strong Tries
                         %td= @submission.number
                       %tr
                         %td.text-right
                           %strong Language
                         %td= @submission.language.pretty_name
                       %tr
                         %td.text-right
                           %strong Submitted
                         %td #{time_ago_in_words(@submission.submitted_at)} ago (at #{@submission.submitted_at.to_formatted_s(:long)})
                       %tr
                         %td.text-right
                           %strong Graded
                         - if @submission.graded_at
                           %td #{time_ago_in_words(@submission.graded_at)} ago (at #{@submission.graded_at.to_formatted_s(:long)})
                         - else
                           %td -
                       %tr
                         %td.text-right
                           %strong Points
                         %td #{@submission.points}/#{@submission.try(:problem).try(:full_score)}
                       %tr
                         %td.text-right
                           %strong Comment
                         %td #{@submission.grader_comment}
                       %tr
                         %td.text-right
                           %strong Runtime (s)
                         %td #{@submission.max_runtime}
                       %tr
                         %td.text-right
                           %strong Memory (kb)
                         %td #{@submission.peak_memory}
                       %tr
                         %td.text-right
                           %strong Compiler result

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

r848:057622a7b534 - Thu, 03 Feb 2022 08:20:51 - 3 files changed: 8 inserted, 2 deleted

Sign in to your account

Commit r848:057622a7b534 public

Author

r848:057622a7b534 - Thu, 03 Feb 2022 08:20:51 - 3 files changed: 8 inserted, 2 deleted

Commit `r848:057622a7b534` public