cafe-grader-web Commit - r51:1f6cfc6a5b62

cafe-grader-web

Commit `r51:1f6cfc6a5b62` public

parent | child

Description:

update views -- styling git-svn-id: http://theory.cpe.ku.ac.th/grader/web/trunk@114 6386c4cd-e34a-4fa8-8920-d93eb39b512e

Commit status:

[Not Reviewed]

References:

default

Diff options:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r51:1f6cfc6a5b62 - Thu, 13 Mar 2008 01:21:00 - 11 files changed: 116 inserted, 63 deleted

app/views/main/_submission_short.html.haml created 644 ¶ +13

@@ -0,0 +1,13
	1	+
	2	+ - if submission==nil
	3	+ = "-"
	4	+ - else
	5	+ - if submission.graded_at==nil
	6	+ Submitted at
	7	+ = format_short_time(submission.submitted_at)
	8	+ - else
	9	+ = "Graded at #{format_short_time(submission.graded_at)}, "
	10	+ = "score: #{submission.points} "
	11	+ = " [" + submission.grader_comment + "]"
	12	+ = " \| "
	13	+ = link_to('[source]',{:action => 'get_source', :id => submission.id})

app/views/main/submission.html.haml created 644 ¶ +24

@@ -0,0 +1,24
	1	+ .title
	2	+ Hello
	3	+ =h @user.full_name
	4	+
	5	+ Current time is
	6	+ = format_short_time(Time.new)
	7	+ %br/
	8	+
	9	+ .task-menu
	10	+ Tasks:
	11	+ - @problems.each do \|problem\|
	12	+ = link_to problem.name, :action => 'submission', :id => problem.name
	13	+
	14	+ - if @submissions!=nil
	15	+ %table.info
	16	+ %tr.info-head
	17	+ %th.info Sub #
	18	+ %th.info Time
	19	+ %th.info Source
	20	+ %th.info Results
	21	+ %th.info{:width => "300px"}
	22	+ Compiler message
	23	+ = render :partial => 'submission', :collection => @submissions
	24	+

app/controllers/main_controller.rb ¶ +12

                     elsif Task.create(:submission_id => @submission.id,
                                       :status => Task::STATUS_INQUEUE) == false
               	flash[:notice] = 'Error adding your submission to task queue'
                     end
                   else
                     prepare_list_information
                     render :action => 'list' and return
                   end
                   redirect_to :action => 'list'
                 end
                 def get_source
                   submission = Submission.find(params[:id])
                   if submission.user_id == session[:user_id]
                     fname = submission.problem.name + '.' + submission.language.ext
                     send_data(submission.source,
               		{:filename => fname,
                                 :type => 'text/plain'})
                   else
                     flash[:notice] = 'Error viewing source'
                     redirect_to :action => 'list'
                   end
                 end
+            +   def submission
+            +     @user = User.find(session[:user_id])
+            +     @problems = Problem.find_available_problems
+            +     if params[:id]==nil
+            +       @problem = nil
+            +       @submissions = nil
+            +     else
+            +       @problem = Problem.find_by_name(params[:id])
+            +       @submissions = Submission.find_all_by_user_problem(@user.id, @problem.id)
+            +     end
+            +   end
+            +
                 protected
                 def prepare_list_information
                   @problems = Problem.find_available_problems
                   @prob_submissions = Array.new
                   @user = User.find(session[:user_id])
                   @problems.each do |p|
                     sub = Submission.find_last_by_user_and_problem(@user.id,p.id)
                     if sub!=nil
                       @prob_submissions << { :count => sub.number, :submission => sub }
                     else
                       @prob_submissions << { :count => 0, :submission => nil }
                     end
                   end
                 end
               end

app/helpers/application_helper.rb ¶ +1

               # Methods added to this helper will be available to all templates in the application.
               module ApplicationHelper
                 def user_header
                   menu_items = ''
                   user = User.find(session[:user_id])
                   # main page
                   append_to menu_items, '[Main]', 'main', 'list'
+            +     append_to menu_items, '[Submissions]', 'main', 'submission'
                   append_to menu_items, '[Test]', 'test', 'index'
                   # admin menu
                   if (user!=nil) and (user.admin?)
                     append_to menu_items, '[Problem admin]', 'problems', 'index'
                     append_to menu_items, '[User admin]', 'user_admin', 'index'
                     append_to menu_items, '[User stat]', 'user_admin', 'user_stat'
                   end
                   # general options
                   append_to menu_items, '[Settings]', 'users', 'index'
                   append_to menu_items, '[Log out]', 'main', 'login'
                   menu_items
                 end
                 def append_to(option,label, controller, action)
                   option << ' ' if option!=''
                   option << link_to_unless_current(label,
                                                    :controller => controller,
                                                    :action => action)
                 end
               end

app/models/submission.rb ¶ +8

               			   "WHERE subs.user_id = submissions.user_id AND " +
                                          "problem_id = " + problem_id.to_s + " " +
               			   "GROUP BY user_id)")
                 end
                 def self.find_last_for_all_available_problems(user_id)
                   submissions = Array.new
                   problems = Problem.find_available_problems
                   problems.each do |problem|
                     sub = Submission.find_last_by_user_and_problem(user_id, problem.id)
                     submissions << sub if sub!=nil
                   end
                   submissions
                 end
                 def self.find_by_user_problem_number(user_id, problem_id, number)
                   Submission.find(:first,
                                   :conditions => {
                                     :user_id => user_id,
                                     :problem_id => problem_id,
                                     :number => number
                                   })
                 end
+            +   def self.find_all_by_user_problem(user_id, problem_id)
+            +     Submission.find(:all,
+            +                     :conditions => {
+            +                       :user_id => user_id,
+            +                       :problem_id => problem_id,
+            +                     })
+            +   end
+            +
                 protected
                 def self.find_option_in_source(option, source)
                   if source==nil
                     return nil
                   end
                   i = 0
                   source.each_line do |s|
                     if s =~ option
               	words = s.split
               	return words[1]
                     end
                     i = i + 1
                     if i==10
               	return nil
                     end
                   end
                   return nil
                 end
                 def self.find_language_in_source(source)
                   langopt = find_option_in_source(/^LANG:/,source)
                   if language = Language.find_by_name(langopt)
                     return language

app/views/main/_compiler_message.html.erb ¶ +12 -7

@@ -1,10 +1,15
1	- <div><div><a href="#" onClick="n = this.parentNode.parentNode.lastChild;	1	+
		2	+ <% if compiler_message==nil or compiler_message=='' %>
		3	+ No message
		4	+ <% else %>
		5	+ <div><div><a href="#" onClick="n = this.parentNode.parentNode.lastChild;
2	if(n.style.display == 'none') { n.style.display = 'block'; }	6	if(n.style.display == 'none') { n.style.display = 'block'; }
3	else {n.style.display ='none'; } return false;">	7	else {n.style.display ='none'; } return false;">
4	- Compiler message</a> (click to see)	8	+ (click to see)</a>
5	- </div>
6	- <div style="display: none">
7	- <div class="compilermsgbody" style="border: thin solid grey; margin: 2px">
8	- <%=h(compiler_message).gsub(/\n/,'<br/>') %>
9	</div>	9	</div>
10	- </div></div>	10	+ <div style="display: none">
		11	+ <div class="compilermsgbody" style="border: thin solid grey; margin: 2px">
		12	+ <%=h(compiler_message).gsub(/\n/,'<br/>') %>
		13	+ </div>
		14	+ </div></div>
		15	+ <% end %>

app/views/main/_problem.html.erb ¶ +1 -1

               <tr class="info-<%= (problem_counter%2==0) ? "even" : "odd" %>">
                 <td class="info">
                   <%= "#{problem_counter + 1}" %>
                 </td>
                 <td class="info">
                   <%= "#{problem.full_name} (#{problem.name})" %>
                   <%= link_to '[desc]', problem.url, :popup => true if (problem.url!=nil) and (problem.url!='') %>
                 </td>
                 <td class="info" align="center">
                   <%= @prob_submissions[problem_counter][:count] %>
                 </td>
                 <td class="info">
-            -     <%= render :partial => 'submission',
+            +     <%= render :partial => 'submission_short',
                              :locals => { :submission => @prob_submissions[problem_counter][:submission]} %>
                 </td>
               </tr>

app/views/main/_submission.html.haml ¶ +13 -12

@@ -1,13 +1,14
1		1
2	- - if submission==nil	2	+ %tr{:class => ((submission_counter%2==0) ? "info-even" : "info-odd")}
3	- = "-"	3	+ %td.info{:align => "center"}
4	- - else	4	+ = submission_counter+1
5	- - if submission.graded_at==nil	5	+ %td.info= format_short_time(submission.submitted_at)
6	- Submitted at	6	+ %td.info= link_to('[source]',{:action => 'get_source', :id => submission.id})
7	- = format_short_time(submission.submitted_at)	7	+ %td.info
8	- - else	8	+ - if submission.graded_at!=nil
9	- = "Graded at #{format_short_time(submission.graded_at)}, "	9	+ = "Graded at #{format_short_time(submission.graded_at)}."
10	- = "score: #{submission.points} "	10	+ %br/
11	- = " [" + submission.grader_comment + "]"	11	+ = "Score: #{submission.points} "
12	- = " \| "	12	+ = " [" + submission.grader_comment + "]"
13	- = link_to('[source]',{:action => 'get_source', :id => submission.id})	13	+ %td.info
		14	+ = render :partial => 'compiler_message', :locals => {:compiler_message => submission.compiler_message }

app/views/test/_test_request.html.haml ¶ +9 -9

@@ -1,11 +1,11
1	- %tr.test-request	1	+ %tr{:class => (test_request_counter%2==0) ? "info-even" : "info-odd"}
2	- %td= test_request_counter +1	2	+ %td.info= test_request_counter +1
3	- %td= test_request.problem.full_name	3	+ %td.info= test_request.problem.full_name
4	- %td= test_request.submission.number	4	+ %td.info= test_request.submission.number
5	- %td= test_request.status_str	5	+ %td.info= test_request.status_str
6	- %td= test_request.running_stat or ''	6	+ %td.info= test_request.running_stat or ''
7	- %td	7	+ %td.info
8	- if test_request.output_file_name!=nil	8	- if test_request.output_file_name!=nil
9	= link_to '[output]', :action => 'read', :id => test_request.id	9	= link_to '[output]', :action => 'read', :id => test_request.id
10	- %td= test_request.grader_comment or ''	10	+ %td.info= test_request.grader_comment or ''
11	- %td= test_request.compiler_message or ''	11	+ %td.info= test_request.compiler_message or ''

app/views/test/index.html.erb ¶ +12 -12

                 for(i=0; i<count; i++) {
                   submissionSelect.options[i] = new Option(""+(i+1),""+(i+1),false,false);
                 }
               }
               </script>
               <% form_for :test_request, nil,
                           :url => { :action => 'submit'},
                           :html => { :multipart => true } do |f| %>
                 <table>
                   <tr>
                     <td>Task:</td>
                     <td>
               	<%= select(:test_request,
               	           :problem_id,
               	           @problems.collect {|p| [p.name, p.id]}, {},
               	           { :onclick => "updateSubmissionList();" }) %>
                     </td>
                   </tr>
                   <tr>
                     <td>Submission:</td>
                     <td>
               	<%= select(:test_request,
               	           :submission_number,
-            - 	           (1..@submissions[0].number).collect {|n| [n,n]}) %>
+            + 	           ((1..@submissions[0].number).collect {|n| [n,n]}).reverse) %>
                     </td>
                   </tr>
                   <tr>
                     <td>Input data:</td>
                     <td><%= f.file_field :input_file %></td>
                   <tr>
                     <td colspan="2">
                       <%= submit_tag 'submit' %>
                     </td>
                   </tr>
                 </table>
               <% end %>
               <h3>Previous requests</h3>
-            - <table border="1">
+            + <table class="info">
-            -   <tr>
+            +   <tr class="info-head">
-            -     <th></td>
+            +     <th class="info"></td>
-            -     <th>problem</th>
+            +     <th class="info">problem</th>
-            -     <th>#</th>
+            +     <th class="info">#</th>
-            -     <th>status</th>
+            +     <th class="info">status</th>
-            -     <th>running stat</th>
+            +     <th class="info">running stat</th>
-            -     <th>output (first 2kb)</th>
+            +     <th class="info">output (first 2kb)</th>
-            -     <th>grading comment</th>
+            +     <th class="info">grading comment</th>
-            -     <th>compiler message</th>
+            +     <th class="info">compiler message</th>
                 </tr>
-            - <%= render :partial => 'test_request', :collection => @user.test_requests %>
+            +   <%= render :partial => 'test_request', :collection => @user.test_requests %>
               </table>
               <% end %>

public/stylesheets/application.css ¶ +11 -22

               p {
                   font-size: 12px;
               }
               div.title {
                   font-size: 20px;
                   font-weight: bold;
                   background: lightgreen;
                   padding: 2px;
               }
-            - div.problist-each {
-            -     margin-top: 2px;
-            -     margin-bottom: 2px
-            - }
               div.userbar {
                   border-top: thin solid grey;
                   border-bottom: thin solid grey;
                   text-align: right;
                   font-size: 12px;
               }
-            - div.probname {
-            -     background-color: #eeeeee;
-            -     font-weight: bold;
-            -     padding: 2px;
-            -     border: 1px solid black;
-            - }
-            - div.subinfo {
-            -     margin-left: 20px;
-            -     margin-top: 2px;
-            -     border-bottom: thin solid grey;
-            -     border-left: thin solid grey;
-            -     font-size: 12px;
-            - }
               div.compilermsgbody {
                   font-family: monospace;
               }
               div.submitbox {
                   border: thin solid black;
                   padding: 5px;
                   color: white;
                   background-color: #777777;
                   font-weight: bold;
+            +     font-size: 13px;
               }
               table.uinfo {
                   border-collapse: collapse;
                   border: 1px solid black;
                   font-size: 13px;
               }
               td.uinfo {
                   vertical-align: top;
                   border: 1px solid black;
                   padding: 5px;
               }
               th.uinfo {
                   background: lightgreen;
                   vertical-align: top;
                   text-align: right;
                   border: 1px solid black;
                   padding: 5px;
               }
               table.info {
                   border: 1px solid black;
                   border-collapse: collapse;
                   font-size: 12px;
               }
               th.info, td.info {
                   border: 1px solid black;
               }
               tr.info-head {
                   background: #777777;
                   color: white;
               }
               tr.info-odd {
                   background: #dddddd;
               }
               tr.info-even {
                   background: #eeeeee;
               }
+            +
+            + div.task-menu {
+            +     text-align: center;
+            +     font-size: 13px;
+            +     font-weight: bold;
+            +     border-top: 1px solid black;
+            +     border-bottom: 1px solid black;
+            +     margin-top: 2px;
+            +     margin-bottom: 4px;
+            + }

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

r51:1f6cfc6a5b62 - Thu, 13 Mar 2008 01:21:00 - 11 files changed: 116 inserted, 63 deleted

Sign in to your account

Commit r51:1f6cfc6a5b62 public

Author

r51:1f6cfc6a5b62 - Thu, 13 Mar 2008 01:21:00 - 11 files changed: 116 inserted, 63 deleted

Commit `r51:1f6cfc6a5b62` public