WIP: Proposal review + private messages (comments).

Author: fredwu

app/assets/javascripts/concerns/form.js.coffee

@@ -29,4 +29,7 @@ jQuery ->
       parent.next().fadeIn()
 
     e.preventDefault()
-  )
+  )
+
+  # read only forms
+  $('.read_only form :input:not([type=submit])').attr('disabled', 'disabled')

app/controllers/proposals_controller.rb

@@ -4,7 +4,7 @@ class ProposalsController < ApplicationController
   belongs_to :startup
 
   def create
-    parent.submit_proposal(investors, params[:proposal], proposal_stage)
+    parent.create_proposal(investors, params[:proposal], proposal_stage)
     show_flash_message
     redirect_to parent_path
   end
@@ -17,12 +17,6 @@ def update
     redirect_to parent_path
   end
 
-  def edit
-    @investors = resource.investors.for_auto_suggest.to_json
-
-    edit!
-  end
-
   private
 
   def investors

app/models/message.rb

@@ -32,6 +32,14 @@ def is_private?
     !!is_private
   end
 
+  def is_with_proposal?
+    !!proposal_id
+  end
+
+  def is_without_proposal?
+    !proposal_id
+  end
+
   def method_missing(symbol, *args)
     case symbol
       when /^is_(un)?(.*)\?/

app/models/startup.rb

@@ -107,14 +107,10 @@ def user_role(user)
     I18n.t "startup.role_identifiers.#{user_meta(user).role_identifier}"
   end
 
-  def create_proposal(attributes = {})
-    proposals.create(attributes)
-  end
-
-  def submit_proposal(investors = [], attributes = {}, stage = 'draft', private_message = I18n.t('text.default_text_for_proposal_review'))
-    proposal = create_proposal(attributes)
+  def create_proposal(investors = [], attributes = {}, stage = 'draft', private_message = I18n.t('text.default_text_for_proposal_review'))
+    proposal = proposals.create(attributes)
     update_and_submit_proposal(proposal, investors, attributes, stage)
-    send_private_message_to_investors(proposal, investors, private_message)
+    send_private_message_to_investors(proposal, investors, private_message) if stage == 'submitted'
     proposal
   end
 

app/views/messages/show_private_message.html.slim

@@ -3,8 +3,11 @@
 .grid_9
   ul#messages
     li.message= render 'show', :resource => @topic, :meta => {}
-
     - @topic.replies.each do |reply|
       li.message= render 'show', :resource => reply, :meta => {}
   br
   = render 'new', :url => my_private_message_path(@topic)
+  - if @topic.is_with_proposal?
+    hr
+    h1= t('label.business_proposal')
+    .read_only= render 'proposals/form', :resource => @topic.proposal, :submit_path => '/'

app/views/proposals/_form.html.slim

@@ -11,7 +11,7 @@ ul#proposal_section_selector.multistage_selector
     legend= t('label.investors')
     .multi_add.input.string
       = label_tag :investors, t('label.investors')
-      = text_field_tag :investors, resource.investors.map(&:id).join(','), :class => 'string required', :'data-investors' => @investors
+      = text_field_tag :investors, resource.investors.map(&:id).join(','), :class => 'string required', :'data-investors' => resource.investors.for_auto_suggest.to_json
     .grouped_buttons
       = submit_tag t('label.next'), :class => 'navigation next'
   fieldset#product

db/seeds_for_dev.rb

@@ -40,11 +40,11 @@
   startup.attach_user(u, :member, Faker::Lorem.word)
   startup.confirm_user(u)
 
-  2.times { startup.submit_proposal(User.investors.sample, Proposal.make.attributes, 'draft') }
-  startup.submit_proposal(User.investors.sample, Proposal.make.attributes, 'submitted', Faker::Lorem.sentence)
-  startup.submit_proposal(user, Proposal.make.attributes, 'submitted', Faker::Lorem.sentence) if rand(5) == 0
+  2.times { startup.create_proposal(User.investors.sample, Proposal.make.attributes, 'draft') }
+  3.times { startup.create_proposal(User.investors.sample, Proposal.make.attributes, 'submitted', Faker::Lorem.sentence) }
+  startup.create_proposal(user, Proposal.make.attributes, 'submitted', Faker::Lorem.sentence) if rand(5) == 0
   if rand(10) == 0
-    startup.submit_proposal(user, Proposal.make.attributes, 'submitted', Faker::Lorem.sentence)
+    startup.create_proposal(user, Proposal.make.attributes, 'submitted', Faker::Lorem.sentence)
     Message.last.mark_as_archived!
   end
 end

spec/controllers/proposals_controller_spec.rb

@@ -22,8 +22,7 @@
     get :edit, :startup_id => startup.id,
                :id         => proposal.id
 
-    assigns(:investors).should be_a(String)
-    assigns(:investors).should == investors.for_auto_suggest.to_json
+    response.should be_success
   end
 
   it "submits to an investor" do

spec/models/message_spec.rb

@@ -76,6 +76,8 @@
 
           private_message.is_private?.should == true
           private_message.is_public?.should == false
+          private_message.is_with_proposal?.should == false
+          private_message.is_without_proposal?.should == true
         end
 
         it "adds a reply to a topic" do

spec/models/proposal_spec.rb

@@ -41,29 +41,20 @@
       startup.attach_user(founder, :member)
     end
 
-    it "creates a draft proposal" do
-      startup.create_proposal(proposal.attributes)
-
-      startup.proposals.count.should == 1
-      startup.proposals.draft.count.should == 1
-      startup.proposals.submitted.count.should == 0
-      startup.proposals.first.proposal_stage_identifier.should == 'draft'
-    end
-
     it "returns the proposal itself" do
-      startup.submit_proposal([], proposal.attributes).should == Proposal.last
+      startup.create_proposal([], proposal.attributes).should == Proposal.last
     end
 
     it "submits proposal to no investor" do
-      startup.submit_proposal([], proposal.attributes)
+      startup.create_proposal([], proposal.attributes)
 
       startup.proposals.count.should == 1
       startup.proposals.draft.count.should == 1
       startup.proposals.submitted.count.should == 0
     end
 
     it "submits proposal to one investor" do
-      startup.submit_proposal(investor1, proposal.attributes, 'submitted')
+      startup.create_proposal(investor1, proposal.attributes, 'submitted')
 
       startup.proposals.count.should == 1
       startup.proposals.draft.count.should == 0
@@ -73,10 +64,12 @@
       investor1.inbox_proposals.count.should == 1
       startup.proposals.first.proposal_stage_identifier.should == 'submitted'
       startup.founder.sent_proposals.first.content.should == I18n.t('text.default_text_for_proposal_review')
+      Message.last.is_with_proposal?.should == true
+      Message.last.is_without_proposal?.should == false
     end
 
     it "submits proposal to many investors" do
-      startup.submit_proposal([investor1, investor2], proposal.attributes, 'submitted', 'Hey man!')
+      startup.create_proposal([investor1, investor2], proposal.attributes, 'submitted', 'Hey man!')
 
       startup.proposals.count.should == 1
       startup.proposals.draft.count.should == 0
@@ -92,7 +85,7 @@
     end
 
     it "edits a proposal" do
-      startup.submit_proposal(investor1, proposal.attributes)
+      startup.create_proposal(investor1, proposal.attributes)
       startup.update_proposal(Proposal.last, investor2, Proposal.make(:pitch => 'Hello world').attributes)
 
       Proposal.last.pitch.should == 'Hello world'
@@ -105,7 +98,7 @@
     end
 
     it "edits and submits a proposal" do
-      startup.submit_proposal(investor1, proposal.attributes)
+      startup.create_proposal(investor1, proposal.attributes)
       startup.update_proposal(Proposal.last, investor2, Proposal.make(:pitch => 'Hello world').attributes, 'submitted')
 
       Proposal.last.pitch.should == 'Hello world'
@@ -118,7 +111,7 @@
     end
 
     it "archives a proposal message" do
-      startup.submit_proposal(investor1, proposal.attributes)
+      startup.create_proposal(investor1, proposal.attributes, 'submitted')
 
       investor1.inbox_proposals.count.should == 1
       investor1.archived_proposals.count.should == 0
@@ -135,7 +128,7 @@
 
     it "preserves proposal details structure" do
       proposal_attributes = proposal.attributes.merge(:pitch => 'Hello world')
-      startup.submit_proposal(investor1, proposal_attributes)
+      startup.create_proposal(investor1, proposal_attributes)
 
       Proposal.last.pitch.should == 'Hello world'
     end