cafe-grader-web Commit - r97:bd747ee8a498

cafe-grader-web

Commit `r97:bd747ee8a498` public

parent | child

Description:

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

r97:bd747ee8a498 - Fri, 18 Apr 2008 04:54:49 - 18 files changed: 336 inserted, 1 deleted

app/controllers/announcements_controller.rb created 644 ¶ +91

@@ -0,0 +1,91
	1	+ class AnnouncementsController < ApplicationController
	2	+
	3	+ before_filter :authenticate
	4	+ before_filter { \|controller\| controller.authorization_by_roles(['admin'])}
	5	+
	6	+ in_place_edit_for :announcement, :published
	7	+
	8	+ # GET /announcements
	9	+ # GET /announcements.xml
	10	+ def index
	11	+ @announcements = Announcement.find(:all)
	12	+
	13	+ respond_to do \|format\|
	14	+ format.html # index.html.erb
	15	+ format.xml { render :xml => @announcements }
	16	+ end
	17	+ end
	18	+
	19	+ # GET /announcements/1
	20	+ # GET /announcements/1.xml
	21	+ def show
	22	+ @announcement = Announcement.find(params[:id])
	23	+
	24	+ respond_to do \|format\|
	25	+ format.html # show.html.erb
	26	+ format.xml { render :xml => @announcement }
	27	+ end
	28	+ end
	29	+
	30	+ # GET /announcements/new
	31	+ # GET /announcements/new.xml
	32	+ def new
	33	+ @announcement = Announcement.new
	34	+
	35	+ respond_to do \|format\|
	36	+ format.html # new.html.erb
	37	+ format.xml { render :xml => @announcement }
	38	+ end
	39	+ end
	40	+
	41	+ # GET /announcements/1/edit
	42	+ def edit
	43	+ @announcement = Announcement.find(params[:id])
	44	+ end
	45	+
	46	+ # POST /announcements
	47	+ # POST /announcements.xml
	48	+ def create
	49	+ @announcement = Announcement.new(params[:announcement])
	50	+
	51	+ respond_to do \|format\|
	52	+ if @announcement.save
	53	+ flash[:notice] = 'Announcement was successfully created.'
	54	+ format.html { redirect_to(@announcement) }
	55	+ format.xml { render :xml => @announcement, :status => :created, :location => @announcement }
	56	+ else
	57	+ format.html { render :action => "new" }
	58	+ format.xml { render :xml => @announcement.errors, :status => :unprocessable_entity }
	59	+ end
	60	+ end
	61	+ end
	62	+
	63	+ # PUT /announcements/1
	64	+ # PUT /announcements/1.xml
	65	+ def update
	66	+ @announcement = Announcement.find(params[:id])
	67	+
	68	+ respond_to do \|format\|
	69	+ if @announcement.update_attributes(params[:announcement])
	70	+ flash[:notice] = 'Announcement was successfully updated.'
	71	+ format.html { redirect_to(@announcement) }
	72	+ format.xml { head :ok }
	73	+ else
	74	+ format.html { render :action => "edit" }
	75	+ format.xml { render :xml => @announcement.errors, :status => :unprocessable_entity }
	76	+ end
	77	+ end
	78	+ end
	79	+
	80	+ # DELETE /announcements/1
	81	+ # DELETE /announcements/1.xml
	82	+ def destroy
	83	+ @announcement = Announcement.find(params[:id])
	84	+ @announcement.destroy
	85	+
	86	+ respond_to do \|format\|
	87	+ format.html { redirect_to(announcements_url) }
	88	+ format.xml { head :ok }
	89	+ end
	90	+ end
	91	+ end

app/helpers/announcements_helper.rb created 644 ¶ +2

@@ -0,0 +1,2
	1	+ module AnnouncementsHelper
	2	+ end

app/models/announcement.rb created 644 ¶ +2

@@ -0,0 +1,2
	1	+ class Announcement < ActiveRecord::Base
	2	+ end

app/views/announcements/edit.html.erb created 644 ¶ +27

@@ -0,0 +1,27
	1	+ <h1>Editing announcement</h1>
	2	+
	3	+ <%= error_messages_for :announcement %>
	4	+
	5	+ <% form_for(@announcement) do \|f\| %>
	6	+ <p>
	7	+ <b>Body</b><br />
	8	+ <%= f.text_area :body %>
	9	+ </p>
	10	+
	11	+ <p>
	12	+ <b>Author</b><br />
	13	+ <%= f.text_field :author %>
	14	+ </p>
	15	+
	16	+ <p>
	17	+ <b>Published</b><br />
	18	+ <%= f.check_box :published %>
	19	+ </p>
	20	+
	21	+ <p>
	22	+ <%= f.submit "Update" %>
	23	+ </p>
	24	+ <% end %>
	25	+
	26	+ <%= link_to 'Show', @announcement %> \|
	27	+ <%= link_to 'Back', announcements_path %>

app/views/announcements/index.html.erb created 644 ¶ +30

@@ -0,0 +1,30
	1	+ <% content_for :head do %>
	2	+ <%= stylesheet_link_tag 'scaffold' %>
	3	+ <%= javascript_include_tag :defaults %>
	4	+ <% end %>
	5	+
	6	+ <h1>Listing announcements</h1>
	7	+
	8	+ <table>
	9	+ <tr>
	10	+ <th>Body</th>
	11	+ <th>Author</th>
	12	+ <th>Published</th>
	13	+ </tr>
	14	+
	15	+ <% for announcement in @announcements %>
	16	+ <tr>
	17	+ <% @announcement = announcement %>
	18	+ <td><%=h announcement.body %></td>
	19	+ <td><%=h announcement.author %></td>
	20	+ <td><%= in_place_editor_field :announcement, :published, {}, :rows => 1 %></td>
	21	+ <td><%= link_to 'Show', announcement %></td>
	22	+ <td><%= link_to 'Edit', edit_announcement_path(announcement) %></td>
	23	+ <td><%= link_to 'Destroy', announcement, :confirm => 'Are you sure?', :method => :delete %></td>
	24	+ </tr>
	25	+ <% end %>
	26	+ </table>
	27	+
	28	+ <br />
	29	+
	30	+ <%= link_to 'New announcement', new_announcement_path %>

app/views/announcements/new.html.erb created 644 ¶ +26

@@ -0,0 +1,26
	1	+ <h1>New announcement</h1>
	2	+
	3	+ <%= error_messages_for :announcement %>
	4	+
	5	+ <% form_for(@announcement) do \|f\| %>
	6	+ <p>
	7	+ <b>Body</b><br />
	8	+ <%= f.text_area :body %>
	9	+ </p>
	10	+
	11	+ <p>
	12	+ <b>Author</b><br />
	13	+ <%= f.text_field :author %>
	14	+ </p>
	15	+
	16	+ <p>
	17	+ <b>Published</b><br />
	18	+ <%= f.check_box :published %>
	19	+ </p>
	20	+
	21	+ <p>
	22	+ <%= f.submit "Create" %>
	23	+ </p>
	24	+ <% end %>
	25	+
	26	+ <%= link_to 'Back', announcements_path %>

app/views/announcements/show.html.erb created 644 ¶ +18

@@ -0,0 +1,18
	1	+ <p>
	2	+ <b>Author:</b>
	3	+ <%=h @announcement.author %>
	4	+ </p>
	5	+
	6	+ <p>
	7	+ <b>Body:</b>
	8	+ <%=h @announcement.body %>
	9	+ </p>
	10	+
	11	+ <p>
	12	+ <b>Published:</b>
	13	+ <%=h @announcement.published %>
	14	+ </p>
	15	+
	16	+
	17	+ <%= link_to 'Edit', edit_announcement_path(@announcement) %> \|
	18	+ <%= link_to 'Back', announcements_path %>

app/views/main/_announcement.html.haml created 644 ¶ +4

@@ -0,0 +1,4
	1	+ .announcement
	2	+ = markdown(announcement.body)
	3	+ .pub-info
	4	+ %p= "#{announcement.author} #{announcement.created_at}"

db/migrate/030_create_announcements.rb created 644 ¶ +15

@@ -0,0 +1,15
	1	+ class CreateAnnouncements < ActiveRecord::Migration
	2	+ def self.up
	3	+ create_table :announcements do \|t\|
	4	+ t.string :author
	5	+ t.text :body
	6	+ t.boolean :published
	7	+
	8	+ t.timestamps
	9	+ end
	10	+ end
	11	+
	12	+ def self.down
	13	+ drop_table :announcements
	14	+ end
	15	+ end

test/fixtures/announcements.yml created 644 ¶ +11

@@ -0,0 +1,11
	1	+ # Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
	2	+
	3	+ one:
	4	+ author: MyString
	5	+ body: MyText
	6	+ published: false
	7	+
	8	+ two:
	9	+ author: MyString
	10	+ body: MyText
	11	+ published: false

test/functional/announcements_controller_test.rb created 644 ¶ +45

@@ -0,0 +1,45
	1	+ require File.dirname(__FILE__) + '/../test_helper'
	2	+
	3	+ class AnnouncementsControllerTest < ActionController::TestCase
	4	+ def test_should_get_index
	5	+ get :index
	6	+ assert_response :success
	7	+ assert_not_nil assigns(:announcements)
	8	+ end
	9	+
	10	+ def test_should_get_new
	11	+ get :new
	12	+ assert_response :success
	13	+ end
	14	+
	15	+ def test_should_create_announcement
	16	+ assert_difference('Announcement.count') do
	17	+ post :create, :announcement => { }
	18	+ end
	19	+
	20	+ assert_redirected_to announcement_path(assigns(:announcement))
	21	+ end
	22	+
	23	+ def test_should_show_announcement
	24	+ get :show, :id => announcements(:one).id
	25	+ assert_response :success
	26	+ end
	27	+
	28	+ def test_should_get_edit
	29	+ get :edit, :id => announcements(:one).id
	30	+ assert_response :success
	31	+ end
	32	+
	33	+ def test_should_update_announcement
	34	+ put :update, :id => announcements(:one).id, :announcement => { }
	35	+ assert_redirected_to announcement_path(assigns(:announcement))
	36	+ end
	37	+
	38	+ def test_should_destroy_announcement
	39	+ assert_difference('Announcement.count', -1) do
	40	+ delete :destroy, :id => announcements(:one).id
	41	+ end
	42	+
	43	+ assert_redirected_to announcements_path
	44	+ end
	45	+ end

test/unit/announcement_test.rb created 644 ¶ +8

@@ -0,0 +1,8
	1	+ require File.dirname(__FILE__) + '/../test_helper'
	2	+
	3	+ class AnnouncementTest < ActiveSupport::TestCase
	4	+ # Replace this with your real tests.
	5	+ def test_truth
	6	+ assert true
	7	+ end
	8	+ end

app/controllers/main_controller.rb ¶ +4

                   @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
+            +
+            +     @announcements = Announcement.find(:all,
+            +                                        :conditions => "published = 1",
+            +                                        :order => "created_at DESC")
                 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])
                   if (user!=nil) and (user.admin?)
                     # admin menu
                     menu_items << "<b>Administrative task:</b> "
+            +       append_to menu_items, '[Announcements]', 'announcements', 'index'
                     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'
                     #append_to menu_items, '[Graders]', 'graders', 'list'
                     append_to menu_items, '[Site config]', 'configurations', 'index'
                     menu_items << "<br/>"
                   end
                   # main page
                   append_to menu_items, '[Main]', 'main', 'list'
                   append_to menu_items, '[Tasks]', 'tasks', 'list'
                   append_to menu_items, '[Submissions]', 'main', 'submission'
                   append_to menu_items, '[Test]', 'test', 'index'
                   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)

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

               = user_title_bar(@user)
+            + - if @announcements.length!=0
+            +   .announcementbox
+            +     %span{:class => 'title'}
+            +       Announcements
+            +     = render :partial => 'announcement', :collection => @announcements
+            +
               .submitbox
                 = error_messages_for 'submission'
                 = render :partial => 'submission_box'
               %hr/
               %table.info
                 %tr.info-head
                   %th
                   %th Tasks
                   %th # of sub(s)
                   %th Results
                 = render :partial => 'problem', :collection => @problems
               %hr
               .submitbox
                 = render :partial => 'submission_box'

config/routes.rb ¶ +2

               ActionController::Routing::Routes.draw do |map|
+            +   map.resources :announcements
+            +
                 map.resources :sites
                 # The priority is based upon order of creation: first created -> highest priority.
                 # Sample of regular route:
                 # map.connect 'products/:id', :controller => 'catalog', :action => 'view'
                 # Keep in mind you can assign values other than :controller and :action
                 # Sample of named route:
                 # map.purchase 'products/:id/purchase', :controller => 'catalog', :action => 'purchase'
                 # This route can be invoked with purchase_url(:id => product.id)
                 # You can have the root of your site routed by hooking up ''
                 # -- just remember to delete public/index.html.
                 map.connect '', :controller => 'main', :action => 'login'
                 # Allow downloading Web Service WSDL as a file with an extension
                 # instead of a file named 'wsdl'
                 map.connect ':controller/service.wsdl', :action => 'wsdl'
                 # Install the default route as the lowest priority.
                 map.connect ':controller/:action/:id.:format'
                 map.connect ':controller/:action/:id'
               end

db/schema.rb ¶ +9 -1

               # This file is auto-generated from the current state of the database. Instead of editing this file,
               # please use the migrations feature of ActiveRecord 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 => 29) do
+            + ActiveRecord::Schema.define(:version => 30) 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"
+            +   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 "descriptions", :force => true do |t|
                   t.text     "body"
                   t.boolean  "markdowned"
                   t.datetime "created_at"
                   t.datetime "updated_at"
                 end
                 create_table "grader_processes", :force => true do |t|
                   t.string   "host",       :limit => 20
                   t.integer  "pid"
                   t.string   "mode"
                   t.boolean  "active"
                   t.datetime "created_at"
                   t.datetime "updated_at"
                   t.integer  "task_id"

public/stylesheets/application.css ¶ +35

               table.taskdesc p {
                   font-size: 13px;
               }
               table.taskdesc tr.name {
                   border: 1px solid black;
                   background: #aaaaaa;
                   color: white;
                   font-weight: bold;
                   font-size: 14px;
                   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-top: 10px;
+            +     margin-bottom: 10px;
+            +     background: green;
+            +     padding: 2px;
+            + }
+            +
+            + div.announcementbox span.title {
+            +     font-weight: bold;
+            +     color: white;
+            +     padding-left: 10px;
+            + }
+            +
+            + div.announcement {
+            +     margin: 2px;
+            +     background: white;
+            +     padding: 2px;
+            +     padding-left: 10px;
+            +     padding-right: 10px;
+            + }
+            +
+            + div.announcement p {
+            +     font-size: 13px;
+            + }
+            +
+            + div.pub-info, div.pub-info p {
+            +     text-align: right;
+            +     font-style: italic;
+            +     font-size: 10px;
+            + }
  No newline at end of file

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 r97:bd747ee8a498 public

Author

r97:bd747ee8a498 - Fri, 18 Apr 2008 04:54:49 - 18 files changed: 336 inserted, 1 deleted

Commit `r97:bd747ee8a498` public