diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/user.rb | 4 | ||||
| -rw-r--r-- | app/views/v1/licenses/_company.json.jbuilder | 1 | ||||
| -rw-r--r-- | app/views/v1/licenses/_confidential_company.json.jbuilder | 1 | ||||
| -rw-r--r-- | app/views/v1/licenses/_license.json.jbuilder | 2 |
4 files changed, 7 insertions, 1 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index 056039b..c298241 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -1,6 +1,10 @@ class User < ActiveRecord::Base belongs_to :company + def full_name + "#{first_name} #{last_name}" + end + def apply_for_license(well_type, location) company.licenses.create(well_type: well_type, location: location, applicant: self) end diff --git a/app/views/v1/licenses/_company.json.jbuilder b/app/views/v1/licenses/_company.json.jbuilder index 223a2b1..91a79da 100644 --- a/app/views/v1/licenses/_company.json.jbuilder +++ b/app/views/v1/licenses/_company.json.jbuilder @@ -1,3 +1,4 @@ json.company do json.name company.name + json.applicant_name applicant.full_name end diff --git a/app/views/v1/licenses/_confidential_company.json.jbuilder b/app/views/v1/licenses/_confidential_company.json.jbuilder index 676c5a1..312961a 100644 --- a/app/views/v1/licenses/_confidential_company.json.jbuilder +++ b/app/views/v1/licenses/_confidential_company.json.jbuilder @@ -1,3 +1,4 @@ json.company do json.name "CONFIDENTIAL" + json.applicant_name "CONFIDENTIAL" end diff --git a/app/views/v1/licenses/_license.json.jbuilder b/app/views/v1/licenses/_license.json.jbuilder index 0035ea4..9fd0ce8 100644 --- a/app/views/v1/licenses/_license.json.jbuilder +++ b/app/views/v1/licenses/_license.json.jbuilder @@ -5,7 +5,7 @@ if license.confidential? json.partial! 'v1/licenses/confidential_company' else json.partial! 'v1/licenses/well_type', well_type: license.well_type - json.partial! 'v1/licenses/company', company: license.company + json.partial! 'v1/licenses/company', company: license.company, applicant: license.applicant end json.issued_at license.issued_at.to_s json.expired_at license.expired_at.to_s |
