epb_view_models 1.0.4 → 1.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: feafa754037d1b8749e1e9b5a7308641da5870f851529cf3377078e51da48687
-  data.tar.gz: bd830849348a8cee04b84c565458211c28a50c31caf420b0cd407d6655a17602
+  metadata.gz: 59d79d9f281a39f02dbee9c2951c691175b3dfc89f0bf3e3f907aa3210e07e8a
+  data.tar.gz: 648c87f4d9ad0b4f23eaf859969665ec413b4a62fd7fc621d764cd2211231eb2
 SHA512:
-  metadata.gz: 0f1210802f8694ba26463bc14b321b4e97b242af4ea69dc8b4a1d6409568cec9383f12b36104c572d760cdf1c6f1ab3aed00e6fb89e5e7efda142fe1e9322a06
-  data.tar.gz: 51d788026927bbab0d9ad3def044e8f56b0a986fae552f2c550810ea2649f49638b144621743353daf8cf56f4a713bd23b8071c2487fbb8edc035b33c49f8db3
+  metadata.gz: 40c679fd072c9fea3087edcfc7e04d289f1bf4c653c60cb2f1c25fb114aa3cbf9d4ef1d4a3ac9c17220bd6b3f876d133b29e8d58bda62acf642e6fa16eef9977
+  data.tar.gz: a754bf7fe7e9a8fb144ae351fa1e7af1591ee572370d384a23fb857f254133c5087a313951dd77757dea1b38baaffb45c973de651a971a0f2bb941f1027ac4c3

data/lib/epb_view_models.rb

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

data/lib/helper/xml_enums_to_output.rb

@@ -97,6 +97,34 @@ module Helper
       "0" => "Not applicable",
       "NR" => "Not recorded",
     }.freeze
+    CONSTRUCTION_AGE_BAND_NI = {
+      "A" => "Northern Ireland: before 1919",
+      "A-12.0" => "Pre-1900",
+      "B" => "Northern Ireland: 1919-1929",
+      "B-12.0" => "1900-1929",
+      "C" => "Northern Ireland: 1930-1949",
+      "C-12.0" => "1930-1949",
+      "D" => "Northern Ireland: 1950-1973",
+      "D-12.0" => "1950-1966",
+      "E" => "Northern Ireland: 1974-1977",
+      "E-12.0" => "1967-1975",
+      "F" => "Northern Ireland: 1978-1985",
+      "F-12.0" => "1976-1982",
+      "G" => "Northern Ireland: 1986-1991",
+      "G-12.0" => "1983-1990",
+      "H" => "Northern Ireland: 1992-1999",
+      "H-12.0" => "1991-1995",
+      "I" => "Northern Ireland: 2000-2006",
+      "I-12.0" => "1996-2002",
+      "J" => "Northern Ireland: not applicable",
+      "J-12.0" => "2003-2006",
+      "K-RdSAP-NI" => "Northern Ireland: 2007-2013",
+      "K-SAP-NI" => "Northern Ireland: 2007 onwards",
+      "K-12.0" => "Post-2006",
+      "L" => "Northern Ireland: 2014 onwards",
+      "0" => "Not applicable",
+      "NR" => "Not recorded",
+    }.freeze
     PROPERTY_TYPE = {
       "0" => "House",
       "1" => "Bungalow",
@@ -135,7 +163,7 @@ module Helper
       "6" => "mechanical extract, decentralised (MEV dc)",
       "7" => "balanced without heat recovery (MV)",
       "8" => "balanced with heat recovery (MVHR)",
-      "9" => "natural with intermittent extract fans and/or passive vents.  For backwards compatibility only, do not use.",
+      "9" => "natural with intermittent extract fans and/or passive vents. For backwards compatibility only, do not use.",
       "10" => "natural with intermittent extract fans and passive vents",
     }.freeze
     CYLINDER_INSULATION_THICKNESS = {
@@ -278,7 +306,7 @@ module Helper
     end
 
     def self.transaction_type(value, report_type = "2", schema_type = "")
-      types_of_ni = %w[
+      types_of_ni = %i[
         RdSAP-Schema-NI-20.0.0
         RdSAP-Schema-NI-19.0
         RdSAP-Schema-NI-18.0
@@ -303,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
@@ -318,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
@@ -327,14 +355,9 @@ module Helper
         RdSAP-Schema-18.0
         RdSAP-Schema-17.1
         RdSAP-Schema-17.0
-        RdSAP-Schema-NI-20.0.0
-        RdSAP-Schema-NI-19.0
-        RdSAP-Schema-NI-18.0
-        RdSAP-Schema-NI-17.4
-        RdSAP-Schema-NI-17.3
       ]
 
-      schemes_that_use_l = %w[
+      schemes_that_use_l = %i[
         SAP-Schema-18.0.0
         SAP-Schema-17.1
         SAP-Schema-17.0
@@ -343,14 +366,9 @@ module Helper
         RdSAP-Schema-18.0
         RdSAP-Schema-17.1
         RdSAP-Schema-17.0
-        RdSAP-Schema-NI-20.0.0
-        RdSAP-Schema-NI-19.0
-        RdSAP-Schema-NI-18.0
-        RdSAP-Schema-NI-17.4
-        RdSAP-Schema-NI-17.3
       ]
 
-      schemes_that_use_0 = %w[
+      schemes_that_use_0 = %i[
         SAP-Schema-16.3
         SAP-Schema-16.2
         SAP-Schema-16.1
@@ -366,6 +384,25 @@ module Helper
         RdSAP-Schema-18.0
         RdSAP-Schema-17.1
         RdSAP-Schema-17.0
+      ]
+
+      sap_schemas_ni = %i[
+        SAP-Schema-NI-18.0.0
+        SAP-Schema-NI-17.4
+        SAP-Schema-NI-17.3
+        SAP-Schema-NI-17.2
+        SAP-Schema-NI-17.1
+        SAP-Schema-NI-17.0
+        SAP-Schema-NI-16.1
+        SAP-Schema-NI-16.0
+        SAP-Schema-NI-15.0
+        SAP-Schema-NI-14.2
+        SAP-Schema-NI-14.1
+        SAP-Schema-NI-14.0
+        SAP-Schema-NI-13.0
+      ]
+
+      rdsap_schemas_ni = %i[
         RdSAP-Schema-NI-20.0.0
         RdSAP-Schema-NI-19.0
         RdSAP-Schema-NI-18.0
@@ -373,7 +410,29 @@ module Helper
         RdSAP-Schema-NI-17.3
       ]
 
-      if value == "K" && schema_type == "SAP-Schema-12.0" && is_rdsap(report_type)
+      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"] || value
+      end
+
+      if value == "K" && sap_schemas_ni.include?(schema_type)
+        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] || value
+      end
+
+      if sap_schemas_ni.include?(schema_type) || rdsap_schemas_ni.include?(schema_type)
+        return CONSTRUCTION_AGE_BAND_NI[value] || value
+      end
+
+      if value == "K" && schema_type == :"SAP-Schema-12.0" && is_rdsap(report_type)
         return CONSTRUCTION_AGE_BAND["K-12.0"]
       end
 
@@ -405,14 +464,13 @@ module Helper
     end
 
     def self.mechanical_ventilation(value, schema_type, report_type)
-      types_of_sap_pre12 = %w[
+      types_of_sap_pre12 = %i[
         SAP-Schema-11.2
         SAP-Schema-11.0
         SAP-Schema-10.2
         SAP-Schema-NI-11.2
       ].freeze
-
-      if types_of_sap_pre12.include?(schema_type.to_s) && is_rdsap(report_type)
+      if types_of_sap_pre12.include?(schema_type) && is_rdsap(report_type)
         return MECHANICAL_VENTILATION["#{value}-pre12.0"]
       end
 
@@ -440,7 +498,7 @@ module Helper
     end
 
     def self.ventilation_type(value, schema_type = "")
-      ni_sap = %w[
+      ni_sap = %i[
         SAP-Schema-NI-16.1
         SAP-Schema-NI-16.0
         SAP-Schema-NI-15.0
@@ -539,13 +597,14 @@ module Helper
       if rdsap.include?(schema_type)
         RDSAP_FUEL_TYPE[value]
       elsif sap.include?(schema_type) && is_sap(report_type)
-         SAP_FUEL_TYPE[value]
+        SAP_FUEL_TYPE[value]
       elsif sap.include?(schema_type) && is_rdsap(report_type)
         if includes_rapeseed_oil.include?(schema_type) && value == "36"
           return RDSAP_FUEL_TYPE["#{value}-rapeseed-oil"]
         end
+
         if pre143_sap.include?(schema_type)
-          return RDSAP_FUEL_TYPE_PRE_143["#{value}-pre14.3-sap"] || RDSAP_FUEL_TYPE[value]
+          RDSAP_FUEL_TYPE_PRE_143["#{value}-pre14.3-sap"] || RDSAP_FUEL_TYPE[value]
         else
           RDSAP_FUEL_TYPE[value]
         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,
             ),
@@ -40,7 +40,7 @@ module Presenter
             Helper::EnergyBandCalculator.domestic(
               @view_model.current_energy_rating,
             ),
-          cylinder_insul_thickness: Helper::XmlEnumsToOutput.cylinder_insulation_thickness(@view_model.cylinder_insul_thickness),
+          cylinder_insul_thickness: @view_model.cylinder_insul_thickness,
           cylinder_insulation_type: @view_model.cylinder_insulation_type,
           cylinder_size: @view_model.cylinder_size,
           has_cylinder_thermostat: @view_model.has_cylinder_thermostat == "Y" ? "true" : "false",

data/lib/presenter/sap/report.rb

@@ -40,7 +40,7 @@ module Presenter
             Helper::EnergyBandCalculator.domestic(
               @view_model.current_energy_rating,
             ),
-          cylinder_insul_thickness: Helper::XmlEnumsToOutput.cylinder_insulation_thickness(@view_model.cylinder_insul_thickness, @view_model.report_type),
+          cylinder_insul_thickness: @view_model.cylinder_insul_thickness,
           cylinder_insulation_type: @view_model.cylinder_insulation_type,
           cylinder_size: @view_model.cylinder_size,
           has_cylinder_thermostat: @view_model.has_cylinder_thermostat,

metadata

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