cafe-grader-web

Commit r651:23fc3f2d9ad1 public

parent | child
Description:
add link to announcement management in main
Commit status:
[Not Reviewed]
References:
java
Diff options:
Raw Diff | Patch Diff | Download Diff | Show whitespace | Increase context
Comments:
0 Commit comments 0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
Side by Side Unified
Expand All Files Collapse All Files Wide Mode Diff
Add another comment
Browse Files

r651:23fc3f2d9ad1 - - 2 files changed: 1 inserted, 1 deleted

Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -64,46 +64,45
64 end
64 end
65
65
66
66
67 def get_latest_submission_status
67 def get_latest_submission_status
68 @problem = Problem.find(params[:pid])
68 @problem = Problem.find(params[:pid])
69 @submission = Submission.find_last_by_user_and_problem(params[:uid],params[:pid])
69 @submission = Submission.find_last_by_user_and_problem(params[:uid],params[:pid])
70 puts User.find(params[:uid]).login
70 puts User.find(params[:uid]).login
71 puts Problem.find(params[:pid]).name
71 puts Problem.find(params[:pid]).name
72 puts 'nil' unless @submission
72 puts 'nil' unless @submission
73 respond_to do |format|
73 respond_to do |format|
74 format.js
74 format.js
75 end
75 end
76 end
76 end
77
77
78 # GET /submissions/:id/rejudge
78 # GET /submissions/:id/rejudge
79 def rejudge
79 def rejudge
80 @submission = Submission.find(params[:id])
80 @submission = Submission.find(params[:id])
81 @task = @submission.task
81 @task = @submission.task
82 @task.status_inqueue! if @task
82 @task.status_inqueue! if @task
83 respond_to do |format|
83 respond_to do |format|
84 format.js
84 format.js
85 end
85 end
86 end
86 end
87
87
88 -
89 protected
88 protected
90
89
91 def submission_authorization
90 def submission_authorization
92 #admin always has privileged
91 #admin always has privileged
93 if @current_user.admin?
92 if @current_user.admin?
94 return true
93 return true
95 end
94 end
96
95
97 sub = Submission.find(params[:id])
96 sub = Submission.find(params[:id])
98 if sub.problem.available?
97 if sub.problem.available?
99 puts "sub = #{sub.user.id}, current = #{@current_user.id}"
98 puts "sub = #{sub.user.id}, current = #{@current_user.id}"
100 return true if GraderConfiguration["right.user_view_submission"] or sub.user == @current_user
99 return true if GraderConfiguration["right.user_view_submission"] or sub.user == @current_user
101 end
100 end
102
101
103 #default to NO
102 #default to NO
104 unauthorized_redirect
103 unauthorized_redirect
105 return false
104 return false
106 end
105 end
107
106
108
107
109 end
108 end
Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -22,42 +22,43
22 %th Task name
22 %th Task name
23 %th Full name
23 %th Full name
24 %th # of sub(s)
24 %th # of sub(s)
25 %th Results
25 %th Results
26 %th
26 %th
27 %tbody
27 %tbody
28 = render :partial => 'problem', :collection => @problems
28 = render :partial => 'problem', :collection => @problems
29 - else
29 - else
30 - @contest_problems.each do |cp|
30 - @contest_problems.each do |cp|
31 - if cp[:problems].length > 0
31 - if cp[:problems].length > 0
32 %h2{:class =>'contest-title'}
32 %h2{:class =>'contest-title'}
33 = "#{cp[:contest] ? cp[:contest].title : 'Public problems'}"
33 = "#{cp[:contest] ? cp[:contest].title : 'Public problems'}"
34 %table.info
34 %table.info
35 %tr.info-head
35 %tr.info-head
36 %th Task name
36 %th Task name
37 %th Full name
37 %th Full name
38 %th # of sub(s)
38 %th # of sub(s)
39 %th Results
39 %th Results
40 %th
40 %th
41 = render :partial => 'problem', :collection => cp[:problems]
41 = render :partial => 'problem', :collection => cp[:problems]
42 .col-md-5
42 .col-md-5
43 .panel.panel-info
43 .panel.panel-info
44 .panel-heading
44 .panel-heading
45 Announcement
45 Announcement
46 + = link_to 'Manage', announcements_path, class: 'btn btn-xs btn-default'
46 %ul.list-group
47 %ul.list-group
47 = render :partial => 'announcement', :collection => @announcements
48 = render :partial => 'announcement', :collection => @announcements
48
49
49 %script{:type => 'text/javascript'}
50 %script{:type => 'text/javascript'}
50 = "Announcement.refreshUrl = '#{url_for :controller => 'main', :action => 'announcements'}';"
51 = "Announcement.refreshUrl = '#{url_for :controller => 'main', :action => 'announcements'}';"
51 Announcement.registerRefreshEventTimer();
52 Announcement.registerRefreshEventTimer();
52
53
53 .modal.fade#compiler{tabindex: -1,role: 'dialog'}
54 .modal.fade#compiler{tabindex: -1,role: 'dialog'}
54 .modal-dialog.modal-lg{role:'document'}
55 .modal-dialog.modal-lg{role:'document'}
55 .modal-content
56 .modal-content
56 .modal-header
57 .modal-header
57 %button.close{type: 'button', data: {dismissed: :modal}, aria: {label: 'close'}}
58 %button.close{type: 'button', data: {dismissed: :modal}, aria: {label: 'close'}}
58 %span{aria: {hidden: 'true'}, data: {dismiss: 'modal'}} ×
59 %span{aria: {hidden: 'true'}, data: {dismiss: 'modal'}} ×
59 %h4 Compiler message
60 %h4 Compiler message
60 .modal-body
61 .modal-body
61 %pre#compiler_msg
62 %pre#compiler_msg
62 .modal-footer
63 .modal-footer
63 %button.btn.btn-default{type: 'button', data: {dismiss: 'modal'}} Close
64 %button.btn.btn-default{type: 'button', data: {dismiss: 'modal'}} Close
You need to be logged in to leave comments. Login now