Description:
reorder submission and remove duplicate code for submission
Commit status:
[Not Reviewed]
References:
Diff options:
Comments:
0 Commit comments
0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
Author
-
r644:6431e2ef4265 - - 7 files changed: 8 inserted, 55 deleted
| @@ -121,29 +121,12 | |||
|
|
121 | 121 | else |
|
|
122 | 122 | flash[:notice] = 'Error viewing source' |
|
|
123 | 123 | redirect_to :action => 'list' |
|
|
124 | 124 | end |
|
|
125 | 125 | end |
|
|
126 | 126 | |
|
|
127 | - def submission | |
|
|
128 | - @user = User.find(session[:user_id]) | |
|
|
129 | - @problems = @user.available_problems | |
|
|
130 | - if params[:id]==nil | |
|
|
131 | - @problem = nil | |
|
|
132 | - @submissions = nil | |
|
|
133 | - else | |
|
|
134 | - @problem = Problem.find_by_id(params[:id]) | |
|
|
135 | - if (@problem == nil) or (not @problem.available) | |
|
|
136 | - redirect_to :action => 'list' | |
|
|
137 | - flash[:notice] = 'Error: submissions for that problem are not viewable.' | |
|
|
138 | - return | |
|
|
139 | - end | |
|
|
140 | - @submissions = Submission.find_all_by_user_problem(@user.id, @problem.id) | |
|
|
141 | - end | |
|
|
142 | - end | |
|
|
143 | - | |
|
|
144 | 127 | def result |
|
|
145 | 128 | if !GraderConfiguration.show_grading_result |
|
|
146 | 129 | redirect_to :action => 'list' and return |
|
|
147 | 130 | end |
|
|
148 | 131 | @user = User.find(session[:user_id]) |
|
|
149 | 132 | @submission = Submission.find(params[:id]) |
| @@ -16,13 +16,13 | |||
|
|
16 | 16 | @problem = Problem.find_by_id(params[:problem_id]) |
|
|
17 | 17 | if (@problem == nil) or (not @problem.available) |
|
|
18 | 18 | redirect_to main_list_path |
|
|
19 | 19 | flash[:notice] = 'Error: submissions for that problem are not viewable.' |
|
|
20 | 20 | return |
|
|
21 | 21 | end |
|
|
22 | - @submissions = Submission.find_all_by_user_problem(@user.id, @problem.id) | |
|
|
22 | + @submissions = Submission.find_all_by_user_problem(@user.id, @problem.id).order(id: :desc) | |
|
|
23 | 23 | end |
|
|
24 | 24 | end |
|
|
25 | 25 | |
|
|
26 | 26 | # GET /submissions/1 |
|
|
27 | 27 | # GET /submissions/1.json |
|
|
28 | 28 | def show |
| @@ -25,13 +25,13 | |||
|
|
25 | 25 | right_menu << add_menu("#{content_tag(:span,'',class: 'glyphicon glyphicon-log-out')} #{user.full_name}".html_safe, 'main', 'login', {title: I18n.t('menu.log_out'), data: {toggle: 'tooltip'}}) |
|
|
26 | 26 | |
|
|
27 | 27 | |
|
|
28 | 28 | result = content_tag(:ul,left_menu.html_safe,class: 'nav navbar-nav') + content_tag(:ul,right_menu.html_safe,class: 'nav navbar-nav navbar-right') |
|
|
29 | 29 | end |
|
|
30 | 30 | |
|
|
31 | - def add_menu(title, controller, action,html_option = {}) | |
|
|
31 | + def add_menu(title, controller, action, html_option = {}) | |
|
|
32 | 32 | link_option = {controller: controller, action: action} |
|
|
33 | 33 | html_option[:class] = (html_option[:class] || '') + " active" if current_page?(link_option) |
|
|
34 | 34 | content_tag(:li, link_to(title,link_option),html_option) |
|
|
35 | 35 | end |
|
|
36 | 36 | |
|
|
37 | 37 | def user_header |
| @@ -1,11 +1,11 | |||
|
|
1 | 1 | |
|
|
2 | 2 | %tr |
|
|
3 | 3 | %td{:align => "center"} |
|
|
4 |
- = submission |
|
|
|
5 | - %td{:align => "center"} | |
|
|
4 | + = submission.number | |
|
|
5 | + %td.text-right | |
|
|
6 | 6 | = link_to "##{submission.id}", submission_path(submission.id) |
|
|
7 | 7 | %td |
|
|
8 | 8 | = l submission.submitted_at, format: :long |
|
|
9 | 9 | = "( #{time_ago_in_words(submission.submitted_at)} ago)" |
|
|
10 | 10 | %td |
|
|
11 | 11 | = submission.source_filename |
| @@ -9,21 +9,22 | |||
|
|
9 | 9 | %span.icon-bar |
|
|
10 | 10 | %a.navbar-brand{href: main_list_path} |
|
|
11 | 11 | %span.glyphicon.glyphicon-home |
|
|
12 | 12 | MAIN |
|
|
13 | 13 | .collapse.navbar-collapse#navbar-collapse |
|
|
14 | 14 | %ul.nav.navbar-nav |
|
|
15 | + / submission | |
|
|
15 | 16 | - if (@current_user!=nil) and (GraderConfiguration.show_tasks_to?(@current_user)) |
|
|
16 | - //= add_menu("#{I18n.t 'menu.tasks'}", 'tasks', 'list') | |
|
|
17 | 17 | %li.dropdown |
|
|
18 | 18 | %a.dropdown-toggle{href: '#', data: {toggle:'dropdown'}, aria: {haspopup:"true", expanded:"false"}, role: "button"} |
|
|
19 | 19 | = "#{I18n.t 'menu.submissions'}" |
|
|
20 | 20 | %span.caret |
|
|
21 | 21 | %ul.dropdown-menu |
|
|
22 |
- = add_menu("View", ' |
|
|
|
22 | + = add_menu("View", 'submissions', 'index') | |
|
|
23 | 23 | = add_menu("Self Test", 'test', 'index') |
|
|
24 | + / hall of fame | |
|
|
24 | 25 | - if GraderConfiguration['right.user_hall_of_fame'] |
|
|
25 | 26 | = add_menu("#{I18n.t 'menu.hall_of_fame'}", 'report', 'problem_hof') |
|
|
26 | 27 | / display MODE button (with countdown in contest mode) |
|
|
27 | 28 | - if GraderConfiguration.analysis_mode? |
|
|
28 | 29 | %div.navbar-btn.btn.btn-success#countdown= "ANALYSIS MODE" |
|
|
29 | 30 | - elsif GraderConfiguration.time_limit_mode? |
| @@ -15,13 +15,13 | |||
|
|
15 | 15 | |
|
|
16 | 16 | - if @submissions!=nil |
|
|
17 | 17 | - if @submissions.length>0 |
|
|
18 | 18 | %table.table |
|
|
19 | 19 | %thead |
|
|
20 | 20 | %th No. |
|
|
21 | - %th # | |
|
|
21 | + %th.text-right # | |
|
|
22 | 22 | %th At |
|
|
23 | 23 | %th Source |
|
|
24 | 24 | %th Result |
|
|
25 | 25 | %th{:width => "300px"} Compiler message |
|
|
26 | 26 | %th |
|
|
27 | 27 | = render :partial => 'submission', :collection => @submissions |
| deleted file |
You need to be logged in to leave comments.
Login now