epb_view_models 1.0.3 → 1.0.4

data/lib/presenter/export/domestic.rb

@@ -7,7 +7,7 @@ module Presenter::Export
       view[:assessment_id] = @view_model.assessment_id
       view[:assessor] = assessor
       view[:built_form] =
-        enum_value(:xml_value_to_string, @view_model.built_form)
+        enum_value(:built_form_string, @view_model.built_form)
       view[:co2_emissions_current_per_floor_area] =
         @view_model.co2_emissions_current_per_floor_area.to_i
       view[:construction_age_band] =

data/lib/presenter/rd_sap/report.rb

@@ -24,7 +24,7 @@ module Presenter
           address2: @view_model.address_line2,
           address3: @view_model.address_line3,
           built_form:
-            Helper::XmlEnumsToOutput.xml_value_to_string(@view_model.built_form),
+            Helper::XmlEnumsToOutput.built_form_string(@view_model.built_form),
           co2_emiss_curr_per_floor_area:
             @view_model.co2_emissions_current_per_floor_area,
           co2_emissions_current: @view_model.current_carbon_emission,
@@ -40,7 +40,7 @@ module Presenter
             Helper::EnergyBandCalculator.domestic(
               @view_model.current_energy_rating,
             ),
-          cylinder_insul_thickness: @view_model.cylinder_insul_thickness,
+          cylinder_insul_thickness: Helper::XmlEnumsToOutput.cylinder_insulation_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",
@@ -101,14 +101,13 @@ module Presenter
               @view_model.lighting_energy_efficiency_rating,
             ),
           lighting_env_eff:
-            Helper::XmlEnumsToOutput.energy_rating_string(
-              @view_model.lighting_environmental_efficiency_rating,
-            ),
+            Helper::XmlEnumsToOutput.energy_rating_string(@view_model.lighting_environmental_efficiency_rating),
           low_energy_lighting: @view_model.low_energy_lighting,
-          low_energy_fixed_lighting_outlets_count:
+          low_energy_fixed_lighting_count:
             @view_model.low_energy_fixed_lighting_outlets_count,
-          main_fuel:
-            Helper::XmlEnumsToOutput.main_fuel_rdsap(@view_model.main_fuel_type),
+          main_fuel: Helper::XmlEnumsToOutput.fuel_type(@view_model.main_fuel_type,
+                                                        @schema_type,
+                                                        @view_model.report_type),
           mainheat_description:
             @view_model.all_main_heating_descriptions.join(", "),
           mainheat_energy_eff:
@@ -134,7 +133,7 @@ module Presenter
             Helper::XmlEnumsToOutput.mechanical_ventilation(
               @view_model.mechanical_ventilation,
               @schema_type,
-              @report_type,
+              @view_model.report_type,
             ),
           mech_vent_sys_index_number: nil,
           mechanical_vent_data_source: nil,
@@ -179,8 +178,11 @@ module Presenter
           transaction_type:
             Helper::XmlEnumsToOutput.transaction_type(
               @view_model.transaction_type,
+              @view_model.report_type,
+              @schema_type,
             ),
           unheated_corridor_length: @view_model.unheated_corridor_length,
+          ventilation_type: nil,
           walls_description: @view_model.all_wall_descriptions.first,
           walls_energy_eff:
             Helper::XmlEnumsToOutput.energy_rating_string(
@@ -190,6 +192,12 @@ module Presenter
             Helper::XmlEnumsToOutput.energy_rating_string(
               @view_model.all_wall_env_energy_efficiency_rating.first,
             ),
+          water_heating_code: @view_model.water_heating_code,
+          water_heating_fuel: Helper::XmlEnumsToOutput.fuel_type(
+            @view_model.water_heating_fuel,
+            @schema_type,
+            @view_model.report_type,
+          ),
           wind_turbine_count: @view_model.wind_turbine_count,
           windows_description: @view_model.window_description,
           windows_energy_eff:
@@ -311,7 +319,7 @@ module Presenter
             ),
           photo_supply: @view_model.photovoltaic_roof_area_percent,
           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(", "),
           mainheat_energy_eff:
@@ -359,7 +367,9 @@ module Presenter
             ),
           floor_height: @view_model.floor_height.first,
           main_fuel:
-            Helper::XmlEnumsToOutput.main_fuel_rdsap(@view_model.main_fuel_type),
+            Helper::XmlEnumsToOutput.fuel_type(@view_model.main_fuel_type,
+                                               @schema_type,
+                                               @view_model.report_type),
           floor_description: @view_model.all_floor_descriptions.first,
           floor_energy_eff:
             Helper::XmlEnumsToOutput.energy_rating_string(

data/lib/presenter/sap/report.rb

@@ -24,8 +24,8 @@ module Presenter
           address2: @view_model.address_line2,
           address3: @view_model.address_line3,
           built_form:
-            Helper::XmlEnumsToOutput.xml_value_to_string(@view_model.built_form),
-          co2_emiss_curr_perfloor_area:
+            Helper::XmlEnumsToOutput.built_form_string(@view_model.built_form),
+          co2_emiss_curr_per_floor_area:
             @view_model.co2_emissions_current_per_floor_area,
           co2_emissions_current: @view_model.current_carbon_emission,
           co2_emissions_potential: @view_model.potential_carbon_emission,
@@ -40,7 +40,7 @@ module Presenter
             Helper::EnergyBandCalculator.domestic(
               @view_model.current_energy_rating,
             ),
-          cylinder_insul_thickness: @view_model.cylinder_insul_thickness,
+          cylinder_insul_thickness: Helper::XmlEnumsToOutput.cylinder_insulation_thickness(@view_model.cylinder_insul_thickness, @view_model.report_type),
           cylinder_insulation_type: @view_model.cylinder_insulation_type,
           cylinder_size: @view_model.cylinder_size,
           has_cylinder_thermostat: @view_model.has_cylinder_thermostat,
@@ -108,10 +108,12 @@ module Presenter
               @view_model.lighting_environmental_efficiency_rating,
             ),
           low_energy_lighting: @view_model.low_energy_lighting,
-          low_energy_fixed_light_count:
+          low_energy_fixed_lighting_count:
             @view_model.low_energy_fixed_lighting_outlets_count,
           main_fuel:
-            Helper::XmlEnumsToOutput.main_fuel_sap(@view_model.main_fuel_type),
+            Helper::XmlEnumsToOutput.fuel_type(@view_model.main_fuel_type,
+                                               @schema_type,
+                                               @view_model.report_type),
           mainheat_description:
             @view_model.all_main_heating_descriptions.join(", "),
           mainheat_energy_eff:
@@ -184,8 +186,11 @@ module Presenter
             Helper::XmlEnumsToOutput.transaction_type(
               @view_model.transaction_type,
               @view_model.report_type,
+              @schema_type,
             ),
+          ventilation_type: Helper::XmlEnumsToOutput.ventilation_type(@view_model.ventilation_type, @schema_type),
           unheated_corridor_length: @view_model.unheated_corridor_length,
+          water_heating_code: @view_model.water_heating_code,
           walls_description: @view_model.all_wall_descriptions.first,
           walls_energy_eff:
             Helper::XmlEnumsToOutput.energy_rating_string(
@@ -195,6 +200,11 @@ module Presenter
             Helper::XmlEnumsToOutput.energy_rating_string(
               @view_model.all_wall_env_energy_efficiency_rating.first,
             ),
+          water_heating_fuel: Helper::XmlEnumsToOutput.fuel_type(
+            @view_model.water_heating_fuel,
+            @schema_type,
+            @view_model.report_type,
+          ),
           wind_turbine_count: @view_model.wind_turbine_count,
           windows_description: @view_model.window_description,
           windows_energy_eff:
@@ -317,7 +327,7 @@ module Presenter
             ),
           photo_supply: @view_model.photovoltaic_roof_area_percent,
           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(", "),
           report_type: @view_model.report_type,
@@ -368,7 +378,9 @@ module Presenter
               @view_model.floor_height.first
             end,
           main_fuel:
-            Helper::XmlEnumsToOutput.main_fuel_sap(@view_model.main_fuel_type),
+            Helper::XmlEnumsToOutput.fuel_type(@view_model.main_fuel_type,
+                                               @schema_type,
+                                               @view_model.report_type),
           floor_description: @view_model.all_floor_descriptions.first,
           floor_energy_eff:
             Helper::XmlEnumsToOutput.energy_rating_string(

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/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_200/common_schema.rb

@@ -346,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

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

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
@@ -514,6 +509,10 @@ module ViewModel
       def thermal_store
         nil
       end
+
+      def ventilation_type
+        nil
+      end
     end
   end
 end

data/lib/view_model/sap_schema_102/rdsap.rb

@@ -65,6 +65,10 @@ module ViewModel
       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

data/lib/view_model/sap_schema_110/rdsap.rb

@@ -109,6 +109,14 @@ module ViewModel
       def thermal_store
         nil
       end
+
+      def water_heating_fuel
+        xpath(%w[Water-Heating-Fuel])
+      end
+
+      def ventilation_type
+        nil
+      end
     end
   end
 end

data/lib/view_model/sap_schema_110/sap.rb

@@ -48,6 +48,14 @@ module ViewModel
       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_112/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

data/lib/view_model/sap_schema_112/rdsap.rb

@@ -109,6 +109,14 @@ module ViewModel
       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_112/sap.rb

@@ -54,6 +54,14 @@ module ViewModel
       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_120/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

data/lib/view_model/sap_schema_120/rdsap.rb

@@ -92,6 +92,14 @@ module ViewModel
       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_120/sap.rb

@@ -36,6 +36,14 @@ module ViewModel
       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_130/common_schema.rb

@@ -243,10 +243,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_130/rdsap.rb

@@ -92,6 +92,14 @@ module ViewModel
       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_130/sap.rb

@@ -36,6 +36,14 @@ module ViewModel
       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_140/common_schema.rb

@@ -243,10 +243,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