epb_view_models 2.2.15 → 2.2.17

data/lib/view_model/rd_sap_schema_s_210/common_schema.rb

@@ -349,6 +349,7 @@ module ViewModel
         if fixed_lighting_outlets_count.zero?
           return 0
         end
+
         ((low_energy_fixed_lighting_outlets_count.to_f / fixed_lighting_outlets_count) * 100).round
       end
 
@@ -566,7 +567,7 @@ module ViewModel
         @xml_doc
           .search("SAP-Building-Part")
           .map do |node|
-          xpath(%w[Party-Wall-Construction], node)
+            xpath(%w[Party-Wall-Construction], node)
         end
       end
 
@@ -574,16 +575,16 @@ module ViewModel
         @xml_doc
           .search("SAP-Building-Part")
           .map do |node|
-          {
-            alternative_wall_thickness: node.at_xpath("SAP-Alternative-Wall/Wall-Thickness")&.content,
-            alternative_wall_thickness_measured: node.at_xpath("SAP-Alternative-Wall/Wall-Thickness-Measured")&.content,
-            alternative_wall_construction: node.at_xpath("SAP-Alternative-Wall/Wall-Construction")&.content,
-            alternative_wall_u_value: node.at_xpath("SAP-Alternative-Wall/Wall-U-Value")&.content,
-            alternative_wall_insulation_thickness: node.at_xpath("SAP-Alternative-Wall/Wall-Insulation-Thickness")&.content,
-            wall_thickness: node.at_xpath("Wall-Thickness")&.content,
-            wall_construction: node.at_xpath("Wall-Construction")&.content,
-            wall_thickness_measured: node.at_xpath("Wall-Thickness-Measured")&.content,
-          }
+            {
+              alternative_wall_thickness: node.at_xpath("SAP-Alternative-Wall/Wall-Thickness")&.content,
+              alternative_wall_thickness_measured: node.at_xpath("SAP-Alternative-Wall/Wall-Thickness-Measured")&.content,
+              alternative_wall_construction: node.at_xpath("SAP-Alternative-Wall/Wall-Construction")&.content,
+              alternative_wall_u_value: node.at_xpath("SAP-Alternative-Wall/Wall-U-Value")&.content,
+              alternative_wall_insulation_thickness: node.at_xpath("SAP-Alternative-Wall/Wall-Insulation-Thickness")&.content,
+              wall_thickness: node.at_xpath("Wall-Thickness")&.content,
+              wall_construction: node.at_xpath("Wall-Construction")&.content,
+              wall_thickness_measured: node.at_xpath("Wall-Thickness-Measured")&.content,
+            }
         end
       end
 
@@ -591,10 +592,10 @@ module ViewModel
         @xml_doc
           .search("SAP-Building-Part")
           .map do |node|
-          {
-            roof_insulation_location: node.at_xpath("Roof-Insulation-Location")&.content,
-            roof_construction: node.at_xpath("Roof-Construction")&.content,
-          }
+            {
+              roof_insulation_location: node.at_xpath("Roof-Insulation-Location")&.content,
+              roof_construction: node.at_xpath("Roof-Construction")&.content,
+            }
         end
       end
 
@@ -606,10 +607,10 @@ module ViewModel
         @xml_doc
           .search("SAP-Building-Part")
           .map do |node|
-          {
-            floor_u_value: node.at_xpath("Floor-U-Value")&.content,
-            floor_insulation_thickness: node.at_xpath("Floor-Insulation-Thickness")&.content,
-          }
+            {
+              floor_u_value: node.at_xpath("Floor-U-Value")&.content,
+              floor_insulation_thickness: node.at_xpath("Floor-Insulation-Thickness")&.content,
+            }
         end
       end
 
@@ -617,13 +618,13 @@ module ViewModel
         @xml_doc
           .search("SAP-Building-Part")
           .map do |node|
-          {
-            roof_u_value: node.at_xpath("Roof-U-Value")&.content,
-            roof_insulation_thickness: node.at_xpath("Roof-Insulation-Thickness")&.content,
-            rafter_insulation_thickness: node.at_xpath("Rafter-Insulation-Thickness")&.content,
-            flat_roof_insulation_thickness: node.at_xpath("Flat-Roof-Insulation-Thickness")&.content,
-            sloping_ceiling_insulation_thickness: node.at_xpath("Sloping-Ceiling-Insulation-Thickness")&.content,
-          }
+            {
+              roof_u_value: node.at_xpath("Roof-U-Value")&.content,
+              roof_insulation_thickness: node.at_xpath("Roof-Insulation-Thickness")&.content,
+              rafter_insulation_thickness: node.at_xpath("Rafter-Insulation-Thickness")&.content,
+              flat_roof_insulation_thickness: node.at_xpath("Flat-Roof-Insulation-Thickness")&.content,
+              sloping_ceiling_insulation_thickness: node.at_xpath("Sloping-Ceiling-Insulation-Thickness")&.content,
+            }
         end
       end
 
@@ -631,10 +632,10 @@ module ViewModel
         @xml_doc
           .search("SAP-Building-Part")
           .map do |node|
-          {
-            wall_u_value: node.at_xpath("Wall-U-Value")&.content,
-            wall_insulation_thickness: node.at_xpath("Wall-Insulation-Thickness")&.content,
-          }
+            {
+              wall_u_value: node.at_xpath("Wall-U-Value")&.content,
+              wall_insulation_thickness: node.at_xpath("Wall-Insulation-Thickness")&.content,
+            }
         end
       end
 
@@ -649,12 +650,12 @@ module ViewModel
       def main_heating_details
         @xml_doc
           .search("Main-Heating")
-          .map do |node|
-          {
-            main_heating_index_number: xpath(%w[Main-Heating-Index-Number]),
-            sap_main_heating_code: xpath(%w[SAP-Main-Heating-Code]),
-            main_fuel_type: xpath(%w[Main-Fuel-Type]),
-          }
+          .map do |_node|
+            {
+              main_heating_index_number: xpath(%w[Main-Heating-Index-Number]),
+              sap_main_heating_code: xpath(%w[SAP-Main-Heating-Code]),
+              main_fuel_type: xpath(%w[Main-Fuel-Type]),
+            }
         end
       end
 

data/lib/view_model/rd_sap_wrapper.rb

@@ -87,6 +87,10 @@ module ViewModel
         ViewModel::RdSapSchemaS190::CommonSchema.new xml_doc
       when :"RdSAP-Schema-S-21.0"
         ViewModel::RdSapSchemaS210::CommonSchema.new xml_doc
+      when :"RdSAP-Schema-S-18.0"
+        ViewModel::RdSapSchemaS180::CommonSchema.new xml_doc
+      when :"RdSAP-Schema-S-17.00"
+        ViewModel::RdSapSchemaS1700::CommonSchema.new xml_doc
       else
         raise ArgumentError, "Unsupported schema type"
       end

data/lib/view_model/sap_schema_s_1900/common_schema.rb

@@ -51,10 +51,6 @@ module ViewModel
         xpath(%w[Registration-Date])
       end
 
-      def date_of_completion
-        xpath(%w[Completion-Date])
-      end
-
       def address_id
         xpath(%w[UPRN])
       end
@@ -603,11 +599,11 @@ module ViewModel
       def main_heating_types
         @xml_doc
           .search("SAP-Heating/Main-Heating-Details/Main-Heating")
-          .map do |node|
-          {
-            main_heating_code: xpath(%w[Main-Heating-Code]),
-            main_heating_index_number: xpath(%w[Main-Heating-Index-Number]),
-          }
+          .map do |_node|
+            {
+              main_heating_code: xpath(%w[Main-Heating-Code]),
+              main_heating_index_number: xpath(%w[Main-Heating-Index-Number]),
+            }
         end
       end
 
@@ -615,7 +611,7 @@ module ViewModel
         @xml_doc
           .search("SAP-Building-Part")
           .map do |node|
-          xpath(%w[Construction-Year], node)
+            xpath(%w[Construction-Year], node)
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: epb_view_models
 version: !ruby/object:Gem::Version
-  version: 2.2.15
+  version: 2.2.17
 platform: ruby
 authors:
 - MHCLG Energy Performance of Buildings
@@ -320,6 +320,28 @@ files:
 - api/schemas/xml/RdSAP-Schema-NI-21.0.1/RdSAP/Templates/RdSAP-Report.xsd
 - api/schemas/xml/RdSAP-Schema-NI-21.0.1/RdSAP/UDT/EPC-Domains.xsd
 - api/schemas/xml/RdSAP-Schema-NI-21.0.1/RdSAP/UDT/SAP-Domains.xsd
+- api/schemas/xml/RdSAP-Schema-S-17.00/RdSAP/ExternalDefinitions.xml
+- api/schemas/xml/RdSAP-Schema-S-17.00/RdSAP/ExternalDefinitions.xsd
+- api/schemas/xml/RdSAP-Schema-S-17.00/RdSAP/Templates/AssessorManagement.xsd
+- api/schemas/xml/RdSAP-Schema-S-17.00/RdSAP/Templates/EPC-Certificate.xsd
+- api/schemas/xml/RdSAP-Schema-S-17.00/RdSAP/Templates/EPC-CollectedData.xsd
+- api/schemas/xml/RdSAP-Schema-S-17.00/RdSAP/Templates/ExceptionList.xsd
+- api/schemas/xml/RdSAP-Schema-S-17.00/RdSAP/Templates/Property.xsd
+- api/schemas/xml/RdSAP-Schema-S-17.00/RdSAP/Templates/RdSAP-Report.xsd
+- api/schemas/xml/RdSAP-Schema-S-17.00/RdSAP/Templates/ReportList.xsd
+- api/schemas/xml/RdSAP-Schema-S-17.00/RdSAP/UDT/EPC-Domains.xsd
+- api/schemas/xml/RdSAP-Schema-S-17.00/RdSAP/UDT/SAP-Domains.xsd
+- api/schemas/xml/RdSAP-Schema-S-18.0/RdSAP/ExternalDefinitions.xml
+- api/schemas/xml/RdSAP-Schema-S-18.0/RdSAP/ExternalDefinitions.xsd
+- api/schemas/xml/RdSAP-Schema-S-18.0/RdSAP/Templates/AssessorManagement.xsd
+- api/schemas/xml/RdSAP-Schema-S-18.0/RdSAP/Templates/EPC-Certificate.xsd
+- api/schemas/xml/RdSAP-Schema-S-18.0/RdSAP/Templates/EPC-CollectedData.xsd
+- api/schemas/xml/RdSAP-Schema-S-18.0/RdSAP/Templates/ExceptionList.xsd
+- api/schemas/xml/RdSAP-Schema-S-18.0/RdSAP/Templates/Property.xsd
+- api/schemas/xml/RdSAP-Schema-S-18.0/RdSAP/Templates/RdSAP-Report.xsd
+- api/schemas/xml/RdSAP-Schema-S-18.0/RdSAP/Templates/ReportList.xsd
+- api/schemas/xml/RdSAP-Schema-S-18.0/RdSAP/UDT/EPC-Domains.xsd
+- api/schemas/xml/RdSAP-Schema-S-18.0/RdSAP/UDT/SAP-Domains.xsd
 - api/schemas/xml/RdSAP-Schema-S-19.0/RdSAP/ExternalDefinitions.xml
 - api/schemas/xml/RdSAP-Schema-S-19.0/RdSAP/ExternalDefinitions.xsd
 - api/schemas/xml/RdSAP-Schema-S-19.0/RdSAP/Templates/AssessorManagement.xsd
@@ -1716,6 +1738,8 @@ files:
 - lib/view_model/rd_sap_schema_ni_200/common_schema.rb
 - lib/view_model/rd_sap_schema_ni_210/common_schema.rb
 - lib/view_model/rd_sap_schema_ni_2101/common_schema.rb
+- lib/view_model/rd_sap_schema_s_1700/common_schema.rb
+- lib/view_model/rd_sap_schema_s_180/common_schema.rb
 - lib/view_model/rd_sap_schema_s_190/common_schema.rb
 - lib/view_model/rd_sap_schema_s_210/common_schema.rb
 - lib/view_model/rd_sap_wrapper.rb