epb_view_models 2.1.4 → 2.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d0afd5a7caeb45cbe256054c67d7c2c48509d30f0cc30830e3158a7fdb2e799e
-  data.tar.gz: 1d73a915230ecb63d67afca596b307fc4cf26849c46b8ea44623a6f76cd5cfb4
+  metadata.gz: 67b33f9ad33a22228573df03d85af550b72f881546c0801c48d937fcdb53dac4
+  data.tar.gz: 41bda340d96c83af50aaae4f0c5cebdd92604f2d3232533b28fdc47f711d8d89
 SHA512:
-  metadata.gz: 66871443879f52e577da10b8906591c6f6195bcc46e36e8a74a13965f8628dcbd3c777c08598be9f7f2d8ae1c2da0f29484520bda995cad9cf6350527111dee2
-  data.tar.gz: b7ef0c3f454c3dba7479667c1e1f3062d569b8662e2dd9f1a57afcf7bc432f3bff456d413f0e521a2c8ffb4cb77c1237ae32c15e4e21e15d83d9ee6814a50597
+  metadata.gz: 8572481d837b9edee24148897ab4d012fbacfdcc70e1bc470c06e3ce2d31e9332426e2ef504689c41e8e8440b25369a7ab67f8fa5c7a18d2d2bb104fe664c243
+  data.tar.gz: 83247d63d782f80ae83694728887d7fc2b16268c5eb0c0f2ae80d42e3df6906d4dd4493e75e946bdadc997a409830df6878e43f960f436b8bd867fbb9b3f7858

data/lib/epb_view_models.rb

@@ -5,7 +5,7 @@ loader = Zeitwerk::Loader.for_gem(warn_on_extra_files: false)
 loader.setup
 
 module EpbViewModels
-  VERSION = "2.1.4"
+  VERSION = "2.1.6"
 end
 
 # Monkey patching to avoid using ActiveRecord::Type::Boolean.new.cast

data/lib/presenter/dec/report.rb

@@ -37,7 +37,7 @@ module Presenter
           main_benchmark: @view_model.main_benchmark,
           main_heating_fuel: @view_model.main_heating_fuel,
           special_energy_uses: @view_model.special_energy_uses,
-          renewable_sources: @view_model.renewables_fuel_thermal,
+          renewable_sources: @view_model.respond_to?(:renewable_sources) ? @view_model.renewable_sources : nil,
           total_floor_area: @view_model.floor_area,
           occupancy_level: @view_model.occupancy_level,
           annual_thermal_fuel_usage: @view_model.annual_energy_use_fuel_thermal,

data/lib/view_model/cepc31/dec.rb

@@ -196,6 +196,10 @@ module ViewModel
       def other_fuel
         xpath(%w[Technical-Information Other-Fuel-Description])
       end
+
+      def renewable_sources
+        xpath(%w[Renewable-Sources])
+      end
     end
   end
 end

data/lib/view_model/cepc40/dec.rb

@@ -216,6 +216,10 @@ module ViewModel
       def other_fuel
         xpath(%w[Technical-Information Other-Fuel-Description])
       end
+
+      def renewable_sources
+        xpath(%w[Renewable-Sources])
+      end
     end
   end
 end

data/lib/view_model/cepc50/dec.rb

@@ -216,6 +216,10 @@ module ViewModel
       def other_fuel
         xpath(%w[Technical-Information Other-Fuel-Description])
       end
+
+      def renewable_sources
+        xpath(%w[Renewable-Sources])
+      end
     end
   end
 end

data/lib/view_model/cepc51/dec.rb

@@ -216,6 +216,10 @@ module ViewModel
       def other_fuel
         xpath(%w[Technical-Information Other-Fuel-Description])
       end
+
+      def renewable_sources
+        xpath(%w[Renewable-Sources])
+      end
     end
   end
 end

data/lib/view_model/cepc60/dec.rb

@@ -224,6 +224,10 @@ module ViewModel
       def other_fuel
         xpath(%w[Technical-Information Other-Fuel-Description])
       end
+
+      def renewable_sources
+        xpath(%w[Renewable-Sources])
+      end
     end
   end
 end

data/lib/view_model/cepc70/dec.rb

@@ -224,6 +224,10 @@ module ViewModel
       def other_fuel
         xpath(%w[Technical-Information Other-Fuel-Description])
       end
+
+      def renewable_sources
+        xpath(%w[Renewable-Sources])
+      end
     end
   end
 end

data/lib/view_model/cepc71/dec.rb

@@ -224,6 +224,10 @@ module ViewModel
       def other_fuel
         xpath(%w[Technical-Information Other-Fuel-Description])
       end
+
+      def renewable_sources
+        xpath(%w[Renewable-Sources])
+      end
     end
   end
 end

data/lib/view_model/cepc800/dec.rb

@@ -226,6 +226,10 @@ module ViewModel
       def building_category
         xpath(%w[Building-Category])
       end
+
+      def renewable_sources
+        xpath(%w[Renewable-Sources])
+      end
     end
   end
 end

data/lib/view_model/cepc_ni800/dec.rb

@@ -224,6 +224,10 @@ module ViewModel
       def other_fuel
         xpath(%w[Technical-Information Other-Fuel-Description])
       end
+
+      def renewable_sources
+        xpath(%w[Renewable-Sources])
+      end
     end
   end
 end

data/lib/view_model/rd_sap_schema_210/common_schema.rb

@@ -125,6 +125,7 @@ module ViewModel
             {
               sequence: xpath(%w[Sequence], node).to_i,
               improvement_code: xpath(%w[Improvement-Details Improvement-Number], node),
+              # the schema version is set to 21.0.1 as 21.0.0 had missing improvements in the external definitions
               improvement_summary: improvement_code ? accessor.fetch_details(schema_version: "RdSAP-Schema-21.0.1", improvement_number: improvement_code).summary : xpath(%w[Improvement-Summary], node),
               improvement_description: improvement_code ? accessor.fetch_details(schema_version: "RdSAP-Schema-21.0.1", improvement_number: improvement_code).description : xpath(%w[Improvement-Description], node),
               indicative_cost: xpath(%w[Indicative-Cost], node),

data/lib/view_model/rd_sap_schema_ni_210/common_schema.rb

@@ -125,8 +125,9 @@ module ViewModel
             {
               sequence: xpath(%w[Sequence], node).to_i,
               improvement_code: xpath(%w[Improvement-Details Improvement-Number], node),
-              improvement_summary: improvement_code ? accessor.fetch_details(schema_version: "RdSAP-Schema-NI-21.0.0", improvement_number: improvement_code).summary : xpath(%w[Improvement-Summary], node),
-              improvement_description: improvement_code ? accessor.fetch_details(schema_version: "RdSAP-Schema-NI-21.0.0", improvement_number: improvement_code).description : xpath(%w[Improvement-Description], node),
+              # the schema version is set to 21.0.1 as 21.0.0 had missing improvements in the external definitions
+              improvement_summary: improvement_code ? accessor.fetch_details(schema_version: "RdSAP-Schema-NI-21.0.1", improvement_number: improvement_code).summary : xpath(%w[Improvement-Summary], node),
+              improvement_description: improvement_code ? accessor.fetch_details(schema_version: "RdSAP-Schema-NI-21.0.1", improvement_number: improvement_code).description : xpath(%w[Improvement-Description], node),
               indicative_cost: xpath(%w[Indicative-Cost], node),
             }
           end
@@ -397,6 +398,41 @@ module ViewModel
         xpath(%w[Heated-Room-Count])&.to_i
       end
 
+      def low_energy_lighting
+        if fixed_lighting_outlets_count.zero?
+          return 0
+        end
+
+        ((low_energy_fixed_lighting_outlets_count.to_f / fixed_lighting_outlets_count) * 100).round
+      end
+
+      def fixed_lighting_outlets_count
+        fixed_lighting_outlets_count = low_energy_fixed_lighting_outlets_count
+        if xpath(%w[Incandescent-Fixed-Lighting-Bulbs-Count])
+          fixed_lighting_outlets_count += xpath(%w[Incandescent-Fixed-Lighting-Bulbs-Count])&.to_i
+        end
+        fixed_lighting_outlets_count
+      end
+
+      def low_energy_fixed_lighting_outlets_count
+        low_energy_fixed_lighting_outlets_count = 0
+        if xpath(%w[CFL-Fixed-Lighting-Bulbs-Count])
+          low_energy_fixed_lighting_outlets_count += xpath(%w[CFL-Fixed-Lighting-Bulbs-Count])&.to_i
+        end
+        if xpath(%w[LED-Fixed-Lighting-Bulbs-Count])
+          low_energy_fixed_lighting_outlets_count += xpath(%w[LED-Fixed-Lighting-Bulbs-Count])&.to_i
+        end
+        if xpath(%w[Low-Energy-Fixed-Lighting-Bulbs-Count])
+          low_energy_fixed_lighting_outlets_count += xpath(%w[Low-Energy-Fixed-Lighting-Bulbs-Count])&.to_i
+        end
+
+        low_energy_fixed_lighting_outlets_count
+      end
+
+      def open_fireplaces_count
+        xpath(%w[Open-Chimneys-Count])&.to_i
+      end
+
       def hot_water_description
         xpath(%w[Hot-Water Description])
       end

data/lib/view_model/rd_sap_schema_ni_2101/common_schema.rb

@@ -125,8 +125,8 @@ module ViewModel
             {
               sequence: xpath(%w[Sequence], node).to_i,
               improvement_code: xpath(%w[Improvement-Details Improvement-Number], node),
-              improvement_summary: improvement_code ? accessor.fetch_details(schema_version: "RdSAP-Schema-21.0.0", improvement_number: improvement_code).summary : xpath(%w[Improvement-Summary], node),
-              improvement_description: improvement_code ? accessor.fetch_details(schema_version: "RdSAP-Schema-21.0.0", improvement_number: improvement_code).description : xpath(%w[Improvement-Description], node),
+              improvement_summary: improvement_code ? accessor.fetch_details(schema_version: "RdSAP-Schema-NI-21.0.1", improvement_number: improvement_code).summary : xpath(%w[Improvement-Summary], node),
+              improvement_description: improvement_code ? accessor.fetch_details(schema_version: "RdSAP-Schema-NI-21.0.1", improvement_number: improvement_code).description : xpath(%w[Improvement-Description], node),
               indicative_cost: xpath(%w[Indicative-Cost], node),
             }
           end
@@ -398,13 +398,17 @@ module ViewModel
       end
 
       def low_energy_lighting
-        (low_energy_fixed_lighting_outlets_count / fixed_lighting_outlets_count) * 100
+        if fixed_lighting_outlets_count.zero?
+          return 0
+        end
+
+        ((low_energy_fixed_lighting_outlets_count.to_f / fixed_lighting_outlets_count) * 100).round
       end
 
       def fixed_lighting_outlets_count
         fixed_lighting_outlets_count = low_energy_fixed_lighting_outlets_count
-        if xpath(%w[Incandescent-Lighting-Bulbs-Count])
-          fixed_lighting_outlets_count += xpath(%w[Incandescent-Lighting-Bulbs-Count])&.to_i
+        if xpath(%w[Incandescent-Fixed-Lighting-Bulbs-Count])
+          fixed_lighting_outlets_count += xpath(%w[Incandescent-Fixed-Lighting-Bulbs-Count])&.to_i
         end
         fixed_lighting_outlets_count
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: epb_view_models
 version: !ruby/object:Gem::Version
-  version: 2.1.4
+  version: 2.1.6
 platform: ruby
 authors:
 - MHCLG Energy Performance of Buildings
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-07-08 00:00:00.000000000 Z
+date: 2025-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri