Description:
- clean up link to problem stat and user stat
(grafted from 45d1e12e9794a23a5431222fe2f4c7461d73a529)
Commit status:
[Not Reviewed]
References:
Diff options:
Comments:
0 Commit comments
0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
Author
-
r657:c28f8e937d0d - - 6 files changed: 15 inserted, 13 deleted
| @@ -106,13 +106,13 | |||
|
|
106 | 106 | else |
|
|
107 | 107 | flash[:notice] = I18n.t 'registration.password_retrieval.no_email' |
|
|
108 | 108 | end |
|
|
109 | 109 | redirect_to :action => 'forget' |
|
|
110 | 110 | end |
|
|
111 | 111 | |
|
|
112 | - def profile | |
|
|
112 | + def stat | |
|
|
113 | 113 | @user = User.find(params[:id]) |
|
|
114 | 114 | @submission = Submission.includes(:problem).where(user_id: params[:id]) |
|
|
115 | 115 | |
|
|
116 | 116 | range = 120 |
|
|
117 | 117 | @histogram = { data: Array.new(range,0), summary: {} } |
|
|
118 | 118 | @summary = {count: 0, solve: 0, attempt: 0} |
| @@ -50,15 +50,15 | |||
|
|
50 | 50 | %th Submitted |
|
|
51 | 51 | %th Graded |
|
|
52 | 52 | %th Result |
|
|
53 | 53 | %tbody |
|
|
54 | 54 | - @submission.each do |sub| |
|
|
55 | 55 | %tr.inactive |
|
|
56 |
- %td= link_to sub.id, |
|
|
|
57 | - %td= sub.try(:user).try(:full_name) | |
|
|
58 | - %td= sub.try(:problem).try(:full_name) | |
|
|
56 | + %td= link_to sub.id, submission_path(sub.id) | |
|
|
57 | + %td= link_to sub.try(:user).try(:full_name), stat_user_path(sub.user.id) | |
|
|
58 | + %td= link_to sub.try(:problem).try(:full_name), stat_problem_path(sub.problem.id) | |
|
|
59 | 59 | %td= "#{time_ago_in_words(sub.submitted_at)} ago" |
|
|
60 | 60 | %td= sub.graded_at ? "#{time_ago_in_words(sub.graded_at)} ago" : " " |
|
|
61 | 61 | %td= sub.grader_comment |
|
|
62 | 62 | %h2 Ungraded submission |
|
|
63 | 63 | %table.table.table-striped.table-condensed |
|
|
64 | 64 | %thead |
| @@ -68,15 +68,15 | |||
|
|
68 | 68 | %th Submitted |
|
|
69 | 69 | %th Graded |
|
|
70 | 70 | %th Result |
|
|
71 | 71 | %tbody |
|
|
72 | 72 | - @backlog_submission.each do |sub| |
|
|
73 | 73 | %tr.inactive |
|
|
74 |
- %td= link_to sub.id, |
|
|
|
75 | - %td= sub.try(:user).try(:full_name) | |
|
|
76 | - %td= sub.try(:problem).try(:full_name) | |
|
|
74 | + %td= link_to sub.id, submission_path(sub.id) | |
|
|
75 | + %td= link_to sub.try(:user).try(:full_name), stat_user_path(sub.user.id) | |
|
|
76 | + %td= link_to sub.try(:problem).try(:full_name), stat_problem_path(sub.problem.id) | |
|
|
77 | 77 | %td= "#{time_ago_in_words(sub.submitted_at)} ago" |
|
|
78 | 78 | %td= sub.graded_at ? "#{time_ago_in_words(sub.graded_at)} ago" : " " |
|
|
79 | 79 | %td= sub.grader_comment |
|
|
80 | 80 | |
|
|
81 | 81 | |
|
|
82 | 82 | |
| @@ -38,14 +38,14 | |||
|
|
38 | 38 | %tbody |
|
|
39 | 39 | - row_odd,curr = true,'' |
|
|
40 | 40 | - @submissions.each do |sub| |
|
|
41 | 41 | - next unless sub.user |
|
|
42 | 42 | - row_odd,curr = !row_odd, sub.user if curr != sub.user |
|
|
43 | 43 | %tr{class: row_odd ? "info-odd" : "info-even"} |
|
|
44 |
- %td= link_to sub.id, |
|
|
|
45 |
- %td= link_to sub.user.login, |
|
|
|
44 | + %td= link_to sub.id, submission_path(sub) | |
|
|
45 | + %td= link_to sub.user.login, stat_user_path(sub.user) | |
|
|
46 | 46 | %td= sub.user.full_name |
|
|
47 | 47 | %td= time_ago_in_words(sub.submitted_at) + " ago" |
|
|
48 | 48 | %td= sub.points |
|
|
49 | 49 | %td.fix-width= sub.grader_comment |
|
|
50 | 50 | %td= sub.ip_address |
|
|
51 | 51 | - else |
| @@ -26,22 +26,22 | |||
|
|
26 | 26 | %table.table.table-striped |
|
|
27 | 27 | %tr |
|
|
28 | 28 | %td.text-right |
|
|
29 | 29 | %strong User |
|
|
30 | 30 | %td |
|
|
31 | 31 | - if @submission.user |
|
|
32 |
- = link_to " |
|
|
|
32 | + = link_to "#{@submission.user.login}", stat_user_path(@submission.user) | |
|
|
33 | 33 | = @submission.user.full_name |
|
|
34 | 34 | - else |
|
|
35 | 35 | = "(n/a)" |
|
|
36 | 36 | %tr |
|
|
37 | 37 | %td.text-right |
|
|
38 | 38 | %strong Task |
|
|
39 | 39 | %td |
|
|
40 | 40 | - if @submission.problem!=nil |
|
|
41 |
- = link_to " |
|
|
|
41 | + = link_to "[#{@submission.problem.name}]", stat_problem_path(@submission.problem) | |
|
|
42 | 42 | = @submission.problem.full_name |
|
|
43 | 43 | - else |
|
|
44 | 44 | = "(n/a)" |
|
|
45 | 45 | %tr |
|
|
46 | 46 | %td.text-right |
|
|
47 | 47 | %strong Tries |
| @@ -49,14 +49,14 | |||
|
|
49 | 49 | - if session[:admin] |
|
|
50 | 50 | %th IP |
|
|
51 | 51 | %tbody |
|
|
52 | 52 | - @submission.each do |s| |
|
|
53 | 53 | - next unless s.problem |
|
|
54 | 54 | %tr |
|
|
55 | - %td= link_to "#{s.id}", controller: "graders", action: "submission", id: s.id | |
|
|
56 |
- %td= link_to s.problem.name, |
|
|
|
55 | + %td= link_to s.id, submission_path(s) | |
|
|
56 | + %td= link_to s.problem.name, stat_problem_path(s.problem) | |
|
|
57 | 57 | %td= s.problem.full_name |
|
|
58 | 58 | %td= s.language.pretty_name |
|
|
59 | 59 | %td #{s.submitted_at.strftime('%Y-%m-%d %H:%M')} (#{time_ago_in_words(s.submitted_at)} ago) |
|
|
60 | 60 | %td.fix-width= s.grader_comment |
|
|
61 | 61 | %td= ( s.try(:points) ? (s.points*100/s.problem.full_score) : '' ) |
|
|
62 | 62 | - if session[:admin] |
| @@ -14,12 +14,13 | |||
|
|
14 | 14 | end |
|
|
15 | 15 | |
|
|
16 | 16 | resources :problems do |
|
|
17 | 17 | member do |
|
|
18 | 18 | get 'toggle' |
|
|
19 | 19 | get 'toggle_test' |
|
|
20 | + get 'stat' | |
|
|
20 | 21 | end |
|
|
21 | 22 | collection do |
|
|
22 | 23 | get 'turn_all_off' |
|
|
23 | 24 | get 'turn_all_on' |
|
|
24 | 25 | get 'import' |
|
|
25 | 26 | get 'manage' |
| @@ -28,12 +29,13 | |||
|
|
28 | 29 | |
|
|
29 | 30 | resources :grader_configuration, controller: 'configurations' |
|
|
30 | 31 | |
|
|
31 | 32 | resources :users do |
|
|
32 | 33 | member do |
|
|
33 | 34 | get 'toggle_activate', 'toggle_enable' |
|
|
35 | + get 'stat' | |
|
|
34 | 36 | end |
|
|
35 | 37 | end |
|
|
36 | 38 | |
|
|
37 | 39 | resources :submissions do |
|
|
38 | 40 | collection do |
|
|
39 | 41 | get 'prob/:problem_id', to: 'submissions#index', as: 'problem' |
You need to be logged in to leave comments.
Login now