diff --git a/app/controllers/contracts_controller.rb b/app/controllers/contracts_controller.rb index 350a48b..e0fd518 100644 --- a/app/controllers/contracts_controller.rb +++ b/app/controllers/contracts_controller.rb @@ -4,6 +4,13 @@ class ContractsController < ApplicationController layout 'resources' def index + if params[:user_id].present? + @contracts = Contract.where(user_id: params[:user_id]) + end + respond_to do |format| + format.html + format.json { render :json => @contracts } + end end def show @@ -16,8 +23,28 @@ class ContractsController < ApplicationController end def create - Rails.logger.info "CONTRACT" - Rails.logger.info @contract.inspect +# if @contract.first_name.blank? && @contract.last_name.blank? && @contract.cosigner.blank? # assume autodetect of filename +# begin +# name_split = params[:contract][:document].original_filename.sub(".jpg","").split +# if name_split.count == 4 # we have one name +# @contract.first_name = name_split[0] +# @contract.last_name = name_split[1] +# # 2 is the hyphen +# @contract.signed_at = Date.parse(name_split[3]) +# elsif name_split.count == 7 && name_split[2] == "by" # we have two names +# @contract.first_name = name_split[0] +# @contract.last_name = name_split[1] +# # 2 is "by" +# @contract.cosigner = "#{name_split[3]} #{name_split[4]}" +# # 5 is the hyphen +# @contract.signed_at = Date.parse(name_split[6]) +# else +# Rails.logger.info "Couldn't determine name from filename array: #{name_split.inspect}" +# end +# rescue Exception => e +# end +# end + @contract.created_by = current_user respond_to do |format| if @contract.save @@ -30,6 +57,9 @@ class ContractsController < ApplicationController end end + def find_for_user + end + def update respond_to do |format| if @contract.update_attributes(params[:contract]) diff --git a/app/models/contract.rb b/app/models/contract.rb index 69fd92a..b498049 100644 --- a/app/models/contract.rb +++ b/app/models/contract.rb @@ -8,10 +8,17 @@ class Contract < ActiveRecord::Base validates_presence_of :first_name, :signed_at #, :last_name - has_attached_file :document, { :styles => { :medium => "300x300>"}, - :storage => :s3, - :s3_credentials => { :access_key_id => ENV['S3_KEY'], - :secret_access_key => ENV['S3_SECRET'] }, - :path => ":attachment/:id/:style.:extension", - :bucket => ENV['S3_BUCKET'] } + has_attached_file :document, + { :styles => + { + :medium => "300x300>", + :large => "900x900>" + }, + :storage => :s3, + :s3_protocol => :https, + :s3_credentials => { :access_key_id => ENV['S3_KEY'], + :secret_access_key => ENV['S3_SECRET'] }, + :path => ":attachment/:id/:style.:extension", + :bucket => ENV['S3_BUCKET'] + } end diff --git a/app/views/contracts/_form.html.erb b/app/views/contracts/_form.html.erb index ee863e1..97636ac 100644 --- a/app/views/contracts/_form.html.erb +++ b/app/views/contracts/_form.html.erb @@ -40,7 +40,7 @@
<%= link_to "Upload New Document", "#", class: "btn btn-default", onclick: "$('#document_upload').removeClass('hidden'); $(this).addClass('hidden')" unless @contract.document.blank? %>
<%= link_to "Download Contract", @contract.document.url %>