epb_view_models 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 69b8f64ca17a4bef69800fe8a0a13388985993a61f4b2fbfae4c6837226bf04b
-  data.tar.gz: 97eb3db6b6d137c83c9604dfddaaa2eca367dcc3175dba154b3840424a8da6a3
+  metadata.gz: 414c0a2f9029d52009e6e7f1b87bbee49bdaef8748412508a50e8a7a08eddbaf
+  data.tar.gz: bd9c946f41a6ddfd2f67700634f3ff6b4f5231c9c7227da63cc3118dfd73a458
 SHA512:
-  metadata.gz: 982f51ee5ebbf8c03132e1254cdef4e4d9df220243c70a28c58d23c6469a527dbc7d970b0d4b6ab8c5089351b2bd48996a4f69c0c44b44d560111d36fcff68aa
-  data.tar.gz: 9dc487fbe31b3a0596f8d1a77c6dc23480d9d5f03847cf5a91f2b2febd163871b9644f6148c5ec7ca83dab7e827bbb6895308d04ff1a62b30383d0404bc1862f
+  metadata.gz: 34da0ef4ee834f38767b57544eddbdb9918b56addedb69ebf5f76604ea17f1d5dee3e0f9cf8cfec41ec298de1c6293fbbafeaa4155a5269e8305e82074574313
+  data.tar.gz: 57d61f7ad89951e09f272fdbc8d9c58a6cdaebabc5ab038bcdde0ea3c7b568773f6f3c3695d4456735a7646d0c32678548b25007a4ed963e02a16a6ad254ccdb

data/lib/epb_view_models.rb

@@ -5,7 +5,7 @@ loader = Zeitwerk::Loader.for_gem
 loader.setup
 
 module EpbViewModels
-  VERSION = "1.0.5"
+  VERSION = "1.0.6"
 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",
@@ -327,11 +355,6 @@ 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[
@@ -343,11 +366,6 @@ 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[
@@ -366,6 +384,25 @@ module Helper
         RdSAP-Schema-18.0
         RdSAP-Schema-17.1
         RdSAP-Schema-17.0
+      ]
+
+      sap_schemas_ni = %w[
+        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 = %w[
         RdSAP-Schema-NI-20.0.0
         RdSAP-Schema-NI-19.0
         RdSAP-Schema-NI-18.0
@@ -373,6 +410,28 @@ module Helper
         RdSAP-Schema-NI-17.3
       ]
 
+      ni_schemas_pre_12 = %w[
+        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"]
+      end
+
+      if value == "K" && sap_schemas_ni.include?(schema_type)
+        return CONSTRUCTION_AGE_BAND_NI["K-SAP-NI"]
+      end
+
+      if ni_schemas_pre_12.include?(schema_type)
+        key = (value == "0" ? value : "#{value}-12.0")
+        return CONSTRUCTION_AGE_BAND_NI[key]
+      end
+
+      if sap_schemas_ni.include?(schema_type) || rdsap_schemas_ni.include?(schema_type)
+        return CONSTRUCTION_AGE_BAND_NI[value]
+      end
+
       if value == "K" && schema_type == "SAP-Schema-12.0" && is_rdsap(report_type)
         return CONSTRUCTION_AGE_BAND["K-12.0"]
       end
@@ -539,13 +598,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

metadata

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