epb_view_models 1.0.0 → 1.0.4

data/lib/presenter/sap/summary.rb

@@ -150,7 +150,7 @@ module Presenter
           wind_turbine_count: @view_model.wind_turbine_count,
           unheated_corridor_length: @view_model.unheated_corridor_length,
           built_form:
-            Helper::XmlEnumsToOutput.xml_value_to_string(@view_model.built_form),
+            Helper::XmlEnumsToOutput.built_form_string(@view_model.built_form),
           mainheat_description:
             @view_model.all_main_heating_descriptions.join(", "),
           extensions_count:

data/lib/view_model/cepc50/cepc.rb

@@ -57,10 +57,6 @@ module ViewModel
         xpath(%w[Other-Fuel-Description])
       end
 
-      def primary_energy_use
-        xpath(%w[Energy-Consumption-Current])
-      end
-
       def primary_energy_use
         nil
       end

data/lib/view_model/cepc60/cepc.rb

@@ -53,10 +53,6 @@ module ViewModel
         xpath(%w[New-Build-Benchmark])
       end
 
-      def other_fuel_description
-        nil
-      end
-
       def other_fuel_description
         xpath(%w[Other-Fuel-Description])
       end

data/lib/view_model/cepc71/dec.rb

@@ -81,10 +81,6 @@ module ViewModel
         xpath(%w[Technical-Information Main-Heating-Fuel])
       end
 
-      def special_energy_uses
-        xpath(%w[Technical-Information Special-Energy-Uses])
-      end
-
       def occupancy_level
         xpath(%w[Benchmarks Benchmark Occupancy-Level])
       end

data/lib/view_model/cepc_ni800/ac_report.rb

@@ -10,12 +10,13 @@ module ViewModel
       end
 
       def extract_aci_recommendations(nodes)
-        nodes.map { |node|
+        recommendations = nodes.map do |node|
           {
             sequence: node.at("Seq-Number").content,
             text: node.at("Text").content,
           }
-        }.reject { |node| node[:text].nil? || node[:text].empty? }
+        end
+        recommendations.reject { |node| node[:text].nil? || node[:text].empty? }
       end
 
       def key_recommendations_efficiency

data/lib/view_model/domestic_epc_view_model.rb

@@ -50,6 +50,10 @@ module ViewModel
       Time.parse(date_of_expiry) < Time.now ? "EXPIRED" : "ENTERED"
     end
 
+    def water_heating_code
+      xpath(%w[Water-Heating-Code])
+    end
+
   private
 
     def fetch_addendum_numbers

data/lib/view_model/rd_sap_schema_170/common_schema.rb

@@ -514,6 +514,22 @@ module ViewModel
         end
         nil
       end
+
+      def cylinder_insul_thickness
+        xpath(%w[Cylinder-Insulation-Thickness])
+      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
     end
   end
 end

data/lib/view_model/rd_sap_schema_171/common_schema.rb

@@ -514,6 +514,22 @@ module ViewModel
         end
         nil
       end
+
+      def cylinder_insul_thickness
+        xpath(%w[Cylinder-Insulation-Thickness])
+      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
     end
   end
 end

data/lib/view_model/rd_sap_schema_180/common_schema.rb

@@ -514,6 +514,22 @@ module ViewModel
         end
         nil
       end
+
+      def cylinder_insul_thickness
+        xpath(%w[Cylinder-Insulation-Thickness])
+      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
     end
   end
 end

data/lib/view_model/rd_sap_schema_190/common_schema.rb

@@ -514,6 +514,22 @@ module ViewModel
         end
         nil
       end
+
+      def cylinder_insul_thickness
+        xpath(%w[Cylinder-Insulation-Thickness])
+      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
     end
   end
 end

data/lib/view_model/rd_sap_schema_200/common_schema.rb

@@ -297,10 +297,6 @@ module ViewModel
         @xml_doc.search("Secondary-Heating/Description").map(&:content)
       end
 
-      def all_main_heating_controls_descriptions
-        @xml_doc.search("Main-Heating-Controls/Description").map(&:content)
-      end
-
       def all_sap_floor_dimensions
         @xml_doc.search("SAP-Floor-Dimension").select(&:element?).map { |node|
           { total_floor_area: xpath(%w[Total-Floor-Area], node).to_f }
@@ -350,10 +346,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
@@ -579,6 +571,22 @@ module ViewModel
         end
         nil
       end
+
+      def cylinder_insul_thickness
+        xpath(%w[Cylinder-Insulation-Thickness])
+      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
     end
   end
 end

data/lib/view_model/rd_sap_schema_ni_173/common_schema.rb

@@ -503,6 +503,22 @@ module ViewModel
         end
         nil
       end
+
+      def cylinder_insul_thickness
+        xpath(%w[Cylinder-Insulation-Thickness])
+      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
     end
   end
 end

data/lib/view_model/rd_sap_schema_ni_174/common_schema.rb

@@ -503,6 +503,22 @@ module ViewModel
         end
         nil
       end
+
+      def cylinder_insul_thickness
+        xpath(%w[Cylinder-Insulation-Thickness])
+      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
     end
   end
 end

data/lib/view_model/rd_sap_schema_ni_180/common_schema.rb

@@ -503,6 +503,22 @@ module ViewModel
         end
         nil
       end
+
+      def cylinder_insul_thickness
+        xpath(%w[Cylinder-Insulation-Thickness])
+      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
     end
   end
 end

data/lib/view_model/rd_sap_schema_ni_190/common_schema.rb

@@ -503,6 +503,22 @@ module ViewModel
         end
         nil
       end
+
+      def cylinder_insul_thickness
+        xpath(%w[Cylinder-Insulation-Thickness])
+      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
     end
   end
 end

data/lib/view_model/rd_sap_schema_ni_200/common_schema.rb

@@ -333,10 +333,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
@@ -566,6 +562,22 @@ module ViewModel
         end
         nil
       end
+
+      def cylinder_insulation_type
+        xpath(%w[Cylinder-Insulation-Type])
+      end
+
+      def cylinder_insul_thickness
+        xpath(%w[Cylinder-Insulation-Thickness])
+      end
+
+      def cylinder_size
+        xpath(%w[Cylinder-Size])
+      end
+
+      def has_cylinder_thermostat
+        xpath(%w[Cylinder-Thermostat])
+      end
     end
   end
 end

data/lib/view_model/rd_sap_wrapper.rb

@@ -18,6 +18,10 @@ module ViewModel
       @summary.to_hash
     end
 
+    def to_hash_ni
+      @report.to_hash_ni
+    end
+
     def to_report
       @report.to_hash
     end

data/lib/view_model/sap_schema_102/common_schema.rb

@@ -244,10 +244,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
@@ -377,8 +373,7 @@ module ViewModel
       end
 
       def built_form
-        built_form_value = xpath(%w[Built-Form])
-        Helper::XmlEnumsToOutput.xml_value_to_string(built_form_value)
+        xpath(%w[Built-Form])
       end
 
       def unheated_corridor_length
@@ -437,10 +432,6 @@ module ViewModel
         xpath(%w[Electricity-Tariff])
       end
 
-      def all_main_heating_energy_efficiency
-        @xml_doc.search("Main-Heating/Energy-Efficiency-Rating").map(&:content)
-      end
-
       def solar_water_heating_flag
         nil
       end
@@ -490,6 +481,38 @@ module ViewModel
           .search("Main-Heating/Environmental-Efficiency-Rating")
           .map(&:content)
       end
+
+      def cylinder_insul_thickness
+        xpath(%w[Cylinder-Insulation-Thickness])
+      end
+
+      def cylinder_insulation_type
+        xpath(%w[Cylinder-Insulation-Type])
+      end
+
+      def cylinder_size
+        xpath(%w[Cylinder-Size])
+      end
+
+      def has_cylinder_thermostat
+        nil
+      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
     end
   end
 end

data/lib/view_model/sap_schema_102/rdsap.rb

@@ -61,6 +61,14 @@ module ViewModel
       def energy_tariff
         xpath(%w[Meter-Type])
       end
+
+      def has_cylinder_thermostat
+        xpath(%w[Cylinder-Thermostat])
+      end
+
+      def water_heating_fuel
+        xpath(%w[Water-Heating-Fuel])
+      end
     end
   end
 end

data/lib/view_model/sap_schema_110/common_schema.rb

@@ -248,10 +248,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
@@ -381,8 +377,7 @@ module ViewModel
       end
 
       def built_form
-        built_form_value = xpath(%w[Built-Form])
-        Helper::XmlEnumsToOutput.xml_value_to_string(built_form_value)
+        xpath(%w[Built-Form])
       end
 
       def unheated_corridor_length
@@ -397,10 +392,6 @@ module ViewModel
         xpath(%w[Wind-Turbines-Count])
       end
 
-      def unheated_corridor_length
-        xpath(%w[Unheated-Corridor-Length])
-      end
-
       def all_main_heating_descriptions
         @xml_doc.search("Main-Heating/Description").map(&:content)
       end