epb_view_models 1.0.2 → 1.0.6

data/lib/view_model/sap_schema_170/common_schema.rb

@@ -494,6 +494,38 @@ module ViewModel
           .search("Main-Heating/Environmental-Efficiency-Rating")
           .map(&:content)
       end
+
+      def cylinder_insul_thickness
+        xpath(%w[Hot-Water-Store-Insulation-Thickness])
+      end
+
+      def cylinder_insulation_type
+        xpath(%w[Hot-Water-Store-Insulation-Type])
+      end
+
+      def cylinder_size
+        xpath(%w[Hot-Water-Store-Size])
+      end
+
+      def has_cylinder_thermostat
+        xpath(%w[Has-Cylinder-Thermostat])
+      end
+
+      def mech_vent_sys_index_number
+        xpath(%w[Mechanical-Vent-System-Index-Number])
+      end
+
+      def mechanical_vent_data_source
+        xpath(%w[Mechanical-Ventilation-Data-Source])
+      end
+
+      def thermal_store
+        xpath(%w[Thermal-Store])
+      end
+
+      def ventilation_type
+        xpath(%w[Ventilation-Type])
+      end
     end
   end
 end

data/lib/view_model/sap_schema_171/common_schema.rb

@@ -494,6 +494,38 @@ module ViewModel
           .search("Main-Heating/Environmental-Efficiency-Rating")
           .map(&:content)
       end
+
+      def cylinder_insul_thickness
+        xpath(%w[Hot-Water-Store-Insulation-Thickness])
+      end
+
+      def cylinder_insulation_type
+        xpath(%w[Hot-Water-Store-Insulation-Type])
+      end
+
+      def cylinder_size
+        xpath(%w[Hot-Water-Store-Size])
+      end
+
+      def has_cylinder_thermostat
+        xpath(%w[Has-Cylinder-Thermostat])
+      end
+
+      def mech_vent_sys_index_number
+        xpath(%w[Mechanical-Vent-System-Index-Number])
+      end
+
+      def mechanical_vent_data_source
+        xpath(%w[Mechanical-Ventilation-Data-Source])
+      end
+
+      def thermal_store
+        xpath(%w[Thermal-Store])
+      end
+
+      def ventilation_type
+        xpath(%w[Ventilation-Type])
+      end
     end
   end
 end

data/lib/view_model/sap_schema_1800/common_schema.rb

@@ -297,10 +297,6 @@ module ViewModel
         xpath(%w[Floor-Heat-Loss])
       end
 
-      def water_heating_code
-        xpath(%w[Water-Heating-Code])
-      end
-
       def immersion_heating_type
         xpath(%w[Immersion-Heating-Type])
       end
@@ -554,6 +550,38 @@ module ViewModel
           .search("Main-Heating/Environmental-Efficiency-Rating")
           .map(&:content)
       end
+
+      def cylinder_insul_thickness
+        xpath(%w[Hot-Water-Store-Insulation-Thickness])
+      end
+
+      def cylinder_insulation_type
+        xpath(%w[Hot-Water-Store-Insulation-Type])
+      end
+
+      def cylinder_size
+        xpath(%w[Hot-Water-Store-Size])
+      end
+
+      def has_cylinder_thermostat
+        xpath(%w[Has-Cylinder-Thermostat])
+      end
+
+      def mech_vent_sys_index_number
+        xpath(%w[Mechanical-Vent-System-Index-Number])
+      end
+
+      def mechanical_vent_data_source
+        xpath(%w[Mechanical-Ventilation-Data-Source])
+      end
+
+      def thermal_store
+        xpath(%w[Thermal-Store])
+      end
+
+      def ventilation_type
+        xpath(%w[Ventilation-Type])
+      end
     end
   end
 end

data/lib/view_model/sap_schema_ni_112/common_schema.rb

@@ -190,7 +190,7 @@ module ViewModel
       end
 
       def tenure
-        xpath(%w[Tenure])
+        nil
       end
 
       def transaction_type
@@ -235,10 +235,6 @@ module ViewModel
         xpath(%w[Secondary-Fuel-Type])
       end
 
-      def water_heating_fuel
-        xpath(%w[Water-Fuel-Type])
-      end
-
       def type_of_assessment
         case xpath(%w[Report-Type]).to_i
         when 1

data/lib/view_model/sap_schema_ni_112/rdsap.rb

@@ -57,10 +57,6 @@ module ViewModel
         xpath(%w[Solar-Water-Heating])
       end
 
-      def mechanical_ventilation
-        xpath(%w[Mechanical-Ventilation])
-      end
-
       def floor_height
         @xml_doc.search("Room-Height").map(&:content)
       end
@@ -72,6 +68,51 @@ module ViewModel
       def energy_tariff
         xpath(%w[Meter-Type])
       end
+
+      def cylinder_insul_thickness
+        xpath(%w[Cylinder-Insulation-Thickness])
+      end
+
+      def glazed_area
+        xpath(%w[Glazed-Area])
+      end
+
+      def cylinder_insulation_type
+        xpath(%w[Cylinder-Insulation-Type])
+      end
+
+      def cylinder_size
+        xpath(%w[Cylinder-Size])
+      end
+
+      def has_cylinder_thermostat
+        xpath(%w[Cylinder-Thermostat])
+      end
+
+      def mech_vent_sys_index_number
+        nil
+      end
+
+      def mechanical_vent_data_source
+        nil
+      end
+
+      # DO NOT CORRECT - this typo is present in the schema XML pre 12.0
+      def mechanical_ventilation
+        xpath(%w[Mechanical-Ventliation])
+      end
+
+      def thermal_store
+        nil
+      end
+
+      def ventilation_type
+        nil
+      end
+
+      def water_heating_fuel
+        xpath(%w[Water-Heating-Fuel])
+      end
     end
   end
 end

data/lib/view_model/sap_schema_ni_112/sap.rb

@@ -1,6 +1,41 @@
 module ViewModel
   module SapSchemaNi112
     class Sap < ViewModel::SapSchemaNi112::CommonSchema
+      def cylinder_insul_thickness
+        xpath(%w[Hot-Water-Store-Insulation-Thickness])
+      end
+
+      def cylinder_insulation_type
+        xpath(%w[Hot-Water-Store-Insulation-Type])
+      end
+
+      def cylinder_size
+        xpath(%w[Hot-Water-Store-Size])
+      end
+
+      def has_cylinder_thermostat
+        xpath(%w[Has-Cylinder-Thermostat])
+      end
+
+      def mech_vent_sys_index_number
+        xpath(%w[Mechanical-Vent-System-Index-Number])
+      end
+
+      def mechanical_vent_data_source
+        xpath(%w[Mechanical-Ventilation-Data-Source])
+      end
+
+      def thermal_store
+        xpath(%w[Thermal-Store])
+      end
+
+      def ventilation_type
+        xpath(%w[Ventilation-Type])
+      end
+
+      def water_heating_fuel
+        xpath(%w[Water-Fuel-Type])
+      end
     end
   end
 end

data/lib/view_model/sap_schema_ni_120/common_schema.rb

@@ -186,7 +186,7 @@ module ViewModel
       end
 
       def tenure
-        xpath(%w[Tenure])
+        nil
       end
 
       def transaction_type
@@ -231,10 +231,6 @@ module ViewModel
         xpath(%w[Secondary-Fuel-Type])
       end
 
-      def water_heating_fuel
-        xpath(%w[Water-Fuel-Type])
-      end
-
       def type_of_assessment
         case xpath(%w[Report-Type]).to_i
         when 1

data/lib/view_model/sap_schema_ni_120/rdsap.rb

@@ -60,6 +60,46 @@ module ViewModel
       def energy_tariff
         xpath(%w[Meter-Type])
       end
+
+      def cylinder_insul_thickness
+        xpath(%w[Cylinder-Insulation-Thickness])
+      end
+
+      def glazed_area
+        xpath(%w[Glazed-Area])
+      end
+
+      def cylinder_insulation_type
+        xpath(%w[Cylinder-Insulation-Type])
+      end
+
+      def cylinder_size
+        xpath(%w[Cylinder-Size])
+      end
+
+      def has_cylinder_thermostat
+        xpath(%w[Cylinder-Thermostat])
+      end
+
+      def mech_vent_sys_index_number
+        nil
+      end
+
+      def mechanical_vent_data_source
+        nil
+      end
+
+      def thermal_store
+        nil
+      end
+
+      def ventilation_type
+        nil
+      end
+
+      def water_heating_fuel
+        xpath(%w[Water-Heating-Fuel])
+      end
     end
   end
 end

data/lib/view_model/sap_schema_ni_120/sap.rb

@@ -8,6 +8,42 @@ module ViewModel
       def construction_year
         xpath(%w[Construction-Year])
       end
+
+      def cylinder_insul_thickness
+        xpath(%w[Hot-Water-Store-Insulation-Thickness])
+      end
+
+      def cylinder_insulation_type
+        xpath(%w[Hot-Water-Store-Insulation-Type])
+      end
+
+      def cylinder_size
+        xpath(%w[Hot-Water-Store-Size])
+      end
+
+      def has_cylinder_thermostat
+        xpath(%w[Has-Cylinder-Thermostat])
+      end
+
+      def mech_vent_sys_index_number
+        xpath(%w[Mechanical-Vent-System-Index-Number])
+      end
+
+      def mechanical_vent_data_source
+        xpath(%w[Mechanical-Ventilation-Data-Source])
+      end
+
+      def thermal_store
+        xpath(%w[Thermal-Store])
+      end
+
+      def ventilation_type
+        xpath(%w[Ventilation-Type])
+      end
+
+      def water_heating_fuel
+        xpath(%w[Water-Fuel-Type])
+      end
     end
   end
 end

data/lib/view_model/sap_schema_ni_130/common_schema.rb

@@ -183,7 +183,7 @@ module ViewModel
       end
 
       def tenure
-        xpath(%w[Tenure])
+        nil
       end
 
       def transaction_type
@@ -228,10 +228,6 @@ module ViewModel
         xpath(%w[Secondary-Fuel-Type])
       end
 
-      def water_heating_fuel
-        xpath(%w[Water-Fuel-Type])
-      end
-
       def type_of_assessment
         case xpath(%w[Report-Type]).to_i
         when 1

data/lib/view_model/sap_schema_ni_130/rdsap.rb

@@ -60,6 +60,46 @@ module ViewModel
       def energy_tariff
         xpath(%w[Meter-Type])
       end
+
+      def cylinder_insul_thickness
+        xpath(%w[Cylinder-Insulation-Thickness])
+      end
+
+      def glazed_area
+        xpath(%w[Glazed-Area])
+      end
+
+      def cylinder_insulation_type
+        xpath(%w[Cylinder-Insulation-Type])
+      end
+
+      def cylinder_size
+        xpath(%w[Cylinder-Size])
+      end
+
+      def has_cylinder_thermostat
+        xpath(%w[Cylinder-Thermostat])
+      end
+
+      def mech_vent_sys_index_number
+        nil
+      end
+
+      def mechanical_vent_data_source
+        nil
+      end
+
+      def thermal_store
+        nil
+      end
+
+      def ventilation_type
+        nil
+      end
+
+      def water_heating_fuel
+        xpath(%w[Water-Heating-Fuel])
+      end
     end
   end
 end

data/lib/view_model/sap_schema_ni_130/sap.rb

@@ -8,6 +8,42 @@ module ViewModel
       def construction_year
         xpath(%w[Construction-Year])
       end
+
+      def cylinder_insul_thickness
+        xpath(%w[Hot-Water-Store-Insulation-Thickness])
+      end
+
+      def cylinder_insulation_type
+        xpath(%w[Hot-Water-Store-Insulation-Type])
+      end
+
+      def cylinder_size
+        xpath(%w[Hot-Water-Store-Size])
+      end
+
+      def has_cylinder_thermostat
+        xpath(%w[Has-Cylinder-Thermostat])
+      end
+
+      def mech_vent_sys_index_number
+        xpath(%w[Mechanical-Vent-System-Index-Number])
+      end
+
+      def mechanical_vent_data_source
+        xpath(%w[Mechanical-Ventilation-Data-Source])
+      end
+
+      def thermal_store
+        xpath(%w[Thermal-Store])
+      end
+
+      def ventilation_type
+        xpath(%w[Ventilation-Type])
+      end
+
+      def water_heating_fuel
+        xpath(%w[Water-Fuel-Type])
+      end
     end
   end
 end

data/lib/view_model/sap_schema_ni_140/common_schema.rb

@@ -183,7 +183,7 @@ module ViewModel
       end
 
       def tenure
-        xpath(%w[Tenure])
+        nil
       end
 
       def transaction_type
@@ -228,10 +228,6 @@ module ViewModel
         xpath(%w[Secondary-Fuel-Type])
       end
 
-      def water_heating_fuel
-        xpath(%w[Water-Fuel-Type])
-      end
-
       def type_of_assessment
         case xpath(%w[Report-Type]).to_i
         when 1

data/lib/view_model/sap_schema_ni_140/rdsap.rb

@@ -60,6 +60,46 @@ module ViewModel
       def energy_tariff
         xpath(%w[Meter-Type])
       end
+
+      def cylinder_insul_thickness
+        xpath(%w[Cylinder-Insulation-Thickness])
+      end
+
+      def glazed_area
+        xpath(%w[Glazed-Area])
+      end
+
+      def cylinder_insulation_type
+        xpath(%w[Cylinder-Insulation-Type])
+      end
+
+      def cylinder_size
+        xpath(%w[Cylinder-Size])
+      end
+
+      def has_cylinder_thermostat
+        xpath(%w[Cylinder-Thermostat])
+      end
+
+      def mech_vent_sys_index_number
+        nil
+      end
+
+      def mechanical_vent_data_source
+        nil
+      end
+
+      def thermal_store
+        nil
+      end
+
+      def ventilation_type
+        nil
+      end
+
+      def water_heating_fuel
+        xpath(%w[Water-Heating-Fuel])
+      end
     end
   end
 end

data/lib/view_model/sap_schema_ni_140/sap.rb

@@ -8,6 +8,42 @@ module ViewModel
       def construction_year
         xpath(%w[Construction-Year])
       end
+
+      def cylinder_insul_thickness
+        xpath(%w[Hot-Water-Store-Insulation-Thickness])
+      end
+
+      def cylinder_insulation_type
+        xpath(%w[Hot-Water-Store-Insulation-Type])
+      end
+
+      def cylinder_size
+        xpath(%w[Hot-Water-Store-Size])
+      end
+
+      def has_cylinder_thermostat
+        xpath(%w[Has-Cylinder-Thermostat])
+      end
+
+      def mech_vent_sys_index_number
+        xpath(%w[Mechanical-Vent-System-Index-Number])
+      end
+
+      def mechanical_vent_data_source
+        xpath(%w[Mechanical-Ventilation-Data-Source])
+      end
+
+      def thermal_store
+        xpath(%w[Thermal-Store])
+      end
+
+      def ventilation_type
+        xpath(%w[Ventilation-Type])
+      end
+
+      def water_heating_fuel
+        xpath(%w[Water-Fuel-Type])
+      end
     end
   end
 end

data/lib/view_model/sap_schema_ni_141/common_schema.rb

@@ -183,7 +183,7 @@ module ViewModel
       end
 
       def tenure
-        xpath(%w[Tenure])
+        nil
       end
 
       def transaction_type
@@ -228,10 +228,6 @@ module ViewModel
         xpath(%w[Secondary-Fuel-Type])
       end
 
-      def water_heating_fuel
-        xpath(%w[Water-Fuel-Type])
-      end
-
       def type_of_assessment
         case xpath(%w[Report-Type]).to_i
         when 1

data/lib/view_model/sap_schema_ni_141/rdsap.rb

@@ -60,6 +60,46 @@ module ViewModel
       def energy_tariff
         xpath(%w[Meter-Type])
       end
+
+      def cylinder_insul_thickness
+        xpath(%w[Cylinder-Insulation-Thickness])
+      end
+
+      def glazed_area
+        xpath(%w[Glazed-Area])
+      end
+
+      def cylinder_insulation_type
+        xpath(%w[Cylinder-Insulation-Type])
+      end
+
+      def cylinder_size
+        xpath(%w[Cylinder-Size])
+      end
+
+      def has_cylinder_thermostat
+        xpath(%w[Cylinder-Thermostat])
+      end
+
+      def mech_vent_sys_index_number
+        nil
+      end
+
+      def mechanical_vent_data_source
+        nil
+      end
+
+      def thermal_store
+        nil
+      end
+
+      def ventilation_type
+        nil
+      end
+
+      def water_heating_fuel
+        xpath(%w[Water-Heating-Fuel])
+      end
     end
   end
 end

data/lib/view_model/sap_schema_ni_141/sap.rb

@@ -8,6 +8,42 @@ module ViewModel
       def construction_year
         xpath(%w[Construction-Year])
       end
+
+      def cylinder_insul_thickness
+        xpath(%w[Hot-Water-Store-Insulation-Thickness])
+      end
+
+      def cylinder_insulation_type
+        xpath(%w[Hot-Water-Store-Insulation-Type])
+      end
+
+      def cylinder_size
+        xpath(%w[Hot-Water-Store-Size])
+      end
+
+      def has_cylinder_thermostat
+        xpath(%w[Has-Cylinder-Thermostat])
+      end
+
+      def mech_vent_sys_index_number
+        xpath(%w[Mechanical-Vent-System-Index-Number])
+      end
+
+      def mechanical_vent_data_source
+        xpath(%w[Mechanical-Ventilation-Data-Source])
+      end
+
+      def thermal_store
+        xpath(%w[Thermal-Store])
+      end
+
+      def ventilation_type
+        xpath(%w[Ventilation-Type])
+      end
+
+      def water_heating_fuel
+        xpath(%w[Water-Fuel-Type])
+      end
     end
   end
 end