cafe-grader-web

Commit r65:7c52d3ded481 public

parent | child
Description:
[web] fixing ticket #10 git-svn-id: http://theory.cpe.ku.ac.th/grader/web/trunk@142 6386c4cd-e34a-4fa8-8920-d93eb39b512e
Commit status:
[Not Reviewed]
References:
default
Diff options:
Raw Diff | Patch Diff | Download Diff | Ignore 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

r65:7c52d3ded481 - - 5 files changed: 14 inserted, 14 deleted

Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -1,34 +1,44
1 1 # Methods added to this helper will be available to all templates in the application.
2 2 module ApplicationHelper
3 3
4 4 def user_header
5 5 menu_items = ''
6 6 user = User.find(session[:user_id])
7 7
8 8 # main page
9 9 append_to menu_items, '[Main]', 'main', 'list'
10 10 append_to menu_items, '[Submissions]', 'main', 'submission'
11 11 append_to menu_items, '[Test]', 'test', 'index'
12 12
13 13 # admin menu
14 14 if (user!=nil) and (user.admin?)
15 15 append_to menu_items, '[Problem admin]', 'problems', 'index'
16 16 append_to menu_items, '[User admin]', 'user_admin', 'index'
17 17 append_to menu_items, '[User stat]', 'user_admin', 'user_stat'
18 18 end
19 19
20 20 # general options
21 21 append_to menu_items, '[Settings]', 'users', 'index'
22 22 append_to menu_items, '[Log out]', 'main', 'login'
23 23
24 24 menu_items
25 25 end
26 26
27 27 def append_to(option,label, controller, action)
28 28 option << ' ' if option!=''
29 29 option << link_to_unless_current(label,
30 30 :controller => controller,
31 31 :action => action)
32 32 end
33 33
34 + def format_short_time(time)
35 + now = Time.now
36 + st = ''
37 + if (time.yday != now.yday) or
38 + (time.year != now.year)
39 + st = time.strftime("%x ")
40 + end
41 + st + time.strftime("%X")
42 + end
43 +
34 44 end
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -1,13 +1,3
1 1 module MainHelper
2 2
3 - def format_short_time(time)
4 - now = Time.now
5 - st = ''
6 - if (time.yday != now.yday) or
7 - (time.year != now.year)
8 - st = time.strftime("%x ")
9 - end
10 - st + time.strftime("%X")
11 - end
12 -
13 3 end
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -1,15 +1,15
1 1
2 2 <% if compiler_message==nil or compiler_message=='' %>
3 3 No message
4 4 <% else %>
5 5 <div><div><a href="#" onClick="n = this.parentNode.parentNode.lastChild;
6 6 if(n.style.display == 'none') { n.style.display = 'block'; }
7 7 else {n.style.display ='none'; } return false;">
8 8 (click to see)</a>
9 9 </div>
10 10 <div style="display: none">
11 11 <div class="compilermsgbody" style="border: thin solid grey; margin: 2px">
12 - <%=h(compiler_message).gsub(/\n/,'<br/>') %>
12 + <%=simple_format(compiler_message) %>
13 13 </div>
14 14 </div></div>
15 15 <% end %>
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -1,11 +1,11
1 1 %tr{:class => (test_request_counter%2==0) ? "info-even" : "info-odd"}
2 - %td= test_request_counter +1
2 + %td= format_short_time(test_request.submitted_at)
3 3 %td= test_request.problem.full_name
4 4 %td= test_request.submission.number
5 5 %td= test_request.status_str
6 6 %td= simple_format((test_request.running_stat or ''))
7 7 %td
8 8 - if test_request.output_file_name!=nil
9 9 = link_to '[output]', :action => 'read', :id => test_request.id
10 10 %td= test_request.grader_comment or ''
11 11 %td= simple_format((test_request.compiler_message or ''))
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -12,62 +12,62
12 12 };
13 13 function updateSubmissionList() {
14 14 currentProb = document.getElementById("test_request_problem_id").value;
15 15 count = submissionCount[currentProb];
16 16 submissionSelect = document.getElementById("test_request_submission_number");
17 17 submissionSelect.options.length = 0;
18 18 for(i=0; i<count; i++) {
19 19 submissionSelect.options[i] = new Option(""+(i+1),""+(i+1),false,false);
20 20 }
21 21 }
22 22 </script>
23 23
24 24 <% form_for :test_request, nil,
25 25 :url => { :action => 'submit'},
26 26 :html => { :multipart => true } do |f| %>
27 27 <table>
28 28 <tr>
29 29 <td>Task:</td>
30 30 <td>
31 31 <%= select(:test_request,
32 32 :problem_id,
33 33 @problems.collect {|p| [p.name, p.id]}, {},
34 34 { :onclick => "updateSubmissionList();" }) %>
35 35 </td>
36 36 </tr>
37 37 <tr>
38 38 <td>Submission:</td>
39 39 <td>
40 40 <%= select(:test_request,
41 41 :submission_number,
42 42 ((1..@submissions[0].number).collect {|n| [n,n]}).reverse) %>
43 43 </td>
44 44 </tr>
45 45 <tr>
46 46 <td>Input data:</td>
47 47 <td><%= f.file_field :input_file %></td>
48 48 <tr>
49 49 <td colspan="2">
50 50 <%= submit_tag 'submit' %>
51 51 </td>
52 52 </tr>
53 53 </table>
54 54 <% end %>
55 55
56 56 <h3>Previous requests</h3>
57 57
58 58 <table class="info">
59 59 <tr class="info-head">
60 - <th></td>
60 + <th>at</th>
61 61 <th>problem</th>
62 - <th>#</th>
62 + <th>sub #</th>
63 63 <th>status</th>
64 64 <th>running stat</th>
65 65 <th>output (first 2kb)</th>
66 66 <th>grading comment</th>
67 67 <th>compiler message</th>
68 68 </tr>
69 69 <%= render :partial => 'test_request', :collection => @test_requests %>
70 70 </table>
71 71
72 72 <% end %>
73 73
You need to be logged in to leave comments. Login now