cafe-grader-web Commit - r611:5599f91f430d

cafe-grader-web

Commit `r611:5599f91f430d` public

parent | child

Description:

- fix link to user stat from user admin - add compiler message to submission view - fix some bugs

Commit status:

[Not Reviewed]

References:

java

Diff options:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r611:5599f91f430d - Tue, 25 Oct 2016 04:00:58 - 4 files changed: 26 inserted, 7 deleted

app/views/graders/list.html.haml ¶ +4 -4

                   %table.table.table-striped.table-condensed
                     %thead
                       %th ID
                       %th User
                       %th Problem
                       %th Submitted
                       %th Graded
                       %th Result
                     %tbody
                       - @submission.each do |sub|
                         %tr.inactive
                           %td= link_to sub.id, submission_path(sub.id)
-            -             %td= ("" unless sub.user) || link_to sub.try(:user).try(:full_name), stat_user_path(sub.user.id)
+            +             %td= ("" unless sub.user) || link_to(sub.try(:user).try(:full_name), stat_user_path(sub.user.id))
-            -             %td= ("" unless sub.problem) || link_to sub.try(:problem).try(:full_name), stat_problem_path(sub.problem.id)
+            +             %td= ("" unless sub.problem) || link_to(sub.try(:problem).try(:full_name), stat_problem_path(sub.problem.id))
                           %td= "#{time_ago_in_words(sub.submitted_at)} ago"
                           %td= sub.graded_at ? "#{time_ago_in_words(sub.graded_at)} ago" : " "
                           %td= sub.grader_comment
                   %h2 Ungraded submission
                   %table.table.table-striped.table-condensed
                     %thead
                       %th ID
                       %th User
                       %th Problem
                       %th Submitted
                       %th Graded
                       %th Result
                     %tbody
                       - @backlog_submission.each do |sub|
                         %tr.inactive
                           %td= link_to sub.id, submission_path(sub.id)
-            -             %td= ("" unless sub.user) || link_to sub.try(:user).try(:full_name), stat_user_path(sub.user.id)
+            +             %td= ("" unless sub.user) || link_to( sub.try(:user).try(:full_name), stat_user_path(sub.user.id))
-            -             %td= ("" unless sub.problem) || link_to sub.try(:problem).try(:full_name), stat_problem_path(sub.problem.id)
+            +             %td= ("" unless sub.problem) || link_to( sub.try(:problem).try(:full_name), stat_problem_path(sub.problem.id))
                           %td= "#{time_ago_in_words(sub.submitted_at)} ago"
                           %td= sub.graded_at ? "#{time_ago_in_words(sub.graded_at)} ago" : " "
                           %td= sub.grader_comment

app/views/layouts/_header.html.haml ¶ +6 -1

               %header.navbar.navbar-default.navbar-fixed-top
                 %nav
                   .container-fluid
                     .navbar-header
+            +         %button.navbar-toggle.collapsed{ data: {toggle: 'collapse', target: '#navbar-collapse'} }
+            +           %span.sr-only Togggle Navigation
+            +           %span.icon-bar
+            +           %span.icon-bar
+            +           %span.icon-bar
                       %a.navbar-brand{href: main_list_path}
                         %span.glyphicon.glyphicon-home
                         MAIN
-            -       .collapse.navbar-collapse
+            +       .collapse.navbar-collapse#navbar-collapse
                       %ul.nav.navbar-nav
                         - if (@current_user!=nil) and (GraderConfiguration.show_tasks_to?(@current_user))
                           //= add_menu("#{I18n.t 'menu.tasks'}", 'tasks', 'list')
                           %li.dropdown
                             %a.dropdown-toggle{href: '#', data: {toggle:'dropdown'},  aria: {haspopup:"true", expanded:"false"}, role: "button"}
                               = "#{I18n.t 'menu.submissions'}"
                               %span.caret
                             %ul.dropdown-menu
                               = add_menu("View", 'main', 'submission')
                               = add_menu("Self Test", 'test', 'index')
                         - if GraderConfiguration['right.user_hall_of_fame']
                           = add_menu("#{I18n.t 'menu.hall_of_fame'}", 'report', 'problem_hof')

app/views/submissions/show.html.haml ¶ +15 -1

               %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 })
                       %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
-            -             %pre= @submission.compiler_message
+            +             %button.btn.btn-info.btn-xs{type: 'button', data: {toggle: 'modal', target: '#compiler'}}
+            +               view
+            +             .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= @submission.compiler_message
+            +                   .modal-footer
+            +                     %button.btn.btn-default{type: 'button', data: {dismiss: 'modal'}} Close
                       - if session[:admin]
                         %tr
                           %td.text-right
                             %strong IP
                           %td #{@submission.ip_address}

app/views/user_admin/index.html.haml ¶ +1 -1

                     Activated
                     %sup{class: 'text-primary',data: {toggle: 'tooltip', placement: 'top'}, title: 'User has already confirmed the email?' } [?]
                   %th
                     Enabled
                     %sup{class: 'text-primary',data: {toggle: 'tooltip', placement: 'top'}, title: 'Allow the user to login?' } [?]
                   %th Last IP
                   %th
                   %th
                   %th
                   %th
                 - for user in @users
                   %tr
-            -       %td= link_to user.login, controller: :users, :action => 'profile', :id => user
+            +       %td= link_to user.login, stat_user_path(user)
                     %td= user.full_name
                     %td= user.email
                     %td= user.remark
                     %td= toggle_button(user.activated?, toggle_activate_user_path(user),"toggle_activate_user_#{user.id}")
                     %td= toggle_button(user.enabled?, toggle_enable_user_path(user),"toggle_enable_user_#{user.id}")
                     %td= user.last_ip
                     %td= link_to 'Clear IP', {:action => 'clear_last_ip', :id => user, :page=>params[:page]}, :confirm => 'This will reset last logging in ip of the user, are you sure?', class: 'btn btn-default btn-xs btn-block'
                     %td= link_to 'Show', {:action => 'show', :id => user}, class: 'btn btn-default btn-xs btn-block'
                     %td= link_to 'Edit', {:action => 'edit', :id => user}, class: 'btn btn-default btn-xs btn-block'
                     %td= link_to 'Destroy', { :action => 'destroy', :id => user }, :confirm => 'Are you sure?', :method => :delete, class: 'btn btn-danger btn-xs btn-block'
               %br/
               = link_to '+ New user', { :action => 'new' }, { class: 'btn btn-success '}

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

r611:5599f91f430d - Tue, 25 Oct 2016 04:00:58 - 4 files changed: 26 inserted, 7 deleted

Sign in to your account

Commit r611:5599f91f430d public

Author

r611:5599f91f430d - Tue, 25 Oct 2016 04:00:58 - 4 files changed: 26 inserted, 7 deleted

Commit `r611:5599f91f430d` public