cafe-grader-web Commit - r192:f7680fc5e3dd

cafe-grader-web

Commit `r192:f7680fc5e3dd` public

parent | child

Description:

added announcement refresh, more styling, prep for announcement hiding git-svn-id: http://theory.cpe.ku.ac.th/grader/web/trunk@412 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

r192:f7680fc5e3dd - Fri, 14 Aug 2009 23:16:41 - 7 files changed: 102 inserted, 10 deleted

config/.gitignore created 644 ¶ +4

			@@ -0,0 +1,4
		1	+ environment.rb
		2	+ database.yml
		3	+ tasks.yml
		4	+

public/javascripts/announcement_refresh.js created 644 ¶ +33

			@@ -0,0 +1,33
		1	+
		2	+ var Announcement = {
		3	+
		4	+ mostRecentId: 0,
		5	+
		6	+ setMostRecentId: function(id) {
		7	+ Announcement.mostRecentId = id;
		8	+ },
		9	+
		10	+ updateRecentId: function(id) {
		11	+ if(Announcement.mostRecentId < id)
		12	+ Announcement.mostRecentId = id;
		13	+ },
		14	+
		15	+ refreshAnnouncement: function() {
		16	+ var url = '/main/announcements';
		17	+ new Ajax.Request(url, {
		18	+ method: 'get',
		19	+ parameters: { recent: Announcement.mostRecentId },
		20	+ onSuccess: function(transport) {
		21	+ var announcementBody = $("announcementbox-body");
		22	+ announcementBody.insert({ top: transport.responseText });
		23	+ }
		24	+ });
		25	+ Announcement.registerRefreshEventTimer();
		26	+ },
		27	+
		28	+ registerRefreshEventTimer: function() {
		29	+ setTimeout(function () {
		30	+ Announcement.refreshAnnouncement();
		31	+ }, 30000);
		32	+ }
		33	+ }; No newline at end of file

.gitignore ¶ -2

               *~
               log
-            - config/environment.rb
-            - config/database.yml

app/controllers/main_controller.rb ¶ +27 -5

               class MainController < ApplicationController
                 SYSTEM_MODE_CONF_KEY = 'system.mode'
                 before_filter :authenticate, :except => [:index, :login]
                 before_filter :check_viewability, :except => [:index, :login]
                 # COMMENTED OUT: filter in each action instead
                 # before_filter :verify_time_limit, :only => [:submit]
                 verify :method => :post, :only => [:submit],
                        :redirect_to => { :action => :index }
                 # COMMENT OUT: only need when having high load
                 # caches_action :index, :login
                 # NOTE: This method is not actually needed, 'config/routes.rb' has
                 # assigned action login as a default action.
                 def index
                   redirect_to :action => 'login'
                 end
                 def login
                   saved_notice = flash[:notice]
                   reset_session
                   flash[:notice] = saved_notice
                   # EXPERIMENT:
                   # Hide login if in single user mode and the url does not
                   # explicitly specify /login
                   #
                   # logger.info "PATH: #{request.path}"
                   # if Configuration['system.single_user_mode'] and
                   #     request.path!='/main/login'
                   #   @hidelogin = true
                   # end
                   @announcements = Announcement.find_for_frontpage
                   render :action => 'login', :layout => 'empty'
                 end
                 def list
                   prepare_list_information
                 end
                 def help
                   @user = User.find(session[:user_id])
                 end
                 def submit
                   user = User.find(session[:user_id])
                   @submission = Submission.new(params[:submission])
                   @submission.user = user
                   @submission.language_id = 0
                   if (params['file']) and (params['file']!='')
                     @submission.source = params['file'].read
                     @submission.source_filename = params['file'].original_filename
                   end
                   @submission.submitted_at = Time.new.gmtime
                   if Configuration[SYSTEM_MODE_CONF_KEY]=='contest' and
                       user.site!=nil and user.site.finished?
                     @submission.errors.add_to_base "The contest is over."
                     prepare_list_information
                     render :action => 'list' and return
                   end
                   if @submission.valid?
                     if @submission.save == false
               	flash[:notice] = 'Error saving your submission'
                     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 source
                   submission = Submission.find(params[:id])
                   if submission.user_id == session[:user_id]
                     send_data(submission.source,
               		{:filename => submission.download_filename,
                                 :type => 'text/plain'})
                   else
                     flash[:notice] = 'Error viewing source'
                     redirect_to :action => 'list'
                   end
                 end
                 def compiler_msg
                   @submission = Submission.find(params[:id])
                   if @submission.user_id == session[:user_id]
                     render :action => 'compiler_msg', :layout => 'empty'
                   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])
                     if not @problem.available
                       redirect_to :action => 'list'
                       flash[:notice] = 'Error: submissions for that problem are not viewable.'
                       return
                     end
                     @submissions = Submission.find_all_by_user_problem(@user.id, @problem.id)
                   end
                 end
                 def result
                   if !Configuration.show_grading_result
                     redirect_to :action => 'list' and return
                   end
                   @user = User.find(session[:user_id])
                   @submission = Submission.find(params[:id])
                   if @submission.user!=@user
                     flash[:notice] = 'You are not allowed to view result of other users.'
                     redirect_to :action => 'list' and return
                   end
                   prepare_grading_result(@submission)
                 end
                 def load_output
                   if !Configuration.show_grading_result or params[:num]==nil
                     redirect_to :action => 'list' and return
                   end
                   @user = User.find(session[:user_id])
                   @submission = Submission.find(params[:id])
                   if @submission.user!=@user
                     flash[:notice] = 'You are not allowed to view result of other users.'
                     redirect_to :action => 'list' and return
                   end
                   case_num = params[:num].to_i
                   out_filename = output_filename(@user.login,
                                                  @submission.problem.name,
                                                  @submission.id,
                                                  case_num)
                   if !FileTest.exists?(out_filename)
                     flash[:notice] = 'Output not found.'
                     redirect_to :action => 'list' and return
                   end
                   response.headers['Content-Type'] = "application/force-download"
                   response.headers['Content-Disposition'] = "attachment; filename=\"output-#{case_num}.txt\""
                   response.headers["X-Sendfile"] = out_filename
                   response.headers['Content-length'] = File.size(out_filename)
                   render :nothing => true
                 end
                 def error
                   @user = User.find(session[:user_id])
                 end
+            +   # announcement refreshing and hiding methods
+            +
+            +   def announcements
+            +     if params.has_key? 'recent'
+            +       prepare_announcements(params[:recent])
+            +     else
+            +       prepare_announcements
+            +     end
+            +     render(:partial => 'announcement',
+            +            :collection => @announcements,
+            +            :locals => {:announcement_effect => true})
+            +   end
+            +
                 protected
+            +
+            +   def prepare_announcements(recent=nil)
+            +     if Configuration.show_tasks_to?(@user)
+            +       @announcements = Announcement.find_published(true)
+            +     else
+            +       @announcements = Announcement.find_published
+            +     end
+            +     if recent!=nil
+            +       recent_id = recent.to_i
+            +       @announcements = @announcements.find_all { |a| a.id > recent_id }
+            +     end
+            +   end
+            +
                 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
-            -     if Configuration.show_tasks_to?(@user)
-            -       @announcements = Announcement.find_published(true)
-            -     else
-            -       @announcements = Announcement.find_published
-            -     end
+            +     prepare_announcements
                 end
                 def check_viewability
                   @user = User.find(session[:user_id])
                   if (!Configuration.show_tasks_to?(@user)) and
                       ((action_name=='submission') or (action_name=='submit'))
                     redirect_to :action => 'list' and return
                   end
                 end
                 def prepare_grading_result(submission)
                   grading_info = Configuration.task_grading_info[submission.problem.name]
                   @test_runs = []
                   if grading_info['testruns'].is_a? Integer
                     trun_count = grading_info['testruns']
                     trun_count.times do |i|
                       @test_runs << [ read_grading_result(@user.login,
                                                           submission.problem.name,
                                                           submission.id,
                                                           i+1) ]
                     end
                   else
                     grading_info['testruns'].keys.sort.each do |num|
                       run = []
                       testrun = grading_info['testruns'][num]
                       testrun.each do |c|
                         run << read_grading_result(@user.login,
                                                    submission.problem.name,
                                                    submission.id,
                                                    c)
                       end
                       @test_runs << run
                     end
                   end
                 end
                 def grading_result_dir(user_name, problem_name, submission_id, case_num)
                   return "#{GRADING_RESULT_DIR}/#{user_name}/#{problem_name}/#{submission_id}/test-result/#{case_num}"
                 end
                 def output_filename(user_name, problem_name, submission_id, case_num)
                   dir = grading_result_dir(user_name,problem_name, submission_id, case_num)
                   return "#{dir}/output.txt"
                 end
                 def read_grading_result(user_name, problem_name, submission_id, case_num)
                   dir = grading_result_dir(user_name,problem_name, submission_id, case_num)
                   result_file_name = "#{dir}/result"
                   if !FileTest.exists?(result_file_name)
                     return {:num => case_num, :msg => 'program did not run'}
                   else
                     results = File.open(result_file_name).readlines
                     run_stat = extract_running_stat(results)
                     output_filename = "#{dir}/output.txt"
                     if FileTest.exists?(output_filename)
                       output_file = true
                       output_size = File.size(output_filename)
                     else
                       output_file = false
                       output_size = 0
                     end
                     return {
                       :num => case_num,
                       :msg => results[0],
                       :run_stat => run_stat,
                       :output => output_file,
                       :output_size => output_size
                     }
                   end
                 end
                 # copied from grader/script/lib/test_request_helper.rb
                 def extract_running_stat(results)
                   running_stat_line = results[-1]
                   # extract exit status line
                   run_stat = ""
                   if !(/[Cc]orrect/.match(results[0]))
                     run_stat = results[0].chomp
                   else
                     run_stat = 'Program exited normally'
                   end
                   logger.info "Stat line: #{running_stat_line}"
                   # extract running time
                   if res = /r(.*)u(.*)s/.match(running_stat_line)
                     seconds = (res[1].to_f + res[2].to_f)
                     time_stat = "Time used: #{seconds} sec."
                   else
                     seconds = nil
                     time_stat = "Time used: n/a sec."
                   end
                   # extract memory usage
                   if res = /s(.*)m/.match(running_stat_line)
                     memory_used = res[1].to_i
                   else
                     memory_used = -1
                   end
                   return {
                     :msg => "#{run_stat}\n#{time_stat}",
                     :running_time => seconds,
                     :exit_status => run_stat,
                     :memory_usage => memory_used
                   }
                 end
               end

app/views/main/_announcement.html.haml ¶ +14 -1

		@@ -1,4 +1,17
1		- .announcement
	1	+ .announcement{:id => "announcement-#{announcement.id}", :style => "#{'opacity: 0;' if (defined? announcement_effect) and announcement_effect }"}
	2	+ -# .announcement-title
	3	+ -# .toggles
	4	+ -# %a{:href => '#', :onclick => "$(\"announcement-body-#{announcement.id}\").hide(); return false;"}
	5	+ -# [hide]
	6	+ -# %a{:href => '#', :onclick => "$(\"announcement-body-#{announcement.id}\").show(); return false;"}
	7	+ -# [show]
	8	+ -# Announcement Title
	9	+ .announcement-body{:id => "announcement-body-#{announcement.id}"}
2	10	= markdown(announcement.body)
3	11	-#.pub-info
4	12	-# %p= "#{announcement.author}, #{announcement.created_at}"
	13	+ :javascript
	14	+ Announcement.updateRecentId(#{announcement.id});
	15	+ - if (defined? announcement_effect) and announcement_effect
	16	+ :javascript
	17	+ $("announcement-#{announcement.id}").appear();

app/views/main/list.html.haml ¶ +10 -1

+            + - content_for :head do
+            +   = javascript_include_tag :defaults
+            +   %script{:type => 'text/javascript', :src => '/javascripts/announcement_refresh.js'}
+            +
               = user_title_bar(@user)
               - if @announcements.length!=0
                 .announcementbox
                   %span{:class => 'title'}
                     Announcements
+            +     #announcementbox-body
                   = render :partial => 'announcement', :collection => @announcements
               - if Configuration.show_submitbox_to?(@user)
                 .submitbox
                   = error_messages_for 'submission'
                   = render :partial => 'submission_box'
               %hr/
-            - - if (Configuration.contest_mode) and (@user.site!=nil) and (@user.site.started!=true)
+            + - if (Configuration.contest_mode) and (@user.site!=nil)  |
+            +   and (@user.site.started!=true)
                 %p=t 'main.start_soon'
               - if Configuration.show_tasks_to?(@user)
                 %table.info
                   %tr.info-head
                     %th
                     %th Tasks
                     %th # of sub(s)
                     %th Results
                   = render :partial => 'problem', :collection => @problems
               %hr/
+            + :javascript
+            +   Announcement.registerRefreshEventTimer();
+            +

public/stylesheets/application.css ¶ +14 -1

                   text-align: right;
                   font-size: 12px;
               }
               /* This is the top bar, displaying user's full name */
               div.title {
                   // background: #ddddff;
                   // border: 1px dashed blue;
                   padding: 10px 0px;
                   line-height: 1.5em;
                   font-size: 13px;
               }
               div.title span.contest-over-msg {
                   font-size: 15px;
                   color: red;
               }
               div.title table {
                   width: 100%;
               }
               div.title td.left-col {
                   text-align: left;
                   vertical-align: top;
                   color: #444444;
               }
               div.title td.right-col {
                   text-align: right;
                   vertical-align: top;
                   font-size: 14px;
                   font-weight: bold;
                   color: #116699;
               }
               /* Standard table with header and rows with alternating background */
               table.info {
                   margin: 10px 0;
                   border: 1px solid #666666;
                   border-collapse: collapse;
                   font-size: 12px;
               }
               table.info th {
                   border: 1px solid #666666;
                   line-height: 1.5em;
                   padding: 0 0.5em;
               }
               table.info td {
                   border-left: 1px solid #666666;
                   border-right: 1px solid #666666;
                   line-height: 1.5em;
                   padding: 0 0.5em;
               }
               tr.info-head {
                   background: #777777;
                   color: white;
               }
               tr.info-odd {
                   background: #eeeeee;
               }
               tr.info-even {
                   background: #f9f9f9;
               }
               /*******************************
                [Main]
               ********************************/
               div.submitbox {
                   background: #eeeeff;
                   border: 1px dotted #99aaee;
                   padding: 5px;
                   margin: 10px 0px;
                   color: black;
                   font-weight: bold;
                   font-size: 13px;
               }
               div.errorExplanation {
                   border: 1px dotted gray;
                   color: #bb2222;
                   padding: 5px 15px 5px 15px;
                   margin-bottom: 5px;
                   background-color: white;
               }
               /*******************************
                [Settings]
               ********************************/
               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;
               }
               /*******************************
                [Submission]
               ********************************/
               div.compilermsgbody {
                   font-family: monospace;
               }
               div.task-menu {
                   text-align: center;
                   font-size: 13px;
                   line-height: 1.75em;
                   font-weight: bold;
                   border-top: 1px dashed gray;
                   border-bottom: 1px dashed gray;
                   margin-top: 2px;
                   margin-bottom: 4px;
               }
               /*******************************
                [Submission]
               ********************************/
               table.taskdesc {
                   border: 2px solid #dddddd;
                   border-collapse: collapse;
                   margin: 10px auto;
                   width: 90%;
                   font-size: 13px;
               }
               table.taskdesc p {
                   font-size: 13px;
               }
               table.taskdesc tr.name {
                   border: 2px solid #dddddd;
                   background: #dddddd;
                   color: #333333;
                   font-weight: bold;
                   font-size: 14px;
                   line-height: 1.5em;
                   text-align: center;
               }
               table.taskdesc td.desc-odd {
                   padding: 5px;
                   padding-left: 20px;
                   background: #fefeee;
               }
               table.taskdesc td.desc-even {
                   padding: 5px;
                   padding-left: 20px;
                   background: #feeefe;
               }
               /**********************
                  Announcement
               ***********************/
               div.announcementbox {
                   margin: 10px 0px;
                   background: #bbddee;
                   padding: 1px;
               }
               div.announcementbox span.title {
                   font-weight: bold;
                   color: #224455;
                   padding-left: 10px;
                   line-height: 1.6em;
               }
               div.announcement {
                   margin: 2px;
                   background: white;
                   padding: 1px;
                   padding-left: 10px;
                   padding-right: 10px;
+            +     padding-top: 5px;
+            +     padding-bottom: 5px;
               }
-            - div.announcement p {
+            + .announcement p {
                   font-size: 12px;
+            +     margin: 2px;
               }
               div.pub-info, div.pub-info p {
                   text-align: right;
                   font-style: italic;
                   font-size: 9px;
               }
+            + .announcement .toggles {
+            +     font-weight: normal;
+            +     float: right;
+            +     font-size: 80%;
+            + }
+            +
+            + .announcement .announcement-title {
+            +     font-weight: bold;
+            + }
+            +
               /******************
                  Messages
               ******************/
               div.message {
                   margin: 10px 0 0;
               }
               div.message div.message {
                   margin: 0 0 0 30px;
               }
               div.message div.body {
                   border: 2px solid #dddddd;
                   background: #fff8f8;
                   padding-left: 5px;
               }
               div.message div.reply-body {
                   border: 2px solid #bbbbbb;
                   background: #fffff8;
                   padding-left: 5px;
               }
               div.message div.stat {
                   font-size: 10px;
                   line-height: 1.75em;
                   padding: 0 5px;
                   color: #333333;
                   background: #dddddd;
                   font-weight: bold;
               }
               div.message div.message div.stat {
                   font-size: 10px;
                   line-height: 1.75em;
                   padding: 0 5px;
                   color: #444444;
                   background: #bbbbbb;
                   font-weight: bold;
               }
               /********************
                  Registration
               ********************/
               div.contest-title {
                   color: white;
                   text-align: center;
                   line-height: 2em;
               }
               div.registration-desc {
                   border: 1px dotted gray;
                   background: #f5f5f5;
                   padding: 5px;
                   margin: 10px 0;
                   font-size: 12px;
                   line-height: 1.5em;
               }
               /********************
                 [Test Interface]
               ********************/
               div.test-desc {
                   border: 1px dotted gray;
                   background: #f5f5f5;
                   padding: 5px;
                   margin: 10px 0;
                   font-size: 12px;
                   line-height: 1.5em;
               }

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

r192:f7680fc5e3dd - Fri, 14 Aug 2009 23:16:41 - 7 files changed: 102 inserted, 10 deleted

Sign in to your account

Commit r192:f7680fc5e3dd public

Author

r192:f7680fc5e3dd - Fri, 14 Aug 2009 23:16:41 - 7 files changed: 102 inserted, 10 deleted

Commit `r192:f7680fc5e3dd` public