epb_view_models 2.0.18 → 2.0.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 12b9bc4e145892c1084d6124b37e06a48b18f5e4f19469c3339925306b20a7a2
-  data.tar.gz: 3e2b52c53637be8e89a9da65f0d08d0c7e917e81f894d4cce3ad4ea71599a3f3
+  metadata.gz: 9907c3bbfc0deee1802164bdb0be33ff7b1a72d6158962b9a7d647b4d70b3cd7
+  data.tar.gz: 49b6df150a4c8ea0e5e88b68ffdacf4e93a62ddd7b12f01d6f245057056d5b62
 SHA512:
-  metadata.gz: f84c4bb41fca78ad62e36ffa1c6e28230e185baf664119c97d1f112f9c105a53db09980a578894f2290d80e5fd74c23c2ea2ce04755c4245fb284b056e3e2599
-  data.tar.gz: 6b2b72411f94c6f87221398f084eacc603421e95a2204747623926212dfbf1842685c47db489c0fcdcc2c221f923c3d223a71a8291fe6d4177d98ba0872e82e2
+  metadata.gz: 3e68bbb919f2eef1f852726f496d9c119763598dc94a8cdef7524364b375acfd8b5664c48bb8409e7a1dc25ed05758cd887976108a50c1c4858a952cda1762b7
+  data.tar.gz: 0a4381990244e6796e7a1bb8b9671cdc820582b0b0c81569f4cebaabddda9426decc7dfe79095fad618b89c49a575b4b1dd200837e8162a8e850f9d41a661313

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.0.18"
+  VERSION = "2.0.20"
 end
 
 # Monkey patching to avoid using ActiveRecord::Type::Boolean.new.cast

data/lib/view_model/cepc_s_71/cepc.rb

@@ -1,12 +1,12 @@
 module ViewModel
   module CepcS71
     class Cepc < ViewModel::Cepc71::CommonSchema
-
       def date_of_expiry
         expires_at = (Date.parse(date_of_registration) - 1) >> 12 * 10
 
         expires_at.to_s
       end
+
       def ac_inspection_commissioned
         xpath(%w[AC-Inspection-Commissioned])
       end

data/lib/view_model/rd_sap_schema_210/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-20.0.0", improvement_number: improvement_code).summary : xpath(%w[Improvement-Summary], node),
-              improvement_description: improvement_code ? accessor.fetch_details(schema_version: "RdSAP-Schema-20.0.0", improvement_number: improvement_code).description : xpath(%w[Improvement-Description], 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),
               indicative_cost: xpath(%w[Indicative-Cost], node),
             }
           end
@@ -397,6 +397,37 @@ module ViewModel
         xpath(%w[Heated-Room-Count])&.to_i
       end
 
+      def low_energy_lighting
+        (low_energy_fixed_lighting_outlets_count / fixed_lighting_outlets_count) * 100
+      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
+        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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: epb_view_models
 version: !ruby/object:Gem::Version
-  version: 2.0.18
+  version: 2.0.20
 platform: ruby
 authors:
 - DLUHC Energy Performance of Buildings
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-05-19 00:00:00.000000000 Z
+date: 2025-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri