cafe-grader-web Commit - r102:8fbc279e8875

cafe-grader-web

Commit `r102:8fbc279e8875` public

parent | child

Description:

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

r102:8fbc279e8875 - Sat, 26 Apr 2008 02:55:53 - 16 files changed: 279 inserted, 1 deleted

app/controllers/messages_controller.rb created 644 ¶ +73

@@ -0,0 +1,73
	1	+ class MessagesController < ApplicationController
	2	+
	3	+ before_filter :authenticate
	4	+
	5	+ verify :method => :post, :only => ['create'],
	6	+ :redirect_to => { :action => 'list' }
	7	+
	8	+ before_filter :only => ['console','show'] do \|controller\|
	9	+ controller.authorization_by_roles(['admin'])
	10	+ end
	11	+
	12	+ def list
	13	+ @user = User.find(session[:user_id])
	14	+ @messages = Message.find_all_sent_by_user(@user)
	15	+ end
	16	+
	17	+ def console
	18	+ @user = User.find(session[:user_id])
	19	+ @messages = Message.find_all_system_unreplied_messages
	20	+ end
	21	+
	22	+ def show
	23	+ @message = Message.find(params[:id])
	24	+ end
	25	+
	26	+ def create
	27	+ user = User.find(session[:user_id])
	28	+ @message = Message.new(params[:message])
	29	+ @message.sender = user
	30	+ if !@message.save
	31	+ render :action => 'list' and return
	32	+ else
	33	+ flash[:notice] = 'New message posted'
	34	+ redirect_to :action => 'list'
	35	+ end
	36	+ end
	37	+
	38	+ def reply
	39	+ user = User.find(session[:user_id])
	40	+ @message = Message.new(params[:r_message])
	41	+ @message.sender = user
	42	+ if !@message.save
	43	+ render :action => 'show' and return
	44	+ else
	45	+ flash[:notice] = 'Message replied'
	46	+ rep_msg = @message.replying_message
	47	+ rep_msg.replied = true
	48	+ rep_msg.save
	49	+ redirect_to :action => 'console'
	50	+ end
	51	+ end
	52	+
	53	+ protected
	54	+ def build_replying_message_hierarchy(user)
	55	+ @all_messages = {}
	56	+
	57	+
	58	+ # manually build replies hierarchy (to improve efficiency)
	59	+ [@messages, @replied_messages].each do \|collection\|
	60	+ collection.each do \|m\|
	61	+ @all_messages[m.id] = {:msg => m, :replies => []}
	62	+ end
	63	+ end
	64	+
	65	+ @all_messages.each do \|m\|
	66	+ rep_id = m.replying_message_id
	67	+ if @all_messages[rep_id]!=nil
	68	+ @all_messages[rep_id][:replies] << m
	69	+ end
	70	+ end
	71	+ end
	72	+
	73	+ end

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

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

app/models/message.rb created 644 ¶ +60

@@ -0,0 +1,60
	1	+ class Message < ActiveRecord::Base
	2	+
	3	+ belongs_to :sender, :class_name => "User"
	4	+ belongs_to :receiver, :class_name => "User"
	5	+
	6	+ belongs_to :replying_message, :class_name => "Message"
	7	+
	8	+ # commented manually do it
	9	+ #
	10	+ #has_many :replied_messages, {
	11	+ # :class_name => "Message",
	12	+ # :foreign_key => "replying_message_id"
	13	+ #}
	14	+ #
	15	+
	16	+ attr_accessor :replied_messages
	17	+
	18	+ def self.find_all_sent_by_user(user)
	19	+ messages = user.messages
	20	+ replied_messages = user.replied_messages
	21	+ Message.build_replying_message_hierarchy messages, replied_messages
	22	+ return messages
	23	+ end
	24	+
	25	+ def self.find_all_system_unreplied_messages
	26	+ self.find(:all,
	27	+ :conditions => 'ISNULL(receiver_id) ' +
	28	+ 'AND (ISNULL(replied) OR replied=0)',
	29	+ :order => 'created_at')
	30	+ end
	31	+
	32	+ def self.build_replying_message_hierarchy(*args)
	33	+ # manually build replies hierarchy (to improve efficiency)
	34	+ all_messages = {}
	35	+
	36	+ args.each do \|collection\|
	37	+ collection.each do \|m\|
	38	+ all_messages[m.id] = m
	39	+ m.replied_messages = []
	40	+ end
	41	+ end
	42	+
	43	+ all_messages.each_value do \|m\|
	44	+ rep_id = m.replying_message_id
	45	+ if all_messages[rep_id]!=nil
	46	+ all_messages[rep_id].add_replied_message(m)
	47	+ end
	48	+ end
	49	+ end
	50	+
	51	+ def add_replied_message(m)
	52	+ if @replied_messages==nil
	53	+ @replied_messages = [m]
	54	+ else
	55	+ @replied_messages << m
	56	+ end
	57	+ @replied_messages
	58	+ end
	59	+
	60	+ end

app/views/messages/_message.html.haml created 644 ¶ +7

@@ -0,0 +1,7
	1	+ .message
	2	+ .stat
	3	+ = "#{message.sender.full_name} at #{message.created_at}"
	4	+ %div{:class => (!defined?(reply) or (reply==false)) ? "body" : "reply-body"}
	5	+ = simple_format(message.body)
	6	+ - if message.replied_messages.length!=0
	7	+ = render :partial => 'message', :collection => message.replied_messages, :locals => {:reply => true}

app/views/messages/_short_message.html.haml created 644 ¶ +6

@@ -0,0 +1,6
	1	+ %tr
	2	+ %td=h short_message.sender.full_name
	3	+ %td= "#{short_message.created_at}"
	4	+ %td=h truncate(short_message.body)
	5	+ %td
	6	+ = link_to "[reply]", :action => 'show', :id => short_message.id

app/views/messages/console.html.haml created 644 ¶ +13

@@ -0,0 +1,13
	1	+ = user_title_bar(@user)
	2	+
	3	+ %h1 Console: active messages
	4	+
	5	+ = link_to '[all messages]', :action => 'list_all'
	6	+
	7	+ %table
	8	+ %tr
	9	+ %th From
	10	+ %th When
	11	+ %th Message
	12	+ %th
	13	+ = render :partial => "short_message", :collection => @messages

app/views/messages/list.html.haml created 644 ¶ +14

@@ -0,0 +1,14
	1	+ = user_title_bar(@user)
	2	+
	3	+ %h3 Your Messages
	4	+
	5	+ - form_for 'message', nil, :url => { :action => 'create'} do \|f\|
	6	+ %p
	7	+ %b New message
	8	+ = submit_tag "Post"
	9	+ %br/
	10	+ = f.text_area :body, :rows => 5, :cols => 100
	11	+
	12	+ %hr/
	13	+
	14	+ = render :partial => 'message', :collection => @messages, :locals => {:reply => false}

app/views/messages/show.html.haml created 644 ¶ +13

@@ -0,0 +1,13
	1	+ %h3 Message
	2	+
	3	+ .message
	4	+ .stat
	5	+ = "#{@message.sender.full_name} at #{@message.created_at}"
	6	+ .body= simple_format(@message.body)
	7	+
	8	+ %h3 Your reply:
	9	+ - form_for 'r_message', nil, :url => { :action => 'reply'} do \|f\|
	10	+ = f.text_area :body, :rows => 5, :cols => 100
	11	+ = f.hidden_field :receiver_id, {:value => @message.sender_id }
	12	+ = f.hidden_field :replying_message_id, {:value => @message.id }
	13	+ = submit_tag "Post"

db/migrate/032_create_messages.rb created 644 ¶ +17

@@ -0,0 +1,17
	1	+ class CreateMessages < ActiveRecord::Migration
	2	+ def self.up
	3	+ create_table :messages do \|t\|
	4	+ t.column "sender_id", :integer
	5	+ t.column "receiver_id", :integer
	6	+ t.column "replying_message_id", :integer
	7	+ t.column "body", :text
	8	+ t.column "replied", :boolean # this is for efficiency
	9	+
	10	+ t.timestamps
	11	+ end
	12	+ end
	13	+
	14	+ def self.down
	15	+ drop_table :messages
	16	+ end
	17	+ end

test/fixtures/messages.yml created 644 ¶ +7

@@ -0,0 +1,7
	1	+ # Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
	2	+
	3	+ # one:
	4	+ # column: value
	5	+ #
	6	+ # two:
	7	+ # column: value

test/functional/messages_controller_test.rb created 644 ¶ +8

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

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

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

app/helpers/application_helper.rb ¶ +2

               # 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, '[Msg console]', 'messages', 'console'
                     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, '[Messages]', 'messages', '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)
                 end
                 def format_short_time(time)
                   now = Time.now
                   st = ''
                   if (time.yday != now.yday) or
               	(time.year != now.year)
                     st = time.strftime("%x ")
                   end
                   st + time.strftime("%X")
                 end
                 def user_title_bar(user)
                   if user.site!=nil and user.site.finished?
                     contest_over_string = <<CONTEST_OVER
               <tr><td colspan="2" align="center">
               <span class="contest-over-msg">THE CONTEST IS OVER</span>
               </td></tr>
               CONTEST_OVER
                   end
                   <<TITLEBAR
               <div class="title">
               <table>
               #{contest_over_string}
               <tr>
               <td class="left-col">
               #{user.full_name}<br/>
               Current time is #{format_short_time(Time.new)}<br/>
               </td>
               <td class="right-col">APIO'08</td>
               </tr>
               </table>
               </div>
               TITLEBAR
                 end
               end

app/models/user.rb ¶ +10

               require 'digest/sha1'
               class User < ActiveRecord::Base
                 has_and_belongs_to_many :roles
                 has_many :test_requests, :order => "submitted_at DESC"
+            +   has_many :messages,
+            +            :class_name => "Message",
+            +            :foreign_key => "sender_id",
+            +            :order => 'created_at DESC'
+            +
+            +   has_many :replied_messages,
+            +            :class_name => "Message",
+            +            :foreign_key => "receiver_id",
+            +            :order => 'created_at DESC'
+            +
                 belongs_to :site
                 validates_presence_of :login
                 validates_presence_of :full_name
                 validates_length_of :full_name, :minimum => 1
                 validates_presence_of :password, :if => :password_required?
                 validates_length_of :password, :within => 4..20, :if => :password_required?
                 validates_confirmation_of :password, :if => :password_required?
                 attr_accessor :password
                 before_save :encrypt_new_password
                 def self.authenticate(login, password)
                   user = find_by_login(login)
                   return user if user && user.authenticated?(password)
                 end
                 def authenticated?(password)
                   hashed_password == User.encrypt(password,self.salt)
                 end
                 def admin?
                   self.roles.detect {|r| r.name == 'admin' }
                 end
                 def email_for_editing
                   if self.email==nil
                     "(unknown)"
                   elsif self.email==''
                     "(blank)"
                   else
                     self.email
                   end
                 end
                 def email_for_editing=(e)
                   self.email=e
                 end
                 def alias_for_editing
                   if self.alias==nil
                     "(unknown)"
                   elsif self.alias==''
                     "(blank)"
                   else
                     self.alias
                   end
                 end
                 def alias_for_editing=(e)
                   self.alias=e
                 end
                 protected
                   def encrypt_new_password
                     return if password.blank?
                     self.salt = (10+rand(90)).to_s
                     self.hashed_password = User.encrypt(self.password,self.salt)
                   end
                   def password_required?
                     self.hashed_password.blank? || !self.password.blank?
                   end
                   def self.encrypt(string,salt)
                     Digest::SHA1.hexdigest(salt + string)
                   end
               end

db/schema.rb ¶ +11 -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 => 31) do
+            + ActiveRecord::Schema.define(:version => 32) 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"
                 end
                 add_index "grader_processes", ["host", "pid"], :name => "index_grader_processes_on_ip_and_pid"
                 create_table "languages", :force => true do |t|
                   t.string "name",        :limit => 10
                   t.string "pretty_name"
                   t.string "ext",         :limit => 10
                 end
+            +   create_table "messages", :force => true do |t|
+            +     t.integer  "sender_id"
+            +     t.integer  "receiver_id"
+            +     t.integer  "replying_message_id"
+            +     t.text     "body"
+            +     t.boolean  "replied"
+            +     t.datetime "created_at"
+            +     t.datetime "updated_at"
+            +   end
+            +
                 create_table "problems", :force => true do |t|
                   t.string  "name",           :limit => 30
                   t.string  "full_name"
                   t.integer "full_score"
                   t.date    "date_added"
                   t.boolean "available"
                   t.string  "url"
                   t.integer "description_id"
                   t.boolean "test_allowed"
                   t.boolean "output_only"
                 end
                 create_table "rights", :force => true do |t|
                   t.string "name"
                   t.string "controller"
                   t.string "action"
                 end
                 create_table "rights_roles", :id => false, :force => true do |t|
                   t.integer "right_id"
                   t.integer "role_id"
                 end
                 add_index "rights_roles", ["role_id"], :name => "index_rights_roles_on_role_id"
                 create_table "roles", :force => true do |t|
                   t.string "name"
                 end
                 create_table "roles_users", :id => false, :force => true do |t|
                   t.integer "role_id"
                   t.integer "user_id"
                 end
                 add_index "roles_users", ["user_id"], :name => "index_roles_users_on_user_id"
                 create_table "sessions", :force => true do |t|
                   t.string   "session_id"
                   t.text     "data"
                   t.datetime "updated_at"
                 end
                 add_index "sessions", ["session_id"], :name => "index_sessions_on_session_id"
                 add_index "sessions", ["updated_at"], :name => "index_sessions_on_updated_at"
                 create_table "sites", :force => true do |t|
                   t.string   "name"
                   t.boolean  "started"
                   t.datetime "start_time"
                   t.datetime "created_at"
                   t.datetime "updated_at"
                 end
                 create_table "submissions", :force => true do |t|
                   t.integer  "user_id"
                   t.integer  "problem_id"
                   t.integer  "language_id"
                   t.text     "source"
                   t.binary   "binary"
                   t.datetime "submitted_at"
                   t.datetime "compiled_at"
                   t.text     "compiler_message"
                   t.datetime "graded_at"
                   t.integer  "points"
                   t.text     "grader_comment"
                   t.integer  "number"
                   t.string   "source_filename"
                 end
                 add_index "submissions", ["user_id", "problem_id", "number"], :name => "index_submissions_on_user_id_and_problem_id_and_number", :unique => true
                 add_index "submissions", ["user_id", "problem_id"], :name => "index_submissions_on_user_id_and_problem_id"
                 create_table "tasks", :force => true do |t|
                   t.integer  "submission_id"
                   t.datetime "created_at"
                   t.integer  "status"
                   t.datetime "updated_at"
                 end
                 create_table "test_requests", :force => true do |t|
                   t.integer  "user_id"
                   t.integer  "problem_id"
                   t.integer  "submission_id"
                   t.string   "input_file_name"
                   t.string   "output_file_name"
                   t.string   "running_stat"
                   t.integer  "status"
                   t.datetime "updated_at"
                   t.datetime "submitted_at"
                   t.datetime "compiled_at"
                   t.text     "compiler_message"
                   t.datetime "graded_at"
                   t.string   "grader_comment"
                   t.datetime "created_at"
                   t.float    "running_time"
                   t.string   "exit_status"

public/stylesheets/application.css ¶ +28

               }
               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;
                   font-weight: bold;
                   border-top: 1px solid black;
                   border-bottom: 1px solid black;
                   margin-top: 2px;
                   margin-bottom: 4px;
               }
               /*******************************
                [Submission]
               ********************************/
               table.taskdesc {
                   border: 1px solid black;
                   border-collapse: collapse;
                   width: 95%;
                   font-size: 13px;
               }
               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: 1px;
               }
               div.announcementbox span.title {
                   font-weight: bold;
                   color: white;
                   padding-left: 10px;
               }
               div.announcement {
                   margin: 2px;
                   background: white;
                   padding: 1px;
                   padding-left: 10px;
                   padding-right: 10px;
               }
               div.announcement p {
                   font-size: 12px;
               }
               div.pub-info, div.pub-info p {
                   text-align: right;
                   font-style: italic;
                   font-size: 9px;
               }
+            +
+            + /******************
+            +   [Messages
+            + ******************/
+            +
+            + div.message {
+            +     padding-top: 5px;
+            +     padding-left: 10px;
+            + }
+            +
+            + div.message div.body {
+            +     border: 1px solid green;
+            +     background: #eeffee;
+            +     padding-left: 5px;
+            + }
+            +
+            + div.message div.reply-body {
+            +     border: 1px solid black;
+            +     background: #ffeeee;
+            +     padding-left: 5px;
+            + }
+            +
+            + div.message div.stat {
+            +     font-size: 10px;
+            +     color: white;
+            +     background: green;
+            +     font-weight: bold;
+            + }

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

r102:8fbc279e8875 - Sat, 26 Apr 2008 02:55:53 - 16 files changed: 279 inserted, 1 deleted

Sign in to your account

Commit r102:8fbc279e8875 public

Author

r102:8fbc279e8875 - Sat, 26 Apr 2008 02:55:53 - 16 files changed: 279 inserted, 1 deleted

Commit `r102:8fbc279e8875` public