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: 106 inserted, 14 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

                     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 = []

app/views/main/_announcement.html.haml ¶ +17 -4

		@@ -1,4 +1,17
1		- .announcement
2		- = markdown(announcement.body)
3		- -#.pub-info
4		- -# %p= "#{announcement.author}, #{announcement.created_at}"
	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}"}
	10	+ = markdown(announcement.body)
	11	+ -#.pub-info
	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 ¶ +11 -2

+            + - 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
-            -     = render :partial => 'announcement', :collection => @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

               /**********************
                  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;
               }

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: 106 inserted, 14 deleted

Sign in to your account

Commit r192:f7680fc5e3dd public

Author

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

Commit `r192:f7680fc5e3dd` public