app/views/meetings/_table.html.haml @@ -1,35 +1,21 @@ class MeetingsController < ApplicationController + # GET /meetings - # GET /meetings.xml def index - @meetings = Meeting.find(:all) - - respond_to do |format| - format.html # index.html.erb - format.xml { render :xml => @meetings } - end + upcoming_meetings = Meeting.future + @next_meeting = upcoming_meetings.shift # removes the next meeting from upcoming_meetings + @future_meetings = upcoming_meetings + @past_meetings = Meeting.past end # GET /meetings/1 - # GET /meetings/1.xml def show @meeting = Meeting.find(params[:id]) - - respond_to do |format| - format.html # show.html.erb - format.xml { render :xml => @meeting } - end end # GET /meetings/new - # GET /meetings/new.xml def new @meeting = Meeting.new - - respond_to do |format| - format.html # new.html.erb - format.xml { render :xml => @meeting } - end end # GET /meetings/1/edit @@ -38,48 +24,31 @@ class MeetingsController < ApplicationController end # POST /meetings - # POST /meetings.xml def create @meeting = Meeting.new(params[:meeting]) - - respond_to do |format| - if @meeting.save - flash[:notice] = 'Meeting was successfully created.' - format.html { redirect_to(@meeting) } - format.xml { render :xml => @meeting, :status => :created, :location => @meeting } - else - format.html { render :action => "new" } - format.xml { render :xml => @meeting.errors, :status => :unprocessable_entity } - end + if @meeting.save + flash[:notice] = 'Meeting was successfully created.' + redirect_to(@meeting) + else + render :action => "new" end end # PUT /meetings/1 - # PUT /meetings/1.xml def update @meeting = Meeting.find(params[:id]) - - respond_to do |format| - if @meeting.update_attributes(params[:meeting]) - flash[:notice] = 'Meeting was successfully updated.' - format.html { redirect_to(@meeting) } - format.xml { head :ok } - else - format.html { render :action => "edit" } - format.xml { render :xml => @meeting.errors, :status => :unprocessable_entity } - end + if @meeting.update_attributes(params[:meeting]) + flash[:notice] = 'Meeting was successfully updated.' + redirect_to(@meeting) + else + render :action => "edit" end end # DELETE /meetings/1 - # DELETE /meetings/1.xml def destroy @meeting = Meeting.find(params[:id]) @meeting.destroy - - respond_to do |format| - format.html { redirect_to(meetings_url) } - format.xml { head :ok } - end + redirect_to(meetings_url) end end app/controllers/meetings_controller.rb @@ -1,4 +1,4 @@ -class Participation < ActiveRecord::Base +class Attendance < ActiveRecord::Base belongs_to :meeting belongs_to :person end app/models/attendance.rb @@ -1,5 +1,13 @@ class Meeting < ActiveRecord::Base + # returns an array of all upcoming meetings from, and including, today in chronological order + # future.first returns the next meeting + named_scope :future, :conditions => ['date >= ?', Date.today], :order => 'date' + + # returns an array of all the meetings held before today in order from latest to oldest (reverse chronological order) + # past.first returns the last held meeting prior to today + named_scope :past, :conditions => ['date < ?', Date.today], :order => 'date DESC' + has_many :attendances, :dependent => :destroy has_many :attendees, :through => :attendances, :source => :person app/models/meeting.rb @@ -1,18 +1,22 @@ -%h1 Listing meetings +#next_meeting + %h1 Next Meeting + - unless @next_meeting.nil? + = render :partial => "table", :locals => { :meetings => @next_meeting.to_a } + - else + No meeting has been scheduled yet -%table - %tr - %th Date - %th Venue - -- for meeting in @meetings - %tr - %td=h meeting.date - %td=h meeting.venue - %td= link_to 'Show', meeting - %td= link_to 'Edit', edit_meeting_path(meeting) - %td= link_to 'Destroy', meeting, :confirm => 'Are you sure?', :method => :delete - -%br - -= link_to 'New meeting', new_meeting_path +#future_meetings + %h3 Upcoming Meetings + - unless @future_meetings.empty? + = render :partial => "table", :locals => { :meetings => @future_meetings } + - else + No meetings have been scheduled yet + +#past_meetings + %h3 Previous Meetings + - unless @past_meetings.empty? + = render :partial => "table", :locals => { :meetings => @past_meetings } + - else + There have not been any meetings yet + +%p= link_to 'New meeting', new_meeting_path app/views/meetings/index.html.haml 885adee13e8c066e5014c0b4be05d41248fd660e Michael MacDonald michaelm@amc.org.au http://github.com/artpop/crc_site/commit/ced7b81593e249d7e62783d209486804c3556100 ced7b81593e249d7e62783d209486804c3556100 2008-10-20T05:13:32-07:00 2008-10-20T05:13:32-07:00 added named scopes to meetings and organised meetings index into next, upcoming and past meetings edf75bf4e0cf535ce2c4030b03735bd873f3d980 Michael MacDonald michaelm@amc.org.au