cafe-grader-web Commit - r151:2e9ddcc1b233

cafe-grader-web

Commit `r151:2e9ddcc1b233` public

parent | child

Description:

added announcement to frontpage git-svn-id: http://theory.cpe.ku.ac.th/grader/web/trunk@290 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

r151:2e9ddcc1b233 - Fri, 07 Nov 2008 15:24:13 - 7 files changed: 38 inserted, 5 deleted

app/controllers/main_controller.rb ¶ +2 -4

                   @country_select_with_all = [['Any',0]]
                   @countries.each do |country|
                     @country_select_with_all << [country.name, country.id]
                   end
                   @site_select = []
                   @countries.each do |country|
                     country.sites.each do |site|
                       @site_select << ["#{site.name}, #{country.name}", site.id]
                     end
                   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
                 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
+            +     @announcements = Announcement.find_published
-            -     @announcements = Announcement.find(:all,
-            -                                        :conditions => "published = 1",
-            -                                        :order => "created_at DESC")
                 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]

app/models/announcement.rb ¶ +13

@@ -1,2 +1,15
1	class Announcement < ActiveRecord::Base	1	class Announcement < ActiveRecord::Base
		2	+
		3	+ def self.find_published
		4	+ Announcement.find(:all,
		5	+ :conditions => "(published = 1) AND (frontpage = 0)",
		6	+ :order => "created_at DESC")
2	end	7	end
		8	+
		9	+ def self.find_for_frontpage
		10	+ Announcement.find(:all,
		11	+ :conditions => "(published = 1) AND (frontpage = 1)",
		12	+ :order => "created_at DESC")
		13	+ end
		14	+
		15	+ end

app/views/announcements/edit.html.erb ¶ +5

                 <p>
                   <b>Author</b><br />
                   <%= f.text_field :author %>
                 </p>
                 <p>
                   <b>Published</b><br />
                   <%= f.check_box :published %>
                 </p>
                 <p>
+            +     <b>Show on front page?</b><br />
+            +     <%= f.check_box :frontpage %>
+            +   </p>
+            +
+            +   <p>
                   <%= f.submit "Update" %>
                 </p>
               <% end %>
               <%= link_to 'Show', @announcement %> |
               <%= link_to 'Back', announcements_path %>

app/views/announcements/new.html.erb ¶ +5

                 <p>
                   <b>Author</b><br />
                   <%= f.text_field :author %>
                 </p>
                 <p>
                   <b>Published</b><br />
                   <%= f.check_box :published %>
                 </p>
                 <p>
+            +     <b>Show on front page?</b><br />
+            +     <%= f.check_box :frontpage %>
+            +   </p>
+            +
+            +   <p>
                   <%= f.submit "Create" %>
                 </p>
               <% end %>
               <%= link_to 'Back', announcements_path %>

app/views/announcements/show.html.erb ¶ +5

               </p>
               <p>
                 <b>Body:</b>
                 <%=h @announcement.body %>
               </p>
               <p>
                 <b>Published:</b>
                 <%=h @announcement.published %>
               </p>
+            + <p>
+            +   <b>Show on front page:</b>
+            +   <%=h @announcement.frontpage %>
+            + </p>
+            +
               <%= link_to 'Edit', edit_announcement_path(@announcement) %> |
               <%= link_to 'Back', announcements_path %>

app/views/main/login.html.haml ¶ +6

               %h1= Configuration['ui.front.title']
+            + - if @announcements.length!=0
+            +   .announcementbox
+            +     %span{:class => 'title'}
+            +       Announcements
+            +     = render :partial => 'announcement', :collection => @announcements
+            +
               %b= Configuration['ui.front.welcome_message']
               %br/
               Please login to see the problem list.
               %br/
               %br/
               - if flash[:notice]
                 %hr/
                 %b= flash[:notice]
                 %hr/
               %div{ :style => "border: solid 1px gray; padding: 2px; background: #f0f0f0;"}

db/schema.rb ¶ +2 -1

               # This file is auto-generated from the current state of the database. Instead of editing this file,
               # please use the migrations feature of Active Record to incrementally modify your database, and
               # then regenerate this schema definition.
               #
               # Note that this schema.rb definition is the authoritative source for your database schema. If you need
               # to create the application database on another system, you should be using db:schema:load, not running
               # all the migrations from scratch. The latter is a flawed and unsustainable approach (the more migrations
               # you'll amass, the slower it'll run and the greater likelihood for issues).
               #
               # It's strongly recommended to check this file into your version control system.
-            - ActiveRecord::Schema.define(:version => 20081012050458) do
+            + ActiveRecord::Schema.define(:version => 20081107145815) do
                 create_table "announcements", :force => true do |t|
                   t.string   "author"
                   t.text     "body"
                   t.boolean  "published"
                   t.datetime "created_at"
                   t.datetime "updated_at"
+            +     t.boolean  "frontpage",  :default => false
                 end
                 create_table "configurations", :force => true do |t|
                   t.string   "key"
                   t.string   "value_type"
                   t.string   "value"
                   t.datetime "created_at"
                   t.datetime "updated_at"
                 end
                 create_table "countries", :force => true do |t|
                   t.string   "name"

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

Commit r151:2e9ddcc1b233 public

Author

r151:2e9ddcc1b233 - Fri, 07 Nov 2008 15:24:13 - 7 files changed: 38 inserted, 5 deleted

Commit `r151:2e9ddcc1b233` public