Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

remove hourly revenue from statemenf of work #159

Merged
merged 1 commit into from
Jan 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion app/models/statement_of_work.rb
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
# contract_model_type :string
# end_date :datetime
# hour_delivery_schedule :string
# hourly_revenue :float
# model :string
# name :string
# start_date :datetime
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# frozen_string_literal: true

json.extract! statement_of_work, :id, :model, :hourly_revenue, :total_revenue, :total_hours, :hour_delivery_schedule,
json.extract! statement_of_work, :id, :model, :total_revenue, :total_hours, :hour_delivery_schedule,
:start_date, :end_date, :project_id, :created_at, :updated_at, :name
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# frozen_string_literal: true

class RemoveHourlyRevenueFromStatementOfWork < ActiveRecord::Migration[7.0]
def change
remove_column :statement_of_works, :hourly_revenue, :float
end
end
3 changes: 1 addition & 2 deletions db/schema.rb

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 0 additions & 3 deletions spec/factories/statement_of_works.rb
Original file line number Diff line number Diff line change
Expand Up @@ -37,23 +37,20 @@

trait :with_maintenance do
model { 'maintenance' }
hourly_revenue { 100 }
total_hours { 120 }
total_revenue { 12_000 }
hour_delivery_schedule { 'monthly' }
end

trait :with_time_and_materials do
model { 'time_and_materials' }
hourly_revenue { 100 }
total_hours { 120 }
total_revenue { 12_000 }
hour_delivery_schedule { 'contract_period' }
end

trait :with_fixed_bid do
model { 'time_and_materials' }
hourly_revenue { nil }
total_hours { nil }
total_revenue { 12_000 }
hour_delivery_schedule { 'contract_period' }
Expand Down
1 change: 0 additions & 1 deletion spec/models/statement_of_work_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
# contract_model_type :string
# end_date :datetime
# hour_delivery_schedule :string
# hourly_revenue :float
# model :string
# name :string
# start_date :datetime
Expand Down
Loading