Skip to content

Commit

Permalink
Removing scheme overview section from fcrp1 report
Browse files Browse the repository at this point in the history
  • Loading branch information
brujeo committed Nov 15, 2023
1 parent a85d694 commit d9a5790
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 12 deletions.
Binary file modified lib/fcerm1_template.xlsx
Binary file not shown.
16 changes: 8 additions & 8 deletions lib/pafs_core/fcerm1.rb
Original file line number Diff line number Diff line change
Expand Up @@ -145,20 +145,20 @@ module Fcerm1
{ column: "GZ", field_name: :create_habitat_amount },

# Confidence Assessment
{ column: "HI", field_name: :confidence_homes_better_protected },
{ column: "HJ", field_name: :confidence_homes_by_gateway_four },
{ column: "HK", field_name: :confidence_secured_partnership_funding },
{ column: "HA", field_name: :confidence_homes_better_protected },
{ column: "HB", field_name: :confidence_homes_by_gateway_four },
{ column: "HC", field_name: :confidence_secured_partnership_funding },

# Project Status
{ column: "HL", field_name: :project_status },
{ column: "HD", field_name: :project_status },

# Carbon
{ column: "HM", field_name: :carbon_cost_build },
{ column: "HN", field_name: :carbon_cost_operation },
{ column: "HE", field_name: :carbon_cost_build },
{ column: "HF", field_name: :carbon_cost_operation },

# Additional columns per RUBY-2394
{ column: "HO", field_name: :last_updated, import: false },
{ column: "HP", field_name: :pso_name, import: false }
{ column: "HG", field_name: :last_updated, import: false },
{ column: "HH", field_name: :pso_name, import: false }
].freeze

A2Z = ("A".."Z").to_a.freeze
Expand Down
8 changes: 4 additions & 4 deletions spec/services/pafs_core/spreadsheet_service_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -118,16 +118,16 @@ class SpreadsheetMapperHelper
expect(first_row[SpreadsheetMapperHelper.column_index("GZ")].value).to eql(spreadsheet_presenter_1.create_habitat_amount)
end

it "includes column HL" do
expect(first_row[SpreadsheetMapperHelper.column_index("HL")].value.to_s).to eql(spreadsheet_presenter_1.state.state.capitalize)
it "includes column HD" do
expect(first_row[SpreadsheetMapperHelper.column_index("HD")].value.to_s).to eql(spreadsheet_presenter_1.state.state.capitalize)
end

it "includes the last_updated column" do
expect(first_row[SpreadsheetMapperHelper.column_index("HO")].value.to_s).to eq(spreadsheet_presenter_1.last_updated)
expect(first_row[SpreadsheetMapperHelper.column_index("HG")].value.to_s).to eq(spreadsheet_presenter_1.last_updated)
end

it "includes the pso_name column" do
expect(first_row[SpreadsheetMapperHelper.column_index("HP")].value.to_s).to eq(spreadsheet_presenter_1.pso_name)
expect(first_row[SpreadsheetMapperHelper.column_index("HH")].value.to_s).to eq(spreadsheet_presenter_1.pso_name)
end
end
end

0 comments on commit d9a5790

Please sign in to comment.