app/views/projects/_form.html.erb app/views/projects/edit.html.erb @@ -1,3 +1,5 @@ class Project < ActiveRecord::Base include Status::Methods + + has_finder :all, :order => 'name' end \ No newline at end of file app/models/project.rb @@ -29,6 +29,10 @@ class Status < ActiveRecord::Base def billable? project && project.billable? end + + def project? + !project_id.nil? + end protected def calculate_hours app/models/status.rb @@ -1,4 +1,10 @@ class User < ActiveRecord::Base concerned_with :authentication, :state_machine include Status::Methods + + has_many :projects, :through => :statuses do + def latest + @latest ||= find(:first) + end + end end app/models/user.rb @@ -1,4 +1,4 @@ <% form_for @project do |f| -%> - <p><%= f.text_field :name %></p> +<%= render :partial => "form", :object => f %> <p><%= submit_tag :Create %></p> <% end -%> \ No newline at end of file app/views/projects/new.html.erb @@ -1,7 +1,11 @@ +<% status.project = @user.projects.latest if status.new_record? -%> <% form_for status, :url => status.new_record? ? user_statuses_path(@user) : status_path(status), :method => status.new_record? ? :post : :put \ do |f| -%> - <p><%= f.text_area :message %></p> + <p> + <%= f.select :project_id, Project.all.collect! { |p| [p.name, p.id] }, :include_blank => '[Out]' %> + <%= f.text_field :message %> + </p> <p><%= submit_tag :Update %></p> <% end -%> \ No newline at end of file app/views/statuses/_form.html.erb @@ -3,6 +3,7 @@ <ul> <% @record.statuses.each do |status| -%> <li> + [<%= status.project? ? link_to(status.project.name, status.project) : :Out %>] <%=h status.message %> <% unless status.hours.zero? -%>(<%= pluralize status.hours, 'hour' %>)<% end -%> </li> app/views/statuses/index.html.erb @@ -5,7 +5,7 @@ ActionController::Routing::Routes.draw do |map| map.resources :users, :has_many => :statuses map.resource :session - map.project_statuses_path 'projects/:project_id/statuses', :controller => 'statuses', :action => 'index' + map.project_statuses 'projects/:project_id/statuses', :controller => 'statuses', :action => 'index' map.activate '/activate/:activation_code', :controller => 'users', :action => 'activate', :activation_code => nil map.signup '/signup', :controller => 'users', :action => 'new' config/routes.rb 6ba9b43186cd635cdb63f44bc95165db642be360 rick technoweenie@gmail.com http://github.com/entp/xtt/commit/4902188efb56a94805946e7b456ea6f579794a89 4902188efb56a94805946e7b456ea6f579794a89 2008-01-06T14:23:48-08:00 2008-01-06T14:23:48-08:00 add project name to status form 7f49b041bc2d3e3f554d508bfe3bbd4d6d97544a rick technoweenie@gmail.com