epb_view_models 2.0.9 → 2.0.11

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (11) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile +1 -1
  3. data/Gemfile.lock +47 -34
  4. data/api/schemas/xml/RdSAP-Schema-21.0.0/RdSAP/Templates/EPC-CollectedData.xsd +7 -7
  5. data/api/schemas/xml/RdSAP-Schema-21.0.0/RdSAP/UDT/SAP-Domains.xsd +111 -2
  6. data/lib/epb_view_models.rb +1 -1
  7. data/lib/presenter/rd_sap/certificate_summary.rb +5 -4
  8. data/lib/presenter/rd_sap/domestic_digest.rb +1 -1
  9. data/lib/presenter/sap/certificate_summary.rb +5 -4
  10. data/lib/presenter/sap/domestic_digest.rb +1 -1
  11. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 90435122609e6e4b3fa5b0c34b5611c342087bed7d4db78f60c43ce1d5b16c44
4
- data.tar.gz: de3f253040a517a97c27b00011883de45f0a2459ee67fc634565854f2204efa3
3
+ metadata.gz: ea8124e14177faa84d74288dcee49bb42a18623b4239cdb3a1f5070b52143f31
4
+ data.tar.gz: 6851cd8f4e4fef2e758a0760725006b471daab775eb0d91534b75f556e693787
5
5
  SHA512:
6
- metadata.gz: '0658307de2ada9774f4b6bdb8e09494c7192b29dcf67d9d490b38031aa399cb647a1348a1cc10339bc9fff794e41a252752c2ba1e00049c6559d64a455440622'
7
- data.tar.gz: dff926e7db3ce96d6396300a29b9f8af1c09f06ad4cd4ca5fc84144d23889301cb11583531339fe16f83bffe8bfa7a3344d591181167dc470050823158726299
6
+ metadata.gz: c87458b7dab57f65fd3e46071e90ea1d40258bfe07fbfbd44fc7d0d3ad6ec3cdef3496df9cd058bb08f85598a6d54cede887f36dfff952a34dd591c64bd88bb7
7
+ data.tar.gz: 92775cb540b9ab7c6adfbd7724ec479ba3678664884eaa36127ba67bc607e05efc5c6e7857d65cc9e97a919bb55b2bc624f5333cf78a8b62c95ad57ef280267f
data/Gemfile CHANGED
@@ -7,7 +7,7 @@ source "https://rubygems.org"
7
7
  group :test do
8
8
  gem "rake", "~> 13.0.6"
9
9
  gem "rspec", "~> 3.0"
10
- gem "rubocop-govuk", "~> 4.7.0", require: false
10
+ gem "rubocop-govuk", "~> 5.0", require: false
11
11
  end
12
12
 
13
13
  gem "nokogiri", "~> 1.16", ">= 1.16.5"
data/Gemfile.lock CHANGED
@@ -1,39 +1,44 @@
1
1
  GEM
2
2
  remote: https://rubygems.org/
3
3
  specs:
4
- activesupport (7.1.3.2)
4
+ activesupport (8.0.1)
5
5
  base64
6
+ benchmark (>= 0.3)
6
7
  bigdecimal
7
- concurrent-ruby (~> 1.0, >= 1.0.2)
8
+ concurrent-ruby (~> 1.0, >= 1.3.1)
8
9
  connection_pool (>= 2.2.5)
9
10
  drb
10
11
  i18n (>= 1.6, < 2)
12
+ logger (>= 1.4.2)
11
13
  minitest (>= 5.1)
12
- mutex_m
13
- tzinfo (~> 2.0)
14
+ securerandom (>= 0.3)
15
+ tzinfo (~> 2.0, >= 2.0.5)
16
+ uri (>= 0.13.1)
14
17
  ast (2.4.2)
15
18
  base64 (0.2.0)
16
- bigdecimal (3.1.6)
17
- concurrent-ruby (1.2.3)
18
- connection_pool (2.4.1)
19
+ benchmark (0.4.0)
20
+ bigdecimal (3.1.9)
21
+ concurrent-ruby (1.3.5)
22
+ connection_pool (2.5.0)
19
23
  diff-lcs (1.5.1)
20
24
  drb (2.2.1)
21
- i18n (1.14.4)
25
+ i18n (1.14.7)
22
26
  concurrent-ruby (~> 1.0)
23
- json (2.7.1)
24
- minitest (5.22.2)
25
- mutex_m (0.2.0)
27
+ json (2.10.0)
28
+ language_server-protocol (3.17.0.4)
29
+ logger (1.6.5)
30
+ minitest (5.25.4)
26
31
  nokogiri (1.18.1-arm64-darwin)
27
32
  racc (~> 1.4)
28
- parallel (1.24.0)
29
- parser (3.3.0.5)
33
+ parallel (1.26.3)
34
+ parser (3.3.7.1)
30
35
  ast (~> 2.4.1)
31
36
  racc
32
37
  racc (1.7.3)
33
- rack (3.0.9.1)
38
+ rack (3.1.9)
34
39
  rainbow (3.1.1)
35
40
  rake (13.0.6)
36
- regexp_parser (2.9.0)
41
+ regexp_parser (2.10.0)
37
42
  rexml (3.4.0)
38
43
  rspec (3.13.0)
39
44
  rspec-core (~> 3.13.0)
@@ -48,36 +53,44 @@ GEM
48
53
  diff-lcs (>= 1.2.0, < 2.0)
49
54
  rspec-support (~> 3.13.0)
50
55
  rspec-support (3.13.1)
51
- rubocop (1.35.0)
56
+ rubocop (1.70.0)
52
57
  json (~> 2.3)
58
+ language_server-protocol (>= 3.17.0)
53
59
  parallel (~> 1.10)
54
- parser (>= 3.1.2.1)
60
+ parser (>= 3.3.0.2)
55
61
  rainbow (>= 2.2.2, < 4.0)
56
- regexp_parser (>= 1.8, < 3.0)
57
- rexml (>= 3.2.5, < 4.0)
58
- rubocop-ast (>= 1.20.1, < 2.0)
62
+ regexp_parser (>= 2.9.3, < 3.0)
63
+ rubocop-ast (>= 1.36.2, < 2.0)
59
64
  ruby-progressbar (~> 1.7)
60
- unicode-display_width (>= 1.4.0, < 3.0)
61
- rubocop-ast (1.21.0)
62
- parser (>= 3.1.1.0)
63
- rubocop-govuk (4.7.0)
64
- rubocop (= 1.35.0)
65
- rubocop-ast (= 1.21.0)
66
- rubocop-rails (= 2.15.2)
65
+ unicode-display_width (>= 2.4.0, < 4.0)
66
+ rubocop-ast (1.37.0)
67
+ parser (>= 3.3.1.0)
68
+ rubocop-capybara (2.21.0)
69
+ rubocop (~> 1.41)
70
+ rubocop-govuk (5.0.8)
71
+ rubocop (= 1.70.0)
72
+ rubocop-ast (= 1.37.0)
73
+ rubocop-capybara (= 2.21.0)
74
+ rubocop-rails (= 2.28.0)
67
75
  rubocop-rake (= 0.6.0)
68
- rubocop-rspec (= 2.12.1)
69
- rubocop-rails (2.15.2)
76
+ rubocop-rspec (= 3.3.0)
77
+ rubocop-rails (2.28.0)
70
78
  activesupport (>= 4.2.0)
71
79
  rack (>= 1.1)
72
- rubocop (>= 1.7.0, < 2.0)
80
+ rubocop (>= 1.52.0, < 2.0)
81
+ rubocop-ast (>= 1.31.1, < 2.0)
73
82
  rubocop-rake (0.6.0)
74
83
  rubocop (~> 1.0)
75
- rubocop-rspec (2.12.1)
76
- rubocop (~> 1.31)
84
+ rubocop-rspec (3.3.0)
85
+ rubocop (~> 1.61)
77
86
  ruby-progressbar (1.13.0)
87
+ securerandom (0.4.1)
78
88
  tzinfo (2.0.6)
79
89
  concurrent-ruby (~> 1.0)
80
- unicode-display_width (2.5.0)
90
+ unicode-display_width (3.1.4)
91
+ unicode-emoji (~> 4.0, >= 4.0.4)
92
+ unicode-emoji (4.0.4)
93
+ uri (1.0.2)
81
94
  zeitwerk (2.6.13)
82
95
 
83
96
  PLATFORMS
@@ -88,7 +101,7 @@ DEPENDENCIES
88
101
  rake (~> 13.0.6)
89
102
  rexml (>= 3.3.9)
90
103
  rspec (~> 3.0)
91
- rubocop-govuk (~> 4.7.0)
104
+ rubocop-govuk (~> 5.0)
92
105
  zeitwerk (~> 2.6)
93
106
 
94
107
  RUBY VERSION
data/api/schemas/xml/RdSAP-Schema-21.0.0/RdSAP/Templates/EPC-CollectedData.xsd CHANGED
@@ -999,7 +999,7 @@ If the total peak power has been apportioned between different dwellings within
999
999
  <xs:element name="PV-Batteries" type="PV-Batteries"/>
1000
1000
  <xs:complexType name="PV-Batteries">
1001
1001
  <xs:sequence>
1002
- <xs:element name="PV-Battery" type="PV-Battery" maxOccurs="20"/>
1002
+ <xs:element name="PV-Battery" type="PV-Battery" maxOccurs="4"/>
1003
1003
  </xs:sequence>
1004
1004
  </xs:complexType>
1005
1005
  <xs:element name="PV-Battery" type="PV-Battery"/>
@@ -1018,7 +1018,7 @@ If the total peak power has been apportioned between different dwellings within
1018
1018
  <xs:element name="Flat-Ceiling-Length-1" type="Measurement" minOccurs="0"/>
1019
1019
  <xs:element name="Flat-Ceiling-Height-1" type="Measurement" minOccurs="0"/>
1020
1020
  <xs:element name="Flat-Ceiling-U-Value-1" type="xs:decimal" minOccurs="0"/>
1021
- <xs:element name="Flat-Ceiling-Insulation-Thickness-1" type="RoofInsulationThicknessCode" minOccurs="0">
1021
+ <xs:element name="Flat-Ceiling-Insulation-Thickness-1" type="RoofRoomInsulationThicknessCode" minOccurs="0">
1022
1022
  <xs:annotation>
1023
1023
  <xs:documentation>Mutually exclusive with U-value. Either U-value provided, or thickness.</xs:documentation>
1024
1024
  </xs:annotation>
@@ -1036,7 +1036,7 @@ If the total peak power has been apportioned between different dwellings within
1036
1036
  <xs:element name="Flat-Ceiling-Length-2" type="Measurement" minOccurs="0"/>
1037
1037
  <xs:element name="Flat-Ceiling-Height-2" type="Measurement" minOccurs="0"/>
1038
1038
  <xs:element name="Flat-Ceiling-U-Value-2" type="xs:decimal" minOccurs="0"/>
1039
- <xs:element name="Flat-Ceiling-Insulation-Thickness-2" type="RoofInsulationThicknessCode" minOccurs="0">
1039
+ <xs:element name="Flat-Ceiling-Insulation-Thickness-2" type="RoofRoomInsulationThicknessCode" minOccurs="0">
1040
1040
  <xs:annotation>
1041
1041
  <xs:documentation>Mutually exclusive with U-value. Either U-value provided, or thickness.</xs:documentation>
1042
1042
  </xs:annotation>
@@ -1054,7 +1054,7 @@ If the total peak power has been apportioned between different dwellings within
1054
1054
  <xs:element name="Stud-Wall-Length-1" type="Measurement" minOccurs="0"/>
1055
1055
  <xs:element name="Stud-Wall-Height-1" type="Measurement" minOccurs="0"/>
1056
1056
  <xs:element name="Stud-Wall-U-Value-1" type="xs:decimal" minOccurs="0"/>
1057
- <xs:element name="Stud-Wall-Insulation-Thickness-1" type="RoofInsulationThicknessCode" minOccurs="0">
1057
+ <xs:element name="Stud-Wall-Insulation-Thickness-1" type="RoofRoomInsulationThicknessCode" minOccurs="0">
1058
1058
  <xs:annotation>
1059
1059
  <xs:documentation>Mutually exclusive with U-value. Either U-value provided, or thickness.</xs:documentation>
1060
1060
  </xs:annotation>
@@ -1067,7 +1067,7 @@ If the total peak power has been apportioned between different dwellings within
1067
1067
  <xs:element name="Stud-Wall-Length-2" type="Measurement" minOccurs="0"/>
1068
1068
  <xs:element name="Stud-Wall-Height-2" type="Measurement" minOccurs="0"/>
1069
1069
  <xs:element name="Stud-Wall-U-Value-2" type="xs:decimal" minOccurs="0"/>
1070
- <xs:element name="Stud-Wall-Insulation-Thickness-2" type="RoofInsulationThicknessCode" minOccurs="0">
1070
+ <xs:element name="Stud-Wall-Insulation-Thickness-2" type="RoofRoomInsulationThicknessCode" minOccurs="0">
1071
1071
  <xs:annotation>
1072
1072
  <xs:documentation>Mutually exclusive with U-value. Either U-value provided, or thickness.</xs:documentation>
1073
1073
  </xs:annotation>
@@ -1080,7 +1080,7 @@ If the total peak power has been apportioned between different dwellings within
1080
1080
  <xs:element name="Slope-Length-1" type="Measurement" minOccurs="0"/>
1081
1081
  <xs:element name="Slope-Height-1" type="Measurement" minOccurs="0"/>
1082
1082
  <xs:element name="Slope-U-Value-1" type="xs:decimal" minOccurs="0"/>
1083
- <xs:element name="Slope-Insulation-Thickness-1" type="RoofInsulationThicknessCode" minOccurs="0">
1083
+ <xs:element name="Slope-Insulation-Thickness-1" type="RoofRoomInsulationThicknessCode" minOccurs="0">
1084
1084
  <xs:annotation>
1085
1085
  <xs:documentation>Mutually exclusive with U-value. Either U-value provided, or thickness.</xs:documentation>
1086
1086
  </xs:annotation>
@@ -1093,7 +1093,7 @@ If the total peak power has been apportioned between different dwellings within
1093
1093
  <xs:element name="Slope-Length-2" type="Measurement" minOccurs="0"/>
1094
1094
  <xs:element name="Slope-Height-2" type="Measurement" minOccurs="0"/>
1095
1095
  <xs:element name="Slope-U-Value-2" type="xs:decimal" minOccurs="0"/>
1096
- <xs:element name="Slope-Insulation-Thickness-2" type="RoofInsulationThicknessCode" minOccurs="0">
1096
+ <xs:element name="Slope-Insulation-Thickness-2" type="RoofRoomInsulationThicknessCode" minOccurs="0">
1097
1097
  <xs:annotation>
1098
1098
  <xs:documentation>Mutually exclusive with U-value. Either U-value provided, or thickness.</xs:documentation>
1099
1099
  </xs:annotation>
data/api/schemas/xml/RdSAP-Schema-21.0.0/RdSAP/UDT/SAP-Domains.xsd CHANGED
@@ -243,8 +243,8 @@ Northern Ireland: 2014 onwards</xs:documentation>
243
243
  <xs:enumeration value="M">
244
244
  <xs:annotation>
245
245
  <xs:documentation>England and Wales: 2022 onwards;
246
- Scotland: 2023 onwards (TBA);
247
- Northern Ireland: 2014 onwards (TBA)</xs:documentation>
246
+ Scotland: 2024 onwards;
247
+ Northern Ireland: 2023 onwards</xs:documentation>
248
248
  </xs:annotation>
249
249
  </xs:enumeration>
250
250
  <xs:enumeration value="0">
@@ -336,6 +336,11 @@ Northern Ireland: 2014 onwards (TBA)</xs:documentation>
336
336
  <xs:documentation>triple glazing, installed during or after 2022 in EAW, 2023 in SCT, 2022 NI</xs:documentation>
337
337
  </xs:annotation>
338
338
  </xs:enumeration>
339
+ <xs:enumeration value="15">
340
+ <xs:annotation>
341
+ <xs:documentation>single glazing, known data</xs:documentation>
342
+ </xs:annotation>
343
+ </xs:enumeration>
339
344
  </xs:restriction>
340
345
  </xs:simpleType>
341
346
  <xs:simpleType name="GlazedAreaCode">
@@ -504,6 +509,105 @@ Northern Ireland: 2014 onwards (TBA)</xs:documentation>
504
509
  </xs:annotation>
505
510
  </xs:enumeration>
506
511
  </xs:restriction>
512
+ </xs:simpleType>
513
+ <xs:simpleType name="RoofRoomInsulationThicknessCode">
514
+ <xs:restriction base="xs:string">
515
+ <xs:enumeration value="AB">
516
+ <xs:annotation>
517
+ <xs:documentation>as built</xs:documentation>
518
+ </xs:annotation>
519
+ </xs:enumeration>
520
+ <xs:enumeration value="NI">
521
+ <xs:annotation>
522
+ <xs:documentation>unknown</xs:documentation>
523
+ </xs:annotation>
524
+ </xs:enumeration>
525
+ <xs:enumeration value="0">
526
+ <xs:annotation>
527
+ <xs:documentation>None</xs:documentation>
528
+ </xs:annotation>
529
+ </xs:enumeration>
530
+ <xs:enumeration value="12mm">
531
+ <xs:annotation>
532
+ <xs:documentation>12mm</xs:documentation>
533
+ </xs:annotation>
534
+ </xs:enumeration>
535
+ <xs:enumeration value="25mm">
536
+ <xs:annotation>
537
+ <xs:documentation>25mm</xs:documentation>
538
+ </xs:annotation>
539
+ </xs:enumeration>
540
+ <xs:enumeration value="50mm">
541
+ <xs:annotation>
542
+ <xs:documentation>50mm</xs:documentation>
543
+ </xs:annotation>
544
+ </xs:enumeration>
545
+ <xs:enumeration value="75mm">
546
+ <xs:annotation>
547
+ <xs:documentation>75mm</xs:documentation>
548
+ </xs:annotation>
549
+ </xs:enumeration>
550
+ <xs:enumeration value="100mm">
551
+ <xs:annotation>
552
+ <xs:documentation>100mm</xs:documentation>
553
+ </xs:annotation>
554
+ </xs:enumeration>
555
+ <xs:enumeration value="125mm">
556
+ <xs:annotation>
557
+ <xs:documentation>125mm</xs:documentation>
558
+ </xs:annotation>
559
+ </xs:enumeration>
560
+ <xs:enumeration value="150mm">
561
+ <xs:annotation>
562
+ <xs:documentation>150mm</xs:documentation>
563
+ </xs:annotation>
564
+ </xs:enumeration>
565
+ <xs:enumeration value="175mm">
566
+ <xs:annotation>
567
+ <xs:documentation>175mm</xs:documentation>
568
+ </xs:annotation>
569
+ </xs:enumeration>
570
+ <xs:enumeration value="200mm">
571
+ <xs:annotation>
572
+ <xs:documentation>200mm</xs:documentation>
573
+ </xs:annotation>
574
+ </xs:enumeration>
575
+ <xs:enumeration value="225mm">
576
+ <xs:annotation>
577
+ <xs:documentation>225mm</xs:documentation>
578
+ </xs:annotation>
579
+ </xs:enumeration>
580
+ <xs:enumeration value="250mm">
581
+ <xs:annotation>
582
+ <xs:documentation>250mm</xs:documentation>
583
+ </xs:annotation>
584
+ </xs:enumeration>
585
+ <xs:enumeration value="270mm">
586
+ <xs:annotation>
587
+ <xs:documentation>270mm</xs:documentation>
588
+ </xs:annotation>
589
+ </xs:enumeration>
590
+ <xs:enumeration value="300mm">
591
+ <xs:annotation>
592
+ <xs:documentation>300mm</xs:documentation>
593
+ </xs:annotation>
594
+ </xs:enumeration>
595
+ <xs:enumeration value="350mm">
596
+ <xs:annotation>
597
+ <xs:documentation>350mm</xs:documentation>
598
+ </xs:annotation>
599
+ </xs:enumeration>
600
+ <xs:enumeration value="400mm+">
601
+ <xs:annotation>
602
+ <xs:documentation>400mm or more</xs:documentation>
603
+ </xs:annotation>
604
+ </xs:enumeration>
605
+ <xs:enumeration value="ND">
606
+ <xs:annotation>
607
+ <xs:documentation>Not Defined</xs:documentation>
608
+ </xs:annotation>
609
+ </xs:enumeration>
610
+ </xs:restriction>
507
611
  </xs:simpleType>
508
612
  <xs:simpleType name="GableType">
509
613
  <xs:restriction base="xs:string">
@@ -2946,6 +3050,11 @@ This is a very similar concept to XML ID datatype but is locally defined because
2946
3050
  <xs:documentation>appliances able to use mineral oil or liquid biofuel</xs:documentation>
2947
3051
  </xs:annotation>
2948
3052
  </xs:enumeration>
3053
+ <xs:enumeration value="38">
3054
+ <xs:annotation>
3055
+ <xs:documentation>Gas: bottled LPG (for secondary heating)</xs:documentation>
3056
+ </xs:annotation>
3057
+ </xs:enumeration>
2949
3058
  <xs:enumeration value="51">
2950
3059
  <xs:annotation>
2951
3060
  <xs:documentation>biogas (not community)</xs:documentation>
data/lib/epb_view_models.rb CHANGED
@@ -5,7 +5,7 @@ loader = Zeitwerk::Loader.for_gem(warn_on_extra_files: false)
5
5
  loader.setup
6
6
 
7
7
  module EpbViewModels
8
- VERSION = "2.0.9"
8
+ VERSION = "2.0.11"
9
9
  end
10
10
 
11
11
  # Monkey patching to avoid using ActiveRecord::Type::Boolean.new.cast
data/lib/presenter/rd_sap/certificate_summary.rb CHANGED
@@ -47,7 +47,7 @@ module Presenter
47
47
  current_space_heating_demand:
48
48
  @view_model.current_space_heating_demand&.to_i,
49
49
  current_water_heating_demand:
50
- @view_model.current_water_heating_demand&.to_i
50
+ @view_model.current_water_heating_demand&.to_i,
51
51
  },
52
52
  heating_cost_current: @view_model.heating_cost_current,
53
53
  heating_cost_potential: @view_model.heating_cost_potential,
@@ -79,12 +79,13 @@ module Presenter
79
79
  @view_model.related_party_disclosure_text,
80
80
  total_floor_area: convert_to_big_decimal(@view_model.total_floor_area),
81
81
  status: @view_model.status,
82
- co2_emissions_current_per_floor_area:
83
- @view_model.co2_emissions_current_per_floor_area,
82
+ environmental_impact_current: @view_model.environmental_impact_current,
83
+ environmental_impact_potential:
84
+ @view_model.environmental_impact_potential,
85
+ primary_energy_use: @view_model.respond_to?(:primary_energy_use) ? @view_model.primary_energy_use : nil,
84
86
  addendum: @view_model.addendum,
85
87
  gas_smart_meter_present: @view_model.respond_to?(:gas_smart_meter_present) ? @view_model.gas_smart_meter_present : nil,
86
88
  electricity_smart_meter_present: @view_model.respond_to?(:electricity_smart_meter_present) ? @view_model.electricity_smart_meter_present : nil,
87
- country_code: @view_model.country_code,
88
89
  }
89
90
  end
90
91
 
data/lib/presenter/rd_sap/domestic_digest.rb CHANGED
@@ -46,7 +46,7 @@ module Presenter
46
46
  improvement
47
47
  end,
48
48
  photo_supply: @view_model.respond_to?(:photovoltaic_roof_area_percent) && !@view_model.photovoltaic_roof_area_percent.nil? ? @view_model.photovoltaic_roof_area_percent.to_i : nil,
49
- main_heating_controls: @view_model.all_main_heating_controls_descriptions
49
+ main_heating_controls: @view_model.all_main_heating_controls_descriptions,
50
50
  }
51
51
  end
52
52
  end
data/lib/presenter/sap/certificate_summary.rb CHANGED
@@ -44,7 +44,7 @@ module Presenter
44
44
  current_space_heating_demand:
45
45
  @view_model.current_space_heating_demand&.to_i,
46
46
  current_water_heating_demand:
47
- @view_model.current_water_heating_demand&.to_i
47
+ @view_model.current_water_heating_demand&.to_i,
48
48
  },
49
49
  heating_cost_current: @view_model.heating_cost_current,
50
50
  heating_cost_potential: @view_model.heating_cost_potential,
@@ -76,12 +76,13 @@ module Presenter
76
76
  @view_model.related_party_disclosure_text,
77
77
  total_floor_area: convert_to_big_decimal(@view_model.total_floor_area),
78
78
  status: @view_model.status,
79
- co2_emissions_current_per_floor_area:
80
- @view_model.co2_emissions_current_per_floor_area,
79
+ environmental_impact_current: @view_model.environmental_impact_current,
80
+ environmental_impact_potential:
81
+ @view_model.environmental_impact_potential,
82
+ primary_energy_use: @view_model.respond_to?(:primary_energy_use) ? @view_model.primary_energy_use : nil,
81
83
  addendum: @view_model.addendum,
82
84
  gas_smart_meter_present: @view_model.respond_to?(:gas_smart_meter_present) ? @view_model.gas_smart_meter_present : nil,
83
85
  electricity_smart_meter_present: @view_model.respond_to?(:electricity_smart_meter_present) ? @view_model.electricity_smart_meter_present : nil,
84
- country_code: @view_model.country_code,
85
86
  }
86
87
  end
87
88
 
data/lib/presenter/sap/domestic_digest.rb CHANGED
@@ -43,7 +43,7 @@ module Presenter
43
43
  improvement
44
44
  end,
45
45
  photo_supply: @view_model.respond_to?(:photovoltaic_roof_area_percent) && !@view_model.photovoltaic_roof_area_percent.nil? ? @view_model.photovoltaic_roof_area_percent.to_i : nil,
46
- main_heating_controls: @view_model.all_main_heating_controls_descriptions
46
+ main_heating_controls: @view_model.all_main_heating_controls_descriptions,
47
47
  }
48
48
  end
49
49
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: epb_view_models
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.0.9
4
+ version: 2.0.11
5
5
  platform: ruby
6
6
  authors:
7
7
  - DLUHC Energy Performance of Buildings
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2025-02-03 00:00:00.000000000 Z
11
+ date: 2025-02-13 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: nokogiri