cafe-grader-web Commit - r857:aa5ee227f493

cafe-grader-web

Commit `r857:aa5ee227f493` public

parent | child

Description:

allow ta to set model submission

Commit status:

[Not Reviewed]

References:

default

Diff options:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r857:aa5ee227f493 - Sat, 05 Feb 2022 15:43:45 - 4 files changed: 13 inserted, 10 deleted

app/models/user.rb ¶ +1 -1

                 def self.authenticate(login, password)
                   user = find_by_login(login)
                   if user
                     return user if user.authenticated?(password)
                   end
                 end
                 def authenticated?(password)
                   if self.activated
                     hashed_password == User.encrypt(password,self.salt)
                   else
                     false
                   end
                 end
                 def login_with_name
                   "[#{login}] #{full_name}"
                 end
                 def admin?
                   has_role?('admin')
                 end
                 def has_role?(role)
-            -     self.roles.where(name: role).count > 0
+            +     self.roles.where(name: [role,'admin']).count > 0
                 end
                 def email_for_editing
                   if self.email==nil
                     "(unknown)"
                   elsif self.email==''
                     "(blank)"
                   else
                     self.email
                   end
                 end
                 def email_for_editing=(e)
                   self.email=e
                 end
                 def alias_for_editing
                   if self.alias==nil
                     "(unknown)"
                   elsif self.alias==''
                     "(blank)"
                   else
                     self.alias
                   end

app/views/report/_task_hof.html.haml ¶ +4 -2

                         %canvas#chart{height: '50px'}
                   .col-md-4
                     .card
                       .card-body
                         %h2.card-title General Info
                         .row
                           .col-sm-6
                             Subs
                           .col-sm-6
                             = @summary[:count]
                         .row
                           .col-sm-6
                             Solved/Attempted User
                           .col-sm-6
                             #{@summary[:solve]}/#{@summary[:attempt]} (#{(@summary[:solve]*100.0/@summary[:attempt]).round(1)}%)
                 .row
                   .col-md-4
                     .card
                       .card-body
                         %h2.card-title Model submission
                       %table.table.table-hover
                         %thead
                           %tr
-            -               %th #Sub
+            +               %th #Sub (lang)
                             %th Author
                         %tbody
                           - @model_subs.each do |sub|
                             %tr
-            -                 %td= link_to "##{sub.id}", submission_path(sub)
+            +                 %td
+            +                   = link_to "##{sub.id}", submission_path(sub)
+            +                   = "(#{sub.language.pretty_name})"
                               %td= sub.user.full_name
                   .col-md-8
                     - if @best
                       .card
                         .card-body
                           %h2.card-title Top Submissions
                         %table.table.table-hover
                           %thead
                             %tr
                               %th Language
                               %th Best runtime (ms)
                               %th Best memory (kbytes)
                               %th Shortest Code (bytes)
                               %th First solver
                           %tbody
                             %tr.bg-warning
                               %td
                                 Overall
                               %td
                                 by #{link_to @best[:runtime][:user], stat_user_path(@best[:runtime][:user_id])}
                                 %br
                                 using <span class="text-success">#{@best[:runtime][:lang]}</span>
                                 %br
                                 with <span class="text-success">#{@best[:runtime][:value] * 1000} milliseconds</span>

app/views/report/problem_hof.html.haml ¶ +4 -3

               /- if params[:id]
               /  %h1 Tasks Hall of Fame
               /  = link_to('[back to All-Time Hall of Fame]', action: 'problem_hof', id: nil  )
               /- else
               /  %h1 All-Time Hall of Fame
               .panel.panel-info
                 .panel-heading
                   Select Task
                 .panel-body
                   .form-inline
                     = select 'report',
                       'problem_id',
                       @problems.collect {|p| ["[#{p.name}] #{p.full_name}", problem_hof_report_path(p)]},
                       {:selected => problem_hof_report_path(@problem)},
                       { class: 'select2 form-control' }
                     %button.btn.btn-primary.btn-sm.go-button#problem_go{data: {source: "#report_problem_id"}} Go
               - unless params[:id]
                 /=render partial: 'all_time_hof'
                 Please select a problem.
               - else
-            -   %h1 [#{Problem.find(params[:id]).name}] #{Problem.find(params[:id]).full_name}
+            +   %h1
-            -   -# %h2 Submission History
+            +     [#{Problem.find(params[:id]).name}] #{Problem.find(params[:id]).full_name}
-            -   -# =render partial: 'application/bar_graph', locals: { histogram: @histogram }
+            +     - if @current_user.has_role?('ta')
+            +       %a{href:stat_problem_path(@problem)} (stat)
                 =render partial: 'task_hof'

app/views/submissions/show.html.haml ¶ +4 -4

                         %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
                         %td
                           %button.btn.btn-info.btn-xs{type: 'button', data: {toggle: 'modal', target: '#compiler'}}
                             view
                       %tr
                         %td.text-right
                           %strong Grading Task Status
                         %td
                           = @task.status_str if @task
-            -             - if session[:admin]
+            +             - if @current_user.admin?
                             = link_to "rejudge", rejudge_submission_path, data: {remote: true}, class: 'btn btn-info btn-xs'
-            -         - if session[:admin]
+            +         - if @current_user.has_role?('ta')
                         %tr
                           %td.text-right
                             %strong IP
                           %td #{@submission.ip_address}
                         %tr
                           %td.text-right
                             %strong Model solution
                           %td
                             - if @submission.tag_model?
                               YES
-            -                 - if session[:admin]
+            +                 - if @current_user.has_role?('ta')
                                 = link_to "remove model status", set_tag_submission_path(@submission, tag: :default), class: 'btn btn-warning btn-xs'
                             - else
                               No
-            -                 - if session[:admin]
+            +                 - if @current_user.has_role?('ta')
                                 = link_to "set as model solution", set_tag_submission_path(@submission, tag: :model), class: 'btn btn-success btn-xs'
               .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

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

Commit r857:aa5ee227f493 public

Author

r857:aa5ee227f493 - Sat, 05 Feb 2022 15:43:45 - 4 files changed: 13 inserted, 10 deleted

Commit `r857:aa5ee227f493` public