isoron/wikiufc
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Events: removendo campo date

Browse Source
This commit is contained in:
Alinson S. Xavier
2008-03-05 04:34:41 -03:00
parent 56e7d7c374
commit ba4a6a20fe
7 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/users_controller.rb
View File

@@ -113,8 +113,8 @@ class UsersController < ApplicationController
unless @current_user.courses.empty? unless @current_user.courses.empty?
@news = News.find(:all, :conditions => [ 'receiver_id in (?)', @current_user.courses ], @news = News.find(:all, :conditions => [ 'receiver_id in (?)', @current_user.courses ],
:order => 'timestamp desc', :limit => 5) :order => 'timestamp desc', :limit => 5)
@events = Event.find(:all, :conditions => [ 'course_id in (?) and (date > ?) and (date < ?)', @events = Event.find(:all, :conditions => [ 'course_id in (?) and (time > ?) and (time < ?)',
@current_user.courses, 1.day.ago, 21.days.from_now ], :order => 'date') @current_user.courses, 1.day.ago, 21.days.from_now ], :order => 'time')
end end
end end

2
app/models/course.rb
View File

@@ -26,7 +26,7 @@ class Course < ActiveRecord::Base
:foreign_key => "receiver_id", :foreign_key => "receiver_id",
:order => 'id desc' :order => 'id desc'
has_many :events, :order => "date asc, time asc" has_many :events, :order => "time asc"
has_many :log_entries, :order => "created_at desc" has_many :log_entries, :order => "created_at desc"

5
db/migrate/029_event_time.rb
View File

@@ -1,7 +1,8 @@
class EventTime < ActiveRecord::Migration class EventTime < ActiveRecord::Migration
def self.up def self.up
change_column :events, :date, :date, :null => true remove_column :events, :date
change_column :events, :time, :datetime remove_column :events, :time
add_column :events, :time, :datetime, :null => false, :default => Time.now
end end
def self.down def self.down

9
db/schema.rb
View File

@@ -37,13 +37,12 @@ ActiveRecord::Schema.define(:version => 29) do
end end
create_table "events", :force => true do |t| create_table "events", :force => true do |t|
t.string "title", :null => false t.string "title", :null => false
t.date "date" t.integer "created_by", :null => false
t.datetime "time", :null => false t.integer "course_id", :default => 0, :null => false
t.integer "created_by", :null => false
t.integer "course_id", :default => 0, :null => false
t.text "description" t.text "description"
t.datetime "deleted_at" t.datetime "deleted_at"
t.datetime "time", :default => '2008-03-05 04:25:27', :null => false
end end
create_table "log_entries", :force => true do |t| create_table "log_entries", :force => true do |t|

1
test/fixtures/events.yml vendored
View File

@@ -16,7 +16,6 @@ event1:
course_id: 1 course_id: 1
created_by: 1 created_by: 1
title: Event 1 title: Event 1
date: <%= Date.today %>
time: <%= Time.now %> time: <%= Time.now %>
description: A random test event description: A random test event
#two: #two:

8
test/functional/events_controller_test.rb
View File

@@ -32,8 +32,8 @@ class EventsControllerTest < Test::Unit::TestCase
setup { login_as :bob } setup { login_as :bob }
should_be_restful do |resource| should_be_restful do |resource|
resource.parent = [ :course ] resource.parent = [ :course ]
resource.create.params = { :title => 'test', :date => Date.today, :time => Time.now, :description => 'test', :created_by => 1 } resource.create.params = { :title => 'test', :time => Time.now, :description => 'test', :created_by => 1 }
resource.update.params = { :title => 'test', :date => Date.today, :time => Time.now, :description => 'test', :created_by => 1 } resource.update.params = { :title => 'test', :time => Time.now, :description => 'test', :created_by => 1 }
end end
end end
@@ -43,8 +43,8 @@ class EventsControllerTest < Test::Unit::TestCase
setup { logout } setup { logout }
should_be_restful do |resource| should_be_restful do |resource|
resource.parent = [ :course ] resource.parent = [ :course ]
resource.create.params = { :title => 'test', :date => Date.today, :time => Time.now, :description => 'test', :created_by => 1 } resource.create.params = { :title => 'test', :time => Time.now, :description => 'test', :created_by => 1 }
resource.update.params = { :title => 'test', :date => Date.today, :time => Time.now, :description => 'test', :created_by => 1 } resource.update.params = { :title => 'test', :time => Time.now, :description => 'test', :created_by => 1 }
resource.denied.actions = [ :new, :edit, :create, :update, :destroy ] resource.denied.actions = [ :new, :edit, :create, :update, :destroy ]
resource.denied.redirect = "'/login'" resource.denied.redirect = "'/login'"
resource.denied.flash = /must be logged in/i resource.denied.flash = /must be logged in/i

2
test/unit/course_test.rb
View File

@@ -36,7 +36,7 @@ class CourseTest < Test::Unit::TestCase
:timestamp => Time.now, :type => "News", :timestamp => Time.now, :type => "News",
:sender_id => 0, :receiver_id => course.id) :sender_id => 0, :receiver_id => course.id)
event = Event.create(:title => 'test', :date => Time.now, :time => Time.now, event = Event.create(:title => 'test', :time => Time.now,
:created_by => 0, :course_id => course.id, :description => 'test') :created_by => 0, :course_id => course.id, :description => 'test')
# Deleta o curso # Deleta o curso