changes the format of the Spending proposal code

This commit is contained in:
kikito
2016-04-04 14:14:10 +02:00
parent 4f4c42da54
commit 3eca6b31bd
2 changed files with 3 additions and 3 deletions

View File

@@ -102,7 +102,7 @@ class SpendingProposal < ActiveRecord::Base
end
def code
"#{id}" + (administrator.present? ? "-A#{administrator.id}" : "")
"#{Setting["proposal_code_prefix"]}-#{created_at.strftime('%Y')}-#{id}" + (administrator.present? ? "-A#{administrator.id}" : "")
end
def send_unfeasible_email

View File

@@ -114,12 +114,12 @@ describe SpendingProposal do
let(:spending_proposal) { create(:spending_proposal) }
it "returns the proposal id" do
expect(spending_proposal.code).to eq("#{spending_proposal.id}")
expect(spending_proposal.code).to include("#{spending_proposal.id}")
end
it "returns the administrator id when assigned" do
spending_proposal.administrator = create(:administrator)
expect(spending_proposal.code).to eq("#{spending_proposal.id}-A#{spending_proposal.administrator.id}")
expect(spending_proposal.code).to include("#{spending_proposal.id}-A#{spending_proposal.administrator.id}")
end
end
end