epb_view_models 1.0.6 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 414c0a2f9029d52009e6e7f1b87bbee49bdaef8748412508a50e8a7a08eddbaf
-  data.tar.gz: bd9c946f41a6ddfd2f67700634f3ff6b4f5231c9c7227da63cc3118dfd73a458
+  metadata.gz: e84293861022176f883ddae06d91d887da347b27ca44d9ed52ad2bb7135d0a53
+  data.tar.gz: 0cb5910f39ba8e6272c2427b3255346005e5c5636777334158a457f258807f71
 SHA512:
-  metadata.gz: 34da0ef4ee834f38767b57544eddbdb9918b56addedb69ebf5f76604ea17f1d5dee3e0f9cf8cfec41ec298de1c6293fbbafeaa4155a5269e8305e82074574313
-  data.tar.gz: 57d61f7ad89951e09f272fdbc8d9c58a6cdaebabc5ab038bcdde0ea3c7b568773f6f3c3695d4456735a7646d0c32678548b25007a4ed963e02a16a6ad254ccdb
+  metadata.gz: 243a54697bca19151c977439193fa2b2651235f4289a9c853916ba91d9237fed64e67ca4df8cd6351a77bae268ecdcc6b29e8ea55cb0b95887fd202703f33a39
+  data.tar.gz: 5e0182f480eef682e2b46c4335161ec1e68e3c3463f95ec5609ee7b6103cd8ba87f682da26c362d120ff3b884a21090fd6c3aa88761aa9c478277e3a96ed2f76

data/lib/epb_view_models.rb

@@ -5,7 +5,7 @@ loader = Zeitwerk::Loader.for_gem
 loader.setup
 
 module EpbViewModels
-  VERSION = "1.0.6"
+  VERSION = "1.0.7"
 end
 
 # Monkey patching to avoid using ActiveRecord::Type::Boolean.new.cast

data/lib/helper/xml_enums_to_output.rb

@@ -331,7 +331,7 @@ module Helper
     end
 
     def self.construction_age_band_lookup(value, schema_type, report_type)
-      types_of_sap_pre17 = %w[
+      types_of_sap_pre17 = %i[
         SAP-Schema-16.3
         SAP-Schema-16.2
         SAP-Schema-16.1
@@ -346,7 +346,7 @@ module Helper
         SAP-Schema-11.0
       ].freeze
 
-      schemes_that_use_not_recorded = %w[
+      schemes_that_use_not_recorded = %i[
         SAP-Schema-16.3
         SAP-Schema-16.2
         SAP-Schema-16.1
@@ -357,7 +357,7 @@ module Helper
         RdSAP-Schema-17.0
       ]
 
-      schemes_that_use_l = %w[
+      schemes_that_use_l = %i[
         SAP-Schema-18.0.0
         SAP-Schema-17.1
         SAP-Schema-17.0
@@ -368,7 +368,7 @@ module Helper
         RdSAP-Schema-17.0
       ]
 
-      schemes_that_use_0 = %w[
+      schemes_that_use_0 = %i[
         SAP-Schema-16.3
         SAP-Schema-16.2
         SAP-Schema-16.1
@@ -386,7 +386,7 @@ module Helper
         RdSAP-Schema-17.0
       ]
 
-      sap_schemas_ni = %w[
+      sap_schemas_ni = %i[
         SAP-Schema-NI-18.0.0
         SAP-Schema-NI-17.4
         SAP-Schema-NI-17.3
@@ -402,7 +402,7 @@ module Helper
         SAP-Schema-NI-13.0
       ]
 
-      rdsap_schemas_ni = %w[
+      rdsap_schemas_ni = %i[
         RdSAP-Schema-NI-20.0.0
         RdSAP-Schema-NI-19.0
         RdSAP-Schema-NI-18.0
@@ -410,29 +410,29 @@ module Helper
         RdSAP-Schema-NI-17.3
       ]
 
-      ni_schemas_pre_12 = %w[
+      ni_schemas_pre_12 = %i[
         SAP-Schema-NI-12.0
         SAP-Schema-NI-11.2
       ]
 
       if value == "K" && rdsap_schemas_ni.include?(schema_type)
-        return CONSTRUCTION_AGE_BAND_NI["K-RdSAP-NI"]
+        return CONSTRUCTION_AGE_BAND_NI["K-RdSAP-NI"] || value
       end
 
       if value == "K" && sap_schemas_ni.include?(schema_type)
-        return CONSTRUCTION_AGE_BAND_NI["K-SAP-NI"]
+        return CONSTRUCTION_AGE_BAND_NI["K-SAP-NI"] || value
       end
 
       if ni_schemas_pre_12.include?(schema_type)
         key = (value == "0" ? value : "#{value}-12.0")
-        return CONSTRUCTION_AGE_BAND_NI[key]
+        return CONSTRUCTION_AGE_BAND_NI[key] || value
       end
 
       if sap_schemas_ni.include?(schema_type) || rdsap_schemas_ni.include?(schema_type)
-        return CONSTRUCTION_AGE_BAND_NI[value]
+        return CONSTRUCTION_AGE_BAND_NI[value] || value
       end
 
-      if value == "K" && schema_type == "SAP-Schema-12.0" && is_rdsap(report_type)
+      if value == "K" && schema_type == :"SAP-Schema-12.0" && is_rdsap(report_type)
         return CONSTRUCTION_AGE_BAND["K-12.0"]
       end
 

data/lib/presenter/rd_sap/report.rb

@@ -31,7 +31,7 @@ module Presenter
           co2_emissions_potential: @view_model.potential_carbon_emission,
           construction_age_band:
             Helper::XmlEnumsToOutput.construction_age_band_lookup(
-              @view_model.property_age_band,
+              @view_model.main_dwelling_construction_age_band_or_year,
               @schema_type,
               @view_model.report_type,
             ),

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: epb_view_models
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
 platform: ruby
 authors:
 - MHCLG Energy Performance of Buildings
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-09-23 00:00:00.000000000 Z
+date: 2021-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri